店铺管理--询盘、询盘邮箱区分站点

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/member/pojo/MemberEnquiry.java

@@ -14,7 +14,7 @@ public class MemberEnquiry {
 
 
 
-    private Integer channel;
+    private String channel;
 
     /**
      *
@@ -724,7 +724,7 @@ public class MemberEnquiry {
         this.goodsName = goodsName;
     }
 
-    public Integer getChannel() {return channel;}
+    public String getChannel() {return channel;}
 
-    public void setChannel(Integer channel) {this.channel = channel;}
+    public void setChannel(String channel) {this.channel = channel;}
 }

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/seller/example/EnquiryReceiveMailSettingExample.java

@@ -10,6 +10,11 @@ public class EnquiryReceiveMailSettingExample implements Serializable {
     private static final long serialVersionUID = -4375707414284856111L;
 
     /**
+     * 渠道
+     */
+    private String channel;
+
+    /**
      * 店铺id
      */
     private Long storeId;

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/seller/pojo/EnquiryReceiveMailSetting.java

@@ -11,6 +11,8 @@ public class EnquiryReceiveMailSetting implements Serializable {
 
     private Long id;
 
+    private String channel;
+
     private Long storeId;
 
     private String email;

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

@@ -65,15 +65,17 @@ public class SellerEnquiryController extends BaseController {
      * @param request
      * @param name
      * @param email
+     * @param validStatus
+     * @param channel
      * @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) {
+    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 = "channel", required = false,defaultValue = "1") String channel) {
         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, pager);
-        pager.setRowsCount(memberEnquiryModel.enquiryListPageCount(name, email, vendor.getStoreId(), vendor.getIsStoreAdmin(), vendor.getVendorId(), validStatus));
+        List<MemberEnquiry> list = memberEnquiryModel.getEnquiryListByPage(name, email, vendor.getStoreId(), vendor.getIsStoreAdmin(), vendor.getVendorId(), validStatus,channel, pager);
+        pager.setRowsCount(memberEnquiryModel.enquiryListPageCount(name, email, vendor.getStoreId(), vendor.getIsStoreAdmin(), vendor.getVendorId(), validStatus,channel));
         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/SellerEnquiryReceiverMailSettingController.java

@@ -40,12 +40,15 @@ public class SellerEnquiryReceiverMailSettingController extends BaseController {
      *
      * @param request
      * @param email
+     * @param phone
+     * @param channel
      * @return
      */
     @GetMapping("list")
     public JsonResult<PageVO<OrderEnquiryReceiverMailVO>> getList(HttpServletRequest request,
                                                                   @RequestParam(value = "email", required = false) String email,
-                                                                  @RequestParam(value = "phone", required = false) String phone) {
+                                                                  @RequestParam(value = "phone", required = false) String phone,
+                                                                  @RequestParam(value = "channel", required = false) String channel) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
 
@@ -53,6 +56,7 @@ public class SellerEnquiryReceiverMailSettingController extends BaseController {
         example.setStoreId(vendor.getStoreId());
         example.setEmailLike(email);
         example.setPhoneLike(phone);
+        example.setChannel(channel);
 
         List<EnquiryReceiveMailSetting> list = enquiryReceiverMailSettingModel.getEnquiryReceiveMailSettings(example, pager);
         ArrayList<OrderEnquiryReceiverMailVO> vos = new ArrayList<>();
@@ -74,6 +78,7 @@ public class SellerEnquiryReceiverMailSettingController extends BaseController {
     @PostMapping("add")
     public JsonResult<Object> addEnquiryReceiverMail(HttpServletRequest request, EnquiryReceiveMailSetting enquiryReceiveMailSetting) {
         Vendor vendor = UserUtil.getUser(request,Vendor.class);
+        AssertUtil.notEmpty(enquiryReceiveMailSetting.getChannel(), "询盘渠道不能为空");
         AssertUtil.notEmpty(enquiryReceiveMailSetting.getEmail(), "询盘接收邮箱不能为空");
         AssertUtil.notEmpty(enquiryReceiveMailSetting.getPhone(), "询盘手机号不能为空");
         AssertUtil.emailCheck(enquiryReceiveMailSetting.getEmail());
@@ -91,6 +96,7 @@ public class SellerEnquiryReceiverMailSettingController extends BaseController {
      */
     @PostMapping("edit")
     public JsonResult<Object> editEnquiryReceiverMail(HttpServletRequest request, EnquiryReceiveMailSetting enquiryReceiveMailSetting) {
+        AssertUtil.notEmpty(enquiryReceiveMailSetting.getChannel(), "询盘渠道不能为空");
         AssertUtil.notEmpty(enquiryReceiveMailSetting.getEmail(), "询盘接收邮箱不能为空");
         AssertUtil.notEmpty(enquiryReceiveMailSetting.getPhone(), "询盘接收手机号不能为空");
         AssertUtil.emailCheck(enquiryReceiveMailSetting.getEmail());

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

@@ -32,6 +32,7 @@ public interface MemberEnquiryReadMapper extends BaseReadMapper<MemberEnquiry, M
                                         @Param("isStoreAdmin") String isStoreAdmin,
                                         @Param("vendorId") Long vendorId,
                                         @Param("validStatus") Integer validStatus,
+                                        @Param("channel") String channel,
                                         @Param("startRow") Integer startRow,
                                         @Param("size") Integer size);
 
@@ -50,7 +51,8 @@ public interface MemberEnquiryReadMapper extends BaseReadMapper<MemberEnquiry, M
                                  @Param("storeId") Long storeId,
                                  @Param("isStoreAdmin") String isStoreAdmin,
                                  @Param("vendorId") Long vendorId,
-                                 @Param("validStatus") Integer validStatus);
+                                 @Param("validStatus") Integer validStatus,
+                                 @Param("channel") String channel);
 
 
     /**

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

@@ -40,12 +40,14 @@ public class EnquiryReceiverMailSettingModel {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         EnquiryReceiveMailSettingExample receiveMailSettingExample = new EnquiryReceiveMailSettingExample();
+        receiveMailSettingExample.setChannel(enquiryReceiveMailSetting.getChannel());
         receiveMailSettingExample.setEmail(enquiryReceiveMailSetting.getEmail());
         receiveMailSettingExample.setStoreId(enquiryReceiveMailSetting.getStoreId());
         List<EnquiryReceiveMailSetting> enquiryReceiveMailSettings = enquiryReceiveMailSettingReadMapper.listByExample(receiveMailSettingExample);
         AssertUtil.isTrue(!CollectionUtil.isEmpty(enquiryReceiveMailSettings), "该邮箱已添加，无需重复添加");
 
         EnquiryReceiveMailSettingExample receiveMailSettingPhoneExample = new EnquiryReceiveMailSettingExample();
+        receiveMailSettingPhoneExample.setChannel(enquiryReceiveMailSetting.getChannel());
         receiveMailSettingPhoneExample.setPhone(enquiryReceiveMailSetting.getPhone());
         receiveMailSettingPhoneExample.setStoreId(enquiryReceiveMailSetting.getStoreId());
         List<EnquiryReceiveMailSetting> enquiryReceivePhoneSettings = enquiryReceiveMailSettingReadMapper.listByExample(receiveMailSettingPhoneExample);
@@ -71,6 +73,7 @@ public class EnquiryReceiverMailSettingModel {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         EnquiryReceiveMailSettingExample receiveMailSettingMailExample = new EnquiryReceiveMailSettingExample();
+        receiveMailSettingMailExample.setChannel(enquiryReceiveMailSetting.getChannel());
         receiveMailSettingMailExample.setEmail(enquiryReceiveMailSetting.getEmail());
         receiveMailSettingMailExample.setStoreId(vendor.getStoreId());
         receiveMailSettingMailExample.setIdNotEqualTo(enquiryReceiveMailSetting.getId());
@@ -78,6 +81,7 @@ public class EnquiryReceiverMailSettingModel {
         AssertUtil.isTrue(!CollectionUtil.isEmpty(enquiryReceiveMailSettings), "该邮箱已添加，无需重复添加");
 
         EnquiryReceiveMailSettingExample receiveMailSettingPhoneExample = new EnquiryReceiveMailSettingExample();
+        receiveMailSettingPhoneExample.setChannel(enquiryReceiveMailSetting.getChannel());
         receiveMailSettingPhoneExample.setPhone(enquiryReceiveMailSetting.getPhone());
         receiveMailSettingPhoneExample.setStoreId(vendor.getStoreId());
         receiveMailSettingPhoneExample.setIdNotEqualTo(enquiryReceiveMailSetting.getId());

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

@@ -484,10 +484,10 @@ public class MemberEnquiryModel {
      * @param pager
      * @return
      */
-    public List<MemberEnquiry> getEnquiryListByPage(String name, String email, Long storeId, String isStoreAdmin, Long vendorId, Integer validStatus, PagerInfo pager) {
+    public List<MemberEnquiry> getEnquiryListByPage(String name, String email, Long storeId, String isStoreAdmin, Long vendorId, Integer validStatus,String channel, PagerInfo pager) {
         List<MemberEnquiry> enquiryList = null;
         if (pager != null) {
-            enquiryList = memberEnquiryReadMapper.enquiryListPage(name, email, storeId, isStoreAdmin, vendorId, validStatus, pager.getStart(), pager.getPageSize());
+            enquiryList = memberEnquiryReadMapper.enquiryListPage(name, email, storeId, isStoreAdmin, vendorId, validStatus,channel, pager.getStart(), pager.getPageSize());
         }
         return enquiryList;
     }
@@ -503,8 +503,8 @@ public class MemberEnquiryModel {
      * @param validStatus
      * @return
      */
-    public Integer enquiryListPageCount(String name, String email, Long storeId, String isStoreAdmin, Long vendorId, Integer validStatus) {
-        return memberEnquiryReadMapper.enquiryListPageCount(name, email, storeId, isStoreAdmin, vendorId, validStatus);
+    public Integer enquiryListPageCount(String name, String email, Long storeId, String isStoreAdmin, Long vendorId, Integer validStatus,String channel) {
+        return memberEnquiryReadMapper.enquiryListPageCount(name, email, storeId, isStoreAdmin, vendorId, validStatus,channel);
     }
 
     /**

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/business/OrderEnquiryReceiverMailVO.java

@@ -15,6 +15,8 @@ public class OrderEnquiryReceiverMailVO implements Serializable {
     private static final long serialVersionUID = -8426680439937326616L;
     private Long id;
 
+    private String channel;
+
     private Long storeId;
 
     private String email;
@@ -31,6 +33,7 @@ public class OrderEnquiryReceiverMailVO implements Serializable {
 
     public OrderEnquiryReceiverMailVO(EnquiryReceiveMailSetting receiveMailSetting) {
         id = receiveMailSetting.getId();
+        channel = receiveMailSetting.getChannel();
         storeId = receiveMailSetting.getStoreId();
         email = receiveMailSetting.getEmail();
         phone = receiveMailSetting.getPhone();

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/business/OrderEnquiryVO.java

@@ -23,6 +23,8 @@ public class OrderEnquiryVO implements Serializable {
     private static final long serialVersionUID = -8426680439937326616L;
     private Long id;
 
+    private String channel;
+
     private String name;
 
     private String email;
@@ -75,6 +77,7 @@ public class OrderEnquiryVO implements Serializable {
 
     public OrderEnquiryVO(MemberEnquiry memberEnquiry) {
         id = memberEnquiry.getId();
+        channel = memberEnquiry.getChannel();
         name = memberEnquiry.getName();
         email = memberEnquiry.getEmail();
         phoneCode = memberEnquiry.getPhoneCode();

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

@@ -211,6 +211,9 @@
         <if test="validStatus != null">
             AND t1.`valid_status` = #{validStatus}
         </if>
+        <if test="channel != null">
+            AND t1.`channel` = #{channel}
+        </if>
         order by t1.id desc
     </select>
 
@@ -232,6 +235,9 @@
         <if test="validStatus != null">
             AND t1.`valid_status` = #{validStatus}
         </if>
+        <if test="channel != null">
+            AND t1.`channel` = #{channel}
+        </if>
         order by t1.id desc
         <include refid="limit"/>
     </select>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/seller/EnquiryReceiveMailSettingReadMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.read.seller.EnquiryReceiveMailSettingReadMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.seller.pojo.EnquiryReceiveMailSetting">
     <id column="id" property="id" />
+    <result column="channel" property="channel" />
     <result column="store_id" property="storeId" />
     <result column="email" property="email" />
     <result column="phone" property="phone" />
@@ -18,6 +19,9 @@
   <sql id="whereCondition">
     <if test="example != null">
       <trim prefix="WHERE" prefixOverrides="AND|OR">
+        <if test="example.channel != null">
+          AND `channel` = #{example.channel}
+        </if>
         <if test="example.storeId != null">
           AND `store_id` = #{example.storeId}
         </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/write/seller/EnquiryReceiveMailSettingWriteMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.write.seller.EnquiryReceiveMailSettingWriteMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.seller.pojo.EnquiryReceiveMailSetting">
     <id column="id" property="id" />
+    <result column="channel" property="channel" />
     <result column="store_id" property="storeId" />
     <result column="email" property="email" />
     <result column="phone" property="phone" />
@@ -13,6 +14,9 @@
   <!--除主键外的所有字段，用于插入操作-->
   <sql id="columns">
     <trim suffixOverrides=",">
+      <if test="channel != null">
+        `channel`,
+      </if>
       <if test="storeId != null">
         `store_id`,
       </if>
@@ -41,7 +45,27 @@
   <sql id="whereCondition">
     <if test="example != null">
       <trim prefix="WHERE" prefixOverrides="AND|OR">
-
+        <if test="example.channel != null">
+          AND `channel` = #{example.channel}
+        </if>
+        <if test="example.storeId != null">
+          AND `store_id` = #{example.storeId}
+        </if>
+        <if test="example.emailLike != null">
+          AND `email` like concat('%',#{example.emailLike},'%')
+        </if>
+        <if test="example.email != null">
+          AND `email` = #{example.email}
+        </if>
+        <if test="example.phoneLike != null">
+          AND `phone` like concat('%',#{example.phoneLike},'%')
+        </if>
+        <if test="example.phone != null">
+          AND `phone` = #{example.phone}
+        </if>
+        <if test="example.idNotEqualTo != null">
+          AND `id` != #{example.idNotEqualTo}
+        </if>
       </trim>
     </if>
   </sql>
@@ -167,6 +191,9 @@
     )
     VALUES(
     <trim suffixOverrides=",">
+      <if test="channel != null">
+        #{channel},
+      </if>
       <if test="storeId != null">
         #{storeId},
       </if>
@@ -192,6 +219,9 @@
   <update id="updateByExampleSelective">
     UPDATE `enquiry_receive_mail_setting`
     <trim prefix="SET" suffixOverrides=",">
+      <if test="record.channel != null">
+        `channel` = #{record.channel},
+      </if>
       <if test="record.storeId != null">
         `store_id` = #{record.storeId},
       </if>
@@ -217,6 +247,9 @@
   <update id="updateByPrimaryKeySelective">
     UPDATE `enquiry_receive_mail_setting`
     <trim prefix="SET" suffixOverrides=",">
+      <if test="channel != null">
+        `channel` = #{channel},
+      </if>
       <if test="storeId != null">
         `store_id` = #{storeId},
       </if>

xinkeaboard-server/doc/DDL/update.sql

@@ -3,14 +3,14 @@ ADD COLUMN country VARCHAR(100) NULL COMMENT '国家',
 ADD COLUMN city VARCHAR(100) NULL COMMENT '城市',
 ADD COLUMN TINYINT NOT NULL DEFAULT 1 COMMENT '会员类型 1:海外门户 2:国内分销门户';
 
-ALTER TABLE goods
-ADD COLUMN distribution_channel TINYINT NOT NULL DEFAULT 1 COMMENT '发布渠道 1：国外站 2：国内站' AFTER goods_id;
+ALTER TABLE goods ADD COLUMN distribution_channel TINYINT NOT NULL DEFAULT 1 COMMENT '发布渠道 1：国外站 2：国内站' AFTER goods_id;
 
-ALTER TABLE product
-    ADD COLUMN distribution_channel TINYINT NOT NULL DEFAULT 1 COMMENT '发布渠道 1：国外站 2：国内站' AFTER product_id;
-
-ALTER TABLE enquiry ADD COLUMN channel TINYINT NOT NULL DEFAULT 1 COMMENT '询盘渠道 1:海外门户 2:国内分销门户';
+ALTER TABLE product ADD COLUMN distribution_channel TINYINT NOT NULL DEFAULT 1 COMMENT '发布渠道 1：国外站 2：国内站' AFTER product_id;
 
 ALTER TABLE goods_related_template ADD COLUMN distribution_channel TINYINT NOT NULL DEFAULT 1 COMMENT '渠道 1:海外门户 2:国内分销门户';
 
-ALTER TABLE goods_parameter_group ADD COLUMN distribution_channel TINYINT NOT NULL DEFAULT 1 COMMENT '渠道 1:海外门户 2:国内分销门户';
+ALTER TABLE goods_parameter_group ADD COLUMN distribution_channel TINYINT NOT NULL DEFAULT 1 COMMENT '渠道 1:海外门户 2:国内分销门户';
+
+ALTER TABLE enquiry ADD COLUMN channel TINYINT NOT NULL DEFAULT 1 COMMENT '渠道 1:海外门户 2:国内分销门户';
+
+ALTER TABLE  enquiry_receive_mail_setting ADD COLUMN channel TINYINT NOT NULL DEFAULT 1 COMMENT '渠道 1:海外门户 2:国内分销门户';