合并代码

assortment-ordercenter-sdk/readme.md

@@ -17,4 +17,5 @@
 | 1.2.2.RELEASE| 升级RELEASE  | wuping | 2020-03-04 |
 | 1.1.7-SNAPSHOT| 预约单支付成功接口增加预约任务  | wuping | 2020-03-10 |
 | 1.1.8-SNAPSHOT| 预约单接单接口增加预约任务  | wuping | 2020-03-17 |
-| 1.2.3.RELEASE | 预约单升级RELEASE | wuping | 2020-03-18 |
\ No newline at end of file
+| 1.2.3.RELEASE | 预约单升级RELEASE | wuping | 2020-03-18 |
+| 1.2.4.RELEASE | 紧急需求 增加骑手电话 | 海波 | 2020-03-19 |
\ No newline at end of file

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

@@ -876,6 +876,8 @@ public class OrderAdapter {
             responseVo.setReceiveCity(ordersBean.getReceiveCity());
             responseVo.setReceiveRegion(ordersBean.getReceiveRegion());
             responseVo.setReceiveMobile(ordersBean.getPhone());
+            if(ordersBean.getAddInfo()!=null&&StringUtils.isNotEmpty(ordersBean.getAddInfo().getRiderPhone()))
+                responseVo.setRiderPhone(ordersBean.getAddInfo().getRiderPhone());
             responseVo.setTakeMealType(ordersBean.getGmtExpect() == null ? 0 : 1);
             responseVo.setTakeMealTypeDesc(responseVo.getTakeMealType() == 0 ? "立即取餐" : "预约取餐");
             if(ordersBean.getAddInfo()!=null&&StringUtils.isNotEmpty(ordersBean.getAddInfo().getRiderPhone()))

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

@@ -165,9 +165,16 @@ public class CheckOrder {
         } catch (ParseException e) {
             throw new ServiceException(ResponseResult.STORE_BUSINESS_HOUR_ERROR);
         }
-        //隔天营业时间处理
+        //隔天营业时间处理  营业时间 8:00-2:00
+        // 当前时间 3-19号 08:01  则整体营业时间为3-19号 8:00 到 3-20号 2:00
+        // 当前时间 3-20号 00:01  则整体营业时间为3-19号 8:00 到 3-20号 2:00
+        // 当前时间 3-20号 02:01  则营业时间为3-20号 8:00 到 3-21号 2:00
         if(startDateTime.after(endDateTime)){
-            endDateTime = DateUtil.addDays(endDateTime,1);
+            if(endDateTime.after(date)){
+                startDateTime = DateUtil.addDays(startDateTime,-1);
+            }else {
+                endDateTime = DateUtil.addDays(endDateTime,1);
+            }
         }
         storeResponseDto.setBusinessHoursDayStartTime(startDateTime);
         storeResponseDto.setBusinessHoursDayEndTime(endDateTime);

order-management/order-management.iml

@@ -40,8 +40,8 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.16" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: cn.freemud:assortment-ordercenter-sdk:1.1.5.RELEASE" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: cn.freemud:ordercenter-sdk:1.1.2.RELEASE" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: cn.freemud:assortment-ordercenter-sdk:1.2.3.RELEASE" level="project" />
+    <orderEntry type="module" module-name="ordercenter-sdk" scope="PROVIDED" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
     <orderEntry type="library" name="Maven: cn.freemud.commons:commons-amqp:2.1.0-release" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-amqp:1.5.3.RELEASE" level="project" />