chore: merge master

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

@@ -2560,6 +2560,7 @@ pc端注册页面logo=
 如果您不想更改密码或未请求更改密码，请忽略并删除此邮件=If you do not want to change your password or did not request a password change, please ignore and delete this message
 谢谢=Thank you
 提交失败,请重试=Submission failed, please try again
+数量超出范围，请重试=The quantity is out of range. Please try again
 文档下载记录保存失败,请重试=Failed to save the document download record. Please try again
 会员账户被禁用，请联系平台=Member account is disabled, please contact the platform
 关注店铺成功=Focus on store success

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

@@ -27,6 +27,8 @@ public class GoodsPublishFrontParamDTO implements Serializable {
     //基本信息
     @ApiModelProperty(value = "商品名称为3到50个字符(商品副标题)", required = true)
     private String goodsName;
+    @ApiModelProperty(value = "商品中文名称")
+    private String goodsNameCn;
     @ApiModelProperty(value = "商品副标题，长度建议140个字符内")
     private String goodsBrief;
     @ApiModelProperty(value = "品牌ID")

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

@@ -55,6 +55,16 @@ public class GoodsExample implements Serializable {
     private String goodsNameLike;
 
     /**
+     * 商品中文名称
+     */
+    private String goodsNameCn;
+
+    /**
+     * 商品中文名称,用于模糊查询
+     */
+    private String goodsNameCnLike;
+
+    /**
      * 商品副标题，长度建议140个字符内
      */
     private String goodsBrief;

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

@@ -53,6 +53,16 @@ public class ProductExample implements Serializable {
     private String goodsNameLike;
 
     /**
+     * 商品中文名称
+     */
+    private String goodsNameCn;
+
+    /**
+     * 商品中文名称
+     */
+    private String goodsNameCnLike;
+
+    /**
      * 规格值，用逗号分隔
      */
     private String specValues;

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

@@ -25,6 +25,9 @@ public class Goods implements Serializable {
     @ApiModelProperty("商品名称为3到50个字符(商品副标题)")
     private String goodsName;
 
+    @ApiModelProperty("商品中文名称")
+    private String goodsNameCn;
+
     @ApiModelProperty("商品副标题，长度建议140个字符内")
     private String goodsBrief;
 

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

@@ -27,6 +27,9 @@ public class Product implements Serializable {
     @ApiModelProperty("商品名称为3到50个字符(商品副标题)")
     private String goodsName;
 
+    @ApiModelProperty("商品中文名称)")
+    private String goodsNameCn;
+
     @ApiModelProperty("规格值，用逗号分隔")
     private String specValues;
 

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

@@ -24,6 +24,7 @@ public class MemberFollowStoreExample implements Serializable {
      * 收藏id
      */
     private Integer followId;
+    
 
     /**
      * 会员ID

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

@@ -39,6 +39,11 @@ public class BrandBaseExample implements Serializable {
     private Date statsTimeBefore;
 
     /**
+     * 站点
+     */
+    private String webSite;
+
+    /**
      * 品牌id
      */
     private Integer brandId;

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

@@ -40,6 +40,11 @@ public class CategoryBaseExample implements Serializable {
     private Date statsTimeBefore;
 
     /**
+     * 站点
+     */
+    private String webSite;
+
+    /**
      * 商品分类id，一级分类
      */
     private Integer categoryId;

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

@@ -40,6 +40,11 @@ public class GoodsBaseExample implements Serializable {
     private Date statsTimeBefore;
 
     /**
+     * 站点
+     */
+    private String webSite;
+
+    /**
      * 商品id
      */
     private Long goodsId;

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

@@ -40,6 +40,11 @@ public class MemberBaseExample implements Serializable {
     private Date statsTimeBefore;
 
     /**
+     * 站点
+     */
+    private String webSite;
+
+    /**
      * 会员id
      */
     private Integer memberId;

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

@@ -39,6 +39,12 @@ public class MemberStoreBaseExample implements Serializable {
      */
     private Date statsTimeBefore;
 
+
+    /**
+     * 站点
+     */
+    private String webSite;
+
     /**
      * 会员id
      */

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

@@ -40,6 +40,11 @@ public class StoreBaseExample implements Serializable {
     private Date statsTimeBefore;
 
     /**
+     * 站点来源 1:海外站 2:国内站
+     */
+    private String webSite;
+
+    /**
      * 店铺id
      */
     private Long storeId;

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

@@ -16,6 +16,9 @@ public class MemberBehavior implements Serializable {
     @ApiModelProperty("会员id")
     private Integer memberId;
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     @ApiModelProperty("ip地址")
     private String ip;
 

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

@@ -17,6 +17,9 @@ public class BrandBase implements Serializable {
     @ApiModelProperty("统计id")
     private Long statsId;
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     @ApiModelProperty("统计时间，数据统计的开始时间")
     private Date statsTime;
 

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

@@ -21,6 +21,9 @@ public class CategoryBase  implements Serializable {
     @ApiModelProperty("统计时间，数据统计的开始时间")
     private Date statsTime;
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     @ApiModelProperty("商品分类id，一级分类")
     private Integer categoryId;
 

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

@@ -21,6 +21,9 @@ public class GoodsBase implements Serializable {
     @ApiModelProperty("统计时间，数据统计的开始时间")
     private Date statsTime;
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     @ApiModelProperty("商品id")
     private Long goodsId;
 

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

@@ -21,6 +21,9 @@ public class MemberBase  implements Serializable {
     @ApiModelProperty("统计时间，数据统计的开始时间")
     private Date statsTime;
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     @ApiModelProperty("会员id")
     private Integer memberId;
 

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

@@ -21,6 +21,9 @@ public class MemberStoreBase implements Serializable {
     @ApiModelProperty("统计时间，数据统计的开始时间")
     private Date statsTime;
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     @ApiModelProperty("会员id")
     private Integer memberId;
 

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

@@ -21,6 +21,9 @@ public class StoreBase implements Serializable {
     @ApiModelProperty("统计时间，数据统计的开始时间")
     private Date statsTime;
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     @ApiModelProperty("店铺id")
     private Long storeId;
 

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/member/front/advich/MemberEmailActiveController.java

@@ -230,7 +230,7 @@ public class MemberEmailActiveController extends BaseController {
         if (!verificationCode.equals(storedCode)) {
             return SldResponse.fail(ResponseConst.STATE_FAIL, Language.translate("验证码校验失败", Language.EN_LANGUAGE_TYPE));
         }
-        stringRedisTemplate.delete(redisKey);
+//        stringRedisTemplate.delete(redisKey);
         return SldResponse.success(Language.translate("验证码校验成功", Language.EN_LANGUAGE_TYPE));
     }
 

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/member/front/advich/MemberEnquiryController.java

@@ -80,6 +80,10 @@ public class MemberEnquiryController extends BaseController {
                 StringUtil.isEmpty(enquiryAddDTO.getPageUrl()) || StringUtil.isEmpty(enquiryAddDTO.getItemType())) {
             return SldResponse.fail(Language.translate("提交失败,请重试",Language.EN_LANGUAGE_TYPE));
         }
+        // 增加Integer参数长度校验，防止数据库int类型溢出
+        if (enquiryAddDTO.getQuantity() != null && (enquiryAddDTO.getQuantity() > Integer.MAX_VALUE || enquiryAddDTO.getQuantity() < Integer.MIN_VALUE)) {
+            return SldResponse.fail(Language.translate("数量超出范围，请重试", Language.EN_LANGUAGE_TYPE));
+        }
         Integer key = memberEnquiryModel.saveEnquiry(request, enquiryAddDTO);
         return SldResponse.success(Language.translate("提交成功",Language.EN_LANGUAGE_TYPE),key);
     }
@@ -99,6 +103,10 @@ public class MemberEnquiryController extends BaseController {
                 StringUtil.isEmpty(enquiryAddDTO.getPageUrl()) || StringUtil.isEmpty(enquiryAddDTO.getItemType())) {
             return SldResponse.fail(Language.translate("提交失败,请重试",Language.EN_LANGUAGE_TYPE));
         }
+        // 增加Integer参数长度校验，防止数据库int类型溢出
+        if (enquiryAddDTO.getQuantity() != null && (enquiryAddDTO.getQuantity() > Integer.MAX_VALUE || enquiryAddDTO.getQuantity() < Integer.MIN_VALUE)) {
+            return SldResponse.fail(Language.translate("数量超出范围，请重试", Language.EN_LANGUAGE_TYPE));
+        }
         Integer key = memberEnquiryModel.saveEnquiry(request, enquiryAddDTO);
         return SldResponse.success(Language.translate("提交成功",Language.EN_LANGUAGE_TYPE),key);
     }

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

@@ -158,14 +158,15 @@ public class AdminFlowAnalysisController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "startTime", value = "开始时间", required = true),
             @ApiImplicitParam(name = "endTime", value = "结束时间", required = true),
+            @ApiImplicitParam(name = "webSite", value = "站点"),
             @ApiImplicitParam(name = "sort", value = "排序:1-浏览量；2-访客数 默认不传按浏览量降序")
     })
     @GetMapping("storeFlowRank")
-    public JsonResult<List<StoreRankVO>> storeFlowRank(HttpServletRequest request, Date startTime, Date endTime, Integer sort) {
+    public JsonResult<List<StoreRankVO>> storeFlowRank(HttpServletRequest request, Date startTime, Date endTime,@RequestParam(name = "webSite", required = false,defaultValue = "1") String webSite, Integer sort) {
         StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, false);
         //默认查询前十条数据
         PagerInfo pager = new PagerInfo(10, 1);
-        List<? extends StoreBase> list = statsModelUtil.getStoreList(timeType, startTime, endTime, sort, "flow", null, pager);
+        List<? extends StoreBase> list = statsModelUtil.getStoreList(timeType, startTime, endTime, webSite, sort, "flow", null, pager);
         List<StoreRankVO> vos = new ArrayList<>();
         if (!CollectionUtils.isEmpty(list)) {
             list.forEach(storeBase -> {
@@ -182,12 +183,13 @@ public class AdminFlowAnalysisController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "startTime", value = "开始时间", required = true),
             @ApiImplicitParam(name = "endTime", value = "结束时间", required = true),
+            @ApiImplicitParam(name = "webSite", value = "站点"),
             @ApiImplicitParam(name = "sort", value = "排序:1-浏览量；2-访客数 默认不传按浏览量降序")
     })
     @GetMapping("goodsFlowRank")
-    public JsonResult<List<GoodsRankVO>> goodsFlowRank(HttpServletRequest request, Date startTime, Date endTime, Integer sort) {
+    public JsonResult<List<GoodsRankVO>> goodsFlowRank(HttpServletRequest request, Date startTime, Date endTime,@RequestParam(name = "webSite", required = false,defaultValue = "1") String webSite,Integer sort) {
         StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, false);
-        List<? extends GoodsBase> list = statsModelUtil.getGoodsList(timeType, startTime, endTime, sort, "flow", null);
+        List<? extends GoodsBase> list = statsModelUtil.getGoodsList(timeType, startTime, endTime,webSite , sort, "flow", null);
         List<GoodsRankVO> vos = new ArrayList<>();
         if (!CollectionUtils.isEmpty(list)) {
             list.forEach(goodsBase -> {

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

@@ -182,17 +182,18 @@ public class AdminGoodsAnalysisController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "startTime", value = "开始时间", required = true),
             @ApiImplicitParam(name = "endTime", value = "结束时间", required = true),
+            @ApiImplicitParam(name = "webSite", value = "站点"),
             @ApiImplicitParam(name = "sort", value = "排序:1-销售额；2-销量 默认不传按销售额降序")
     })
     @GetMapping("goodsSalesRank")
-    public JsonResult<List<GoodsChangeTrendVO>> goodsSalesRank(HttpServletRequest request, Date startTime, Date endTime, Integer sort) {
+    public JsonResult<List<GoodsChangeTrendVO>> goodsSalesRank(HttpServletRequest request, Date startTime, Date endTime,@RequestParam(name = "webSite", required = false,defaultValue = "1") String webSite, Integer sort) {
         StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, true);
         //如果查询24小时，先按天查询前十条数据
         StatsTimeType timeType2 = timeType;
         if (timeType == StatsTimeType.HOUR) {
             timeType2 = StatsTimeType.DAY;
         }
-        List<? extends GoodsBase> list = statsModelUtil.getGoodsList(timeType2, startTime, endTime, sort, "sale", null);
+        List<? extends GoodsBase> list = statsModelUtil.getGoodsList(timeType2, startTime, endTime,webSite, sort, "sale", null);
         List<GoodsChangeTrendVO> vos = getGoodsSalesRank(list, timeType, startTime, endTime);
         return SldResponse.success(vos);
     }
@@ -200,12 +201,13 @@ public class AdminGoodsAnalysisController extends BaseController {
     @ApiOperation("商品收藏数排行-TOP10")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "startTime", value = "开始时间", required = true),
-            @ApiImplicitParam(name = "endTime", value = "结束时间", required = true)
+            @ApiImplicitParam(name = "endTime", value = "结束时间", required = true),
+            @ApiImplicitParam(name = "webSite", value = "站点")
     })
     @GetMapping("goodsCollectionRank")
-    public JsonResult<List<GoodsCollectionRankVO>> goodsCollectionRank(HttpServletRequest request, Date startTime, Date endTime) {
+    public JsonResult<List<GoodsCollectionRankVO>> goodsCollectionRank(HttpServletRequest request, Date startTime, Date endTime,@RequestParam(name = "webSite", required = false,defaultValue = "1") String webSite) {
         StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, false);
-        List<? extends GoodsBase> list = statsModelUtil.getGoodsList(timeType, startTime, endTime, 1, "collection", null);
+        List<? extends GoodsBase> list = statsModelUtil.getGoodsList(timeType, startTime, endTime, webSite,1, "collection", null);
         List<GoodsCollectionRankVO> vos = new ArrayList<>();
         if (!CollectionUtils.isEmpty(list)) {
             list.forEach(goodsBase -> {

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

@@ -152,12 +152,13 @@ public class AdminMemberAnalysisController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "startTime", value = "开始时间", required = true),
             @ApiImplicitParam(name = "endTime", value = "结束时间", required = true),
+            @ApiImplicitParam(name = "webSite", value = "站点"),
             @ApiImplicitParam(name = "sort", value = "排序:1-浏览量；2-收藏数；3-支付订单数 默认不传按浏览量降序")
     })
     @GetMapping("preferGoodsRank")
-    public JsonResult<List<GoodsRankVO>> preferGoodsRank(HttpServletRequest request, Date startTime, Date endTime, Integer sort) {
+    public JsonResult<List<GoodsRankVO>> preferGoodsRank(HttpServletRequest request, Date startTime, Date endTime,@RequestParam(name = "webSite", required = false,defaultValue = "1") String webSite, Integer sort) {
         StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, false);
-        List<? extends GoodsBase> list = statsModelUtil.getGoodsList(timeType, startTime, endTime, sort, "prefer", null);
+        List<? extends GoodsBase> list = statsModelUtil.getGoodsList(timeType, startTime, endTime,webSite, sort, "prefer", null);
         List<GoodsRankVO> vos = new ArrayList<>();
         if (!CollectionUtils.isEmpty(list)) {
             list.forEach(goodsBase -> {

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

@@ -118,11 +118,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("tradeInfo")
     public JsonResult<AdminPresentIndexVO.AdminTradeInfo> tradeInfo(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 adminPresentDataVO;
         if (refresh) {
             //刷新请求，重新计算实时统计，并缓存
@@ -132,13 +134,13 @@ public class AdminOverviewController extends BaseController {
             DateTime startTime = DateUtil.beginOfDay(endTime);
 
             //计算实时统计数据
-            adminPresentDataVO = platformPresentDataUtil.calculatePresentData(startTime, endTime);
+            adminPresentDataVO = platformPresentDataUtil.calculatePresentData(startTime, endTime,webSite);
 
             //缓存数据
-            objectRedisTemplate.opsForHash().put(StatsConstant.ADMIN_PRESENT_REDIS_KEY, StatsConstant.ADMIN_PRESENT_REDIS_KEY, adminPresentDataVO);
+            objectRedisTemplate.opsForHash().put(StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, adminPresentDataVO);
         } else {
             //查询缓存数据
-            Object presentData = objectRedisTemplate.opsForHash().get(StatsConstant.ADMIN_PRESENT_REDIS_KEY, StatsConstant.ADMIN_PRESENT_REDIS_KEY);
+            Object presentData = objectRedisTemplate.opsForHash().get(StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite);
             if (presentData == null) {
                 //无缓存数据，重新计算实时统计，并缓存
                 //截止当前时间
@@ -147,10 +149,10 @@ public class AdminOverviewController extends BaseController {
                 DateTime startTime = DateUtil.beginOfDay(endTime);
 
                 //计算实时统计数据
-                adminPresentDataVO = platformPresentDataUtil.calculatePresentData(startTime, endTime);
+                adminPresentDataVO = platformPresentDataUtil.calculatePresentData(startTime, endTime,webSite);
 
                 //缓存数据
-                objectRedisTemplate.opsForHash().put(StatsConstant.ADMIN_PRESENT_REDIS_KEY, StatsConstant.ADMIN_PRESENT_REDIS_KEY, adminPresentDataVO);
+                objectRedisTemplate.opsForHash().put(StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, adminPresentDataVO);
             } else {
                 //有缓存数据
                 adminPresentDataVO = JSON.parseObject(JSON.toJSONString(presentData), AdminPresentDataVO.class);
@@ -162,11 +164,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("viewInfo")
     public JsonResult<AdminPresentIndexVO.AdminViewInfo> viewInfo(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 adminPresentDataVO;
         if (refresh) {
             //刷新请求，重新计算实时统计，并缓存
@@ -176,13 +180,13 @@ public class AdminOverviewController extends BaseController {
             DateTime startTime = DateUtil.beginOfDay(endTime);
 
             //计算实时统计数据
-            adminPresentDataVO = platformPresentDataUtil.calculatePresentData(startTime, endTime);
+            adminPresentDataVO = platformPresentDataUtil.calculatePresentData(startTime, endTime,webSite);
 
             //缓存数据
-            objectRedisTemplate.opsForHash().put(StatsConstant.ADMIN_PRESENT_REDIS_KEY, StatsConstant.ADMIN_PRESENT_REDIS_KEY, adminPresentDataVO);
+            objectRedisTemplate.opsForHash().put(StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, adminPresentDataVO);
         } else {
             //查询缓存数据
-            Object presentData = objectRedisTemplate.opsForHash().get(StatsConstant.ADMIN_PRESENT_REDIS_KEY, StatsConstant.ADMIN_PRESENT_REDIS_KEY);
+            Object presentData = objectRedisTemplate.opsForHash().get(StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite);
             if (presentData == null) {
                 //无缓存数据，重新计算实时统计，并缓存
                 //截止当前时间
@@ -191,10 +195,10 @@ public class AdminOverviewController extends BaseController {
                 DateTime startTime = DateUtil.beginOfDay(endTime);
 
                 //计算实时统计数据
-                adminPresentDataVO = platformPresentDataUtil.calculatePresentData(startTime, endTime);
+                adminPresentDataVO = platformPresentDataUtil.calculatePresentData(startTime, endTime,webSite);
 
                 //缓存数据
-                objectRedisTemplate.opsForHash().put(StatsConstant.ADMIN_PRESENT_REDIS_KEY, StatsConstant.ADMIN_PRESENT_REDIS_KEY, adminPresentDataVO);
+                objectRedisTemplate.opsForHash().put(StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, adminPresentDataVO);
             } else {
                 //有缓存数据
                 adminPresentDataVO = JSON.parseObject(JSON.toJSONString(presentData), AdminPresentDataVO.class);
@@ -206,11 +210,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("goodsInfo")
     public JsonResult<AdminPresentIndexVO.AdminGoodsInfo> goodsInfo(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 adminPresentDataVO;
         if (refresh) {
             //刷新请求，重新计算实时统计，并缓存
@@ -220,13 +226,13 @@ public class AdminOverviewController extends BaseController {
             DateTime startTime = DateUtil.beginOfDay(endTime);
 
             //计算实时统计数据
-            adminPresentDataVO = platformPresentDataUtil.calculatePresentData(startTime, endTime);
+            adminPresentDataVO = platformPresentDataUtil.calculatePresentData(startTime, endTime,webSite);
 
             //缓存数据
-            objectRedisTemplate.opsForHash().put(StatsConstant.ADMIN_PRESENT_REDIS_KEY, StatsConstant.ADMIN_PRESENT_REDIS_KEY, adminPresentDataVO);
+            objectRedisTemplate.opsForHash().put(StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, adminPresentDataVO);
         } else {
             //查询缓存数据
-            Object presentData = objectRedisTemplate.opsForHash().get(StatsConstant.ADMIN_PRESENT_REDIS_KEY, StatsConstant.ADMIN_PRESENT_REDIS_KEY);
+            Object presentData = objectRedisTemplate.opsForHash().get(StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite);
             if (presentData == null) {
                 //无缓存数据，重新计算实时统计，并缓存
                 //截止当前时间
@@ -235,10 +241,10 @@ public class AdminOverviewController extends BaseController {
                 DateTime startTime = DateUtil.beginOfDay(endTime);
 
                 //计算实时统计数据
-                adminPresentDataVO = platformPresentDataUtil.calculatePresentData(startTime, endTime);
+                adminPresentDataVO = platformPresentDataUtil.calculatePresentData(startTime, endTime,webSite);
 
                 //缓存数据
-                objectRedisTemplate.opsForHash().put(StatsConstant.ADMIN_PRESENT_REDIS_KEY, StatsConstant.ADMIN_PRESENT_REDIS_KEY, adminPresentDataVO);
+                objectRedisTemplate.opsForHash().put(StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, adminPresentDataVO);
             } else {
                 //有缓存数据
                 adminPresentDataVO = JSON.parseObject(JSON.toJSONString(presentData), AdminPresentDataVO.class);
@@ -250,11 +256,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("userInfo")
     public JsonResult<AdminPresentIndexVO.AdminUserInfo> userInfo(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 adminPresentDataVO;
         if (refresh) {
             //刷新请求，重新计算实时统计，并缓存
@@ -264,13 +272,13 @@ public class AdminOverviewController extends BaseController {
             DateTime startTime = DateUtil.beginOfDay(endTime);
 
             //计算实时统计数据
-            adminPresentDataVO = platformPresentDataUtil.calculatePresentData(startTime, endTime);
+            adminPresentDataVO = platformPresentDataUtil.calculatePresentData(startTime, endTime,webSite);
 
             //缓存数据
-            objectRedisTemplate.opsForHash().put(StatsConstant.ADMIN_PRESENT_REDIS_KEY, StatsConstant.ADMIN_PRESENT_REDIS_KEY, adminPresentDataVO);
+            objectRedisTemplate.opsForHash().put(StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, adminPresentDataVO);
         } else {
             //查询缓存数据
-            Object presentData = objectRedisTemplate.opsForHash().get(StatsConstant.ADMIN_PRESENT_REDIS_KEY, StatsConstant.ADMIN_PRESENT_REDIS_KEY);
+            Object presentData = objectRedisTemplate.opsForHash().get(StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite);
             if (presentData == null) {
                 //无缓存数据，重新计算实时统计，并缓存
                 //截止当前时间
@@ -279,10 +287,10 @@ public class AdminOverviewController extends BaseController {
                 DateTime startTime = DateUtil.beginOfDay(endTime);
 
                 //计算实时统计数据
-                adminPresentDataVO = platformPresentDataUtil.calculatePresentData(startTime, endTime);
+                adminPresentDataVO = platformPresentDataUtil.calculatePresentData(startTime, endTime,webSite);
 
                 //缓存数据
-                objectRedisTemplate.opsForHash().put(StatsConstant.ADMIN_PRESENT_REDIS_KEY, StatsConstant.ADMIN_PRESENT_REDIS_KEY, adminPresentDataVO);
+                objectRedisTemplate.opsForHash().put(StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, adminPresentDataVO);
             } else {
                 //有缓存数据
                 adminPresentDataVO = JSON.parseObject(JSON.toJSONString(presentData), AdminPresentDataVO.class);

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

@@ -34,37 +34,39 @@ public class AdminPresentAnalysisController {
 
     @ApiOperation("获取实时统计数据")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "refresh", value = "true-刷新,默认false", defaultValue = "false")
+            @ApiImplicitParam(name = "refresh", value = "true-刷新,默认false", defaultValue = "false"),
+            @ApiImplicitParam(name = "webSite", value = "站点")
     })
     @GetMapping("presentData")
     public JsonResult<AdminPresentDataVO> getAdminPresentData(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) {
         if (refresh) {
             //刷新请求，重新计算实时统计，并缓存
             Date endTime = new Date();//截止当前时间
             DateTime startTime = DateUtil.beginOfDay(endTime);//今日0时开始
 
             //计算实时统计数据
-            AdminPresentDataVO vo = platformPresentDataUtil.calculatePresentData(startTime, endTime);
+            AdminPresentDataVO vo = platformPresentDataUtil.calculatePresentData(startTime, endTime,webSite);
 
             //缓存数据
-            objectRedisTemplate.opsForHash().put(StatsConstant.ADMIN_PRESENT_REDIS_KEY, StatsConstant.ADMIN_PRESENT_REDIS_KEY, vo);
+            objectRedisTemplate.opsForHash().put(StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, vo);
 
             return SldResponse.success(vo);
         }
 
         //查询缓存数据
-        Object presentData = objectRedisTemplate.opsForHash().get(StatsConstant.ADMIN_PRESENT_REDIS_KEY, StatsConstant.ADMIN_PRESENT_REDIS_KEY);
+        Object presentData = objectRedisTemplate.opsForHash().get(StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite);
         if (presentData == null) {
             //无缓存数据，重新计算实时统计，并缓存
             Date endTime = new Date();//截止当前时间
             DateTime startTime = DateUtil.beginOfDay(endTime);//今日0时开始
 
             //计算实时统计数据
-            AdminPresentDataVO vo = platformPresentDataUtil.calculatePresentData(startTime, endTime);
+            AdminPresentDataVO vo = platformPresentDataUtil.calculatePresentData(startTime, endTime,webSite);
 
             //缓存数据
-            objectRedisTemplate.opsForHash().put(StatsConstant.ADMIN_PRESENT_REDIS_KEY, StatsConstant.ADMIN_PRESENT_REDIS_KEY, vo);
+            objectRedisTemplate.opsForHash().put(StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, StatsConstant.ADMIN_PRESENT_REDIS_KEY + "_" + webSite, vo);
 
             return SldResponse.success(vo);
         }

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

@@ -153,14 +153,15 @@ public class AdminTradeAnalysisController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "startTime", value = "开始时间", required = true),
             @ApiImplicitParam(name = "endTime", value = "结束时间", required = true),
+            @ApiImplicitParam(name = "webSite", value = "站点"),
             @ApiImplicitParam(name = "sort", value = "排序:1-销售额；2-订单量 默认不传按销售额降序")
     })
     @GetMapping("storeSalesRank")
-    public JsonResult<List<StoreRankVO>> storeSalesRank(HttpServletRequest request, Date startTime, Date endTime, Integer sort) {
+    public JsonResult<List<StoreRankVO>> storeSalesRank(HttpServletRequest request, Date startTime, Date endTime, @RequestParam(name = "webSite", required = false,defaultValue = "1") String webSite,Integer sort) {
         StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, false);
         //默认查询前十条数据
         PagerInfo pager = new PagerInfo(10, 1);
-        List<? extends StoreBase> list = statsModelUtil.getStoreList(timeType, startTime, endTime, sort, "sale", null, pager);
+        List<? extends StoreBase> list = statsModelUtil.getStoreList(timeType, startTime, endTime, webSite, sort, "sale", null, pager);
         List<StoreRankVO> vos = new ArrayList<>();
         if (!CollectionUtils.isEmpty(list)) {
             list.forEach(storeBase -> {
@@ -177,12 +178,13 @@ public class AdminTradeAnalysisController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "startTime", value = "开始时间", required = true),
             @ApiImplicitParam(name = "endTime", value = "结束时间", required = true),
+            @ApiImplicitParam(name = "webSite", value = "站点"),
             @ApiImplicitParam(name = "sort", value = "排序:1-销售额；2-销量 默认不传按销售额降序")
     })
     @GetMapping("goodsSalesRank")
-    public JsonResult<List<GoodsRankVO>> goodsSalesRank(HttpServletRequest request, Date startTime, Date endTime, Integer sort) {
+    public JsonResult<List<GoodsRankVO>> goodsSalesRank(HttpServletRequest request, Date startTime, Date endTime,@RequestParam(name = "webSite", required = false,defaultValue = "1") String webSite, Integer sort) {
         StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, false);
-        List<? extends GoodsBase> list = statsModelUtil.getGoodsList(timeType, startTime, endTime, sort, "sale", null);
+        List<? extends GoodsBase> list = statsModelUtil.getGoodsList(timeType, startTime, endTime, webSite,sort, "sale", null);
         List<GoodsRankVO> vos = new ArrayList<>();
         if (!CollectionUtils.isEmpty(list)) {
             list.forEach(goodsBase -> {

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

@@ -5,20 +5,25 @@ import com.slodon.b2b2c.core.controller.BaseController;
 import com.slodon.b2b2c.core.response.JsonResult;
 import com.slodon.b2b2c.core.response.SldResponse;
 import com.slodon.b2b2c.model.statistics.*;
+import com.slodon.b2b2c.model.system.SettingModel;
 import com.slodon.b2b2c.statistics.pojo.*;
 import com.slodon.b2b2c.statistics.pojo.base.*;
+import com.slodon.b2b2c.system.pojo.Setting;
 import com.slodon.b2b2c.util.StatsDataUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.Collection;
 import java.util.Date;
+import java.util.List;
 
 @Api(tags = "admin-定时任务补充管理")
 @RestController
@@ -133,12 +138,14 @@ public class StatsJobController 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("hourStats")
-    public JsonResult hourStats(Date startTime, Date endTime) {
+    public JsonResult hourStats(Date startTime, Date endTime, @RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite) {
+
         //1.查询阶段内的统计基础数据
-        StatsBasicDataBO basicDataBO = statsDataUtil.searchStatsBasicData(startTime, endTime);
+        StatsBasicDataBO basicDataBO = statsDataUtil.searchStatsBasicData(startTime, endTime, webSite);
 
         //2.保存品牌统计表
         Collection<BrandOrderBO> brandOrderBOS = statsDataUtil.buildBrandStatsInfo(basicDataBO);
@@ -146,6 +153,7 @@ public class StatsJobController extends BaseController {
             BrandBase brandBase = brandOrderBO.initStats(startTime, basicDataBO.getOrderMap());
             BrandHour brandHour = new BrandHour();
             brandHour.copy(brandBase);
+            brandHour.setWebSite(webSite);
             brandHourModel.saveBrandHour(brandHour);
         });
 
@@ -155,6 +163,7 @@ public class StatsJobController extends BaseController {
             CategoryBase categoryBase = categoryOrderBO.initStats(startTime, basicDataBO.getOrderMap());
             CategoryHour categoryHour = new CategoryHour();
             categoryHour.copy(categoryBase);
+            categoryHour.setWebSite(webSite);
             categoryHourModel.saveCategoryHour(categoryHour);
         });
 
@@ -164,6 +173,7 @@ public class StatsJobController extends BaseController {
             GoodsBase goodsBase = goodsStatsBO.initStats(startTime, basicDataBO.getOrderMap());
             GoodsHour goodsHour = new GoodsHour();
             goodsHour.copy(goodsBase);
+            goodsHour.setWebSite(webSite);
             goodsHourModel.saveGoodsHour(goodsHour);
         });
 
@@ -173,6 +183,7 @@ public class StatsJobController extends BaseController {
             MemberBase memberBase = memberStatsBO.initStats(startTime);
             MemberHour memberHour = new MemberHour();
             memberHour.copy(memberBase);
+            memberHour.setWebSite(webSite);
             memberHourModel.saveMemberHour(memberHour);
         });
 
@@ -182,6 +193,7 @@ public class StatsJobController extends BaseController {
             MemberStoreBase memberStoreBase = memberStoreStatsBO.initStats(startTime);
             MemberStoreHour memberStoreHour = new MemberStoreHour();
             memberStoreHour.copy(memberStoreBase);
+            memberStoreHour.setWebSite(webSite);
             memberStoreHourModel.saveMemberStoreHour(memberStoreHour);
         });
 
@@ -207,6 +219,7 @@ public class StatsJobController extends BaseController {
             StoreBase storeBase = storeStatsBO.initStats(startTime);
             StoreHour storeHour = new StoreHour();
             storeHour.copy(storeBase);
+            storeHour.setWebSite(webSite);
             storeHourModel.saveStoreHour(storeHour);
         });
 
@@ -218,18 +231,21 @@ public class StatsJobController extends BaseController {
             terminalHour.copy(terminalBase);
             terminalHourModel.saveTerminalHour(terminalHour);
         });
+
+
         return SldResponse.success();
     }
 
     @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("dayStats")
-    public JsonResult dayStats(Date startTime, Date endTime) {
+    public JsonResult dayStats(Date startTime, Date endTime,@RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite) {
         //1.查询阶段内的统计基础数据
-        StatsBasicDataBO basicDataBO = statsDataUtil.searchStatsBasicData(startTime, endTime);
+        StatsBasicDataBO basicDataBO = statsDataUtil.searchStatsBasicData(startTime, endTime,webSite);
 
         //2.保存品牌统计表
         Collection<BrandOrderBO> brandOrderBOS = statsDataUtil.buildBrandStatsInfo(basicDataBO);
@@ -237,6 +253,7 @@ public class StatsJobController extends BaseController {
             BrandBase brandBase = brandOrderBO.initStats(startTime, basicDataBO.getOrderMap());
             BrandDay brandDay = new BrandDay();
             brandDay.copy(brandBase);
+            brandDay.setWebSite(webSite);
             brandDayModel.saveBrandDay(brandDay);
         });
 
@@ -246,6 +263,7 @@ public class StatsJobController extends BaseController {
             CategoryBase categoryBase = categoryOrderBO.initStats(startTime, basicDataBO.getOrderMap());
             CategoryDay categoryDay = new CategoryDay();
             categoryDay.copy(categoryBase);
+            categoryDay.setWebSite(webSite);
             categoryDayModel.saveCategoryDay(categoryDay);
         });
 
@@ -255,6 +273,7 @@ public class StatsJobController extends BaseController {
             GoodsBase goodsBase = goodsStatsBO.initStats(startTime, basicDataBO.getOrderMap());
             GoodsDay goodsDay = new GoodsDay();
             goodsDay.copy(goodsBase);
+            goodsDay.setWebSite(webSite);
             goodsDayModel.saveGoodsDay(goodsDay);
         });
 
@@ -264,6 +283,7 @@ public class StatsJobController extends BaseController {
             MemberBase memberBase = memberStatsBO.initStats(startTime);
             MemberDay memberDay = new MemberDay();
             memberDay.copy(memberBase);
+            memberDay.setWebSite(webSite);
             memberDayModel.saveMemberDay(memberDay);
         });
 
@@ -273,6 +293,7 @@ public class StatsJobController extends BaseController {
             MemberStoreBase memberStoreBase = memberStoreStatsBO.initStats(startTime);
             MemberStoreDay memberStoreDay = new MemberStoreDay();
             memberStoreDay.copy(memberStoreBase);
+            memberStoreDay.setWebSite(webSite);
             memberStoreDayModel.saveMemberStoreDay(memberStoreDay);
         });
 
@@ -298,6 +319,7 @@ public class StatsJobController extends BaseController {
             StoreBase storeBase = storeStatsBO.initStats(startTime);
             StoreDay storeDay = new StoreDay();
             storeDay.copy(storeBase);
+            storeDay.setWebSite(webSite);
             storeDayModel.saveStoreDay(storeDay);
         });
 
@@ -315,12 +337,13 @@ public class StatsJobController 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("weekStats")
-    public JsonResult weekStats(Date startTime, Date endTime) {
+    public JsonResult weekStats(Date startTime, Date endTime,@RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite) {
         //1.查询阶段内的统计基础数据
-        StatsBasicDataBO basicDataBO = statsDataUtil.searchStatsBasicData(startTime, endTime);
+        StatsBasicDataBO basicDataBO = statsDataUtil.searchStatsBasicData(startTime, endTime,webSite);
 
         //2.保存品牌统计表
         Collection<BrandOrderBO> brandOrderBOS = statsDataUtil.buildBrandStatsInfo(basicDataBO);
@@ -328,6 +351,7 @@ public class StatsJobController extends BaseController {
             BrandBase brandBase = brandOrderBO.initStats(startTime, basicDataBO.getOrderMap());
             BrandWeek brandWeek = new BrandWeek();
             brandWeek.copy(brandBase);
+            brandWeek.setWebSite(webSite);
             brandWeekModel.saveBrandWeek(brandWeek);
         });
 
@@ -337,6 +361,7 @@ public class StatsJobController extends BaseController {
             CategoryBase categoryBase = categoryOrderBO.initStats(startTime, basicDataBO.getOrderMap());
             CategoryWeek categoryWeek = new CategoryWeek();
             categoryWeek.copy(categoryBase);
+            categoryWeek.setWebSite(webSite);
             categoryWeekModel.saveCategoryWeek(categoryWeek);
         });
 
@@ -346,6 +371,7 @@ public class StatsJobController extends BaseController {
             GoodsBase goodsBase = goodsStatsBO.initStats(startTime, basicDataBO.getOrderMap());
             GoodsWeek goodsWeek = new GoodsWeek();
             goodsWeek.copy(goodsBase);
+            goodsWeek.setWebSite(webSite);
             goodsWeekModel.saveGoodsWeek(goodsWeek);
         });
 
@@ -355,6 +381,7 @@ public class StatsJobController extends BaseController {
             MemberBase memberBase = memberStatsBO.initStats(startTime);
             MemberWeek memberWeek = new MemberWeek();
             memberWeek.copy(memberBase);
+            memberWeek.setWebSite(webSite);
             memberWeekModel.saveMemberWeek(memberWeek);
         });
 
@@ -364,6 +391,7 @@ public class StatsJobController extends BaseController {
             MemberStoreBase memberStoreBase = memberStoreStatsBO.initStats(startTime);
             MemberStoreWeek memberStoreWeek = new MemberStoreWeek();
             memberStoreWeek.copy(memberStoreBase);
+            memberStoreWeek.setWebSite(webSite);
             memberStoreWeekModel.saveMemberStoreWeek(memberStoreWeek);
         });
 
@@ -389,6 +417,7 @@ public class StatsJobController extends BaseController {
             StoreBase storeBase = storeStatsBO.initStats(startTime);
             StoreWeek storeWeek = new StoreWeek();
             storeWeek.copy(storeBase);
+            storeWeek.setWebSite(webSite);
             storeWeekModel.saveStoreWeek(storeWeek);
         });
 
@@ -406,12 +435,13 @@ public class StatsJobController 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("monthStats")
-    public JsonResult monthStats(Date startTime, Date endTime) {
+    public JsonResult monthStats(Date startTime, Date endTime,@RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite) {
         //1.查询阶段内的统计基础数据
-        StatsBasicDataBO basicDataBO = statsDataUtil.searchStatsBasicData(startTime, endTime);
+        StatsBasicDataBO basicDataBO = statsDataUtil.searchStatsBasicData(startTime, endTime,webSite);
 
         //2.保存品牌统计表
         Collection<BrandOrderBO> brandOrderBOS = statsDataUtil.buildBrandStatsInfo(basicDataBO);
@@ -419,6 +449,7 @@ public class StatsJobController extends BaseController {
             BrandBase brandBase = brandOrderBO.initStats(startTime, basicDataBO.getOrderMap());
             BrandMonth brandMonth = new BrandMonth();
             brandMonth.copy(brandBase);
+            brandMonth.setWebSite(webSite);
             brandMonthModel.saveBrandMonth(brandMonth);
         });
 
@@ -428,6 +459,7 @@ public class StatsJobController extends BaseController {
             CategoryBase categoryBase = categoryOrderBO.initStats(startTime, basicDataBO.getOrderMap());
             CategoryMonth categoryMonth = new CategoryMonth();
             categoryMonth.copy(categoryBase);
+            categoryMonth.setWebSite(webSite);
             categoryMonthModel.saveCategoryMonth(categoryMonth);
         });
 
@@ -437,6 +469,7 @@ public class StatsJobController extends BaseController {
             GoodsBase goodsBase = goodsStatsBO.initStats(startTime, basicDataBO.getOrderMap());
             GoodsMonth goodsMonth = new GoodsMonth();
             goodsMonth.copy(goodsBase);
+            goodsMonth.setWebSite(webSite);
             goodsMonthModel.saveGoodsMonth(goodsMonth);
         });
 
@@ -446,6 +479,7 @@ public class StatsJobController extends BaseController {
             MemberBase memberBase = memberStatsBO.initStats(startTime);
             MemberMonth memberMonth = new MemberMonth();
             memberMonth.copy(memberBase);
+            memberMonth.setWebSite(webSite);
             memberMonthModel.saveMemberMonth(memberMonth);
         });
 
@@ -455,6 +489,7 @@ public class StatsJobController extends BaseController {
             MemberStoreBase memberStoreBase = memberStoreStatsBO.initStats(startTime);
             MemberStoreMonth memberStoreMonth = new MemberStoreMonth();
             memberStoreMonth.copy(memberStoreBase);
+            memberStoreMonth.setWebSite(webSite);
             memberStoreMonthModel.saveMemberStoreMonth(memberStoreMonth);
         });
 
@@ -480,6 +515,7 @@ public class StatsJobController extends BaseController {
             StoreBase storeBase = storeStatsBO.initStats(startTime);
             StoreMonth storeMonth = new StoreMonth();
             storeMonth.copy(storeBase);
+            storeMonth.setWebSite(webSite);
             storeMonthModel.saveStoreMonth(storeMonth);
         });
 
@@ -497,12 +533,13 @@ public class StatsJobController 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("yearStats")
-    public JsonResult yearStats(Date startTime, Date endTime) {
+    public JsonResult yearStats(Date startTime, Date endTime,@RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite) {
         //1.查询阶段内的统计基础数据
-        StatsBasicDataBO basicDataBO = statsDataUtil.searchStatsBasicData(startTime, endTime);
+        StatsBasicDataBO basicDataBO = statsDataUtil.searchStatsBasicData(startTime, endTime,webSite);
 
         //2.保存品牌统计表
         Collection<BrandOrderBO> brandOrderBOS = statsDataUtil.buildBrandStatsInfo(basicDataBO);
@@ -510,6 +547,7 @@ public class StatsJobController extends BaseController {
             BrandBase brandBase = brandOrderBO.initStats(startTime, basicDataBO.getOrderMap());
             BrandYear brandYear = new BrandYear();
             brandYear.copy(brandBase);
+            brandYear.setWebSite(webSite);
             brandYearModel.saveBrandYear(brandYear);
         });
 
@@ -519,6 +557,7 @@ public class StatsJobController extends BaseController {
             CategoryBase categoryBase = categoryOrderBO.initStats(startTime, basicDataBO.getOrderMap());
             CategoryYear categoryYear = new CategoryYear();
             categoryYear.copy(categoryBase);
+            categoryYear.setWebSite(webSite);
             categoryYearModel.saveCategoryYear(categoryYear);
         });
 
@@ -528,6 +567,7 @@ public class StatsJobController extends BaseController {
             GoodsBase goodsBase = goodsStatsBO.initStats(startTime, basicDataBO.getOrderMap());
             GoodsYear goodsYear = new GoodsYear();
             goodsYear.copy(goodsBase);
+            goodsYear.setWebSite(webSite);
             goodsYearModel.saveGoodsYear(goodsYear);
         });
 
@@ -537,6 +577,7 @@ public class StatsJobController extends BaseController {
             MemberBase memberBase = memberStatsBO.initStats(startTime);
             MemberYear memberYear = new MemberYear();
             memberYear.copy(memberBase);
+            memberYear.setWebSite(webSite);
             memberYearModel.saveMemberYear(memberYear);
         });
 
@@ -546,6 +587,7 @@ public class StatsJobController extends BaseController {
             MemberStoreBase memberStoreBase = memberStoreStatsBO.initStats(startTime);
             MemberStoreYear memberStoreYear = new MemberStoreYear();
             memberStoreYear.copy(memberStoreBase);
+            memberStoreYear.setWebSite(webSite);
             memberStoreYearModel.saveMemberStoreYear(memberStoreYear);
         });
 
@@ -571,6 +613,7 @@ public class StatsJobController extends BaseController {
             StoreBase storeBase = storeStatsBO.initStats(startTime);
             StoreYear storeYear = new StoreYear();
             storeYear.copy(storeBase);
+            storeYear.setWebSite(webSite);
             storeYearModel.saveStoreYear(storeYear);
         });
 

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

@@ -22,6 +22,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -42,10 +43,11 @@ public class SellerEnquiryAnalysisController 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("enquiryOverview")
-    public JsonResult<EnquiryOverviewVO> enquiryOverview(HttpServletRequest request) {
+    public JsonResult<EnquiryOverviewVO> enquiryOverview(HttpServletRequest request, @RequestParam(value = "webSite", required = false,defaultValue = "1") String webSite) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         EnquiryOverviewVO enquiryOverviewVO = new EnquiryOverviewVO();
@@ -60,6 +62,7 @@ public class SellerEnquiryAnalysisController extends BaseController {
         memberEnquiryTotalExample.setStoreId(vendor.getStoreId());
         memberEnquiryTotalExample.setStatusNotEqual(EnquiryConst.ENQUIRY_DELETE);
         memberEnquiryTotalExample.setItemTypeIn(itemTypeStr);
+        memberEnquiryTotalExample.setWebSite(webSite);
         enquiryOverviewVO.setEnquiryTotalNum(memberEnquiryModel.getMemberEnquiryCount(memberEnquiryTotalExample));
 
         //新增询盘数
@@ -71,6 +74,7 @@ public class SellerEnquiryAnalysisController extends BaseController {
         memberEnquiryNewExample.setCreateTimeLte(com.slodon.b2b2c.core.util.DateUtil.dateToString(enquiryEndTime, com.slodon.b2b2c.core.util.DateUtil.DATE_FORMAT_FIVE));
         memberEnquiryNewExample.setStatusNotEqual(EnquiryConst.ENQUIRY_DELETE);
         memberEnquiryNewExample.setItemTypeIn(itemTypeStr);
+        memberEnquiryNewExample.setWebSite(webSite);
         enquiryOverviewVO.setEnquiryNewNum(memberEnquiryModel.getMemberEnquiryCount(memberEnquiryNewExample));
 
         //有效询盘数
@@ -79,6 +83,7 @@ public class SellerEnquiryAnalysisController extends BaseController {
         memberEnquiryValidExample.setValidStatus(EnquiryConst.ENQUIRY_VALID);
         memberEnquiryValidExample.setStatusNotEqual(EnquiryConst.ENQUIRY_DELETE);
         memberEnquiryValidExample.setItemTypeIn(itemTypeStr);
+        memberEnquiryNewExample.setWebSite(webSite);
         enquiryOverviewVO.setValidInquiryNum(memberEnquiryModel.getMemberEnquiryCount(memberEnquiryValidExample));
 
         //待分配询盘数
@@ -86,6 +91,7 @@ public class SellerEnquiryAnalysisController extends BaseController {
         memberEnquiryToAssignExample.setStoreId(vendor.getStoreId());
         memberEnquiryToAssignExample.setStatusEqual(EnquiryConst.ENQUIRY_NEW);
         memberEnquiryToAssignExample.setItemTypeIn(itemTypeStr);
+        memberEnquiryNewExample.setWebSite(webSite);
         enquiryOverviewVO.setEnquiryToBeAssignNum(memberEnquiryModel.getMemberEnquiryCount(memberEnquiryToAssignExample));
 
         return SldResponse.success(enquiryOverviewVO);
@@ -97,8 +103,9 @@ public class SellerEnquiryAnalysisController extends BaseController {
      * @param request
      * @return
      */
+    @ApiImplicitParam(name = "webSite", value = "站点")
     @GetMapping("enquiryChangeTrend")
-    public JsonResult<EnquiryTrendVO> getEnquiryTrend(HttpServletRequest request) throws Exception {
+    public JsonResult<EnquiryTrendVO> getEnquiryTrend(HttpServletRequest request,@RequestParam(value = "webSite",required = false,defaultValue = "1") String webSite) throws Exception {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
         EnquiryTrendVO vo = new EnquiryTrendVO();
 
@@ -108,7 +115,7 @@ public class SellerEnquiryAnalysisController extends BaseController {
         Date startTime = DateUtil.beginOfDay(calendar.getTime());
         Date endTime = new Date();
         StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, true);
-        List<MemberEnquiry> list = memberEnquiryModel.getSellerEnquiryTrendList(timeType, startTime, endTime, vendor.getStoreId());
+        List<MemberEnquiry> list = memberEnquiryModel.getSellerEnquiryTrendList(timeType, startTime, endTime, webSite, vendor.getStoreId());
         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/seller/SellerFlowAnalysisController.java

@@ -49,15 +49,16 @@ public class SellerFlowAnalysisController 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("flowOverview")
-    public JsonResult<SellerFlowOverviewVO> flowOverview(HttpServletRequest request, Date startTime, Date endTime) {
+    public JsonResult<SellerFlowOverviewVO> flowOverview(HttpServletRequest request, Date startTime, Date endTime,@RequestParam(name = "webSite", required = false,defaultValue = "1") String webSite) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, false);
         SellerFlowOverviewVO vo = new SellerFlowOverviewVO();
-        List<? extends StoreBase> list = statsModelUtil.getStoreList(timeType, startTime, endTime, 1, "flow", vendor.getStoreId(), null);
+        List<? extends StoreBase> list = statsModelUtil.getStoreList(timeType, startTime, endTime, webSite,1, "flow", vendor.getStoreId(), null);
         if (!CollectionUtils.isEmpty(list)) {
             StoreBase storeBase = list.get(0);
             //上期数据
@@ -73,7 +74,7 @@ public class SellerFlowAnalysisController extends BaseController {
                 preEndTime = StatsTimeType.getEndTime(endTime, timeType);
             }
             if (preStartTime != null) {
-                List<? extends StoreBase> previousList = statsModelUtil.getStoreList(timeType, preStartTime, preEndTime, 1, "flow", vendor.getStoreId(), null);
+                List<? extends StoreBase> previousList = statsModelUtil.getStoreList(timeType, preStartTime, preEndTime, webSite,1, "flow", vendor.getStoreId(), null);
                 if (!CollectionUtils.isEmpty(previousList)) {
                     previousData = previousList.get(0);
                 }
@@ -87,7 +88,8 @@ public class SellerFlowAnalysisController extends BaseController {
 
     @ApiOperation("近30天变化趋势")
     @GetMapping("changeTrend")
-    public JsonResult<List<FlowChangeTrendVO>> changeTrend(HttpServletRequest request) {
+    @ApiImplicitParam(name = "webSite", value = "站点")
+    public JsonResult<List<FlowChangeTrendVO>> changeTrend(HttpServletRequest request,@RequestParam(value = "webSite",required = false,defaultValue = "1") String webSite) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         //获取当前时间30天之前的时间
@@ -97,6 +99,7 @@ public class SellerFlowAnalysisController extends BaseController {
         StoreDayExample example = new StoreDayExample();
         example.setStatsTimeAfter(startTime);
         example.setStoreId(vendor.getStoreId());
+        example.setWebSite(webSite);
         example.setOrderBy("stats_time ASC");
         List<StoreDay> list = storeDayModel.getStoreDayList(example, null);
         List<FlowChangeTrendVO> vos = new ArrayList<>();
@@ -110,6 +113,7 @@ public class SellerFlowAnalysisController extends BaseController {
 
     @ApiOperation("流量报表")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点"),
             @ApiImplicitParam(name = "startTime", value = "开始时间", required = true),
             @ApiImplicitParam(name = "endTime", value = "结束时间", required = true),
             @ApiImplicitParam(name = "type", value = "排序类型；desc-降序;asc-升序;默认类型为降序"),
@@ -121,7 +125,8 @@ public class SellerFlowAnalysisController extends BaseController {
     @GetMapping("flowReport")
     public JsonResult<PageVO<SellerFlowReportVO>> flowReport(HttpServletRequest request, Date startTime, Date endTime,
                                                              @RequestParam(value = "type", required = false, defaultValue = "desc") String type,
-                                                             @RequestParam(value = "sort", required = false, defaultValue = "stats_time") String sort) {
+                                                             @RequestParam(value = "sort", required = false, defaultValue = "stats_time") String sort,
+                                                             @RequestParam(value = "webSite",required = false,defaultValue = "1") String webSite) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
@@ -129,6 +134,7 @@ public class SellerFlowAnalysisController extends BaseController {
         example.setStatsTimeAfter(startTime);
         example.setStatsTimeBefore(endTime);
         example.setStoreId(vendor.getStoreId());
+        example.setWebSite(webSite);
         example.setOrderBy(sort + " " + type);
         List<StoreDay> list = storeDayModel.getStoreDayList(example, pager);
         List<SellerFlowReportVO> vos = new ArrayList<>();
@@ -142,6 +148,7 @@ public class SellerFlowAnalysisController extends BaseController {
 
     @ApiOperation("导出报表")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点"),
             @ApiImplicitParam(name = "startTime", value = "开始时间", required = true),
             @ApiImplicitParam(name = "endTime", value = "结束时间", required = true),
             @ApiImplicitParam(name = "type", value = "排序类型；desc-降序;asc-升序;默认类型为降序"),
@@ -151,13 +158,15 @@ public class SellerFlowAnalysisController extends BaseController {
     @GetMapping("export")
     public JsonResult export(HttpServletRequest request, HttpServletResponse response, Date startTime, Date endTime,
                              @RequestParam(value = "type", required = false, defaultValue = "desc") String type,
-                             @RequestParam(value = "sort", required = false, defaultValue = "stats_time") String sort) {
+                             @RequestParam(value = "sort", required = false, defaultValue = "stats_time") String sort,
+                             @RequestParam(value = "webSite",required = false,defaultValue = "1") String webSite) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         StoreDayExample example = new StoreDayExample();
         example.setStoreId(vendor.getStoreId());
         example.setStatsTimeAfter(startTime);
         example.setStatsTimeBefore(endTime);
+        example.setWebSite(webSite);
         example.setOrderBy(sort + " " + type);
         storeDayModel.flowReportExport(request, response, example);
         return null;

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

@@ -53,14 +53,16 @@ public class SellerGoodsAnalysisController extends BaseController {
     private GoodsModel goodsModel;
 
     @ApiOperation("商品总览(商品数)")
+    @ApiImplicitParam(name = "webSite", value = "站点")
     @GetMapping("goodsNum")
-    public JsonResult<SellerGoodsNumVO> goodsNum(HttpServletRequest request) {
+    public JsonResult<SellerGoodsNumVO> goodsNum(HttpServletRequest request,@RequestParam(name = "webSite", required = false,defaultValue = "1") String webSite) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         SellerGoodsNumVO vo = new SellerGoodsNumVO();
         GoodsExample example = new GoodsExample();
         example.setStoreId(vendor.getStoreId());
         example.setStateNotEquals(GoodsConst.GOODS_STATE_DELETE);
+        example.setWebSite(webSite);
         vo.setGoodsTotalNum(goodsModel.getGoodsCount(example));
         example.setState(GoodsConst.GOODS_STATE_UPPER);
         vo.setOnSaleGoodsNum(goodsModel.getGoodsCount(example));
@@ -72,14 +74,15 @@ public class SellerGoodsAnalysisController 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("goodsOverview")
-    public JsonResult<GoodsOverviewVO> goodsOverview(HttpServletRequest request, Date startTime, Date endTime) {
+    public JsonResult<GoodsOverviewVO> goodsOverview(HttpServletRequest request, Date startTime, Date endTime,@RequestParam(name = "webSite", required = false,defaultValue = "1") String webSite) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, false);
-        List<? extends StoreBase> list = statsModelUtil.getStoreList(timeType, startTime, endTime, 1, "sale", vendor.getStoreId(), null);
+        List<? extends StoreBase> list = statsModelUtil.getStoreList(timeType, startTime, endTime, webSite, 1, "sale", vendor.getStoreId(), null);
         GoodsOverviewVO vo = new GoodsOverviewVO();
         if (!CollectionUtils.isEmpty(list)) {
             StoreBase storeBase = list.get(0);
@@ -96,7 +99,7 @@ public class SellerGoodsAnalysisController extends BaseController {
                 preEndTime = StatsTimeType.getEndTime(endTime, timeType);
             }
             if (preStartTime != null) {
-                List<? extends StoreBase> previousList = statsModelUtil.getStoreList(timeType, preStartTime, preEndTime, 1, "sale", vendor.getStoreId(), null);
+                List<? extends StoreBase> previousList = statsModelUtil.getStoreList(timeType, preStartTime, preEndTime, webSite,1, "sale", vendor.getStoreId(), null);
                 if (!CollectionUtils.isEmpty(previousList)) {
                     previousData = previousList.get(0);
                 }
@@ -111,14 +114,15 @@ public class SellerGoodsAnalysisController 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) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, true);
-        List<MovableGoodsVO> list = statsModelUtil.getStoreTrendList(timeType, startTime, endTime, vendor.getStoreId());
+        List<MovableGoodsVO> list = statsModelUtil.getStoreTrendList(timeType, startTime, endTime, webSite, vendor.getStoreId());
         GoodsSalesTrendVO vo = new GoodsSalesTrendVO();
         //新增商品数列表
         List<MovableGoodsVO> newGoodsList = new ArrayList<>();
@@ -179,10 +183,11 @@ public class SellerGoodsAnalysisController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "startTime", value = "开始时间", required = true),
             @ApiImplicitParam(name = "endTime", value = "结束时间", required = true),
+            @ApiImplicitParam(name = "webSite", value = "站点"),
             @ApiImplicitParam(name = "sort", value = "排序:1-销售额；2-销量 默认不传按销售额降序")
     })
     @GetMapping("goodsSalesRank")
-    public JsonResult<List<GoodsChangeTrendVO>> goodsSalesRank(HttpServletRequest request, Date startTime, Date endTime, Integer sort) {
+    public JsonResult<List<GoodsChangeTrendVO>> goodsSalesRank(HttpServletRequest request, Date startTime, Date endTime,@RequestParam(name = "webSite", required = false,defaultValue = "1") String webSite, Integer sort) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, true);
@@ -191,7 +196,7 @@ public class SellerGoodsAnalysisController extends BaseController {
         if (timeType == StatsTimeType.HOUR) {
             timeType2 = StatsTimeType.DAY;
         }
-        List<? extends GoodsBase> list = statsModelUtil.getGoodsList(timeType2, startTime, endTime, sort, "sale", vendor.getStoreId());
+        List<? extends GoodsBase> list = statsModelUtil.getGoodsList(timeType2, startTime, endTime,webSite, sort, "sale", vendor.getStoreId());
         List<GoodsChangeTrendVO> vos = getGoodsSalesRank(list, timeType, startTime, endTime);
         return SldResponse.success(vos);
     }

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

@@ -53,7 +53,7 @@ public class SellerMemberAnalysisController extends BaseController {
 
     @ApiOperation("用户总览(用户总数)")
     @GetMapping("memberNum")
-    public JsonResult memberNum(HttpServletRequest request) {
+    public JsonResult memberNum(HttpServletRequest request,@RequestParam(name = "webSite", required = false,defaultValue ="1") String webSite) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         //查询用户总数，在本店有过支付行为的会员数
@@ -68,15 +68,16 @@ public class SellerMemberAnalysisController 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("goodsOverview")
-    public JsonResult<MemberOverviewVO> goodsOverview(HttpServletRequest request, Date startTime, Date endTime) {
+    public JsonResult<MemberOverviewVO> goodsOverview(HttpServletRequest request, Date startTime, Date endTime,@RequestParam(name = "webSite", required = false,defaultValue = "1") String webSite) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, false);
         MemberOverviewVO vo = new MemberOverviewVO();
-        List<? extends StoreBase> list = statsModelUtil.getStoreList(timeType, startTime, endTime, 1, "sale", vendor.getStoreId(), null);
+        List<? extends StoreBase> list = statsModelUtil.getStoreList(timeType, startTime, endTime, webSite, 1, "sale", vendor.getStoreId(), null);
         if (!CollectionUtils.isEmpty(list)) {
             StoreBase storeBase = list.get(0);
             //上期数据
@@ -92,7 +93,7 @@ public class SellerMemberAnalysisController extends BaseController {
                 preEndTime = StatsTimeType.getEndTime(endTime, timeType);
             }
             if (preStartTime != null) {
-                List<? extends StoreBase> previousList = statsModelUtil.getStoreList(timeType, preStartTime, preEndTime, 1, "sale", vendor.getStoreId(), null);
+                List<? extends StoreBase> previousList = statsModelUtil.getStoreList(timeType, preStartTime, preEndTime, webSite,1, "sale", vendor.getStoreId(), null);
                 if (!CollectionUtils.isEmpty(previousList)) {
                     previousData = previousList.get(0);
                 }
@@ -107,14 +108,15 @@ public class SellerMemberAnalysisController 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("changeTrend")
-    public JsonResult<List<SalesTrendVO>> changeTrend(HttpServletRequest request, Date startTime, Date endTime) {
+    public JsonResult<List<SalesTrendVO>> changeTrend(HttpServletRequest request, Date startTime, Date endTime,@RequestParam(value = "webSite",required = false,defaultValue = "1") String webSite) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, true);
-        List<MovableGoodsVO> list = statsModelUtil.getStoreTrendList(timeType, startTime, endTime, vendor.getStoreId());
+        List<MovableGoodsVO> list = statsModelUtil.getStoreTrendList(timeType, startTime, endTime, webSite, vendor.getStoreId());
         List<SalesTrendVO> vos = new ArrayList<>();
         if (!CollectionUtils.isEmpty(list)) {
             list.forEach(goodsVO -> {
@@ -129,14 +131,15 @@ public class SellerMemberAnalysisController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "startTime", value = "开始时间", required = true),
             @ApiImplicitParam(name = "endTime", value = "结束时间", required = true),
+            @ApiImplicitParam(name = "webSite", value = "站点"),
             @ApiImplicitParam(name = "sort", value = "排序:1-浏览量；2-收藏数；2-支付订单数 默认不传按浏览量降序")
     })
     @GetMapping("preferGoodsRank")
-    public JsonResult<List<GoodsRankVO>> preferGoodsRank(HttpServletRequest request, Date startTime, Date endTime, Integer sort) {
+    public JsonResult<List<GoodsRankVO>> preferGoodsRank(HttpServletRequest request, Date startTime, Date endTime,@RequestParam(value = "webSite",required = false,defaultValue = "1") String webSite, Integer sort) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, false);
-        List<? extends GoodsBase> list = statsModelUtil.getGoodsList(timeType, startTime, endTime, sort, "prefer", vendor.getStoreId());
+        List<? extends GoodsBase> list = statsModelUtil.getGoodsList(timeType, startTime, endTime,webSite, sort, "prefer", vendor.getStoreId());
         List<GoodsRankVO> vos = new ArrayList<>();
         if (!CollectionUtils.isEmpty(list)) {
             list.forEach(goodsBase -> {
@@ -153,14 +156,16 @@ public class SellerMemberAnalysisController 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("orderPayTrend")
-    public JsonResult<List<OrderPayTrendVO>> orderPayTrend(HttpServletRequest request, Date startTime, Date endTime) {
+    public JsonResult<List<OrderPayTrendVO>> orderPayTrend(HttpServletRequest request, Date startTime, Date endTime,@RequestParam(value = "webSite",required = false,defaultValue = "1") String webSite) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, true);
-        List<MovableGoodsVO> list = statsModelUtil.getStoreTrendList(timeType, startTime, endTime, vendor.getStoreId());
+        List<MovableGoodsVO> list = statsModelUtil.getStoreTrendList(timeType, startTime, endTime, webSite, vendor.getStoreId());
         List<OrderPayTrendVO> vos = new ArrayList<>();
         if (!CollectionUtils.isEmpty(list)) {
             list.forEach(trendVO -> {
@@ -177,6 +182,7 @@ public class SellerMemberAnalysisController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "startTime", value = "开始时间", required = true),
             @ApiImplicitParam(name = "endTime", value = "结束时间", required = true),
+            @ApiImplicitParam(name = "webSite", value = "站点"),
             @ApiImplicitParam(name = "type", value = "排序类型；desc-降序;asc-升序;默认类型为降序"),
             @ApiImplicitParam(name = "sort", value = "排序:stats_time-时间;new_member_num-新增用户数;visitor_num-店铺访客数;" +
                     "order_submit_member_num-下单人数;order_pay_member_num-支付人数;collection_store_num-关注店铺人数;默认按时间降序排序"),
@@ -185,6 +191,7 @@ public class SellerMemberAnalysisController extends BaseController {
     })
     @GetMapping("dayReport")
     public JsonResult<PageVO<MemberDayReportVO>> dayReport(HttpServletRequest request, Date startTime, Date endTime,
+                                                           @RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite,
                                                            @RequestParam(value = "type", required = false, defaultValue = "desc") String type,
                                                            @RequestParam(value = "sort", required = false, defaultValue = "stats_time") String sort) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
@@ -194,6 +201,7 @@ public class SellerMemberAnalysisController extends BaseController {
         example.setStoreId(vendor.getStoreId());
         example.setStatsTimeAfter(startTime);
         example.setStatsTimeBefore(endTime);
+        example.setWebSite(webSite);
         example.setOrderBy(sort + " " + type);
         List<StoreDay> list = storeDayModel.getStoreDayList(example, pager);
         List<MemberDayReportVO> vos = new ArrayList<>();
@@ -209,6 +217,7 @@ public class SellerMemberAnalysisController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "startTime", value = "开始时间", required = true),
             @ApiImplicitParam(name = "endTime", value = "结束时间", required = true),
+            @ApiImplicitParam(name = "webSite", value = "站点"),
             @ApiImplicitParam(name = "memberName", value = "会员名称"),
             @ApiImplicitParam(name = "type", value = "排序类型；desc-降序;asc-升序;默认类型为降序"),
             @ApiImplicitParam(name = "sort", value = "排序:orderSubmitNum-下单数;orderSubmitAmount-下单金额;orderPayNum-支付订单数;" +
@@ -217,7 +226,9 @@ public class SellerMemberAnalysisController extends BaseController {
             @ApiImplicitParam(name = "current", value = "当前页面位置", defaultValue = "1", paramType = "query")
     })
     @GetMapping("memberReport")
-    public JsonResult<PageVO<MemberStoreReportVO>> memberReport(HttpServletRequest request, Date startTime, Date endTime, String memberName,
+    public JsonResult<PageVO<MemberStoreReportVO>> memberReport(HttpServletRequest request, Date startTime, Date endTime,
+                                                                @RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite,
+                                                                String memberName,
                                                                 @RequestParam(value = "type", required = false, defaultValue = "desc") String type,
                                                                 @RequestParam(value = "sort", required = false, defaultValue = "orderSubmitNum") String sort) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
@@ -228,6 +239,7 @@ public class SellerMemberAnalysisController extends BaseController {
         example.setStatsTimeAfter(startTime);
         example.setStatsTimeBefore(endTime);
         example.setMemberNameLike(memberName);
+        example.setWebSite(webSite);
         example.setOrderBy(sort + " " + type);
         List<MemberStoreBase> list = memberStoreDayModel.getMemberStoreList(example, pager);
         List<MemberStoreReportVO> vos = new ArrayList<>();
@@ -243,12 +255,14 @@ public class SellerMemberAnalysisController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "startTime", value = "开始时间", required = true),
             @ApiImplicitParam(name = "endTime", value = "结束时间", required = true),
+            @ApiImplicitParam(name = "webSite", value = "站点"),
             @ApiImplicitParam(name = "type", value = "排序类型；desc-降序;asc-升序;默认类型为降序"),
             @ApiImplicitParam(name = "sort", value = "排序:stats_time-时间;new_member_num-新增用户数;visitor_num-店铺访客数;" +
                     "order_submit_member_num-下单人数;order_pay_member_num-支付人数;collection_store_num-关注店铺人数;默认按时间降序排序")
     })
     @GetMapping("dayExport")
     public JsonResult dayExport(HttpServletRequest request, HttpServletResponse response, Date startTime, Date endTime,
+                                @RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite,
                                 @RequestParam(value = "type", required = false, defaultValue = "desc") String type,
                                 @RequestParam(value = "sort", required = false, defaultValue = "stats_time") String sort) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
@@ -257,6 +271,7 @@ public class SellerMemberAnalysisController extends BaseController {
         example.setStoreId(vendor.getStoreId());
         example.setStatsTimeAfter(startTime);
         example.setStatsTimeBefore(endTime);
+        example.setWebSite(webSite);
         example.setOrderBy(sort + " " + type);
         storeDayModel.memberReportExport(request, response, example);
         return null;
@@ -266,13 +281,16 @@ public class SellerMemberAnalysisController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "startTime", value = "开始时间", required = true),
             @ApiImplicitParam(name = "endTime", value = "结束时间", required = true),
+            @ApiImplicitParam(name = "webSite", value = "站点"),
             @ApiImplicitParam(name = "memberName", value = "会员名称"),
             @ApiImplicitParam(name = "type", value = "排序类型；desc-降序;asc-升序;默认类型为降序"),
             @ApiImplicitParam(name = "sort", value = "排序:orderSubmitNum-下单数;orderSubmitAmount-下单金额;orderPayNum-支付订单数;" +
                     "orderPayAmount-支付金额;returnNum-退单数;returnAmount-退款金额;默认按下单数降序排序")
     })
     @GetMapping("memberExport")
-    public JsonResult memberExport(HttpServletRequest request, HttpServletResponse response, Date startTime, Date endTime, String memberName,
+    public JsonResult memberExport(HttpServletRequest request, HttpServletResponse response, Date startTime, Date endTime,
+                                   @RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite,
+                                   String memberName,
                                    @RequestParam(value = "type", required = false, defaultValue = "desc") String type,
                                    @RequestParam(value = "sort", required = false, defaultValue = "orderSubmitNum") String sort) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
@@ -282,6 +300,7 @@ public class SellerMemberAnalysisController extends BaseController {
         example.setStatsTimeAfter(startTime);
         example.setStatsTimeBefore(endTime);
         example.setMemberNameLike(memberName);
+        example.setWebSite(webSite);
         example.setOrderBy(sort + " " + type);
         memberStoreDayModel.memberReportExport(request, response, example);
         return null;

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

@@ -69,12 +69,13 @@ public class SellerOverviewController extends BaseController {
     private MemberEnquiryModel memberEnquiryModel;
 
     @ApiOperation("首页概况实时统计数据")
+    @ApiImplicitParam(name = "webSite", value = "站点来源 1:海外站 2:国内站")
     @GetMapping("presentData")
-    public JsonResult<SellerPresentIndexVO> indexPresentData(HttpServletRequest request) {
+    public JsonResult<SellerPresentIndexVO> indexPresentData(HttpServletRequest request, @RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
         SellerPresentDataVO sellerPresentDataVO;
         //查询缓存数据
-        Object presentData = objectRedisTemplate.opsForHash().get(StatsConstant.SELLER_PRESENT_REDIS_KEY, vendor.getStoreId() + "");
+        Object presentData = objectRedisTemplate.opsForHash().get(StatsConstant.SELLER_PRESENT_REDIS_KEY + "_" + webSite, vendor.getStoreId() + "");
         if (presentData == null) {
             //无缓存数据，重新计算实时统计，并缓存
             //截止当前时间
@@ -83,10 +84,10 @@ public class SellerOverviewController extends BaseController {
             DateTime startTime = DateUtil.beginOfDay(endTime);
 
             //计算实时统计数据
-            sellerPresentDataVO = sellerPresentDataUtil.calculatePresentData(startTime, endTime, vendor.getStoreId());
+            sellerPresentDataVO = sellerPresentDataUtil.calculatePresentData(startTime, endTime, webSite, vendor.getStoreId());
 
             //缓存数据
-            objectRedisTemplate.opsForHash().put(StatsConstant.SELLER_PRESENT_REDIS_KEY, vendor.getStoreId() + "", sellerPresentDataVO);
+            objectRedisTemplate.opsForHash().put(StatsConstant.SELLER_PRESENT_REDIS_KEY + "_" + webSite, vendor.getStoreId() + "", sellerPresentDataVO);
         } else {
             sellerPresentDataVO = JSON.parseObject(JSON.toJSONString(presentData), SellerPresentDataVO.class);
         }
@@ -115,6 +116,15 @@ public class SellerOverviewController extends BaseController {
         goodsExample.setState(GoodsConst.GOODS_STATE_LOWER_BY_SYSTEM);
         goodsExample.setIsDelete(GoodsConst.GOODS_IS_DELETE_NO);
         sellerWaitDeal.setSysLowerGoodsNum(goodsModel.getGoodsCount(goodsExample));
+
+        //站点违规商品数
+        goodsExample = new GoodsExample();
+        goodsExample.setWebSite(webSite);
+        goodsExample.setStoreId(vendor.getStoreId());
+        goodsExample.setState(GoodsConst.GOODS_STATE_LOWER_BY_SYSTEM);
+        goodsExample.setIsDelete(GoodsConst.GOODS_IS_DELETE_NO);
+        sellerWaitDeal.setSysWebSiteLowerGoodsNum(goodsModel.getGoodsCount(goodsExample));
+
         //待确认结算单数
         BillExample billExample = new BillExample();
         billExample.setStoreId(vendor.getStoreId());
@@ -160,54 +170,31 @@ public class SellerOverviewController extends BaseController {
         memberEnquiryToAssignExample.setItemTypeIn(itemTypeStr);
         sellerWaitDeal.setEnquiryToBeAssignNum(memberEnquiryModel.getMemberEnquiryCount(memberEnquiryToAssignExample));
 
-        result.setSellerWaitDeal(sellerWaitDeal);
-
-        return SldResponse.success(result);
-    }
-
-    @ApiOperation("首页不同站点概况实时统计数据")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "source", value = "站点来源 1:海外站 2:国内站")
-    })
-    @GetMapping("source/presentData")
-    public JsonResult<SellerSourcePresentIndexVO> indexSourcePresentData(HttpServletRequest request, @RequestParam(required = false, defaultValue = "1") String webSite) {
-        Vendor vendor = UserUtil.getUser(request, Vendor.class);
-        SellerSourcePresentIndexVO result = new SellerSourcePresentIndexVO();
-        //违规商品数
-        GoodsExample goodsExample = new GoodsExample();
-        goodsExample.setStoreId(vendor.getStoreId());
-        goodsExample.setWebSite(webSite);
-        goodsExample.setState(GoodsConst.GOODS_STATE_LOWER_BY_SYSTEM);
-        goodsExample.setIsDelete(GoodsConst.GOODS_IS_DELETE_NO);
-        result.setSysLowerGoodsNum(goodsModel.getGoodsCount(goodsExample));
-
-        //询盘数据
-        List<String> itemTypes = new ArrayList<>();
-        itemTypes.add(EnquiryConst.ENQUIRY_ITEM_TYPE_GOODS);
-        itemTypes.add(EnquiryConst.ENQUIRY_ITEM_TYPE_SHOP);
-        String itemTypeStr = StringUtil.listToString(itemTypes);
-
-        //待分配询盘数
-        MemberEnquiryExample memberEnquiryToAssignExample = new MemberEnquiryExample();
-        memberEnquiryToAssignExample.setStoreId(vendor.getStoreId());
+        //站点待分配询盘数
+        memberEnquiryToAssignExample = new MemberEnquiryExample();
         memberEnquiryToAssignExample.setWebSite(webSite);
+        memberEnquiryToAssignExample.setStoreId(vendor.getStoreId());
         memberEnquiryToAssignExample.setStatusEqual(EnquiryConst.ENQUIRY_NEW);
         memberEnquiryToAssignExample.setItemTypeIn(itemTypeStr);
-        result.setEnquiryToBeAssignNum(memberEnquiryModel.getMemberEnquiryCount(memberEnquiryToAssignExample));
+        sellerWaitDeal.setWebSiteEnquiryToBeAssignNum(memberEnquiryModel.getMemberEnquiryCount(memberEnquiryToAssignExample));
+
+        result.setSellerWaitDeal(sellerWaitDeal);
+
         return SldResponse.success(result);
     }
 
     @ApiOperation("支付或下单金额趋势")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "startTime", value = "开始时间", required = true),
-            @ApiImplicitParam(name = "endTime", value = "结束时间", required = true)
+            @ApiImplicitParam(name = "endTime", value = "结束时间", required = true),
+            @ApiImplicitParam(name = "webSite", value = "站点来源 1:海外站 2:国内站")
     })
     @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) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, true);
-        List<MovableGoodsVO> list = statsModelUtil.getStoreTrendList(timeType, startTime, endTime, vendor.getStoreId());
+        List<MovableGoodsVO> list = statsModelUtil.getStoreTrendList(timeType, startTime, endTime, webSite, vendor.getStoreId());
         PlatformSalesVO vo = new PlatformSalesVO();
         //支付金额列表
         List<PlatformSalesVO.PayAmountVO> payAmountList = new ArrayList<>();
@@ -235,14 +222,15 @@ public class SellerOverviewController 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 = "站点来源 1:海外站 2:国内站")
     })
     @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) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, true);
-        List<MovableGoodsVO> list = statsModelUtil.getStoreTrendList(timeType, startTime, endTime, vendor.getStoreId());
+        List<MovableGoodsVO> list = statsModelUtil.getStoreTrendList(timeType, startTime, endTime, webSite, vendor.getStoreId());
         FlowTrendVO vo = new FlowTrendVO();
         //访客数列表
         List<FlowTrendVO.VisitorNumVO> visitorNumList = new ArrayList<>();
@@ -276,12 +264,13 @@ public class SellerOverviewController extends BaseController {
      * @return
      */
     @GetMapping("enquiryTrend")
-    public JsonResult<EnquiryTrendVO> getEnquiryTrend(HttpServletRequest request, Date startTime, Date endTime) throws Exception {
+    @ApiImplicitParam(name = "webSite", value = "站点来源 1:海外站 2:国内站")
+    public JsonResult<EnquiryTrendVO> getEnquiryTrend(HttpServletRequest request, Date startTime, Date endTime, @RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite) throws Exception {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
         EnquiryTrendVO vo = new EnquiryTrendVO();
         if (startTime != null && endTime != null) {
             StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, true);
-            List<MemberEnquiry> list = memberEnquiryModel.getSellerEnquiryTrendList(timeType, startTime, endTime, vendor.getStoreId());
+            List<MemberEnquiry> list = memberEnquiryModel.getSellerEnquiryTrendList(timeType, startTime, endTime, webSite, vendor.getStoreId());
             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/seller/SellerPresentAnalysisController.java

@@ -36,11 +36,13 @@ public class SellerPresentAnalysisController {
 
     @ApiOperation("获取实时统计数据")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "refresh", value = "true-刷新,默认false", defaultValue = "false")
+            @ApiImplicitParam(name = "refresh", value = "true-刷新,默认false", defaultValue = "false"),
+            @ApiImplicitParam(name = "webSite", value = "站点来源 1:海外站 2:国内站")
     })
     @GetMapping("presentData")
     public JsonResult<SellerPresentDataVO> getSellerPresentData(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) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
         if (refresh) {
             //刷新请求，重新计算实时统计，并缓存
@@ -48,26 +50,26 @@ public class SellerPresentAnalysisController {
             DateTime startTime = DateUtil.beginOfDay(endTime);//今日0时开始
 
             //计算实时统计数据
-            SellerPresentDataVO vo = sellerPresentDataUtil.calculatePresentData(startTime, endTime, vendor.getStoreId());
+            SellerPresentDataVO vo = sellerPresentDataUtil.calculatePresentData(startTime, endTime,webSite, vendor.getStoreId());
 
             //缓存数据
-            objectRedisTemplate.opsForHash().put(StatsConstant.SELLER_PRESENT_REDIS_KEY, vendor.getStoreId() + "", vo);
+            objectRedisTemplate.opsForHash().put(StatsConstant.SELLER_PRESENT_REDIS_KEY + "_" + webSite, vendor.getStoreId() + "", vo);
 
             return SldResponse.success(vo);
         }
 
         //查询缓存数据
-        Object presentData = objectRedisTemplate.opsForHash().get(StatsConstant.SELLER_PRESENT_REDIS_KEY, vendor.getStoreId() + "");
+        Object presentData = objectRedisTemplate.opsForHash().get(StatsConstant.SELLER_PRESENT_REDIS_KEY+"_"+webSite, vendor.getStoreId() + "");
         if (presentData == null) {
             //无缓存数据，重新计算实时统计，并缓存
             Date endTime = new Date();//截止当前时间
             DateTime startTime = DateUtil.beginOfDay(endTime);//今日0时开始
 
             //计算实时统计数据
-            SellerPresentDataVO vo = sellerPresentDataUtil.calculatePresentData(startTime, endTime, vendor.getStoreId());
+            SellerPresentDataVO vo = sellerPresentDataUtil.calculatePresentData(startTime, endTime, webSite,vendor.getStoreId());
 
             //缓存数据
-            objectRedisTemplate.opsForHash().put(StatsConstant.SELLER_PRESENT_REDIS_KEY, vendor.getStoreId() + "", vo);
+            objectRedisTemplate.opsForHash().put(StatsConstant.SELLER_PRESENT_REDIS_KEY + "_" + webSite, vendor.getStoreId() + "", vo);
 
             return SldResponse.success(vo);
         }

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

@@ -49,15 +49,16 @@ public class SellerTradeAnalysisController 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("tradeOverview")
-    public JsonResult<TradeOverviewVO> tradeOverview(HttpServletRequest request, Date startTime, Date endTime) {
+    public JsonResult<TradeOverviewVO> tradeOverview(HttpServletRequest request, Date startTime, Date endTime,@RequestParam(name = "webSite", required = false,defaultValue = "1") String webSite) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, false);
         TradeOverviewVO vo = new TradeOverviewVO();
-        List<? extends StoreBase> list = statsModelUtil.getStoreList(timeType, startTime, endTime, 1, "sale", vendor.getStoreId(), null);
+        List<? extends StoreBase> list = statsModelUtil.getStoreList(timeType, startTime, endTime, webSite,1, "sale", vendor.getStoreId(), null);
         if (!CollectionUtils.isEmpty(list)) {
             StoreBase storeBase = list.get(0);
             //上期数据
@@ -73,7 +74,7 @@ public class SellerTradeAnalysisController extends BaseController {
                 preEndTime = StatsTimeType.getEndTime(endTime, timeType);
             }
             if (preStartTime != null) {
-                List<? extends StoreBase> previousList = statsModelUtil.getStoreList(timeType, preStartTime, preEndTime, 1, "sale", vendor.getStoreId(), null);
+                List<? extends StoreBase> previousList = statsModelUtil.getStoreList(timeType, preStartTime, preEndTime, webSite,1, "sale", vendor.getStoreId(), null);
                 if (!CollectionUtils.isEmpty(previousList)) {
                     previousData = previousList.get(0);
                 }
@@ -112,14 +113,15 @@ public class SellerTradeAnalysisController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "startTime", value = "开始时间", required = true),
             @ApiImplicitParam(name = "endTime", value = "结束时间", required = true),
+            @ApiImplicitParam(name="webSite",value = "站点"),
             @ApiImplicitParam(name = "sort", value = "排序:1-销售额；2-销量 默认不传按销售额降序")
     })
     @GetMapping("goodsSalesRank")
-    public JsonResult<List<GoodsRankVO>> goodsSalesRank(HttpServletRequest request, Date startTime, Date endTime, Integer sort) {
+    public JsonResult<List<GoodsRankVO>> goodsSalesRank(HttpServletRequest request, Date startTime, Date endTime,@RequestParam(name = "webSite", required = false,defaultValue = "1") String webSite, Integer sort) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, false);
-        List<? extends GoodsBase> list = statsModelUtil.getGoodsList(timeType, startTime, endTime, sort, "sale", vendor.getStoreId());
+        List<? extends GoodsBase> list = statsModelUtil.getGoodsList(timeType, startTime, endTime,webSite, sort, "sale", vendor.getStoreId());
         List<GoodsRankVO> vos = new ArrayList<>();
         if (!CollectionUtils.isEmpty(list)) {
             list.forEach(goodsBase -> {
@@ -135,14 +137,15 @@ public class SellerTradeAnalysisController 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("orderTrend")
-    public JsonResult<OrderTrendVO> orderTrend(HttpServletRequest request, Date startTime, Date endTime) {
+    public JsonResult<OrderTrendVO> orderTrend(HttpServletRequest request, Date startTime, Date endTime,@RequestParam(value = "webSite",required = false,defaultValue = "1") String webSite) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         StatsTimeType timeType = StatsTimeType.checkTimeType(startTime, endTime, true);
-        List<MovableGoodsVO> list = statsModelUtil.getStoreTrendList(timeType, startTime, endTime, vendor.getStoreId());
+        List<MovableGoodsVO> list = statsModelUtil.getStoreTrendList(timeType, startTime, endTime,webSite, vendor.getStoreId());
         OrderTrendVO vo = new OrderTrendVO();
         //支付订单数列表
         List<OrderTrendVO.OrderPayNumVO> orderPayNumList = new ArrayList<>();

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

@@ -102,8 +102,9 @@ public interface MemberEnquiryReadMapper extends BaseReadMapper<MemberEnquiry, M
      * @return
      */
     List<MemberEnquiry> getSellerEnquiryTrendByTime(@Param("startTime") Date startTime,
-                                              @Param("endTime") Date endTime,
-                                              @Param("storeId") Long storeId);
+                                                    @Param("endTime") Date endTime,
+                                                    @Param("webSite") String webSite,
+                                                    @Param("storeId") Long storeId);
 
     /**
      * 卖家端-询盘趋势-小时
@@ -115,6 +116,7 @@ public interface MemberEnquiryReadMapper extends BaseReadMapper<MemberEnquiry, M
      */
     List<MemberEnquiry> getSellerEnquiryTrendByHour(@Param("startTime") Date startTime,
                                               @Param("endTime") Date endTime,
+                                              @Param("webSite")String webSite,
                                               @Param("storeId") Long storeId);
 
     /**

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

@@ -350,6 +350,7 @@ public class GoodsSellerModel {
         product.setGoodsId(goods.getGoodsId());
         product.setWebSite(goods.getWebSite());
         product.setGoodsName(goods.getGoodsName());
+        product.setGoodsNameCn(goods.getGoodsNameCn());
         product.setSpecValues(productInsertInfo.getSpecValues());
         product.setSpecValueIds(productInsertInfo.getSpecValueIds());
         product.setBrandId(goods.getBrandId());
@@ -917,6 +918,7 @@ public class GoodsSellerModel {
             Product product = new Product();
             product.setProductId(productInsertInfo.getProductId());
             product.setGoodsName(updateGoods.getGoodsName());
+            product.setGoodsNameCn(updateGoods.getGoodsNameCn());
             product.setSpecValues(productInsertInfo.getSpecValues());
             product.setSpecValueIds(productInsertInfo.getSpecValueIds());
             product.setBrandId(StringUtil.isNullOrZero(updateGoods.getBrandId()) ? 0 : updateGoods.getBrandId());

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

@@ -278,24 +278,24 @@ public class MemberEnquiryModel {
      * @param storeId
      * @return
      */
-    public List<MemberEnquiry> getSellerEnquiryTrendList(StatsTimeType timeType, Date start, Date end, Long storeId) throws Exception {
+    public List<MemberEnquiry> getSellerEnquiryTrendList(StatsTimeType timeType, Date start, Date end,String webSite, Long storeId) throws Exception {
         List<MemberEnquiry> enquiryList = new ArrayList<>();
         log.info("timeType:{}", timeType);
         switch (timeType) {
             case HOUR:
-                enquiryList = getSellerEnquryHoursInfo(start, end, storeId);
+                enquiryList = getSellerEnquryHoursInfo(start, end,webSite, storeId);
                 break;
             case DAY:
-                enquiryList = getSellerEnquryDaysInfo(start, end, storeId);
+                enquiryList = getSellerEnquryDaysInfo(start, end, webSite, storeId);
                 break;
             case WEEK:
-                enquiryList = getSellerEnquryDaysInfo(start, end, storeId);
+                enquiryList = getSellerEnquryDaysInfo(start, end, webSite, storeId);
                 break;
             case MONTH:
-                enquiryList = getSellerEnquryDaysInfo(start, end, storeId);
+                enquiryList = getSellerEnquryDaysInfo(start, end, webSite, storeId);
                 break;
             case YEAR:
-                enquiryList = getSellerEnquryDaysInfo(start, end, storeId);
+                enquiryList = getSellerEnquryDaysInfo(start, end, webSite, storeId);
                 break;
         }
         return enquiryList;
@@ -310,9 +310,9 @@ public class MemberEnquiryModel {
      * @return
      * @throws Exception
      */
-    private List<MemberEnquiry> getSellerEnquryDaysInfo(Date start, Date end, Long storeId) throws Exception {
+    private List<MemberEnquiry> getSellerEnquryDaysInfo(Date start, Date end,String webSite, Long storeId) throws Exception {
         Map<String, MemberEnquiry> enquiryMap = new HashMap<>();
-        List<MemberEnquiry> enquiryList = memberEnquiryReadMapper.getSellerEnquiryTrendByTime(start, end, storeId);
+        List<MemberEnquiry> enquiryList = memberEnquiryReadMapper.getSellerEnquiryTrendByTime(start, end, webSite, storeId);
         enquiryList.forEach(c -> {
             enquiryMap.put(c.getEnquiryDay(), c);
         });
@@ -339,11 +339,12 @@ public class MemberEnquiryModel {
      *
      * @param start
      * @param end
+     * @param webSite
      * @param storeId
      * @return
      */
-    private List<MemberEnquiry> getSellerEnquryHoursInfo(Date start, Date end, Long storeId) {
-        List<MemberEnquiry> enquiryHoursList = memberEnquiryReadMapper.getSellerEnquiryTrendByHour(start, end, storeId);
+    private List<MemberEnquiry> getSellerEnquryHoursInfo(Date start, Date end, String webSite, Long storeId) {
+        List<MemberEnquiry> enquiryHoursList = memberEnquiryReadMapper.getSellerEnquiryTrendByHour(start, end, webSite, storeId);
 
         Map<String, MemberEnquiry> enquiryMap = new HashMap<>();
         enquiryHoursList.forEach(c -> {

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

@@ -25,6 +25,7 @@ import com.slodon.b2b2c.statistics.pojo.base.StoreBase;
 import com.slodon.b2b2c.vo.statistics.AdminPresentDataVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -54,14 +55,14 @@ public class PlatformPresentDataUtil {
      * @param endTime
      * @return
      */
-    public AdminPresentDataVO calculatePresentData(Date startTime, Date endTime) {
+    public AdminPresentDataVO calculatePresentData(Date startTime, Date endTime,String webSite) {
         AdminPresentDataVO vo = new AdminPresentDataVO();
         vo.setStatsTime(endTime);
         //平台汇总
         vo.setPlatformSummary(this.getPlatformSummary());
 
         //查询今日统计基础数据
-        StatsBasicDataBO basicDataBO = statsDataUtil.searchStatsBasicData(startTime, endTime);
+        StatsBasicDataBO basicDataBO = statsDataUtil.searchStatsBasicData(startTime, endTime,webSite);
 
         //今日实时
         vo.setPlatformTodaySummary(this.getPlatformTodaySummary(basicDataBO));

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

@@ -66,11 +66,11 @@ public class SellerPresentDataUtil {
      * @param storeId
      * @return
      */
-    public SellerPresentDataVO calculatePresentData(Date startTime, Date endTime, Long storeId) {
+    public SellerPresentDataVO calculatePresentData(Date startTime, Date endTime,String webSite, Long storeId) {
         SellerPresentDataVO vo = new SellerPresentDataVO();
         vo.setStatsTime(endTime);
         //店铺汇总
-        vo.setSellerSummary(this.getSellerSummary(storeId));
+        vo.setSellerSummary(this.getSellerSummary(storeId,webSite));
 
         //查询今日统计基础数据
         //订单列表
@@ -96,12 +96,13 @@ public class SellerPresentDataUtil {
         //用户行为列表
         Query query = new Query();
         Criteria criteria = new Criteria();
-        criteria.and("behaviorTime").gte(startTime).lte(endTime).and("storeId").is(storeId);
+        criteria.and("behaviorTime").gte(startTime).lte(endTime).and("storeId").is(storeId).and("webSite").is(webSite);
         query.addCriteria(criteria);
         List<MemberBehavior> memberBehaviorList = mongoTemplate.find(query, MemberBehavior.class, "stats_member_behavior");
         //新增商品列表
         GoodsExample goodsExample = new GoodsExample();
         goodsExample.setStoreId(storeId);
+        goodsExample.setWebSite(webSite);
         goodsExample.setCreateTimeBefore(endTime);
         goodsExample.setCreateTimeAfter(startTime);
         List<Goods> newGoodsList = goodsModel.getGoodsList(goodsExample, null);
@@ -109,6 +110,7 @@ public class SellerPresentDataUtil {
         MemberExample memberExample = new MemberExample();
         memberExample.setRegisterTimeBefore(endTime);
         memberExample.setRegisterTimeAfter(startTime);
+        memberExample.setWebSite(webSite);
         List<Member> newMemberList = memberModel.getMemberList(memberExample, null);
 
         StoreStatsBO storeStatsBO = new StoreStatsBO();
@@ -141,7 +143,7 @@ public class SellerPresentDataUtil {
      *
      * @return
      */
-    private SellerPresentDataVO.SellerSummary getSellerSummary(Long storeId) {
+    private SellerPresentDataVO.SellerSummary getSellerSummary(Long storeId,String webSite) {
         //订单总额
         OrderExample orderExample = new OrderExample();
         orderExample.setOrderStateIn(OrderConst.ORDER_STATE_20 + "," + OrderConst.ORDER_STATE_30 + "," + OrderConst.ORDER_STATE_40);
@@ -161,6 +163,7 @@ public class SellerPresentDataUtil {
         GoodsExample goodsExample = new GoodsExample();
         goodsExample.setStoreId(storeId);
         goodsExample.setStateNotEquals(GoodsConst.GOODS_STATE_DELETE);
+        goodsExample.setWebSite(webSite);
         Integer goodsNum = goodsModel.getGoodsCount(goodsExample);
         goodsExample.setState(GoodsConst.GOODS_STATE_UPPER);
         Integer goodsCount = goodsModel.getGoodsCount(goodsExample);

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

@@ -72,7 +72,7 @@ public class StatsDataUtil {
      * @param endTime   统计结束时间
      * @return
      */
-    public StatsBasicDataBO searchStatsBasicData(Date startTime, Date endTime) {
+    public StatsBasicDataBO searchStatsBasicData(Date startTime, Date endTime,String webSite) {
         //1.时间段内的订单
         OrderExample orderExample = new OrderExample();
         orderExample.setCreateTimeAfter(startTime);
@@ -128,6 +128,7 @@ public class StatsDataUtil {
         Query query = new Query();
         Criteria criteria = new Criteria();
         criteria.and("behaviorTime").gte(startTime).lte(endTime);
+        criteria.and("webSite").is(webSite);
         query.addCriteria(criteria);
         List<MemberBehavior> memberBehaviorList = mongoTemplate.find(query, MemberBehavior.class, "stats_member_behavior");
 
@@ -158,6 +159,7 @@ public class StatsDataUtil {
             //查询一段时间有统计信息的商品
             GoodsExample goodsExample = new GoodsExample();
             goodsExample.setGoodsIdIn(goodsIds.toString().substring(1));
+            goodsExample.setWebSite(webSite);
             goodsList = goodsModel.getGoodsList(goodsExample, null);
         }
 
@@ -179,6 +181,7 @@ public class StatsDataUtil {
             //查询一段时间内有统计数据的所有会员
             MemberExample memberExample = new MemberExample();
             memberExample.setMemberIdIn(memberIds.toString().substring(1));
+            memberExample.setWebSite(webSite);
             memberList = memberModel.getMemberList(memberExample, null);
         }
 
@@ -186,12 +189,14 @@ public class StatsDataUtil {
         MemberExample memberExample = new MemberExample();
         memberExample.setRegisterTimeAfter(startTime);
         memberExample.setRegisterTimeBefore(endTime);
+        memberExample.setWebSite(webSite);
         List<Member> newMemberList = memberModel.getMemberList(memberExample, null);
 
         //10.查询一段时间内新增的商品
         GoodsExample goodsExample = new GoodsExample();
         goodsExample.setCreateTimeAfter(startTime);
         goodsExample.setCreateTimeBefore(endTime);
+        goodsExample.setWebSite(webSite);
         List<Goods> newGoodsList = goodsModel.getGoodsList(goodsExample, null);
 
         //11.查询一段时间内新增的品牌
@@ -199,6 +204,7 @@ public class StatsDataUtil {
         goodsBrandExample.setCreateTimeAfter(startTime);
         goodsBrandExample.setCreateTimeBefore(endTime);
         goodsBrandExample.setState(GoodsConst.BRAND_STATE_1);
+        goodsBrandExample.setWebSite(webSite);
         List<GoodsBrand> newGoodsBrandList = goodsBrandModel.getGoodsBrandList(goodsBrandExample, null);
 
         //12.查询一段时间内新增的店铺
@@ -211,6 +217,7 @@ public class StatsDataUtil {
         Query query1 = new Query();
         Criteria criteria1 = new Criteria();
         criteria1.and("behaviorType").is(StatsConstant.MEMBER_REGISTER);
+        criteria1.and("webSite").is(webSite);
         query1.addCriteria(criteria1);
         List<MemberBehavior> memberRegisterBehaviorList = mongoTemplate.find(query1, MemberBehavior.class, "stats_member_behavior");
 

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

@@ -265,7 +265,7 @@ public class StatsModelUtil {
      * @param endTime
      * @return
      */
-    public List<? extends StoreBase> getStoreList(StatsTimeType timeType, Date startTime, Date endTime, Integer sort,
+    public List<? extends StoreBase> getStoreList(StatsTimeType timeType, Date startTime, Date endTime, String webSite, Integer sort,
                                                   String sortType, Long storeId, PagerInfo pager) {
         List<? extends StoreBase> list = new ArrayList<>();
         //排序规则
@@ -289,6 +289,7 @@ public class StatsModelUtil {
                 example.setStatsTimeAfter(startTime);
                 example.setStatsTimeBefore(endTime);
                 example.setStoreId(storeId);
+                example.setWebSite(webSite);
                 example.setOrderBy(orderBy);
                 list = storeHourModel.getStoreHourList(example, pager);
                 break;
@@ -297,6 +298,7 @@ public class StatsModelUtil {
                 weekExample.setStatsTimeAfter(startTime);
                 weekExample.setStatsTimeBefore(endTime);
                 weekExample.setStoreId(storeId);
+                weekExample.setWebSite(webSite);
                 weekExample.setOrderBy(orderBy);
                 list = storeWeekModel.getStoreWeekList(weekExample, pager);
                 break;
@@ -305,6 +307,7 @@ public class StatsModelUtil {
                 monthExample.setStatsTimeAfter(startTime);
                 monthExample.setStatsTimeBefore(endTime);
                 monthExample.setStoreId(storeId);
+                monthExample.setWebSite(webSite);
                 monthExample.setOrderBy(orderBy);
                 list = storeMonthModel.getStoreMonthList(monthExample, pager);
                 break;
@@ -313,6 +316,7 @@ public class StatsModelUtil {
                 yearExample.setStatsTimeAfter(startTime);
                 yearExample.setStatsTimeBefore(endTime);
                 yearExample.setStoreId(storeId);
+                yearExample.setWebSite(webSite);
                 yearExample.setOrderBy(orderBy);
                 list = storeYearModel.getStoreYearList(yearExample, pager);
                 break;
@@ -321,6 +325,7 @@ public class StatsModelUtil {
                 dayExample.setStatsTimeAfter(startTime);
                 dayExample.setStatsTimeBefore(endTime);
                 dayExample.setStoreId(storeId);
+                dayExample.setWebSite(webSite);
                 if (sortType.equals("sale")) {
                     if (!StringUtil.isNullOrZero(sort) && sort == 2) {
                         dayExample.setOrderBy("orderPayNum DESC");
@@ -352,7 +357,7 @@ public class StatsModelUtil {
      * @param endTime
      * @return
      */
-    public List<MovableGoodsVO> getStoreTrendList(StatsTimeType timeType, Date startTime, Date endTime, Long storeId) {
+    public List<MovableGoodsVO> getStoreTrendList(StatsTimeType timeType, Date startTime, Date endTime,String webSite, Long storeId) {
         List<MovableGoodsVO> list = new ArrayList<>();
         switch (timeType) {
             case HOUR:
@@ -360,6 +365,7 @@ public class StatsModelUtil {
                 example.setStatsTimeAfter(startTime);
                 example.setStatsTimeBefore(endTime);
                 example.setStoreId(storeId);
+                example.setWebSite(webSite);
                 list = storeHourModel.getStoreTrendList(example);
                 break;
             case DAY:
@@ -369,6 +375,7 @@ public class StatsModelUtil {
                 dayExample.setStatsTimeAfter(startTime);
                 dayExample.setStatsTimeBefore(endTime);
                 dayExample.setStoreId(storeId);
+                dayExample.setWebSite(webSite);
                 list = storeDayModel.getStoreTrendList(dayExample);
                 break;
             case YEAR:
@@ -376,6 +383,7 @@ public class StatsModelUtil {
                 monthExample.setStatsTimeAfter(startTime);
                 monthExample.setStatsTimeBefore(endTime);
                 monthExample.setStoreId(storeId);
+                monthExample.setWebSite(webSite);
                 list = storeMonthModel.getStoreTrendList(monthExample);
                 break;
         }
@@ -390,7 +398,7 @@ public class StatsModelUtil {
      * @param endTime
      * @return
      */
-    public List<? extends GoodsBase> getGoodsList(StatsTimeType timeType, Date startTime, Date endTime, Integer sort,
+    public List<? extends GoodsBase> getGoodsList(StatsTimeType timeType, Date startTime, Date endTime,String webSite, Integer sort,
                                                   String sortType, Long storeId) {
         //默认查询前十条数据
         PagerInfo pager = new PagerInfo(10, 1);
@@ -430,6 +438,7 @@ public class StatsModelUtil {
                 example.setStatsTimeAfter(startTime);
                 example.setStatsTimeBefore(endTime);
                 example.setStoreId(storeId);
+                example.setWebSite(webSite);
                 example.setOrderBy(orderBy);
                 list = goodsHourModel.getGoodsHourList(example, pager);
                 break;
@@ -438,6 +447,7 @@ public class StatsModelUtil {
                 weekExample.setStatsTimeAfter(startTime);
                 weekExample.setStatsTimeBefore(endTime);
                 weekExample.setStoreId(storeId);
+                weekExample.setWebSite(webSite);
                 weekExample.setOrderBy(orderBy);
                 list = goodsWeekModel.getGoodsWeekList(weekExample, pager);
                 break;
@@ -446,6 +456,7 @@ public class StatsModelUtil {
                 monthExample.setStatsTimeAfter(startTime);
                 monthExample.setStatsTimeBefore(endTime);
                 monthExample.setStoreId(storeId);
+                monthExample.setWebSite(webSite);
                 monthExample.setOrderBy(orderBy);
                 list = goodsMonthModel.getGoodsMonthList(monthExample, pager);
                 break;
@@ -455,6 +466,7 @@ public class StatsModelUtil {
                 yearExample.setStatsTimeBefore(endTime);
                 yearExample.setStoreId(storeId);
                 yearExample.setOrderBy(orderBy);
+                yearExample.setWebSite(webSite);
                 list = goodsYearModel.getGoodsYearList(yearExample, pager);
                 break;
             case DAY:
@@ -462,6 +474,7 @@ public class StatsModelUtil {
                 dayExample.setStatsTimeAfter(startTime);
                 dayExample.setStatsTimeBefore(endTime);
                 dayExample.setStoreId(storeId);
+                dayExample.setWebSite(webSite);
                 if (sortType.equals("sale")) {
                     if (!StringUtil.isNullOrZero(sort) && sort == 2) {
                         dayExample.setOrderBy("saleNum DESC");

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

@@ -31,6 +31,9 @@ public class GoodsVO {
     @ApiModelProperty("商品名称")
     private String goodsName;
 
+    @ApiModelProperty("商品中文名称")
+    private String goodsNameCn;
+
     @ApiModelProperty("商品副标题")
     private String goodsBrief;
 
@@ -121,6 +124,7 @@ public class GoodsVO {
         this.goodsId = goods.getGoodsId();
         this.webSite = goods.getWebSite();
         this.goodsName = goods.getGoodsName();
+        this.goodsNameCn = goods.getGoodsNameCn();
         this.goodsBrief = goods.getGoodsBrief();
         this.categoryPath = goods.getCategoryPath();
         this.marketPrice = goods.getMarketPrice();

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

@@ -18,6 +18,7 @@ public class ProductVO {
         this.productId = product.getProductId();
         this.goodsId = product.getGoodsId();
         this.goodsName = product.getGoodsName();
+        this.goodsNameCn = product.getGoodsNameCn();
         this.specValueIds = product.getSpecValueIds();
         this.specValues = StringUtils.isEmpty(product.getSpecValues()) ? "默认" : product.getSpecValues();
         this.productPrice = product.getProductPrice();
@@ -43,6 +44,9 @@ public class ProductVO {
     @ApiModelProperty("商品名称为3到50个字符(商品副标题)")
     private String goodsName;
 
+    @ApiModelProperty("商品中文名称")
+    private String goodsNameCn;
+
     @ApiModelProperty("规格值，用逗号分隔")
     private String specValues;
 

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

@@ -35,6 +35,8 @@ public class SellerGoodsDetailVO implements Serializable {
     private String webSite;
     @ApiModelProperty("商品名称为3到50个字符(商品副标题)")
     private String goodsName;
+    @ApiModelProperty("商品中文名称")
+    private String goodsNameCn;
     @ApiModelProperty("商品副标题，长度建议140个字符内")
     private String goodsBrief;
     @ApiModelProperty("品牌ID")
@@ -178,6 +180,7 @@ public class SellerGoodsDetailVO implements Serializable {
         //基本信息
         this.webSite = goods.getWebSite();
         this.goodsName = goods.getGoodsName();
+        this.goodsNameCn = goods.getGoodsNameCn();
         this.goodsBrief = goods.getGoodsBrief();
         this.brandId = goods.getBrandId();
         this.brandName = goods.getBrandName();

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

@@ -37,6 +37,9 @@ public class SellerPresentIndexVO {
         @ApiModelProperty("违规商品数")
         private Integer sysLowerGoodsNum;
 
+        @ApiModelProperty("站点违规商品数")
+        private Integer sysWebSiteLowerGoodsNum;
+
         @ApiModelProperty("待确认结算单数")
         private Integer confirmBillNum;
 
@@ -51,6 +54,9 @@ public class SellerPresentIndexVO {
 
         @ApiModelProperty("待分配询盘数")
         private Integer enquiryToBeAssignNum;
+
+        @ApiModelProperty("站点待分配询盘数")
+        private Integer webSiteEnquiryToBeAssignNum;
     }
 
 }

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

@@ -5,6 +5,7 @@
     <id column="goods_id" property="goodsId" />
     <result column="web_site" property="webSite" />
     <result column="goods_name" property="goodsName" />
+    <result column="goods_name_cn" property="goodsNameCn" />
     <result column="goods_brief" property="goodsBrief" />
     <result column="keyword" property="keyword" />
     <result column="brand_id" property="brandId" />
@@ -78,6 +79,12 @@
         <if test="example.goodsNameLike != null">
           AND `goods_name` like concat('%',#{example.goodsNameLike},'%')
         </if>
+        <if test="example.goodsNameCn != null">
+          AND `goods_name_cn` = #{example.goodsNameCn}
+        </if>
+        <if test="example.goodsNameCnLike != null">
+          AND `goods_name_cn` like concat('%',#{example.goodsNameCnLike},'%')
+        </if>
         <if test="example.goodsBrief != null">
           AND `goods_brief` = #{example.goodsBrief}
         </if>

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

@@ -6,6 +6,7 @@
     <result column="web_site" property="webSite" />
     <result column="goods_id" property="goodsId" />
     <result column="goods_name" property="goodsName" />
+    <result column="goods_name_cn" property="goodsNameCn" />
     <result column="spec_values" property="specValues" />
     <result column="spec_value_ids" property="specValueIds" />
     <result column="brand_id" property="brandId" />
@@ -59,6 +60,12 @@
         <if test="example.goodsNameLike != null">
           AND `goods_name` like concat('%',#{example.goodsNameLike},'%')
         </if>
+        <if test="example.goodsNameCn != null">
+          AND `goods_name_cn` = #{example.goodsNameCn}
+        </if>
+        <if test="example.goodsNameCnLike != null">
+          AND `goods_name_cn` like concat('%',#{example.goodsNameCnLike},'%')
+        </if>
         <if test="example.specValues != null">
           AND `spec_values` = #{example.specValues}
         </if>

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

@@ -297,6 +297,7 @@
             t1.`status` != 'DELETE' AND ( t1.`item_type` = 'SHOP' OR t1.`item_type` = 'GOODS' )
             and t1.create_time >= #{startTime} and #{endTime} > t1.create_time
             AND t1.`store_id` = #{storeId}
+            AND t1.`web_site` = #{webSite}
         GROUP BY
             date_format( t1.create_time, '%Y-%m-%d' )
         ORDER BY enquiry_day
@@ -312,6 +313,7 @@
         WHERE
             t1.`status` != 'DELETE' AND ( t1.`item_type` = 'SHOP' OR t1.`item_type` = 'GOODS' )
             and t1.create_time >= #{startTime} and #{endTime} > t1.create_time
+            AND t1.`web_site` = #{webSite}
             AND t1.`store_id` = #{storeId}
         GROUP BY
             date_format( t1.create_time, '%H:00' )

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.BrandDay">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="brand_id" property="brandId" />
     <result column="brand_name" property="brandName" />
     <result column="order_submit_num" property="orderSubmitNum" />
@@ -35,6 +36,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.brandId != null">
           AND `brand_id` = #{example.brandId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.BrandHour">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="brand_id" property="brandId" />
     <result column="brand_name" property="brandName" />
     <result column="order_submit_num" property="orderSubmitNum" />
@@ -35,6 +36,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.brandId != null">
           AND `brand_id` = #{example.brandId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.BrandMonth">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="brand_id" property="brandId" />
     <result column="brand_name" property="brandName" />
     <result column="order_submit_num" property="orderSubmitNum" />
@@ -35,6 +36,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.brandId != null">
           AND `brand_id` = #{example.brandId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.BrandWeek">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="brand_id" property="brandId" />
     <result column="brand_name" property="brandName" />
     <result column="order_submit_num" property="orderSubmitNum" />
@@ -35,6 +36,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.brandId != null">
           AND `brand_id` = #{example.brandId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.BrandYear">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="brand_id" property="brandId" />
     <result column="brand_name" property="brandName" />
     <result column="order_submit_num" property="orderSubmitNum" />
@@ -35,6 +36,9 @@
         <if test="example.statsTimeBefore != null">
           AND `stats_time` <![CDATA[ <= ]]> #{example.statsTimeBefore}
         </if>
+        <if test="example.webSite != null">
+          AND `sweb_site` = #{example.webSite}
+        </if>
         <if test="example.brandId != null">
           AND `brand_id` = #{example.brandId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.CategoryDay">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="category_id" property="categoryId" />
     <result column="category_name" property="categoryName" />
     <result column="order_submit_num" property="orderSubmitNum" />
@@ -35,6 +36,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.categoryId != null">
           AND `category_id` = #{example.categoryId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.CategoryHour">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="category_id" property="categoryId" />
     <result column="category_name" property="categoryName" />
     <result column="order_submit_num" property="orderSubmitNum" />
@@ -35,6 +36,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.categoryId != null">
           AND `category_id` = #{example.categoryId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.CategoryMonth">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="category_id" property="categoryId" />
     <result column="category_name" property="categoryName" />
     <result column="order_submit_num" property="orderSubmitNum" />
@@ -35,6 +36,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.categoryId != null">
           AND `category_id` = #{example.categoryId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.CategoryWeek">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="category_id" property="categoryId" />
     <result column="category_name" property="categoryName" />
     <result column="order_submit_num" property="orderSubmitNum" />
@@ -35,6 +36,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.categoryId != null">
           AND `category_id` = #{example.categoryId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.CategoryYear">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="category_id" property="categoryId" />
     <result column="category_name" property="categoryName" />
     <result column="order_submit_num" property="orderSubmitNum" />
@@ -35,6 +36,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.categoryId != null">
           AND `category_id` = #{example.categoryId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.GoodsDay">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="goods_id" property="goodsId" />
     <result column="goods_name" property="goodsName" />
     <result column="goods_image" property="goodsImage" />
@@ -48,6 +49,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.goodsId != null">
           AND `goods_id` = #{example.goodsId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.GoodsHour">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="goods_id" property="goodsId" />
     <result column="goods_name" property="goodsName" />
     <result column="goods_image" property="goodsImage" />
@@ -48,6 +49,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.goodsId != null">
           AND `goods_id` = #{example.goodsId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.GoodsMonth">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="goods_id" property="goodsId" />
     <result column="goods_name" property="goodsName" />
     <result column="goods_image" property="goodsImage" />
@@ -48,6 +49,12 @@
         <if test="example.statsTimeBefore != null">
           AND `stats_time` <![CDATA[ <= ]]> #{example.statsTimeBefore}
         </if>
+        <if test="example.goodsName != null">
+          AND `goods_name` = #{example.goodsName}
+        </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.goodsId != null">
           AND `goods_id` = #{example.goodsId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.GoodsWeek">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="goods_id" property="goodsId" />
     <result column="goods_name" property="goodsName" />
     <result column="goods_image" property="goodsImage" />
@@ -48,6 +49,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.goodsId != null">
           AND `goods_id` = #{example.goodsId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.GoodsYear">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="goods_id" property="goodsId" />
     <result column="goods_name" property="goodsName" />
     <result column="goods_image" property="goodsImage" />
@@ -48,6 +49,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.goodsId != null">
           AND `goods_id` = #{example.goodsId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.MemberDay">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="member_id" property="memberId" />
     <result column="member_name" property="memberName" />
     <result column="register_time" property="registerTime" />
@@ -35,6 +36,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.memberId != null">
           AND `member_id` = #{example.memberId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.MemberHour">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="member_id" property="memberId" />
     <result column="member_name" property="memberName" />
     <result column="register_time" property="registerTime" />
@@ -35,6 +36,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.memberId != null">
           AND `member_id` = #{example.memberId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.MemberMonth">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="member_id" property="memberId" />
     <result column="member_name" property="memberName" />
     <result column="register_time" property="registerTime" />
@@ -35,6 +36,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.memberId != null">
           AND `member_id` = #{example.memberId}
         </if>

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

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.read.statistics.MemberStoreDayReadMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.MemberStoreDay">
     <id column="stats_id" property="statsId" />
+    <result column="web_site" property="webSite" />
     <result column="stats_time" property="statsTime" />
     <result column="member_id" property="memberId" />
     <result column="member_name" property="memberName" />
@@ -35,6 +36,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.memberId != null">
           AND `member_id` = #{example.memberId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.MemberStoreHour">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="member_id" property="memberId" />
     <result column="member_name" property="memberName" />
     <result column="store_id" property="storeId" />
@@ -35,6 +36,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.memberId != null">
           AND `member_id` = #{example.memberId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.MemberStoreMonth">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="member_id" property="memberId" />
     <result column="member_name" property="memberName" />
     <result column="store_id" property="storeId" />
@@ -35,6 +36,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.memberId != null">
           AND `member_id` = #{example.memberId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.MemberStoreWeek">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="member_id" property="memberId" />
     <result column="member_name" property="memberName" />
     <result column="store_id" property="storeId" />
@@ -35,6 +36,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.memberId != null">
           AND `member_id` = #{example.memberId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.MemberStoreYear">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="member_id" property="memberId" />
     <result column="member_name" property="memberName" />
     <result column="store_id" property="storeId" />
@@ -35,6 +36,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.memberId != null">
           AND `member_id` = #{example.memberId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.MemberWeek">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="member_id" property="memberId" />
     <result column="member_name" property="memberName" />
     <result column="register_time" property="registerTime" />
@@ -35,6 +36,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.memberId != null">
           AND `member_id` = #{example.memberId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.MemberYear">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="member_id" property="memberId" />
     <result column="member_name" property="memberName" />
     <result column="register_time" property="registerTime" />
@@ -35,6 +36,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.memberId != null">
           AND `member_id` = #{example.memberId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.StoreDay">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="store_id" property="storeId" />
     <result column="store_name" property="storeName" />
     <result column="visitor_num" property="visitorNum" />
@@ -51,6 +52,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.storeId != null">
           AND `store_id` = #{example.storeId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.StoreHour">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="store_id" property="storeId" />
     <result column="store_name" property="storeName" />
     <result column="visitor_num" property="visitorNum" />
@@ -51,6 +52,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.storeId != null">
           AND `store_id` = #{example.storeId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.StoreMonth">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="store_id" property="storeId" />
     <result column="store_name" property="storeName" />
     <result column="visitor_num" property="visitorNum" />
@@ -51,6 +52,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.storeId != null">
           AND `store_id` = #{example.storeId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.StoreWeek">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="store_id" property="storeId" />
     <result column="store_name" property="storeName" />
     <result column="visitor_num" property="visitorNum" />
@@ -51,6 +52,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.storeId != null">
           AND `store_id` = #{example.storeId}
         </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.StoreYear">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="store_id" property="storeId" />
     <result column="store_name" property="storeName" />
     <result column="visitor_num" property="visitorNum" />
@@ -51,6 +52,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.storeId != null">
           AND `store_id` = #{example.storeId}
         </if>

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

@@ -5,6 +5,7 @@
     <id column="goods_id" property="goodsId" />
     <result column="web_site" property="webSite" />
     <result column="goods_name" property="goodsName" />
+    <result column="goods_name_cn" property="goodsNameCn" />
     <result column="goods_brief" property="goodsBrief" />
     <result column="keyword" property="keyword" />
     <result column="brand_id" property="brandId" />
@@ -61,6 +62,9 @@
       <if test="goodsName != null">
         `goods_name`,
       </if>
+      <if test="goodsNameCn != null">
+        `goods_name_cn`,
+      </if>
       <if test="goodsBrief != null">
         `goods_brief`,
       </if>
@@ -215,6 +219,12 @@
         <if test="example.goodsNameLike != null">
           AND `goods_name` like concat('%',#{example.goodsNameLike},'%')
         </if>
+        <if test="example.goodsNameCn != null">
+          AND `goods_name_cn` = #{example.goodsNameCn}
+        </if>
+        <if test="example.goodsNameCnLike != null">
+          AND `goods_name_cn` like concat('%',#{example.goodsNameCnLike},'%')
+        </if>
         <if test="example.goodsBrief != null">
           AND `goods_brief` = #{example.goodsBrief}
         </if>
@@ -505,6 +515,9 @@
       <if test="goodsName != null">
         #{goodsName},
       </if>
+      <if test="goodsNameCn != null">
+        #{goodsNameCn}
+      </if>
       <if test="goodsBrief != null">
         #{goodsBrief},
       </if>
@@ -647,6 +660,9 @@
       <if test="record.goodsName != null">
         `goods_name` = #{record.goodsName},
       </if>
+      <if test="record.goodsNameCn != null">
+        `goods_name_cn` = #{record.goodsNameCn},
+      </if>
       <if test="record.goodsBrief != null">
         `goods_brief` = #{record.goodsBrief},
       </if>
@@ -789,6 +805,9 @@
       <if test="goodsName != null">
         `goods_name` = #{goodsName},
       </if>
+      <if test="goodsNameCn != null">
+        `goods_name_cn` = #{goodsNameCn},
+      </if>
       <if test="goodsBrief != null">
         `goods_brief` = #{goodsBrief},
       </if>

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

@@ -6,6 +6,7 @@
     <result column="web_site" property="webSite" />
     <result column="goods_id" property="goodsId" />
     <result column="goods_name" property="goodsName" />
+    <result column="goods_name_cn" property="goodsNameCn" />
     <result column="spec_values" property="specValues" />
     <result column="spec_value_ids" property="specValueIds" />
     <result column="brand_id" property="brandId" />
@@ -48,6 +49,9 @@
       <if test="goodsName != null">
         `goods_name`,
       </if>
+      <if test="goodsNameCn != null">
+        `goods_name_cn`,
+      </if>
       <if test="specValues != null">
         `spec_values`,
       </if>
@@ -154,6 +158,12 @@
         <if test="example.goodsNameLike != null">
           AND `goods_name` like concat('%',#{example.goodsNameLike},'%')
         </if>
+        <if test="example.goodsNameCn != null">
+          AND `goods_name_cn` = #{example.goodsNameCn}
+        </if>
+        <if test="example.goodsNameCnLike != null">
+          AND `goods_name_cn` like concat('%',#{example.goodsNameCnLike},'%')
+        </if>
         <if test="example.specValues != null">
           AND `spec_values` = #{example.specValues}
         </if>
@@ -393,6 +403,9 @@
       <if test="goodsName != null">
         #{goodsName},
       </if>
+      <if test="goodsNameCn != null">
+        #{goodsNameCn},
+      </if>
       <if test="specValues != null">
         #{specValues},
       </if>
@@ -487,6 +500,9 @@
       <if test="record.goodsName != null">
         `goods_name` = #{record.goodsName},
       </if>
+      <if test="record.goodsNameCn != null">
+        `goods_name_cn` = #{record.goodsNameCn},
+      </if>
       <if test="record.specValues != null">
         `spec_values` = #{record.specValues},
       </if>
@@ -581,6 +597,9 @@
       <if test="goodsName != null">
         `goods_name` = #{goodsName},
       </if>
+      <if test="goodsNameCn != null">
+        `goods_name_cn` = #{goodsNameCn},
+      </if>
       <if test="specValues != null">
         `spec_values` = #{specValues},
       </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.BrandDay">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="brand_id" property="brandId" />
     <result column="brand_name" property="brandName" />
     <result column="order_submit_num" property="orderSubmitNum" />
@@ -21,6 +22,9 @@
       <if test="statsTime != null">
         `stats_time`,
       </if>
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="brandId != null">
         `brand_id`,
       </if>
@@ -73,6 +77,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.brandId != null">
           AND `brand_id` = #{example.brandId}
         </if>
@@ -234,6 +241,9 @@
       <if test="statsTime != null">
         #{statsTime},
       </if>
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="brandId != null">
         #{brandId},
       </if>
@@ -274,6 +284,9 @@
       <if test="record.statsTime != null">
         `stats_time` = #{record.statsTime},
       </if>
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.brandId != null">
         `brand_id` = #{record.brandId},
       </if>
@@ -314,6 +327,9 @@
       <if test="statsTime != null">
         `stats_time` = #{statsTime},
       </if>
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="brandId != null">
         `brand_id` = #{brandId},
       </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.BrandHour">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="brand_id" property="brandId" />
     <result column="brand_name" property="brandName" />
     <result column="order_submit_num" property="orderSubmitNum" />
@@ -21,6 +22,9 @@
       <if test="statsTime != null">
         `stats_time`,
       </if>
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="brandId != null">
         `brand_id`,
       </if>
@@ -73,6 +77,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.brandId != null">
           AND `brand_id` = #{example.brandId}
         </if>
@@ -234,6 +241,9 @@
       <if test="statsTime != null">
         #{statsTime},
       </if>
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="brandId != null">
         #{brandId},
       </if>
@@ -274,6 +284,9 @@
       <if test="record.statsTime != null">
         `stats_time` = #{record.statsTime},
       </if>
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.brandId != null">
         `brand_id` = #{record.brandId},
       </if>
@@ -314,6 +327,9 @@
       <if test="statsTime != null">
         `stats_time` = #{statsTime},
       </if>
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="brandId != null">
         `brand_id` = #{brandId},
       </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.BrandMonth">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="brand_id" property="brandId" />
     <result column="brand_name" property="brandName" />
     <result column="order_submit_num" property="orderSubmitNum" />
@@ -21,6 +22,9 @@
       <if test="statsTime != null">
         `stats_time`,
       </if>
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="brandId != null">
         `brand_id`,
       </if>
@@ -73,6 +77,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.brandId != null">
           AND `brand_id` = #{example.brandId}
         </if>
@@ -234,6 +241,9 @@
       <if test="statsTime != null">
         #{statsTime},
       </if>
+       <if test="webSite != null">
+        #{webSite}
+      </if>
       <if test="brandId != null">
         #{brandId},
       </if>
@@ -274,6 +284,9 @@
       <if test="record.statsTime != null">
         `stats_time` = #{record.statsTime},
       </if>
+      <if test="record.webSite!=null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.brandId != null">
         `brand_id` = #{record.brandId},
       </if>
@@ -314,6 +327,9 @@
       <if test="statsTime != null">
         `stats_time` = #{statsTime},
       </if>
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="brandId != null">
         `brand_id` = #{brandId},
       </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.BrandWeek">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="brand_id" property="brandId" />
     <result column="brand_name" property="brandName" />
     <result column="order_submit_num" property="orderSubmitNum" />
@@ -21,6 +22,9 @@
       <if test="statsTime != null">
         `stats_time`,
       </if>
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="brandId != null">
         `brand_id`,
       </if>
@@ -73,6 +77,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.brandId != null">
           AND `brand_id` = #{example.brandId}
         </if>
@@ -234,6 +241,9 @@
       <if test="statsTime != null">
         #{statsTime},
       </if>
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="brandId != null">
         #{brandId},
       </if>
@@ -274,6 +284,9 @@
       <if test="record.statsTime != null">
         `stats_time` = #{record.statsTime},
       </if>
+      <if test="record.webSite!=null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.brandId != null">
         `brand_id` = #{record.brandId},
       </if>
@@ -314,6 +327,9 @@
       <if test="statsTime != null">
         `stats_time` = #{statsTime},
       </if>
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="brandId != null">
         `brand_id` = #{brandId},
       </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.BrandYear">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="brand_id" property="brandId" />
     <result column="brand_name" property="brandName" />
     <result column="order_submit_num" property="orderSubmitNum" />
@@ -21,6 +22,9 @@
       <if test="statsTime != null">
         `stats_time`,
       </if>
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="brandId != null">
         `brand_id`,
       </if>
@@ -73,6 +77,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.brandId != null">
           AND `brand_id` = #{example.brandId}
         </if>
@@ -234,6 +241,9 @@
       <if test="statsTime != null">
         #{statsTime},
       </if>
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="brandId != null">
         #{brandId},
       </if>
@@ -274,6 +284,9 @@
       <if test="record.statsTime != null">
         `stats_time` = #{record.statsTime},
       </if>
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.brandId != null">
         `brand_id` = #{record.brandId},
       </if>
@@ -314,6 +327,9 @@
       <if test="statsTime != null">
         `stats_time` = #{statsTime},
       </if>
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="brandId != null">
         `brand_id` = #{brandId},
       </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.CategoryDay">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="category_id" property="categoryId" />
     <result column="category_name" property="categoryName" />
     <result column="order_submit_num" property="orderSubmitNum" />
@@ -21,6 +22,9 @@
       <if test="statsTime != null">
         `stats_time`,
       </if>
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="categoryId != null">
         `category_id`,
       </if>
@@ -73,6 +77,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.categoryId != null">
           AND `category_id` = #{example.categoryId}
         </if>
@@ -234,6 +241,9 @@
       <if test="statsTime != null">
         #{statsTime},
       </if>
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="categoryId != null">
         #{categoryId},
       </if>
@@ -274,6 +284,9 @@
       <if test="record.statsTime != null">
         `stats_time` = #{record.statsTime},
       </if>
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.categoryId != null">
         `category_id` = #{record.categoryId},
       </if>
@@ -314,6 +327,9 @@
       <if test="statsTime != null">
         `stats_time` = #{statsTime},
       </if>
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="categoryId != null">
         `category_id` = #{categoryId},
       </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.CategoryHour">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="category_id" property="categoryId" />
     <result column="category_name" property="categoryName" />
     <result column="order_submit_num" property="orderSubmitNum" />
@@ -21,6 +22,9 @@
       <if test="statsTime != null">
         `stats_time`,
       </if>
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="categoryId != null">
         `category_id`,
       </if>
@@ -73,6 +77,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.categoryId != null">
           AND `category_id` = #{example.categoryId}
         </if>
@@ -234,6 +241,9 @@
       <if test="statsTime != null">
         #{statsTime},
       </if>
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="categoryId != null">
         #{categoryId},
       </if>
@@ -274,6 +284,9 @@
       <if test="record.statsTime != null">
         `stats_time` = #{record.statsTime},
       </if>
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.categoryId != null">
         `category_id` = #{record.categoryId},
       </if>
@@ -314,6 +327,9 @@
       <if test="statsTime != null">
         `stats_time` = #{statsTime},
       </if>
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="categoryId != null">
         `category_id` = #{categoryId},
       </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.CategoryMonth">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="category_id" property="categoryId" />
     <result column="category_name" property="categoryName" />
     <result column="order_submit_num" property="orderSubmitNum" />
@@ -21,6 +22,9 @@
       <if test="statsTime != null">
         `stats_time`,
       </if>
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="categoryId != null">
         `category_id`,
       </if>
@@ -73,6 +77,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.categoryId != null">
           AND `category_id` = #{example.categoryId}
         </if>
@@ -234,6 +241,9 @@
       <if test="statsTime != null">
         #{statsTime},
       </if>
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="categoryId != null">
         #{categoryId},
       </if>
@@ -274,6 +284,9 @@
       <if test="record.statsTime != null">
         `stats_time` = #{record.statsTime},
       </if>
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.categoryId != null">
         `category_id` = #{record.categoryId},
       </if>
@@ -314,6 +327,9 @@
       <if test="statsTime != null">
         `stats_time` = #{statsTime},
       </if>
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="categoryId != null">
         `category_id` = #{categoryId},
       </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.CategoryWeek">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="category_id" property="categoryId" />
     <result column="category_name" property="categoryName" />
     <result column="order_submit_num" property="orderSubmitNum" />
@@ -21,6 +22,9 @@
       <if test="statsTime != null">
         `stats_time`,
       </if>
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="categoryId != null">
         `category_id`,
       </if>
@@ -73,6 +77,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.categoryId != null">
           AND `category_id` = #{example.categoryId}
         </if>
@@ -234,6 +241,9 @@
       <if test="statsTime != null">
         #{statsTime},
       </if>
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="categoryId != null">
         #{categoryId},
       </if>
@@ -274,6 +284,9 @@
       <if test="record.statsTime != null">
         `stats_time` = #{record.statsTime},
       </if>
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.categoryId != null">
         `category_id` = #{record.categoryId},
       </if>
@@ -314,6 +327,9 @@
       <if test="statsTime != null">
         `stats_time` = #{statsTime},
       </if>
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="categoryId != null">
         `category_id` = #{categoryId},
       </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.CategoryYear">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="category_id" property="categoryId" />
     <result column="category_name" property="categoryName" />
     <result column="order_submit_num" property="orderSubmitNum" />
@@ -21,6 +22,9 @@
       <if test="statsTime != null">
         `stats_time`,
       </if>
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="categoryId != null">
         `category_id`,
       </if>
@@ -73,6 +77,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.categoryId != null">
           AND `category_id` = #{example.categoryId}
         </if>
@@ -234,6 +241,9 @@
       <if test="statsTime != null">
         #{statsTime},
       </if>
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="categoryId != null">
         #{categoryId},
       </if>
@@ -274,6 +284,9 @@
       <if test="record.statsTime != null">
         `stats_time` = #{record.statsTime},
       </if>
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.categoryId != null">
         `category_id` = #{record.categoryId},
       </if>
@@ -314,6 +327,9 @@
       <if test="statsTime != null">
         `stats_time` = #{statsTime},
       </if>
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="categoryId != null">
         `category_id` = #{categoryId},
       </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.GoodsDay">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="goods_id" property="goodsId" />
     <result column="goods_name" property="goodsName" />
     <result column="goods_image" property="goodsImage" />
@@ -34,6 +35,9 @@
       <if test="statsTime != null">
         `stats_time`,
       </if>
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="goodsId != null">
         `goods_id`,
       </if>
@@ -125,6 +129,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.goodsId != null">
           AND `goods_id` = #{example.goodsId}
         </if>
@@ -334,6 +341,9 @@
       <if test="statsTime != null">
         #{statsTime},
       </if>
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="goodsId != null">
         #{goodsId},
       </if>
@@ -413,6 +423,9 @@
       <if test="record.statsTime != null">
         `stats_time` = #{record.statsTime},
       </if>
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},`
+      </if>
       <if test="record.goodsId != null">
         `goods_id` = #{record.goodsId},
       </if>
@@ -492,6 +505,9 @@
       <if test="statsTime != null">
         `stats_time` = #{statsTime},
       </if>
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="goodsId != null">
         `goods_id` = #{goodsId},
       </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.GoodsHour">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="goods_id" property="goodsId" />
     <result column="goods_name" property="goodsName" />
     <result column="goods_image" property="goodsImage" />
@@ -34,6 +35,9 @@
       <if test="statsTime != null">
         `stats_time`,
       </if>
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="goodsId != null">
         `goods_id`,
       </if>
@@ -125,6 +129,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.goodsId != null">
           AND `goods_id` = #{example.goodsId}
         </if>
@@ -334,6 +341,9 @@
       <if test="statsTime != null">
         #{statsTime},
       </if>
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="goodsId != null">
         #{goodsId},
       </if>
@@ -413,6 +423,9 @@
       <if test="record.statsTime != null">
         `stats_time` = #{record.statsTime},
       </if>
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.goodsId != null">
         `goods_id` = #{record.goodsId},
       </if>
@@ -492,6 +505,9 @@
       <if test="statsTime != null">
         `stats_time` = #{statsTime},
       </if>
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="goodsId != null">
         `goods_id` = #{goodsId},
       </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.GoodsMonth">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="goods_id" property="goodsId" />
     <result column="goods_name" property="goodsName" />
     <result column="goods_image" property="goodsImage" />
@@ -34,6 +35,9 @@
       <if test="statsTime != null">
         `stats_time`,
       </if>
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="goodsId != null">
         `goods_id`,
       </if>
@@ -125,6 +129,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.goodsId != null">
           AND `goods_id` = #{example.goodsId}
         </if>
@@ -334,6 +341,9 @@
       <if test="statsTime != null">
         #{statsTime},
       </if>
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="goodsId != null">
         #{goodsId},
       </if>
@@ -413,6 +423,9 @@
       <if test="record.statsTime != null">
         `stats_time` = #{record.statsTime},
       </if>
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.goodsId != null">
         `goods_id` = #{record.goodsId},
       </if>
@@ -492,6 +505,9 @@
       <if test="statsTime != null">
         `stats_time` = #{statsTime},
       </if>
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="goodsId != null">
         `goods_id` = #{goodsId},
       </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.GoodsWeek">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="goods_id" property="goodsId" />
     <result column="goods_name" property="goodsName" />
     <result column="goods_image" property="goodsImage" />
@@ -34,6 +35,9 @@
       <if test="statsTime != null">
         `stats_time`,
       </if>
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="goodsId != null">
         `goods_id`,
       </if>
@@ -125,6 +129,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.goodsId != null">
           AND `goods_id` = #{example.goodsId}
         </if>
@@ -334,6 +341,9 @@
       <if test="statsTime != null">
         #{statsTime},
       </if>
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="goodsId != null">
         #{goodsId},
       </if>
@@ -413,6 +423,9 @@
       <if test="record.statsTime != null">
         `stats_time` = #{record.statsTime},
       </if>
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.goodsId != null">
         `goods_id` = #{record.goodsId},
       </if>
@@ -492,6 +505,9 @@
       <if test="statsTime != null">
         `stats_time` = #{statsTime},
       </if>
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="goodsId != null">
         `goods_id` = #{goodsId},
       </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.GoodsYear">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="goods_id" property="goodsId" />
     <result column="goods_name" property="goodsName" />
     <result column="goods_image" property="goodsImage" />
@@ -34,6 +35,9 @@
       <if test="statsTime != null">
         `stats_time`,
       </if>
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="goodsId != null">
         `goods_id`,
       </if>
@@ -125,6 +129,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.goodsId != null">
           AND `goods_id` = #{example.goodsId}
         </if>
@@ -334,6 +341,9 @@
       <if test="statsTime != null">
         #{statsTime},
       </if>
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="goodsId != null">
         #{goodsId},
       </if>
@@ -413,6 +423,9 @@
       <if test="record.statsTime != null">
         `stats_time` = #{record.statsTime},
       </if>
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.goodsId != null">
         `goods_id` = #{record.goodsId},
       </if>
@@ -492,6 +505,9 @@
       <if test="statsTime != null">
         `stats_time` = #{statsTime},
       </if>
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="goodsId != null">
         `goods_id` = #{goodsId},
       </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.MemberDay">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="member_id" property="memberId" />
     <result column="member_name" property="memberName" />
     <result column="register_time" property="registerTime" />
@@ -21,6 +22,9 @@
       <if test="statsTime != null">
         `stats_time`,
       </if>
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="memberId != null">
         `member_id`,
       </if>
@@ -73,6 +77,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.memberId != null">
           AND `member_id` = #{example.memberId}
         </if>
@@ -237,6 +244,9 @@
       <if test="statsTime != null">
         #{statsTime},
       </if>
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="memberId != null">
         #{memberId},
       </if>
@@ -277,6 +287,9 @@
       <if test="record.statsTime != null">
         `stats_time` = #{record.statsTime},
       </if>
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.memberId != null">
         `member_id` = #{record.memberId},
       </if>
@@ -317,6 +330,9 @@
       <if test="statsTime != null">
         `stats_time` = #{statsTime},
       </if>
+      <if test="webSite !=null">
+        `web_site` = #{webSite},
+      </if>
       <if test="memberId != null">
         `member_id` = #{memberId},
       </if>

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

@@ -4,6 +4,7 @@
   <resultMap id="resultMap" type="com.slodon.b2b2c.statistics.pojo.MemberHour">
     <id column="stats_id" property="statsId" />
     <result column="stats_time" property="statsTime" />
+    <result column="web_site" property="webSite" />
     <result column="member_id" property="memberId" />
     <result column="member_name" property="memberName" />
     <result column="register_time" property="registerTime" />
@@ -21,6 +22,9 @@
       <if test="statsTime != null">
         `stats_time`,
       </if>
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="memberId != null">
         `member_id`,
       </if>
@@ -73,6 +77,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.memberId != null">
           AND `member_id` = #{example.memberId}
         </if>
@@ -237,6 +244,9 @@
       <if test="statsTime != null">
         #{statsTime},
       </if>
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="memberId != null">
         #{memberId},
       </if>
@@ -277,6 +287,9 @@
       <if test="record.statsTime != null">
         `stats_time` = #{record.statsTime},
       </if>
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.memberId != null">
         `member_id` = #{record.memberId},
       </if>
@@ -317,6 +330,9 @@
       <if test="statsTime != null">
         `stats_time` = #{statsTime},
       </if>
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="memberId != null">
         `member_id` = #{memberId},
       </if>