Merge remote-tracking branch 'origin/develop' into develop

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/ShoppingCartBaseService.java

@@ -112,7 +112,7 @@ public interface ShoppingCartBaseService {
             getProductInfoDto.setShopId(getProductInfoRequest.getStoreId());
             getProductInfoDto.setProductInfoType(2);
             getProductInfoDto.setProductIds(goodsIds);
-            getProductInfoDto.setChannel(OrderChannelType.SAAS.getCode());
+            getProductInfoDto.setChannel(getProductInfoRequest.getBusinessType());
             ProductService productService = SDKCommonBaseContextWare.getBean(ProductService.class);
             com.freemud.application.sdk.api.base.BaseResponse<ProductInfosDTO> productInfosDTOBaseResponse = productService.listProductInfoByIdList(getProductInfoDto, LogThreadLocal.getTrackingNo());
             if (!Objects.equals(ResponseResultEnum.SUCCESS.getCode(), productInfosDTOBaseResponse.getCode()) || productInfosDTOBaseResponse.getData() == null) {

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

@@ -52,6 +52,7 @@ import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
 import com.freemud.sdk.api.assortment.promotion.response.ShoppingCartGoodsResponse;
 import com.freemud.sdk.api.assortment.promotion.service.ActivityCalculationDiscountService;
 import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableMap;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
@@ -107,6 +108,8 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
 
     private final Integer RESPONSE_SUCCESS_CODE = 100;
 
+    private final String SESSION_KEY = "sessionKey";
+
     @Override
     public BaseResponse createReserveOrder(CreateOrderVo createOrderVo) {
         //查询用户缓存信息(用户信息，用户绑定桌号信息)
@@ -242,6 +245,10 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
         }
         groupCreateOrderRequest.setProducts(orderProductRequests);
         groupCreateOrderRequest.setOperator(assortmentCustomerInfoVo.getNickName() == null ? "围餐": assortmentCustomerInfoVo.getNickName());
+        // 扩展字段添加sessionKey
+        if (StringUtils.isNotBlank(createOrderVo.getSessionKey())) {
+            groupCreateOrderRequest.setExtInfo(JSONObject.toJSONString(ImmutableMap.of(SESSION_KEY, createOrderVo.getSessionKey())));
+        }
         return orderCenterSdkService.createGroupOrder(groupCreateOrderRequest);
     }
 

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

@@ -48,6 +48,8 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
         if (assortmentCustomerInfoVo == null || StringUtils.isEmpty(assortmentCustomerInfoVo.getMemberId())) {
             return ResponseUtil.error(ResponseResult.NOT_LOGIN);
         }
+        // 扩展字段中存储 sessionKey
+        createOrderVo.setSessionKey(assortmentCustomerInfoVo.getSessionKey());
         if(IappIdType.WC_XCX.getCode().equals(assortmentCustomerInfoVo.getIappId())){  //i围餐
             BaseResponse baseResponse = null;
             CreateReserveOrderVo createReserveOrderVo = new CreateReserveOrderVo();
@@ -57,13 +59,13 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
             createReserveOrderVo.setOrderUpdateVer(createOrderVo.getOrderUpdateVer());
             if(createOrderVo.getOperation() == null) throw new ServiceException(ResponseResult.ORDER_CREATE_OPERATION_ERROR);
             switch (createOrderVo.getOperation()){
-                case 2:
+                case 2:// 开台
                     baseResponse = encircleOrderService.createReserveOrder(createOrderVo);
                     break;
-                case 3:
+                case 3:// 下单
                     baseResponse = encircleOrderService.updateReserveOrder(createReserveOrderVo);
                     break;
-                case 4:
+                case 4:// 创建预支付订单
                     baseResponse = encircleOrderService.createPrepaymentOrder(createReserveOrderVo);
                     break;
                     default:
@@ -84,8 +86,6 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
         if(ObjectUtils.notEqual(baseResponse.getCode(),ResponseResult.SUCCESS.getCode())){
             return baseResponse;
         }
-        // 扩展字段中存储 sessionKey
-        createOrderVo.setSessionKey(assortmentCustomerInfoVo.getSessionKey());
         return orderservice.createOrderNew(createOrderVo);
     }