Merge branch 'feature/20210707_hekuoOrderAutoComplete_miaohui' into 'qa'

kehuo need auto order complete

See merge request !123

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

@@ -68,9 +68,9 @@ public class SaasOrderHandle {
         orderSdkAdapter.convert2wmDeliveryTimeOut(orderConfirmRequest,this.wmDeliveryTimeOut);
         //合阔pos 商户订单状态不自动扭转
         // 2021-07-07 合阔自动
-//        if (CollectionUtils.isNotEmpty(notAutomaticTwistPartnerId) && notAutomaticTwistPartnerId.contains(orderBean.getCompanyId())) {
-//            orderConfirmRequest.setNotAutomaticTwist(true);
-//        }
+        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())) {
@@ -113,9 +113,9 @@ public class SaasOrderHandle {
         BaseQueryOrderRequest orderDoneRequest = orderSdkAdapter.getOrderConfirmRequest(request.getOperator(), orderBean);
         //合阔pos 商户订单状态不自动扭转
         // 2021-07-07 合阔自动
-//        if (CollectionUtils.isNotEmpty(notAutomaticTwistPartnerId) && notAutomaticTwistPartnerId.contains(orderBean.getCompanyId())) {
-//            orderDoneRequest.setNotAutomaticTwist(true);
-//        }
+        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);