feat: 商品列表增加多端展示

xinkeaboard-server/b2b2c-core/src/main/resources/i18n_en.properties

@@ -410,6 +410,7 @@ labelIds格式错误,请重试=labelIds format error, please try again
 parametersIds格式错误,请重试=parametersIds format error, please try again
 自定义属性不能为空=Custom attributes can not be empty
 属性分组不能为空,请重试!=Attribute grouping can not be empty, please try again!
+分组发布渠道不能为空,请重试!=Group release channel can not be empty, please try again!
 分组名称不能为空,请重试!=Group name can not be empty, please try again!
 groupIds格式错误,请重试=groupIds format error, please try again
 属性分组不能为空=Attribute can not be null packet

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/goods/dto/GoodsParameterGroupAddDTO.java

@@ -9,6 +9,9 @@ import java.io.Serializable;
 public class GoodsParameterGroupAddDTO implements Serializable {
     private static final long serialVersionUID = -5204389277400759015L;
 
+    @ApiModelProperty("分组发布渠道")
+    private String distributionChannel;
+
     @ApiModelProperty(value = "分组名称",required = true)
     private String groupName;
 

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/goods/dto/GoodsParameterGroupUpdateDTO.java

@@ -11,6 +11,9 @@ public class GoodsParameterGroupUpdateDTO implements Serializable {
     @ApiModelProperty(value = "分组id", required = true)
     private Integer groupId;
 
+    @ApiModelProperty("分组发布渠道")
+    private String distributionChannel;
+
     @ApiModelProperty("分组名称")
     private String groupName;
 

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/goods/dto/GoodsRelatedTemplateAddDTO.java

@@ -13,7 +13,7 @@ public class GoodsRelatedTemplateAddDTO implements Serializable {
     private String templateName;
 
     @ApiModelProperty("模版渠道")
-    private String channel ;
+    private String distributionChannel;
 
     @ApiModelProperty("模版位置(1-顶部，2-底部）")
     private Integer templatePosition;

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/goods/dto/GoodsRelatedTemplateUpdateDTO.java

@@ -13,7 +13,7 @@ public class GoodsRelatedTemplateUpdateDTO implements Serializable {
     private Integer templateId;
 
     @ApiModelProperty("模版渠道")
-    private String channel;
+    private String distributionChannel;
 
     @ApiModelProperty("模版名称")
     private String templateName;

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/goods/example/GoodsParameterGroupExample.java

@@ -26,6 +26,11 @@ public class GoodsParameterGroupExample implements Serializable {
     private Integer groupId;
 
     /**
+     * 分组发布渠道
+     */
+    private String distributionChannel;
+
+    /**
      * 分组名称
      */
     private String groupName;

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/goods/example/GoodsRelatedTemplateExample.java

@@ -25,9 +25,9 @@ public class GoodsRelatedTemplateExample implements Serializable {
     private Integer templateId;
 
     /**
-     * 模版名称
+     * 模版渠道
      */
-    private String channel;
+    private String distributionChannel;
 
     /**
      * 模版名称

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/goods/pojo/GoodsParameterGroup.java

@@ -16,6 +16,9 @@ public class GoodsParameterGroup implements Serializable {
     @ApiModelProperty("分组id")
     private Integer groupId;
 
+    @ApiModelProperty("分组发布渠道")
+    private String distributionChannel;
+
     @ApiModelProperty("分组名称")
     private String groupName;
 

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/goods/pojo/GoodsRelatedTemplate.java

@@ -16,7 +16,7 @@ public class GoodsRelatedTemplate implements Serializable {
     private Integer templateId;
 
     @ApiModelProperty("模版渠道")
-    private String channel;
+    private String distributionChannel;
 
     @ApiModelProperty("模版名称")
     private String templateName;

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/goods/seller/GoodsParameterGroupController.java

@@ -26,10 +26,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -57,6 +54,7 @@ public class GoodsParameterGroupController extends BaseController {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
         //验证参数
         AssertUtil.notNull(goodsParameterGroupAddDTO, "属性分组不能为空,请重试!");
+        AssertUtil.notEmpty(goodsParameterGroupAddDTO.getDistributionChannel(), "分组发布渠道不能为空,请重试!");
         AssertUtil.notEmpty(goodsParameterGroupAddDTO.getGroupName(), "分组名称不能为空,请重试!");
         goodsParameterGroupModel.saveGoodsParameterGroup(goodsParameterGroupAddDTO, vendor);
         return SldResponse.success("添加成功", goodsParameterGroupAddDTO.getGroupName());
@@ -97,12 +95,13 @@ public class GoodsParameterGroupController extends BaseController {
 
     @ApiOperation("属性分组列表")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "distributionChannel", value = "分组发布渠道", paramType = "query"),
             @ApiImplicitParam(name = "groupName", value = "分组名称", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = "20", paramType = "query"),
             @ApiImplicitParam(name = "current", value = "当前页面位置", defaultValue = "1", paramType = "query")
     })
     @GetMapping("list")
-    public JsonResult<PageVO<GoodsParameterGroupVO>> getList(HttpServletRequest request, String groupName) {
+    public JsonResult<PageVO<GoodsParameterGroupVO>> getList(HttpServletRequest request, String groupName,@RequestParam (value = "distributionChannel", required = false, defaultValue = "1") String distributionChannel) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         //分页设置
@@ -110,6 +109,7 @@ public class GoodsParameterGroupController extends BaseController {
         //根据条件查询集合
         GoodsParameterGroupExample example = new GoodsParameterGroupExample();
         example.setStoreId(vendor.getStoreId());
+        example.setDistributionChannel(distributionChannel);
         example.setGroupNameLike(groupName);
         List<GoodsParameterGroup> list = goodsParameterGroupModel.getGoodsParameterGroupList(example, pager);
         List<GoodsParameterGroupVO> vos = new ArrayList<>();
@@ -124,17 +124,19 @@ public class GoodsParameterGroupController extends BaseController {
 
     @ApiOperation("可用属性分组列表")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "distributionChannel", value = "分组发布渠道", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = "20", paramType = "query"),
             @ApiImplicitParam(name = "current", value = "当前页面位置", defaultValue = "1", paramType = "query")
     })
     @GetMapping("canUseList")
-    public JsonResult<PageVO<GoodsParameterGroupVO>> canUseList(HttpServletRequest request) {
+    public JsonResult<PageVO<GoodsParameterGroupVO>> canUseList(HttpServletRequest request,@RequestParam (value = "distributionChannel", required = false, defaultValue = "1") String distributionChannel) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         //分页设置
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
         //根据条件查询集合
         GoodsParameterGroupExample example = new GoodsParameterGroupExample();
+        example.setDistributionChannel(distributionChannel);
         example.setStoreId(vendor.getStoreId());
         example.setIsShow(GoodsConst.IS_ATTRIBUTE_YES);
         example.setOrderBy("sort asc, create_time desc");

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/goods/seller/GoodsRelatedTemplateController.java

@@ -54,7 +54,7 @@ public class GoodsRelatedTemplateController extends BaseController {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
         //验证参数
         AssertUtil.isTrue(goodsRelatedTemplateAddDTO == null, "关联模板不能为空,请重试!");
-        AssertUtil.notEmpty(goodsRelatedTemplateAddDTO.getChannel(), "关联模板发布渠道不能为空,请重试!");
+        AssertUtil.notEmpty(goodsRelatedTemplateAddDTO.getDistributionChannel(), "关联模板发布渠道不能为空,请重试!");
         AssertUtil.notEmpty(goodsRelatedTemplateAddDTO.getTemplateName(), "关联模板名称不能为空,请重试!");
         AssertUtil.notNullOrZero(goodsRelatedTemplateAddDTO.getTemplatePosition(), "关联模板位置不能为空,请重试!");
         AssertUtil.notEmpty(goodsRelatedTemplateAddDTO.getTemplateContent(), "关联模板内容不能为空,请重试!");
@@ -117,13 +117,13 @@ public class GoodsRelatedTemplateController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "templateName", value = "版式名称", paramType = "query"),
             @ApiImplicitParam(name = "templatePosition", value = "版式位置", paramType = "query"),
-            @ApiImplicitParam(name = "channel", value = "发布渠道", paramType = "query"),
+            @ApiImplicitParam(name = "distributionChannel", value = "发布渠道", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = "20", paramType = "query"),
             @ApiImplicitParam(name = "current", value = "当前页面位置", defaultValue = "1", paramType = "query")
     })
     @GetMapping("list")
     public JsonResult<PageVO<GoodsRelatedTemplateVO>> getList(HttpServletRequest request,
-                                                              @RequestParam(value = "channel", required = false, defaultValue = "1") String channel,
+                                                              @RequestParam(value = "distributionChannel", required = false, defaultValue = "1") String distributionChannel,
                                                               @RequestParam(value = "templateName", required = false) String templateName,
                                                               @RequestParam(value = "templatePosition", required = false) Integer templatePosition) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
@@ -133,7 +133,7 @@ public class GoodsRelatedTemplateController extends BaseController {
         //根据条件查询集合
         GoodsRelatedTemplateExample example = new GoodsRelatedTemplateExample();
         example.setStoreId(vendor.getStoreId());
-        example.setChannel(channel);
+        example.setDistributionChannel(distributionChannel);
         example.setTemplateNameLike(templateName);
         if (templatePosition != null && (templatePosition == TEMPLATE_CONTENT_1 || templatePosition == TEMPLATE_CONTENT_2)) {
             example.setTemplatePosition(templatePosition);

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/goods/GoodsParameterGroupModel.java

@@ -56,6 +56,7 @@ public class GoodsParameterGroupModel {
         //查重
         GoodsParameterGroupExample example = new GoodsParameterGroupExample();
         example.setStoreId(vendor.getStoreId());
+        example.setDistributionChannel(goodsParameterGroupAddDTO.getDistributionChannel());
         example.setGroupName(goodsParameterGroupAddDTO.getGroupName());
         List<GoodsParameterGroup> list = goodsParameterGroupReadMapper.listByExample(example);
         if (!CollectionUtils.isEmpty(list)) {
@@ -150,6 +151,7 @@ public class GoodsParameterGroupModel {
             example.setStoreId(storeId);
             example.setGroupName(goodsParameterGroupUpdateDTO.getGroupName());
             example.setGroupIdNotEquals(goodsParameterGroupUpdateDTO.getGroupId());
+            example.setDistributionChannel(goodsParameterGroupUpdateDTO.getDistributionChannel());
             List<GoodsParameterGroup> list = goodsParameterGroupReadMapper.listByExample(example);
             if (!CollectionUtils.isEmpty(list)) {
                 throw new MallException("属性分组名称重复,请重新填写");

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/goods/GoodsRelatedTemplateModel.java

@@ -121,7 +121,7 @@ public class GoodsRelatedTemplateModel {
         GoodsRelatedTemplateExample example = new GoodsRelatedTemplateExample();
         example.setStoreId(storeId);
         example.setTemplateName(goodsRelatedTemplateUpdateDTO.getTemplateName());
-        example.setChannel(goodsRelatedTemplateUpdateDTO.getChannel());
+        example.setDistributionChannel(goodsRelatedTemplateUpdateDTO.getDistributionChannel());
         example.setTemplateIdNotEquals(goodsRelatedTemplateUpdateDTO.getTemplateId());
         List<GoodsRelatedTemplate> list = goodsRelatedTemplateReadMapper.listByExample(example);
         if (!CollectionUtils.isEmpty(list)) {

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/java/com/slodon/b2b2c/vo/goods/GoodsParameterGroupVO.java

@@ -10,6 +10,9 @@ public class GoodsParameterGroupVO {
     @ApiModelProperty("分组id")
     private Integer groupId;
 
+    @ApiModelProperty("分组发布渠道")
+    private String distributionChannel;
+
     @ApiModelProperty("分组名称")
     private String groupName;
 
@@ -21,6 +24,7 @@ public class GoodsParameterGroupVO {
 
     public GoodsParameterGroupVO(GoodsParameterGroup goodsParameterGroup) {
         this.groupId=goodsParameterGroup.getGroupId();
+        this.distributionChannel = goodsParameterGroup.getDistributionChannel();
         this.groupName = goodsParameterGroup.getGroupName();
         this.sort =goodsParameterGroup.getSort();
         this.isShow =goodsParameterGroup.getIsShow();

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/goods/GoodsRelatedTemplateVO.java

@@ -12,7 +12,7 @@ public class GoodsRelatedTemplateVO {
     private Integer templateId;
 
     @ApiModelProperty("模版渠道")
-    private String channel;
+    private String distributionChannel;
 
     @ApiModelProperty("模版名称")
     private String templateName;
@@ -25,7 +25,7 @@ public class GoodsRelatedTemplateVO {
 
     public GoodsRelatedTemplateVO(GoodsRelatedTemplate goodsRelatedTemplate) {
         this.templateId = goodsRelatedTemplate.getTemplateId();
-        this.channel = goodsRelatedTemplate.getChannel();
+        this.distributionChannel = goodsRelatedTemplate.getDistributionChannel();
         this.templateName =goodsRelatedTemplate.getTemplateName();
         this.templatePosition = goodsRelatedTemplate.getTemplatePosition();
         this.templateContent = goodsRelatedTemplate.getTemplateContent();

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/goods/GoodsParameterGroupReadMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.read.goods.GoodsParameterGroupReadMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.goods.pojo.GoodsParameterGroup">
     <id column="group_id" property="groupId" />
+    <result column="distribution_channel" property="distributionChannel" />
     <result column="group_name" property="groupName" />
     <result column="store_id" property="storeId" />
     <result column="create_vendor_id" property="createVendorId" />
@@ -24,6 +25,9 @@
         <if test="example.groupIdIn != null">
           AND `group_id` in (${example.groupIdIn})
         </if>
+        <if test="example.distributionChannel != null">
+          AND `distribution_channel` = #{example.distributionChannel}
+        </if>
         <if test="example.groupName != null">
           AND `group_name` = #{example.groupName}
         </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/goods/GoodsRelatedTemplateReadMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.read.goods.GoodsRelatedTemplateReadMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.goods.pojo.GoodsRelatedTemplate">
     <id column="template_id" property="templateId" />
-    <result column="channel" property="channel" />
+    <result column="distribution_channel" property="distributionChannel" />
     <result column="template_name" property="templateName" />
     <result column="template_position" property="templatePosition" />
     <result column="store_id" property="storeId" />
@@ -24,8 +24,8 @@
         <if test="example.templateIdIn != null">
           AND `template_id` in (${example.templateIdIn})
         </if>
-        <if test="example.channel != null">
-          AND `channel` = #{example.channel}
+        <if test="example.distributionChannel != null">
+          AND `distribution_channel` = #{example.distributionChannel}
         </if>
         <if test="example.templateName != null">
           AND `template_name` = #{example.templateName}

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/goods/GoodsParameterGroupWriteMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.write.goods.GoodsParameterGroupWriteMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.goods.pojo.GoodsParameterGroup">
     <id column="group_id" property="groupId" />
+    <result column="distribution_channel" property="distributionChannel" />
     <result column="group_name" property="groupName" />
     <result column="store_id" property="storeId" />
     <result column="create_vendor_id" property="createVendorId" />
@@ -13,6 +14,9 @@
   <!--除主键外的所有字段，用于插入操作-->
   <sql id="columns">
     <trim suffixOverrides=",">
+      <if test="distributionChannel != null">
+        `distribution_channel`,
+      </if>
       <if test="groupName != null">
         `group_name`,
       </if>
@@ -47,6 +51,9 @@
         <if test="example.groupIdIn != null">
           AND `group_id` in (${example.groupIdIn})
         </if>
+        <if test="example.distributionChannel != null">
+          AND `distribution_channel` = #{example.distributionChannel}
+        </if>
         <if test="example.groupName != null">
           AND `group_name` = #{example.groupName}
         </if>
@@ -196,6 +203,9 @@
     )
     VALUES(
     <trim suffixOverrides=",">
+      <if test="distributionChannel != null">
+        #{distributionChannel},
+      </if>
       <if test="groupName != null">
         #{groupName},
       </if>
@@ -221,6 +231,9 @@
   <update id="updateByExampleSelective">
     UPDATE `goods_parameter_group`
     <trim prefix="SET" suffixOverrides=",">
+      <if test="record.distributionChannel != null">
+        `distribution_channel` = #{record.distributionChannel},
+      </if>
       <if test="record.groupName != null">
         `group_name` = #{record.groupName},
       </if>
@@ -246,6 +259,9 @@
   <update id="updateByPrimaryKeySelective">
     UPDATE `goods_parameter_group`
     <trim prefix="SET" suffixOverrides=",">
+      <if test="distributionChannel != null">
+        `distribution_channel` = #{distributionChannel},
+      </if>
       <if test="groupName != null">
         `group_name` = #{groupName},
       </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/write/goods/GoodsRelatedTemplateWriteMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.write.goods.GoodsRelatedTemplateWriteMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.goods.pojo.GoodsRelatedTemplate">
     <id column="template_id" property="templateId" />
-    <result column="channel" property="channel" />
+    <result column="distribution_channel" property="distributionChannel" />
     <result column="template_name" property="templateName" />
     <result column="template_position" property="templatePosition" />
     <result column="store_id" property="storeId" />
@@ -13,8 +13,8 @@
   <!--除主键外的所有字段，用于插入操作-->
   <sql id="columns">
     <trim suffixOverrides=",">
-      <if test="channel != null">
-        `channel`,
+      <if test="distributionChannel != null">
+        `distribution_channel`,
       </if>
       <if test="templateName != null">
         `template_name`,
@@ -47,8 +47,8 @@
         <if test="example.templateIdIn != null">
           AND `template_id` in (${example.templateIdIn})
         </if>
-        <if test="example.channel != null">
-          AND `channel` = #{example.channel}
+        <if test="example.distributionChannel != null">
+          AND `distribution_channel` = #{example.distributionChannel}
         </if>
         <if test="example.templateName != null">
           AND `template_name` = #{example.templateName}
@@ -196,8 +196,8 @@
     )
     VALUES(
     <trim suffixOverrides=",">
-      <if test="channel != null">
-        #{channel},
+      <if test="distributionChannel != null">
+        #{distributionChannel},
       </if>
       <if test="templateName != null">
         #{templateName},
@@ -221,8 +221,8 @@
   <update id="updateByExampleSelective">
     UPDATE `goods_related_template`
     <trim prefix="SET" suffixOverrides=",">
-      <if test="record.channel != null">
-        `channel` = #{record.channel},
+      <if test="record.distributionChannel != null">
+        `distribution_channel` = #{record.distributionChannel},
       </if>
       <if test="record.templateName != null">
         `template_name` = #{record.templateName},
@@ -246,8 +246,8 @@
   <update id="updateByPrimaryKeySelective">
     UPDATE `goods_related_template`
     <trim prefix="SET" suffixOverrides=",">
-      <if test="channel != null">
-        `channel` = #{channel},
+      <if test="distributionChannel != null">
+        `distribution_channel` = #{distributionChannel},
       </if>
       <if test="templateName != null">
         `template_name` = #{templateName},

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/write/goods/ProductWriteMapper.xml

@@ -36,12 +36,12 @@
   <!--除主键外的所有字段，用于插入操作-->
   <sql id="columns">
     <trim suffixOverrides=",">
-      <if test="distributionChannel != null">
-        `distribution_channel`,
-      </if>
       <if test="productId != null">
         `product_id`,
       </if>
+      <if test="distributionChannel != null">
+        `distribution_channel`,
+      </if>
       <if test="goodsId != null">
         `goods_id`,
       </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

@@ -1,17 +1,16 @@
 ALTER TABLE member
 ADD COLUMN country VARCHAR(100) NULL COMMENT '国家',
 ADD COLUMN city VARCHAR(100) NULL COMMENT '城市',
-ADD COLUMN member_type CHAR(2) NOT NULL DEFAULT 1 COMMENT '会员类型 1:海外门户 2:国内分销门户';
+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 CHAR(2) 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 product
-    ADD COLUMN distribution_channel CHAR(2) 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 enquiry ADD COLUMN channel CHAR(2) NOT NULL DEFAULT 1 COMMENT '询盘渠道 1:海外门户 2:国内分销门户';
+ALTER TABLE enquiry ADD COLUMN channel TINYINT NOT NULL DEFAULT 1 COMMENT '渠道 1:海外门户 2:国内分销门户';
 
-
-ALTER TABLE goods_related_template ADD COLUMN channel CHAR(2) NOT NULL DEFAULT 1 COMMENT '渠道 1:海外门户 2:国内分销门户';
+ALTER TABLE  enquiry_receive_mail_setting ADD COLUMN channel TINYINT NOT NULL DEFAULT 1 COMMENT '渠道 1:海外门户 2:国内分销门户';