Merge branches 'feature/20220621_门店小助手退款处理_wuping' and 'qa' of…

Merge branches 'feature/20220621_门店小助手退款处理_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/payment/MultiPayRequest.java

@@ -80,4 +80,13 @@ public class MultiPayRequest {
 
     //储值卡支付列表
     private List<String> cardItems;
+
+    /**
+     * 小程序appid
+     */
+    private String subAppid;
+    /**
+     * 支付类型编码 TWX:微信 TZFB:支付宝
+     */
+    private String payTypeCode;
 }

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

@@ -4109,6 +4109,8 @@ public class OrderAdapter {
         orderPayDto.setOut_order_no(orderBean.getOid());
         orderPayDto.setCardItems(cardCodes);//多卡支付
         orderPayDto.setApplicationType(getPayApplicationType(orderBean.getOrderClient()));
+        orderPayDto.setSubAppid(orderBean.getAppId());
+        orderPayDto.setPayTypeCode(convertPayTypeCode(orderBean.getOrderClient()));
         return orderPayDto;
 
     }