no message

mall-server-api/src/main/java/com/gree/mall/manager/bean/count/CountBean.java

@@ -16,10 +16,23 @@ public class CountBean {
     private Integer sold = 0;
     @ApiModelProperty("待发货数量")
     private Integer dfh = 0;
+    @ApiModelProperty("待确认")
+    private Integer dqr = 0;
+    @ApiModelProperty("待拣货")
+    private Integer djh = 0;
+    @ApiModelProperty("拣货中")
+    private Integer jhz = 0;
+    @ApiModelProperty("待配送")
+    private Integer dps = 0;
+    @ApiModelProperty("配送待取")
+    private Integer psdq = 0;
+    @ApiModelProperty("配送中")
+    private Integer psz = 0;
+    @ApiModelProperty("待退款")
+    private Integer dtk = 0;
     @ApiModelProperty("维权订单数量")
     private Integer refund = 0;
-    @ApiModelProperty("待审核提现/结算金额")
-    private BigDecimal orderShareAmount;
+
     @ApiModelProperty("今日访客数量")
     private Integer todayVisit = 0;
     @ApiModelProperty("昨日访客")

mall-server-api/src/main/java/com/gree/mall/manager/logic/count/CountLogic.java

@@ -81,14 +81,8 @@ public class CountLogic {
         Integer todayVisit = countMapper.countVisit(sdf.format(DateUtils.getStartTime()),sdf.format(DateUtils.getEndTime()),adminUser.getCompanyWechatIds());
         //昨日访客
         Integer yestodayVisit = countMapper.countVisit(sdf.format(DateUtils.getBeginDayOfYesterday()),sdf.format(DateUtils.getEndDayOfYesterDay()),adminUser.getCompanyWechatIds());
-        //查询待结算金额
-        List<OrderShare> list = orderShareService.lambdaQuery()
-                .eq(OrderShare::getStatus, OrderShareStatusEnum.ING.toString())
-                .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()),OrderShare::getCompanyWechatId,adminUser.getCompanyWechatIds())
-                //.//in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()),OrderShare::getWebsitId,adminUser.getAdminWebsitIds())
-                .list();
-        BigDecimal totalShareAmount = list.stream().map(OrderShare::getAmount).reduce(BigDecimal::add).orElse(new BigDecimal(0));
-        countBean.setOrderShareAmount(totalShareAmount);
+
+
         countBean.setTodayVisit(todayVisit);
         countBean.setYestodayVisit(yestodayVisit);
         return countBean;

mall-server-api/src/main/resources/mapper/CountMapper.xml

@@ -7,6 +7,13 @@
         sum(if(order_status not in ('NOPAY','CLOSE'),total_num,0)) 'total',
         sum(if(order_status not in ('NOPAY','CLOSE','OVER'),total_num,0)) 'sold',
         sum(if(order_status ='DFH',1,0)) 'dfh',
+        sum(if(order_status ='DQR',1,0)) 'dqr',
+        sum(if(order_status ='DJH',1,0)) 'djh',
+        sum(if(order_status ='JHZ',1,0)) 'jhz',
+        sum(if(order_status ='DPS',1,0)) 'dps',
+        sum(if(order_status ='PSDQ',1,0)) 'psdq',
+        sum(if(order_status ='PSZ',1,0)) 'psz',
+        sum(if(order_status ='DTK',1,0)) 'dtk',
         (select count(1) from order_refund where order_status not in ('OVER','CLOSE')
         <if test="companyWechatIds != null and companyWechatIds.size > 0">
             and company_wechat_id in