no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/material/stock/MaterialGoodsStockLogic.java

@@ -152,7 +152,9 @@ public class MaterialGoodsStockLogic {
         Integer materialSalesCount = websitNormRecordService.query()
                 .select("DISTINCT ref_order")
                 .eq("goods_type", "M")
-                .eq("worker_id", wechat.getUser().getWorkerNumber())
+                .and(v -> v.eq("worker_id", wechat.getUser().getUserId())
+                        .or()
+                        .eq("worker_number", wechat.getUser().getWorkerNumber()))
                 .between("create_time", curDate + " 00:00:00", curDate + " 23:59:59")
                 .count();
         List<WebsitNormRecord> normRecords1 = websitNormRecordService.lambdaQuery()

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

@@ -805,7 +805,8 @@ public class PayOrderLogic {
             websitNormRecord.setCompanyWechatId(workerOrder.getCompanyWechatId());
             websitNormRecord.setCompanyWechatName(workerOrder.getCompanyWechatName());
             websitNormRecord.setGoodsType(workerOrder.getGoodsType());
-            websitNormRecord.setWorkerId(workerOrder.getWorkerId());
+            websitNormRecord.setWorkerId(workerOrder.getUserId());
+            websitNormRecord.setWorkerNumber(workerOrder.getWorkerId());
             websitNormRecord.setWorkerName(workerOrder.getWorkerName());
             websitNormRecord.setOrderId(workerOrder.getWorkerOrderId());
             websitNormRecord.setRefOrder(workerOrder.getOrderId());

mall-server-api/src/main/java/com/gree/mall/manager/logic/websit/SettlementOrderLogic.java

@@ -634,7 +634,8 @@ public class SettlementOrderLogic {
             websitNormRecord.setCompanyWechatId(workerOrder.getCompanyWechatId());
             websitNormRecord.setCompanyWechatName(workerOrder.getCompanyWechatName());
             websitNormRecord.setGoodsType(workerOrder.getGoodsType());
-            websitNormRecord.setWorkerId(workerOrder.getWorkerId());
+            websitNormRecord.setWorkerId(workerOrder.getUserId());
+            websitNormRecord.setWorkerNumber(workerOrder.getWorkerId());
             websitNormRecord.setWorkerName(workerOrder.getWorkerName());
             websitNormRecord.setOrderId(workerOrder.getWorkerOrderId());
             websitNormRecord.setRefOrder(workerOrder.getOrderId());