Merge branches 'feature/20211123_预支付接口空指针修复_wuping' and 'master' of…

Merge branches 'feature/20211123_预支付接口空指针修复_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

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

@@ -507,7 +507,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
             return ResponseUtil.error(orderInfoReqsBaseResponse.getCode(), "支付异常," + response.getData().getResultMsg());
         }
 
-        updatExtInfo(response.getData(), appId,createPrepayRequestDto);
+        updateExtInfo(response.getData(), appId,createPrepayRequestDto);
 
         //唤起支付返回参数
         checkOrder.convent2CreateOrderResponseVo(createOrderResponseVo, appId, response.getData());
@@ -526,9 +526,11 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
         return ResponseUtil.success(createOrderResponseVo);
     }
 
-    public void convent2CreateOrderResponseVo(OrderPayResponse createOrderResponseVo, String appId, UnifiedPayResponseDto response){
-        createOrderResponseVo.setWxAppid(appId);
-        createOrderResponseVo.setFmId(response.getFmId());
+    public void convent2OrderPayResponse(OrderPayResponse orderPayResponse, String appId, UnifiedPayResponseDto response
+            ,CreatePrepayRequestDto createPrepayRequestDto){
+        orderPayResponse.setWxAppid(appId);
+        orderPayResponse.setFmId(response.getFmId());
+        orderPayResponse.setOpenId(createPrepayRequestDto.getOpenId());
 //        createOrderResponseVo.setEndTransId(response.getEndTransId());
 //        createOrderResponseVo.setPaySuccess(false);
         String payOrderDto = response.getPayOrder();
@@ -542,18 +544,25 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
             payBean.setSignType(payOrderBean.getSignType());
             payBean.setTimestamp(payOrderBean.getTimestamp());
             payBean.setAliPayOrder(payOrderBean.getAliPayOrder());
-            createOrderResponseVo.setPayOrder(payBean);
-            createOrderResponseVo.setThirdOrderId(payOrderBean.getThirdPartTradeNo());
-            createOrderResponseVo.setThirdOrderToken(payOrderBean.getBizContent());
+            orderPayResponse.setPayOrder(payBean);
+            orderPayResponse.setThirdOrderId(payOrderBean.getThirdPartTradeNo());
+            orderPayResponse.setThirdOrderToken(payOrderBean.getBizContent());
+        }
+        orderPayResponse.setPayChannelType(PayChannelType.WECHAT);
+        if (orderPayResponse.getPayOrder() != null && StringUtils.isNotBlank(orderPayResponse.getPayOrder().getAliPayOrder())) {
+            orderPayResponse.setPayChannelType(PayChannelType.ALIPAY);
+        }
+        //抖音支付
+        if (PayChannelType.TIKTOKPAY.getIndex().toString().equalsIgnoreCase(createPrepayRequestDto.getProductOrderBean().getPayChannelType())) {
+            orderPayResponse.setPayChannelType(PayChannelType.TIKTOKPAY);
         }
     }
 
 
-    public void updatExtInfo(UnifiedPayResponseDto response , String appId,CreatePrepayRequestDto createPrepayRequestDto){
-        OrderPayResponse createOrderResponseVo  = new OrderPayResponse();
-        convent2CreateOrderResponseVo(createOrderResponseVo, appId,response);
-        createOrderResponseVo.setOpenId(createPrepayRequestDto.getOpenId());
-        BaseResponse baseEditResponse = payService.updateOrderInfo(createOrderResponseVo, createPrepayRequestDto.getOrderExtInfoDTO(), createPrepayRequestDto.getProductOrderBean(), LogThreadLocal.getTrackingNo());
+    public void updateExtInfo(UnifiedPayResponseDto response , String appId,CreatePrepayRequestDto createPrepayRequestDto){
+        OrderPayResponse orderPayResponse  = new OrderPayResponse();
+        convent2OrderPayResponse(orderPayResponse, appId,response,createPrepayRequestDto);
+        BaseResponse baseEditResponse = payService.updateOrderInfo(orderPayResponse, createPrepayRequestDto.getOrderExtInfoDTO(), createPrepayRequestDto.getProductOrderBean(), LogThreadLocal.getTrackingNo());
     }
 
     /**
@@ -802,10 +811,12 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
         CreateOrderRequest request = new CreateOrderRequest();
         Integer orderClient = OrderClientType.SAAS.getIndex();
         request.setPayChannel(PayChannelType.WECHAT.getIndex().toString());
+        request.setPayChannelName(PayChannelType.WECHAT.getName());
         request.setPayChannelType(PayChannelType.WECHAT.getIndex());
         if(UserLoginChannelEnum.ALIPAY.getCode().equals(userLoginInfoDto.getChannel())){
             orderClient = OrderClientType.ALIPAY.getIndex();
-            request.setPayChannel(PayChannelType.ALIPAY.getIndex().toString());
+            request.setPayChannel(PayChannelType.ALIPAY.getEbcode());
+            request.setPayChannelName(PayChannelType.ALIPAY.getName());
             request.setPayChannelType(PayChannelType.ALIPAY.getIndex());
         }
         if(UserLoginChannelEnum.APP.getCode().equals(userLoginInfoDto.getChannel())){
@@ -818,7 +829,8 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
         }
         //抖音小程序
         if("5".equalsIgnoreCase(userLoginInfoDto.getChannel())) {
-            request.setPayChannel(PayChannelType.TIKTOKPAY.getIndex().toString());
+            request.setPayChannel(PayChannelType.TIKTOKPAY.toString());
+            request.setPayChannelName(PayChannelType.TIKTOKPAY.getName());
             request.setPayChannelType(PayChannelType.TIKTOKPAY.getIndex());
             orderClient = OrderClientType.TIKTOKPAY.getIndex();
         }