Merge branch 'feature/zxh/临时券码新增字段对接20220826' into develop

call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java

@@ -31,6 +31,7 @@ import com.freemud.application.sdk.api.ordercenter.entities.vo.OrderCallBackRequ
 import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
+import com.freemud.application.sdk.api.ordercenter.enums.PayType;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderItemResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderPayItemResp;
@@ -210,7 +211,7 @@ public class OrderCallBackMQService {
         try {
             OrderInfoReqs orderInfoReqs = JSONObject.parseObject(body.getContent(), OrderInfoReqs.class);
             List<Integer> allowOrderClientList = Lists.newArrayList(OrderClientType.SAAS.getIndex(), OrderClientType.ALIPAY.getIndex());
-            if (orderInfoReqs != null && allowOrderClientList.contains(orderInfoReqs.getOrderClient()) &&
+            if (orderInfoReqs != null && allowOrderClientList.contains(orderInfoReqs.getOrderClient()) && Objects.equals(PayType.ONLINE_PAY.getCode(),orderInfoReqs.getPayType())&&
                     ((body.getOperateType() == 0 && NewOrderStatus.PENDING_PAYMENT.getIndex().equals(orderInfoReqs.getOrderState())) ||
                             (body.getOperateType() == 1 && NewOrderStatus.PLACE_AN_ORDER.getIndex().equals(orderInfoReqs.getOrderState())))) {
                 return orderInfoReqs;

order-application-service/src/main/java/cn/freemud/adapter/CouponAdapter.java

@@ -821,6 +821,9 @@ public class CouponAdapter {
 
         List<CouponCodeVerificationTransDto> transactions = this.getTransactions(orderBean, couponCodeVerificationDto);
         couponCodeVerificationDto.setTransactions(transactions);
+        couponCodeVerificationDto.setTradeNo(orderBean.getThirdPartTradeNo());
+        String couponChannel = CouponTradeChannelEnum.getCouponChannel(orderBean.getOrderClient());
+        couponCodeVerificationDto.setTradeChannel(couponChannel);
         return couponCodeVerificationDto;
     }