chore: merge master

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

@@ -14,6 +14,9 @@ public class ApplyBrandAddDTO implements Serializable {
 
     private static final long serialVersionUID = 242387892236111014L;
 
+    @ApiModelProperty(value ="站点")
+    private String webSite;
+
     @ApiModelProperty(value ="品牌名称",required = true)
     private String brandName;
 

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

@@ -17,6 +17,9 @@ public class ApplyBrandUpdateDTO implements Serializable {
     @ApiModelProperty(value ="品牌id",required = true)
     private Integer brandId;
 
+    @ApiModelProperty(value ="站点")
+    private String webSite;
+
     @ApiModelProperty(value ="品牌名称",required = true)
     private String brandName;
 

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

@@ -11,6 +11,9 @@ import java.io.Serializable;
 @Data
 public class StoreCertificateAddDTO implements Serializable {
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     @ApiModelProperty("荣誉资质名称")
     private String name;
 

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

@@ -13,6 +13,9 @@ public class StoreCertificateUpdateDTO implements Serializable {
     @ApiModelProperty("荣誉资质图片id")
     private Long id;
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     @ApiModelProperty("荣誉资质名称")
     private String name;
 

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

@@ -25,6 +25,11 @@ public class GoodsBrandExample implements Serializable {
     private Integer brandId;
 
     /**
+     * 站点 1:国外 2:国内
+     */
+    private String webSite;
+
+    /**
      * 品牌名称
      */
     private String brandName;

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

@@ -16,6 +16,9 @@ public class GoodsBrand implements Serializable {
     @ApiModelProperty("品牌id")
     private Integer brandId;
 
+    @ApiModelProperty("站点 1:国外 2:国内")
+    private String webSite;
+
     @ApiModelProperty("品牌名称")
     private String brandName;
 

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

@@ -11,6 +11,8 @@ import java.io.Serializable;
 @Data
 public class StoreCompanyShowListAddDTO implements Serializable {
 
+    @ApiModelProperty("站点")
+    private String webSite;
     @ApiModelProperty("工厂照片名称")
     private String name;
     @ApiModelProperty("工厂图片路径")

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

@@ -10,6 +10,8 @@ import lombok.Data;
 public class StoreCompanyShowListUpdateDTO {
     @ApiModelProperty("工厂照片id")
     private Long id;
+    @ApiModelProperty("站点")
+    private String webSite;
     @ApiModelProperty("工厂照片名称")
     private String name;
     @ApiModelProperty("工厂图片路径")

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

@@ -9,6 +9,8 @@ import lombok.Data;
  */
 @Data
 public class StoreProfileListAddDTO {
+    @ApiModelProperty("站点")
+    private String webSite;
     @ApiModelProperty("简介照片名称")
     private String name;
     @ApiModelProperty("工厂图片路径")

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

@@ -8,6 +8,8 @@ import lombok.Data;
  */
 @Data
 public class StoreProfileListUpdateDTO {
+    @ApiModelProperty("站点")
+    private String webSite;
     @ApiModelProperty("简介照片id")
     private Long id;
     @ApiModelProperty("简介照片名称")

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

@@ -705,6 +705,11 @@ public class StoreCertificateListExample {
             return (Criteria) this;
         }
 
+        public Criteria andWebSiteEqualTo(String value) {
+            addCriterion("web_site =", value, "webSite");
+            return (Criteria) this;
+        }
+
         public Criteria andUpdateIdIsNull() {
             addCriterion("update_id is null");
             return (Criteria) this;

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

@@ -25,6 +25,12 @@ public class StoreInnerLabelExample implements Serializable {
      */
     private Integer innerLabelId;
 
+
+    /**
+     * 站点
+     */
+    private String webSite;
+
     /**
      * 分类名称
      */

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

@@ -650,6 +650,12 @@ public class StoreProfileListExample {
             return (Criteria) this;
         }
 
+        public Criteria andWebSiteEqualTo(String value) {
+            addCriterion("web_site =", value, "webSite");
+            return (Criteria) this;
+        }
+
+
         public Criteria andStatusNotEqualTo(String value) {
             addCriterion("status <>", value, "status");
             return (Criteria) this;

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

@@ -270,6 +270,8 @@ public class StoreProfileTextListExample {
             return (Criteria) this;
         }
 
+
+
         public Criteria andStoreIdNotEqualTo(Long value) {
             addCriterion("store_id <>", value, "storeId");
             return (Criteria) this;
@@ -330,6 +332,11 @@ public class StoreProfileTextListExample {
             return (Criteria) this;
         }
 
+        public Criteria andWebSiteEqualTo(String value) {
+            addCriterion("web_site =", value, "webSite");
+            return (Criteria) this;
+        }
+
         public Criteria andContentNotEqualTo(String value) {
             addCriterion("content <>", value, "content");
             return (Criteria) this;
@@ -636,6 +643,7 @@ public class StoreProfileTextListExample {
         protected Criteria() {
             super();
         }
+
     }
 
     /**

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

@@ -0,0 +1,41 @@
+package com.slodon.b2b2c.seller.example;
+
+import com.slodon.b2b2c.core.response.PagerInfo;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class StoreSiteInfoExample implements Serializable {
+    private static final long serialVersionUID = 9095659065758029675L;
+
+    /**
+     * 用于编辑时的重复判断
+     */
+    private Long idNotEquals;
+
+
+    private Long storeId;
+
+    /**
+     * 站点
+     */
+    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/StoreCertificateList.java

@@ -15,6 +15,9 @@ public class StoreCertificateList {
      */
     private Long id;
 
+
+    private String webSite;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -341,4 +344,12 @@ public class StoreCertificateList {
     public String getImgUrl() {
         return DomainUrlUtil.SLD_IMAGE_RESOURCES + honorPath;
     }
+
+    public String getWebSite() {
+        return webSite;
+    }
+
+    public void setWebSite(String webSite) {
+        this.webSite = webSite;
+    }
 }

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

@@ -14,6 +14,8 @@ public class StoreCompanyShowList {
      */
     private Long id;
 
+    private String webSite;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -340,4 +342,12 @@ public class StoreCompanyShowList {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    public String getWebSite() {
+        return webSite;
+    }
+
+    public void setWebSite(String webSite) {
+        this.webSite = webSite;
+    }
 }

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

@@ -16,6 +16,9 @@ public class StoreInnerLabel implements Serializable {
     @ApiModelProperty("店铺内分类ID")
     private Integer innerLabelId;
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     @ApiModelProperty("分类名称")
     private String innerLabelName;
 

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

@@ -13,7 +13,7 @@ import java.util.Date;
 public class StoreName implements Serializable {
     private static final long serialVersionUID = 7492642995071695931L;
     @ApiModelProperty("id")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("店铺id")
     private Long storeId;

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

@@ -14,6 +14,8 @@ public class StoreProfileList {
      */
     private Long id;
 
+    private String webSite;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -340,4 +342,12 @@ public class StoreProfileList {
     public String getImgUrl() {
         return DomainUrlUtil.SLD_IMAGE_RESOURCES + path;
     }
+
+    public String getWebSite() {
+        return webSite;
+    }
+
+    public void setWebSite(String webSite) {
+        this.webSite = webSite;
+    }
 }

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

@@ -21,6 +21,9 @@ public class StoreProfileTextList {
      */
     private Long storeId;
 
+
+    private String webSite;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -233,4 +236,12 @@ public class StoreProfileTextList {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    public String getWebSite() {
+        return webSite;
+    }
+
+    public void setWebSite(String webSite) {
+        this.webSite = webSite;
+    }
 }

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

@@ -0,0 +1,61 @@
+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 StoreSiteInfo implements Serializable {
+    private static final long serialVersionUID = 7492642995071695931L;
+    @ApiModelProperty("id")
+    private Long id;
+
+    @ApiModelProperty("店铺id")
+    private Long storeId;
+
+    @ApiModelProperty("站点")
+    private String webSite;
+
+    @ApiModelProperty("店铺logo")
+    private String storeLogo;
+
+    @ApiModelProperty("pc端店铺横幅")
+    private String storeBannerPc;
+
+    @ApiModelProperty("店铺主营商品名称，用','分隔，例如'男装,女装,童装'")
+    private String mainBusiness;
+
+    @ApiModelProperty("店铺客服电话")
+    private String servicePhone;
+
+    @ApiModelProperty("店铺开店详细地址")
+    private String address;
+
+    @ApiModelProperty("店铺邮箱")
+    private String email;
+
+    @ApiModelProperty("店铺地图参数配置-经度")
+    private String storeMapInfo;
+
+    @ApiModelProperty("店铺地图参数配置-维度")
+    private String storeMapInfoW;
+
+    @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/TplPcMallDecoExample.java

@@ -28,6 +28,11 @@ public class TplPcMallDecoExample implements Serializable {
     private Integer decoId;
 
     /**
+     * 装修页站点
+     */
+    private String webSite;
+
+    /**
      * 装修页类型
      */
     private String decoType;

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

@@ -15,6 +15,9 @@ public class TplPcMallDeco implements Serializable {
     @ApiModelProperty("商城装修页面组装信息id")
     private Integer decoId;
 
+    @ApiModelProperty("装修页站点")
+    private String webSite;
+
     @ApiModelProperty("装修页类型")
     private String decoType;
 

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

@@ -53,17 +53,19 @@ public class ApplyBrandController {
 
     @ApiOperation("品牌列表")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点 1:国外 2:国内"),
             @ApiImplicitParam(name = "brandName", value = "品牌名称", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = "20", paramType = "query"),
             @ApiImplicitParam(name = "current", value = "当前页面位置", defaultValue = "1", paramType = "query")
     })
     @GetMapping("list")
-    public JsonResult<PageVO<SellerBrandVO>> getList(HttpServletRequest request, String brandName) {
+    public JsonResult<PageVO<SellerBrandVO>> getList(HttpServletRequest request, @RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite,String brandName) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
         GoodsBrandExample example = new GoodsBrandExample();
         example.setBrandNameLike(brandName);
+        example.setWebSite(webSite);
         example.setApplyStoreId(vendor.getStoreId());
         List<GoodsBrand> list = goodsBrandModel.getGoodsBrandList(example, pager);
         List<SellerBrandVO> vos = new ArrayList<>();
@@ -82,6 +84,7 @@ public class ApplyBrandController {
         String logMsg = "品牌名称" + applyBrandAddDTO.getBrandName();
         // 验证参数是否为空
         AssertUtil.notNull(applyBrandAddDTO, "品牌信息不能为空，请重试！");
+        AssertUtil.notEmpty(applyBrandAddDTO.getWebSite(), "品牌站点不能为空，请重试！");
         AssertUtil.notEmpty(applyBrandAddDTO.getBrandName(), "品牌名称不能为空，请重试！");
         AssertUtil.notEmpty(applyBrandAddDTO.getImage(), "品牌图片不能为空，请重试！");
         AssertUtil.notNullOrZero(applyBrandAddDTO.getCategoryId(), "分类不能为空，请重试！");
@@ -98,6 +101,7 @@ public class ApplyBrandController {
     public JsonResult<Integer> editBrand(HttpServletRequest request, ApplyBrandUpdateDTO applyBrandUpdateDTO) {
         AssertUtil.notNull(applyBrandUpdateDTO, "品牌信息不能为空，请重试！");
         AssertUtil.notNullOrZero(applyBrandUpdateDTO.getBrandId(), "品牌ID不能为空，请重试！");
+        AssertUtil.notEmpty(applyBrandUpdateDTO.getWebSite(), "品牌站点不能为空，请重试！");
         AssertUtil.notEmpty(applyBrandUpdateDTO.getBrandName(), "品牌名称不能为空，请重试！");
         AssertUtil.notEmpty(applyBrandUpdateDTO.getImage(), "品牌图片不能为空，请重试！");
         AssertUtil.notNullOrZero(applyBrandUpdateDTO.getCategoryId(), "分类不能为空，请重试！");

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

@@ -53,11 +53,14 @@ public class GoodsCategorySellerController {
 
     @ApiOperation("分类列表,获取当前分类的下级分类，0代表获取所有1级分类")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query"),
             @ApiImplicitParam(name = "categoryId", value = "分类Id(一级不传，二三级必传)", paramType = "query"),
             @ApiImplicitParam(name = "grade", value = "分类级别: 1-一级，2-二级，3-三级", defaultValue = "1", required = true)
     })
     @GetMapping("list")
-    public JsonResult<List<SellerGoodsCategoryVO>> getList(HttpServletRequest request, Integer categoryId,
+    public JsonResult<List<SellerGoodsCategoryVO>> getList(HttpServletRequest request,
+                                                           @RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite,
+                                                           Integer categoryId,
                                                            @RequestParam(value = "grade", defaultValue = "1") Integer grade) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
@@ -84,6 +87,7 @@ public class GoodsCategorySellerController {
             String fields;
             StoreBindCategoryExample example = new StoreBindCategoryExample();
             example.setStoreId(vendor.getStoreId());
+            example.setWebSite(webSite);
             example.setState(StoreConst.STORE_CATEGORY_STATE_PASS);
             if (grade == GoodsCategoryConst.CATEGORY_GRADE_1) {
                 fields = "goods_category_id1";

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

@@ -275,7 +275,7 @@ public class FrontStoreController {
         List<StoreProfileList> storeProfileList = storeProfileModel.getStoreProfileByStoreIdAndStatus(storeId);
         vo.setStoreProfileList(storeProfileList);
         //店铺简介的内容信息
-        StoreProfileTextList storeProfileTextList = storeProfileTextListModel.getList(storeId);
+        StoreProfileTextList storeProfileTextList = storeProfileTextListModel.getList(storeId, "1");
         vo.setStoreProfileTextList(storeProfileTextList);
 
         //店铺工厂图片信息

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

@@ -8,13 +8,17 @@ import com.slodon.b2b2c.core.response.JsonResult;
 import com.slodon.b2b2c.core.response.SldResponse;
 import com.slodon.b2b2c.core.util.AssertUtil;
 import com.slodon.b2b2c.core.util.UserUtil;
+import com.slodon.b2b2c.enums.WebSiteConstant;
+import com.slodon.b2b2c.goods.example.GoodsCategoryExample;
 import com.slodon.b2b2c.goods.pojo.GoodsCategory;
 import com.slodon.b2b2c.model.goods.GoodsCategoryModel;
 import com.slodon.b2b2c.model.seller.*;
+import com.slodon.b2b2c.model.system.SettingModel;
 import com.slodon.b2b2c.seller.dto.StoreApplyDTO;
 import com.slodon.b2b2c.seller.example.*;
 import com.slodon.b2b2c.seller.pojo.*;
 import com.slodon.b2b2c.starter.redisson.SlodonLock;
+import com.slodon.b2b2c.system.pojo.Setting;
 import com.slodon.b2b2c.vo.seller.ProcessVO;
 import com.slodon.b2b2c.vo.seller.StoreApplyDetailVO;
 import com.slodon.b2b2c.vo.seller.StoreGoodsCateVO;
@@ -55,6 +59,8 @@ public class SellerApplyController extends BaseController {
     private VendorModel vendorModel;
     @Resource
     private SlodonLock slodonLock;
+    @Resource
+    private SettingModel settingModel;
 
     @ApiOperation("保存入驻信息")
     @VendorLogger(option = "保存入驻信息")
@@ -134,21 +140,25 @@ public class SellerApplyController extends BaseController {
         vo.setPayAmount("￥" + new BigDecimal(storeGrade.getPrice()).multiply(new BigDecimal(storeApplyList.get(0).getApplyYear())));
         //审核状态信息
         if (storeApplyList.get(0).getState() == StoreConst.STATE_1_SEND_APPLY || storeApplyList.get(0).getState() == StoreConst.STATE_2_DONE_APPLY) {
+            List<Setting> webSiteList = settingModel.getSiteSetting();
+
             //待审核或审核通过，支付凭证信息
             //获取经营类目列表
             StoreBindCategoryExample storeBindCategoryExample = new StoreBindCategoryExample();
             storeBindCategoryExample.setCreateVendorId(storeApplyList.get(0).getVendorId());
             List<StoreBindCategory> storeBindCategoryList = storeBindCategoryModel.getStoreBindCategoryList(storeBindCategoryExample, null);
+
+            GoodsCategoryExample goodsCategoryExample = new GoodsCategoryExample();
+            List<GoodsCategory> goodsCategoryList = goodsCategoryModel.getGoodsCategoryList(goodsCategoryExample, null);
+
             List<StoreGoodsCateVO> storeGoodsCateVOList = new ArrayList<>();
             if (!CollectionUtils.isEmpty(storeBindCategoryList)) {
                 storeBindCategoryList.forEach(storeBindCategory -> {
                     StoreGoodsCateVO storeGoodsCateVO = new StoreGoodsCateVO(storeBindCategory);
-                    GoodsCategory goodsCategory1 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId1());
-                    storeGoodsCateVO.setGoodsCateName1(goodsCategory1.getCategoryName());
-                    GoodsCategory goodsCategory2 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId2());
-                    storeGoodsCateVO.setGoodsCateName2(goodsCategory2.getCategoryName());
-                    GoodsCategory goodsCategory3 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId3());
-                    storeGoodsCateVO.setGoodsCateName3(goodsCategory3.getCategoryName());
+                    storeGoodsCateVO.setWebSiteName(webSiteList.stream().filter(setting -> setting.getValue().equals(storeBindCategory.getWebSite())).findFirst().map(Setting::getTitle).orElse(""));
+                    storeGoodsCateVO.setGoodsCateName1(goodsCategoryList.stream().filter(goodsCategory -> goodsCategory.getCategoryId().equals(storeBindCategory.getGoodsCategoryId1())).findFirst().map(GoodsCategory::getCategoryName).orElse(""));
+                    storeGoodsCateVO.setGoodsCateName2(goodsCategoryList.stream().filter(goodsCategory -> goodsCategory.getCategoryId().equals(storeBindCategory.getGoodsCategoryId2())).findFirst().map(GoodsCategory::getCategoryName).orElse(""));
+                    storeGoodsCateVO.setGoodsCateName3(goodsCategoryList.stream().filter(goodsCategory -> goodsCategory.getCategoryId().equals(storeBindCategory.getGoodsCategoryId3())).findFirst().map(GoodsCategory::getCategoryName).orElse(""));
                     storeGoodsCateVOList.add(storeGoodsCateVO);
                 });
                 vo.setStoreGoodsCateVOList(storeGoodsCateVOList);
@@ -185,7 +195,6 @@ public class SellerApplyController extends BaseController {
         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());
@@ -193,20 +202,38 @@ public class SellerApplyController extends BaseController {
             vo.setStoreGradeName(storeGrade.getGradeName());
         }
 
+        List<Setting> webSiteList = settingModel.getSiteSetting();
+
         //获取经营类目信息
         StoreBindCategoryExample storeBindCategoryExample = new StoreBindCategoryExample();
         storeBindCategoryExample.setCreateVendorId(storeApply.getVendorId());
         List<StoreBindCategory> storeBindCategoryList = storeBindCategoryModel.getStoreBindCategoryList(storeBindCategoryExample, null);
+
+        GoodsCategoryExample goodsCategoryExample = new GoodsCategoryExample();
+        List<GoodsCategory> goodsCategoryList = goodsCategoryModel.getGoodsCategoryList(goodsCategoryExample, null);
+
         List<StoreGoodsCateVO> storeGoodsCateVOList = new ArrayList<>();
         if (!CollectionUtils.isEmpty(storeBindCategoryList)) {
             storeBindCategoryList.forEach(storeBindCategory -> {
                 StoreGoodsCateVO storeGoodsCateVO = new StoreGoodsCateVO(storeBindCategory);
-                GoodsCategory goodsCategory1 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId1());
-                storeGoodsCateVO.setGoodsCateName1(goodsCategory1.getCategoryName());
-                GoodsCategory goodsCategory2 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId2());
-                storeGoodsCateVO.setGoodsCateName2(goodsCategory2.getCategoryName());
-                GoodsCategory goodsCategory3 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId3());
-                storeGoodsCateVO.setGoodsCateName3(goodsCategory3.getCategoryName());
+                if (WebSiteConstant.MEMBER_OVERSEA.equals(storeBindCategory.getWebSite())) {
+                    storeGoodsCateVO.setStoreName(storeApply.getStoreName());
+                } else {
+                    storeGoodsCateVO.setStoreName(storeNameList.stream()
+                            .filter(name -> name.getWebSite().equals(storeBindCategory.getWebSite()))
+                            .findFirst()
+                            .map(StoreName::getStoreName)
+                            .orElse(""));
+                    storeGoodsCateVO.setId(storeNameList.stream()
+                            .filter(name -> name.getWebSite().equals(storeBindCategory.getWebSite()))
+                            .findFirst()
+                            .map(StoreName::getId)
+                            .orElse(null));
+                }
+                storeGoodsCateVO.setWebSiteName(webSiteList.stream().filter(setting -> setting.getValue().equals(storeBindCategory.getWebSite())).findFirst().map(Setting::getTitle).orElse(""));
+                storeGoodsCateVO.setGoodsCateName1(goodsCategoryList.stream().filter(goodsCategory -> goodsCategory.getCategoryId().equals(storeBindCategory.getGoodsCategoryId1())).findFirst().map(GoodsCategory::getCategoryName).orElse(""));
+                storeGoodsCateVO.setGoodsCateName2(goodsCategoryList.stream().filter(goodsCategory -> goodsCategory.getCategoryId().equals(storeBindCategory.getGoodsCategoryId2())).findFirst().map(GoodsCategory::getCategoryName).orElse(""));
+                storeGoodsCateVO.setGoodsCateName3(goodsCategoryList.stream().filter(goodsCategory -> goodsCategory.getCategoryId().equals(storeBindCategory.getGoodsCategoryId3())).findFirst().map(GoodsCategory::getCategoryName).orElse(""));
                 storeGoodsCateVOList.add(storeGoodsCateVO);
             });
             vo.setStoreGoodsCateVOList(storeGoodsCateVOList);

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

@@ -41,14 +41,16 @@ public class SellerBindCateController extends BaseController {
 
     @ApiOperation("商户获取经营类目列表")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query"),
             @ApiImplicitParam(name = "state", value = "申请状态：1-提交审核;2-审核通过;3-审核失败;", paramType = "query")
     })
     @GetMapping("list")
-    public JsonResult<PageVO<StoreBindCateVO>> getList(HttpServletRequest request, @RequestParam(value = "state", required = false) Integer state) {
+    public JsonResult<PageVO<StoreBindCateVO>> getList(HttpServletRequest request,@RequestParam(value = "webSite", required = false,defaultValue = "1") String webSite, @RequestParam(value = "state", required = false) Integer state) {
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         StoreBindCategoryExample storeBindCategoryExample = new StoreBindCategoryExample();
+        storeBindCategoryExample.setWebSite(webSite);
         storeBindCategoryExample.setStoreId(vendor.getStoreId());
         storeBindCategoryExample.setState(state);
         storeBindCategoryExample.setOrderBy("create_time desc,bind_id desc");
@@ -65,14 +67,15 @@ public class SellerBindCateController extends BaseController {
 
     @ApiOperation("申请经营类目")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query"),
             @ApiImplicitParam(name = "goodsCateIds", value = "申请分类id字符串,例1级-2级-3级,1级-2级-3级", required = true)
     })
     @VendorLogger(option = "申请经营类目")
     @PostMapping("apply")
-    public JsonResult<Integer> applyStoreBindCate(HttpServletRequest request, @RequestParam("goodsCateIds") String goodsCateIds) {
+    public JsonResult<Integer> applyStoreBindCate(HttpServletRequest request,@RequestParam(value = "webSite", required = false,defaultValue = "1") String webSite, @RequestParam("goodsCateIds") String goodsCateIds) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
-        storeBindCategoryModel.commitApply(goodsCateIds, vendor);
+        storeBindCategoryModel.commitApply(goodsCateIds,webSite, vendor);
         return SldResponse.success("申请已提交");
     }
 

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

@@ -47,16 +47,18 @@ public class SellerCategoryController extends BaseController {
 
     @ApiOperation("获取店铺分类列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "isShow", value = "是否显示，0-不显示，1-显示")
+            @ApiImplicitParam(name = "isShow", value = "是否显示，0-不显示，1-显示"),
+            @ApiImplicitParam(name = "webSite", value = "站点 1:国外 2:国内")
     })
     @GetMapping("list")
-    public JsonResult<List<StoreCategoryTreeVO>> getList(HttpServletRequest request, Integer isShow) {
+    public JsonResult<List<StoreCategoryTreeVO>> getList(HttpServletRequest request, Integer isShow,@RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite) {
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         List<StoreCategoryTreeVO> tree = new ArrayList<>();
         StoreInnerLabelExample example = new StoreInnerLabelExample();
         example.setParentInnerLabelId(0);
+        example.setWebSite(webSite);
         example.setStoreId(vendor.getStoreId());
         if (!StringUtil.isNullOrZero(isShow)) {
             example.setIsShow(StoreCateConst.STORE_LABEL_IS_SHOW);
@@ -70,10 +72,11 @@ public class SellerCategoryController extends BaseController {
 
     @ApiOperation("发布商品时获取店铺分类列表")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点 1:国外 2:国内"),
             @ApiImplicitParam(name = "isShow", value = "是否显示，0-不显示，1-显示")
     })
     @GetMapping("publishList")
-    public JsonResult<List<StoreCategoryTreeVO>> getpublishList(HttpServletRequest request) {
+    public JsonResult<List<StoreCategoryTreeVO>> getpublishList(HttpServletRequest request, @RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite) {
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
@@ -81,6 +84,7 @@ public class SellerCategoryController extends BaseController {
         StoreInnerLabelExample example = new StoreInnerLabelExample();
         example.setParentInnerLabelId(0);
         example.setStoreId(vendor.getStoreId());
+        example.setWebSite(webSite);
         example.setIsShow(StoreCateConst.STORE_LABEL_IS_SHOW);
 
         List<StoreInnerLabel> storeInnerLabelList = storeInnerLabelModel.getStoreInnerLabelList(example, pager);
@@ -91,6 +95,7 @@ public class SellerCategoryController extends BaseController {
 
     @ApiOperation("新增店铺分类")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点 1:国外 2:国内"),
             @ApiImplicitParam(name = "innerLabelName", value = "分类名称", required = true),
             @ApiImplicitParam(name = "parentInnerLabelId", value = "父分类ID,一级分类==0", required = true),
             @ApiImplicitParam(name = "innerLabelSort", value = "店铺内分类排序", required = true),
@@ -103,6 +108,7 @@ public class SellerCategoryController extends BaseController {
     @VendorLogger(option = "新增店铺分类")
     @PostMapping("add")
     public JsonResult<Integer> addStoreCategory(HttpServletRequest request,
+                                                @RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite,
                                                 @RequestParam("innerLabelName") String innerLabelName,
                                                 @RequestParam("parentInnerLabelId") Integer parentInnerLabelId,
                                                 @RequestParam("innerLabelSort") Integer innerLabelSort,
@@ -115,6 +121,7 @@ public class SellerCategoryController extends BaseController {
             innerLabelName = innerLabelName.replace("&amp;","&");
         }
         StoreInnerLabel storeInnerLabel = new StoreInnerLabel();
+        storeInnerLabel.setWebSite(webSite);
         storeInnerLabel.setInnerLabelName(innerLabelName);
         storeInnerLabel.setInnerLabelSort(innerLabelSort);
         storeInnerLabel.setIsShow(isShow);
@@ -136,6 +143,7 @@ public class SellerCategoryController extends BaseController {
     @ApiOperation("编辑店铺分类")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "innerLabelId", value = "分类id", required = true),
+            @ApiImplicitParam(name = "webSite", value = "站点"),
             @ApiImplicitParam(name = "innerLabelName", value = "分类名称", required = true),
             @ApiImplicitParam(name = "innerLabelSort", value = "排序", required = true),
             @ApiImplicitParam(name = "isShow", value = "是否显示，0-不显示，1-显示"),
@@ -144,6 +152,7 @@ public class SellerCategoryController extends BaseController {
     @PostMapping("edit")
     public JsonResult<Integer> editStoreCategory(HttpServletRequest request,
                                                  @RequestParam("innerLabelId") Integer innerLabelId,
+                                                 @RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite,
                                                  @RequestParam("innerLabelName") String innerLabelName,
                                                  @RequestParam("innerLabelSort") Integer innerLabelSort,
                                                  @RequestParam(value = "isShow", required = false) Integer isShow,
@@ -163,6 +172,7 @@ public class SellerCategoryController extends BaseController {
         }
         StoreInnerLabel storeInnerLabelUpdate = new StoreInnerLabel();
         storeInnerLabelUpdate.setInnerLabelId(innerLabelId);
+        storeInnerLabelUpdate.setWebSite(webSite);
         storeInnerLabelUpdate.setInnerLabelName(innerLabelName);
         storeInnerLabelUpdate.setInnerLabelSort(innerLabelSort);
         storeInnerLabelUpdate.setIsShow(isShow);
@@ -240,6 +250,7 @@ public class SellerCategoryController extends BaseController {
             for (StoreInnerLabel storeInnerLabel : data) {
                 StoreCategoryTreeVO tree = new StoreCategoryTreeVO();
                 tree.setInnerLabelId(storeInnerLabel.getInnerLabelId());
+                tree.setWebSite(storeInnerLabel.getWebSite());
                 tree.setInnerLabelName(storeInnerLabel.getInnerLabelName());
                 tree.setInnerLabelSort(storeInnerLabel.getInnerLabelSort());
                 tree.setIsShow(storeInnerLabel.getIsShow());

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

@@ -43,19 +43,21 @@ public class SellerStoreCertificateController {
 
     @ApiOperation("店铺荣誉资质列表")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query"),
             @ApiImplicitParam(name = "honorName", value = "荣誉资质图片名称", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = "20", paramType = "query"),
             @ApiImplicitParam(name = "current", value = "当前页面位置", defaultValue = "1", paramType = "query")
     })
     @GetMapping("list")
-    public JsonResult<PageVO<SellerCertificateVo>> getList(HttpServletRequest request
+    public JsonResult<PageVO<SellerCertificateVo>> getList(HttpServletRequest request,
+                                                           @RequestParam(value = "webSite", required = false,defaultValue = "1") String webSite
                                                            ,@RequestParam(value = "honorName", required = false) String honorName){
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
 
 
-        pager.setRowsCount(storeCertificateNewListModel.storeCertificateListPageCount(honorName,vendor.getStoreId()));
-        List<StoreCertificateList> list = storeCertificateNewListModel.getStoreCertificateListByPage(honorName, pager,vendor.getStoreId());
+        pager.setRowsCount(storeCertificateNewListModel.storeCertificateListPageCount(webSite,honorName,vendor.getStoreId()));
+        List<StoreCertificateList> list = storeCertificateNewListModel.getStoreCertificateListByPage(webSite,honorName, pager,vendor.getStoreId());
 
         List<SellerCertificateVo> vos = new ArrayList<>();
         if (!CollectionUtils.isEmpty(list)) {
@@ -96,6 +98,7 @@ public class SellerStoreCertificateController {
         String logMsg = "图片名称" + storeCertificateAddDTO.getName();
         // 验证参数是否为空
         AssertUtil.notNull(storeCertificateAddDTO, "品牌信息不能为空，请重试！");
+        AssertUtil.notEmpty(storeCertificateAddDTO.getWebSite(), "站点不能为空，请重试！");
         AssertUtil.notEmpty(storeCertificateAddDTO.getName(), "荣誉资质名称不能为空，请重试！");
         AssertUtil.notEmpty(storeCertificateAddDTO.getPath(), "图片路径不能为空，请重试！");
         AssertUtil.notNullOrZero(storeCertificateAddDTO.getSort(), "排序不能为空，请重试！");
@@ -118,6 +121,7 @@ public class SellerStoreCertificateController {
 //        storeCertificateUpdateDTO.setSort(3);
         // 验证参数是否为空
         AssertUtil.notNull(storeCertificateUpdateDTO, "品牌信息不能为空，请重试！");
+        AssertUtil.notEmpty(storeCertificateUpdateDTO.getWebSite(), "站点不能为空，请重试！");
         AssertUtil.notEmpty(storeCertificateUpdateDTO.getName(), "荣誉资质名称不能为空，请重试！");
         AssertUtil.notEmpty(storeCertificateUpdateDTO.getPath(), "图片路径不能为空，请重试！");
         AssertUtil.notNullOrZero(storeCertificateUpdateDTO.getSort(), "排序不能为空，请重试！");

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

@@ -39,18 +39,20 @@ public class SellerStoreCompanyShowController {
 
     @ApiOperation("店铺工厂图片列表")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query"),
             @ApiImplicitParam(name = "companyPictureName", value = "店铺工厂图片名称", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = "20", paramType = "query"),
             @ApiImplicitParam(name = "current", value = "当前页面位置", defaultValue = "1", paramType = "query")
     })
     @GetMapping("list")
     public JsonResult<PageVO<StoreCompanyShowListVo>> getList(HttpServletRequest request,
+                                                            @RequestParam(value = "webSite", required = false,defaultValue = "1") String webSite,
                                                             @RequestParam(value = "companyPictureName", required = false)String companyPictureName ){
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
 
-        pager.setRowsCount(sellerStoreCompanyShowModel.storeCompanyShowListPageCount(companyPictureName,vendor.getStoreId()));
-        List<StoreCompanyShowList> list = sellerStoreCompanyShowModel.getStoreCompanyShowListByPage(companyPictureName, pager,vendor.getStoreId());
+        pager.setRowsCount(sellerStoreCompanyShowModel.storeCompanyShowListPageCount(webSite,companyPictureName,vendor.getStoreId()));
+        List<StoreCompanyShowList> list = sellerStoreCompanyShowModel.getStoreCompanyShowListByPage(webSite,companyPictureName, pager,vendor.getStoreId());
         ArrayList<StoreCompanyShowListVo> vos = new ArrayList<>();
         if (!CollectionUtils.isEmpty(list)) {
             list.forEach(storeCompanyShowList -> {
@@ -67,6 +69,7 @@ public class SellerStoreCompanyShowController {
         String logMsg = "图片名称" + storeCompanyShowListAddDTO.getName();
         // 验证参数是否为空
         AssertUtil.notNull(storeCompanyShowListAddDTO, "工厂图片信息不能为空，请重试！");
+        AssertUtil.notEmpty(storeCompanyShowListAddDTO.getWebSite(), "站点不能为空，请重试！");
         AssertUtil.notEmpty(storeCompanyShowListAddDTO.getName(), "工厂图片名称不能为空，请重试！");
         AssertUtil.notEmpty(storeCompanyShowListAddDTO.getPath(), "图片路径不能为空，请重试！");
         AssertUtil.notNullOrZero(storeCompanyShowListAddDTO.getSort(), "排序不能为空，请重试！");
@@ -83,6 +86,7 @@ public class SellerStoreCompanyShowController {
     public JsonResult<Integer> editStoreCompanyShowList(HttpServletRequest request, StoreCompanyShowListUpdateDTO storeCompanyShowListUpdateDTO) {
         // 验证参数是否为空
         AssertUtil.notNull(storeCompanyShowListUpdateDTO, "工厂图片信息不能为空，请重试！");
+        AssertUtil.notEmpty(storeCompanyShowListUpdateDTO.getWebSite(), "站点不能为空，请重试！");
         AssertUtil.notEmpty(storeCompanyShowListUpdateDTO.getName(), "工厂图片名称不能为空，请重试！");
         AssertUtil.notEmpty(storeCompanyShowListUpdateDTO.getPath(), "图片路径不能为空，请重试！");
         AssertUtil.notNullOrZero(storeCompanyShowListUpdateDTO.getSort(), "排序不能为空，请重试！");

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

@@ -8,13 +8,15 @@ import com.slodon.b2b2c.core.response.SldResponse;
 import com.slodon.b2b2c.core.util.AssertUtil;
 import com.slodon.b2b2c.core.util.FileUrlUtil;
 import com.slodon.b2b2c.core.util.UserUtil;
+import com.slodon.b2b2c.enums.WebSiteConstant;
+import com.slodon.b2b2c.goods.example.GoodsCategoryExample;
 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.example.StoreApplyExample;
-import com.slodon.b2b2c.seller.example.StoreBindCategoryExample;
-import com.slodon.b2b2c.seller.example.StoreCertificateExample;
+import com.slodon.b2b2c.model.system.SettingModel;
+import com.slodon.b2b2c.seller.example.*;
 import com.slodon.b2b2c.seller.pojo.*;
+import com.slodon.b2b2c.system.pojo.Setting;
 import com.slodon.b2b2c.system.pojo.SysSeo;
 import com.slodon.b2b2c.vo.seller.StoreDetailVO;
 import com.slodon.b2b2c.vo.seller.StoreGoodsCateVO;
@@ -49,6 +51,12 @@ public class SellerStoreController extends BaseController {
     @Resource
     private StoreModel storeModel;
     @Resource
+    private StoreSiteInfoModel storeSiteInfoModel;
+    @Resource
+    private StoreNameModel storeNameModel;
+    @Resource
+    private SettingModel settingModel;
+    @Resource
     private StoreApplyModel storeApplyModel;
     @Resource
     private StoreCertificateModel storeCertificateModel;
@@ -66,11 +74,19 @@ public class SellerStoreController extends BaseController {
 
     @ApiOperation("查看店铺信息")
     @GetMapping("detail")
-    public JsonResult<StoreDetailVO> getDetail(HttpServletRequest request) {
+    @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query")
+    public JsonResult<StoreDetailVO> getDetail(HttpServletRequest request, @RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite) {
 
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
         //根据vendor获取店铺信息
         Store store = storeModel.getStoreByStoreId(vendor.getStoreId());
+        if (!WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
+            store = storeSiteInfoModel.getStoreByStoreIdAndWebSite(store.getStoreId(), webSite);
+            StoreNameExample storeNameExample = new StoreNameExample();
+            storeNameExample.setStoreId(store.getStoreId());
+            List<StoreName> storeNameList = storeNameModel.getStoreNameList(storeNameExample, null);
+            store.setStoreName(CollectionUtils.isEmpty(storeNameList) ? store.getStoreName() : storeNameList.get(0).getStoreName());
+        }
         AssertUtil.notNull(store, "未获取到店铺信息");
         AssertUtil.isTrue(!vendor.getStoreId().equals(store.getStoreId()), "非法操作");
 
@@ -102,18 +118,23 @@ public class SellerStoreController extends BaseController {
         //获取经营类目信息
         StoreBindCategoryExample storeBindCategoryExample = new StoreBindCategoryExample();
         storeBindCategoryExample.setStoreId(storeApply.getStoreId());
+        storeBindCategoryExample.setWebSite(webSite);
         storeBindCategoryExample.setState(StoreConst.STORE_CATEGORY_STATE_PASS);
         List<StoreBindCategory> storeBindCategoryList = storeBindCategoryModel.getStoreBindCategoryList(storeBindCategoryExample, null);
+
+        List<Setting> webSiteList = settingModel.getSiteSetting();
+
+        GoodsCategoryExample goodsCategoryExample = new GoodsCategoryExample();
+        List<GoodsCategory> goodsCategoryList = goodsCategoryModel.getGoodsCategoryList(goodsCategoryExample, null);
+
         List<StoreGoodsCateVO> storeGoodsCateVOList = new ArrayList<>();
         if (!CollectionUtils.isEmpty(storeBindCategoryList)) {
             storeBindCategoryList.forEach(storeBindCategory -> {
                 StoreGoodsCateVO storeGoodsCateVO = new StoreGoodsCateVO(storeBindCategory);
-                GoodsCategory goodsCategory1 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId1());
-                storeGoodsCateVO.setGoodsCateName1(goodsCategory1.getCategoryName());
-                GoodsCategory goodsCategory2 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId2());
-                storeGoodsCateVO.setGoodsCateName2(goodsCategory2.getCategoryName());
-                GoodsCategory goodsCategory3 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId3());
-                storeGoodsCateVO.setGoodsCateName3(goodsCategory3.getCategoryName());
+                storeGoodsCateVO.setWebSiteName(webSiteList.stream().filter(setting -> setting.getValue().equals(storeBindCategory.getWebSite())).findFirst().map(Setting::getTitle).orElse(""));
+                storeGoodsCateVO.setGoodsCateName1(goodsCategoryList.stream().filter(goodsCategory -> goodsCategory.getCategoryId().equals(storeBindCategory.getGoodsCategoryId1())).findFirst().map(GoodsCategory::getCategoryName).orElse(""));
+                storeGoodsCateVO.setGoodsCateName2(goodsCategoryList.stream().filter(goodsCategory -> goodsCategory.getCategoryId().equals(storeBindCategory.getGoodsCategoryId2())).findFirst().map(GoodsCategory::getCategoryName).orElse(""));
+                storeGoodsCateVO.setGoodsCateName3(goodsCategoryList.stream().filter(goodsCategory -> goodsCategory.getCategoryId().equals(storeBindCategory.getGoodsCategoryId3())).findFirst().map(GoodsCategory::getCategoryName).orElse(""));
                 storeGoodsCateVOList.add(storeGoodsCateVO);
             });
             vo.setStoreGoodsCateVOList(storeGoodsCateVOList);
@@ -168,17 +189,32 @@ public class SellerStoreController extends BaseController {
     }
 
     @ApiOperation("获取店铺设置信息接口")
+    @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query")
     @GetMapping("settingDetail")
-    public JsonResult<StoreSettingVO> settingDetail(HttpServletRequest request) {
+    public JsonResult<StoreSettingVO> settingDetail(HttpServletRequest request, @RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
-        Store store = storeModel.getStoreByStoreId(vendor.getStoreId());
-        SysSeo seoInfo = storeModel.getRecordByTargetIdAndType(vendor.getStoreId(),SeoTypeConstant.SEO_TYPE_SHOP);
-        if(seoInfo!=null){
-            store.setStoreSeoTitle(seoInfo.getTitle());
-            store.setStoreSeoDesc(seoInfo.getRemark());
-            store.setStoreSeoKeyword(seoInfo.getKeywords());
+        Store store;
+        if (WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
+            store = storeModel.getStoreByStoreId(vendor.getStoreId());
+            SysSeo seoInfo = storeModel.getRecordByTargetIdAndType(vendor.getStoreId(), SeoTypeConstant.SEO_TYPE_SHOP);
+            if (seoInfo != null) {
+                store.setStoreSeoTitle(seoInfo.getTitle());
+                store.setStoreSeoDesc(seoInfo.getRemark());
+                store.setStoreSeoKeyword(seoInfo.getKeywords());
+            }
+        } else {
+            store = storeSiteInfoModel.getStoreByStoreIdAndWebSite(vendor.getStoreId(), webSite);
+            SysSeo seoInfo = storeModel.getRecordByTargetIdAndType(vendor.getStoreId(), SeoTypeConstant.SEO_TYPE_SHOP + "_" + webSite);
+            if (seoInfo != null) {
+                store.setStoreSeoTitle(seoInfo.getTitle());
+                store.setStoreSeoDesc(seoInfo.getRemark());
+                store.setStoreSeoKeyword(seoInfo.getKeywords());
+            }
         }
+
+
+
         //查询店铺简介内容表里是否存在这笔数据
 //        StoreProfileTextList storeProfileTextInfo = storeProfileTextListModel.getList(vendor.getStoreId());
 //        if(storeProfileTextInfo!=null){
@@ -191,6 +227,7 @@ public class SellerStoreController extends BaseController {
 
     @ApiOperation("编辑店铺设置接口")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query"),
             @ApiImplicitParam(name = "mainBusiness", value = "店铺主营商品名称，用','分隔，例如'男装,女装,童装'"),
             @ApiImplicitParam(name = "storeLogo", value = "店铺logo"),
             @ApiImplicitParam(name = "servicePhone", value = "店铺客服电话"),
@@ -209,6 +246,7 @@ public class SellerStoreController extends BaseController {
     @VendorLogger(option = "编辑店铺设置接口")
     @PostMapping("updateSetting")
     public JsonResult<Integer> updateStoreSetting(HttpServletRequest request,
+                                                  @RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite,
                                                   @RequestParam(value = "mainBusiness", required = false) String mainBusiness,
                                                   @RequestParam(value = "storeLogo", required = false) String storeLogo,
                                                   @RequestParam(value = "servicePhone", required = false) String servicePhone,
@@ -227,25 +265,56 @@ public class SellerStoreController extends BaseController {
 
         String logMsg = "店铺id:" + vendor.getStoreId();
 
-        Store store = new Store();
-        store.setStoreId(vendor.getStoreId());
-        store.setMainBusiness(mainBusiness);
-        store.setStoreLogo(storeLogo);
-        store.setServicePhone(servicePhone);
-        store.setAddress(address);
-        store.setEmail(email);
-        store.setStoreBannerPc(storeBannerPc);
-        store.setStoreBannerMobile(storeBannerMobile);
-        store.setStoreBackdrop(storeBackdrop);
-        store.setStoreMapInfo(storeMapInfo);
-        store.setStoreMapInfoW(storeMapInfoW);
-
-        storeModel.updateStore(store);
+        if (WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
+            Store store = new Store();
+            store.setStoreId(vendor.getStoreId());
+            store.setMainBusiness(mainBusiness);
+            store.setStoreLogo(storeLogo);
+            store.setServicePhone(servicePhone);
+            store.setAddress(address);
+            store.setEmail(email);
+            store.setStoreBannerPc(storeBannerPc);
+            store.setStoreBannerMobile(storeBannerMobile);
+            store.setStoreBackdrop(storeBackdrop);
+            store.setStoreMapInfo(storeMapInfo);
+            store.setStoreMapInfoW(storeMapInfoW);
+            storeModel.updateStore(store);
+        }else {
+            StoreSiteInfoExample storeSiteInfoExample = new StoreSiteInfoExample();
+            storeSiteInfoExample.setStoreId(vendor.getStoreId());
+            storeSiteInfoExample.setWebSite(webSite);
+            Store store = storeSiteInfoModel.getStoreByStoreIdAndWebSite(vendor.getStoreId(), webSite);
+
+            StoreSiteInfo storeSiteInfo = new StoreSiteInfo();
+            storeSiteInfo.setStoreId(vendor.getStoreId());
+            storeSiteInfo.setWebSite(webSite);
+            storeSiteInfo.setStoreLogo(storeLogo);
+            storeSiteInfo.setServicePhone(servicePhone);
+            storeSiteInfo.setAddress(address);
+            storeSiteInfo.setEmail(email);
+            storeSiteInfo.setStoreBannerPc(storeBannerPc);
+            storeSiteInfo.setStoreMapInfo(storeMapInfo);
+            storeSiteInfo.setStoreMapInfoW(storeMapInfoW);
+
+            if (store == null) {
+                storeSiteInfo.setCreateId(vendor.getVendorId());
+                storeSiteInfo.setCreateTime(new Date());
+                storeSiteInfoModel.saveStoreSiteInfo(storeSiteInfo);
+            } else {
+                storeSiteInfo.setUpdateId(vendor.getVendorId());
+                storeSiteInfo.setUpdateTime(new Date());
+                storeSiteInfoModel.updateStoreSiteInfo(storeSiteInfo);
+            }
+        }
+
 
         //以下为新增SEO表
         SysSeo sysSeo = new SysSeo();
         sysSeo.setTenant(0L);
         sysSeo.setType(SeoTypeConstant.SEO_TYPE_SHOP);
+        if (!WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
+            sysSeo.setType(SeoTypeConstant.SEO_TYPE_SHOP + "_" + webSite);
+        }
         sysSeo.setName("店铺SEO");
 //        sysSeo.setCode(SeoTypeConstant.SEO_TYPE_SHOP+"_"+vendor.getStoreId());
         sysSeo.setTargetId(vendor.getStoreId());

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

@@ -50,18 +50,20 @@ public class SellerStoreProfileController {
 
     @ApiOperation("店铺简介图片列表")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点名称",paramType = "query"),
             @ApiImplicitParam(name = "profilePictureName", value = "店铺简介图片名称", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = "20", paramType = "query"),
             @ApiImplicitParam(name = "current", value = "当前页面位置", defaultValue = "1", paramType = "query")
     })
     @GetMapping("list")
     public JsonResult<PageVO<StoreProfileListVo>> getList(HttpServletRequest request,
+                                                          @RequestParam(value = "webSite", required = false,defaultValue = "1") String webSite,
                                                           @RequestParam(value = "profilePictureName", required = false)String profilePictureName ){
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
 
-        pager.setRowsCount(storeProfileModel.storeProfileListPageCount(profilePictureName,vendor.getStoreId()));
-        List<StoreProfileList> list = storeProfileModel.getStoreProfileListByPage(profilePictureName, pager,vendor.getStoreId());
+        pager.setRowsCount(storeProfileModel.storeProfileListPageCount(webSite,profilePictureName,vendor.getStoreId()));
+        List<StoreProfileList> list = storeProfileModel.getStoreProfileListByPage(webSite,profilePictureName, pager,vendor.getStoreId());
         ArrayList<StoreProfileListVo> vos = new ArrayList<>();
         if (!CollectionUtils.isEmpty(list)) {
             list.forEach(storeProfileList -> {
@@ -79,6 +81,7 @@ public class SellerStoreProfileController {
         String logMsg = "图片名称" + storeProfileListAddDTO.getName();
         // 验证参数是否为空
         AssertUtil.notNull(storeProfileListAddDTO, "简介图片信息不能为空，请重试！");
+        AssertUtil.notEmpty(storeProfileListAddDTO.getWebSite(), "站点不能为空，请重试！");
         AssertUtil.notEmpty(storeProfileListAddDTO.getName(), "简介图片名称不能为空，请重试！");
         AssertUtil.notEmpty(storeProfileListAddDTO.getPath(), "图片路径不能为空，请重试！");
         AssertUtil.notNullOrZero(storeProfileListAddDTO.getSort(), "排序不能为空，请重试！");
@@ -100,6 +103,7 @@ public class SellerStoreProfileController {
 //        storeProfileListUpdateDTO.setSort(3);
         // 验证参数是否为空
         AssertUtil.notNull(storeProfileListUpdateDTO, "简介图片信息不能为空，请重试！");
+        AssertUtil.notEmpty(storeProfileListUpdateDTO.getWebSite(), "站点不能为空，请重试！");
         AssertUtil.notEmpty(storeProfileListUpdateDTO.getName(), "简介图片名称不能为空，请重试！");
         AssertUtil.notEmpty(storeProfileListUpdateDTO.getPath(), "图片路径不能为空，请重试！");
         AssertUtil.notNullOrZero(storeProfileListUpdateDTO.getSort(), "排序不能为空，请重试！");
@@ -120,18 +124,21 @@ public class SellerStoreProfileController {
 
     @ApiOperation("编辑店铺简介内容接口")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点名称"),
             @ApiImplicitParam(name = "storeDesc", value = "店铺介绍")
     })
     @PostMapping("updateSetting")
     public JsonResult<Integer> updateStoreProfileText(HttpServletRequest request,
+                                                      @RequestParam(value = "webSite", required = false) String webSite,
                                                   @RequestParam(value = "storeDesc", required = false) String storeDesc ) throws ParseException {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
         String logMsg = "店铺id:" + vendor.getStoreId();
         //更新店铺简介内容表
         StoreProfileTextList storeProfileTextList = new StoreProfileTextList();
         storeProfileTextList.setContent(storeDesc);
+        storeProfileTextList.setWebSite(webSite);
         //查询店铺简介内容表里是否存在这笔数据
-        StoreProfileTextList storeProfileTextInfo = storeProfileTextListModel.getList(vendor.getStoreId());
+        StoreProfileTextList storeProfileTextInfo = storeProfileTextListModel.getList(vendor.getStoreId(),webSite);
         if(storeProfileTextInfo!=null){//更新
             storeProfileTextList.setUpdateId(vendor.getVendorId());
             storeProfileTextList.setUpdateTime(new Date());
@@ -147,15 +154,19 @@ public class SellerStoreProfileController {
     }
 
     @ApiOperation("获取店铺简介内容接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "网站名称")
+    })
     @GetMapping("settingDetail")
-    public JsonResult<StoreProfileTextVo> settingDetail(HttpServletRequest request) {
+    public JsonResult<StoreProfileTextVo> settingDetail(HttpServletRequest request, @RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 //        Store store = storeModel.getStoreByStoreId(vendor.getStoreId());
         StoreProfileTextVo storeProfileTextVo = new StoreProfileTextVo();
         //查询店铺简介内容表里是否存在这笔数据
-        StoreProfileTextList storeProfileTextInfo = storeProfileTextListModel.getList(vendor.getStoreId());
+        StoreProfileTextList storeProfileTextInfo = storeProfileTextListModel.getList(vendor.getStoreId(),webSite);
         if(storeProfileTextInfo!=null){
             storeProfileTextVo.setContent(storeProfileTextInfo.getContent());
+            storeProfileTextVo.setWebSite(storeProfileTextInfo.getWebSite());
         }
 
 

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/system/admin/AdminPcDecoController.java

@@ -108,7 +108,7 @@ public class AdminPcDecoController extends BaseController {
         tplPcMallDeco.setUpdateUserName(adminUser.getAdminName());
         tplPcMallDeco.setUpdateTime(new Date());
         tplPcMallDeco.setStoreId(0L);
-        tplPcMallDecoModel.saveTplPcMallDeco(tplPcMallDeco);
+        tplPcMallDecoModel.saveTplPcMallDeco(tplPcMallDeco,false);
         return SldResponse.success("添加成功", "装修页名称:" + tplPcMallDeco.getDecoName());
     }
 
@@ -248,7 +248,7 @@ public class AdminPcDecoController extends BaseController {
         deco.setUpdateUserName(adminUser.getAdminName());
         deco.setUpdateTime(new Date());
         deco.setStoreId(0L);
-        tplPcMallDecoModel.saveTplPcMallDeco(deco);
+        tplPcMallDecoModel.saveTplPcMallDeco(deco,true);
         return SldResponse.success("复制成功");
     }
 

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

@@ -42,6 +42,7 @@ public class SellerPcDecoController extends BaseController {
 
     @ApiOperation("首页装修列表")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "模板站点", paramType = "query"),
             @ApiImplicitParam(name = "decoType", value = "装修页类型", paramType = "query"),
             @ApiImplicitParam(name = "decoName", value = "装修页名称", paramType = "query"),
             @ApiImplicitParam(name = "isEnable", value = "是否启用，0==不启用；1==启用", paramType = "query"),
@@ -50,12 +51,14 @@ public class SellerPcDecoController extends BaseController {
     })
     @GetMapping("list")
     public JsonResult<PageVO<TplPcMallDecoVO>> list(HttpServletRequest request,
+                                                    @RequestParam(value = "decoType", required = false,defaultValue = "1") String webSite,
                                                     @RequestParam(value = "decoType", required = false) String decoType,
                                                     @RequestParam(value = "decoName", required = false) String decoName,
                                                     @RequestParam(value = "isEnable", required = false) Integer isEnable) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
         TplPcMallDecoExample example = new TplPcMallDecoExample();
+        example.setWebSite(webSite);
         example.setDecoType(decoType);
         example.setDecoNameLike(decoName);
         example.setIsEnable(isEnable);
@@ -80,15 +83,17 @@ public class SellerPcDecoController extends BaseController {
     @ApiOperation("添加装修页")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "decoType", value = "装修页类型", required = true),
+            @ApiImplicitParam(name = "webSite", value = "装修页站点"),
             @ApiImplicitParam(name = "decoName", value = "装修页名称", required = true)
     })
     @VendorLogger(option = "添加装修页")
     @PostMapping("add")
-    public JsonResult<Integer> add(HttpServletRequest request, String decoType, String decoName) {
+    public JsonResult<Integer> add(HttpServletRequest request, String decoType,@RequestParam (value = "webSite", required = false,defaultValue = "1") String webSite, String decoName) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         TplPcMallDeco tplPcMallDeco = new TplPcMallDeco();
         tplPcMallDeco.setDecoType(decoType);
+        tplPcMallDeco.setWebSite(webSite);
         tplPcMallDeco.setDecoName(decoName);
         tplPcMallDeco.setIsEnable(TplPcConst.IS_ENABLE_NO);
         tplPcMallDeco.setCreateUserId(vendor.getVendorId());
@@ -98,7 +103,7 @@ public class SellerPcDecoController extends BaseController {
         tplPcMallDeco.setUpdateUserName(vendor.getVendorName());
         tplPcMallDeco.setUpdateTime(new Date());
         tplPcMallDeco.setStoreId(vendor.getStoreId());
-        tplPcMallDecoModel.saveTplPcMallDeco(tplPcMallDeco);
+        tplPcMallDecoModel.saveTplPcMallDeco(tplPcMallDeco,false);
         return SldResponse.success("添加成功", "装修页名称:" + tplPcMallDeco.getDecoName());
     }
 
@@ -106,13 +111,14 @@ public class SellerPcDecoController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "decoId", value = "装修页id", required = true),
             @ApiImplicitParam(name = "decoType", value = "装修页类型", required = true),
+            @ApiImplicitParam(name = "webSite", value = "装修页站点"),
             @ApiImplicitParam(name = "decoName", value = "装修页名称", required = true),
             @ApiImplicitParam(name = "data", value = "装修页数据"),
             @ApiImplicitParam(name = "isEnable", value = "是否启用该装修页；0==不启用，1==启用")
     })
     @VendorLogger(option = "编辑装修页")
     @PostMapping("update")
-    public JsonResult<Integer> update(HttpServletRequest request, Integer decoId, String decoType, String decoName, String data, Integer isEnable) {
+    public JsonResult<Integer> update(HttpServletRequest request, Integer decoId, String decoType,@RequestParam (value = "webSite", required = false,defaultValue = "1") String webSite, String decoName, String data, Integer isEnable) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         TplPcMallDeco tplPcMallDecoDb = tplPcMallDecoModel.getTplPcMallDecoByDecoId(decoId);
@@ -122,6 +128,7 @@ public class SellerPcDecoController extends BaseController {
         TplPcMallDeco tplPcMallDeco = new TplPcMallDeco();
         tplPcMallDeco.setDecoId(decoId);
         tplPcMallDeco.setDecoType(decoType);
+        tplPcMallDeco.setWebSite(webSite);
         tplPcMallDeco.setDecoName(decoName);
         tplPcMallDeco.setData(data);
         tplPcMallDeco.setIsEnable(isEnable);
@@ -136,6 +143,7 @@ public class SellerPcDecoController extends BaseController {
             //关闭其他开启的装修页
             TplPcMallDecoExample example = new TplPcMallDecoExample();
             example.setDecoIdNotEquals(decoId);
+            example.setWebSite(webSite);
             example.setDecoType(tplPcMallDecoDb.getDecoType());
             example.setIsEnable(TplPcConst.IS_ENABLE_YES);
             example.setStoreId(vendor.getStoreId());
@@ -204,6 +212,7 @@ public class SellerPcDecoController extends BaseController {
         AssertUtil.isTrue(!tplPcMallDecoDb.getStoreId().equals(vendor.getStoreId()), "非法操作");
 
         TplPcMallDeco deco = new TplPcMallDeco();
+        deco.setWebSite(tplPcMallDecoDb.getWebSite());
         deco.setDecoType(tplPcMallDecoDb.getDecoType());
         deco.setDecoName("copy-" + tplPcMallDecoDb.getDecoName());
         deco.setData(tplPcMallDecoDb.getData());
@@ -215,7 +224,7 @@ public class SellerPcDecoController extends BaseController {
         deco.setUpdateUserName(vendor.getVendorName());
         deco.setUpdateTime(new Date());
         deco.setStoreId(vendor.getStoreId());
-        tplPcMallDecoModel.saveTplPcMallDeco(deco);
+        tplPcMallDecoModel.saveTplPcMallDeco(deco,true);
         return SldResponse.success("复制成功");
     }
 }

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

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-public interface StoreCertificateListReadMapper extends BaseReadMapper<StoreCertificateList , StoreCertificateListExample> {
+public interface StoreCertificateListReadMapper extends BaseReadMapper<StoreCertificateList, StoreCertificateListExample> {
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table store_certificate_list
@@ -36,23 +36,31 @@ public interface StoreCertificateListReadMapper extends BaseReadMapper<StoreCert
 
     /**
      * 店铺荣誉资质分页总条数
+     *
+     * @param webSite
      * @param honorName
      * @param storeId
      * @return
      */
-    Integer storeCertificateListPageCount(@Param("nameLike")String honorName,
-                                      @Param("storeId")Long storeId);
+    Integer storeCertificateListPageCount(
+            @Param("webSite") String webSite,
+            @Param("nameLike") String honorName,
+            @Param("storeId") Long storeId);
 
     /**
      * 店铺荣誉资质列表
+     *
+     * @param webSite
      * @param honorName
      * @param startRow
      * @param size
      * @return
      */
-    List<StoreCertificateList> getStoreCertificateListByPage(@Param("nameLike")String honorName,
-                                                @Param("startRow")Integer startRow,
-                                                @Param("size")Integer size,
-                                                @Param("storeId")Long storeId);
+    List<StoreCertificateList> getStoreCertificateListByPage(
+            @Param("webSite") String webSite,
+            @Param("nameLike") String honorName,
+            @Param("startRow") Integer startRow,
+            @Param("size") Integer size,
+            @Param("storeId") Long storeId);
 
 }

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

@@ -34,24 +34,32 @@ public interface StoreCompanyShowListReadMapper {
 
     /**
      * 店铺分页总条数
+     *
+     * @param webSite
      * @param companyPictureName
      * @param storeId
      * @return
      */
-    Integer storeCompanyShowPageCount(@Param("nameLike")String companyPictureName,
-                                      @Param("storeId")Long storeId);
+    Integer storeCompanyShowPageCount(
+            @Param("webSite") String webSite,
+            @Param("nameLike") String companyPictureName,
+            @Param("storeId") Long storeId);
 
 
     /**
      * 店铺工厂图片列表
+     *
+     * @param webSite
      * @param companyPictureName
      * @param startRow
      * @param size
      * @return
      */
-    List<StoreCompanyShowList> storeCompanyShowListPage(@Param("nameLike")String companyPictureName,
-                                                        @Param("startRow")Integer startRow,
-                                                        @Param("size")Integer size,
-                                                        @Param("storeId")Long storeId);
+    List<StoreCompanyShowList> storeCompanyShowListPage(
+            @Param("webSite") String webSite,
+            @Param("nameLike") String companyPictureName,
+            @Param("startRow") Integer startRow,
+            @Param("size") Integer size,
+            @Param("storeId") Long storeId);
 
 }

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

@@ -34,24 +34,30 @@ public interface StoreProfileListReadMapper {
 
     /**
      * 店铺简介分页总条数
+     *
+     * @param webSite
      * @param profilePictureName
      * @param storeId
      * @return
      */
-    Integer storeProfileListPageCount(@Param("nameLike")String profilePictureName,
-                                      @Param("storeId")Long storeId);
+    Integer storeProfileListPageCount(
+            @Param("webSite") String webSite,
+            @Param("nameLike") String profilePictureName,
+            @Param("storeId") Long storeId);
 
     /**
      * 店铺简介图片列表
+     *
+     * @param webSite
      * @param profilePictureName
      * @param startRow
      * @param size
      * @return
      */
-    List<StoreProfileList> storeProfileListPage(@Param("nameLike")String profilePictureName,
-                                                        @Param("startRow")Integer startRow,
-                                                        @Param("size")Integer size,
-                                                        @Param("storeId")Long storeId);
+    List<StoreProfileList> storeProfileListPage(@Param("webSite") String webSite, @Param("nameLike") String profilePictureName,
+                                                @Param("startRow") Integer startRow,
+                                                @Param("size") Integer size,
+                                                @Param("storeId") Long storeId);
 
 
 }

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

@@ -0,0 +1,12 @@
+package com.slodon.b2b2c.dao.read.seller;
+
+import com.slodon.b2b2c.core.database.BaseReadMapper;
+import com.slodon.b2b2c.seller.example.StoreSiteInfoExample;
+import com.slodon.b2b2c.seller.pojo.StoreSiteInfo;
+import org.apache.ibatis.annotations.Param;
+
+
+public interface StoreSiteInfoReadMapper extends BaseReadMapper<StoreSiteInfo, StoreSiteInfoExample> {
+
+    StoreSiteInfo getByStoreIdAndWebSite(@Param("storeId") Long storeId, @Param("webSite") String webSite);
+}

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/dao/write/seller/StoreSiteInfoWriteMapper.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.StoreSiteInfoExample;
+import com.slodon.b2b2c.seller.pojo.StoreSiteInfo;
+
+public interface StoreSiteInfoWriteMapper extends BaseWriteMapper<StoreSiteInfo, StoreSiteInfoExample> {
+}

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

@@ -102,6 +102,7 @@ public class GoodsBrandModel {
         //判断品牌名称是否重复
         GoodsBrandExample example = new GoodsBrandExample();
         example.setBrandName(applyBrandAddDTO.getBrandName());
+        example.setWebSite(applyBrandAddDTO.getWebSite());
         example.setApplyStoreId(vendor.getStoreId());
         List<GoodsBrand> list = goodsBrandReadMapper.listByExample(example);
         AssertUtil.isTrue(!CollectionUtils.isEmpty(list), "品牌名称已存在，请重新填写");
@@ -114,6 +115,7 @@ public class GoodsBrandModel {
 
         //插入品牌表
         GoodsBrand goodsBrandInsert = new GoodsBrand();
+        goodsBrandInsert.setWebSite(applyBrandAddDTO.getWebSite());
         goodsBrandInsert.setBrandName(applyBrandAddDTO.getBrandName());
         goodsBrandInsert.setBrandDesc(applyBrandAddDTO.getBrandDesc());
         goodsBrandInsert.setImage(applyBrandAddDTO.getImage());
@@ -227,6 +229,7 @@ public class GoodsBrandModel {
         //判断品牌名称是否重复
         GoodsBrandExample example = new GoodsBrandExample();
         example.setBrandName(applyBrandUpdateDTO.getBrandName());
+        example.setWebSite(applyBrandUpdateDTO.getWebSite());
         example.setBrandIdNotEquals(applyBrandUpdateDTO.getBrandId());
         example.setApplyStoreId(vendor.getStoreId());
         List<GoodsBrand> list = goodsBrandReadMapper.listByExample(example);
@@ -239,6 +242,7 @@ public class GoodsBrandModel {
         //更新品牌表
         GoodsBrand goodsBrandUpdate = new GoodsBrand();
         goodsBrandUpdate.setBrandId(applyBrandUpdateDTO.getBrandId());
+        goodsBrandUpdate.setWebSite(applyBrandUpdateDTO.getWebSite());
         goodsBrandUpdate.setBrandName(applyBrandUpdateDTO.getBrandName());
         goodsBrandUpdate.setBrandDesc(applyBrandUpdateDTO.getBrandDesc());
         goodsBrandUpdate.setImage(applyBrandUpdateDTO.getImage());

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

@@ -41,24 +41,26 @@ public class StoreCertificateNewListModel {
 
     /**
      *店铺荣誉资质列表分页总条数
+     * @param webSite 站点
      * @param honorName 简介照片名称
      * @param storeId 店铺id
      * @return
      */
-    public Integer storeCertificateListPageCount(String honorName , Long storeId){
-        return storeCertificateListReadMapper.storeCertificateListPageCount(honorName,storeId);
+    public Integer storeCertificateListPageCount(String webSite,String honorName , Long storeId){
+        return storeCertificateListReadMapper.storeCertificateListPageCount(webSite,honorName,storeId);
     }
 
     /**
      *店铺荣誉资质列表
+     * @param webSite 站点
      * @param honorName 查询条件
      * @param pager 分页信息
      * @return
      */
-    public List<StoreCertificateList> getStoreCertificateListByPage(String honorName , PagerInfo pager, Long storeId){
+    public List<StoreCertificateList> getStoreCertificateListByPage(String webSite,String honorName , PagerInfo pager, Long storeId){
         List<StoreCertificateList> list = null;
         if(pager!= null){
-            list = storeCertificateListReadMapper.getStoreCertificateListByPage(honorName,pager.getStart(),pager.getPageSize(),storeId);
+            list = storeCertificateListReadMapper.getStoreCertificateListByPage(webSite,honorName,pager.getStart(),pager.getPageSize(),storeId);
         }
         return list;
     }
@@ -91,12 +93,13 @@ public class StoreCertificateNewListModel {
     public Integer saveStoreCertificate(StoreCertificateAddDTO storeCertificateAddDTO, Vendor vendor) {
         //判断荣誉资质图片名称是否重复
         StoreCertificateListExample example = new StoreCertificateListExample();
-        example.createCriteria().andHonorNameEqualTo(storeCertificateAddDTO.getName()).andStatusEqualTo(StoreCertificateStatusConst.CER_NORMAL).andCreateIdEqualTo(vendor.getVendorId());
+        example.createCriteria().andHonorNameEqualTo(storeCertificateAddDTO.getName()).andStatusEqualTo(StoreCertificateStatusConst.CER_NORMAL).andCreateIdEqualTo(vendor.getVendorId()).andWebSiteEqualTo(storeCertificateAddDTO.getWebSite());
         List<StoreCertificateList> list = storeCertificateListReadMapper.selectByExample(example);
         AssertUtil.isTrue(!CollectionUtils.isEmpty(list), "荣誉资质名称已存在，请重新上传图片时重命名");
 
         //插入店铺荣誉资质表
         StoreCertificateList storeCertificateInfo = new StoreCertificateList();
+        storeCertificateInfo.setWebSite(storeCertificateAddDTO.getWebSite());
         storeCertificateInfo.setStoreId(vendor.getStoreId());
         storeCertificateInfo.setHonorName(storeCertificateAddDTO.getName());
         storeCertificateInfo.setHonorPath(storeCertificateAddDTO.getPath());
@@ -124,6 +127,7 @@ public class StoreCertificateNewListModel {
         StoreCertificateList storeCertificateInfo = getStoreCertificateInfo(storeCertificateUpdateDTO.getId());
 //        storeCertificateInfo.setId(storeCertificateUpdateDTO.getId());
 //        storeCertificateInfo.setStoreId(vendor.getStoreId());
+        storeCertificateInfo.setWebSite(storeCertificateUpdateDTO.getWebSite());
         storeCertificateInfo.setHonorName(storeCertificateUpdateDTO.getName());
         storeCertificateInfo.setHonorPath(storeCertificateUpdateDTO.getPath());
         storeCertificateInfo.setUpdateId(vendor.getVendorId());

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

@@ -40,24 +40,26 @@ public class SellerStoreCompanyShowModel {
 
     /**
      *店铺分页总条数
+     * @param webSite
      * @param companyPictureName 工厂照片名称
      * @param storeId 店铺id
      * @return
      */
-    public Integer storeCompanyShowListPageCount(String companyPictureName , Long storeId){
-        return storeCompanyShowListReadMapper.storeCompanyShowPageCount(companyPictureName,storeId);
+    public Integer storeCompanyShowListPageCount(String webSite,String companyPictureName , Long storeId){
+        return storeCompanyShowListReadMapper.storeCompanyShowPageCount(webSite,companyPictureName,storeId);
     }
 
     /**
      *店铺工厂图片列表
+     * @param webSite
      * @param companyPictureName 查询条件
      * @param pager 分页信息
      * @return
      */
-    public List<StoreCompanyShowList> getStoreCompanyShowListByPage(String companyPictureName , PagerInfo pager,Long storeId){
+    public List<StoreCompanyShowList> getStoreCompanyShowListByPage(String webSite,String companyPictureName , PagerInfo pager,Long storeId){
         List<StoreCompanyShowList> list = null;
         if(pager!= null){
-            list = storeCompanyShowListReadMapper.storeCompanyShowListPage(companyPictureName,pager.getStart(),pager.getPageSize(),storeId);
+            list = storeCompanyShowListReadMapper.storeCompanyShowListPage(webSite,companyPictureName,pager.getStart(),pager.getPageSize(),storeId);
         }
         return list;
     }
@@ -79,6 +81,7 @@ public class SellerStoreCompanyShowModel {
 
         //新增入库
         StoreCompanyShowList storeCompanyShowList = new StoreCompanyShowList();
+        storeCompanyShowList.setWebSite(storeCompanyShowList.getWebSite());
         storeCompanyShowList.setStoreId(vendor.getStoreId());
         storeCompanyShowList.setName(storeCompanyShowListAddDTO.getName());
         storeCompanyShowList.setPath(storeCompanyShowListAddDTO.getPath());
@@ -104,6 +107,7 @@ public class SellerStoreCompanyShowModel {
         //根据id查询到店铺工厂图片表的这笔记录
         StoreCompanyShowList storeCompanyShowListInfo = getStoreCompanyShowInfo(storeCompanyShowListUpdateDTO.getId());
         //页面上的id是肯定存在与库中的，不需要考虑storeCompanyShowListInfo是否为空
+        storeCompanyShowListInfo.setWebSite(storeCompanyShowListUpdateDTO.getWebSite());
         storeCompanyShowListInfo.setName(storeCompanyShowListUpdateDTO.getName());
         storeCompanyShowListInfo.setPath(storeCompanyShowListUpdateDTO.getPath());
         storeCompanyShowListInfo.setUpdateId(vendor.getVendorId());

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

@@ -19,6 +19,7 @@ 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.example.GoodsCategoryExample;
 import com.slodon.b2b2c.goods.pojo.GoodsCategory;
 import com.slodon.b2b2c.seller.dto.StoreApplyDTO;
 import com.slodon.b2b2c.seller.dto.StoreSiteCategoryInfoDTO;
@@ -40,6 +41,7 @@ import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -130,6 +132,7 @@ public class StoreApplyModel {
                 storeApply.setSubmitTime(new Date());
                 storeApply.setStoreId(storeId);
                 storeApply.setStoreType(StoreConst.NO_OWN_STORE);
+//                storeApply.setSiteInfoJson(JSON.toJSONString(storeApplyDTO.getSiteInfoList()));
                 //根据gradeId查询收费标准
                 StoreGrade storeGrade = storeGradeReadMapper.getByPrimaryKey(StoreConst.STORE_CRADE_1);
 //                 storeApply.setPayAmount(new BigDecimal(storeGrade.getPrice()).multiply(new BigDecimal(storeApplyDTO.getApplyYear())));
@@ -171,6 +174,9 @@ public class StoreApplyModel {
             throw new MallException("店铺资质表添加失败，请重试");
         }
 
+        GoodsCategoryExample goodsCategoryExample = new GoodsCategoryExample();
+        List<GoodsCategory> goodsCategoryList = goodsCategoryReadMapper.listByExample(goodsCategoryExample);
+
         for (StoreSiteCategoryInfoDTO siteCategoryInfoDTO : storeApplyDTO.getSiteInfoList()) {
             //插入store_bind_category表
             StoreBindCategory storeBindCategory = new StoreBindCategory();
@@ -187,11 +193,20 @@ public class StoreApplyModel {
                 storeBindCategory.setGoodsCategoryId2(Integer.parseInt(split1[1]));
                 storeBindCategory.setGoodsCategoryId3(Integer.parseInt(split1[2]));
                 //根据一级分类id查询一级分类名称
-                GoodsCategory goodsCategory1 = goodsCategoryReadMapper.getByPrimaryKey(split1[0]);
+                GoodsCategory goodsCategory1 = goodsCategoryList.stream()
+                        .filter(goodsCategory -> goodsCategory.getCategoryId().equals(Integer.valueOf(split1[0])))
+                        .findFirst()
+                        .orElseThrow(() -> new MallException("未找到对应的一级商品分类"));
                 //根据二级分类id查询二级分类名称
-                GoodsCategory goodsCategory2 = goodsCategoryReadMapper.getByPrimaryKey(split1[1]);
+                GoodsCategory goodsCategory2 = goodsCategoryList.stream()
+                        .filter(goodsCategory -> goodsCategory.getCategoryId().equals(Integer.valueOf(split1[1])))
+                        .findFirst()
+                        .orElseThrow(() -> new MallException("未找到对应的二级商品分类"));
                 //根据三级分类id查询三级分类名称
-                GoodsCategory goodsCategory3 = goodsCategoryReadMapper.getByPrimaryKey(split1[2]);
+                GoodsCategory goodsCategory3 = goodsCategoryList.stream()
+                        .filter(goodsCategory -> goodsCategory.getCategoryId().equals(Integer.valueOf(split1[2])))
+                        .findFirst()
+                        .orElseThrow(() -> new MallException("未找到对应的三级商品分类"));
                 //拼接类目组合名称
                 String goodsCateName = goodsCategory1.getCategoryName() + ">" + goodsCategory2.getCategoryName() + ">" + goodsCategory3.getCategoryName();
                 storeBindCategory.setGoodsCateName(goodsCateName);
@@ -343,6 +358,9 @@ public class StoreApplyModel {
         storeBindCategoryExample.setCreateVendorId(vendor.getVendorId());
         storeBindCategoryWriteMapper.deleteByExample(storeBindCategoryExample);
 
+        GoodsCategoryExample goodsCategoryExample = new GoodsCategoryExample();
+        List<GoodsCategory> goodsCategoryList = goodsCategoryReadMapper.listByExample(goodsCategoryExample);
+
         for (StoreSiteCategoryInfoDTO siteCategoryInfoDTO : storeApplyDTO.getSiteInfoList()) {
             StoreBindCategory storeBindCategory = new StoreBindCategory();
             storeBindCategory.setStoreId(0L);
@@ -358,11 +376,20 @@ public class StoreApplyModel {
                 storeBindCategory.setGoodsCategoryId2(Integer.parseInt(split1[1]));
                 storeBindCategory.setGoodsCategoryId3(Integer.parseInt(split1[2]));
                 //根据一级分类id查询一级分类名称
-                GoodsCategory goodsCategory1 = goodsCategoryReadMapper.getByPrimaryKey(split1[0]);
+                GoodsCategory goodsCategory1 = goodsCategoryList.stream()
+                        .filter(goodsCategory -> goodsCategory.getCategoryId().equals(Integer.valueOf(split1[0])))
+                        .findFirst()
+                        .orElseThrow(() -> new MallException("未找到对应的一级商品分类"));
                 //根据二级分类id查询二级分类名称
-                GoodsCategory goodsCategory2 = goodsCategoryReadMapper.getByPrimaryKey(split1[1]);
+                GoodsCategory goodsCategory2 = goodsCategoryList.stream()
+                        .filter(goodsCategory -> goodsCategory.getCategoryId().equals(Integer.valueOf(split1[1])))
+                        .findFirst()
+                        .orElseThrow(() -> new MallException("未找到对应的二级商品分类"));
                 //根据三级分类id查询三级分类名称
-                GoodsCategory goodsCategory3 = goodsCategoryReadMapper.getByPrimaryKey(split1[2]);
+                GoodsCategory goodsCategory3 = goodsCategoryList.stream()
+                        .filter(goodsCategory -> goodsCategory.getCategoryId().equals(Integer.valueOf(split1[2])))
+                        .findFirst()
+                        .orElseThrow(() -> new MallException("未找到对应的三级商品分类"));
                 //拼接类目组合名称
                 String goodsCateName = goodsCategory1.getCategoryName() + ">" + goodsCategory2.getCategoryName() + ">" + goodsCategory3.getCategoryName();
                 storeBindCategory.setGoodsCateName(goodsCateName);

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

@@ -53,9 +53,10 @@ public class StoreBindCategoryModel {
      * @param vendor       操作员
      * @return
      */
-    public Integer commitApply(String goodsCateIds, Vendor vendor) {
+    public Integer commitApply(String goodsCateIds,String webSite, Vendor vendor) {
         StoreBindCategory storeBindCategory = new StoreBindCategory();
         storeBindCategory.setStoreId(vendor.getStoreId());
+        storeBindCategory.setWebSite(webSite);
         storeBindCategory.setCreateVendorId(vendor.getVendorId());
         storeBindCategory.setCreateTime(new Date());
         storeBindCategory.setState(StoreConst.STORE_CATEGORY_STATE_SEND);

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

@@ -108,7 +108,7 @@ public class StoreCreateDataModel {
         deco.setUpdateUserName(vendor.getVendorName());
         deco.setUpdateTime(new Date());
         deco.setStoreId(storeApply.getStoreId());
-        int count = tplPcMallDecoModel.saveTplPcMallDeco(deco);
+        int count = tplPcMallDecoModel.saveTplPcMallDeco(deco,false);
         if (count == 0) {
             throw new MallException("店铺首页创建失败，请重试");
         }

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

@@ -97,6 +97,7 @@ public class StoreInnerLabelModel {
     public Integer editStoreCategory(StoreInnerLabel storeInnerLabel) {
         //判断分类名称是否重复
         StoreInnerLabelExample storeInnerLabelExample = new StoreInnerLabelExample();
+        storeInnerLabelExample.setWebSite(storeInnerLabel.getWebSite());
         storeInnerLabelExample.setInnerLabelName(storeInnerLabel.getInnerLabelName());
         storeInnerLabelExample.setStoreId(storeInnerLabel.getStoreId());
         storeInnerLabelExample.setParentInnerLabelId(storeInnerLabel.getParentInnerLabelId());

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

@@ -44,8 +44,8 @@ public class StoreProfileModel {
      * @param storeId 店铺id
      * @return
      */
-    public Integer storeProfileListPageCount(String profilePictureName , Long storeId){
-        return storeProfileListReadMapper.storeProfileListPageCount(profilePictureName,storeId);
+    public Integer storeProfileListPageCount(String webSite,String profilePictureName , Long storeId){
+        return storeProfileListReadMapper.storeProfileListPageCount(webSite,profilePictureName,storeId);
     }
 
     /**
@@ -54,10 +54,10 @@ public class StoreProfileModel {
      * @param pager 分页信息
      * @return
      */
-    public List<StoreProfileList> getStoreProfileListByPage(String profilePictureName , PagerInfo pager, Long storeId){
+    public List<StoreProfileList> getStoreProfileListByPage(String webSite,String profilePictureName , PagerInfo pager, Long storeId){
         List<StoreProfileList> list = null;
         if(pager!= null){
-            list = storeProfileListReadMapper.storeProfileListPage(profilePictureName,pager.getStart(),pager.getPageSize(),storeId);
+            list = storeProfileListReadMapper.storeProfileListPage(webSite,profilePictureName,pager.getStart(),pager.getPageSize(),storeId);
         }
         return list;
     }
@@ -72,12 +72,13 @@ public class StoreProfileModel {
     public Integer saveStoreProfile(StoreProfileListAddDTO storeProfileListAddDTO , Vendor vendor){
         //店铺工厂图片名称是否重复
         StoreProfileListExample example = new StoreProfileListExample();
-        example.createCriteria().andNameEqualTo(storeProfileListAddDTO.getName()).andStatusEqualTo(StoreCompanyShowConstant.COMPANY_NORMAL).andCreateIdEqualTo(vendor.getVendorId());
+        example.createCriteria().andNameEqualTo(storeProfileListAddDTO.getName()).andStatusEqualTo(StoreCompanyShowConstant.COMPANY_NORMAL).andCreateIdEqualTo(vendor.getVendorId()).andWebSiteEqualTo(storeProfileListAddDTO.getWebSite());
         List<StoreProfileList> list = storeProfileListReadMapper.selectByExample(example);
         AssertUtil.isTrue(!CollectionUtils.isEmpty(list), "公司介绍图片名称已存在，请重新上传图片时重命名");
 
         //新增入库
         StoreProfileList storeProfileList = new StoreProfileList();
+        storeProfileList.setWebSite(storeProfileListAddDTO.getWebSite());
         storeProfileList.setStoreId(vendor.getStoreId());
         storeProfileList.setName(storeProfileListAddDTO.getName());
         storeProfileList.setPath(storeProfileListAddDTO.getPath());
@@ -107,6 +108,7 @@ public class StoreProfileModel {
         //页面上的id是肯定存在与库中的，不需要考虑storeCompanyShowListInfo是否为空
         storeProfileListInfo.setName(storeProfileListUpdateDTO.getName());
         storeProfileListInfo.setPath(storeProfileListUpdateDTO.getPath());
+        storeProfileListInfo.setWebSite(storeProfileListUpdateDTO.getWebSite());
         storeProfileListInfo.setUpdateId(vendor.getVendorId());
         storeProfileListInfo.setUpdateTime(new Date());
         storeProfileListInfo.setSort(storeProfileListUpdateDTO.getSort());

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

@@ -33,10 +33,11 @@ public class StoreProfileTextListModel {
      * @param storeId 店铺id
      * @return
      */
-    public StoreProfileTextList getList(Long storeId){
+    public StoreProfileTextList getList(Long storeId,String webSite){
         StoreProfileTextList storeProfileTextList = null;
         StoreProfileTextListExample storeProfileTextListExample = new StoreProfileTextListExample();
         storeProfileTextListExample.createCriteria().andStoreIdEqualTo(storeId);
+        storeProfileTextListExample.createCriteria().andWebSiteEqualTo(webSite);
         List<StoreProfileTextList> storeProfileTextInfoList = storeProfileTextListReadMapper.selectByExample(storeProfileTextListExample);
         if(!CollectionUtils.isEmpty(storeProfileTextInfoList)){
             storeProfileTextList = storeProfileTextInfoList.get(NumConstant.ZERO);
@@ -52,6 +53,7 @@ public class StoreProfileTextListModel {
     public Integer updateProfileText(StoreProfileTextList storeProfileTextList,Long storeId){
         StoreProfileTextListExample storeProfileTextListExample = new StoreProfileTextListExample();
         storeProfileTextListExample.createCriteria().andStoreIdEqualTo(storeId);
+        storeProfileTextListExample.createCriteria().andWebSiteEqualTo(storeProfileTextList.getWebSite());
         int count = storeProfileTextListWriteMapper.updateByExampleSelective(storeProfileTextList,storeProfileTextListExample);
         if(count==0){
             throw new MallException("更新店铺简介内容表失败,请重试");

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

@@ -0,0 +1,40 @@
+package com.slodon.b2b2c.model.seller;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.slodon.b2b2c.dao.read.seller.StoreReadMapper;
+import com.slodon.b2b2c.dao.read.seller.StoreSiteInfoReadMapper;
+import com.slodon.b2b2c.dao.write.seller.StoreSiteInfoWriteMapper;
+import com.slodon.b2b2c.dao.write.seller.StoreWriteMapper;
+import com.slodon.b2b2c.seller.example.StoreSiteInfoExample;
+import com.slodon.b2b2c.seller.pojo.Store;
+import com.slodon.b2b2c.seller.pojo.StoreSiteInfo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+@Component
+@Slf4j
+public class StoreSiteInfoModel {
+
+    @Resource
+    private StoreSiteInfoReadMapper storeSiteInfoReadMapper;
+    @Resource
+    private StoreSiteInfoWriteMapper storeSiteInfoWriteMapper;
+
+    public Store getStoreByStoreIdAndWebSite(Long storeId, String webSite) {
+       StoreSiteInfo storeSiteInfo = storeSiteInfoReadMapper.getByStoreIdAndWebSite(storeId, webSite);
+       return BeanUtil.copyProperties(storeSiteInfo, Store.class);
+    }
+
+    public void saveStoreSiteInfo(StoreSiteInfo storeSiteInfo) {
+        storeSiteInfoWriteMapper.insert(storeSiteInfo);
+    }
+
+    public void updateStoreSiteInfo(StoreSiteInfo storeSiteInfo) {
+        StoreSiteInfoExample example =new StoreSiteInfoExample();
+        example.setWebSite(storeSiteInfo.getWebSite());
+        example.setStoreId(storeSiteInfo.getStoreId());
+        storeSiteInfoWriteMapper.updateByExampleSelective(storeSiteInfo, example);
+    }
+}

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

@@ -32,15 +32,16 @@ public class TplPcMallDecoModel {
      * JIANGSU ZHONGHUI STAGE TECHNOLOGY CO.,LTD.
      * @return
      */
-    public Integer saveTplPcMallDeco(TplPcMallDeco tplPcMallDeco) {
+    public Integer saveTplPcMallDeco(TplPcMallDeco tplPcMallDeco,Boolean isCopy) {
         //名称查重
         TplPcMallDecoExample example = new TplPcMallDecoExample();
         example.setDecoName(tplPcMallDeco.getDecoName());
         example.setDecoType(tplPcMallDeco.getDecoType());
+        example.setWebSite(tplPcMallDeco.getWebSite());
         example.setStoreId(tplPcMallDeco.getStoreId());
         List<TplPcMallDeco> tplPcMallDecos = tplPcMallDecoReadMapper.listByExample(example);
         AssertUtil.isTrue(!CollectionUtils.isEmpty(tplPcMallDecos), "名称重复，请重试");
-        AssertUtil.isTrue(tplPcMallDeco.getDecoName().length() > 150, "复制后名称过长，请修改");
+        if (isCopy) AssertUtil.isTrue(tplPcMallDeco.getDecoName().length() > 150, "复制后名称过长，请修改");
         int count = tplPcMallDecoWriteMapper.insert(tplPcMallDeco);
         if (count == 0) {
             throw new MallException("添加PC商城装修页组装信息表（基于实例化数据表组合）失败，请重试");
@@ -90,6 +91,16 @@ public class TplPcMallDecoModel {
         if (StringUtils.isEmpty(tplPcMallDeco.getDecoId())) {
             throw new MallException("请选择要修改的数据");
         }
+        //名称查重
+        TplPcMallDecoExample example = new TplPcMallDecoExample();
+        example.setDecoIdNotEquals(tplPcMallDeco.getDecoId());
+        example.setDecoName(tplPcMallDeco.getDecoName());
+        example.setDecoType(tplPcMallDeco.getDecoType());
+        example.setWebSite(tplPcMallDeco.getWebSite());
+        example.setStoreId(tplPcMallDeco.getStoreId());
+        List<TplPcMallDeco> tplPcMallDecos = tplPcMallDecoReadMapper.listByExample(example);
+        AssertUtil.isTrue(!CollectionUtils.isEmpty(tplPcMallDecos), "名称重复，请重试");
+
         int count = tplPcMallDecoWriteMapper.updateByPrimaryKeySelective(tplPcMallDeco);
         if (count == 0) {
             log.error("根据decoId：" + tplPcMallDeco.getDecoId() + "更新PC商城装修页组装信息表（基于实例化数据表组合）失败");

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

@@ -20,6 +20,9 @@ public class SellerBrandDetailVO {
     @ApiModelProperty("品牌id")
     private Integer brandId;
 
+    @ApiModelProperty("品牌站点")
+    private String webSite;
+
     @ApiModelProperty("品牌名称")
     private String brandName;
 
@@ -58,6 +61,7 @@ public class SellerBrandDetailVO {
 
     public SellerBrandDetailVO(GoodsBrand brand) {
         this.brandId = brand.getBrandId();
+        this.webSite = brand.getWebSite();
         this.brandName = brand.getBrandName();
         this.brandDesc = brand.getBrandDesc();
         this.image = brand.getImage();

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

@@ -19,6 +19,9 @@ public class SellerBrandVO {
     @ApiModelProperty("品牌id")
     private Integer brandId;
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     @ApiModelProperty("品牌名称")
     private String brandName;
 

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

@@ -16,6 +16,9 @@ public class SellerCertificateVo {
     @ApiModelProperty("店铺荣誉资质id")
     private Long id;
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     @ApiModelProperty("店铺id")
     private Long storeId;
 

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

@@ -21,6 +21,9 @@ public class StoreCategoryTreeVO implements Serializable {
     @ApiModelProperty("店铺内分类ID")
     private Integer innerLabelId;
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     @ApiModelProperty("分类名称")
     private String innerLabelName;
 

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

@@ -12,6 +12,8 @@ public class StoreCompanyShowListVo {
 
     private Long id;
 
+    private String webSite;
+
     private Long storeId;
 
     private String name;

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

@@ -17,9 +17,18 @@ public class StoreGoodsCateVO {
     @ApiModelProperty("绑定id")
     private Integer bindId;
 
+    @ApiModelProperty("店铺其他站点店铺名称表id")
+    private Long id;
+
     @ApiModelProperty("店铺入驻站点")
     private String webSite;
 
+    @ApiModelProperty("店铺入驻站点名称")
+    private String webSiteName;
+
+    @ApiModelProperty("店铺名称")
+    private String storeName;
+
     @ApiModelProperty("申请分类id（一级）")
     private Integer goodsCategoryId1;
 

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

@@ -12,6 +12,8 @@ public class StoreProfileListVo {
 
     private Long id;
 
+    private String webSite;
+
     private Long storeId;
 
     private String name;

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

@@ -9,5 +9,7 @@ import lombok.Data;
 @Data
 public class StoreProfileTextVo {
 
+    private String webSite;
+
     private String content;
 }

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/system/TplPcMallDecoVO.java

@@ -20,6 +20,9 @@ public class TplPcMallDecoVO implements Serializable {
     @ApiModelProperty("装修页id")
     private Integer decoId;
 
+    @ApiModelProperty("装修页站点")
+    private String webSite;
+
     @ApiModelProperty("装修页类型")
     private String decoType;
 
@@ -46,6 +49,7 @@ public class TplPcMallDecoVO implements Serializable {
 
     public TplPcMallDecoVO(TplPcMallDeco tplPcMallDeco) {
         decoId = tplPcMallDeco.getDecoId();
+        webSite = tplPcMallDeco.getWebSite();
         decoType = tplPcMallDeco.getDecoType();
         decoName = tplPcMallDeco.getDecoName();
         isEnable = tplPcMallDeco.getIsEnable();

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

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.read.goods.GoodsBrandReadMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.goods.pojo.GoodsBrand">
     <id column="brand_id" property="brandId" />
+    <result column="web_site" property="webSite" />
     <result column="brand_name" property="brandName" />
     <result column="brand_desc" property="brandDesc" />
     <result column="brand_initial" property="brandInitial" />
@@ -37,6 +38,9 @@
         <if test="example.brandIdIn != null">
           AND `brand_id` in (${example.brandIdIn})
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.brandName != null">
           AND `brand_name` = #{example.brandName}
         </if>

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

@@ -8,6 +8,7 @@
       This element was generated on Tue Sep 27 21:24:12 CST 2022.
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="web_site" jdbcType="VARCHAR" property="webSite" />
     <result column="store_id" jdbcType="BIGINT" property="storeId" />
     <result column="honor_name" jdbcType="VARCHAR" property="honorName" />
     <result column="honor_path" jdbcType="VARCHAR" property="honorPath" />
@@ -92,7 +93,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Sep 27 21:24:12 CST 2022.
     -->
-    id, store_id, honor_name, honor_path, sort, create_id, create_time, status, update_id,
+    id, web_site,store_id, honor_name, honor_path, sort, create_id, create_time, status, update_id,
     update_time
   </sql>
   <select id="selectByExample" parameterType="com.slodon.b2b2c.seller.example.StoreCertificateListExample" resultMap="BaseResultMap">
@@ -149,6 +150,9 @@
     SELECT COUNT(*)
     FROM store_certificate_list T
     WHERE T.STATUS ='normal'
+    <if test="webSite != null">
+      AND T.web_site = #{webSite}
+    </if>
     <if test="nameLike != null">
       AND T.honor_name like concat('%',#{nameLike},'%')
     </if>
@@ -162,6 +166,9 @@
     SELECT *
     FROM store_certificate_list T
     WHERE T.STATUS ='normal'
+    <if test="webSite != null">
+      AND T.web_site = #{webSite}
+    </if>
     <if test="nameLike != null">
       AND T.honor_name like concat('%',#{nameLike},'%')
     </if>

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

@@ -8,6 +8,7 @@
       This element was generated on Sat Oct 08 15:05:15 CST 2022.
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="web_site" jdbcType="VARCHAR" property="webSite" />
     <result column="store_id" jdbcType="BIGINT" property="storeId" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="path" jdbcType="VARCHAR" property="path" />
@@ -92,7 +93,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Sat Oct 08 15:05:15 CST 2022.
     -->
-    id, store_id, name, path, sort, create_id, create_time, status, update_id, update_time
+    id, web_site,store_id, name, path, sort, create_id, create_time, status, update_id, update_time
   </sql>
   <select id="selectByExample" parameterType="com.slodon.b2b2c.seller.example.StoreCompanyShowListExample" resultMap="BaseResultMap">
     <!--
@@ -148,6 +149,9 @@
     SELECT COUNT(*)
         FROM store_company_show_list T
     WHERE T.STATUS ='normal'
+    <if test="webSite != null">
+        AND T.web_site = #{webSite}
+    </if>
     <if test="nameLike != null">
         AND T.name like concat('%',#{nameLike},'%')
     </if>
@@ -161,6 +165,9 @@
     SELECT *
     FROM store_company_show_list T
     WHERE T.STATUS ='normal'
+    <if test="webSite != null">
+      AND T.web_site = #{webSite}
+    </if>
     <if test="nameLike != null">
       AND T.name like concat('%',#{nameLike},'%')
     </if>

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

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.read.seller.StoreInnerLabelReadMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.seller.pojo.StoreInnerLabel">
     <id column="inner_label_id" property="innerLabelId" />
+    <result column="web_site" property="webSite" />
     <result column="inner_label_name" property="innerLabelName" />
     <result column="inner_label_sort" property="innerLabelSort" />
     <result column="is_show" property="isShow" />
@@ -32,6 +33,9 @@
         <if test="example.innerLabelId != null">
           AND `inner_label_id` = #{example.innerLabelId}
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.innerLabelName != null">
           AND `inner_label_name` = #{example.innerLabelName}
         </if>

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

@@ -8,6 +8,7 @@
       This element was generated on Sat Oct 08 15:05:15 CST 2022.
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="web_site" jdbcType="VARCHAR" property="webSite" />
     <result column="store_id" jdbcType="BIGINT" property="storeId" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="path" jdbcType="VARCHAR" property="path" />
@@ -92,7 +93,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Sat Oct 08 15:05:15 CST 2022.
     -->
-    id, store_id, name, path, sort, create_id, create_time, status, update_id, update_time
+    id,web_site, store_id, name, path, sort, create_id, create_time, status, update_id, update_time
   </sql>
   <select id="selectByExample" parameterType="com.slodon.b2b2c.seller.example.StoreProfileListExample" resultMap="BaseResultMap">
     <!--
@@ -148,6 +149,9 @@
     SELECT COUNT(*)
     FROM store_profile_list T
     WHERE T.STATUS ='normal'
+    <if test="webSite != null">
+      AND T.web_site = #{webSite}
+    </if>
     <if test="nameLike != null">
       AND T.name like concat('%',#{nameLike},'%')
     </if>
@@ -161,6 +165,9 @@
     SELECT *
     FROM store_profile_list T
     WHERE T.STATUS ='normal'
+    <if test="webSite != null">
+      AND T.web_site = #{webSite}
+    </if>
     <if test="nameLike != null">
       AND T.name like concat('%',#{nameLike},'%')
     </if>

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

@@ -9,6 +9,7 @@
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="store_id" jdbcType="BIGINT" property="storeId" />
+    <result column="web_site" jdbcType="VARCHAR" property="webSite" />
     <result column="content" jdbcType="VARCHAR" property="content" />
     <result column="create_id" jdbcType="BIGINT" property="createId" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
@@ -89,7 +90,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Sat Oct 08 15:05:15 CST 2022.
     -->
-    id, store_id, content, create_id, create_time, update_id, update_time
+    id, store_id,web_site, content, create_id, create_time, update_id, update_time
   </sql>
   <select id="selectByExample" parameterType="com.slodon.b2b2c.seller.example.StoreProfileTextListExample" resultMap="BaseResultMap">
     <!--

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

@@ -0,0 +1,149 @@
+<?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.StoreSiteInfoReadMapper">
+  <resultMap id="resultMap" type="com.slodon.b2b2c.seller.pojo.StoreSiteInfo">
+    <id column="id" property="id" />
+    <result column="store_id" property="storeId" />
+    <result column="store_logo" property="storeLogo" />
+    <result column="store_banner_pc" property="storeBannerPc" />
+    <result column="main_business" property="mainBusiness" />
+    <result column="service_phone" property="servicePhone" />
+    <result column="email" property="email" />
+    <result column="address" property="address" />
+    <result column="store_map_info" property="storeMapInfo" />
+    <result column="store_map_info_w" property="storeMapInfoW" />
+    <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.storeId != null">
+          AND `store_id` =#{example.storeId}
+        </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
+      </trim>
+    </if>
+  </sql>
+  <!--排序条件-->
+  <sql id="orderBy">
+    ORDER BY `store_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.StoreSiteInfoExample" resultType="java.lang.Integer">
+    SELECT
+      COUNT(*)
+    FROM `store_site_info`
+    <include refid="whereCondition" />
+  </select>
+  <!--根据主键查询记录-->
+  <select id="getByPrimaryKey" resultMap="resultMap">
+    SELECT
+      *
+    FROM `store_site_info`
+    <include refid="pkWhere" />
+  </select>
+  <!--查询符合条件的记录(所有字段)-->
+  <select id="listByExample" resultMap="resultMap">
+    SELECT
+      *
+    FROM `store_site_info`
+    <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_site_info`
+    <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_site_info`
+    <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_site_info`
+    <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="getByStoreIdAndWebSite" resultMap="resultMap">
+    SELECT *
+    FROM store_site_info
+    WHERE store_id = #{storeId}
+      AND web_site = #{webSite}
+  </select>
+</mapper>

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

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.read.system.TplPcMallDecoReadMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.system.pojo.TplPcMallDeco">
     <id column="deco_id" property="decoId" />
+    <result column="web_site" property="webSite" />
     <result column="deco_type" property="decoType" />
     <result column="deco_name" property="decoName" />
     <result column="data" property="data" />
@@ -29,6 +30,9 @@
         <if test="example.decoIdIn != null">
           AND `deco_id` in (${example.decoIdIn})
         </if>
+        <if test="example.webSite != null">
+            AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.decoType != null">
           AND `deco_type` = #{example.decoType}
         </if>

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

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.write.goods.GoodsBrandWriteMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.goods.pojo.GoodsBrand">
     <id column="brand_id" property="brandId" />
+    <result column="web_site" property="webSite" />
     <result column="brand_name" property="brandName" />
     <result column="brand_desc" property="brandDesc" />
     <result column="brand_initial" property="brandInitial" />
@@ -26,6 +27,9 @@
   <!--除主键外的所有字段，用于插入操作-->
   <sql id="columns">
     <trim suffixOverrides=",">
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="brandName != null">
         `brand_name`,
       </if>
@@ -102,6 +106,9 @@
         <if test="example.brandId != null">
           AND `brand_id` = #{example.brandId}
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.brandName != null">
           AND `brand_name` = #{example.brandName}
         </if>
@@ -308,6 +315,9 @@
     )
     VALUES(
     <trim suffixOverrides=",">
+      <if test="webSite != null">
+        #{webSite}
+      </if>
       <if test="brandName != null">
         #{brandName},
       </if>
@@ -372,6 +382,9 @@
   <update id="updateByExampleSelective">
     UPDATE `goods_brand`
     <trim prefix="SET" suffixOverrides=",">
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.brandName != null">
         `brand_name` = #{record.brandName},
       </if>
@@ -436,6 +449,9 @@
   <update id="updateByPrimaryKeySelective">
     UPDATE `goods_brand`
     <trim prefix="SET" suffixOverrides=",">
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="brandName != null">
         `brand_name` = #{brandName},
       </if>

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

@@ -8,6 +8,7 @@
       This element was generated on Tue Sep 27 21:24:12 CST 2022.
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="web_site" jdbcType="VARCHAR" property="webSite"/>
     <result column="store_id" jdbcType="BIGINT" property="storeId" />
     <result column="honor_name" jdbcType="VARCHAR" property="honorName" />
     <result column="honor_path" jdbcType="VARCHAR" property="honorPath" />
@@ -92,7 +93,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Sep 27 21:24:12 CST 2022.
     -->
-    id, store_id, honor_name, honor_path, sort, create_id, create_time, status, update_id,
+    id,web_site, store_id, honor_name, honor_path, sort, create_id, create_time, status, update_id,
     update_time
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
@@ -124,11 +125,11 @@
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into store_certificate_list (store_id, honor_name, honor_path,
+    insert into store_certificate_list (web_site,store_id, honor_name, honor_path,
       sort, create_id, create_time,
       status, update_id, update_time
       )
-    values (#{storeId,jdbcType=BIGINT}, #{honorName,jdbcType=VARCHAR}, #{honorPath,jdbcType=VARCHAR},
+    values (#{webSite,jdbcType=VARCHAR},#{storeId,jdbcType=BIGINT}, #{honorName,jdbcType=VARCHAR}, #{honorPath,jdbcType=VARCHAR},
       #{sort,jdbcType=INTEGER}, #{createId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP},
       #{status,jdbcType=VARCHAR}, #{updateId,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}
       )
@@ -144,6 +145,9 @@
     </selectKey>
     insert into store_certificate_list
     <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="webSite != null">
+        web_site,
+      </if>
       <if test="storeId != null">
         store_id,
       </if>
@@ -173,6 +177,9 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
+        <if test="webSite != null">
+        #{webSite,jdbcType=VARCHAR},
+      </if>
       <if test="storeId != null">
         #{storeId,jdbcType=BIGINT},
       </if>
@@ -213,6 +220,9 @@
       <if test="row.id != null">
         id = #{row.id,jdbcType=BIGINT},
       </if>
+        <if test="row.webSite != null">
+        web_site = #{row.webSite,jdbcType=VARCHAR},
+      </if>
       <if test="row.storeId != null">
         store_id = #{row.storeId,jdbcType=BIGINT},
       </if>
@@ -253,6 +263,7 @@
     -->
     update store_certificate_list
     set id = #{row.id,jdbcType=BIGINT},
+      web_site = #{row.webSite,jdbcType=VARCHAR},
       store_id = #{row.storeId,jdbcType=BIGINT},
       honor_name = #{row.honorName,jdbcType=VARCHAR},
       honor_path = #{row.honorPath,jdbcType=VARCHAR},
@@ -274,6 +285,9 @@
     -->
     update store_certificate_list
     <set>
+      <if test="webSite != null">
+        web_site = #{webSite,jdbcType=VARCHAR},
+      </if>
       <if test="storeId != null">
         store_id = #{storeId,jdbcType=BIGINT},
       </if>
@@ -311,7 +325,8 @@
       This element was generated on Tue Sep 27 21:24:12 CST 2022.
     -->
     update store_certificate_list
-    set store_id = #{storeId,jdbcType=BIGINT},
+    set web_site = #{webSite,jdbcType=VARCHAR},
+     store_id = #{storeId,jdbcType=BIGINT},
       honor_name = #{honorName,jdbcType=VARCHAR},
       honor_path = #{honorPath,jdbcType=VARCHAR},
       sort = #{sort,jdbcType=INTEGER},

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

@@ -8,6 +8,7 @@
       This element was generated on Sat Oct 08 15:05:15 CST 2022.
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="web_site" jdbcType="VARCHAR" property="webSite" />
     <result column="store_id" jdbcType="BIGINT" property="storeId" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="path" jdbcType="VARCHAR" property="path" />
@@ -92,7 +93,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Sat Oct 08 15:05:15 CST 2022.
     -->
-    id, store_id, name, path, sort, create_id, create_time, status, update_id, update_time
+    id,web_site, store_id, name, path, sort, create_id, create_time, status, update_id, update_time
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     <!--
@@ -123,11 +124,11 @@
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into store_company_show_list (store_id, name, path,
+    insert into store_company_show_list (web_site,store_id, name, path,
     sort, create_id, create_time,
     status, update_id, update_time
     )
-    values (#{storeId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{path,jdbcType=VARCHAR},
+    values (#{webSite,jdbcType=VARCHAR},#{storeId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{path,jdbcType=VARCHAR},
     #{sort,jdbcType=INTEGER}, #{createId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP},
     #{status,jdbcType=VARCHAR}, #{updateId,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}
     )
@@ -143,6 +144,9 @@
     </selectKey>
     insert into store_company_show_list
     <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="webSite != null">
+        web_site,
+      </if>
       <if test="storeId != null">
         store_id,
       </if>
@@ -172,6 +176,9 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="webSite != null">
+        #{webSite,jdbcType=VARCHAR},
+      </if>
       <if test="storeId != null">
         #{storeId,jdbcType=BIGINT},
       </if>
@@ -212,6 +219,9 @@
       <if test="row.id != null">
         id = #{row.id,jdbcType=BIGINT},
       </if>
+      <if test="row.webSite != null">
+        web_site = #{row.webSite,jdbcType=VARCHAR},
+      </if>
       <if test="row.storeId != null">
         store_id = #{row.storeId,jdbcType=BIGINT},
       </if>
@@ -252,6 +262,7 @@
     -->
     update store_company_show_list
     set id = #{row.id,jdbcType=BIGINT},
+    web_site = #{row.webSite,jdbcType=VARCHAR},
     store_id = #{row.storeId,jdbcType=BIGINT},
     name = #{row.name,jdbcType=VARCHAR},
     path = #{row.path,jdbcType=VARCHAR},
@@ -273,6 +284,9 @@
     -->
     update store_company_show_list
     <set>
+      <if test="webSite != null">
+        web_site = #{webSite,jdbcType=VARCHAR},
+      </if>
       <if test="storeId != null">
         store_id = #{storeId,jdbcType=BIGINT},
       </if>
@@ -310,7 +324,8 @@
       This element was generated on Sat Oct 08 15:05:15 CST 2022.
     -->
     update store_company_show_list
-    set store_id = #{storeId,jdbcType=BIGINT},
+    set web_site = #{webSite,jdbcType=VARCHAR},
+    store_id = #{storeId,jdbcType=BIGINT},
     name = #{name,jdbcType=VARCHAR},
     path = #{path,jdbcType=VARCHAR},
     sort = #{sort,jdbcType=INTEGER},

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

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.write.seller.StoreInnerLabelWriteMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.seller.pojo.StoreInnerLabel">
     <id column="inner_label_id" property="innerLabelId" />
+    <result column="web_site" property="webSite" />
     <result column="inner_label_name" property="innerLabelName" />
     <result column="inner_label_sort" property="innerLabelSort" />
     <result column="is_show" property="isShow" />
@@ -18,6 +19,9 @@
   <!--除主键外的所有字段，用于插入操作-->
   <sql id="columns">
     <trim suffixOverrides=",">
+      <if test="webSite != null">
+          `web_site`,
+      </if>
       <if test="innerLabelName != null">
         `inner_label_name`,
       </if>
@@ -67,6 +71,9 @@
         <if test="example.innerLabelIdIn != null">
           AND `inner_label_id` in (${example.innerLabelIdIn})
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.innerLabelName != null">
           AND `inner_label_name` = #{example.innerLabelName}
         </if>
@@ -240,6 +247,9 @@
     )
     VALUES(
     <trim suffixOverrides=",">
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="innerLabelName != null">
         #{innerLabelName},
       </if>
@@ -280,6 +290,9 @@
   <update id="updateByExampleSelective">
     UPDATE `store_inner_label`
     <trim prefix="SET" suffixOverrides=",">
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="record.innerLabelName != null">
         `inner_label_name` = #{record.innerLabelName},
       </if>
@@ -320,6 +333,9 @@
   <update id="updateByPrimaryKeySelective">
     UPDATE `store_inner_label`
     <trim prefix="SET" suffixOverrides=",">
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="innerLabelName != null">
         `inner_label_name` = #{innerLabelName},
       </if>

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

@@ -8,6 +8,7 @@
       This element was generated on Sat Oct 08 15:05:15 CST 2022.
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="web_site" jdbcType="VARCHAR" property="webSite" />
     <result column="store_id" jdbcType="BIGINT" property="storeId" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="path" jdbcType="VARCHAR" property="path" />
@@ -92,7 +93,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Sat Oct 08 15:05:15 CST 2022.
     -->
-    id, store_id, name, path, sort, create_id, create_time, status, update_id, update_time
+    id,web_site,store_id, name, path, sort, create_id, create_time, status, update_id, update_time
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     <!--
@@ -123,11 +124,11 @@
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into store_profile_list (store_id, name, path, 
+    insert into store_profile_list (web_site,store_id, name, path,
       sort, create_id, create_time, 
       status, update_id, update_time
       )
-    values (#{storeId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{path,jdbcType=VARCHAR}, 
+    values (#{webSite,jdbcType=VARCHAR},#{storeId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{path,jdbcType=VARCHAR},
       #{sort,jdbcType=INTEGER}, #{createId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, 
       #{status,jdbcType=VARCHAR}, #{updateId,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}
       )
@@ -143,6 +144,9 @@
     </selectKey>
     insert into store_profile_list
     <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="webSite != null">
+        web_site,
+      </if>
       <if test="storeId != null">
         store_id,
       </if>
@@ -172,6 +176,9 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="webSite != null">
+        #{webSite,jdbcType=VARCHAR},
+      </if>
       <if test="storeId != null">
         #{storeId,jdbcType=BIGINT},
       </if>
@@ -212,6 +219,9 @@
       <if test="row.id != null">
         id = #{row.id,jdbcType=BIGINT},
       </if>
+      <if test="row.webSite != null">
+        web_site = #{row.webSite,jdbcType=VARCHAR},
+      </if>
       <if test="row.storeId != null">
         store_id = #{row.storeId,jdbcType=BIGINT},
       </if>
@@ -252,6 +262,7 @@
     -->
     update store_profile_list
     set id = #{row.id,jdbcType=BIGINT},
+      web_site = #{row.webSite,jdbcType=VARCHAR},
       store_id = #{row.storeId,jdbcType=BIGINT},
       name = #{row.name,jdbcType=VARCHAR},
       path = #{row.path,jdbcType=VARCHAR},
@@ -273,6 +284,9 @@
     -->
     update store_profile_list
     <set>
+      <if test="webSite != null">
+        web_site = #{webSite,jdbcType=VARCHAR},
+      </if>
       <if test="storeId != null">
         store_id = #{storeId,jdbcType=BIGINT},
       </if>
@@ -310,7 +324,8 @@
       This element was generated on Sat Oct 08 15:05:15 CST 2022.
     -->
     update store_profile_list
-    set store_id = #{storeId,jdbcType=BIGINT},
+    set web_site = #{webSite,jdbcType=VARCHAR},
+      store_id = #{storeId,jdbcType=BIGINT},
       name = #{name,jdbcType=VARCHAR},
       path = #{path,jdbcType=VARCHAR},
       sort = #{sort,jdbcType=INTEGER},

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

@@ -9,6 +9,7 @@
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="store_id" jdbcType="BIGINT" property="storeId" />
+    <result column="web_site" jdbcType="VARCHAR" property="webSite" />
     <result column="content" jdbcType="VARCHAR" property="content" />
     <result column="create_id" jdbcType="BIGINT" property="createId" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
@@ -89,7 +90,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Sat Oct 08 15:05:15 CST 2022.
     -->
-    id, store_id, content, create_id, create_time, update_id, update_time
+    id, store_id,web_site, content, create_id, create_time, update_id, update_time
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     <!--
@@ -120,10 +121,10 @@
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into store_profile_text_list (store_id, content, create_id, 
+    insert into store_profile_text_list (store_id,web_site, content, create_id,
       create_time, update_id, update_time
       )
-    values (#{storeId,jdbcType=BIGINT}, #{content,jdbcType=VARCHAR}, #{createId,jdbcType=BIGINT}, 
+    values (#{storeId,jdbcType=BIGINT},#{webSite,jdbcType=VARCHAR}, #{content,jdbcType=VARCHAR}, #{createId,jdbcType=BIGINT},
       #{createTime,jdbcType=TIMESTAMP}, #{updateId,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}
       )
   </insert>
@@ -141,6 +142,9 @@
       <if test="storeId != null">
         store_id,
       </if>
+      <if test="webSite != null">
+        web_site,
+      </if>
       <if test="content != null">
         content,
       </if>
@@ -161,6 +165,9 @@
       <if test="storeId != null">
         #{storeId,jdbcType=BIGINT},
       </if>
+      <if test="webSite != null">
+        #{webSite,jdbcType=VARCHAR},
+      </if>
       <if test="content != null">
         #{content,jdbcType=VARCHAR},
       </if>
@@ -192,6 +199,9 @@
       <if test="row.storeId != null">
         store_id = #{row.storeId,jdbcType=BIGINT},
       </if>
+      <if test="row.webSite != null">
+        web_site = #{row.webSite,jdbcType=VARCHAR},
+      </if>
       <if test="row.content != null">
         content = #{row.content,jdbcType=VARCHAR},
       </if>
@@ -221,6 +231,7 @@
     update store_profile_text_list
     set id = #{row.id,jdbcType=BIGINT},
       store_id = #{row.storeId,jdbcType=BIGINT},
+      web_site = #{row.webSite,jdbcType=VARCHAR},
       content = #{row.content,jdbcType=VARCHAR},
       create_id = #{row.createId,jdbcType=BIGINT},
       create_time = #{row.createTime,jdbcType=TIMESTAMP},
@@ -241,6 +252,9 @@
       <if test="storeId != null">
         store_id = #{storeId,jdbcType=BIGINT},
       </if>
+       <if test="webSite!=null">
+         web_site = #{webSite,jdbcType=VARCHAR},
+       </if>
       <if test="content != null">
         content = #{content,jdbcType=VARCHAR},
       </if>
@@ -267,6 +281,7 @@
     -->
     update store_profile_text_list
     set store_id = #{storeId,jdbcType=BIGINT},
+      web_site = #{webSite,jdbcType=VARCHAR},
       content = #{content,jdbcType=VARCHAR},
       create_id = #{createId,jdbcType=BIGINT},
       create_time = #{createTime,jdbcType=TIMESTAMP},

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

@@ -0,0 +1,321 @@
+<?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.StoreSiteInfoWriteMapper">
+  <resultMap id="resultMap" type="com.slodon.b2b2c.seller.pojo.StoreSiteInfo">
+    <id column="id" property="id" />
+    <result column="store_id" property="storeId" />
+    <result column="store_logo" property="storeLogo" />
+    <result column="store_banner_pc" property="storeBannerPc" />
+    <result column="main_business" property="mainBusiness" />
+    <result column="service_phone" property="servicePhone" />
+    <result column="email" property="email" />
+    <result column="address" property="address" />
+    <result column="store_map_info" property="storeMapInfo" />
+    <result column="store_map_info_w" property="storeMapInfoW" />
+    <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="storeId != null">
+        `store_id`,
+      </if>
+      <if test="storeLogo != null">
+        `store_logo`,
+      </if>
+      <if test="storeBannerPc != null">
+        `store_banner_pc`,
+      </if>
+      <if test="mainBusiness != null">
+        `main_business`,
+      </if>
+      <if test="servicePhone != null">
+        `service_phone`,
+      </if>
+      <if test="email != null">
+        `email`,
+      </if>
+      <if test="address != null">
+        `address`,
+      </if>
+      <if test="storeMapInfo != null">
+        `store_map_info`,
+      </if>
+      <if test="storeMapInfoW != null">
+        `store_map_info_w`,
+      </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.storeId != null">
+          AND `store_id` = #{example.storeId}
+        </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
+      </trim>
+    </if>
+  </sql>
+  <!--排序条件-->
+  <sql id="orderBy">
+    ORDER BY `store_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.StoreSiteInfoExample" resultType="java.lang.Integer">
+    SELECT
+      COUNT(*)
+    FROM `store_site_info`
+    <include refid="whereCondition" />
+  </select>
+  <!--根据主键查询记录-->
+  <select id="getByPrimaryKey" resultMap="resultMap">
+    SELECT
+      *
+    FROM `store_site_info`
+    <include refid="pkWhere" />
+  </select>
+  <!--查询符合条件的记录(所有字段)-->
+  <select id="listByExample" resultMap="resultMap">
+    SELECT
+      *
+    FROM `store_site_info`
+    <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_site_info`
+    <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_site_info`
+    <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_site_info`
+    <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_site_info`
+    <include refid="whereCondition" />
+  </delete>
+  <!--根据主键删除记录-->
+  <delete id="deleteByPrimaryKey">
+    DELETE FROM `store_site_info`
+    <include refid="pkWhere" />
+  </delete>
+  <!--插入一条记录-->
+  <insert id="insert" keyColumn="id" keyProperty="storeId" parameterType="com.slodon.b2b2c.seller.pojo.StoreSiteInfo"
+          useGeneratedKeys="true">
+    INSERT INTO `store_site_info`(
+    <include refid="columns"/>
+    )
+    VALUES(
+    <trim suffixOverrides=",">
+      <if test="storeId != null">
+        #{storeId},
+      </if>
+      <if test="storeLogo != null">
+        #{storeLogo},
+      </if>
+      <if test="storeBannerPc != null">
+        #{storeBannerPc},
+      </if>
+      <if test="mainBusiness != null">
+        #{mainBusiness},
+      </if>
+      <if test="servicePhone != null">
+        #{servicePhone},
+      </if>
+      <if test="email != null">
+        #{email},
+      </if>
+      <if test="address != null">
+        #{address},
+      </if>
+      <if test="storeMapInfo != null">
+        #{storeMapInfo},
+      </if>
+      <if test="storeMapInfoW != null">
+        #{storeMapInfoW},
+      </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_site_info`
+    <trim prefix="SET" suffixOverrides=",">
+      <if test="record.storeLogo != null">
+        `store_logo` = #{record.storeLogo},
+      </if>
+      <if test="record.storeBannerPc != null">
+        `store_banner_pc` = #{record.storeBannerPc},
+      </if>
+      <if test="record.mainBusiness != null">
+          `main_business` = #{record.mainBusiness},
+      </if>
+      <if test="record.servicePhone != null">
+          `service_phone` = #{record.servicePhone},
+      </if>
+      <if test="record.email != null">
+        `email` = #{record.email},
+      </if>
+      <if test="record.address != null">
+        `address` = #{record.address},
+      </if>
+      <if test="record.storeMapInfo != null">
+          `store_map_info` = #{record.storeMapInfo},
+      </if>
+      <if test="record.storeMapInfoW != null">
+          `store_map_info_w` = #{record.storeMapInfoW},
+      </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_site_info`
+    <trim prefix="SET" suffixOverrides=",">
+      <if test="storeLogo != null">
+        `store_logo` = #{storeLogo},
+      </if>
+      <if test="storeBannerPc != null">
+        `store_banner_pc` = #{storeBannerPc},
+      </if>
+      <if test="mainBusiness != null">
+        `main_business` = #{mainBusiness},
+      </if>
+      <if test="servicePhone != null">
+        `service_phone` = #{servicePhone},
+      </if>
+      <if test="email != null">
+        `email` = #{email},
+      </if>
+      <if test="address != null">
+        `address` = #{address},
+      </if>
+      <if test="storeMapInfo != null">
+        `store_map_info` = #{storeMapInfo},
+      </if>
+      <if test="storeMapInfoW != null">
+        `store_map_info_w` = #{storeMapInfoW},
+      </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/TplPcMallDecoWriteMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.write.system.TplPcMallDecoWriteMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.system.pojo.TplPcMallDeco">
     <id column="deco_id" property="decoId" />
+    <result column="web_site" property="webSite" />
     <result column="deco_type" property="decoType" />
     <result column="deco_name" property="decoName" />
     <result column="data" property="data" />
@@ -18,6 +19,9 @@
   <!--除主键外的所有字段，用于插入操作-->
   <sql id="columns">
     <trim suffixOverrides=",">
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="decoType != null">
         `deco_type`,
       </if>
@@ -67,6 +71,9 @@
         <if test="example.decoIdIn != null">
           AND `deco_id` in (${example.decoIdIn})
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.decoType != null">
           AND `deco_type` = #{example.decoType}
         </if>
@@ -240,6 +247,9 @@
     )
     VALUES(
     <trim suffixOverrides=",">
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="decoType != null">
         #{decoType},
       </if>
@@ -280,6 +290,9 @@
   <update id="updateByExampleSelective">
     UPDATE `sys_tpl_pc_mall_deco`
     <trim prefix="SET" suffixOverrides=",">
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.decoType != null">
         `deco_type` = #{record.decoType},
       </if>
@@ -320,6 +333,9 @@
   <update id="updateByPrimaryKeySelective">
     UPDATE `sys_tpl_pc_mall_deco`
     <trim prefix="SET" suffixOverrides=",">
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="decoType != null">
         `deco_type` = #{decoType},
       </if>

xinkeaboard-server/doc/DDL/update.sql

@@ -17,7 +17,19 @@ ALTER TABLE  enquiry_receive_mail_setting ADD COLUMN web_site TINYINT NOT NULL D
 
 ALTER TABLE  sys_tpl_pc_mall_data ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户';
 
+ALTER TABLE  sys_tpl_pc_mall_deco ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户' AFTER deco_id;
 
+ALTER TABLE  store_inner_label ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户' AFTER inner_label_id;
+
+ALTER TABLE  goods_brand ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户' AFTER brand_id;
+
+ALTER TABLE  store_profile_text_list ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户' AFTER id;
+
+ALTER TABLE  store_profile_list ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户' AFTER id;
+
+ALTER TABLE  store_certificate_list ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户' AFTER id;
+
+ALTER TABLE  store_company_show_list ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户' AFTER id;
 
 ALTER TABLE  store_bind_category ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户';
 
@@ -34,4 +46,27 @@ CREATE TABLE `store_name`
     `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='店铺名称表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='店铺名称表';
+
+
+
+CREATE TABLE `store_site_info`
+(
+    `id`               bigint                                                  NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `web_site`         tinyint                                                 NOT NULL DEFAULT 1 COMMENT '站点',
+    `store_id`         bigint                                                  NOT NULL COMMENT '店铺ID',
+    `store_logo`       varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '店铺logo',
+    `store_banner_pc`  varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'pc端店铺横幅',
+    `main_business`    varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '店铺主营商品名称',
+    `service_phone`    varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci  NOT NULL COMMENT '店铺客服电话',
+    `email`            varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '邮箱',
+    `address`          varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '店铺开店详细地址',
+    `store_map_info`   varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '店铺地图参数-经度',
+    `store_map_info_w` 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='店铺站点基础设置表';

xinkeaboard-web/app.vue

@@ -69,17 +69,10 @@ onMounted(() => {
 
   window.addEventListener('storage', function (e) {
     if (e.key === 'isLoggedIn') {
-      // 如果当前页面是目标页面，则不要刷新
-      if (!sessionStorage.getItem('noRefresh')) {
-        location.reload();  // 其他页面刷新
-      }
-      localStorage.removeItem('isLoggedIn')
-      sessionStorage.removeItem('noRefresh')
+      location.reload();  // 其他页面刷新
     }
   });
 })
 
 
-
-
 </script>

xinkeaboard-web/components/NavTopBar.vue

@@ -148,8 +148,10 @@ const loginOut = async () => {
   filtersStore.setToken("");
   filtersStore.setRefreshToken("");
   filtersStore.setTime(new Date().getTime().toString()); //存储refresh_token更新时间
-  sessionStorage.setItem('noRefresh', 'true')
   localStorage.setItem('isLoggedIn', 'false');
+  setTimeout(() => {
+      localStorage.removeItem('isLoggedIn');
+  }, 200)
   // window.location.reload();
 };
 

xinkeaboard-web/components/SldDiy.vue

@@ -1226,8 +1226,10 @@ const loginOut = async () => {
   filtersStore.setToken("");
   filtersStore.setRefreshToken("");
   filtersStore.setTime(new Date().getTime().toString()); //存储refresh_token更新时间
-  sessionStorage.setItem('noRefresh', 'true')
   localStorage.setItem('isLoggedIn', 'false');
+   setTimeout(() => {
+      localStorage.removeItem('isLoggedIn');
+  }, 200)
 };
 
 const goSupplierUrl = () => {

xinkeaboard-web/pages/login.vue

@@ -242,8 +242,10 @@ const login = () => {
             router.replace({
               path: '/'
             })
-            sessionStorage.setItem('noRefresh', 'true')
             localStorage.setItem('isLoggedIn', 'true');
+             setTimeout(() => {
+                localStorage.removeItem('isLoggedIn');
+            }, 200)
             // if (window.history.state.back) {
             //   router.replace({
             //     path: '/'