修改bug+平台端首页+基本配置

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

@@ -29,6 +29,11 @@ public class GoodsCategoryExample implements Serializable {
     private Integer categoryId;
 
     /**
+     * 站点
+     */
+    private String webSite;
+
+    /**
      * 分类名称
      */
     private String categoryName;

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

@@ -16,6 +16,9 @@ public class GoodsCategory implements Serializable {
     @ApiModelProperty("分类id")
     private Integer categoryId;
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     @ApiModelProperty("分类名称")
     private String categoryName;
 

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/statistics/example/base/PlatformBaseExample.java

@@ -1,6 +1,7 @@
 package com.slodon.b2b2c.statistics.example.base;
 
 import com.slodon.b2b2c.core.response.PagerInfo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -39,6 +40,9 @@ public class PlatformBaseExample implements Serializable {
      */
     private Date statsTimeBefore;
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     /**
      * 访客数
      */

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/statistics/pojo/base/PlatformBase.java

@@ -21,6 +21,9 @@ public class PlatformBase implements Serializable {
     @ApiModelProperty("统计时间，数据统计的开始时间")
     private Date statsTime;
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     @ApiModelProperty("访客数")
     private Integer visitorNum;
 

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

@@ -384,6 +384,11 @@ public class SysSeoExample {
             return (Criteria) this;
         }
 
+        public Criteria andWebSiteEqualTo(String value) {
+            addCriterion("web_site =", value, "webSite");
+            return (Criteria) this;
+        }
+
         public Criteria andNameIsNull() {
             addCriterion("name is null");
             return (Criteria) this;

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

@@ -28,6 +28,9 @@ public class SysSeo {
      */
     private String type;
 
+
+    private String webSite;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -462,4 +465,12 @@ public class SysSeo {
     public void setUpdateTime(String updateTime) {
         this.updateTime = updateTime == null ? null : updateTime.trim();
     }
+
+    public String getWebSite() {
+        return webSite;
+    }
+
+    public void setWebSite(String webSite) {
+        this.webSite = webSite;
+    }
 }

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

@@ -195,11 +195,16 @@ public class GoodsCategorySellerController {
     }
 
     @ApiOperation("获取分类列表接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query")
+    })
     @GetMapping("getCateList")
-    public JsonResult<List<GoodsCategoryListVO>> getCateList(HttpServletRequest request) {
+    public JsonResult<List<GoodsCategoryListVO>> getCateList(HttpServletRequest request,@RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
         //店铺申请经营类目和商户入驻选择经营类目用到此接口
         GoodsCategoryExample example = new GoodsCategoryExample();
+        //TODO: 2025/07/31 临时处理，待完善
+//      example.setWebSite(webSite);
         example.setState(GoodsCategoryConst.CATEGORY_STATE_1);
         example.setGrade(GoodsCategoryConst.CATEGORY_GRADE_3);
         List<GoodsCategory> list = goodsCategoryModel.getGoodsCategoryList(example, null);

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

@@ -132,7 +132,7 @@ public class SellerCategoryController extends BaseController {
         storeInnerLabelModel.saveStoreInnerLabel(storeInnerLabel);
 
         //seo内容入库
-        int count = storeInnerLabelModel.addAndUpdateSeo(storeInnerLabel,seoTitle,seoDesc,seoKeyWords,vendor);
+        int count = storeInnerLabelModel.addAndUpdateSeo(storeInnerLabel, seoTitle, seoDesc, seoKeyWords, vendor, webSite);
         if(count == 0){
             return SldResponse.fail("新增seo表失败");
         }
@@ -183,7 +183,7 @@ public class SellerCategoryController extends BaseController {
         storeInnerLabelModel.editStoreCategory(storeInnerLabelUpdate);
 
         //seo内容入库
-        int count = storeInnerLabelModel.addAndUpdateSeo(storeInnerLabelUpdate,seoTitle,seoDesc,seoKeyWords,vendor);
+        int count = storeInnerLabelModel.addAndUpdateSeo(storeInnerLabelUpdate, seoTitle, seoDesc, seoKeyWords, vendor, webSite);
         if(count == 0){
             return SldResponse.fail("修改seo表失败");
         }

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

@@ -82,8 +82,20 @@ public class SellerStoreController extends BaseController {
         Store store = storeModel.getStoreByStoreId(vendor.getStoreId());
         if (!WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
             store = storeSiteInfoModel.getStoreByStoreIdAndWebSite(store.getStoreId(), webSite);
+            //未设置国内站基本信息，则返回默认信息
+            if (StringUtils.isEmpty(store.getStoreId())) {
+                store = storeModel.getStoreByStoreId(vendor.getStoreId());
+                store.setStoreLogo(null);
+                store.setStoreBannerPc(null);
+                store.setMainBusiness(null);
+                store.setServicePhone(null);
+                store.setAddress(null);
+                store.setEmail(null);
+                store.setStoreMapInfo(null);
+                store.setStoreMapInfoW(null);
+            }
             StoreNameExample storeNameExample = new StoreNameExample();
-            storeNameExample.setStoreId(store.getStoreId());
+            storeNameExample.setStoreId(vendor.getStoreId());
             List<StoreName> storeNameList = storeNameModel.getStoreNameList(storeNameExample, null);
             store.setStoreName(CollectionUtils.isEmpty(storeNameList) ? store.getStoreName() : storeNameList.get(0).getStoreName());
         }
@@ -205,6 +217,8 @@ public class SellerStoreController extends BaseController {
             }
         } else {
             store = storeSiteInfoModel.getStoreByStoreIdAndWebSite(vendor.getStoreId(), webSite);
+            store.setStoreGradeId(storeModel.getStoreByStoreId(vendor.getStoreId()).getStoreGradeId());
+            store.setStoreGradeName(storeModel.getStoreByStoreId(vendor.getStoreId()).getStoreGradeName());
             SysSeo seoInfo = storeModel.getRecordByTargetIdAndType(vendor.getStoreId(), SeoTypeConstant.SEO_TYPE_SHOP + "_" + webSite);
             if (seoInfo != null) {
                 store.setStoreSeoTitle(seoInfo.getTitle());
@@ -288,6 +302,7 @@ public class SellerStoreController extends BaseController {
             StoreSiteInfo storeSiteInfo = new StoreSiteInfo();
             storeSiteInfo.setStoreId(vendor.getStoreId());
             storeSiteInfo.setWebSite(webSite);
+            storeSiteInfo.setMainBusiness(mainBusiness);
             storeSiteInfo.setStoreLogo(storeLogo);
             storeSiteInfo.setServicePhone(servicePhone);
             storeSiteInfo.setAddress(address);
@@ -296,7 +311,7 @@ public class SellerStoreController extends BaseController {
             storeSiteInfo.setStoreMapInfo(storeMapInfo);
             storeSiteInfo.setStoreMapInfoW(storeMapInfoW);
 
-            if (store == null) {
+            if (StringUtils.isEmpty(store.getStoreId())) {
                 storeSiteInfo.setCreateId(vendor.getVendorId());
                 storeSiteInfo.setCreateTime(new Date());
                 storeSiteInfoModel.saveStoreSiteInfo(storeSiteInfo);
@@ -312,9 +327,7 @@ public class SellerStoreController extends BaseController {
         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.setWebSite(webSite);
         sysSeo.setName("店铺SEO");
 //        sysSeo.setCode(SeoTypeConstant.SEO_TYPE_SHOP+"_"+vendor.getStoreId());
         sysSeo.setTargetId(vendor.getStoreId());
@@ -360,11 +373,20 @@ public class SellerStoreController extends BaseController {
     }
 
     @ApiOperation("获取商户首页店铺信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点", dataType = "String", paramType = "query"),
+    })
     @GetMapping("indexStoreInfor")
-    public JsonResult<StoreIndexInformationVO> getIndexStoreInfor(HttpServletRequest request) {
+    public JsonResult<StoreIndexInformationVO> getIndexStoreInfor(HttpServletRequest request,@RequestParam(value = "webSite", required = false,defaultValue = "1") String webSite) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         Store store = storeModel.getStoreByStoreId(vendor.getStoreId());
+        if (!WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
+            StoreNameExample storeNameExample = new StoreNameExample();
+            storeNameExample.setStoreId(vendor.getStoreId());
+            List<StoreName> storeNameList = storeNameModel.getStoreNameList(storeNameExample, null);
+            store.setStoreName(CollectionUtils.isEmpty(storeNameList) ? store.getStoreName() : storeNameList.get(0).getStoreName());
+        }
         //店铺默认logo
         if (StringUtils.isEmpty(store.getStoreLogo())) {
             store.setStoreLogo(stringRedisTemplate.opsForValue().get("default_image_store_logo"));

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/statistics/admin/AdminGoodsAnalysisController.java

@@ -108,12 +108,13 @@ public class AdminGoodsAnalysisController extends BaseController {
     @ApiOperation("商品动销趋势")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "startTime", value = "开始时间", required = true),
-            @ApiImplicitParam(name = "endTime", value = "结束时间", required = true)
+            @ApiImplicitParam(name = "endTime", value = "结束时间", required = true),
+            @ApiImplicitParam(name = "webSite", value = "站点")
     })
     @GetMapping("goodsSalesTrend")
-    public JsonResult<GoodsSalesTrendVO> goodsSalesTrend(HttpServletRequest request, Date startTime, Date endTime) {
+    public JsonResult<GoodsSalesTrendVO> goodsSalesTrend(HttpServletRequest request, Date startTime, Date endTime,@RequestParam(value = "webSite",required = false,defaultValue = "1") String webSite) {
         StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, true);
-        List<MovableGoodsVO> list = statsModelUtil.getPlatformTrendList(timeType, startTime, endTime);
+        List<MovableGoodsVO> list = statsModelUtil.getPlatformTrendList(timeType, startTime, endTime, webSite);
         GoodsSalesTrendVO vo = new GoodsSalesTrendVO();
         //新增商品数列表
         List<MovableGoodsVO> newGoodsList = new ArrayList<>();

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/statistics/admin/AdminOverviewController.java

@@ -82,8 +82,11 @@ public class AdminOverviewController extends BaseController {
     private MemberEnquiryModel memberEnquiryModel;
 
     @ApiOperation("首页概况-待办事项")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点")
+    })
     @GetMapping("waitDeal")
-    public JsonResult<AdminPresentIndexVO.AdminWaitDeal> waitDeal(HttpServletRequest request) {
+    public JsonResult<AdminPresentIndexVO.AdminWaitDeal> waitDeal(HttpServletRequest request,@RequestParam(value = "webSite", required = false,defaultValue = "1") String webSite) {
         //待办事项
         AdminPresentIndexVO.AdminWaitDeal adminWaitDeal = new AdminPresentIndexVO.AdminWaitDeal();
         //待审核店铺
@@ -94,10 +97,24 @@ public class AdminOverviewController extends BaseController {
         GoodsExample goodsExample = new GoodsExample();
         goodsExample.setStateIn(GoodsConst.GOODS_STATE_SELL_NOW_TO_AUDIT + "," + GoodsConst.GOODS_STATE_WAREHOUSE_TO_AUDIT);
         adminWaitDeal.setAuditGoodsNum(goodsModel.getGoodsCount(goodsExample));
+
+        //站点待审核商品
+        goodsExample = new GoodsExample();
+        goodsExample.setWebSite(webSite);
+        goodsExample.setStateIn(GoodsConst.GOODS_STATE_SELL_NOW_TO_AUDIT + "," + GoodsConst.GOODS_STATE_WAREHOUSE_TO_AUDIT);
+        adminWaitDeal.setWebSiteAuditGoodsNum(goodsModel.getGoodsCount(goodsExample));
+
         //待审核品牌
         GoodsBrandExample goodsBrandExample = new GoodsBrandExample();
         goodsBrandExample.setState(GoodsConst.BRAND_STATE_2);
         adminWaitDeal.setAuditBrandNum(goodsBrandModel.getBrandCount(goodsBrandExample));
+
+        //站点待审核品牌
+        goodsBrandExample = new GoodsBrandExample();
+        goodsBrandExample.setWebSite(webSite);
+        goodsBrandExample.setState(GoodsConst.BRAND_STATE_2);
+        adminWaitDeal.setWebSiteAuditBrandNum(goodsBrandModel.getBrandCount(goodsBrandExample));
+
         //待确认退款单
         OrderReturnExample orderReturnExample = new OrderReturnExample();
         orderReturnExample.setStateIn(OrdersAfsConst.RETURN_STATE_200 + "," + OrdersAfsConst.RETURN_STATE_203);
@@ -113,6 +130,13 @@ public class AdminOverviewController extends BaseController {
         memberEnquiryToAssignExample.setItemType(EnquiryConst.ENQUIRY_ITEM_TYPE_MALL);
         adminWaitDeal.setEnquiryToBeAssignNum(memberEnquiryModel.getMemberEnquiryCount(memberEnquiryToAssignExample));
 
+        //站点待分配询盘数
+        memberEnquiryToAssignExample = new MemberEnquiryExample();
+        memberEnquiryToAssignExample.setWebSite(webSite);
+        memberEnquiryToAssignExample.setStatusEqual(EnquiryConst.ENQUIRY_NEW);
+        memberEnquiryToAssignExample.setItemType(EnquiryConst.ENQUIRY_ITEM_TYPE_MALL);
+        adminWaitDeal.setWebSiteEnquiryToBeAssignNum(memberEnquiryModel.getMemberEnquiryCount(memberEnquiryToAssignExample));
+
         return SldResponse.success(adminWaitDeal);
     }
 
@@ -134,7 +158,7 @@ public class AdminOverviewController extends BaseController {
             DateTime startTime = DateUtil.beginOfDay(endTime);
 
             //计算实时统计数据
-            adminPresentDataVO = platformPresentDataUtil.calculatePresentData(startTime, endTime,webSite);
+            adminPresentDataVO = platformPresentDataUtil.calculatePresentData(startTime, endTime, webSite);
 
             //缓存数据
             objectRedisTemplate.opsForHash().put(StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, adminPresentDataVO);
@@ -149,7 +173,7 @@ public class AdminOverviewController extends BaseController {
                 DateTime startTime = DateUtil.beginOfDay(endTime);
 
                 //计算实时统计数据
-                adminPresentDataVO = platformPresentDataUtil.calculatePresentData(startTime, endTime,webSite);
+                adminPresentDataVO = platformPresentDataUtil.calculatePresentData(startTime, endTime, webSite);
 
                 //缓存数据
                 objectRedisTemplate.opsForHash().put(StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, adminPresentDataVO);
@@ -180,7 +204,7 @@ public class AdminOverviewController extends BaseController {
             DateTime startTime = DateUtil.beginOfDay(endTime);
 
             //计算实时统计数据
-            adminPresentDataVO = platformPresentDataUtil.calculatePresentData(startTime, endTime,webSite);
+            adminPresentDataVO = platformPresentDataUtil.calculatePresentData(startTime, endTime, webSite);
 
             //缓存数据
             objectRedisTemplate.opsForHash().put(StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, adminPresentDataVO);
@@ -195,7 +219,7 @@ public class AdminOverviewController extends BaseController {
                 DateTime startTime = DateUtil.beginOfDay(endTime);
 
                 //计算实时统计数据
-                adminPresentDataVO = platformPresentDataUtil.calculatePresentData(startTime, endTime,webSite);
+                adminPresentDataVO = platformPresentDataUtil.calculatePresentData(startTime, endTime, webSite);
 
                 //缓存数据
                 objectRedisTemplate.opsForHash().put(StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, adminPresentDataVO);
@@ -303,12 +327,13 @@ public class AdminOverviewController extends BaseController {
     @ApiOperation("支付或下单金额趋势")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "startTime", value = "开始时间", required = true),
-            @ApiImplicitParam(name = "endTime", value = "结束时间", required = true)
+            @ApiImplicitParam(name = "endTime", value = "结束时间", required = true),
+            @ApiImplicitParam(name = "webSite", value = "站点")
     })
     @GetMapping("payOrderTrend")
-    public JsonResult<PlatformSalesVO> payOrderTrend(HttpServletRequest request, Date startTime, Date endTime) {
+    public JsonResult<PlatformSalesVO> payOrderTrend(HttpServletRequest request, Date startTime, Date endTime,@RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite) {
         StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, true);
-        List<MovableGoodsVO> list = statsModelUtil.getPlatformTrendList(timeType, startTime, endTime);
+        List<MovableGoodsVO> list = statsModelUtil.getPlatformTrendList(timeType, startTime, endTime, webSite);
         PlatformSalesVO vo = new PlatformSalesVO();
         //支付金额列表
         List<PlatformSalesVO.PayAmountVO> payAmountList = new ArrayList<>();
@@ -336,12 +361,13 @@ public class AdminOverviewController extends BaseController {
     @ApiOperation("流量趋势")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "startTime", value = "开始时间", required = true),
-            @ApiImplicitParam(name = "endTime", value = "结束时间", required = true)
+            @ApiImplicitParam(name = "endTime", value = "结束时间", required = true),
+            @ApiImplicitParam(name = "webSite", value = "站点")
     })
     @GetMapping("flowTrend")
-    public JsonResult<FlowTrendVO> flowTrend(HttpServletRequest request, Date startTime, Date endTime) {
+    public JsonResult<FlowTrendVO> flowTrend(HttpServletRequest request, Date startTime, Date endTime, @RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite) {
         StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, true);
-        List<MovableGoodsVO> list = statsModelUtil.getPlatformTrendList(timeType, startTime, endTime);
+        List<MovableGoodsVO> list = statsModelUtil.getPlatformTrendList(timeType, startTime, endTime, webSite);
         FlowTrendVO vo = new FlowTrendVO();
         //访客数列表
         List<FlowTrendVO.VisitorNumVO> visitorNumList = new ArrayList<>();
@@ -369,12 +395,13 @@ public class AdminOverviewController extends BaseController {
     @ApiOperation("会员或店铺新增趋势")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "startTime", value = "开始时间", required = true),
-            @ApiImplicitParam(name = "endTime", value = "结束时间", required = true)
+            @ApiImplicitParam(name = "endTime", value = "结束时间", required = true),
+            @ApiImplicitParam(name = "webSite", value = "站点")
     })
     @GetMapping("newTrend")
-    public JsonResult<PlatformTrendVO> newTrend(HttpServletRequest request, Date startTime, Date endTime) {
+    public JsonResult<PlatformTrendVO> newTrend(HttpServletRequest request, Date startTime, Date endTime,@RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite) {
         StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, true);
-        List<MovableGoodsVO> list = statsModelUtil.getPlatformTrendList(timeType, startTime, endTime);
+        List<MovableGoodsVO> list = statsModelUtil.getPlatformTrendList(timeType, startTime, endTime, webSite);
         PlatformTrendVO vo = new PlatformTrendVO();
         //新增会员数列表
         List<PlatformTrendVO.NewMemberNumVO> memberList = new ArrayList<>();
@@ -564,11 +591,13 @@ public class AdminOverviewController extends BaseController {
      */
     @ApiOperation("首页概况-今日询盘概况")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "refresh", value = "true-刷新,默认false", defaultValue = "false")
+            @ApiImplicitParam(name = "refresh", value = "true-刷新,默认false", defaultValue = "false"),
+            @ApiImplicitParam(name = "webSite", value = "站点")
     })
     @GetMapping("enquiryInfo")
     public JsonResult<AdminPresentIndexVO.AdminEnquiryInfo> enquiryInfo(HttpServletRequest request,
-                                                                        @RequestParam(value = "refresh", required = false, defaultValue = "false") Boolean refresh) {
+                                                                        @RequestParam(value = "refresh", required = false, defaultValue = "false") Boolean refresh,
+                                                                        @RequestParam(value = "webSite", required = false,defaultValue ="1") String webSite) {
         AdminPresentDataVO.PlatformEnquiryTodayInfo platformEnquiryTodayInfo = new AdminPresentDataVO.PlatformEnquiryTodayInfo();
 
         Date now = new Date();
@@ -582,6 +611,7 @@ public class AdminOverviewController extends BaseController {
 
         //询盘总数
         MemberEnquiryExample memberEnquiryTotalExample = new MemberEnquiryExample();
+        memberEnquiryTotalExample.setWebSite(webSite);
         memberEnquiryTotalExample.setStatusNotEqual(EnquiryConst.ENQUIRY_DELETE);
         memberEnquiryTotalExample.setItemType(EnquiryConst.ENQUIRY_ITEM_TYPE_MALL);
         platformEnquiryTodayInfo.setEnquiryTotalNum(memberEnquiryModel.getMemberEnquiryCount(memberEnquiryTotalExample));
@@ -590,6 +620,7 @@ public class AdminOverviewController extends BaseController {
         Date enquiryEndTime = new Date();
         DateTime enquiryStartTime = DateUtil.beginOfDay(enquiryEndTime);
         MemberEnquiryExample memberEnquiryNewExample = new MemberEnquiryExample();
+        memberEnquiryNewExample.setWebSite(webSite);
         memberEnquiryNewExample.setCreateTimeGte(com.slodon.b2b2c.core.util.DateUtil.dateToString(enquiryStartTime, com.slodon.b2b2c.core.util.DateUtil.DATE_FORMAT_FIVE));
         memberEnquiryNewExample.setCreateTimeLte(com.slodon.b2b2c.core.util.DateUtil.dateToString(enquiryEndTime, com.slodon.b2b2c.core.util.DateUtil.DATE_FORMAT_FIVE));
         memberEnquiryNewExample.setStatusNotEqual(EnquiryConst.ENQUIRY_DELETE);
@@ -598,6 +629,7 @@ public class AdminOverviewController extends BaseController {
 
         //有效询盘数
         MemberEnquiryExample memberEnquiryValidExample = new MemberEnquiryExample();
+        memberEnquiryValidExample.setWebSite(webSite);
         memberEnquiryValidExample.setValidStatus(EnquiryConst.ENQUIRY_VALID);
         memberEnquiryValidExample.setStatusNotEqual(EnquiryConst.ENQUIRY_DELETE);
         memberEnquiryValidExample.setItemType(EnquiryConst.ENQUIRY_ITEM_TYPE_MALL);
@@ -605,6 +637,7 @@ public class AdminOverviewController extends BaseController {
 
         //待分配询盘数
         MemberEnquiryExample memberEnquiryToAssignExample = new MemberEnquiryExample();
+        memberEnquiryToAssignExample.setWebSite(webSite);
         memberEnquiryToAssignExample.setStatusEqual(EnquiryConst.ENQUIRY_NEW);
         memberEnquiryToAssignExample.setItemType(EnquiryConst.ENQUIRY_ITEM_TYPE_MALL);
         platformEnquiryTodayInfo.setEnquiryToBeAssignNum(memberEnquiryModel.getMemberEnquiryCount(memberEnquiryToAssignExample));
@@ -619,12 +652,13 @@ public class AdminOverviewController extends BaseController {
      * @param endTime
      * @return
      */
+    @ApiImplicitParam(name = "webSite", value = "站点")
     @GetMapping("enquiryTrend")
-    public JsonResult<EnquiryTrendVO> getEnquiryTrend(HttpServletRequest request, Date startTime, Date endTime) throws Exception {
+    public JsonResult<EnquiryTrendVO> getEnquiryTrend(HttpServletRequest request, Date startTime, Date endTime,@RequestParam(value = "webSite", required = false,defaultValue = "1")String webSite) throws Exception {
         EnquiryTrendVO vo = new EnquiryTrendVO();
         if (startTime != null && endTime != null) {
             StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, true);
-            List<MemberEnquiry> list = memberEnquiryModel.getAdminEnquiryTrendList(timeType, startTime, endTime);
+            List<MemberEnquiry> list = memberEnquiryModel.getAdminEnquiryTrendList(timeType, startTime, endTime,webSite);
             List<EnquiryTrendVO.EnquiryNumVO> enquiryNumVOList = new ArrayList<>();
             if (!CollectionUtils.isEmpty(list)) {
                 list.forEach(memberEnquiry -> {

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/statistics/admin/AdminStoreAnalysisController.java

@@ -98,12 +98,13 @@ public class AdminStoreAnalysisController extends BaseController {
     @ApiOperation("新增店铺趋势")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "startTime", value = "开始时间", required = true),
-            @ApiImplicitParam(name = "endTime", value = "结束时间", required = true)
+            @ApiImplicitParam(name = "endTime", value = "结束时间", required = true),
+            @ApiImplicitParam(name = "webSite", value = "站点")
     })
     @GetMapping("newStoreTrend")
-    public JsonResult<List<NewStoreTrendVO>> newStoreTrend(HttpServletRequest request, Date startTime, Date endTime) {
+    public JsonResult<List<NewStoreTrendVO>> newStoreTrend(HttpServletRequest request, Date startTime, Date endTime,@RequestParam(name = "webSite", required = false,defaultValue = "1") String webSite) {
         StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, true);
-        List<MovableGoodsVO> list = statsModelUtil.getPlatformTrendList(timeType, startTime, endTime);
+        List<MovableGoodsVO> list = statsModelUtil.getPlatformTrendList(timeType, startTime, endTime, webSite);
         List<NewStoreTrendVO> vos = new ArrayList<>();
         if (!CollectionUtils.isEmpty(list)) {
             list.forEach(trendVO -> {

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/statistics/admin/StatsJobController.java

@@ -202,6 +202,7 @@ public class StatsJobController extends BaseController {
         PlatformBase platformBase = platformStatsBO.initStats(startTime, basicDataBO);
         PlatformHour platformHour = new PlatformHour();
         platformHour.copy(platformBase);
+        platformHour.setWebSite(webSite);
         platformHourModel.savePlatformHour(platformHour);
 
         //8.保存省份统计

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

@@ -2,6 +2,7 @@ package com.slodon.b2b2c.controller.system.admin;
 
 import com.slodon.b2b2c.aop.OperationLogger;
 import com.slodon.b2b2c.core.config.DomainUrlUtil;
+import com.slodon.b2b2c.core.constant.MemberConst;
 import com.slodon.b2b2c.core.constant.PromotionConst;
 import com.slodon.b2b2c.core.controller.BaseController;
 import com.slodon.b2b2c.core.exception.MallException;
@@ -10,6 +11,7 @@ import com.slodon.b2b2c.core.response.JsonResult;
 import com.slodon.b2b2c.core.response.SldResponse;
 import com.slodon.b2b2c.core.util.*;
 import com.slodon.b2b2c.enums.SeoTypeConstant;
+import com.slodon.b2b2c.enums.WebSiteConstant;
 import com.slodon.b2b2c.model.promotion.PromotionCommonModel;
 import com.slodon.b2b2c.model.seller.StoreModel;
 import com.slodon.b2b2c.model.system.SettingModel;
@@ -24,10 +26,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -63,11 +62,12 @@ public class AdminSettingController extends BaseController {
     @ApiOperation("批量更新后台参数配置")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "name", value = "要修改的name名称", paramType = "query"),
-            @ApiImplicitParam(name = "value", value = "要修改的value值", paramType = "query")
+            @ApiImplicitParam(name = "value", value = "要修改的value值", paramType = "query"),
+            @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query")
     })
     @OperationLogger(option = "编辑后台参数配置")
     @PostMapping("updateSettingList")
-    public JsonResult updateSettingList(HttpServletRequest request) {
+    public JsonResult updateSettingList(HttpServletRequest request, @RequestParam(name = "webSite", required = false,defaultValue = "1") String webSite) {
         Map<String, String> postMap = WebUtil.handlerPostMap(request);
         if (null == postMap) {
             return SldResponse.badArgument();
@@ -79,6 +79,7 @@ public class AdminSettingController extends BaseController {
         SysSeo sysSeo = new SysSeo();
         sysSeo.setTenant(0L);
         sysSeo.setType(SeoTypeConstant.SEO_TYPE_MALL);
+        sysSeo.setWebSite(webSite);
         sysSeo.setName("平台SEO");
 //        sysSeo.setCode(SeoTypeConstant.SEO_TYPE_MALL+"_"+Integer.valueOf(admin.getRoleId()).longValue());
         sysSeo.setTargetId(Integer.valueOf(admin.getRoleId()).longValue());
@@ -108,7 +109,7 @@ public class AdminSettingController extends BaseController {
             } else {
                 setting.setValue(entry.getValue());
             }
-            settingModel.updateSetting(setting);
+            settingModel.updateSetting(setting, webSite);
 
 
             if("sys_seo_title".equals(entry.getKey())){
@@ -140,19 +141,25 @@ public class AdminSettingController extends BaseController {
         }
 
         //判断此条对应的记录是否为空
-        SysSeo seoInfo = storeModel.getRecordByTargetIdAndType(sysSeo.getTargetId(),sysSeo.getType());
-        if(seoInfo !=null){
+        SysSeo seoInfo = storeModel.getRecordByTargetIdAndType(sysSeo.getTargetId(), sysSeo.getType(), webSite);
+        if (seoInfo != null) {
             sysSeo.setUpdateUid(Integer.valueOf(admin.getAdminId()).longValue());
             sysSeo.setUpdateTime(time);
-            storeModel.updateSeo(sysSeo,sysSeo.getTargetId(),sysSeo.getType());
+            storeModel.updateSeo(sysSeo, sysSeo.getTargetId(), sysSeo.getType());
 //            storeModel.updateSeoByTargetIdAndType(sysSeo,sysSeo.getTargetId(),sysSeo.getType());
-        }else{
-            sysSeo.setCode(SeoTypeConstant.SEO_TYPE_MALL+"_"+Integer.valueOf(admin.getRoleId()).longValue());
+        } else {
+            sysSeo.setCode(SeoTypeConstant.SEO_TYPE_MALL + "_" + Integer.valueOf(admin.getRoleId()).longValue());
             sysSeo.setCreateUid(Integer.valueOf(admin.getAdminId()).longValue());
             sysSeo.setCreateTime(time);
             storeModel.saveSeo(sysSeo);
         }
 
+        List<Setting> settingList = settingModel.getSettingList(new SettingExample(), null);
+        AssertUtil.notEmpty(settingList, "配置信息不存在");
+        settingList.forEach(setting -> {
+            stringRedisTemplate.opsForValue().set(setting.getName(), setting.getValue());
+        });
+
         return SldResponse.success("更新成功");
     }
 
@@ -305,8 +312,11 @@ public class AdminSettingController extends BaseController {
     }
 
     @ApiOperation("获取站点设置基本信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query")
+    })
     @GetMapping("getBasicSiteSetting")
-    public JsonResult<List<Setting>> getBasicSiteSetting(HttpServletRequest request) {
+    public JsonResult<List<Setting>> getBasicSiteSetting(HttpServletRequest request, @RequestParam(name = "webSite", required = false,defaultValue = "1") String webSite) {
         //从请求头中获取语言类型
         String languageType = request.getHeader("Language");
 
@@ -314,7 +324,9 @@ public class AdminSettingController extends BaseController {
                 "hot_search_words,verification_code_check_is_enable,"+
                 "sys_seo_title,sys_seo_desc,sys_seo_keywords,pt_map_parameter,pt_map_parameter_1,about_banner,about_pic,about_text,basic_site_address,gz_code,guide_funds_banner,guide_funds_text";
 
-        List<Setting> list = getSetting(str);
+        List<Setting> list = getSetting(str, webSite);
+
+
         AssertUtil.notNull(list, "请输入正确的参数");
         list.forEach(setting -> {
             //翻译
@@ -558,14 +570,17 @@ public class AdminSettingController extends BaseController {
     }
 
     @ApiOperation("获取默认图片")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query")
+    })
     @GetMapping("getPcDefaultImage")
-    public JsonResult<List<Setting>> getPcDefaultImage(HttpServletRequest request) {
+    public JsonResult<List<Setting>> getPcDefaultImage(HttpServletRequest request,@RequestParam(name = "webSite", required = false,defaultValue = "1") String webSite) {
         //从请求头中获取语言类型
         String languageType = request.getHeader("Language");
 
         String str = "default_image_store_logo,default_image_user_portrait,default_image_store_banner_pc,default_image_store_list_top";
 
-        List<Setting> list = getSetting(str);
+        List<Setting> list = getSetting(str, webSite);
         AssertUtil.notNull(list, "请输入正确的参数");
         list.forEach(setting -> {
             //翻译
@@ -578,8 +593,11 @@ public class AdminSettingController extends BaseController {
     }
 
     @ApiOperation("获取PC基础图片")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query")
+    })
     @GetMapping("getPcMainImage")
-    public JsonResult<List<Setting>> getPcMainImage(HttpServletRequest request) {
+    public JsonResult<List<Setting>> getPcMainImage(HttpServletRequest request, @RequestParam(name = "webSite", required = false,defaultValue = "1") String webSite) {
         //从请求头中获取语言类型
         String languageType = request.getHeader("Language");
 
@@ -587,7 +605,7 @@ public class AdminSettingController extends BaseController {
                 "main_user_register_logo,main_seller_center_logo,vendor_login_left_bg,vendor_login_bg," +
                 "main_admin_top_logo,admin_login_left_bg,admin_login_bg";
 
-        List<Setting> list = getSetting(str);
+        List<Setting> list = getSetting(str,webSite);
         AssertUtil.notNull(list, "请输入正确的参数");
         list.forEach(setting -> {
             //翻译
@@ -825,6 +843,46 @@ public class AdminSettingController extends BaseController {
         return list;
     }
 
+
+
+    /**
+     * 获取Setting参数
+     *
+     * @param str 以逗号分割要查询的键值name
+     * @return
+     */
+    private List<Setting> getSetting(String str,String webSite) {
+        if (StringUtils.isEmpty(str)) {
+            return null;
+        }
+        //不需要返回描述信息的配置,直接往后追加
+        List<String> emptyDes = Arrays.asList("refund_setting_switch", "coupon_is_enable");
+        List<Setting> list = new LinkedList<>();
+        String[] split = str.split(",");
+        for (String s : split) {
+            if (StringUtils.isEmpty(s)) {
+                continue;
+            }
+            Setting setting = settingModel.getSettingByName(s);
+            if (!WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
+                setting = settingModel.getSettingByName(s + "_" + webSite);
+            }
+            if (setting == null) {
+                continue;
+            }
+            //类型，1-字符串，2-图片，3-固定不能修改；4-开关配置, 如果是图片需要返回图片的完整连接地址
+            if (2 == setting.getType()) {
+                setting.setImageUrl(StringUtil.isEmpty(setting.getValue()) ? null : FileUrlUtil.getFileUrl(setting.getValue(), null));
+            }
+            if (emptyDes.contains(s)) {
+                //不需要返回描述信息的配置
+                setting.setDescription(null);
+            }
+            list.add(setting);
+        }
+        return list;
+    }
+
     @ApiOperation("订单列表字段")
     @GetMapping("getOrderListCode")
     public JsonResult getOrderListCode(HttpServletRequest request) {

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

@@ -124,18 +124,22 @@ public interface MemberEnquiryReadMapper extends BaseReadMapper<MemberEnquiry, M
      *
      * @param startTime
      * @param endTime
+     * @param webSite
      * @return
      */
     List<MemberEnquiry> getAdminEnquiryTrendByTime(@Param("startTime") Date startTime,
-                                              @Param("endTime") Date endTime);
+                                                   @Param("endTime") Date endTime,
+                                                   @Param("webSite") String webSite);
 
     /**
      * 平台端-询盘趋势-小时
      *
      * @param startTime
      * @param endTime
+     * @param webSite
      * @return
      */
     List<MemberEnquiry> getAdminEnquiryTrendByHour(@Param("startTime") Date startTime,
-                                              @Param("endTime") Date endTime);
+                                                   @Param("endTime") Date endTime,
+                                                   @Param("webSite") String webSite);
 }

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/job/StatsJob.java

@@ -247,6 +247,7 @@ public class StatsJob {
                     PlatformBase platformBase = platformStatsBO.initStats(startTime, basicDataBO);
                     PlatformHour platformHour = new PlatformHour();
                     platformHour.copy(platformBase);
+                    platformHour.setWebSite(setting.getValue());
                     platformHourModel.savePlatformHour(platformHour);
                 } catch (Exception e) {
                     log.error("保存平台小时统计出错", e);
@@ -396,6 +397,7 @@ public class StatsJob {
                     PlatformBase platformBase = platformStatsBO.initStats(startTime, basicDataBO);
                     PlatformDay platformDay = new PlatformDay();
                     platformDay.copy(platformBase);
+                    platformDay.setWebSite(setting.getValue());
                     platformDayModel.savePlatformDay(platformDay);
                 } catch (Exception e) {
                     log.error("保存平台日统计出错", e);
@@ -545,6 +547,7 @@ public class StatsJob {
                     PlatformBase platformBase = platformStatsBO.initStats(startTime, basicDataBO);
                     PlatformWeek platformWeek = new PlatformWeek();
                     platformWeek.copy(platformBase);
+                    platformWeek.setWebSite(setting.getValue());
                     platformWeekModel.savePlatformWeek(platformWeek);
                 } catch (Exception e) {
                     log.error("保存平台周统计出错", e);
@@ -692,6 +695,7 @@ public class StatsJob {
                     PlatformBase platformBase = platformStatsBO.initStats(startTime, basicDataBO);
                     PlatformMonth platformMonth = new PlatformMonth();
                     platformMonth.copy(platformBase);
+                    platformMonth.setWebSite(setting.getValue());
                     platformMonthModel.savePlatformMonth(platformMonth);
                 } catch (Exception e) {
                     log.error("保存品平台月统计出错", e);
@@ -827,6 +831,7 @@ public class StatsJob {
                         MemberStoreBase memberStoreBase = memberStoreStatsBO.initStats(startTime);
                         MemberStoreYear memberStoreYear = new MemberStoreYear();
                         memberStoreYear.copy(memberStoreBase);
+                        memberStoreYear.setWebSite(setting.getValue());
                         memberStoreYearModel.saveMemberStoreYear(memberStoreYear);
                     });
                 } catch (Exception e) {
@@ -839,6 +844,7 @@ public class StatsJob {
                     PlatformBase platformBase = platformStatsBO.initStats(startTime, basicDataBO);
                     PlatformYear platformYear = new PlatformYear();
                     platformYear.copy(platformBase);
+                    platformYear.setWebSite(setting.getValue());
                     platformYearModel.savePlatformYear(platformYear);
                 } catch (Exception e) {
                     log.error("保存平台年统计出错", e);
@@ -864,6 +870,7 @@ public class StatsJob {
                         StoreBase storeBase = storeStatsBO.initStats(startTime);
                         StoreYear storeYear = new StoreYear();
                         storeYear.copy(storeBase);
+                        storeYear.setWebSite(setting.getValue());
                         storeYearModel.saveStoreYear(storeYear);
                     });
                 } catch (Exception e) {

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

@@ -201,6 +201,7 @@ public class GoodsSellerModel {
         goods.setWebSite(insertDTO.getWebSite());
         goods.setGoodsId(goodsId);
         goods.setGoodsName(insertDTO.getGoodsName());
+        goods.setGoodsNameCn(insertDTO.getGoodsNameCn());
         goods.setGoodsBrief(insertDTO.getGoodsBrief());
         if (!StringUtil.isNullOrZero(insertDTO.getBrandId())) {
             //查询品牌信息
@@ -258,6 +259,7 @@ public class GoodsSellerModel {
 
         //以下为新增SEO表
         SysSeo sysSeo = new SysSeo();
+        sysSeo.setWebSite(insertDTO.getWebSite());
         sysSeo.setTenant(0L);
         sysSeo.setType(SeoTypeConstant.SEO_TYPE_GOODS);
         sysSeo.setName("商品SEO");
@@ -731,6 +733,7 @@ public class GoodsSellerModel {
         Goods goods = new Goods();
         goods.setGoodsId(insertDTO.getGoodsId());
         goods.setGoodsName(insertDTO.getGoodsName());
+        goods.setGoodsNameCn(insertDTO.getGoodsNameCn());
         goods.setGoodsBrief(StringUtils.isEmpty(insertDTO.getGoodsBrief()) ? "" : insertDTO.getGoodsBrief());//为传商品广告时，要清除原数据
         if (!StringUtil.isNullOrZero(insertDTO.getBrandId())) {
             //查询品牌信息
@@ -794,6 +797,7 @@ public class GoodsSellerModel {
         sysSeo.setTenant(0L);
         sysSeo.setType(SeoTypeConstant.SEO_TYPE_GOODS);
         sysSeo.setName("商品SEO");
+        sysSeo.setWebSite(insertDTO.getWebSite());
 //        sysSeo.setCode(SeoTypeConstant.SEO_TYPE_GOODS+"_"+insertDTO.getGoodsId());
         sysSeo.setTargetId(insertDTO.getGoodsId());
         sysSeo.setTitle(insertDTO.getSeoTitle());

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

@@ -381,24 +381,24 @@ public class MemberEnquiryModel {
      * @param end
      * @return
      */
-    public List<MemberEnquiry> getAdminEnquiryTrendList(StatsTimeType timeType, Date start, Date end) throws Exception {
+    public List<MemberEnquiry> getAdminEnquiryTrendList(StatsTimeType timeType, Date start, Date end,String webSite) throws Exception {
         List<MemberEnquiry> enquiryList = new ArrayList<>();
         log.info("timeType:{}", timeType);
         switch (timeType) {
             case HOUR:
-                enquiryList = getAdminEnquryHoursInfo(start, end);
+                enquiryList = getAdminEnquryHoursInfo(start, end, webSite);
                 break;
             case DAY:
-                enquiryList = getAdminEnquryDaysInfo(start, end);
+                enquiryList = getAdminEnquryDaysInfo(start, end, webSite);
                 break;
             case WEEK:
-                enquiryList = getAdminEnquryDaysInfo(start, end);
+                enquiryList = getAdminEnquryDaysInfo(start, end, webSite);
                 break;
             case MONTH:
-                enquiryList = getAdminEnquryDaysInfo(start, end);
+                enquiryList = getAdminEnquryDaysInfo(start, end, webSite);
                 break;
             case YEAR:
-                enquiryList = getAdminEnquryDaysInfo(start, end);
+                enquiryList = getAdminEnquryDaysInfo(start, end, webSite);
                 break;
         }
         return enquiryList;
@@ -412,9 +412,9 @@ public class MemberEnquiryModel {
      * @return
      * @throws Exception
      */
-    private List<MemberEnquiry> getAdminEnquryDaysInfo(Date start, Date end) throws Exception {
+    private List<MemberEnquiry> getAdminEnquryDaysInfo(Date start, Date end,String webSite) throws Exception {
         Map<String, MemberEnquiry> enquiryMap = new HashMap<>();
-        List<MemberEnquiry> enquiryList = memberEnquiryReadMapper.getAdminEnquiryTrendByTime(start, end);
+        List<MemberEnquiry> enquiryList = memberEnquiryReadMapper.getAdminEnquiryTrendByTime(start, end, webSite);
         enquiryList.forEach(c -> {
             enquiryMap.put(c.getEnquiryDay(), c);
         });
@@ -443,8 +443,8 @@ public class MemberEnquiryModel {
      * @param end
      * @return
      */
-    private List<MemberEnquiry> getAdminEnquryHoursInfo(Date start, Date end) {
-        List<MemberEnquiry> enquiryHoursList = memberEnquiryReadMapper.getAdminEnquiryTrendByHour(start, end);
+    private List<MemberEnquiry> getAdminEnquryHoursInfo(Date start, Date end,String webSite) {
+        List<MemberEnquiry> enquiryHoursList = memberEnquiryReadMapper.getAdminEnquiryTrendByHour(start, end, webSite);
 
         Map<String, MemberEnquiry> enquiryMap = new HashMap<>();
         enquiryHoursList.forEach(c -> {

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

@@ -189,12 +189,13 @@ public class StoreInnerLabelModel {
      * @param seoKeyWords
      * @return
      */
-    public Integer addAndUpdateSeo(StoreInnerLabel storeInnerLabel, String seoTitle, String seoDesc, String seoKeyWords, Vendor vendor){
+    public Integer addAndUpdateSeo(StoreInnerLabel storeInnerLabel, String seoTitle, String seoDesc, String seoKeyWords, Vendor vendor,String webSite){
         //以下为新增SEO表
         SysSeo sysSeo = new SysSeo();
         sysSeo.setTenant(0L);
         sysSeo.setType(SeoTypeConstant.SEO_TYPE_SHOP_CATEGORY);
         sysSeo.setName("店铺分类SEO");
+        sysSeo.setWebSite(webSite);
 //        sysSeo.setCode(SeoTypeConstant.SEO_TYPE_GOODS_CATEGORY+"_"+Integer.valueOf(storeInnerLabel.getInnerLabelId()).longValue());
         sysSeo.setTargetId(Integer.valueOf(storeInnerLabel.getInnerLabelId()).longValue());
         sysSeo.setTitle(seoTitle);

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

@@ -137,7 +137,7 @@ public class StoreModel {
 
         //新增store表
         Store store = new Store();
-        store.setStoreId(SmartId.nextId(BizTypeConst.STORE));
+        store.setStoreId(storeApply.getStoreId());
         store.setStoreName(storeApply.getStoreName());
         store.setStoreGradeId(storeApply.getStoreGradeId());
         //根据店铺等级id获取等级名称
@@ -416,7 +416,6 @@ public class StoreModel {
         return count;
     }
 
-
     /**
      * 根据targetId去查询SEO记录
      *
@@ -434,6 +433,25 @@ public class StoreModel {
         return seo;
     }
 
+
+    /**
+     *
+     * @param targetId
+     * @param type
+     * @param webSite
+     * @return
+     */
+    public SysSeo getRecordByTargetIdAndType(Long targetId, String type, String webSite) {
+        SysSeo seo = null;
+        SysSeoExample seoExample = new SysSeoExample();
+        seoExample.createCriteria().andTargetIdEqualTo(targetId).andTypeEqualTo(type).andWebSiteEqualTo(webSite);
+        List<SysSeo> seoList = sysSeoReadMapper.selectByExample(seoExample);
+        if (!CollectionUtils.isEmpty(seoList)) {
+            seo = seoList.get(NumConstant.ZERO);
+        }
+        return seo;
+    }
+
     /**
      * 用于商品详情接口-查询seoVo
      *

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

@@ -7,6 +7,7 @@ import com.slodon.b2b2c.dao.read.system.SettingReadMapper;
 import com.slodon.b2b2c.dao.read.system.SysSeoReadMapper;
 import com.slodon.b2b2c.dao.write.system.SettingWriteMapper;
 import com.slodon.b2b2c.dao.write.system.SysSeoWriteMapper;
+import com.slodon.b2b2c.enums.WebSiteConstant;
 import com.slodon.b2b2c.system.example.SettingExample;
 import com.slodon.b2b2c.system.example.SysSeoExample;
 import com.slodon.b2b2c.system.pojo.Setting;
@@ -84,6 +85,22 @@ public class SettingModel {
     }
 
 
+    public Integer updateSetting(Setting setting,String webSite) {
+        if (StringUtils.isEmpty(setting.getName())) {
+            throw new MallException("请选择要修改的数据");
+        }
+        if (!WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
+            setting.setName(setting.getName() + "_" + webSite);
+        }
+        int count = settingWriteMapper.updateByPrimaryKeySelective(setting);
+        if (count == 0) {
+            log.error("根据name：" + setting.getName() + "更新系统设置表失败");
+            throw new MallException("更新系统设置表失败,请重试");
+        }
+        return count;
+    }
+
+
 //    /**
 //     *根据targetId去查询SEO记录
 //     * @param targetId

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/util/StatsModelUtil.java

@@ -143,15 +143,17 @@ public class StatsModelUtil {
      * @param timeType
      * @param startTime
      * @param endTime
+     * @param webSite
      * @return
      */
-    public List<MovableGoodsVO> getPlatformTrendList(StatsTimeType timeType, Date startTime, Date endTime) {
+    public List<MovableGoodsVO> getPlatformTrendList(StatsTimeType timeType, Date startTime, Date endTime,String webSite) {
         List<MovableGoodsVO> list = new ArrayList<>();
         switch (timeType) {
             case HOUR:
                 PlatformHourExample example = new PlatformHourExample();
                 example.setStatsTimeAfter(startTime);
                 example.setStatsTimeBefore(endTime);
+                example.setWebSite(webSite);
                 list = platformHourModel.getPlatformTrendList(example);
                 break;
             case DAY:
@@ -160,12 +162,14 @@ public class StatsModelUtil {
                 PlatformDayExample dayExample = new PlatformDayExample();
                 dayExample.setStatsTimeAfter(startTime);
                 dayExample.setStatsTimeBefore(endTime);
+                dayExample.setWebSite(webSite);
                 list = platformDayModel.getPlatformTrendList(dayExample);
                 break;
             case YEAR:
                 PlatformMonthExample monthExample = new PlatformMonthExample();
                 monthExample.setStatsTimeAfter(startTime);
                 monthExample.setStatsTimeBefore(endTime);
+                monthExample.setWebSite(webSite);
                 list = platformMonthModel.getPlatformTrendList(monthExample);
                 break;
         }

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

@@ -22,6 +22,9 @@ public class GoodsCategoryListVO {
     @ApiModelProperty("分类id")
     private Integer categoryId;
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     @ApiModelProperty("分类名称")
     private String categoryName;
 
@@ -101,6 +104,7 @@ public class GoodsCategoryListVO {
 
     public GoodsCategoryListVO(GoodsCategory category) {
         this.categoryId = category.getCategoryId();
+        this.webSite = category.getWebSite();
         this.categoryName = category.getCategoryName();
         this.categoryAlias = category.getCategoryAlias();
         this.pid = category.getPid();

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/statistics/AdminPresentIndexVO.java

@@ -23,9 +23,15 @@ public class AdminPresentIndexVO {
         @ApiModelProperty("待审核商品数")
         private Integer auditGoodsNum;
 
+        @ApiModelProperty("站点待审核商品数")
+        private Integer webSiteAuditGoodsNum;
+
         @ApiModelProperty("待审核品牌数")
         private Integer auditBrandNum;
 
+        @ApiModelProperty("站点待审核品牌数")
+        private Integer webSiteAuditBrandNum;
+
         @ApiModelProperty("待确认退款数")
         private Integer confirmReturnNum;
 
@@ -34,6 +40,9 @@ public class AdminPresentIndexVO {
 
         @ApiModelProperty("待分配询盘")
         private Integer enquiryToBeAssignNum;
+
+        @ApiModelProperty("站点待分配询盘")
+        private Integer webSiteEnquiryToBeAssignNum;
     }
 
     /**

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

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.read.goods.GoodsCategoryReadMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.goods.pojo.GoodsCategory">
     <id column="category_id" property="categoryId" />
+    <result column="web_site" property="webSite" />
     <result column="category_name" property="categoryName" />
     <result column="category_alias" property="categoryAlias" />
     <result column="pid" property="pid" />
@@ -35,6 +36,9 @@
         <if test="example.categoryIdIn != null">
           AND `category_id` in (${example.categoryIdIn})
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.categoryName != null">
           AND `category_name` = #{example.categoryName}
         </if>

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

@@ -331,6 +331,9 @@
         WHERE
             t1.`status` != 'DELETE' AND ( t1.`item_type` = 'MALL')
             and t1.create_time >= #{startTime} and #{endTime} > t1.create_time
+            <if test="webSite != null and webSite != ''">
+                and t1.web_site = #{webSite}
+            </if>
         GROUP BY
             date_format( t1.create_time, '%Y-%m-%d' )
         ORDER BY enquiry_day
@@ -346,6 +349,9 @@
         WHERE
             t1.`status` != 'DELETE' AND ( t1.`item_type` = 'MALL')
             and t1.create_time >= #{startTime} and #{endTime} > t1.create_time
+        <if test="webSite != null and webSite != ''">
+            and t1.web_site = #{webSite}
+        </if>
         GROUP BY
             date_format( t1.create_time, '%H:00' )
         ORDER BY

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

@@ -206,6 +206,9 @@
                 <if test="example.gpToken != null">
                     AND `gp_token` = #{example.gpToken}
                 </if>
+                <if test="example.memberCompany != null">
+                    AND `member_company` = #{example.memberCompany}
+                </if>
                 <if test="example.webSite != null">
                     AND `web_site` = #{example.webSite}
                 </if>

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

@@ -3,6 +3,7 @@
 <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="web_site" property="webSite" />
     <result column="store_id" property="storeId" />
     <result column="store_logo" property="storeLogo" />
     <result column="store_banner_pc" property="storeBannerPc" />

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/statistics/PlatformDayReadMapper.xml

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.PlatformDay">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="visitor_num" property="visitorNum" />
     <result column="new_visitor_num" property="newVisitorNum" />
     <result column="view_num" property="viewNum" />
@@ -49,6 +50,9 @@
         <if test="example.statsTimeBefore != null">
           AND `stats_time` <![CDATA[ <= ]]> #{example.statsTimeBefore}
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.visitorNum != null">
           AND `visitor_num` = #{example.visitorNum}
         </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/statistics/PlatformHourReadMapper.xml

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.PlatformHour">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="visitor_num" property="visitorNum" />
     <result column="new_visitor_num" property="newVisitorNum" />
     <result column="view_num" property="viewNum" />
@@ -49,6 +50,9 @@
         <if test="example.statsTimeBefore != null">
           AND `stats_time` <![CDATA[ <= ]]> #{example.statsTimeBefore}
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.visitorNum != null">
           AND `visitor_num` = #{example.visitorNum}
         </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/statistics/PlatformMonthReadMapper.xml

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.PlatformMonth">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="visitor_num" property="visitorNum" />
     <result column="new_visitor_num" property="newVisitorNum" />
     <result column="view_num" property="viewNum" />
@@ -49,6 +50,9 @@
         <if test="example.statsTimeBefore != null">
           AND `stats_time` <![CDATA[ <= ]]> #{example.statsTimeBefore}
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.visitorNum != null">
           AND `visitor_num` = #{example.visitorNum}
         </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/statistics/PlatformWeekReadMapper.xml

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.PlatformWeek">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="visitor_num" property="visitorNum" />
     <result column="new_visitor_num" property="newVisitorNum" />
     <result column="view_num" property="viewNum" />
@@ -49,6 +50,9 @@
         <if test="example.statsTimeBefore != null">
           AND `stats_time` <![CDATA[ <= ]]> #{example.statsTimeBefore}
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.visitorNum != null">
           AND `visitor_num` = #{example.visitorNum}
         </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/statistics/PlatformYearReadMapper.xml

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.PlatformYear">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="visitor_num" property="visitorNum" />
     <result column="new_visitor_num" property="newVisitorNum" />
     <result column="view_num" property="viewNum" />
@@ -49,6 +50,9 @@
         <if test="example.statsTimeBefore != null">
           AND `stats_time` <![CDATA[ <= ]]> #{example.statsTimeBefore}
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.visitorNum != null">
           AND `visitor_num` = #{example.visitorNum}
         </if>

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

@@ -8,6 +8,7 @@
       This element was generated on Fri Sep 09 17:18:53 CST 2022.
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="web_site" jdbcType="VARCHAR" property="webSite" />
     <result column="tenant" jdbcType="BIGINT" property="tenant" />
     <result column="type" jdbcType="VARCHAR" property="type" />
     <result column="name" jdbcType="VARCHAR" property="name" />
@@ -96,7 +97,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Fri Sep 09 17:18:53 CST 2022.
     -->
-    id, tenant, type, name, code, target_id, title, remark, keywords, alt, create_uid,
+    id,web_site, tenant, type, name, code, target_id, title, remark, keywords, alt, create_uid,
     create_time, update_uid, update_time
   </sql>
   <select id="selectByExample" parameterType="com.slodon.b2b2c.system.example.SysSeoExample" resultMap="BaseResultMap">

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

@@ -316,7 +316,7 @@
     VALUES(
     <trim suffixOverrides=",">
       <if test="webSite != null">
-        #{webSite}
+        #{webSite},
       </if>
       <if test="brandName != null">
         #{brandName},

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

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.write.goods.GoodsCategoryWriteMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.goods.pojo.GoodsCategory">
     <id column="category_id" property="categoryId" />
+    <result column="web_site" property="webSite" />
     <result column="category_name" property="categoryName" />
     <result column="category_alias" property="categoryAlias" />
     <result column="pid" property="pid" />
@@ -24,6 +25,9 @@
   <!--除主键外的所有字段，用于插入操作-->
   <sql id="columns">
     <trim suffixOverrides=",">
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="categoryName != null">
         `category_name`,
       </if>
@@ -91,6 +95,9 @@
         <if test="example.categoryIdIn != null">
           AND `category_id` in (${example.categoryIdIn})
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.categoryName != null">
           AND `category_name` = #{example.categoryName}
         </if>
@@ -282,6 +289,9 @@
     )
     VALUES(
     <trim suffixOverrides=",">
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="categoryName != null">
         #{categoryName},
       </if>
@@ -340,6 +350,9 @@
   <update id="updateByExampleSelective">
     UPDATE `goods_category`
     <trim prefix="SET" suffixOverrides=",">
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.categoryName != null">
         `category_name` = #{record.categoryName},
       </if>
@@ -398,6 +411,9 @@
   <update id="updateByPrimaryKeySelective">
     UPDATE `goods_category`
     <trim prefix="SET" suffixOverrides=",">
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="categoryName != null">
         `category_name` = #{categoryName},
       </if>

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

@@ -516,7 +516,7 @@
         #{goodsName},
       </if>
       <if test="goodsNameCn != null">
-        #{goodsNameCn}
+        #{goodsNameCn},
       </if>
       <if test="goodsBrief != null">
         #{goodsBrief},

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

@@ -3,6 +3,7 @@
 <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="web_site" property="webSite" />
     <result column="store_id" property="storeId" />
     <result column="store_logo" property="storeLogo" />
     <result column="store_banner_pc" property="storeBannerPc" />
@@ -20,6 +21,9 @@
   <!--除主键外的所有字段，用于插入操作-->
   <sql id="columns">
     <trim suffixOverrides=",">
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="storeId != null">
         `store_id`,
       </if>
@@ -201,6 +205,9 @@
     )
     VALUES(
     <trim suffixOverrides=",">
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="storeId != null">
         #{storeId},
       </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/write/statistics/BrandMonthWriteMapper.xml

@@ -242,7 +242,7 @@
         #{statsTime},
       </if>
        <if test="webSite != null">
-        #{webSite}
+        #{webSite},
       </if>
       <if test="brandId != null">
         #{brandId},

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/write/statistics/PlatformDayWriteMapper.xml

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.PlatformDay">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="visitor_num" property="visitorNum" />
     <result column="new_visitor_num" property="newVisitorNum" />
     <result column="view_num" property="viewNum" />
@@ -35,6 +36,9 @@
       <if test="statsTime != null">
         `stats_time`,
       </if>
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="visitorNum != null">
         `visitor_num`,
       </if>
@@ -129,6 +133,9 @@
         <if test="example.statsTimeBefore != null">
           AND `stats_time` <![CDATA[ <= ]]> #{example.statsTimeBefore}
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.visitorNum != null">
           AND `visitor_num` = #{example.visitorNum}
         </if>
@@ -335,6 +342,9 @@
       <if test="statsTime != null">
         #{statsTime},
       </if>
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="visitorNum != null">
         #{visitorNum},
       </if>
@@ -417,6 +427,9 @@
       <if test="record.statsTime != null">
         `stats_time` = #{record.statsTime},
       </if>
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.visitorNum != null">
         `visitor_num` = #{record.visitorNum},
       </if>
@@ -499,6 +512,9 @@
       <if test="statsTime != null">
         `stats_time` = #{statsTime},
       </if>
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="visitorNum != null">
         `visitor_num` = #{visitorNum},
       </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/write/statistics/PlatformHourWriteMapper.xml

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.PlatformHour">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="visitor_num" property="visitorNum" />
     <result column="new_visitor_num" property="newVisitorNum" />
     <result column="view_num" property="viewNum" />
@@ -35,6 +36,9 @@
       <if test="statsTime != null">
         `stats_time`,
       </if>
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="visitorNum != null">
         `visitor_num`,
       </if>
@@ -129,6 +133,9 @@
         <if test="example.statsTimeBefore != null">
           AND `stats_time` <![CDATA[ <= ]]> #{example.statsTimeBefore}
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.visitorNum != null">
           AND `visitor_num` = #{example.visitorNum}
         </if>
@@ -335,6 +342,9 @@
       <if test="statsTime != null">
         #{statsTime},
       </if>
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="visitorNum != null">
         #{visitorNum},
       </if>
@@ -417,6 +427,9 @@
       <if test="record.statsTime != null">
         `stats_time` = #{record.statsTime},
       </if>
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.visitorNum != null">
         `visitor_num` = #{record.visitorNum},
       </if>
@@ -499,6 +512,9 @@
       <if test="statsTime != null">
         `stats_time` = #{statsTime},
       </if>
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="visitorNum != null">
         `visitor_num` = #{visitorNum},
       </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/write/statistics/PlatformMonthWriteMapper.xml

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.PlatformMonth">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="visitor_num" property="visitorNum" />
     <result column="new_visitor_num" property="newVisitorNum" />
     <result column="view_num" property="viewNum" />
@@ -35,6 +36,9 @@
       <if test="statsTime != null">
         `stats_time`,
       </if>
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="visitorNum != null">
         `visitor_num`,
       </if>
@@ -129,6 +133,9 @@
         <if test="example.statsTimeBefore != null">
           AND `stats_time` <![CDATA[ <= ]]> #{example.statsTimeBefore}
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.visitorNum != null">
           AND `visitor_num` = #{example.visitorNum}
         </if>
@@ -335,6 +342,9 @@
       <if test="statsTime != null">
         #{statsTime},
       </if>
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="visitorNum != null">
         #{visitorNum},
       </if>
@@ -417,6 +427,9 @@
       <if test="record.statsTime != null">
         `stats_time` = #{record.statsTime},
       </if>
+      <if test="record.webSite != null">
+        AND `web_site` = #{record.webSite}
+      </if>
       <if test="record.visitorNum != null">
         `visitor_num` = #{record.visitorNum},
       </if>
@@ -499,6 +512,9 @@
       <if test="statsTime != null">
         `stats_time` = #{statsTime},
       </if>
+      <if test="webSite != null">
+        AND `web_site` = #{webSite}
+      </if>
       <if test="visitorNum != null">
         `visitor_num` = #{visitorNum},
       </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/write/statistics/PlatformWeekWriteMapper.xml

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.PlatformWeek">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="visitor_num" property="visitorNum" />
     <result column="new_visitor_num" property="newVisitorNum" />
     <result column="view_num" property="viewNum" />
@@ -35,6 +36,9 @@
       <if test="statsTime != null">
         `stats_time`,
       </if>
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="visitorNum != null">
         `visitor_num`,
       </if>
@@ -129,6 +133,9 @@
         <if test="example.statsTimeBefore != null">
           AND `stats_time` <![CDATA[ <= ]]> #{example.statsTimeBefore}
         </if>
+        <if test="example.webSite != null">
+            AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.visitorNum != null">
           AND `visitor_num` = #{example.visitorNum}
         </if>
@@ -335,6 +342,9 @@
       <if test="statsTime != null">
         #{statsTime},
       </if>
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="visitorNum != null">
         #{visitorNum},
       </if>
@@ -417,6 +427,9 @@
       <if test="record.statsTime != null">
         `stats_time` = #{record.statsTime},
       </if>
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.visitorNum != null">
         `visitor_num` = #{record.visitorNum},
       </if>
@@ -499,6 +512,9 @@
       <if test="statsTime != null">
         `stats_time` = #{statsTime},
       </if>
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="visitorNum != null">
         `visitor_num` = #{visitorNum},
       </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/write/statistics/PlatformYearWriteMapper.xml

@@ -5,6 +5,7 @@
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
     <result column="visitor_num" property="visitorNum" />
+    <result column="web_site" property="webSite" />
     <result column="new_visitor_num" property="newVisitorNum" />
     <result column="view_num" property="viewNum" />
     <result column="store_visitor_num" property="storeVisitorNum" />
@@ -35,6 +36,9 @@
       <if test="statsTime != null">
         `stats_time`,
       </if>
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="visitorNum != null">
         `visitor_num`,
       </if>
@@ -129,6 +133,9 @@
         <if test="example.statsTimeBefore != null">
           AND `stats_time` <![CDATA[ <= ]]> #{example.statsTimeBefore}
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.visitorNum != null">
           AND `visitor_num` = #{example.visitorNum}
         </if>
@@ -335,6 +342,9 @@
       <if test="statsTime != null">
         #{statsTime},
       </if>
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="visitorNum != null">
         #{visitorNum},
       </if>
@@ -417,6 +427,9 @@
       <if test="record.statsTime != null">
         `stats_time` = #{record.statsTime},
       </if>
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.visitorNum != null">
         `visitor_num` = #{record.visitorNum},
       </if>
@@ -499,6 +512,9 @@
       <if test="statsTime != null">
         `stats_time` = #{statsTime},
       </if>
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="visitorNum != null">
         `visitor_num` = #{visitorNum},
       </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/write/statistics/StoreYearWriteMapper.xml

@@ -366,7 +366,7 @@
         #{statsTime},
       </if>
       <if test="webSite != null">
-        #{webSite}
+        #{webSite},
       </if>
       <if test="storeId != null">
         #{storeId},

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

@@ -8,6 +8,8 @@
       This element was generated on Fri Sep 09 17:18:53 CST 2022.
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="web_site" jdbcType="VARCHAR" property="webSite" />
+    <result column="tenant" jdbcType="BIGINT" property="tenant" />
     <result column="tenant" jdbcType="BIGINT" property="tenant" />
     <result column="type" jdbcType="VARCHAR" property="type" />
     <result column="name" jdbcType="VARCHAR" property="name" />
@@ -96,7 +98,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Fri Sep 09 17:18:53 CST 2022.
     -->
-    id, tenant, type, name, code, target_id, title, remark, keywords, alt, create_uid,
+    id,web_site, tenant, type, name, code, target_id, title, remark, keywords, alt, create_uid,
     create_time, update_uid, update_time
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
@@ -128,12 +130,12 @@
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into sys_seo (tenant, type, name,
+    insert into sys_seo (web_site,tenant, type, name,
       code, target_id, title,
       remark, keywords, alt,
       create_uid, create_time, update_uid,
       update_time)
-    values (#{tenant,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
+    values (#{webSite,jdbcType=VARCHAR},#{tenant,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
       #{code,jdbcType=VARCHAR}, #{targetId,jdbcType=BIGINT}, #{title,jdbcType=VARCHAR},
       #{remark,jdbcType=VARCHAR}, #{keywords,jdbcType=VARCHAR}, #{alt,jdbcType=VARCHAR},
       #{createUid,jdbcType=BIGINT}, #{createTime,jdbcType=VARCHAR}, #{updateUid,jdbcType=BIGINT},
@@ -150,6 +152,9 @@
     </selectKey>
     insert into sys_seo
     <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="webSite != null">
+        web_site,
+      </if>
       <if test="tenant != null">
         tenant,
       </if>
@@ -191,6 +196,9 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="webSite != null">
+        #{webSite,jdbcType=VARCHAR},
+      </if>
       <if test="tenant != null">
         #{tenant,jdbcType=BIGINT},
       </if>
@@ -254,6 +262,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.tenant != null">
         tenant = #{row.tenant,jdbcType=BIGINT},
       </if>
@@ -306,6 +317,7 @@
     -->
     update sys_seo
     set id = #{row.id,jdbcType=BIGINT},
+      web_site = #{row.webSite,jdbcType=VARCHAR},
       tenant = #{row.tenant,jdbcType=BIGINT},
       type = #{row.type,jdbcType=VARCHAR},
       name = #{row.name,jdbcType=VARCHAR},
@@ -331,6 +343,9 @@
     -->
     update sys_seo
     <set>
+      <if test="webSite != null">
+        web_site = #{webSite,jdbcType=VARCHAR},
+      </if>
       <if test="tenant != null">
         tenant = #{tenant,jdbcType=BIGINT},
       </if>
@@ -380,7 +395,8 @@
       This element was generated on Fri Sep 09 17:18:53 CST 2022.
     -->
     update sys_seo
-    set tenant = #{tenant,jdbcType=BIGINT},
+    set web_site = #{webSite,jdbcType=VARCHAR},
+      tenant = #{tenant,jdbcType=BIGINT},
       type = #{type,jdbcType=VARCHAR},
       name = #{name,jdbcType=VARCHAR},
       code = #{code,jdbcType=VARCHAR},

xinkeaboard-server/doc/DDL/update.sql

@@ -141,6 +141,66 @@ ALTER TABLE  stats_store_week ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COM
 ALTER TABLE stats_store_year ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户' AFTER stats_time;
 
 
+ALTER TABLE  stats_platform_day ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户' AFTER stats_time;
+
+ALTER TABLE  stats_platform_hour ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户' AFTER stats_time;
+
+ALTER TABLE  stats_platform_month ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户' AFTER stats_time;
+
+ALTER TABLE  stats_platform_week ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户' AFTER stats_time;
+
+ALTER TABLE stats_platform_year ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户' AFTER stats_time;
+
+
+INSERT INTO sys_setting (name, title, value, description)
+SELECT CONCAT(name, '_2') AS name,
+       title,
+       value,
+       description
+FROM sys_setting
+WHERE name IN (
+               'basic_site_name', 'basic_site_icp', 'basic_site_copyright', 'basic_site_technical_support',
+               'basic_site_phone', 'basic_site_email',
+               'hot_search_words', 'verification_code_check_is_enable',
+               'sys_seo_title', 'sys_seo_desc', 'sys_seo_keywords', 'pt_map_parameter', 'pt_map_parameter_1',
+               'about_banner', 'about_pic', 'about_text',
+               'basic_site_address', 'gz_code', 'guide_funds_banner', 'guide_funds_text'
+    );
+
+
+INSERT INTO sys_setting (name, title, value, description)
+SELECT CONCAT(name, '_2') AS name,
+       title,
+       value,
+       description
+FROM sys_setting
+WHERE name IN (
+               'main_site_logo', 'main_user_center_logo', 'main_user_logon_bg', 'main_user_register_bg',
+               'pc_home_bottom_adv', 'main_user_forget_password_bg',
+               'main_user_register_logo', 'main_seller_center_logo', 'vendor_login_left_bg', 'vendor_login_bg',
+               'main_admin_top_logo', 'admin_login_left_bg', 'admin_login_bg'
+    );
+
+INSERT INTO sys_setting (name, title, value, description)
+SELECT CONCAT(name, '_2') AS name,
+       title,
+       value,
+       description
+FROM sys_setting
+WHERE name IN (
+               'default_image_store_logo', 'default_image_user_portrait', 'default_image_store_banner_pc',
+               'default_image_store_list_top'
+    );
+
+
+ALTER TABLE sys_seo ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户' AFTER id;
+
+
+ALTER TABLE goods_category ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户' AFTER category_id;
+
+
+
+