Merge branch 'feature/1.9.20-蜜雪中台-dingkai' into qa

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -1203,6 +1203,9 @@ public class OrderSdkAdapter {
             case "saasmall":
                 orderClientType = 23;
                 break;
+            case "app":
+                orderClientType = 12;
+                break;
             default:
                 orderClientType = OrderClientType.SAAS.getIndex();
                 break;

order-application-service/pom.xml

@@ -315,7 +315,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>paymentcenter-sdk</artifactId>
-            <version>2.4.RELEASE</version>
+            <version>2.6.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>

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

@@ -92,6 +92,8 @@ public class AppOrderServiceImpl implements AppOrderService {
         // 关闭历史预支付订单
         this.closeHistoryPrePay(productOrderBean);
         OrderExtInfoDTO extInfo = JSONObject.parseObject(productOrderBean.getExtInfo(), OrderExtInfoDTO.class);
+        extInfo.setAppid(createPrepayVo.getPayAppId());
+        extInfo.setOpenid(createPrepayVo.getOpenId());
         String faceCode = "";
         String cardCode = "";
         CreatePrepayRequestDto createPrepayRequestDto = orderAdapter.convertToCreatePrepayRequestDto(createPrepayVo.getPartnerId(), createPrepayVo.getPayAppId(), createPrepayVo.getOpenId(), faceCode,

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

@@ -2065,6 +2065,7 @@ public class OrderServiceImpl implements Orderservice {
 //        orderExtInfo = orderAdapter.getOrderExtInfo(orderPayResponse, orderExtInfo);
         orderExtInfo.setOpenid(orderPayResponse.getOpenId());
         orderExtInfo.setFmId(orderPayResponse.getFmId());
+        orderExtInfo.setAppid(orderPayResponse.getWxAppid());
         String prepayId = "";
         OrderPayResponse.PayOrderBean payOrder = orderPayResponse.getPayOrder();
         // StringUtils 依赖修改