Merge remote-tracking branch 'origin/master'

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

@@ -518,6 +518,10 @@ public class CheckOrder {
         Date startDateTime;
         Date endDateTime;
         startDateTime = DateUtil.convert2Date(startDateTimeStr, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
+        //判断营业开始时间是24:00点
+        if (startDateTime == null) {
+            throw new ServiceException(ResponseResult.STORE_BUSINESS_HOUR_ERROR);
+        }
         SimpleDateFormat hhmmss = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {
             endDateTime = hhmmss.parse(endDateTimeStr);

order-management/pom.xml

@@ -59,7 +59,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.1.76-RELEASE</version>
+            <version>2.1.84-RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java

@@ -67,9 +67,10 @@ public class SaasOrderHandle {
         BaseQueryOrderRequest orderConfirmRequest = orderSdkAdapter.getOrderConfirmRequest(request.getOperator(), orderBean);
         orderSdkAdapter.convert2wmDeliveryTimeOut(orderConfirmRequest,this.wmDeliveryTimeOut);
         //合阔pos 商户订单状态不自动扭转
-        if (CollectionUtils.isNotEmpty(notAutomaticTwistPartnerId) && notAutomaticTwistPartnerId.contains(orderBean.getCompanyId())) {
-            orderConfirmRequest.setNotAutomaticTwist(true);
-        }
+        // 2021-07-07 合阔自动
+//        if (CollectionUtils.isNotEmpty(notAutomaticTwistPartnerId) && notAutomaticTwistPartnerId.contains(orderBean.getCompanyId())) {
+//            orderConfirmRequest.setNotAutomaticTwist(true);
+//        }
         BaseOrderResponse confirmOrderResponse = orderCenterSdkService.orderConfirmTake(orderConfirmRequest);
         //处理1秒重复接单问题 订单服务接单返回20067重复操作，20018状态机不支持认为接单成功
         if ("20067".equals(confirmOrderResponse.getErrcode().toString()) || "20018".equals(confirmOrderResponse.getErrcode().toString()) || "50002".equals(confirmOrderResponse.getErrcode().toString())) {
@@ -111,9 +112,10 @@ public class SaasOrderHandle {
     public BaseResponse orderDone(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
         BaseQueryOrderRequest orderDoneRequest = orderSdkAdapter.getOrderConfirmRequest(request.getOperator(), orderBean);
         //合阔pos 商户订单状态不自动扭转
-        if (CollectionUtils.isNotEmpty(notAutomaticTwistPartnerId) && notAutomaticTwistPartnerId.contains(orderBean.getCompanyId())) {
-            orderDoneRequest.setNotAutomaticTwist(true);
-        }
+        // 2021-07-07 合阔自动
+//        if (CollectionUtils.isNotEmpty(notAutomaticTwistPartnerId) && notAutomaticTwistPartnerId.contains(orderBean.getCompanyId())) {
+//            orderDoneRequest.setNotAutomaticTwist(true);
+//        }
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderDone(orderDoneRequest);
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
             return ResponseUtil.error(ResponseResult.DONE_ORDER_FAIL);