国内站修改

xinkeaboard-server/b2b2c-core/src/main/java/com/slodon/b2b2c/core/config/DomainUrlUtil.java

@@ -122,7 +122,7 @@ public class DomainUrlUtil {
     /**
      * 发送短信类型，1-腾讯云发送，2-云片发送，3-阿里云发送
      */
-    public static final Integer SEND_SMS_TYPE = 1;
+    public static final Integer SEND_SMS_TYPE = 3;
 
     /**
      * 数据清洗模式，1==清除模式，2==转义模式

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/member/admin/AdminEnquiryController.java

@@ -97,15 +97,16 @@ public class AdminEnquiryController extends BaseController {
                                                       @RequestParam(value = "email", required = false) String email,
                                                       @RequestParam(value = "validStatus", required = false) Integer validStatus,
                                                       @RequestParam(value = "storeId", required = false) Long storeId,
-                                                      @RequestParam(value = "webSite", required = false) String webSite) {
+                                                      @RequestParam(value = "webSite", required = false) String webSite,
+                                                      @RequestParam(value = "phone", required = false) String phone) {
         Admin admin = UserUtil.getUser(request, Admin.class);
 
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
         if(storeId !=null && storeId == 1){
             storeId = 0L;
         }
-        List<MemberEnquiry> list = memberEnquiryModel.getEnquiryAdminListByPage(name, email, String.valueOf(admin.getIsSuper()), admin.getAdminId(),validStatus, pager,storeId,webSite);
-        pager.setRowsCount(memberEnquiryModel.enquiryAdminListPageCount(name, email, String.valueOf(admin.getIsSuper()), admin.getAdminId(),validStatus,storeId,webSite));
+        List<MemberEnquiry> list = memberEnquiryModel.getEnquiryAdminListByPage(name, email, String.valueOf(admin.getIsSuper()), admin.getAdminId(),validStatus, pager,storeId,webSite,phone);
+        pager.setRowsCount(memberEnquiryModel.enquiryAdminListPageCount(name, email, String.valueOf(admin.getIsSuper()), admin.getAdminId(),validStatus,storeId,webSite,phone));
         ArrayList<OrderEnquiryVO> vos = new ArrayList<>();
         if (!CollectionUtils.isEmpty(list)) {
             list.forEach(memberEnquiry -> {

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/member/seller/advich/SellerEnquiryController.java

@@ -71,12 +71,12 @@ public class SellerEnquiryController extends BaseController {
      * @return
      */
     @GetMapping("list")
-    public JsonResult<PageVO<OrderEnquiryVO>> getList(HttpServletRequest request, @RequestParam(value = "name", required = false) String name, @RequestParam(value = "email", required = false) String email, @RequestParam(value = "validStatus", required = false) Integer validStatus, @RequestParam(value = "webSite", required = false,defaultValue = "1") String webSite) {
+    public JsonResult<PageVO<OrderEnquiryVO>> getList(HttpServletRequest request, @RequestParam(value = "name", required = false) String name, @RequestParam(value = "email", required = false) String email, @RequestParam(value = "validStatus", required = false) Integer validStatus, @RequestParam(value = "webSite", required = false,defaultValue = "1") String webSite,@RequestParam(value = "phone", required = false) String phone ) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
-        List<MemberEnquiry> list = memberEnquiryModel.getEnquiryListByPage(name, email, vendor.getStoreId(), vendor.getIsStoreAdmin(), vendor.getVendorId(), validStatus,webSite, pager);
-        pager.setRowsCount(memberEnquiryModel.enquiryListPageCount(name, email, vendor.getStoreId(), vendor.getIsStoreAdmin(), vendor.getVendorId(), validStatus,webSite));
+        List<MemberEnquiry> list = memberEnquiryModel.getEnquiryListByPage(name, email, vendor.getStoreId(), vendor.getIsStoreAdmin(), vendor.getVendorId(), validStatus, webSite, phone, pager);
+        pager.setRowsCount(memberEnquiryModel.enquiryListPageCount(name, email, vendor.getStoreId(), vendor.getIsStoreAdmin(), vendor.getVendorId(), validStatus, webSite, phone));
         ArrayList<OrderEnquiryVO> vos = new ArrayList<>();
         if (!CollectionUtils.isEmpty(list)) {
             list.forEach(memberEnquiry -> {

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/msg/front/VerifyController.java

@@ -20,6 +20,7 @@ import com.slodon.b2b2c.model.member.MemberModel;
 import com.slodon.b2b2c.model.msg.MsgSendModel;
 import com.slodon.b2b2c.model.msg.SmsCodeModel;
 import com.slodon.b2b2c.msg.pojo.SmsCode;
+import com.slodon.b2b2c.sms.DySmsSender;
 import com.slodon.b2b2c.sms.TencentSmsSender;
 import com.slodon.b2b2c.sms.YunPianSmsSender;
 import com.slodon.b2b2c.sms.base.SmsSender;
@@ -200,6 +201,10 @@ public class VerifyController extends BaseController {
                 //云片发送
                 smsSender = new YunPianSmsSender(stringRedisTemplate);
                 break;
+            case 3:
+                //阿里云发送
+                smsSender = new DySmsSender(stringRedisTemplate);
+                break;
             default:
                 throw new MallException("发送短信失败");
         }

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/dao/read/member/MemberEnquiryReadMapper.java

@@ -22,6 +22,9 @@ public interface MemberEnquiryReadMapper extends BaseReadMapper<MemberEnquiry, M
      * @param storeId
      * @param isStoreAdmin
      * @param vendorId
+     * @param validStatus
+     * @param webSite
+     * @param phone
      * @param startRow
      * @param size
      * @return
@@ -33,6 +36,7 @@ public interface MemberEnquiryReadMapper extends BaseReadMapper<MemberEnquiry, M
                                         @Param("vendorId") Long vendorId,
                                         @Param("validStatus") Integer validStatus,
                                         @Param("webSite") String webSite,
+                                        @Param("phone") String phone,
                                         @Param("startRow") Integer startRow,
                                         @Param("size") Integer size);
 
@@ -44,6 +48,9 @@ public interface MemberEnquiryReadMapper extends BaseReadMapper<MemberEnquiry, M
      * @param storeId
      * @param isStoreAdmin
      * @param vendorId
+     * @param webSite
+     * @param validStatus
+     * @param phone
      * @return
      */
     Integer enquiryListPageCount(@Param("nameLike") String name,
@@ -52,7 +59,8 @@ public interface MemberEnquiryReadMapper extends BaseReadMapper<MemberEnquiry, M
                                  @Param("isStoreAdmin") String isStoreAdmin,
                                  @Param("vendorId") Long vendorId,
                                  @Param("validStatus") Integer validStatus,
-                                 @Param("webSite") String webSite);
+                                 @Param("webSite") String webSite,
+                                 @Param("phone") String phone);
 
 
     /**
@@ -63,6 +71,9 @@ public interface MemberEnquiryReadMapper extends BaseReadMapper<MemberEnquiry, M
      * @param isSupAdmin
      * @param sysAdminId
      * @param validStatus
+     * @param webSite
+     * @param storeId
+     * @param phone
      * @param startRow
      * @param size
      * @return
@@ -75,7 +86,8 @@ public interface MemberEnquiryReadMapper extends BaseReadMapper<MemberEnquiry, M
                                              @Param("startRow") Integer startRow,
                                              @Param("size") Integer size,
                                              @Param("storeId") Long storeId,
-                                             @Param("webSite") String webSite);
+                                             @Param("webSite") String webSite,
+                                             @Param("phone") String phone);
 
     /**
      * 平台端-询盘数量
@@ -86,6 +98,8 @@ public interface MemberEnquiryReadMapper extends BaseReadMapper<MemberEnquiry, M
      * @param sysAdminId
      * @param validStatus
      * @param webSite
+     * @param storeId
+     * @param phone
      * @return
      */
     Integer enquiryAdminListPageCount(@Param("nameLike") String name,
@@ -94,7 +108,8 @@ public interface MemberEnquiryReadMapper extends BaseReadMapper<MemberEnquiry, M
                                       @Param("sysAdminId") Integer sysAdminId,
                                       @Param("validStatus") Integer validStatus,
                                       @Param("storeId") Long storeId,
-                                      @Param("webSite") String webSite);
+                                      @Param("webSite") String webSite,
+                                      @Param("phone") String phone);
 
     /**
      * 卖家端-询盘趋势-天数

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/member/advich/MemberEnquiryModel.java

@@ -482,13 +482,15 @@ public class MemberEnquiryModel {
      * @param isStoreAdmin
      * @param vendorId
      * @param validStatus
+     * @param webSite
+     * @param phone
      * @param pager
      * @return
      */
-    public List<MemberEnquiry> getEnquiryListByPage(String name, String email, Long storeId, String isStoreAdmin, Long vendorId, Integer validStatus,String webSite, PagerInfo pager) {
+    public List<MemberEnquiry> getEnquiryListByPage(String name, String email, Long storeId, String isStoreAdmin, Long vendorId, Integer validStatus,String webSite,String phone, PagerInfo pager) {
         List<MemberEnquiry> enquiryList = null;
         if (pager != null) {
-            enquiryList = memberEnquiryReadMapper.enquiryListPage(name, email, storeId, isStoreAdmin, vendorId, validStatus,webSite, pager.getStart(), pager.getPageSize());
+            enquiryList = memberEnquiryReadMapper.enquiryListPage(name, email, storeId, isStoreAdmin, vendorId, validStatus, webSite, phone, pager.getStart(), pager.getPageSize());
         }
         return enquiryList;
     }
@@ -502,10 +504,12 @@ public class MemberEnquiryModel {
      * @param isStoreAdmin
      * @param vendorId
      * @param validStatus
+     * @param webSite
+     * @param phone
      * @return
      */
-    public Integer enquiryListPageCount(String name, String email, Long storeId, String isStoreAdmin, Long vendorId, Integer validStatus,String webSite) {
-        return memberEnquiryReadMapper.enquiryListPageCount(name, email, storeId, isStoreAdmin, vendorId, validStatus,webSite);
+    public Integer enquiryListPageCount(String name, String email, Long storeId, String isStoreAdmin, Long vendorId, Integer validStatus,String webSite,String phone) {
+        return memberEnquiryReadMapper.enquiryListPageCount(name, email, storeId, isStoreAdmin, vendorId, validStatus, webSite, phone);
     }
 
     /**
@@ -513,12 +517,18 @@ public class MemberEnquiryModel {
      *
      * @param name  查询条件信息
      * @param email 查询条件信息
+     * @param storeId
+     * @param isSupAdmin
+     * @param sysAdminId
+     * @param validStatus
+     * @param webSite
+     * @param phone
      * @param pager 分页信息
      */
-    public List<MemberEnquiry> getEnquiryAdminListByPage(String name, String email, String isSupAdmin, Integer sysAdminId, Integer validStatus, PagerInfo pager, Long storeId, String webSite) {
+    public List<MemberEnquiry> getEnquiryAdminListByPage(String name, String email, String isSupAdmin, Integer sysAdminId, Integer validStatus, PagerInfo pager, Long storeId, String webSite,String phone) {
         List<MemberEnquiry> enquiryList = null;
         if (pager != null) {
-            enquiryList = memberEnquiryReadMapper.enquiryAdminListPage(name, email, isSupAdmin, sysAdminId, validStatus, pager.getStart(), pager.getPageSize(), storeId, webSite);
+            enquiryList = memberEnquiryReadMapper.enquiryAdminListPage(name, email, isSupAdmin, sysAdminId, validStatus, pager.getStart(), pager.getPageSize(), storeId, webSite,phone);
         }
         return enquiryList;
     }
@@ -528,10 +538,16 @@ public class MemberEnquiryModel {
      *
      * @param name  查询条件信息
      * @param email 查询条件信息
+     * @param isSupAdmin
+     * @param sysAdminId
+     * @param validStatus
+     * @param storeId
+     * @param webSite
+     * @param phone
      * @return 购物车列表
      */
-    public Integer enquiryAdminListPageCount(String name, String email, String isSupAdmin, Integer sysAdminId, Integer validStatus, Long storeId, String webSite) {
-        return memberEnquiryReadMapper.enquiryAdminListPageCount(name, email, isSupAdmin, sysAdminId, validStatus, storeId, webSite);
+    public Integer enquiryAdminListPageCount(String name, String email, String isSupAdmin, Integer sysAdminId, Integer validStatus, Long storeId, String webSite,String phone) {
+        return memberEnquiryReadMapper.enquiryAdminListPageCount(name, email, isSupAdmin, sysAdminId, validStatus, storeId, webSite, phone);
     }
 
     /**

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/member/MemberEnquiryReadMapper.xml

@@ -214,6 +214,9 @@
         <if test="webSite != null">
             AND t1.`web_site` = #{webSite}
         </if>
+        <if test="phone != null">
+            AND t1.`phone` like concat('%',#{phone},'%')
+        </if>
         order by t1.id desc
     </select>
 
@@ -238,6 +241,9 @@
         <if test="webSite != null">
             AND t1.`web_site` = #{webSite}
         </if>
+        <if test="phone != null">
+            AND t1.`phone` like concat('%',#{phone},'%')
+        </if>
         order by t1.id desc
         <include refid="limit"/>
     </select>
@@ -263,6 +269,9 @@
         <if test="webSite != null">
             AND t1.`web_site` = #{webSite}
         </if>
+        <if test="phone != null">
+            AND t1.`phone` like concat('%',#{phone},'%')
+        </if>
         order by t1.id desc
     </select>
 
@@ -300,6 +309,9 @@
         <if test="webSite != null">
             AND t1.`web_site` = #{webSite}
         </if>
+        <if test="phone != null">
+            AND t1.`phone` like concat('%',#{phone},'%')
+        </if>
         order by t1.id desc
         <include refid="limit"/>
     </select>