字段统一+店铺管理端---商户入驻经营信息区分站点

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

@@ -1496,8 +1496,8 @@ expressIds格式错误,请重试=expressIds format error, please try again
 修改商家管理员表失败，请重试=Edit business administrator table failed, please try again
 店铺名称已存在，请重新填写=Store name already exists, please re-fill
 管理员名称已存在，请重新填写=Administrator name already exists, please re-fill
-店铺账号已存在，请重新填写=
-该手机号已被其他账号绑定，请重新填写=
+店铺账号已存在，请重新填写=Store account already exists, please re-fill
+该手机号已被其他账号绑定，请重新填写=This mobile phone number has been bound to another account, please re-fill
 添加管理员表失败，请重试=Add Administrator table failed, please try again
 添加店铺资质表失败，请重试=Add shop qualification table failed, please try again
 店铺状态为关闭时才可以删除=Store status can be deleted when closed

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

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

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

@@ -12,7 +12,7 @@ public class GoodsParameterGroupUpdateDTO implements Serializable {
     private Integer groupId;
 
     @ApiModelProperty("分组发布渠道")
-    private String distributionChannel;
+    private String webSite;
 
     @ApiModelProperty("分组名称")
     private String groupName;

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

@@ -19,7 +19,7 @@ public class GoodsPublishFrontParamDTO implements Serializable {
     private Long goodsId;
 
     @ApiModelProperty(value = "发布渠道：1-海外站；2-国内站,默认1")
-    private String distributionChannel;
+    private String webSite;
 
     @ApiModelProperty(value = "是否是虚拟商品：1-实物商品；2-虚拟商品,默认1", required = true)
     private Integer isVirtualGoods = 1;
@@ -280,7 +280,7 @@ public class GoodsPublishFrontParamDTO implements Serializable {
         @ApiModelProperty(value = "商品编码")
         private String productCode;
         @ApiModelProperty(value ="发布渠道 1-海外站；2-国内站")
-        private String distributionChannel;
+        private String webSite;
         @ApiModelProperty(value = "条形码")
         private String barCode;
         @ApiModelProperty(value = "是否启用，1-启用；2-不启用")

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

@@ -27,7 +27,7 @@ public class GoodsPublishInsertDTO extends GoodsPublishFrontParamDTO {
     @ApiModelProperty(value ="主规格id")
     private Integer mainSpecId = 0;
     @ApiModelProperty(value ="发布渠道 1-海外站；2-国内站")
-    private String distributionChannel;
+    private String webSite;
 
     public GoodsPublishInsertDTO(GoodsPublishFrontParamDTO paramDTO) {
         //复制属性

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 distributionChannel;
+    private String webSite;
 
     @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 distributionChannel;
+    private String webSite;
 
     @ApiModelProperty("模版名称")
     private String templateName;

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

@@ -42,7 +42,7 @@ public class GoodsExample implements Serializable {
     /**
      * 发布渠道  1-海外站；2-国内站
      */
-    private String distributionChannel;
+    private String webSite;
 
     /**
      * 商品名称为3到50个字符(商品副标题)

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

@@ -28,7 +28,7 @@ public class GoodsParameterGroupExample implements Serializable {
     /**
      * 分组发布渠道
      */
-    private String distributionChannel;
+    private String webSite;
 
     /**
      * 分组名称

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

@@ -27,7 +27,7 @@ public class GoodsRelatedTemplateExample implements Serializable {
     /**
      * 模版渠道
      */
-    private String distributionChannel;
+    private String webSite;
 
     /**
      * 模版名称

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

@@ -35,7 +35,7 @@ public class ProductExample implements Serializable {
     /**
      * 发布渠道
      */
-    private String distributionChannel;
+    private String webSite;
 
     /**
      * 商品ID

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

@@ -20,7 +20,7 @@ public class Goods implements Serializable {
     private Long goodsId;
 
     @ApiModelProperty("发布渠道 1-海外站；2-国内站")
-    private String distributionChannel;
+    private String webSite;
 
     @ApiModelProperty("商品名称为3到50个字符(商品副标题)")
     private String goodsName;

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

@@ -17,7 +17,7 @@ public class GoodsParameterGroup implements Serializable {
     private Integer groupId;
 
     @ApiModelProperty("分组发布渠道")
-    private String distributionChannel;
+    private String webSite;
 
     @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 distributionChannel;
+    private String webSite;
 
     @ApiModelProperty("模版名称")
     private String templateName;

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

@@ -19,7 +19,7 @@ public class Product implements Serializable {
     private Long productId;
 
     @ApiModelProperty("货品渠道")
-    private String distributionChannel;
+    private String webSite;
 
     @ApiModelProperty("商品ID")
     private Long goodsId;

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/member/example/MemberEnquiryExample.java

@@ -67,7 +67,7 @@ public class MemberEnquiryExample implements Serializable {
     /**
      * 渠道  1-海外站；2-国内站
      */
-    private String channel;
+    private String webSite;
 
     /**
      * 店铺Id查询

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/member/example/MemberExample.java

@@ -287,4 +287,9 @@ public class MemberExample implements Serializable {
      * 会员类型
      */
     private String memberType;
+
+    /**
+     * 会员公司
+     */
+    private String memberCompany;
 }

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

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

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/seller/dto/StoreApplyDTO.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author lxk
@@ -64,8 +65,8 @@ public class StoreApplyDTO implements Serializable {
     @ApiModelProperty("申请id,重新编辑时使用")
     private Integer applyId;
 
-    @ApiModelProperty(value = "店铺名称",required = true)
-    private String storeName;
+//    @ApiModelProperty(value = "店铺名称",required = true)
+//    private String storeName;
 
     @ApiModelProperty(value = "开店时长",required = true)
     private Integer applyYear;
@@ -73,7 +74,11 @@ public class StoreApplyDTO implements Serializable {
     @ApiModelProperty(value = "店铺等级",required = true)
     private Integer storeGradeId;
 
-    @ApiModelProperty(value = "申请分类id字符串,例1级-2级-3级,1级-2级-3级",required = true)
-    private String goodsCategoryIds;
+    @ApiModelProperty(value = "站点经营信息",required = true)
+    private List<StoreSiteCategoryInfoDTO>  siteInfoList;
+
+//    @ApiModelProperty(value = "申请分类id字符串,例1级-2级-3级,1级-2级-3级",required = true)
+//    private String goodsCategoryIds;
+
 
 }

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/seller/dto/StoreSiteCategoryInfoDTO.java

@@ -0,0 +1,23 @@
+package com.slodon.b2b2c.seller.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+@Data
+public class StoreSiteCategoryInfoDTO implements Serializable {
+
+    @ApiModelProperty(value = "id")
+    private Long  id;
+
+    @ApiModelProperty(value = "店铺入驻站点")
+    private String  webSite;
+
+    @ApiModelProperty(value = "店铺名称",required = true)
+    private String storeName;
+
+    @ApiModelProperty(value = "申请分类id字符串,例1级-2级-3级,1级-2级-3级",required = true)
+    private String goodsCategoryIds;
+
+
+}

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

@@ -12,7 +12,7 @@ public class EnquiryReceiveMailSettingExample implements Serializable {
     /**
      * 渠道
      */
-    private String channel;
+    private String webSite;
 
     /**
      * 店铺id

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

@@ -26,6 +26,12 @@ public class StoreBindCategoryExample implements Serializable {
      */
     private Integer bindId;
 
+
+    /**
+     * 入驻站点
+     */
+    private String webSite;
+
     /**
      * 店铺id
      */

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

@@ -0,0 +1,47 @@
+package com.slodon.b2b2c.seller.example;
+
+import com.slodon.b2b2c.core.response.PagerInfo;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class StoreNameExample implements Serializable {
+    private static final long serialVersionUID = 9095659065758029675L;
+
+    /**
+     * 用于编辑时的重复判断
+     */
+    private Long idNotEquals;
+
+
+    private Long storeId;
+
+    /**
+     * 店铺名称
+     */
+    private String storeName;
+
+
+    /**
+     * 站点
+     */
+    private String webSite;
+
+    /**
+     * 分页信息
+     */
+    private PagerInfo pager;
+
+    /**
+     * 排序条件，条件之间用逗号隔开，如果不传则按照bindId倒序排列
+     */
+    private String orderBy;
+
+    /**
+     * 分组条件
+     */
+    private String groupBy;
+
+
+}

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

@@ -11,7 +11,7 @@ public class EnquiryReceiveMailSetting implements Serializable {
 
     private Long id;
 
-    private String channel;
+    private String webSite;
 
     private Long storeId;
 

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

@@ -20,6 +20,9 @@ public class StoreBindCategory implements Serializable {
     @ApiModelProperty("店铺id")
     private Long storeId;
 
+    @ApiModelProperty("店铺入驻站点")
+    private String webSite;
+
     @ApiModelProperty("申请人")
     private Long createVendorId;
 

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

@@ -0,0 +1,40 @@
+package com.slodon.b2b2c.seller.pojo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 商家其余站点名称表
+ */
+@Data
+public class StoreName implements Serializable {
+    private static final long serialVersionUID = 7492642995071695931L;
+    @ApiModelProperty("id")
+    private Integer id;
+
+    @ApiModelProperty("店铺id")
+    private Long storeId;
+
+    @ApiModelProperty("店铺名称")
+    private String storeName;
+
+    @ApiModelProperty("站点")
+    private String webSite;
+
+    @ApiModelProperty("创建人")
+    private Long createId;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private Long updateId;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+
+}

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/system/example/TplPcMallDataExample.java

@@ -45,7 +45,7 @@ public class TplPcMallDataExample implements Serializable {
     /**
      * 模板数据站点
      */
-    private String  site;
+    private String  webSite;
 
     /**
      * 模板类型

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/system/pojo/TplPcMallData.java

@@ -16,7 +16,7 @@ public class TplPcMallData implements Serializable {
     private Integer dataId;
 
     @ApiModelProperty("装修模板输数据站点")
-    private String  site;
+    private String  webSite;
 
     @ApiModelProperty("装修模板id")
     private Integer tplPcId;

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

@@ -54,7 +54,7 @@ public class GoodsParameterGroupController extends BaseController {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
         //验证参数
         AssertUtil.notNull(goodsParameterGroupAddDTO, "属性分组不能为空,请重试!");
-        AssertUtil.notEmpty(goodsParameterGroupAddDTO.getDistributionChannel(), "分组发布渠道不能为空,请重试!");
+        AssertUtil.notEmpty(goodsParameterGroupAddDTO.getWebSite(), "分组发布渠道不能为空,请重试!");
         AssertUtil.notEmpty(goodsParameterGroupAddDTO.getGroupName(), "分组名称不能为空,请重试!");
         goodsParameterGroupModel.saveGoodsParameterGroup(goodsParameterGroupAddDTO, vendor);
         return SldResponse.success("添加成功", goodsParameterGroupAddDTO.getGroupName());
@@ -95,13 +95,13 @@ public class GoodsParameterGroupController extends BaseController {
 
     @ApiOperation("属性分组列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "distributionChannel", value = "分组发布渠道", paramType = "query"),
+            @ApiImplicitParam(name = "webSite", 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,@RequestParam (value = "distributionChannel", required = false, defaultValue = "1") String distributionChannel) {
+    public JsonResult<PageVO<GoodsParameterGroupVO>> getList(HttpServletRequest request, String groupName,@RequestParam (value = "webSite", required = false, defaultValue = "1") String webSite) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         //分页设置
@@ -109,7 +109,7 @@ public class GoodsParameterGroupController extends BaseController {
         //根据条件查询集合
         GoodsParameterGroupExample example = new GoodsParameterGroupExample();
         example.setStoreId(vendor.getStoreId());
-        example.setDistributionChannel(distributionChannel);
+        example.setWebSite(webSite);
         example.setGroupNameLike(groupName);
         List<GoodsParameterGroup> list = goodsParameterGroupModel.getGoodsParameterGroupList(example, pager);
         List<GoodsParameterGroupVO> vos = new ArrayList<>();
@@ -124,19 +124,19 @@ public class GoodsParameterGroupController extends BaseController {
 
     @ApiOperation("可用属性分组列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "distributionChannel", value = "分组发布渠道", paramType = "query"),
+            @ApiImplicitParam(name = "webSite", 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,@RequestParam (value = "distributionChannel", required = false, defaultValue = "1") String distributionChannel) {
+    public JsonResult<PageVO<GoodsParameterGroupVO>> canUseList(HttpServletRequest request,@RequestParam (value = "webSite", required = false, defaultValue = "1") String webSite) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         //分页设置
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
         //根据条件查询集合
         GoodsParameterGroupExample example = new GoodsParameterGroupExample();
-        example.setDistributionChannel(distributionChannel);
+        example.setWebSite(webSite);
         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.getDistributionChannel(), "关联模板发布渠道不能为空,请重试!");
+        AssertUtil.notEmpty(goodsRelatedTemplateAddDTO.getWebSite(), "关联模板发布渠道不能为空,请重试!");
         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 = "distributionChannel", value = "发布渠道", paramType = "query"),
+            @ApiImplicitParam(name = "webSite", 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 = "distributionChannel", required = false, defaultValue = "1") String distributionChannel,
+                                                              @RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite,
                                                               @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.setDistributionChannel(distributionChannel);
+        example.setWebSite(webSite);
         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/goods/seller/GoodsSellerController.java

@@ -100,20 +100,20 @@ public class GoodsSellerController extends BaseController {
             @ApiImplicitParam(name = "isVirtualGoods", value = "是否是虚拟商品：1-实物商品；2-虚拟商品", paramType = "query"),
             @ApiImplicitParam(name = "goodsCode", value = "商品货号", paramType = "query"),
             @ApiImplicitParam(name = "barCode", value = "商品条形码", paramType = "query"),
-            @ApiImplicitParam(name = "distributionChannel", value = "发布渠道", paramType = "query"),
+            @ApiImplicitParam(name = "webSite", value = "发布渠道", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = "20", paramType = "query"),
             @ApiImplicitParam(name = "current", value = "当前页面位置", defaultValue = "1", paramType = "query")
     })
     @GetMapping("list")
     public JsonResult<PageVO<GoodsVO>> getList(HttpServletRequest request, String goodsName, Integer StoreCategoryId,
                                                Date startTime, Date endTime, Integer state, Integer auditState,
-                                               Integer isVirtualGoods, String goodsCode, String barCode,@RequestParam(value = "distributionChannel", required = false, defaultValue = "1") String distributionChannel) {
+                                               Integer isVirtualGoods, String goodsCode, String barCode,@RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
         GoodsExample example = new GoodsExample();
         example.setStoreId(vendor.getStoreId());
         example.setGoodsNameLike(goodsName);
-        example.setDistributionChannel(distributionChannel);
+        example.setWebSite(webSite);
         if (!StringUtil.isNullOrZero(StoreCategoryId)) {
             StoreInnerLabel storeInnerLabel = storeInnerLabelModel.getStoreInnerLabelByInnerLabelId(StoreCategoryId);
             AssertUtil.notNull(storeInnerLabel, "店铺内部分类不存在");
@@ -428,7 +428,7 @@ public class GoodsSellerController extends BaseController {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         //校验是否可以发布商品
-        if (!checkIsCanPublish(vendor.getStoreId(), paramDTO.getDistributionChannel())) {
+        if (!checkIsCanPublish(vendor.getStoreId(), paramDTO.getWebSite())) {
             return SldResponse.fail("发布商品数量不允许超过店铺等级限制的数量");
         }
 
@@ -531,7 +531,7 @@ public class GoodsSellerController extends BaseController {
 
     @ApiOperation("判断入驻店铺发布商品数是否超过等级限制的发布数")
     @GetMapping("enablePublish")
-    public JsonResult<Integer> enablePublish(HttpServletRequest request,String distributionChannel) {
+    public JsonResult<Integer> enablePublish(HttpServletRequest request,String webSite) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         if ("1".equals(stringRedisTemplate.opsForValue().get("zjpay_is_enable"))) {
@@ -551,7 +551,7 @@ public class GoodsSellerController extends BaseController {
                 }
             }
         }
-        if (checkIsCanPublish(vendor.getStoreId(),distributionChannel)) {
+        if (checkIsCanPublish(vendor.getStoreId(),webSite)) {
             return SldResponse.success();
         } else {
             return SldResponse.fail("发布商品数量不允许超过店铺等级限制的数量");
@@ -564,7 +564,7 @@ public class GoodsSellerController extends BaseController {
      * @param storeId 店铺id
      * @return 是否可发布商品
      */
-    public boolean checkIsCanPublish(Long storeId,String distributionChannel) {
+    public boolean checkIsCanPublish(Long storeId,String webSite) {
         boolean isCanPublish = true;
         //获取店铺信息
         Store storeDb = storeModel.getStoreByStoreId(storeId);
@@ -577,7 +577,7 @@ public class GoodsSellerController extends BaseController {
             GoodsExample example = new GoodsExample();
             example.setStoreId(storeId);
             example.setStateNotEquals(GoodsConst.GOODS_STATE_DELETE);
-            example.setDistributionChannel(distributionChannel);
+            example.setWebSite(webSite);
             List<Goods> goodsList = goodsModel.getGoodsList(example, null);
             if (goodsList.size() >= storeGradeDb.getGoodsLimit()) {
                 isCanPublish = false;

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

@@ -66,16 +66,16 @@ public class SellerEnquiryController extends BaseController {
      * @param name
      * @param email
      * @param validStatus
-     * @param channel
+     * @param webSite
      * @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 = "channel", required = false,defaultValue = "1") String channel) {
+    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) {
         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,channel, pager);
-        pager.setRowsCount(memberEnquiryModel.enquiryListPageCount(name, email, vendor.getStoreId(), vendor.getIsStoreAdmin(), vendor.getVendorId(), validStatus,channel));
+        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));
         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

@@ -41,14 +41,14 @@ public class SellerEnquiryReceiverMailSettingController extends BaseController {
      * @param request
      * @param email
      * @param phone
-     * @param channel
+     * @param webSite
      * @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 = "channel", required = false) String channel) {
+                                                                  @RequestParam(value = "webSite", required = false) String webSite) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
 
@@ -56,7 +56,7 @@ public class SellerEnquiryReceiverMailSettingController extends BaseController {
         example.setStoreId(vendor.getStoreId());
         example.setEmailLike(email);
         example.setPhoneLike(phone);
-        example.setChannel(channel);
+        example.setWebSite(webSite);
 
         List<EnquiryReceiveMailSetting> list = enquiryReceiverMailSettingModel.getEnquiryReceiveMailSettings(example, pager);
         ArrayList<OrderEnquiryReceiverMailVO> vos = new ArrayList<>();
@@ -78,7 +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.getWebSite(), "询盘渠道不能为空");
         AssertUtil.notEmpty(enquiryReceiveMailSetting.getEmail(), "询盘接收邮箱不能为空");
         AssertUtil.notEmpty(enquiryReceiveMailSetting.getPhone(), "询盘手机号不能为空");
         AssertUtil.emailCheck(enquiryReceiveMailSetting.getEmail());
@@ -96,7 +96,7 @@ public class SellerEnquiryReceiverMailSettingController extends BaseController {
      */
     @PostMapping("edit")
     public JsonResult<Object> editEnquiryReceiverMail(HttpServletRequest request, EnquiryReceiveMailSetting enquiryReceiveMailSetting) {
-        AssertUtil.notEmpty(enquiryReceiveMailSetting.getChannel(), "询盘渠道不能为空");
+        AssertUtil.notEmpty(enquiryReceiveMailSetting.getWebSite(), "询盘渠道不能为空");
         AssertUtil.notEmpty(enquiryReceiveMailSetting.getEmail(), "询盘接收邮箱不能为空");
         AssertUtil.notEmpty(enquiryReceiveMailSetting.getPhone(), "询盘接收手机号不能为空");
         AssertUtil.emailCheck(enquiryReceiveMailSetting.getEmail());

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

@@ -12,10 +12,7 @@ import com.slodon.b2b2c.goods.pojo.GoodsCategory;
 import com.slodon.b2b2c.model.goods.GoodsCategoryModel;
 import com.slodon.b2b2c.model.seller.*;
 import com.slodon.b2b2c.seller.dto.StoreApplyDTO;
-import com.slodon.b2b2c.seller.example.StoreApplyExample;
-import com.slodon.b2b2c.seller.example.StoreBindCategoryExample;
-import com.slodon.b2b2c.seller.example.StoreCertificateExample;
-import com.slodon.b2b2c.seller.example.VendorExample;
+import com.slodon.b2b2c.seller.example.*;
 import com.slodon.b2b2c.seller.pojo.*;
 import com.slodon.b2b2c.starter.redisson.SlodonLock;
 import com.slodon.b2b2c.vo.seller.ProcessVO;
@@ -48,6 +45,8 @@ public class SellerApplyController extends BaseController {
     @Resource
     private StoreApplyModel storeApplyModel;
     @Resource
+    private StoreNameModel storeNameModel;
+    @Resource
     private StoreCertificateModel storeCertificateModel;
     @Resource
     private StoreGradeModel storeGradeModel;
@@ -64,7 +63,7 @@ public class SellerApplyController extends BaseController {
     @VendorLogger(option = "保存入驻信息")
     @PostMapping("saveApply")
     public JsonResult<Object> saveApply(HttpServletRequest request, StoreApplyDTO storeApplyDTO) throws Exception {
-        String logMsg = "店铺名称" + storeApplyDTO.getStoreName();
+        String logMsg = "店铺名称" + storeApplyDTO.getSiteInfoList().get(0).getStoreName();
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         //对商户加锁，防止同一商户在重复申请商家
@@ -80,8 +79,8 @@ public class SellerApplyController extends BaseController {
             vendorMobileExample.setIsAllowLoginNotEquals(VendorConst.LOGOUT_ALLOW_LOGIN);
             vendorMobileExample.setVendorIdNotEquals(vendor.getVendorId());
             List<Vendor> vendorList = vendorModel.getVendorList(vendorMobileExample, null);
-            // todo 测试期间 手机号验证暂时放开
-//            AssertUtil.isTrue(!CollectionUtils.isEmpty(vendorList), "该手机号已被其他账号绑定，请重新填写");
+
+            AssertUtil.isTrue(!CollectionUtils.isEmpty(vendorList), "该手机号已被其他账号绑定，请重新填写");
 
             //先根据vendorId查询数据库中的申请，判断是否是第一次申请
             StoreApplyExample example = new StoreApplyExample();
@@ -186,6 +185,11 @@ public class SellerApplyController extends BaseController {
         List<StoreCertificate> storeCertificateList = storeCertificateModel.getStoreCertificateList(storeCertificateExample, null);
         StoreApplyDetailVO vo = new StoreApplyDetailVO(storeApply, storeCertificateList.get(0));
 
+        StoreNameExample storeNameExample = new StoreNameExample();
+        storeNameExample.setStoreId(storeApply.getStoreId());
+        List<StoreName> storeNameList = storeNameModel.getStoreNameList(storeNameExample, null);
+        vo.setStoreNameList(storeNameList);
+
         //根据等级id获取等级名称
         StoreGrade storeGrade = storeGradeModel.getStoreGradeByGradeId(storeApply.getStoreGradeId());
         if (storeGrade != null) {

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/statistics/seller/SellerOverviewController.java

@@ -170,13 +170,13 @@ public class SellerOverviewController extends BaseController {
             @ApiImplicitParam(name = "source", value = "站点来源 1:海外站 2:国内站")
     })
     @GetMapping("source/presentData")
-    public JsonResult<SellerSourcePresentIndexVO> indexSourcePresentData(HttpServletRequest request, @RequestParam(required = false, defaultValue = "1") String source) {
+    public JsonResult<SellerSourcePresentIndexVO> indexSourcePresentData(HttpServletRequest request, @RequestParam(required = false, defaultValue = "1") String webSite) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
         SellerSourcePresentIndexVO result = new SellerSourcePresentIndexVO();
         //违规商品数
         GoodsExample goodsExample = new GoodsExample();
         goodsExample.setStoreId(vendor.getStoreId());
-        goodsExample.setDistributionChannel(source);
+        goodsExample.setWebSite(webSite);
         goodsExample.setState(GoodsConst.GOODS_STATE_LOWER_BY_SYSTEM);
         goodsExample.setIsDelete(GoodsConst.GOODS_IS_DELETE_NO);
         result.setSysLowerGoodsNum(goodsModel.getGoodsCount(goodsExample));
@@ -190,7 +190,7 @@ public class SellerOverviewController extends BaseController {
         //待分配询盘数
         MemberEnquiryExample memberEnquiryToAssignExample = new MemberEnquiryExample();
         memberEnquiryToAssignExample.setStoreId(vendor.getStoreId());
-        memberEnquiryToAssignExample.setChannel(source);
+        memberEnquiryToAssignExample.setWebSite(webSite);
         memberEnquiryToAssignExample.setStatusEqual(EnquiryConst.ENQUIRY_NEW);
         memberEnquiryToAssignExample.setItemTypeIn(itemTypeStr);
         result.setEnquiryToBeAssignNum(memberEnquiryModel.getMemberEnquiryCount(memberEnquiryToAssignExample));

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/system/seller/SellerTplPcController.java

@@ -79,7 +79,7 @@ public class SellerTplPcController extends BaseController {
     @ApiOperation("实例化模板列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "tplId", value = "模板id", paramType = "query"),
-            @ApiImplicitParam(name = "site", value = "模板站点", paramType = "query"),
+            @ApiImplicitParam(name = "webwebSite", value = "模板站点", paramType = "query"),
             @ApiImplicitParam(name = "tplType", value = "模板类型,banner_except==除了主轮播之外的模板类型", paramType = "query"),
             @ApiImplicitParam(name = "name", value = "实例化模板名称", paramType = "query"),
             @ApiImplicitParam(name = "isEnable", value = "是否启用，0==不启用；1==启用", paramType = "query"),
@@ -88,14 +88,14 @@ public class SellerTplPcController extends BaseController {
             @ApiImplicitParam(name = "current", value = "当前页面位置", defaultValue = "1", paramType = "query")
     })
     @GetMapping("data/list")
-    public JsonResult<PageVO<TplPcMallDataVO>> getTplData(HttpServletRequest request, Integer tplId, String site, String tplType,
+    public JsonResult<PageVO<TplPcMallDataVO>> getTplData(HttpServletRequest request, Integer tplId, String webwebSite, String tplType,
                                                           String name, Integer isEnable, String tplName) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
         TplPcMallDataExample example = new TplPcMallDataExample();
         example.setStoreId(vendor.getStoreId());
         example.setTplPcId(tplId);
-        example.setSite(site);
+        example.setWebSite(webwebSite);
         if (!StringUtil.isEmpty(tplType)) {
             if ("banner_except".equals(tplType)) {
                 example.setTplPcTypeNotEquals("notNull");
@@ -119,7 +119,7 @@ public class SellerTplPcController extends BaseController {
     @ApiOperation("添加实例化模板数据")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "tplPcId", value = "装修模板id", required = true),
-            @ApiImplicitParam(name = "site", value = "模板站点", paramType = "query"),
+            @ApiImplicitParam(name = "webSite", value = "模板站点", paramType = "query"),
             @ApiImplicitParam(name = "name", value = "实例化模板名称"),
             @ApiImplicitParam(name = "html", value = "实例化装修模板(html片段)"),
             @ApiImplicitParam(name = "json", value = "装修模板数据(json)"),
@@ -128,13 +128,13 @@ public class SellerTplPcController extends BaseController {
     })
     @VendorLogger(option = "添加实例化模板数据")
     @PostMapping("data/add")
-    public JsonResult<Integer> addTplData(HttpServletRequest request, Integer tplPcId,String site, String name, String html, String json,
+    public JsonResult<Integer> addTplData(HttpServletRequest request, Integer tplPcId,String webSite, String name, String html, String json,
                                  Integer sort, Integer isEnable) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         TplPcMallData tplPcMallData = new TplPcMallData();
         tplPcMallData.setTplPcId(tplPcId);
-        tplPcMallData.setSite(site);
+        tplPcMallData.setWebSite(webSite);
         tplPcMallData.setName(name);
         tplPcMallData.setHtml(html);
         tplPcMallData.setJson(json);

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

@@ -32,7 +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("webSite") String webSite,
                                         @Param("startRow") Integer startRow,
                                         @Param("size") Integer size);
 
@@ -52,7 +52,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("webSite") String webSite);
 
 
     /**

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/dao/read/seller/StoreNameReadMapper.java

@@ -0,0 +1,11 @@
+package com.slodon.b2b2c.dao.read.seller;
+
+import com.slodon.b2b2c.core.database.BaseReadMapper;
+import com.slodon.b2b2c.seller.example.StoreNameExample;
+import com.slodon.b2b2c.seller.pojo.StoreName;
+
+
+
+public interface StoreNameReadMapper extends BaseReadMapper<StoreName, StoreNameExample> {
+
+}

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/dao/write/seller/StoreNameWriteMapper.java

@@ -0,0 +1,8 @@
+package com.slodon.b2b2c.dao.write.seller;
+
+import com.slodon.b2b2c.core.database.BaseWriteMapper;
+import com.slodon.b2b2c.seller.example.StoreNameExample;
+import com.slodon.b2b2c.seller.pojo.StoreName;
+
+public interface StoreNameWriteMapper extends BaseWriteMapper<StoreName, StoreNameExample> {
+}

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/enums/WebSiteConstant.java

@@ -0,0 +1,17 @@
+package com.slodon.b2b2c.enums;
+
+/**
+ * 会员类型常量
+ */
+public class WebSiteConstant {
+    /**
+     * 海外门户
+     */
+    public static final String MEMBER_OVERSEA = "1";
+
+    /**
+     * 国内分销门户
+     */
+    public static final String MEMBER_DISTRIBUTOR = "2";
+
+}

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

@@ -56,7 +56,7 @@ public class GoodsParameterGroupModel {
         //查重
         GoodsParameterGroupExample example = new GoodsParameterGroupExample();
         example.setStoreId(vendor.getStoreId());
-        example.setDistributionChannel(goodsParameterGroupAddDTO.getDistributionChannel());
+        example.setWebSite(goodsParameterGroupAddDTO.getWebSite());
         example.setGroupName(goodsParameterGroupAddDTO.getGroupName());
         List<GoodsParameterGroup> list = goodsParameterGroupReadMapper.listByExample(example);
         if (!CollectionUtils.isEmpty(list)) {
@@ -151,7 +151,7 @@ public class GoodsParameterGroupModel {
             example.setStoreId(storeId);
             example.setGroupName(goodsParameterGroupUpdateDTO.getGroupName());
             example.setGroupIdNotEquals(goodsParameterGroupUpdateDTO.getGroupId());
-            example.setDistributionChannel(goodsParameterGroupUpdateDTO.getDistributionChannel());
+            example.setWebSite(goodsParameterGroupUpdateDTO.getWebSite());
             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.setDistributionChannel(goodsRelatedTemplateUpdateDTO.getDistributionChannel());
+        example.setWebSite(goodsRelatedTemplateUpdateDTO.getWebSite());
         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/goods/GoodsSellerModel.java

@@ -126,7 +126,7 @@ public class GoodsSellerModel {
     public void saveGoods(Vendor vendor, GoodsPublishInsertDTO insertDTO) {
         List<GoodsPublishFrontParamDTO.ProductInfo> productList = insertDTO.getProductList();//货品列表
         //-校验sku是否重复
-        this.checkSku(productList,insertDTO.getDistributionChannel());
+        this.checkSku(productList,insertDTO.getWebSite());
 
         //-保存商品信息
         Goods goods = this.insertGoods(vendor, insertDTO);
@@ -164,7 +164,7 @@ public class GoodsSellerModel {
      *
      * @param productList
      */
-    private void checkSku(List<GoodsPublishFrontParamDTO.ProductInfo> productList,String distributionChannel) {
+    private void checkSku(List<GoodsPublishFrontParamDTO.ProductInfo> productList,String webSite) {
         Set<String> set = new HashSet<>();//用于校验自身sku是否重复
         productList.forEach(productInfo -> {
             if (!StringUtils.isEmpty(productInfo.getProductCode())) {
@@ -172,7 +172,7 @@ public class GoodsSellerModel {
                 ProductExample example = new ProductExample();
                 example.setProductCode(productInfo.getProductCode());
                 example.setProductIdNotEquals(((GoodsPublishInsertDTO.ProductInsertInfo) productInfo).getProductId());
-                example.setDistributionChannel(distributionChannel);
+                example.setWebSite(webSite);
                 int count = productModel.countByExample(example);
                 AssertUtil.isTrue(count > 0, "商品货号[" + productInfo.getProductCode() + "]已存在，请重新输入");
             }
@@ -198,7 +198,7 @@ public class GoodsSellerModel {
         GoodsCategory goodsCategory1 = goodsCategoryModel.getGoodsCategoryByCategoryId(goodsCategory2.getPid());
 
         Goods goods = new Goods();
-        goods.setDistributionChannel(insertDTO.getDistributionChannel());
+        goods.setWebSite(insertDTO.getWebSite());
         goods.setGoodsId(goodsId);
         goods.setGoodsName(insertDTO.getGoodsName());
         goods.setGoodsBrief(insertDTO.getGoodsBrief());
@@ -218,7 +218,7 @@ public class GoodsSellerModel {
                 goodsRecommendExample.setStoreId(vendor.getStoreId());
                 goodsRecommendExample.setStateNotEquals(GoodsConst.GOODS_STATE_DELETE);
                 goodsRecommendExample.setStoreIsRecommend(GoodsConst.IS_RECOMMEND_YES);
-                goodsRecommendExample.setDistributionChannel(insertDTO.getDistributionChannel());
+                goodsRecommendExample.setWebSite(insertDTO.getWebSite());
                 List<Goods> goodsRecommends = goodsModel.getGoodsList(goodsRecommendExample, null);
                 //获取该店铺推荐限制数
                 StoreGrade storeGradeDb = storeGradeReadMapper.getByPrimaryKey(storeDb.getStoreGradeId());
@@ -348,7 +348,7 @@ public class GoodsSellerModel {
             product.setProductId(GoodsIdGenerator.productIdGenerator());
         }
         product.setGoodsId(goods.getGoodsId());
-        product.setDistributionChannel(goods.getDistributionChannel());
+        product.setWebSite(goods.getWebSite());
         product.setGoodsName(goods.getGoodsName());
         product.setSpecValues(productInsertInfo.getSpecValues());
         product.setSpecValueIds(productInsertInfo.getSpecValueIds());
@@ -591,7 +591,7 @@ public class GoodsSellerModel {
         this.compareSpecWithDb(goodsDb.getGoodsId(), productList, addProductList, updateProductList, deleteProductList);
 
         //-校验sku是否重复
-        this.checkSku(productList, goodsDb.getDistributionChannel());
+        this.checkSku(productList, goodsDb.getWebSite());
 
         //-更新商品信息
         Goods updateGoods = this.updateGoods(insertDTO, vendor);

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

@@ -40,14 +40,14 @@ public class EnquiryReceiverMailSettingModel {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         EnquiryReceiveMailSettingExample receiveMailSettingExample = new EnquiryReceiveMailSettingExample();
-        receiveMailSettingExample.setChannel(enquiryReceiveMailSetting.getChannel());
+        receiveMailSettingExample.setWebSite(enquiryReceiveMailSetting.getWebSite());
         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.setWebSite(enquiryReceiveMailSetting.getWebSite());
         receiveMailSettingPhoneExample.setPhone(enquiryReceiveMailSetting.getPhone());
         receiveMailSettingPhoneExample.setStoreId(enquiryReceiveMailSetting.getStoreId());
         List<EnquiryReceiveMailSetting> enquiryReceivePhoneSettings = enquiryReceiveMailSettingReadMapper.listByExample(receiveMailSettingPhoneExample);
@@ -73,7 +73,7 @@ public class EnquiryReceiverMailSettingModel {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         EnquiryReceiveMailSettingExample receiveMailSettingMailExample = new EnquiryReceiveMailSettingExample();
-        receiveMailSettingMailExample.setChannel(enquiryReceiveMailSetting.getChannel());
+        receiveMailSettingMailExample.setWebSite(enquiryReceiveMailSetting.getWebSite());
         receiveMailSettingMailExample.setEmail(enquiryReceiveMailSetting.getEmail());
         receiveMailSettingMailExample.setStoreId(vendor.getStoreId());
         receiveMailSettingMailExample.setIdNotEqualTo(enquiryReceiveMailSetting.getId());
@@ -81,7 +81,7 @@ public class EnquiryReceiverMailSettingModel {
         AssertUtil.isTrue(!CollectionUtil.isEmpty(enquiryReceiveMailSettings), "该邮箱已添加，无需重复添加");
 
         EnquiryReceiveMailSettingExample receiveMailSettingPhoneExample = new EnquiryReceiveMailSettingExample();
-        receiveMailSettingPhoneExample.setChannel(enquiryReceiveMailSetting.getChannel());
+        receiveMailSettingPhoneExample.setWebSite(enquiryReceiveMailSetting.getWebSite());
         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,String channel, PagerInfo pager) {
+    public List<MemberEnquiry> getEnquiryListByPage(String name, String email, Long storeId, String isStoreAdmin, Long vendorId, Integer validStatus,String webSite, PagerInfo pager) {
         List<MemberEnquiry> enquiryList = null;
         if (pager != null) {
-            enquiryList = memberEnquiryReadMapper.enquiryListPage(name, email, storeId, isStoreAdmin, vendorId, validStatus,channel, pager.getStart(), pager.getPageSize());
+            enquiryList = memberEnquiryReadMapper.enquiryListPage(name, email, storeId, isStoreAdmin, vendorId, validStatus,webSite, 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,String channel) {
-        return memberEnquiryReadMapper.enquiryListPageCount(name, email, storeId, isStoreAdmin, vendorId, validStatus,channel);
+    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);
     }
 
     /**

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/seller/StoreApplyModel.java

@@ -1,5 +1,6 @@
 package com.slodon.b2b2c.model.seller;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.gexin.fastjson.JSON;
 import com.slodon.b2b2c.core.constant.*;
 import com.slodon.b2b2c.core.exception.MallException;
@@ -12,14 +13,19 @@ import com.slodon.b2b2c.dao.read.goods.GoodsCategoryReadMapper;
 import com.slodon.b2b2c.dao.read.seller.StoreApplyReadMapper;
 import com.slodon.b2b2c.dao.read.seller.StoreCertificateReadMapper;
 import com.slodon.b2b2c.dao.read.seller.StoreGradeReadMapper;
+import com.slodon.b2b2c.dao.read.seller.StoreNameReadMapper;
 import com.slodon.b2b2c.dao.write.seller.StoreApplyWriteMapper;
 import com.slodon.b2b2c.dao.write.seller.StoreBindCategoryWriteMapper;
 import com.slodon.b2b2c.dao.write.seller.StoreCertificateWriteMapper;
+import com.slodon.b2b2c.dao.write.seller.StoreNameWriteMapper;
+import com.slodon.b2b2c.enums.WebSiteConstant;
 import com.slodon.b2b2c.goods.pojo.GoodsCategory;
 import com.slodon.b2b2c.seller.dto.StoreApplyDTO;
+import com.slodon.b2b2c.seller.dto.StoreSiteCategoryInfoDTO;
 import com.slodon.b2b2c.seller.example.StoreApplyExample;
 import com.slodon.b2b2c.seller.example.StoreBindCategoryExample;
 import com.slodon.b2b2c.seller.example.StoreCertificateExample;
+import com.slodon.b2b2c.seller.example.StoreNameExample;
 import com.slodon.b2b2c.seller.pojo.*;
 import com.slodon.b2b2c.sms.DySmsSender;
 import com.slodon.b2b2c.sms.base.SmsSender;
@@ -34,6 +40,7 @@ import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -44,6 +51,10 @@ public class StoreApplyModel {
     @Resource
     private StoreApplyReadMapper storeApplyReadMapper;
     @Resource
+    private StoreNameReadMapper storeNameReadMapper;
+    @Resource
+    private StoreNameWriteMapper storeNameWriteMapper;
+    @Resource
     private StoreApplyWriteMapper storeApplyWriteMapper;
     @Resource
     private StoreGradeReadMapper storeGradeReadMapper;
@@ -92,32 +103,59 @@ public class StoreApplyModel {
             int count = storeCertificateReadMapper.countByExample(example);
             AssertUtil.isTrue(count > 0, "公司名称已存在");
         }
-        //重复判断：店铺名称不能重复
-        String storeName = storeApplyDTO.getStoreName().trim();
-        StoreApplyExample example = new StoreApplyExample();
-        example.setStoreName(storeName);
-        int count = storeApplyReadMapper.countByExample(example);
-        AssertUtil.isTrue(count > 0, "店铺名称已存在");
-
-        //插入store_apply表
-        StoreApply storeApply = new StoreApply();
-        storeApply.setVendorId(vendor.getVendorId());
-        storeApply.setVendorName(vendor.getVendorName());
-        storeApply.setStoreName(storeName);
-        storeApply.setState(StoreConst.STATE_1_SEND_APPLY);
-//        storeApply.setApplyYear(storeApplyDTO.getApplyYear());
-//        storeApply.setStoreGradeId(storeApplyDTO.getStoreGradeId());
-        storeApply.setApplyYear(NumConstant.ONE);
-        storeApply.setStoreGradeId(StoreConst.STORE_CRADE_1);
-        storeApply.setSubmitTime(new Date());
-        storeApply.setStoreId(SmartId.nextId(BizTypeConst.STORE));
-        storeApply.setStoreType(StoreConst.NO_OWN_STORE);
-        //根据gradeId查询收费标准
-        StoreGrade storeGrade = storeGradeReadMapper.getByPrimaryKey(StoreConst.STORE_CRADE_1);
-//        storeApply.setPayAmount(new BigDecimal(storeGrade.getPrice()).multiply(new BigDecimal(storeApplyDTO.getApplyYear())));
-        count = storeApplyWriteMapper.insert(storeApply);
-        if (count == 0) {
-            throw new MallException("店铺申请表添加失败，请重试");
+
+        Long storeId = SmartId.nextId(BizTypeConst.STORE);
+        if (CollectionUtil.isEmpty(storeApplyDTO.getSiteInfoList())){
+            throw new MallException("请选择经营信息");
+        }
+
+        for (StoreSiteCategoryInfoDTO siteCategoryInfoDTO : storeApplyDTO.getSiteInfoList()) {
+            //重复判断：店铺名称不能重复
+            String storeName = siteCategoryInfoDTO.getStoreName().trim();
+            if (WebSiteConstant.MEMBER_OVERSEA.equals(siteCategoryInfoDTO.getWebSite())) {
+                StoreApplyExample example = new StoreApplyExample();
+                example.setStoreName(storeName);
+                int count = storeApplyReadMapper.countByExample(example);
+                AssertUtil.isTrue(count > 0, "店铺名称已存在");
+                //插入store_apply表
+                StoreApply storeApply = new StoreApply();
+                storeApply.setVendorId(vendor.getVendorId());
+                storeApply.setVendorName(vendor.getVendorName());
+                storeApply.setStoreName(storeName);
+                storeApply.setState(StoreConst.STATE_1_SEND_APPLY);
+//                storeApply.setApplyYear(storeApplyDTO.getApplyYear());
+//                storeApply.setStoreGradeId(storeApplyDTO.getStoreGradeId());
+                storeApply.setApplyYear(NumConstant.ONE);
+                storeApply.setStoreGradeId(StoreConst.STORE_CRADE_1);
+                storeApply.setSubmitTime(new Date());
+                storeApply.setStoreId(storeId);
+                storeApply.setStoreType(StoreConst.NO_OWN_STORE);
+                //根据gradeId查询收费标准
+                StoreGrade storeGrade = storeGradeReadMapper.getByPrimaryKey(StoreConst.STORE_CRADE_1);
+//                 storeApply.setPayAmount(new BigDecimal(storeGrade.getPrice()).multiply(new BigDecimal(storeApplyDTO.getApplyYear())));
+                count = storeApplyWriteMapper.insert(storeApply);
+                if (count == 0) {
+                    throw new MallException("店铺申请表添加失败，请重试");
+                }
+            } else {
+                StoreNameExample example = new StoreNameExample();
+                example.setStoreName(storeName);
+                example.setWebSite(siteCategoryInfoDTO.getWebSite());
+                int count = storeNameReadMapper.countByExample(example);
+                AssertUtil.isTrue(count > 0, "店铺名称已存在");
+                StoreName name = new StoreName();
+                name.setStoreName(storeName);
+                name.setWebSite(siteCategoryInfoDTO.getWebSite());
+                name.setStoreId(storeId);
+                name.setCreateId(vendor.getVendorId());
+                name.setCreateTime(new Date());
+                name.setUpdateId(vendor.getVendorId());
+                name.setUpdateTime(new Date());
+                count = storeNameWriteMapper.insert(name);
+                if (count == 0) {
+                    throw new MallException("店铺名称表添加失败，请重试");
+                }
+            }
         }
 
         //插入store_certificate表
@@ -128,40 +166,44 @@ public class StoreApplyModel {
         storeCertificate.setVendorName(vendor.getVendorName());
         storeCertificate.setCompanyName(companyName);
 
-        count = storeCertificateWriteMapper.insert(storeCertificate);
+        int count = storeCertificateWriteMapper.insert(storeCertificate);
         if (count == 0) {
             throw new MallException("店铺资质表添加失败，请重试");
         }
 
-        //插入store_bind_category表
-        StoreBindCategory storeBindCategory = new StoreBindCategory();
-        storeBindCategory.setStoreId(0L);
-        storeBindCategory.setCreateVendorId(vendor.getVendorId());
-        storeBindCategory.setCreateTime(new Date());
-        storeBindCategory.setState(StoreConst.STORE_CATEGORY_STATE_SEND);
-
-        String[] split = storeApplyDTO.getGoodsCategoryIds().split(",");
-        for (String goodsCategoryId : split) {
-            String[] split1 = goodsCategoryId.split("-");
-            storeBindCategory.setGoodsCategoryId1(Integer.parseInt(split1[0]));
-            storeBindCategory.setGoodsCategoryId2(Integer.parseInt(split1[1]));
-            storeBindCategory.setGoodsCategoryId3(Integer.parseInt(split1[2]));
-            //根据一级分类id查询一级分类名称
-            GoodsCategory goodsCategory1 = goodsCategoryReadMapper.getByPrimaryKey(split1[0]);
-            //根据二级分类id查询二级分类名称
-            GoodsCategory goodsCategory2 = goodsCategoryReadMapper.getByPrimaryKey(split1[1]);
-            //根据三级分类id查询三级分类名称
-            GoodsCategory goodsCategory3 = goodsCategoryReadMapper.getByPrimaryKey(split1[2]);
-            //拼接类目组合名称
-            String goodsCateName = goodsCategory1.getCategoryName() + ">" + goodsCategory2.getCategoryName() + ">" + goodsCategory3.getCategoryName();
-            storeBindCategory.setGoodsCateName(goodsCateName);
-            storeBindCategory.setScaling(goodsCategory3.getScaling());
-            count = storeBindCategoryWriteMapper.insert(storeBindCategory);
-            if (count == 0) {
-                throw new MallException("店铺可用商品分类表添加失败，请重试");
-            }
+        for (StoreSiteCategoryInfoDTO siteCategoryInfoDTO : storeApplyDTO.getSiteInfoList()) {
+            //插入store_bind_category表
+            StoreBindCategory storeBindCategory = new StoreBindCategory();
+            storeBindCategory.setStoreId(0L);
+            storeBindCategory.setWebSite(siteCategoryInfoDTO.getWebSite());
+            storeBindCategory.setCreateVendorId(vendor.getVendorId());
+            storeBindCategory.setCreateTime(new Date());
+            storeBindCategory.setState(StoreConst.STORE_CATEGORY_STATE_SEND);
+
+            String[] split = siteCategoryInfoDTO.getGoodsCategoryIds().split(",");
+            for (String goodsCategoryId : split) {
+                String[] split1 = goodsCategoryId.split("-");
+                storeBindCategory.setGoodsCategoryId1(Integer.parseInt(split1[0]));
+                storeBindCategory.setGoodsCategoryId2(Integer.parseInt(split1[1]));
+                storeBindCategory.setGoodsCategoryId3(Integer.parseInt(split1[2]));
+                //根据一级分类id查询一级分类名称
+                GoodsCategory goodsCategory1 = goodsCategoryReadMapper.getByPrimaryKey(split1[0]);
+                //根据二级分类id查询二级分类名称
+                GoodsCategory goodsCategory2 = goodsCategoryReadMapper.getByPrimaryKey(split1[1]);
+                //根据三级分类id查询三级分类名称
+                GoodsCategory goodsCategory3 = goodsCategoryReadMapper.getByPrimaryKey(split1[2]);
+                //拼接类目组合名称
+                String goodsCateName = goodsCategory1.getCategoryName() + ">" + goodsCategory2.getCategoryName() + ">" + goodsCategory3.getCategoryName();
+                storeBindCategory.setGoodsCateName(goodsCateName);
+                storeBindCategory.setScaling(goodsCategory3.getScaling());
+                count = storeBindCategoryWriteMapper.insert(storeBindCategory);
+                if (count == 0) {
+                    throw new MallException("店铺可用商品分类表添加失败，请重试");
+                }
 
+            }
         }
+
     }
 
     /**
@@ -220,36 +262,77 @@ public class StoreApplyModel {
                 AssertUtil.isTrue(count > 0, "公司名称已存在");
             }
         }
-        //重复判断：店铺名称不能重复
-        String storeName = storeApplyDTO.getStoreName().trim();
-        if (!StringUtils.isEmpty(storeName)) {
-            StoreApplyExample example = new StoreApplyExample();
-            example.setStoreName(storeName);
-            example.setVendorIdNotEquals(vendor.getVendorId());
-            int count = storeApplyReadMapper.countByExample(example);
-            AssertUtil.isTrue(count > 0, "店铺名称已存在");
-        }
 
-        StoreCertificate storeCertificate = storeCertificateReadMapper.getByPrimaryKey(storeApplyDTO.getCertificateId());
-        PropertyUtils.copyProperties(storeCertificate, storeApplyDTO);
+        if (CollectionUtil.isEmpty(storeApplyDTO.getSiteInfoList())){
+            throw new MallException("请选择经营信息");
+        }
+
+        for (StoreSiteCategoryInfoDTO siteCategoryInfoDTO : storeApplyDTO.getSiteInfoList()) {
+            //重复判断：店铺名称不能重复
+            String storeName = siteCategoryInfoDTO.getStoreName().trim();
+            if (!StringUtils.isEmpty(storeName)) {
+                if (WebSiteConstant.MEMBER_OVERSEA.equals(siteCategoryInfoDTO.getWebSite())) {
+                    StoreApplyExample example = new StoreApplyExample();
+                    example.setStoreName(storeName);
+                    example.setVendorIdNotEquals(vendor.getVendorId());
+                    int count = storeApplyReadMapper.countByExample(example);
+                    AssertUtil.isTrue(count > 0, "店铺名称已存在");
+                    //更新store_apply表
+                    StoreApply storeApply = storeApplyReadMapper.getByPrimaryKey(storeApplyDTO.getApplyId());
+                    PropertyUtils.copyProperties(storeApply, storeApplyDTO);
+                    storeApply.setStoreName(storeName);
+                    storeApply.setState(StoreConst.STATE_1_SEND_APPLY);
+                    storeApply.setSubmitTime(new Date());
+                    count = storeApplyWriteMapper.updateByPrimaryKeySelective(storeApply);
+                    if (count == 0) {
+                        log.error("根据applyId：" + storeApply.getApplyId() + "更新商家申请表失败");
+                        throw new MallException("更新商家申请表失败,请重试");
+                    }
+                } else {
+                    int count;
+                    if (siteCategoryInfoDTO.getId() != null) {
+                        StoreNameExample example = new StoreNameExample();
+                        example.setIdNotEquals(siteCategoryInfoDTO.getId());
+                        example.setStoreName(storeName);
+                        example.setWebSite(siteCategoryInfoDTO.getWebSite());
+                        count = storeNameReadMapper.countByExample(example);
+                        AssertUtil.isTrue(count > 0, "店铺名称已存在");
+                        StoreName name = storeNameReadMapper.getByPrimaryKey(siteCategoryInfoDTO.getId());
+                        PropertyUtils.copyProperties(name, siteCategoryInfoDTO);
+                        name.setStoreName(storeName);
+                        name.setUpdateId(vendor.getVendorId());
+                        name.setUpdateTime(new Date());
+                        count = storeNameWriteMapper.updateByPrimaryKeySelective(name);
+                        if (count == 0) {
+                            log.error("根据id：" + name.getId() + "更新店铺名称表失败");
+                            throw new MallException("更新店铺名称表失败,请重试");
+                        }
+                    } else {
+                        StoreName name = new StoreName();
+                        PropertyUtils.copyProperties(name, siteCategoryInfoDTO);
+                        StoreApply storeApply = storeApplyReadMapper.getByPrimaryKey(storeApplyDTO.getApplyId());
+                        name.setStoreId(storeApply.getStoreId());
+                        name.setStoreName(storeName);
+                        name.setCreateId(vendor.getVendorId());
+                        name.setCreateTime(new Date());
+                        count = storeNameWriteMapper.insert(name);
+                        if (count == 0) {
+                            log.error("添加店铺名称表失败");
+                            throw new MallException("添加店铺名称表失败,请重试");
+                        }
+                    }
 
-        //更新store_apply表
-        StoreApply storeApply = storeApplyReadMapper.getByPrimaryKey(storeApplyDTO.getApplyId());
-        PropertyUtils.copyProperties(storeApply, storeApplyDTO);
-        storeApply.setStoreName(storeName);
-        storeApply.setState(StoreConst.STATE_1_SEND_APPLY);
-        storeApply.setSubmitTime(new Date());
+                }
 
-        int count;
-        count = storeApplyWriteMapper.updateByPrimaryKeySelective(storeApply);
-        if (count == 0) {
-            log.error("根据applyId：" + storeApply.getApplyId() + "更新商家申请表失败");
-            throw new MallException("更新商家申请表失败,请重试");
+            }
         }
+        StoreCertificate storeCertificate = storeCertificateReadMapper.getByPrimaryKey(storeApplyDTO.getCertificateId());
+        PropertyUtils.copyProperties(storeCertificate, storeApplyDTO);
+
 
         //更新store_certificate表
         storeCertificate.setCompanyName(companyName);
-        count = storeCertificateWriteMapper.updateByPrimaryKeySelective(storeCertificate);
+        int count = storeCertificateWriteMapper.updateByPrimaryKeySelective(storeCertificate);
         if (count == 0) {
             log.error("根据certificateId：" + storeCertificate.getCertificateId() + "更新商家资质表失败");
             throw new MallException("更新商家资质表失败,请重试");
@@ -260,31 +343,34 @@ public class StoreApplyModel {
         storeBindCategoryExample.setCreateVendorId(vendor.getVendorId());
         storeBindCategoryWriteMapper.deleteByExample(storeBindCategoryExample);
 
-        StoreBindCategory storeBindCategory = new StoreBindCategory();
-        storeBindCategory.setStoreId(0L);
-        storeBindCategory.setCreateVendorId(vendor.getVendorId());
-        storeBindCategory.setCreateTime(new Date());
-        storeBindCategory.setState(StoreConst.STORE_CATEGORY_STATE_SEND);
-
-        String[] split = storeApplyDTO.getGoodsCategoryIds().split(",");
-        for (String goodsCategoryId : split) {
-            String[] split1 = goodsCategoryId.split("-");
-            storeBindCategory.setGoodsCategoryId1(Integer.parseInt(split1[0]));
-            storeBindCategory.setGoodsCategoryId2(Integer.parseInt(split1[1]));
-            storeBindCategory.setGoodsCategoryId3(Integer.parseInt(split1[2]));
-            //根据一级分类id查询一级分类名称
-            GoodsCategory goodsCategory1 = goodsCategoryReadMapper.getByPrimaryKey(split1[0]);
-            //根据二级分类id查询二级分类名称
-            GoodsCategory goodsCategory2 = goodsCategoryReadMapper.getByPrimaryKey(split1[1]);
-            //根据三级分类id查询三级分类名称
-            GoodsCategory goodsCategory3 = goodsCategoryReadMapper.getByPrimaryKey(split1[2]);
-            //拼接类目组合名称
-            String goodsCateName = goodsCategory1.getCategoryName() + ">" + goodsCategory2.getCategoryName() + ">" + goodsCategory3.getCategoryName();
-            storeBindCategory.setGoodsCateName(goodsCateName);
-            storeBindCategory.setScaling(goodsCategory3.getScaling());
-            count = storeBindCategoryWriteMapper.insert(storeBindCategory);
-            if (count == 0) {
-                throw new MallException("店铺可用商品分类表添加失败，请重试");
+        for (StoreSiteCategoryInfoDTO siteCategoryInfoDTO : storeApplyDTO.getSiteInfoList()) {
+            StoreBindCategory storeBindCategory = new StoreBindCategory();
+            storeBindCategory.setStoreId(0L);
+            storeBindCategory.setWebSite(siteCategoryInfoDTO.getWebSite());
+            storeBindCategory.setCreateVendorId(vendor.getVendorId());
+            storeBindCategory.setCreateTime(new Date());
+            storeBindCategory.setState(StoreConst.STORE_CATEGORY_STATE_SEND);
+
+            String[] split = siteCategoryInfoDTO.getGoodsCategoryIds().split(",");
+            for (String goodsCategoryId : split) {
+                String[] split1 = goodsCategoryId.split("-");
+                storeBindCategory.setGoodsCategoryId1(Integer.parseInt(split1[0]));
+                storeBindCategory.setGoodsCategoryId2(Integer.parseInt(split1[1]));
+                storeBindCategory.setGoodsCategoryId3(Integer.parseInt(split1[2]));
+                //根据一级分类id查询一级分类名称
+                GoodsCategory goodsCategory1 = goodsCategoryReadMapper.getByPrimaryKey(split1[0]);
+                //根据二级分类id查询二级分类名称
+                GoodsCategory goodsCategory2 = goodsCategoryReadMapper.getByPrimaryKey(split1[1]);
+                //根据三级分类id查询三级分类名称
+                GoodsCategory goodsCategory3 = goodsCategoryReadMapper.getByPrimaryKey(split1[2]);
+                //拼接类目组合名称
+                String goodsCateName = goodsCategory1.getCategoryName() + ">" + goodsCategory2.getCategoryName() + ">" + goodsCategory3.getCategoryName();
+                storeBindCategory.setGoodsCateName(goodsCateName);
+                storeBindCategory.setScaling(goodsCategory3.getScaling());
+                count = storeBindCategoryWriteMapper.insert(storeBindCategory);
+                if (count == 0) {
+                    throw new MallException("店铺可用商品分类表添加失败，请重试");
+                }
             }
         }
     }

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/seller/StoreNameModel.java

@@ -0,0 +1,36 @@
+package com.slodon.b2b2c.model.seller;
+
+
+import com.slodon.b2b2c.core.response.PagerInfo;
+import com.slodon.b2b2c.dao.read.seller.StoreNameReadMapper;
+import com.slodon.b2b2c.dao.write.seller.StoreNameWriteMapper;
+
+import com.slodon.b2b2c.seller.example.StoreNameExample;
+import com.slodon.b2b2c.seller.pojo.StoreName;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Component
+@Slf4j
+public class StoreNameModel {
+
+    @Resource
+    private StoreNameReadMapper storeNameReadMapper;
+    @Resource
+    private StoreNameWriteMapper storeNameWriteMapper;
+
+
+    public List<StoreName> getStoreNameList(StoreNameExample example, PagerInfo pager) {
+        List<StoreName> storeNameList;
+        if (pager != null) {
+            pager.setRowsCount(storeNameReadMapper.countByExample(example));
+            storeNameList = storeNameReadMapper.listPageByExample(example, pager.getStart(), pager.getPageSize());
+        } else {
+            storeNameList = storeNameReadMapper.listByExample(example);
+        }
+        return storeNameList;
+    }
+}

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/system/TplPcMallDataModel.java

@@ -39,7 +39,7 @@ public class TplPcMallDataModel {
         TplPcMallDataExample example = new TplPcMallDataExample();
         example.setName(tplPcMallData.getName());
         example.setStoreId(tplPcMallData.getStoreId());
-        example.setSite(tplPcMallData.getSite());
+        example.setWebSite(tplPcMallData.getWebSite());
         int count = tplPcMallDataReadMapper.countByExample(example);
         AssertUtil.isTrue(count > 0, "模板名称重复，请重新输入");
 
@@ -91,7 +91,7 @@ public class TplPcMallDataModel {
         TplPcMallDataExample example = new TplPcMallDataExample();
         example.setName(tplPcMallData.getName());
         example.setStoreId(tplPcMallData.getStoreId());
-        example.setSite(tplPcMallData.getSite());
+        example.setWebSite(tplPcMallData.getWebSite());
         example.setDataIdNotEquals(tplPcMallData.getDataId());
         AssertUtil.isTrue(tplPcMallDataReadMapper.countByExample(example) > 0, "模板名称重复，请重新输入");
 

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

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

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

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

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

@@ -11,7 +11,7 @@ public class GoodsParameterGroupVO {
     private Integer groupId;
 
     @ApiModelProperty("分组发布渠道")
-    private String distributionChannel;
+    private String webSite;
 
     @ApiModelProperty("分组名称")
     private String groupName;
@@ -24,7 +24,7 @@ public class GoodsParameterGroupVO {
 
     public GoodsParameterGroupVO(GoodsParameterGroup goodsParameterGroup) {
         this.groupId=goodsParameterGroup.getGroupId();
-        this.distributionChannel = goodsParameterGroup.getDistributionChannel();
+        this.webSite = goodsParameterGroup.getWebSite();
         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 distributionChannel;
+    private String webSite;
 
     @ApiModelProperty("模版名称")
     private String templateName;
@@ -25,7 +25,7 @@ public class GoodsRelatedTemplateVO {
 
     public GoodsRelatedTemplateVO(GoodsRelatedTemplate goodsRelatedTemplate) {
         this.templateId = goodsRelatedTemplate.getTemplateId();
-        this.distributionChannel = goodsRelatedTemplate.getDistributionChannel();
+        this.webSite = goodsRelatedTemplate.getWebSite();
         this.templateName =goodsRelatedTemplate.getTemplateName();
         this.templatePosition = goodsRelatedTemplate.getTemplatePosition();
         this.templateContent = goodsRelatedTemplate.getTemplateContent();

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

@@ -26,7 +26,7 @@ public class GoodsVO {
     private Long goodsId;
 
     @ApiModelProperty("发布渠道 1-海外站；2-国内站")
-    private String distributionChannel;
+    private String webSite;
 
     @ApiModelProperty("商品名称")
     private String goodsName;
@@ -119,7 +119,7 @@ public class GoodsVO {
 
     public GoodsVO(Goods goods, GoodsExtend goodsExtend) {
         this.goodsId = goods.getGoodsId();
-        this.distributionChannel = goods.getDistributionChannel();
+        this.webSite = goods.getWebSite();
         this.goodsName = goods.getGoodsName();
         this.goodsBrief = goods.getGoodsBrief();
         this.categoryPath = goods.getCategoryPath();

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

@@ -32,7 +32,7 @@ public class SellerGoodsDetailVO implements Serializable {
 
     //基本信息
     @ApiModelProperty(value = "发布渠道")
-    private String distributionChannel;
+    private String webSite;
     @ApiModelProperty("商品名称为3到50个字符(商品副标题)")
     private String goodsName;
     @ApiModelProperty("商品副标题，长度建议140个字符内")
@@ -176,7 +176,7 @@ public class SellerGoodsDetailVO implements Serializable {
         this.goodsId = goods.getGoodsId();
 
         //基本信息
-        this.distributionChannel = goods.getDistributionChannel();
+        this.webSite = goods.getWebSite();
         this.goodsName = goods.getGoodsName();
         this.goodsBrief = goods.getGoodsBrief();
         this.brandId = goods.getBrandId();

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/seller/StoreApplyDetailVO.java

@@ -6,6 +6,7 @@ import com.slodon.b2b2c.core.util.CommonUtil;
 import com.slodon.b2b2c.core.util.FileUrlUtil;
 import com.slodon.b2b2c.seller.pojo.StoreApply;
 import com.slodon.b2b2c.seller.pojo.StoreCertificate;
+import com.slodon.b2b2c.seller.pojo.StoreName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.util.StringUtils;
@@ -110,6 +111,9 @@ public class StoreApplyDetailVO {
     @ApiModelProperty("备注")
     private String auditInfo;
 
+    @ApiModelProperty("其他站点店铺名称")
+    private List<StoreName> storeNameList;
+
     @ApiModelProperty("经营类目集合")
     private List<StoreGoodsCateVO> storeGoodsCateVOList;
 

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/seller/StoreGoodsCateVO.java

@@ -17,6 +17,9 @@ public class StoreGoodsCateVO {
     @ApiModelProperty("绑定id")
     private Integer bindId;
 
+    @ApiModelProperty("店铺入驻站点")
+    private String webSite;
+
     @ApiModelProperty("申请分类id（一级）")
     private Integer goodsCategoryId1;
 
@@ -46,6 +49,7 @@ public class StoreGoodsCateVO {
 
     public StoreGoodsCateVO(StoreBindCategory storeBindCategory) {
         bindId = storeBindCategory.getBindId();
+        webSite = storeBindCategory.getWebSite();
         goodsCategoryId1 = storeBindCategory.getGoodsCategoryId1();
         goodsCategoryId2 = storeBindCategory.getGoodsCategoryId2();
         goodsCategoryId3 = storeBindCategory.getGoodsCategoryId3();

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

@@ -3,7 +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="web_site" property="webSite" />
     <result column="group_name" property="groupName" />
     <result column="store_id" property="storeId" />
     <result column="create_vendor_id" property="createVendorId" />
@@ -25,8 +25,8 @@
         <if test="example.groupIdIn != null">
           AND `group_id` in (${example.groupIdIn})
         </if>
-        <if test="example.distributionChannel != null">
-          AND `distribution_channel` = #{example.distributionChannel}
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
         </if>
         <if test="example.groupName != null">
           AND `group_name` = #{example.groupName}

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.read.goods.GoodsReadMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.goods.pojo.Goods">
     <id column="goods_id" property="goodsId" />
-    <result column="distribution_channel" property="distributionChannel" />
+    <result column="web_site" property="webSite" />
     <result column="goods_name" property="goodsName" />
     <result column="goods_brief" property="goodsBrief" />
     <result column="keyword" property="keyword" />
@@ -69,8 +69,8 @@
         <if test="example.goodsIdNotIn != null and example.goodsIdNotIn != ''">
           AND `goods_id` not in (${example.goodsIdNotIn})
         </if>
-        <if test="example.distributionChannel != null">
-            AND `distribution_channel` = #{example.distributionChannel}
+        <if test="example.webSite != null">
+            AND `web_site` = #{example.webSite}
         </if>
         <if test="example.goodsName != null">
           AND `goods_name` = #{example.goodsName}

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="distribution_channel" property="distributionChannel" />
+    <result column="web_site" property="webSite" />
     <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.distributionChannel != null">
-          AND `distribution_channel` = #{example.distributionChannel}
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
         </if>
         <if test="example.templateName != null">
           AND `template_name` = #{example.templateName}

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.read.goods.ProductReadMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.goods.pojo.Product">
     <id column="product_id" property="productId" />
-    <result column="distribution_channel" property="distributionChannel" />
+    <result column="web_site" property="webSite" />
     <result column="goods_id" property="goodsId" />
     <result column="goods_name" property="goodsName" />
     <result column="spec_values" property="specValues" />
@@ -41,8 +41,8 @@
   <sql id="whereCondition">
     <if test="example != null">
       <trim prefix="WHERE" prefixOverrides="AND|OR">
-        <if test="example.distributionChannel != null">
-          AND `distributionChannel` = #{example.distributionChannel}
+        <if test="example.webSite != null">
+          AND `webSite` = #{example.webSite}
         </if>
         <if test="example.productIdNotEquals != null">
           AND `product_id` != #{example.productIdNotEquals}

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.read.member.MemberEnquiryReadMapper">
     <resultMap id="resultMap" type="com.slodon.b2b2c.member.pojo.MemberEnquiry">
         <id column="id" property="id"/>
-        <result column="channel" property="channel"/>
+        <result column="web_site" property="webSite"/>
         <result column="name" property="name"/>
         <result column="email" property="email"/>
         <result column="phone_code" property="phoneCode"/>
@@ -45,8 +45,8 @@
                 <if test="example.statusNotEqual != null">
                     AND `status` != #{example.statusNotEqual}
                 </if>
-                <if test="example.channel != null">
-                    AND `channel` = #{example.channel}
+                <if test="example.webSite != null">
+                    AND `web_site` = #{example.webSite}
                 </if>
                 <if test="example.storeId != null">
                     AND `store_id` = #{example.storeId}
@@ -211,8 +211,8 @@
         <if test="validStatus != null">
             AND t1.`valid_status` = #{validStatus}
         </if>
-        <if test="channel != null">
-            AND t1.`channel` = #{channel}
+        <if test="webSite != null">
+            AND t1.`web_site` = #{webSite}
         </if>
         order by t1.id desc
     </select>
@@ -235,8 +235,8 @@
         <if test="validStatus != null">
             AND t1.`valid_status` = #{validStatus}
         </if>
-        <if test="channel != null">
-            AND t1.`channel` = #{channel}
+        <if test="webSite != null">
+            AND t1.`web_site` = #{webSite}
         </if>
         order by t1.id desc
         <include refid="limit"/>

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

@@ -3,7 +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="web_site" property="webSite" />
     <result column="store_id" property="storeId" />
     <result column="email" property="email" />
     <result column="phone" property="phone" />
@@ -19,8 +19,8 @@
   <sql id="whereCondition">
     <if test="example != null">
       <trim prefix="WHERE" prefixOverrides="AND|OR">
-        <if test="example.channel != null">
-          AND `channel` = #{example.channel}
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
         </if>
         <if test="example.storeId != null">
           AND `store_id` = #{example.storeId}

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.seller.pojo.StoreBindCategory">
     <id column="bind_id" property="bindId" />
     <result column="store_id" property="storeId" />
+    <result column="web_site" property="webSite" />
     <result column="create_vendor_id" property="createVendorId" />
     <result column="create_time" property="createTime" />
     <result column="goods_cate_name" property="goodsCateName" />
@@ -36,6 +37,9 @@
         <if test="example.storeIdNotEquals != null">
           AND `store_id` != #{example.storeIdNotEquals}
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.createVendorId != null">
           AND `create_vendor_id` = #{example.createVendorId}
         </if>

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

@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.slodon.b2b2c.dao.read.seller.StoreNameReadMapper">
+  <resultMap id="resultMap" type="com.slodon.b2b2c.seller.pojo.StoreName">
+    <id column="id" property="id" />
+    <result column="web_site" property="webSite" />
+    <result column="store_id" property="storeId" />
+    <result column="store_name" property="storeName" />
+    <result column="create_id" property="createId" />
+    <result column="create_time" property="createTime" />
+    <result column="update_id" property="updateId" />
+    <result column="update_time" property="updateTime" />
+  </resultMap>
+  <!--按照主键值进行操作-->
+  <sql id="pkWhere">
+    WHERE `id` = #{primaryKey}
+  </sql>
+  <!--操作条件-->
+  <sql id="whereCondition">
+    <if test="example != null">
+      <trim prefix="WHERE" prefixOverrides="AND|OR">
+        <if test="example.idNotEquals != null">
+          AND `id` != #{example.idNotEquals}
+        </if>
+        <if test="example.storeId != null">
+          AND `store_id` = #{example.storeId}
+        </if>
+        <if test="example.storeName != null">
+          AND `store_name` = #{example.storeName}
+        </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
+      </trim>
+    </if>
+  </sql>
+  <!--排序条件-->
+  <sql id="orderBy">
+    ORDER BY `id` DESC
+  </sql>
+  <sql id="orderByOther">
+    order by ${example.orderBy}
+  </sql>
+  <!--分组条件-->
+  <sql id="groupBy">
+    group by ${example.groupBy}
+  </sql>
+  <!--分页条件-->
+  <sql id="limit">
+    <if test="size != null and size &gt; 0">
+      limit #{startRow},#{size}
+    </if>
+  </sql>
+  <!--查询符合条件的记录数-->
+  <select id="countByExample" parameterType="com.slodon.b2b2c.seller.example.StoreNameExample" resultType="java.lang.Integer">
+    SELECT
+      COUNT(*)
+    FROM `store_name`
+    <include refid="whereCondition" />
+  </select>
+  <!--根据主键查询记录-->
+  <select id="getByPrimaryKey" resultMap="resultMap">
+    SELECT
+      *
+    FROM `store_name`
+    <include refid="pkWhere" />
+  </select>
+  <!--查询符合条件的记录(所有字段)-->
+  <select id="listByExample" resultMap="resultMap">
+    SELECT
+      *
+    FROM `store_name`
+    <include refid="whereCondition" />
+    <if test="example.groupBy != null">
+      <include refid="groupBy" />
+    </if>
+    <choose>
+      <when test="example.orderBy != null">
+        <include refid="orderByOther" />
+      </when>
+      <otherwise>
+        <include refid="orderBy" />
+      </otherwise>
+    </choose>
+  </select>
+  <!--分页查询符合条件的记录(所有字段)-->
+  <select id="listPageByExample" resultMap="resultMap">
+    SELECT
+      *
+    FROM `store_name`
+    <include refid="whereCondition" />
+    <if test="example.groupBy != null">
+      <include refid="groupBy" />
+    </if>
+    <choose>
+      <when test="example.orderBy != null">
+        <include refid="orderByOther" />
+      </when>
+      <otherwise>
+        <include refid="orderBy" />
+      </otherwise>
+    </choose>
+    <include refid="limit" />
+  </select>
+  <!--查询符合条件的记录(指定字段)-->
+  <select id="listFieldsByExample" resultMap="resultMap">
+    SELECT
+      ${fields}
+    FROM `store_name`
+    <include refid="whereCondition" />
+    <if test="example.groupBy != null">
+      <include refid="groupBy" />
+    </if>
+    <choose>
+      <when test="example.orderBy != null">
+        <include refid="orderByOther" />
+      </when>
+      <otherwise>
+        <include refid="orderBy" />
+      </otherwise>
+    </choose>
+  </select>
+  <!--分页查询符合条件的记录(指定字段)-->
+  <select id="listFieldsPageByExample" resultMap="resultMap">
+    SELECT
+      ${fields}
+    FROM `store_name`
+    <include refid="whereCondition" />
+    <if test="example.groupBy != null">
+      <include refid="groupBy" />
+    </if>
+    <choose>
+      <when test="example.orderBy != null">
+        <include refid="orderByOther" />
+      </when>
+      <otherwise>
+        <include refid="orderBy" />
+      </otherwise>
+    </choose>
+    <include refid="limit" />
+  </select>
+</mapper>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/system/TplPcMallDataReadMapper.xml

@@ -7,7 +7,7 @@
     <result column="tpl_pc_name" property="tplPcName" />
     <result column="tpl_pc_type" property="tplPcType" />
     <result column="tpl_pc_type_name" property="tplPcTypeName" />
-    <result column="site" property="site" />
+    <result column="web_site" property="webSite" />
     <result column="name" property="name" />
     <result column="create_time" property="createTime" />
     <result column="create_user_id" property="createUserId" />
@@ -57,8 +57,8 @@
         <if test="example.tplPcTypeNameLike != null">
           AND `tpl_pc_type_name` like concat('%',#{example.tplPcTypeNameLike},'%')
         </if>
-        <if test="example.site != null">
-          AND `site` = #{example.site}
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
         </if>
         <if test="example.name != null">
           AND `name` = #{example.name}

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

@@ -3,7 +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="web_site" property="webSite" />
     <result column="group_name" property="groupName" />
     <result column="store_id" property="storeId" />
     <result column="create_vendor_id" property="createVendorId" />
@@ -14,8 +14,8 @@
   <!--除主键外的所有字段，用于插入操作-->
   <sql id="columns">
     <trim suffixOverrides=",">
-      <if test="distributionChannel != null">
-        `distribution_channel`,
+      <if test="webSite != null">
+        `web_site`,
       </if>
       <if test="groupName != null">
         `group_name`,
@@ -51,8 +51,8 @@
         <if test="example.groupIdIn != null">
           AND `group_id` in (${example.groupIdIn})
         </if>
-        <if test="example.distributionChannel != null">
-          AND `distribution_channel` = #{example.distributionChannel}
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
         </if>
         <if test="example.groupName != null">
           AND `group_name` = #{example.groupName}
@@ -203,8 +203,8 @@
     )
     VALUES(
     <trim suffixOverrides=",">
-      <if test="distributionChannel != null">
-        #{distributionChannel},
+      <if test="webSite != null">
+        #{webSite},
       </if>
       <if test="groupName != null">
         #{groupName},
@@ -231,8 +231,8 @@
   <update id="updateByExampleSelective">
     UPDATE `goods_parameter_group`
     <trim prefix="SET" suffixOverrides=",">
-      <if test="record.distributionChannel != null">
-        `distribution_channel` = #{record.distributionChannel},
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
       </if>
       <if test="record.groupName != null">
         `group_name` = #{record.groupName},
@@ -259,8 +259,8 @@
   <update id="updateByPrimaryKeySelective">
     UPDATE `goods_parameter_group`
     <trim prefix="SET" suffixOverrides=",">
-      <if test="distributionChannel != null">
-        `distribution_channel` = #{distributionChannel},
+      <if test="webSite != null">
+        `web_site` = #{webSite},
       </if>
       <if test="groupName != null">
         `group_name` = #{groupName},

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="distribution_channel" property="distributionChannel" />
+    <result column="web_site" property="webSite" />
     <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="distributionChannel != null">
-        `distribution_channel`,
+      <if test="webSite != null">
+        `web_site`,
       </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.distributionChannel != null">
-          AND `distribution_channel` = #{example.distributionChannel}
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
         </if>
         <if test="example.templateName != null">
           AND `template_name` = #{example.templateName}
@@ -196,8 +196,8 @@
     )
     VALUES(
     <trim suffixOverrides=",">
-      <if test="distributionChannel != null">
-        #{distributionChannel},
+      <if test="webSite != null">
+        #{webSite},
       </if>
       <if test="templateName != null">
         #{templateName},
@@ -221,8 +221,8 @@
   <update id="updateByExampleSelective">
     UPDATE `goods_related_template`
     <trim prefix="SET" suffixOverrides=",">
-      <if test="record.distributionChannel != null">
-        `distribution_channel` = #{record.distributionChannel},
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
       </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="distributionChannel != null">
-        `distribution_channel` = #{distributionChannel},
+      <if test="webSite != null">
+        `web_site` = #{webSite},
       </if>
       <if test="templateName != null">
         `template_name` = #{templateName},

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.write.goods.GoodsWriteMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.goods.pojo.Goods">
     <id column="goods_id" property="goodsId" />
-    <result column="distribution_channel" property="distributionChannel" />
+    <result column="web_site" property="webSite" />
     <result column="goods_name" property="goodsName" />
     <result column="goods_brief" property="goodsBrief" />
     <result column="keyword" property="keyword" />
@@ -55,8 +55,8 @@
       <if test="goodsId != null">
         `goods_id`,
       </if>
-      <if test="distributionChannel != null">
-        `distribution_channel`,
+      <if test="webSite != null">
+        `web_site`,
       </if>
       <if test="goodsName != null">
         `goods_name`,
@@ -206,8 +206,8 @@
         <if test="example.goodsIdIn != null">
           AND `goods_id` in (${example.goodsIdIn})
         </if>
-        <if test="example.distributionChannel != null">
-          AND `distribution_channel` = #{example.distributionChannel}
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
         </if>
         <if test="example.goodsName != null">
           AND `goods_name` = #{example.goodsName}
@@ -499,8 +499,8 @@
       <if test="goodsId != null">
         #{goodsId},
       </if>
-      <if test="distributionChannel != null">
-        #{distributionChannel},
+      <if test="webSite != null">
+        #{webSite},
       </if>
       <if test="goodsName != null">
         #{goodsName},
@@ -641,8 +641,8 @@
   <update id="updateByExampleSelective">
     UPDATE `goods`
     <trim prefix="SET" suffixOverrides=",">
-      <if test="record.distributionChannel != null">
-        `distribution_channel` = #{record.distributionChannel},
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
       </if>
       <if test="record.goodsName != null">
         `goods_name` = #{record.goodsName},
@@ -783,8 +783,8 @@
   <update id="updateByPrimaryKeySelective">
     UPDATE `goods`
     <trim prefix="SET" suffixOverrides=",">
-      <if test="distributionChannel != null">
-        `distribution_channel` = #{distributionChannel},
+      <if test="webSite != null">
+        `web_site` = #{webSite},
       </if>
       <if test="goodsName != null">
         `goods_name` = #{goodsName},

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.write.goods.ProductWriteMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.goods.pojo.Product">
     <id column="product_id" property="productId" />
-    <result column="distribution_channel" property="distributionChannel" />
+    <result column="web_site" property="webSite" />
     <result column="goods_id" property="goodsId" />
     <result column="goods_name" property="goodsName" />
     <result column="spec_values" property="specValues" />
@@ -39,8 +39,8 @@
       <if test="productId != null">
         `product_id`,
       </if>
-      <if test="distributionChannel != null">
-        `distribution_channel`,
+      <if test="webSite != null">
+        `web_site`,
       </if>
       <if test="goodsId != null">
         `goods_id`,
@@ -142,8 +142,8 @@
         <if test="example.productIdIn != null">
           AND `product_id` in (${example.productIdIn})
         </if>
-        <if test="example.distributionChannel != null">
-          AND `distribution_channel` = #{example.distributionChannel}
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
         </if>
         <if test="example.goodsId != null">
           AND `goods_id` = #{example.goodsId}
@@ -384,8 +384,8 @@
       <if test="productId != null">
         #{productId},
       </if>
-      <if test="distributionChannel != null">
-        #{distributionChannel},
+      <if test="webSite != null">
+        #{webSite},
       </if>
       <if test="goodsId != null">
         #{goodsId},
@@ -481,8 +481,8 @@
       <if test="record.goodsId != null">
         `goods_id` = #{record.goodsId},
       </if>
-      <if test="record.distributionChannel != null">
-        `distribution_channel` = #{record.distributionChannel},
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
       </if>
       <if test="record.goodsName != null">
         `goods_name` = #{record.goodsName},
@@ -575,8 +575,8 @@
       <if test="goodsId != null">
         `goods_id` = #{goodsId},
       </if>
-      <if test="distributionChannel != null">
-        `distribution_channel` = #{distributionChannel},
+      <if test="webSite != null">
+        `web_site` = #{webSite},
       </if>
       <if test="goodsName != null">
         `goods_name` = #{goodsName},

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

@@ -3,7 +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="web_site" property="webSite" />
     <result column="store_id" property="storeId" />
     <result column="email" property="email" />
     <result column="phone" property="phone" />
@@ -14,8 +14,8 @@
   <!--除主键外的所有字段，用于插入操作-->
   <sql id="columns">
     <trim suffixOverrides=",">
-      <if test="channel != null">
-        `channel`,
+      <if test="webSite != null">
+        `web_site`,
       </if>
       <if test="storeId != null">
         `store_id`,
@@ -45,8 +45,8 @@
   <sql id="whereCondition">
     <if test="example != null">
       <trim prefix="WHERE" prefixOverrides="AND|OR">
-        <if test="example.channel != null">
-          AND `channel` = #{example.channel}
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
         </if>
         <if test="example.storeId != null">
           AND `store_id` = #{example.storeId}
@@ -191,8 +191,8 @@
     )
     VALUES(
     <trim suffixOverrides=",">
-      <if test="channel != null">
-        #{channel},
+      <if test="webSite != null">
+        #{webSite},
       </if>
       <if test="storeId != null">
         #{storeId},
@@ -219,8 +219,8 @@
   <update id="updateByExampleSelective">
     UPDATE `enquiry_receive_mail_setting`
     <trim prefix="SET" suffixOverrides=",">
-      <if test="record.channel != null">
-        `channel` = #{record.channel},
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
       </if>
       <if test="record.storeId != null">
         `store_id` = #{record.storeId},
@@ -247,8 +247,8 @@
   <update id="updateByPrimaryKeySelective">
     UPDATE `enquiry_receive_mail_setting`
     <trim prefix="SET" suffixOverrides=",">
-      <if test="channel != null">
-        `channel` = #{channel},
+      <if test="webSite != null">
+        `web_site` = #{webSite},
       </if>
       <if test="storeId != null">
         `store_id` = #{storeId},

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.seller.pojo.StoreBindCategory">
     <id column="bind_id" property="bindId" />
     <result column="store_id" property="storeId" />
+    <result column="web_site" property="webSite" />
     <result column="create_vendor_id" property="createVendorId" />
     <result column="create_time" property="createTime" />
     <result column="goods_cate_name" property="goodsCateName" />
@@ -22,6 +23,9 @@
       <if test="storeId != null">
         `store_id`,
       </if>
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="createVendorId != null">
         `create_vendor_id`,
       </if>
@@ -74,6 +78,9 @@
         <if test="example.storeId != null">
           AND `store_id` = #{example.storeId}
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.createVendorId != null">
           AND `create_vendor_id` = #{example.createVendorId}
         </if>
@@ -247,6 +254,9 @@
       <if test="storeId != null">
         #{storeId},
       </if>
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="createVendorId != null">
         #{createVendorId},
       </if>
@@ -290,6 +300,9 @@
       <if test="record.storeId != null">
         `store_id` = #{record.storeId},
       </if>
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.createVendorId != null">
         `create_vendor_id` = #{record.createVendorId},
       </if>
@@ -333,6 +346,9 @@
       <if test="storeId != null">
         `store_id` = #{storeId},
       </if>
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="createVendorId != null">
         `create_vendor_id` = #{createVendorId},
       </if>

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

@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.slodon.b2b2c.dao.write.seller.StoreNameWriteMapper">
+    <resultMap id="resultMap" type="com.slodon.b2b2c.seller.pojo.StoreName">
+        <id column="id" property="id"/>
+        <result column="web_site" property="webSite"/>
+        <result column="store_id" property="storeId"/>
+        <result column="store_name" property="storeName"/>
+        <result column="create_id" property="createId"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_id" property="updateId"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+    <!--除主键外的所有字段，用于插入操作-->
+    <sql id="columns">
+        <trim suffixOverrides=",">
+            <if test="webSite != null">
+                `web_site`,
+            </if>
+            <if test="storeId != null">
+                `store_id`,
+            </if>
+            <if test="storeName != null">
+                `store_name`,
+            </if>
+            <if test="createId != null">
+                `create_id`,
+            </if>
+            <if test="createTime != null">
+                `create_time`,
+            </if>
+            <if test="updateId != null">
+                `update_id`,
+            </if>
+            <if test="updateTime != null">
+                `update_time`,
+            </if>
+        </trim>
+    </sql>
+    <!--按照主键值进行操作-->
+    <sql id="pkWhere">
+        WHERE `id` =
+        #{primaryKey}
+    </sql>
+    <!--操作条件-->
+    <sql id="whereCondition">
+        <if test="example != null">
+            <trim prefix="WHERE" prefixOverrides="AND|OR">
+                <if test="example.idNotEquals != null">
+                    AND `id` != #{example.idNotEquals}
+                </if>
+                <if test="example.storeId != null">
+                    AND `store_id` = #{example.storeId}
+                </if>
+                <if test="example.storeName != null">
+                    AND `store_name` = #{example.storeName}
+                </if>
+                <if test="example.webSite != null">
+                    AND `web_site` = #{example.webSite}
+                </if>
+            </trim>
+        </if>
+    </sql>
+    <!--排序条件-->
+    <sql id="orderBy">
+        ORDER BY `id` DESC
+    </sql>
+    <sql id="orderByOther">
+        order by
+        ${example.orderBy}
+    </sql>
+    <!--分组条件-->
+    <sql id="groupBy">
+        group by
+        ${example.groupBy}
+    </sql>
+    <!--分页条件-->
+    <sql id="limit">
+        <if test="size != null and size &gt; 0">
+            limit #{startRow},#{size}
+        </if>
+    </sql>
+    <!--查询符合条件的记录数-->
+    <select id="countByExample" parameterType="com.slodon.b2b2c.seller.example.StoreNameExample"
+            resultType="java.lang.Integer">
+        SELECT
+        COUNT(*)
+        FROM `store_name`
+        <include refid="whereCondition"/>
+    </select>
+    <!--根据主键查询记录-->
+    <select id="getByPrimaryKey" resultMap="resultMap">
+        SELECT
+        *
+        FROM `store_name`
+        <include refid="pkWhere"/>
+    </select>
+    <!--查询符合条件的记录(所有字段)-->
+    <select id="listByExample" resultMap="resultMap">
+        SELECT
+        *
+        FROM `store_name`
+        <include refid="whereCondition"/>
+        <if test="example.groupBy != null">
+            <include refid="groupBy"/>
+        </if>
+        <choose>
+            <when test="example.orderBy != null">
+                <include refid="orderByOther"/>
+            </when>
+            <otherwise>
+                <include refid="orderBy"/>
+            </otherwise>
+        </choose>
+    </select>
+    <!--分页查询符合条件的记录(所有字段)-->
+    <select id="listPageByExample" resultMap="resultMap">
+        SELECT
+        *
+        FROM `store_name`
+        <include refid="whereCondition"/>
+        <if test="example.groupBy != null">
+            <include refid="groupBy"/>
+        </if>
+        <choose>
+            <when test="example.orderBy != null">
+                <include refid="orderByOther"/>
+            </when>
+            <otherwise>
+                <include refid="orderBy"/>
+            </otherwise>
+        </choose>
+        <include refid="limit"/>
+    </select>
+    <!--查询符合条件的记录(指定字段)-->
+    <select id="listFieldsByExample" resultMap="resultMap">
+        SELECT
+        ${fields}
+        FROM `store_name`
+        <include refid="whereCondition"/>
+        <if test="example.groupBy != null">
+            <include refid="groupBy"/>
+        </if>
+        <choose>
+            <when test="example.orderBy != null">
+                <include refid="orderByOther"/>
+            </when>
+            <otherwise>
+                <include refid="orderBy"/>
+            </otherwise>
+        </choose>
+    </select>
+    <!--分页查询符合条件的记录(指定字段)-->
+    <select id="listFieldsPageByExample" resultMap="resultMap">
+        SELECT
+        ${fields}
+        FROM `store_name`
+        <include refid="whereCondition"/>
+        <if test="example.groupBy != null">
+            <include refid="groupBy"/>
+        </if>
+        <choose>
+            <when test="example.orderBy != null">
+                <include refid="orderByOther"/>
+            </when>
+            <otherwise>
+                <include refid="orderBy"/>
+            </otherwise>
+        </choose>
+        <include refid="limit"/>
+    </select>
+    <!--根据条件删除记录，可多条删除-->
+    <delete id="deleteByExample">
+        DELETE FROM `store_name`
+        <include refid="whereCondition"/>
+    </delete>
+    <!--根据主键删除记录-->
+    <delete id="deleteByPrimaryKey">
+        DELETE FROM `store_name`
+        <include refid="pkWhere"/>
+    </delete>
+    <!--插入一条记录-->
+    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.slodon.b2b2c.seller.pojo.StoreName"
+            useGeneratedKeys="true">
+        INSERT INTO `store_name`(
+        <include refid="columns"/>
+        )
+        VALUES(
+        <trim suffixOverrides=",">
+            <if test="webSite != null">
+                #{webSite},
+            </if>
+            <if test="storeId != null">
+                #{storeId},
+            </if>
+            <if test="storeName != null">
+                #{storeName},
+            </if>
+            <if test="createId != null">
+                #{createId},
+            </if>
+            <if test="createTime != null">
+                #{createTime},
+            </if>
+            <if test="updateId != null">
+                #{updateId},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime},
+            </if>
+        </trim>
+        )
+    </insert>
+    <!--按条件更新记录中不为空的字段-->
+    <update id="updateByExampleSelective">
+        UPDATE `store_name`
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="record.webSite != null">
+                `web_site` = #{record.webSite},
+            </if>
+            <if test="record.storeId != null">
+                `store_id` = #{record.storeId},
+            </if>
+            <if test="record.storeName != null">
+                `store_name` = #{record.storeName},
+            </if>
+            <if test="record.createId != null">
+                `create_id` = #{record.createId},
+            </if>
+            <if test="record.createTime != null">
+                `create_time` = #{record.createTime},
+            </if>
+            <if test="record.updateId != null">
+                `update_id` = #{record.updateId},
+            </if>
+            <if test="record.updateTime != null">
+                `update_time` = #{record.updateTime},
+            </if>
+        </trim>
+        <include refid="whereCondition"/>
+    </update>
+    <!--按照主键更新记录中不为空的字段-->
+    <update id="updateByPrimaryKeySelective">
+        UPDATE `store_name`
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="webSite != null">
+                `web_site` = #{webSite},
+            </if>
+            <if test="storeId != null">
+                `store_id` = #{storeId},
+            </if>
+            <if test="storeName != null">
+                `store_name` = #{storeName},
+            </if>
+            <if test="createId != null">
+                `create_id` = #{createId},
+            </if>
+            <if test="createTime != null">
+                `create_time` = #{createTime},
+            </if>
+            <if test="updateId != null">
+                `update_id` = #{updateId},
+            </if>
+            <if test="updateTime != null">
+                `update_time` = #{updateTime},
+            </if>
+        </trim>
+        WHERE `id` = #{id}
+    </update>
+</mapper>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/write/system/TplPcMallDataWriteMapper.xml

@@ -7,7 +7,7 @@
     <result column="tpl_pc_name" property="tplPcName" />
     <result column="tpl_pc_type" property="tplPcType" />
     <result column="tpl_pc_type_name" property="tplPcTypeName" />
-    <result column="site" property="site" />
+    <result column="web_site" property="webSite" />
     <result column="name" property="name" />
     <result column="create_time" property="createTime" />
     <result column="create_user_id" property="createUserId" />
@@ -34,8 +34,8 @@
       <if test="tplPcTypeName != null">
         `tpl_pc_type_name`,
       </if>
-      <if test="site != null">
-        `site`,
+      <if test="webSite != null">
+        `web_site`,
       </if>
       <if test="name != null">
         `name`,
@@ -101,8 +101,8 @@
         <if test="example.tplPcTypeNameLike != null">
           AND `tpl_pc_type_name` like concat('%',#{example.tplPcTypeNameLike},'%')
         </if>
-        <if test="example.site != null">
-          AND `site` = #{example.site}
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
         </if>
         <if test="example.name != null">
           AND `name` = #{example.name}
@@ -280,8 +280,8 @@
       <if test="tplPcTypeName != null">
         #{tplPcTypeName},
       </if>
-      <if test="site != null">
-        #{site},
+      <if test="webSite != null">
+        #{webSite},
       </if>
       <if test="name != null">
         #{name},
@@ -332,8 +332,8 @@
       <if test="record.tplPcTypeName != null">
         `tpl_pc_type_name` = #{record.tplPcTypeName},
       </if>
-      <if test="record.site != null">
-        `site` = #{record.site},
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
       </if>
       <if test="record.name != null">
         `name` = #{record.name},
@@ -384,8 +384,8 @@
       <if test="tplPcTypeName != null">
         `tpl_pc_type_name` = #{tplPcTypeName},
       </if>
-      <if test="site != null">
-        `site` = #{site},
+      <if test="webSite != null">
+        `web_site` = #{webSite},
       </if>
       <if test="name != null">
         `name` = #{name},

xinkeaboard-server/doc/DDL/update.sql

@@ -1,18 +1,37 @@
 ALTER TABLE member
 ADD COLUMN country VARCHAR(100) NULL COMMENT '国家',
 ADD COLUMN city VARCHAR(100) NULL COMMENT '城市',
-ADD COLUMN TINYINT NOT NULL DEFAULT 1 COMMENT '会员类型 1:海外门户 2:国内分销门户';
+ADD COLUMN web_site 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 web_site 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 product ADD COLUMN web_site 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_related_template ADD COLUMN web_site 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 web_site 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 ADD COLUMN web_site 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:国内分销门户';
+ALTER TABLE  enquiry_receive_mail_setting ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户';
 
-ALTER TABLE  sys_tpl_pc_mall_data ADD COLUMN site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户';
+ALTER TABLE  sys_tpl_pc_mall_data ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户';
+
+
+
+ALTER TABLE  store_bind_category ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户';
+
+CREATE TABLE `store_name`
+(
+    `id`          bigint                                                  NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `web_site`    tinyint                                                 NOT NULL DEFAULT 1 COMMENT '站点',
+    `store_id`    bigint                                                  NOT NULL COMMENT '店铺ID',
+    `store_name`  varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '店铺名称',
+
+    `create_id`   bigint                                                  NOT NULL COMMENT '创建人',
+    `create_time` datetime                                                NOT NULL COMMENT '创建时间',
+
+    `update_id`   bigint                                                           DEFAULT NULL COMMENT '更新人',
+    `update_time` datetime                                                         DEFAULT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='店铺名称表';