Merge remote-tracking branch 'origin/feature/20210917_抖音买券_wp' into feature/20210917_抖音买券_wp

order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java

@@ -170,6 +170,10 @@ public class PayServiceImpl {
         } else {
             // 0元订单如果不需要支付，自定义支付单号
             orderPayResponse = getOrderPayResponse(paymentRequest, createPrepayRequestDto.getFatherOrderBean());
+            // 这里如果抖音卖券价格为0元，不能设置支付方式为0元购，否则后面mq送券的判断会走到通用送券逻辑
+            if (PayChannelType.TIKTOKPAY.getEbcode().equals(createPrepayRequestDto.getChannel())) {
+                orderPayResponse.setPayChannelType(PayChannelType.TIKTOKPAY);
+            }
         }
         if (orderPayResponse == null || Objects.isNull(orderPayResponse.getFmId())) {
             BaseResponse baseResponse = failPreOrderPay(LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getProductOrderBean(), cardCode, createPrepayRequestDto.getOrderClient(),

order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java

@@ -253,6 +253,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
         createPrepayRequestDto.setProductOrderBean(createOrderResponse.getData());
         createPrepayRequestDto.setTotalAmount(createOrderRequest.getSettlementAmount());
         createPrepayRequestDto.setCardAmount(0);
+        createPrepayRequestDto.setChannel(PayChannelType.TIKTOKPAY.getEbcode());
 
         OrderExtInfoDto orderExtInfoDto = new OrderExtInfoDto();
         orderExtInfoDto.setOpenid(userLoginInfoDto.getOpenId());