Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

assortment-ordercenter-sdk/pom.xml

@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.1.9.RELEASE</version>
+            <version>1.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.4.6-SNAPSHOT</version>
+            <version>1.4.8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
@@ -119,7 +119,7 @@
         <dependency>
             <artifactId>assortment-data-manager</artifactId>
             <groupId>com.freemud.sdk.api.assortment</groupId>
-            <version>4.5.4-SNAPSHOT</version>
+            <version>4.3.0.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud.commons</groupId>
@@ -315,12 +315,12 @@
         <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>
             <artifactId>assortment-payment-sdk</artifactId>
-            <version>2.5.1-SNAPSHOT</version>
+            <version>2.4.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud</groupId>

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

@@ -2247,7 +2247,7 @@ public class OrderAdapter {
             });
         }
         orderPayDto.setProducts(productBeans);
-        orderPayDto.setPayCode(paymentRequest.getPayCode());
+//        orderPayDto.setPayCode(paymentRequest.getPayCode());
         return orderPayDto;
     }
 

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

@@ -63,7 +63,7 @@ public class AppOrderServiceImpl implements AppOrderService {
     public BaseResponse createOrderFlow(CreateOrderVo createOrderVo) {
         String trackingNo = LogThreadLocal.getTrackingNo();
         // 查询用户信息
-        AssortmentCustomerInfoVo userLoginInfoDto = checkOrder.checkOrderByMember(createOrderVo.getSessionId());
+        AssortmentCustomerInfoVo userLoginInfoDto = checkOrder.checkOrderByMember(createOrderVo, trackingNo);
         // 查询门店信息 营业时间、营业状态，服务器当前时间在营业时间内 点餐桌号
         StoreResponse.BizVO storeResponseDto = checkOrder.checkOrderByStore(createOrderVo, trackingNo);
         // 查询购物车（内部校验券点餐方式，券是否可用） 校验当前订单类型的下单参数
@@ -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/CheckOrder.java

@@ -116,16 +116,6 @@ public class CheckOrder {
         return userLoginInfoDto;
     }
 
-    public AssortmentCustomerInfoVo checkOrderByMember(String sessionId) {
-        // 通过sessionId查询缓存中会员id
-        AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(sessionId);
-        if (userLoginInfoDto == null || StringUtils.isEmpty(userLoginInfoDto.getMemberId())) {
-            throw new ServiceException(ResponseResult.NOT_LOGIN);
-        }
-        return userLoginInfoDto;
-    }
-
-
     /**
      * 查询门店信息
      */

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 依赖修改