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

Hotfix/20220302 一元捐插件商户单号字段取值替换 miaohui

See merge request !132

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

@@ -260,6 +260,8 @@ public class CreateOrderAdapter {
             orderInfo.setOrder_token(orderPayResponse.getThirdOrderToken());
             createOrderResponseVo.setOrderInfo(orderInfo);
         }
+        // 随行付支付通道返回的endTransId无法满足一元捐插件，支付接口新增返回channelPayId字段作为商户单号使用
+        createOrderResponseVo.setOutTradeNo(orderPayResponse.getChannelPayId());
 
         return createOrderResponseVo;
     }
@@ -1506,4 +1508,4 @@ public class CreateOrderAdapter {
 
     }
 
-}
\ No newline at end of file
+}