Merge branch 'hotfix/20220302_一元捐插件商户单号字段取值替换_miaohui' into 'master'

修复爱马哥一元捐插件随行付支付返回的商户号

See merge request !131

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

@@ -2862,7 +2862,9 @@ public class OrderAdapter {
             orderInfo.setOrder_token(orderPayResponse.getThirdOrderToken());
             createOrderResponseVo.setOrderInfo(orderInfo);
         }
-        createOrderResponseVo.setOutTradeNo(orderPayResponse.getEndTransId());
+        //createOrderResponseVo.setOutTradeNo(orderPayResponse.getEndTransId());
+        // 随行付支付通道返回的endTransId无法满足一元捐插件，支付接口新增返回channelPayId字段作为商户单号使用
+        createOrderResponseVo.setOutTradeNo(orderPayResponse.getChannelPayId());
 
         return createOrderResponseVo;
     }

order-application-service/src/main/java/cn/freemud/entities/dto/order/UnifiedPayResponseDto.java

@@ -35,5 +35,5 @@ public class UnifiedPayResponseDto {
     private String payOrder;
 
     private String endTransId;
-
+    private String channelPayId;
 }

order-application-service/src/main/java/cn/freemud/entities/dto/pay/OrderPayResponse.java

@@ -92,6 +92,11 @@ public class OrderPayResponse {
     //商户订单号
     private String endTransId;
 
+    /**
+     * 修复随行付返回的endTransId无法满足一元捐插件，支付接口新增的落单号字段（对应微信商户单号）
+     */
+    private String channelPayId;
+
     @NoArgsConstructor
     @Data
     public static class PayOrderBean {

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

@@ -1272,6 +1272,7 @@ public class PayServiceImpl {
         createOrderResponseVo.setWxAppid(appId);
         createOrderResponseVo.setFmId(response.getFmId());
         createOrderResponseVo.setEndTransId(response.getEndTransId());
+        createOrderResponseVo.setChannelPayId(response.getChannelPayId());
 //        createOrderResponseVo.setPaySuccess(false);
         String payOrderDto = response.getPayOrder();
         PayOrderDto payOrderBean = JSONObject.parseObject(payOrderDto, PayOrderDto.class);