优化

mp-admin/src/main/java/com/qs/mp/web/controller/api/callback/AlipayCallBackController.java

@@ -121,7 +121,7 @@ public class AlipayCallBackController {
       responseWrite(response,"fail");
       return;
     }
-    PayOrder payOrder =  new PayOrder();
+    PayOrder payOrder = payOrderService.getById(order.getOrderId());
     payOrder.setOrderId(order.getOrderId());
     payOrder.setOrderNo(tradeNo);
     payOrder.setCompleteDate(completeDate);

mp-admin/src/main/java/com/qs/mp/web/controller/api/callback/PayCallBackController.java

@@ -77,7 +77,8 @@ public class PayCallBackController {
       responseWrite(response,"error");
       return;
     }
-    PayOrder payOrder =  new PayOrder();
+
+    PayOrder payOrder = payOrderService.getById(shopOrderNo);
     payOrder.setOrderId(shopOrderNo);
     payOrder.setOrderNo(orderNo);
     payOrder.setCompleteDate(completeDate);

mp-service/src/main/java/com/qs/mp/pay/service/impl/WalletServiceImpl.java

@@ -318,18 +318,17 @@ public class WalletServiceImpl implements IWalletService {
 
     //查询统一支付订单表，查询订单类型，然后根据不同类型做对应的逻辑处理
     //查询支付状态为1：支付成功，2：订单创建成功，等待支付。
-    PayOrder order = payOrderService.getById(orderNo);
     LogUtil.info(logger, "支付回调,bizType:{0},bizId:{1}" ,
-        new Object[]{order.getBizType(), order.getBizId()});
-    if (BizTypeEnum.CHANNEL_ORDER == order.getBizType()) {
+        new Object[]{payOrder.getBizType(), payOrder.getBizId()});
+    if (BizTypeEnum.CHANNEL_ORDER == payOrder.getBizType()) {
       // 渠道盲票采购订单支付成功，调用业务订单服务处理
-      channelOrderService.paySuccess(order);
-    } else if (BizTypeEnum.TICKET_ORDER == order.getBizType()) {
+      channelOrderService.paySuccess(payOrder);
+    } else if (BizTypeEnum.TICKET_ORDER == payOrder.getBizType()) {
       // 用户盲票购买订单支付成功，调用业务订单服务处理
-      userTicketOrderService.paySuccess(order);
-    } else if (BizTypeEnum.DELIVER_ORDER == order.getBizType()) {
+      userTicketOrderService.paySuccess(payOrder);
+    } else if (BizTypeEnum.DELIVER_ORDER == payOrder.getBizType()) {
       // 用户提货订单支付成功，调用业务订单服务处理
-      userDeliverOrderService.paySuccess(order);
+      userDeliverOrderService.paySuccess(payOrder);
     } else {
       //数据结构异常，告警
       LogUtil.error(logger, "该业务单据类型未支持，orderNo：" + orderNo);