推送支付单商户订单号改为订单号

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

@@ -3229,7 +3229,7 @@ public class OrderServiceImpl implements OrderService {
         orderSendCusParams.put("merchName", order.getMerchName());
         orderSendCusParams.put("thirdPartyMerchCode", store.getThirdPartyMerchCode());
         orderSendCusParams.put("thirdPartyMerchName", store.getThirdPartyMerchName());
-        orderSendCusParams.put("outTradeNo", order.getMerchOrderSn());
+        orderSendCusParams.put("outTradeNo", order.getOrder_sn());
         orderSendCusParams.put("transactionId", order.getPayTransactionId());
         orderSendCusParams.put("subOrderId", "");   // ccnet原逻辑没有对该字段赋值
         orderSendCusParams.put("subOrderNo", order.getOrder_sn());