Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!748

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/SaleSiteMgrController.java

@@ -203,6 +203,10 @@ public class SaleSiteMgrController extends BaseApiController {
 			channelExcel.setName(channelVO.getName());
 			channelExcel.setParentsName(channelVO.getParentsName());
 			channelExcel.setCreatedTime(channelVO.getCreatedTime());
+			channelExcel.setOffLineSaleCnt(channelVO.getOffLineSaleCnt());
+			channelExcel.setOffLineQtyCnt(channelVO.getOffLineQtyCnt());
+			channelExcel.setOnLineSaleCnt(channelVO.getOnLineSaleCnt());
+			channelExcel.setUserCnt(channelVO.getUserCnt());
 			if (Objects.nonNull(channelVO.getCertifyStatus())) {
 				channelExcel.setCertifyStatus(channelVO.getCertifyStatus().getDesc());
 			}

mp-common/src/main/java/com/qs/mp/common/enums/SiteTypeEnum.java

@@ -13,10 +13,25 @@ import com.qs.mp.common.json.EnumValueDeserializer;
 @JSONType(deserializer = EnumValueDeserializer.class)
 public enum SiteTypeEnum implements IEnum<Integer> {
 
-  STREET_STORE(1, "临街门店"),
-  ENTERTAINMENT(2, "娱乐场所"),
-  CINEMA(3, "电影院"),
-  CHAIN_STORE(4, "品牌连锁店");
+  CONVENIENCE_STORE(1, "便利店/超市/烟酒店"),
+  FAST_FOOD(2,"快餐/正餐"),
+  TEA_HOUSE(3, "咖啡/茶馆/甜品/奶茶"),
+  KAT_BAR(5,"KTV/酒吧"),
+  MASSAGE(6, "按摩/足浴/洗浴"),
+  COSMETIC(7,"美容/美发"),
+  HOTEL(8,"酒店/民宿"),
+  CINEMA(9, "电影院"),
+  SPORT(10,"台球/运动/健身"),
+  BOARD_GAME(11,"棋牌室/剧本杀/密室/网咖"),
+  PARENT_CHILD(12,"亲子/母婴/教育"),
+  HOME_APPLIANCES(13,"家电/通信/电动车"),
+  SCENIC_SPOT(14,"景区"),
+  WECHAT_BUSINESS(15,"线上-微商"),
+  OFFLINE_PLATFORM(16,"线下-平台"),
+  OTHER(17,"其他"),
+  STREET_STORE(18, "临街门店"),
+  ENTERTAINMENT(19, "娱乐场所"),
+  CHAIN_STORE(20, "品牌连锁店");
 
   private final int value;
   private final String desc;

mp-service/src/main/java/com/qs/mp/admin/domain/excel/ChannelExcel.java

@@ -31,6 +31,15 @@ public class ChannelExcel {
     @Excel(name = "经销商佣金比例(%)")
     private BigDecimal commRate;
 
+    @Excel(name = "盲票库存")
+    long offLineQtyCnt;
+    @Excel(name = "线下销量")
+    long offLineSaleCnt;
+    @Excel(name = "线上销量")
+    long onLineSaleCnt;
+    @Excel(name = "用户数")
+    long userCnt;
+
     @Excel(name = "注册时间")
     private Date createdTime;