fix bug

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

@@ -2749,9 +2749,9 @@ public class OrderServiceImpl implements OrderService {
             JedisUtil.del(Constants.WAREHOUSE_STOCK_MAP_KEY + "_" + storeId);
 
             // TODO 推单测试用
-            order.setPayApp("wxpay");
-            order.setRequest("1111111111111111111");
-            order.setResponse("2222222222222222222");
+//            order.setPayApp("wxpay");
+//            order.setRequest("1111111111111111111");
+//            order.setResponse("2222222222222222222");
             // 推单
             sendOrderInfoToVmcShop(order, orderGoodsVoList);
 
@@ -2872,7 +2872,7 @@ public class OrderServiceImpl implements OrderService {
         payInfoDTO.setPayMode("offline");
         payInfoDTO.setRequest(order.getRequest());
         payInfoDTO.setResponse(order.getResponse());
-        payInfoDTO.setOutTradeNo(order.getOrder_sn());
+        payInfoDTO.setOutTradeNo(order.getAliTradeNo());
         return payInfoDTO;
     }
 
@@ -3088,6 +3088,7 @@ public class OrderServiceImpl implements OrderService {
         order.setResponse(payOriginInfoDTO.getResponse());
         order.setPayApp("wxpay");
         order.setFeeType(wechatMicropayApiResult.getFee_type());
+        order.setAliTradeNo(wechatMicropayApiResult.getTransaction_id());
         resultObj.put("shopName", store.getStoreName()); // 根据门店编号查询
         resultObj.put("userName", user.getUsername());
         // 修改订单状态