支付单推送优化

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -3216,13 +3216,20 @@ public class OrderServiceImpl implements OrderService {
 
         if (atomicBoolean.get()) {
             // 推送支付单
-            sendWxPayInfo(order, store);
+            sendWxPayInfo(order, store, wechatMicropayApiResult);
         }
 
     }
 
-    private void sendWxPayInfo(OrderVo order, StoreEntity store) {
+    private void sendWxPayInfo(OrderVo order, StoreEntity store, WechatMicropayApiResult wechatMicropayApiResult) {
         // 组装支付单信息
+        String payTransactionId = "";
+        if (Objects.nonNull(wechatMicropayApiResult)) {
+            payTransactionId = wechatMicropayApiResult.getTransaction_id();
+        } else {
+            payTransactionId = order.getPayTransactionId();
+        }
+
         Map<String, Object> orderSendCusParams = new HashMap<>();
         orderSendCusParams.put("merchSn", order.getMerchSn());
         orderSendCusParams.put("orderSn", order.getOrder_sn());
@@ -3230,7 +3237,7 @@ public class OrderServiceImpl implements OrderService {
         orderSendCusParams.put("thirdPartyMerchCode", store.getThirdPartyMerchCode());
         orderSendCusParams.put("thirdPartyMerchName", store.getThirdPartyMerchName());
         orderSendCusParams.put("outTradeNo", order.getOrder_sn());
-        orderSendCusParams.put("transactionId", order.getPayTransactionId());
+        orderSendCusParams.put("transactionId", payTransactionId);
         orderSendCusParams.put("subOrderId", "");   // ccnet原逻辑没有对该字段赋值
         orderSendCusParams.put("subOrderNo", order.getOrder_sn());
         orderSendCusParams.put("feeType", order.getFeeType());