需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -352,7 +352,7 @@ public class PayOrderLogic {
         WebsitNormCharge websitNormCharge = websitNormChargeService.getById(workerOrderItem.getGoodsId());
         if (websitNormCharge.getNormType().equals("M")) {
             // 获取当前关联师傅库存记录
-            List<WorkerNormStockBean> stockBeanList = materialMapper.queryWorkerStockQty(workerOrderItem.getGoodsId(), workerOrderBuy.getWorkerId());
+            List<WorkerNormStockBean> stockBeanList = materialMapper.queryWorkerStockQty(workerOrderItem.getGoodsId(), workerOrderBuy.getIdentity());
             if (CollectionUtil.isNotEmpty(stockBeanList)) {
                 // 获取待支付的师傅收费订单
                 final List<WorkerOrder> workerOrderList = workerOrderService.lambdaQuery()

mall-server-api/src/main/java/com/gree/mall/manager/bean/workorder/OrderBaseCountBean.java

@@ -15,6 +15,8 @@ public class OrderBaseCountBean {
     private Integer dpg = 0;
     @ApiModelProperty("待接收数量")
     private Integer djs = 0;
+    @ApiModelProperty("待预约")
+    private Integer dyy = 0;
     @ApiModelProperty("服务中数量")
     private Integer fwz = 0;
     @ApiModelProperty("异常待处理数量")

mall-server-api/src/main/resources/mapper/workorder/OrderBaseCMapper.xml

@@ -114,6 +114,7 @@
             count(if(order_status in ('DJD'),1,null)) as 'djs',
             count(if(order_status in ('DQD'),1,null)) as 'dqd',
             count(if(order_status in ('FWZ'),1,null)) as 'fwz',
+            count(if(order_status in ('DYY'),1,null)) as 'dyy',
             count(if(is_exception = 1,1,null)) as 'ycdcl',
             count(if(appraise_status in ('C'),1,null)) as 'cp'
         from pg_order_base a