合并代码

assortment-ordercenter-sdk/pom.xml

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

assortment-ordercenter-sdk/readme.md

@@ -81,4 +81,5 @@
 | 2.0.9-SNAPSHOT| 新增修改取餐码接口| 谌会阳 |2020-08-08
 | 2.0.11-SNAPSHOT| 麦咖啡| 谌会阳 |2020-08-08
 | 2.0.12-SNAPSHOT| OrderSourceType 调整 | 谌会阳 |2020-08-10
-| 2.0.13-SNAPSHOT| 加料商品 | 谌会阳 |2020-08-14
+| 2.0.13-SNAPSHOT| 加料商品 | 谌会阳 |2020-08-14
\ No newline at end of file
+| 2.0.14-SNAPSHOT| 商品统计分类名称保存 | wuping | 2020-08-20 |
\ No newline at end of file

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.0.13-SNAPSHOT</version>
+            <version>2.0.14-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -2102,7 +2102,8 @@ public class OrderAdapter {
         createOrderProductDemoDto.setWeight(cartGoodsDetailDto.getWeight());
         createOrderProductDemoDto.setUnit(cartGoodsDetailDto.getUnit());
         createOrderProductDemoDto.setStapleFood(0);
-        createOrderProductDemoDto.setCategory(cartGoodsDetailDto.getClassificationId());
+        createOrderProductDemoDto.setClassificationId(cartGoodsDetailDto.getClassificationId());
+        createOrderProductDemoDto.setSetClassificationName(cartGoodsDetailDto.getSetClassificationName());
         if (CollectionUtils.isNotEmpty(cartGoodsDetailDto.getActivityDiscountsDtos())) {
             createOrderProductDemoDto.setAccounts(getMaterialAccounts(createOrderProductDemoDto, cartGoodsDetailDto));
         }

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

@@ -188,10 +188,7 @@ public class CheckOrder {
         }
         // TODO: 2020/6/16 门店校验处理
         String takeMealFlag = createOrderVo.getTakeMealFlag();
-        //未营业无预约时间无法下单
-        if (!StoreConstant.BUSINESS.equals(storeResponseDto.getState()) && StringUtils.isBlank(takeMealFlag) && "0".equals(takeMealFlag)) {
-            throw new ServiceException(ResponseResult.STORE_ITEM_CHECK_CLOSE);
-//        String takeMealTimes = createOrderVo.getTakeMealTime();
+        String takeMealTimes = createOrderVo.getTakeMealTime();
 
         //立即送达
         if ("0".equals(takeMealFlag) || (StringUtils.isEmpty(createOrderVo.getExpectTime()) && StringUtils.isEmpty(takeMealTimes))) {
@@ -205,7 +202,6 @@ public class CheckOrder {
             }
         }
 
-        String takeMealTimes = createOrderVo.getTakeMealTime();
         //有预约时间
         if (StringUtils.isNotBlank(takeMealTimes) || StringUtils.isNotBlank(createOrderVo.getExpectTime())) {
             // 设置预约时间