创建订单时落库

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.0.13-RELEASE</version>
+    <version>2.0.18-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

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

@@ -96,7 +96,7 @@ public class AppOrderServiceImpl implements AppOrderService {
         Integer pushOrderTime = checkOrder.checkOrderByOrderType(createOrderVo, userLoginInfoDto, storeResponseDto, shoppingCartGoodsDto, trackingNo);
         //1.5.4版本，商品库存校验与扣库存
         //List<String> stockProductIds = checkOrder.getStockProductIdList(createOrderVo, shoppingCartGoodsDto);
-        OrderExtInfoDto extInfo = orderservice.getExtInfo(userLoginInfoDto, storeResponseDto, pushOrderTime, createOrderVo);
+        OrderExtInfoDto extInfo = orderservice.getExtInfo(userLoginInfoDto, storeResponseDto, pushOrderTime, createOrderVo, shoppingCartGoodsDto);
         //创建订单
         BaseResponse createOrderOperateDtoResponse = orderservice.sdkCreateOrder(createOrderVo, storeResponseDto, shoppingCartGoodsDto, userLoginInfoDto);
         if(createOrderOperateDtoResponse == null || !ResponseResult.SUCCESS.getCode().equals(createOrderOperateDtoResponse.getCode()) || createOrderOperateDtoResponse.getResult() == null ) {
@@ -161,7 +161,7 @@ public class AppOrderServiceImpl implements AppOrderService {
         Integer pushOrderTime = checkOrder.checkOrderByOrderType(createOrderVo, customerInfo, storeResponse.getBizVO(), shoppingCartGoodsDto, trackingNo);
         //1.5.4版本，商品库存校验与扣库存
         //List<String> stockProductIds = checkOrder.getStockProductIdList(createOrderVo, shoppingCartGoodsDto);
-        OrderExtInfoDto extInfo = orderservice.getExtInfo(customerInfo, storeResponse.getBizVO(), pushOrderTime, createOrderVo);
+        OrderExtInfoDto extInfo = orderservice.getExtInfo(customerInfo, storeResponse.getBizVO(), pushOrderTime, createOrderVo, shoppingCartGoodsDto);
         //创建订单
         BaseResponse createOrderOperateDtoResponse = orderservice.sdkCreateOrder(createOrderVo, storeResponse.getBizVO(), shoppingCartGoodsDto, customerInfo);
         if(createOrderOperateDtoResponse == null || !ResponseResult.SUCCESS.getCode().equals(createOrderOperateDtoResponse.getCode()) || createOrderOperateDtoResponse.getResult() == null ) {

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

@@ -321,7 +321,7 @@ public class OrderServiceImpl implements Orderservice {
         ShoppingCartGoodsDto shoppingCartGoodsDto = checkOrder.getShoppingCartGoodsDto(createOrderVo);
         // 查询小程序自提外卖配置信息 校验当前订单类型的下单参数 校验外卖是否满足起送条件
         Integer pushOrderTime = checkOrder.checkOrderByOrderType(createOrderVo, userLoginInfoDto, storeResponseDto, shoppingCartGoodsDto, trackingNo);
-        OrderExtInfoDto extInfo = getExtInfo(userLoginInfoDto, storeResponseDto, pushOrderTime, createOrderVo);
+        OrderExtInfoDto extInfo = getExtInfo(userLoginInfoDto, storeResponseDto, pushOrderTime, createOrderVo, shoppingCartGoodsDto);
         //1.9.2套餐需求同步优化创建订单代码
         BaseResponse createOrderOperateDtoResponse = this.sdkCreateOrder(createOrderVo, storeResponseDto, shoppingCartGoodsDto, userLoginInfoDto);
         if(createOrderOperateDtoResponse == null || !ResponseResult.SUCCESS.getCode().equals(createOrderOperateDtoResponse.getCode()) || createOrderOperateDtoResponse.getResult() == null ) {
@@ -329,10 +329,13 @@ public class OrderServiceImpl implements Orderservice {
         }
         CreateOrderOperateDto createOrderOperateDto = (CreateOrderOperateDto)createOrderOperateDtoResponse.getResult();
         // 设置集点值
+        /*
         ShoppingCartGoodsDto.SendPoint sendPoint = shoppingCartGoodsDto.getSendPoint();
         if (sendPoint != null){
             redisCache.save(RedisKeyConstant.KGD_SENDPOINT_ORDERID + createOrderOperateDto.getFatherOrderBean().getOid(), sendPoint, 1L, TimeUnit.DAYS);
         }
+
+         */
         //创建支付
         CreatePrepayRequestDto createPrepayRequestDto = orderAdapter.convertToCreatePrepayRequestDto(userLoginInfoDto, createOrderVo, createOrderOperateDto, extInfo);
         return this.createPrepayOrder(createPrepayRequestDto);
@@ -354,7 +357,7 @@ public class OrderServiceImpl implements Orderservice {
         Integer pushOrderTime = checkOrder.checkOrderByOrderType(createOrderVo, userLoginInfoDto, storeResponseDto, shoppingCartGoodsDto, trackingNo);
         //1.5.4版本，商品库存校验与扣库存
         //List<String> stockProductIds = checkOrder.getStockProductIdList(createOrderVo, shoppingCartGoodsDto);
-        OrderExtInfoDto extInfo = getExtInfo(userLoginInfoDto, storeResponseDto, pushOrderTime, createOrderVo);
+        OrderExtInfoDto extInfo = getExtInfo(userLoginInfoDto, storeResponseDto, pushOrderTime, createOrderVo, shoppingCartGoodsDto);
         //下单并支付
         return this.createOrderAndPay(createOrderVo, storeResponseDto, shoppingCartGoodsDto, userLoginInfoDto, extInfo);
     }
@@ -438,6 +441,7 @@ public class OrderServiceImpl implements Orderservice {
         if (orderBean.getGmtExpect() != null && orderBean.getGmtExpect() != 0) {
             var1.setExpectTime(DateUtil.convert2String(new Date(orderBean.getGmtExpect()), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
         }
+        /*
         ShoppingCartGoodsDto.SendPoint value = (ShoppingCartGoodsDto.SendPoint)redisCache.getValue(RedisKeyConstant.KGD_SENDPOINT_ORDERID + var1.getOrderId());
         if (value != null){
             var1.setSendPointActivityCode(value.getActivityCode());
@@ -446,6 +450,7 @@ public class OrderServiceImpl implements Orderservice {
             var1.setSendPointSendPoint(value.getSendPoint());
             var1.setSendPointValidityDateDays(value.getValidityDateDays());
         }
+         */
         // 订单支付成功
         com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderCenterSdkService.payAccess(var1);
         String string2 = JSONObject.toJSONString(payAccessRes);
@@ -2480,7 +2485,7 @@ public class OrderServiceImpl implements Orderservice {
     }
 
     public OrderExtInfoDto getExtInfo(AssortmentCustomerInfoVo userLoginInfoDto, StoreResponse.BizVO storeResponseDto,
-                                      Integer pushOrderTime, CreateOrderVo createOrderVo) {
+                                      Integer pushOrderTime, CreateOrderVo createOrderVo, ShoppingCartGoodsDto shoppingCartGoodsDto) {
 
         Integer serviceTime = storeResponseDto.getServiceTime();
         String sessionId = createOrderVo.getSessionId();
@@ -2519,6 +2524,14 @@ public class OrderServiceImpl implements Orderservice {
         if (StringUtils.isNotBlank(createOrderVo.getScene())) {
             orderExtInfoDto.setScene(createOrderVo.getScene());
         }
+        if (null != shoppingCartGoodsDto &&  null != shoppingCartGoodsDto.getSendPoint()){
+            ShoppingCartGoodsDto.SendPoint sendPoint = shoppingCartGoodsDto.getSendPoint();
+            orderExtInfoDto.setSendPointValidityDateDays(sendPoint.getValidityDateDays());
+            orderExtInfoDto.setSendPointMaxNum(sendPoint.getMaxNum());
+            orderExtInfoDto.setSendPointActivityCode(sendPoint.getActivityCode());
+            orderExtInfoDto.setSendPointEndTime(sendPoint.getEndTime());
+            orderExtInfoDto.setSendPointSendPoint(sendPoint.getSendPoint());
+        }
         return orderExtInfoDto;
     }