fix: 修复整体样式问题

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

@@ -81,6 +81,9 @@ public class StoreBase implements Serializable {
     @ApiModelProperty("新增商品数")
     private Integer newGoodsNum;
 
+    @ApiModelProperty("新增品牌数")
+    private Integer newBrandNum;
+
     @ApiModelProperty("被收藏商品数")
     private Integer collectionGoodsNum;
 

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/bo/StoreStatsBO.java

@@ -5,6 +5,7 @@ import com.slodon.b2b2c.business.pojo.OrderProduct;
 import com.slodon.b2b2c.business.pojo.OrderReturn;
 import com.slodon.b2b2c.core.util.StringUtil;
 import com.slodon.b2b2c.goods.pojo.Goods;
+import com.slodon.b2b2c.goods.pojo.GoodsBrand;
 import com.slodon.b2b2c.member.pojo.Member;
 import com.slodon.b2b2c.statistics.pojo.MemberBehavior;
 import com.slodon.b2b2c.statistics.pojo.base.StoreBase;
@@ -37,6 +38,8 @@ public class StoreStatsBO {
     private List<MemberBehavior> memberBehaviorList = new ArrayList<>();
     @ApiModelProperty("店铺新增商品列表")
     private List<Goods> storeNewGoodsList = new ArrayList<>();
+    @ApiModelProperty("店铺新增品牌列表")
+    private List<GoodsBrand> storeNewBrandList = new ArrayList<>();
     @ApiModelProperty("统计阶段内的新会员列表，用于统计店铺新增用户数，规则为：统计阶段内的新会员，访问了店铺，即定义为店铺的新增用户")
     private List<Member> newMemberList = new ArrayList<>();
 
@@ -68,6 +71,7 @@ public class StoreStatsBO {
         storeBase.setGoodsViewNum(0);
         storeBase.setViewGoodsNum(0);
         storeBase.setNewGoodsNum(storeNewGoodsList.size());
+        storeBase.setNewBrandNum(storeNewBrandList.size());
         storeBase.setCollectionGoodsNum(0);
         storeBase.setCollectionStoreNum(0);
         storeBase.setSalingGoodsNum(0);

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

@@ -600,7 +600,7 @@ public class AdminSettingController extends BaseController {
         //从请求头中获取语言类型
         String languageType = request.getHeader("Language");
 
-        String str = "main_site_logo,main_user_center_logo,main_user_logon_bg,main_user_register_bg,pc_home_bottom_adv,main_user_forget_password_bg," +
+        String str = "main_site_logo,main_user_center_logo,main_user_logon_bg,main_user_register_bg,main_user_forget_password_bg," +
                 "main_user_register_logo,main_seller_center_logo,vendor_login_left_bg,vendor_login_bg," +
                 "main_admin_top_logo,admin_login_left_bg,admin_login_bg";
 

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

@@ -10,13 +10,16 @@ import com.slodon.b2b2c.core.constant.GoodsConst;
 import com.slodon.b2b2c.core.constant.OrderConst;
 import com.slodon.b2b2c.core.util.FileUrlUtil;
 import com.slodon.b2b2c.enums.StatsConstant;
+import com.slodon.b2b2c.goods.example.GoodsBrandExample;
 import com.slodon.b2b2c.goods.example.GoodsExample;
 import com.slodon.b2b2c.goods.pojo.Goods;
+import com.slodon.b2b2c.goods.pojo.GoodsBrand;
 import com.slodon.b2b2c.member.example.MemberExample;
 import com.slodon.b2b2c.member.example.MemberFollowStoreExample;
 import com.slodon.b2b2c.member.pojo.Member;
 import com.slodon.b2b2c.model.business.OrderModel;
 import com.slodon.b2b2c.model.business.OrderProductModel;
+import com.slodon.b2b2c.model.goods.GoodsBrandModel;
 import com.slodon.b2b2c.model.goods.GoodsModel;
 import com.slodon.b2b2c.model.member.MemberFollowStoreModel;
 import com.slodon.b2b2c.model.member.MemberModel;
@@ -54,6 +57,8 @@ public class SellerPresentDataUtil {
     @Resource
     private GoodsModel goodsModel;
     @Resource
+    private GoodsBrandModel goodsBrandModel;
+    @Resource
     private MemberFollowStoreModel memberFollowStoreModel;
     @Resource
     private MongoTemplate mongoTemplate;
@@ -106,6 +111,16 @@ public class SellerPresentDataUtil {
         goodsExample.setCreateTimeBefore(endTime);
         goodsExample.setCreateTimeAfter(startTime);
         List<Goods> newGoodsList = goodsModel.getGoodsList(goodsExample, null);
+
+        //新增品牌数
+        GoodsBrandExample goodsBrandExample = new GoodsBrandExample();
+        goodsBrandExample.setApplyStoreId(storeId);
+        goodsBrandExample.setWebSite(webSite);
+        goodsBrandExample.setState(GoodsConst.BRAND_STATE_1);
+        goodsBrandExample.setCreateTimeBefore(endTime);
+        goodsBrandExample.setCreateTimeAfter(startTime);
+        List<GoodsBrand> newGoodsBrandList = goodsBrandModel.getGoodsBrandList(goodsBrandExample, null);
+
         //新增会员列表
         MemberExample memberExample = new MemberExample();
         memberExample.setRegisterTimeBefore(endTime);
@@ -118,6 +133,7 @@ public class SellerPresentDataUtil {
         storeStatsBO.setOrderProductList(orderProductList);
         storeStatsBO.setMemberBehaviorList(memberBehaviorList);
         storeStatsBO.setStoreNewGoodsList(newGoodsList);
+        storeStatsBO.setStoreNewBrandList(newGoodsBrandList);
         storeStatsBO.setNewMemberList(newMemberList);
 
         //今日实时

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

@@ -79,6 +79,7 @@ public class GoodsOverviewVO {
     public GoodsOverviewVO(StoreBase storeBase, StoreBase previousData) {
         this.movableGoodsNum = storeBase.getSalingGoodsNum();
         this.newGoodsNum = storeBase.getNewGoodsNum();
+        this.newBrandNum = storeBase.getNewBrandNum();
         this.orderPayAmount = storeBase.getOrderPayAmount();
         this.orderSubmitNum = storeBase.getOrderSubmitNum();
         if (previousData != null) {

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

@@ -21,6 +21,9 @@ public class MovableGoodsVO {
     @ApiModelProperty("新增商品数")
     private Integer newGoodsNum;
 
+    @ApiModelProperty("新增品牌数")
+    private Integer newBrandNum;
+
     @ApiModelProperty("动销商品数")
     private Integer movableGoodsNum;
 

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

@@ -24,6 +24,7 @@
     <result column="goods_view_num" property="goodsViewNum" />
     <result column="view_goods_num" property="viewGoodsNum" />
     <result column="new_goods_num" property="newGoodsNum" />
+    <result column="new_brand_num" property="newBrandNum" />
     <result column="collection_goods_num" property="collectionGoodsNum" />
     <result column="collection_store_num" property="collectionStoreNum" />
     <result column="saling_goods_num" property="salingGoodsNum" />
@@ -281,6 +282,7 @@
     sum( order_pay_member_num ) AS orderPayMemberNum,
     sum( saling_goods_num ) AS salingGoodsNum,
     sum( new_goods_num ) AS newGoodsNum,
+    sum( new_brand_num ) AS newBrandNum,
     sum( new_member_num ) AS newMemberNum,
     sum( return_num ) AS returnNum,
     sum( return_amount ) AS returnAmount
@@ -313,6 +315,7 @@
     sum( order_pay_member_num ) AS orderPayMemberNum,
     sum( saling_goods_num ) AS salingGoodsNum,
     sum( new_goods_num ) AS newGoodsNum,
+    sum( new_brand_num ) AS newBrandNum,
     sum( new_member_num ) AS newMemberNum
     FROM `stats_store_day`
     <include refid="whereCondition"/>
@@ -333,6 +336,7 @@
     SELECT
     date( stats_time ) AS statsTime,
     new_goods_num AS newGoodsNum,
+    new_brand_num AS newBrandNum,
     saling_goods_num AS movableGoodsNum,
     order_submit_num AS orderSubmitNum,
     order_submit_amount AS orderSubmitAmount,

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

@@ -24,6 +24,7 @@
     <result column="goods_view_num" property="goodsViewNum" />
     <result column="view_goods_num" property="viewGoodsNum" />
     <result column="new_goods_num" property="newGoodsNum" />
+    <result column="new_brand_num" property="newBrandNum" />
     <result column="collection_goods_num" property="collectionGoodsNum" />
     <result column="collection_store_num" property="collectionStoreNum" />
     <result column="saling_goods_num" property="salingGoodsNum" />
@@ -261,6 +262,7 @@
     SELECT
     DATE_FORMAT( stats_time, '%H:%i' ) AS statsTime,
     new_goods_num AS newGoodsNum,
+    new_brand_num AS newBrandNum,
     saling_goods_num AS movableGoodsNum,
     order_submit_num AS orderSubmitNum,
     order_submit_amount AS orderSubmitAmount,

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

@@ -24,6 +24,7 @@
     <result column="goods_view_num" property="goodsViewNum" />
     <result column="view_goods_num" property="viewGoodsNum" />
     <result column="new_goods_num" property="newGoodsNum" />
+    <result column="new_brand_num" property="newBrandNum" />
     <result column="collection_goods_num" property="collectionGoodsNum" />
     <result column="collection_store_num" property="collectionStoreNum" />
     <result column="saling_goods_num" property="salingGoodsNum" />
@@ -261,6 +262,7 @@
     SELECT
     LEFT( stats_time, 7 ) AS statsTime,
     new_goods_num AS newGoodsNum,
+    new_brand_num AS newBrandNum,
     saling_goods_num AS movableGoodsNum,
     order_submit_num AS orderSubmitNum,
     order_submit_amount AS orderSubmitAmount,

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

@@ -24,6 +24,7 @@
     <result column="goods_view_num" property="goodsViewNum" />
     <result column="view_goods_num" property="viewGoodsNum" />
     <result column="new_goods_num" property="newGoodsNum" />
+    <result column="new_brand_num" property="newBrandNum" />
     <result column="collection_goods_num" property="collectionGoodsNum" />
     <result column="collection_store_num" property="collectionStoreNum" />
     <result column="saling_goods_num" property="salingGoodsNum" />

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

@@ -24,6 +24,7 @@
     <result column="goods_view_num" property="goodsViewNum" />
     <result column="view_goods_num" property="viewGoodsNum" />
     <result column="new_goods_num" property="newGoodsNum" />
+    <result column="new_brand_num" property="newBrandNum" />
     <result column="collection_goods_num" property="collectionGoodsNum" />
     <result column="collection_store_num" property="collectionStoreNum" />
     <result column="saling_goods_num" property="salingGoodsNum" />

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

@@ -24,6 +24,7 @@
     <result column="goods_view_num" property="goodsViewNum" />
     <result column="view_goods_num" property="viewGoodsNum" />
     <result column="new_goods_num" property="newGoodsNum" />
+    <result column="new_brand_num" property="newBrandNum" />
     <result column="collection_goods_num" property="collectionGoodsNum" />
     <result column="collection_store_num" property="collectionStoreNum" />
     <result column="saling_goods_num" property="salingGoodsNum" />
@@ -98,6 +99,9 @@
       <if test="newGoodsNum != null">
         `new_goods_num`,
       </if>
+      <if test="newBrandNum != null">
+        `new_brand_num`,
+      </if>
       <if test="collectionGoodsNum != null">
         `collection_goods_num`,
       </if>
@@ -425,6 +429,9 @@
       <if test="newGoodsNum != null">
         #{newGoodsNum},
       </if>
+      <if test="newBrandNum != null">
+        #{newBrandNum},
+      </if>
       <if test="collectionGoodsNum != null">
         #{collectionGoodsNum},
       </if>

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

@@ -24,6 +24,7 @@
     <result column="goods_view_num" property="goodsViewNum" />
     <result column="view_goods_num" property="viewGoodsNum" />
     <result column="new_goods_num" property="newGoodsNum" />
+    <result column="new_brand_num" property="newBrandNum" />
     <result column="collection_goods_num" property="collectionGoodsNum" />
     <result column="collection_store_num" property="collectionStoreNum" />
     <result column="saling_goods_num" property="salingGoodsNum" />
@@ -98,6 +99,9 @@
       <if test="newGoodsNum != null">
         `new_goods_num`,
       </if>
+      <if test="newBrandNum != null">
+        `new_brand_num`,
+      </if>
       <if test="collectionGoodsNum != null">
         `collection_goods_num`,
       </if>
@@ -425,6 +429,9 @@
       <if test="newGoodsNum != null">
         #{newGoodsNum},
       </if>
+      <if test="newBrandNum != null">
+        #{newBrandNum},
+      </if>
       <if test="collectionGoodsNum != null">
         #{collectionGoodsNum},
       </if>

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

@@ -24,6 +24,7 @@
     <result column="goods_view_num" property="goodsViewNum" />
     <result column="view_goods_num" property="viewGoodsNum" />
     <result column="new_goods_num" property="newGoodsNum" />
+    <result column="new_brand_num" property="newBrandNum" />
     <result column="collection_goods_num" property="collectionGoodsNum" />
     <result column="collection_store_num" property="collectionStoreNum" />
     <result column="saling_goods_num" property="salingGoodsNum" />
@@ -98,6 +99,9 @@
       <if test="newGoodsNum != null">
         `new_goods_num`,
       </if>
+      <if test="newBrandNum != null">
+        `new_brand_num`,
+      </if>
       <if test="collectionGoodsNum != null">
         `collection_goods_num`,
       </if>
@@ -425,6 +429,9 @@
       <if test="newGoodsNum != null">
         #{newGoodsNum},
       </if>
+      <if test="newBrandNum != null">
+        #{newBrandNum},
+      </if>
       <if test="collectionGoodsNum != null">
         #{collectionGoodsNum},
       </if>

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

@@ -24,6 +24,7 @@
     <result column="goods_view_num" property="goodsViewNum" />
     <result column="view_goods_num" property="viewGoodsNum" />
     <result column="new_goods_num" property="newGoodsNum" />
+    <result column="new_brand_num" property="newBrandNum" />
     <result column="collection_goods_num" property="collectionGoodsNum" />
     <result column="collection_store_num" property="collectionStoreNum" />
     <result column="saling_goods_num" property="salingGoodsNum" />
@@ -98,6 +99,9 @@
       <if test="newGoodsNum != null">
         `new_goods_num`,
       </if>
+      <if test="newBrandNum != null">
+        `new_brand_num`,
+      </if>
       <if test="collectionGoodsNum != null">
         `collection_goods_num`,
       </if>
@@ -425,6 +429,9 @@
       <if test="newGoodsNum != null">
         #{newGoodsNum},
       </if>
+      <if test="newBrandNum != null">
+        #{newBrandNum},
+      </if>
       <if test="collectionGoodsNum != null">
         #{collectionGoodsNum},
       </if>

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

@@ -24,6 +24,7 @@
     <result column="goods_view_num" property="goodsViewNum" />
     <result column="view_goods_num" property="viewGoodsNum" />
     <result column="new_goods_num" property="newGoodsNum" />
+    <result column="new_brand_num" property="newBrandNum" />
     <result column="collection_goods_num" property="collectionGoodsNum" />
     <result column="collection_store_num" property="collectionStoreNum" />
     <result column="saling_goods_num" property="salingGoodsNum" />
@@ -98,6 +99,9 @@
       <if test="newGoodsNum != null">
         `new_goods_num`,
       </if>
+      <if test="newBrandNum != null">
+        `new_brand_num`,
+      </if>
       <if test="collectionGoodsNum != null">
         `collection_goods_num`,
       </if>
@@ -425,6 +429,9 @@
       <if test="newGoodsNum != null">
         #{newGoodsNum},
       </if>
+      <if test="newBrandNum != null">
+        #{newBrandNum},
+      </if>
       <if test="collectionGoodsNum != null">
         #{collectionGoodsNum},
       </if>

xinkeaboard-server/doc/DDL/update.sql

@@ -137,15 +137,19 @@ ALTER TABLE stats_member_store_year ADD COLUMN web_site TINYINT NOT NULL DEFAULT
 
 
 ALTER TABLE  stats_store_day ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户' AFTER stats_time;
+ALTER TABLE  stats_store_day ADD COLUMN new_brand_num INT NOT NULL DEFAULT 0 COMMENT '新增品牌数' AFTER new_goods_num;
 
 ALTER TABLE  stats_store_hour ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户' AFTER stats_time;
+ALTER TABLE  stats_store_hour ADD COLUMN new_brand_num INT NOT NULL DEFAULT 0 COMMENT '新增品牌数' AFTER new_goods_num;
 
 ALTER TABLE  stats_store_month ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户' AFTER stats_time;
+ALTER TABLE  stats_store_month ADD COLUMN new_brand_num INT NOT NULL DEFAULT 0 COMMENT '新增品牌数' AFTER new_goods_num;
 
 ALTER TABLE  stats_store_week ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户' AFTER stats_time;
+ALTER TABLE  stats_store_week ADD COLUMN new_brand_num INT NOT NULL DEFAULT 0 COMMENT '新增品牌数' AFTER new_goods_num;
 
 ALTER TABLE stats_store_year ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户' AFTER stats_time;
-
+ALTER TABLE  stats_store_year ADD COLUMN new_brand_num INT NOT NULL DEFAULT 0 COMMENT '新增品牌数' AFTER new_goods_num;
 
 ALTER TABLE  stats_platform_day ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户' AFTER stats_time;