订单模块 预定单开发

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

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

@@ -21,6 +21,7 @@ import com.freemud.application.sdk.api.promotioncenter.request.promotion.Activit
 import com.freemud.application.sdk.api.stockapi.domain.ProductStocksVO;
 import com.freemud.application.sdk.api.stockapi.request.UpdateStocksRequest;
 import com.freemud.application.sdk.api.util.DateUtil;
+import com.freemud.sdk.api.assortment.order.constant.CommonConstant;
 import com.freemud.sdk.api.assortment.order.domain.OrderStatesVO;
 import com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant;
 import com.freemud.sdk.api.assortment.order.entities.OrderEditInfo;
@@ -217,8 +218,15 @@ public class OrderSdkAdapter {
         } else {
             request.setOrderClient(StringUtils.isEmpty(requestVO.getSource()) ? OrderClientType.SAAS.getIndex() : getNewOrderClient(requestVO.getSource()));
         }
-        //订单业务类型 1:普通订单 2:虚拟订单
-        request.setBizType(1);
+        // fisherman->预定单场景 bizType = 7  other:普通订单
+        Integer bizType = requestVO.getBizType();
+        // 双重判断,防止前端乱传参搞事情
+        if (Objects.nonNull(bizType) && BizTypeEnum.ADVANCE_ORDER.getBizType().compareTo(bizType) == 0) {
+            request.setBizType(BizTypeEnum.ADVANCE_ORDER.getBizType());
+        } else {
+            // 20210730之前 默认设置为1
+            request.setBizType(CommonConstant.INTEGER_ONE);
+        }
         request.setNote(requestVO.getRemark());
         request.setOrderType(getNewOrderType(requestVO.getOrderType(), requestVO.getGmtExpect()));
         request.setBarCounter(requestVO.getBarCounter());

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/constant/CommonConstant.java

@@ -16,4 +16,6 @@ public class CommonConstant {
      * 4:星期四
      */
     public static List<Integer> weekDay = Arrays.asList(2, 4);
+
+    public static Integer INTEGER_ONE = 1;
 }

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

@@ -12,6 +12,11 @@ import java.util.List;
 
 @Data
 public class    BaseCreateOrderRequest extends BaseConfig {
+    /**
+     *  爱马哥蛋糕预定
+     *  预定单需求, bizType= 7  其他的场景默认传递null
+     */
+    private Integer bizType;
 
     /**
      * 商户ID 必填

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -137,7 +137,6 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     @Override
     public CreateOrderResponse createOrderFlow(CreateOrderRequest config) {
         com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest request = orderSdkAdapter.convent2NEWCreateOrderRequest(config.getBaseCreateOrderRequest());
-//        AssortOrderLogUtil.info("fisherman 请求基础服务,最终构建 04",config!=null?JSON.toJSONString(config):null);
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse<OrderInfoReqs> order = orderSdkService.createOrder(request, config.getTrackingNo());
         CreateOrderResponse createOrderResponse = orderSdkAdapter.convent2NEWOrderInfoReqs(order);
         if (!RESPONSE_SUCCESS.equals(createOrderResponse.getErrcode())

order-application-service/pom.xml

@@ -48,7 +48,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.1.84-RELEASE</version>
+            <version>2.1.85-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -716,6 +716,8 @@ public class OrderAdapter {
         createOrderDto.setLongitude(longitude);
         createOrderDto.setOrderType(convent2OrderTypeEnum(orderType));
         createOrderDto.setPayType(QueryPayType.ONLINE_PAY);
+        //  爱马哥蛋糕预定 预定单需求, bizType= 7  其他的场景默认传递null(到基础服务默认设置为1)
+        createOrderDto.setBizType(createOrderVo.getBizType());
         //电子风味卡
         if (Objects.nonNull(createOrderVo.getUnionPayCard())) {
             createOrderDto.setPayChannel(PayChannelType.USVCP.getEbcode());

order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/NewShoppingCartClearDto.java

@@ -34,4 +34,9 @@ public class NewShoppingCartClearDto {
      */
     private String channelType;
 
+    /**
+     *  爱马哥蛋糕预定
+     *  预定单需求, bizType= 7  其他的场景默认传递null
+     */
+    private Integer bizType;
 }

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

@@ -518,7 +518,9 @@ public class OrderServiceImpl implements Orderservice {
         var1.setMealCodeRule(getMealCodeRule(wxappid));
         if (StringUtils.isNotBlank(payCode)) {
             var1.setPayChannel(payCode);
-            var1.setPayChannelName(PayChannel.getByCode(payCode).getDesc());
+            //fisherman 看着会出现NPE 就给修改了下
+            PayChannel byCode = PayChannel.getByCode(payCode);
+            var1.setPayChannelName(Objects.isNull(byCode) ? null : byCode.getDesc());
         }
         if (orderBean.getGmtExpect() != null && orderBean.getGmtExpect() != 0) {
             var1.setExpectTime(DateUtil.convert2String(new Date(orderBean.getGmtExpect()), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
@@ -566,6 +568,8 @@ public class OrderServiceImpl implements Orderservice {
             newShoppingCartClearDto.setAppId(wxappid);
             newShoppingCartClearDto.setSessionId(sessionId);
             newShoppingCartClearDto.setOperationType(1);
+            // fisherman 清楚 爱马哥蛋糕预定 类型购物车 bizType = 7
+            newShoppingCartClearDto.setBizType(orderBean.getBizType());
             shoppingCartClient.clearShoppingCart(newShoppingCartClearDto);
         }