需求

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

@@ -424,20 +424,8 @@ public class PayOrderLogic {
             final User user = userService.getById(workerOrder.getUserId());
             workerOrder.setIdentity(user.getIdCard());
         }
-
         List<WorkerOrderItem> workerOrderItems = workerOrderItemService.lambdaQuery().eq(WorkerOrderItem::getOrderId, workerOrder.getOrderId()).list();
 
-        for (WorkerOrderItem workerOrderItem : workerOrderItems) {
-            if (websitNormChargeService.lambdaQuery().eq(WebsitNormCharge::getNormName,workerOrderItem.getGoodsName())
-                    .eq(WebsitNormCharge::getNormType,"M").count() < 1
-                    && partsImportService.lambdaQuery().eq(PartsImport::getPartName,workerOrderItem.getGoodsName())
-                    .count() < 1
-            ) {
-                workerOrderItem.setChargeType("SERV");
-            }
-
-        }
-
         workerOrder.setSource(commonLogic.getSource().equals("A")?OrderInfoSourceEnum.A.getRemark():OrderInfoSourceEnum.B.getRemark() );
 
 
@@ -1199,6 +1187,17 @@ public class PayOrderLogic {
         }else {
             workerOrder.updateById();
         }
+
+        List<WorkerOrderItem> workerOrderItems = workerOrderItemService.lambdaQuery().eq(WorkerOrderItem::getOrderId, workerOrder.getOrderId()).list();
+
+        for (WorkerOrderItem workerOrderItem : workerOrderItems) {
+            if (partsImportService.lambdaQuery().eq(PartsImport::getPartName,workerOrderItem.getGoodsName())
+                    .count() > 0
+            ) {
+                workerOrderItem.setChargeType("SERV");
+            }
+
+        }
         return workerOrder;
     }
 }