需求

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

@@ -338,15 +338,6 @@ public class PayOrderLogic {
 
         workerOrder.setSource(commonLogic.getSource().equals(OrderInfoSourceEnum.A)?OrderInfoSourceEnum.A.getRemark():OrderInfoSourceEnum.B.getRemark() );
 
-
-        if (payType.equals(PayTypeEnum.WECHAT.getKey())) {
-           String transcationId = wechatLogic.paymentFkm(workerOrder.getOrderId(), workerOrder.getTotalAmount(), authCode, "Y", ip,
-                   adminWebsit.getPayWorkerCodeId(),workerOrder.getSource());
-
-            workerOrder.setTranscationId(transcationId);
-            workerOrder.setOpenId(currentCompanyWechat.getUser().getOpenId());
-            workerOrder.setConfigId(adminWebsit.getPayWorkerCodeId());
-        }
         workerOrder.setPayTime(new Date());
         workerOrder.setPayType(payType);
         workerOrder.setPayStatus(PayStatusEnum.PAID.getKey());
@@ -461,6 +452,16 @@ public class PayOrderLogic {
             log.error(workerOrder.getOrderId() + " 师傅配件扣自有库存失败: ", e);
         }
 
+        if (payType.equals(PayTypeEnum.WECHAT.getKey())) {
+            String transcationId = wechatLogic.paymentFkm(workerOrder.getOrderId(), workerOrder.getTotalAmount(), authCode, "Y", ip,
+                    adminWebsit.getPayWorkerCodeId(),workerOrder.getSource());
+
+            workerOrder.setTranscationId(transcationId);
+            workerOrder.setOpenId(currentCompanyWechat.getUser().getOpenId());
+            workerOrder.setConfigId(adminWebsit.getPayWorkerCodeId());
+            workerOrder.updateById();
+        }
+
 
         return true;
     }