oms订单履单正向流程

order-management/src/main/java/cn/freemud/management/controller/OrderManagerController.java

@@ -36,8 +36,8 @@ public class OrderManagerController {
     private OrderManagerAdapter orderManagerAdapter;
 
 
-    @ApiAnnotation(logMessage = "订单履单")
-    @ApiOperation(value = "订单履单", notes = "订单履单", produces = "application/json")
+    @ApiAnnotation(logMessage = "oms订单履单")
+    @ApiOperation(value = "oms订单履单", notes = "订单履单", produces = "application/json")
     @PostMapping("/statusOperate")
     public BaseResponse deliveryCreate(@Validated @LogParams @RequestBody OrderManagerRequest request) {
         OperateType byOpType = OperateType.getByOpType(request.getOperateType());

order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

@@ -55,37 +55,26 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
 
     /**
      * 接单
-     * @param request 请求参数
+     *
+     * @param request   请求参数
      * @param orderBean 订单实体
      * @return
      */
     @Override
     public BaseResponse<OrderManagerResponse> orderConfirm(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
-        //退款状态
-        RefundStatus refundStatus = CollectionUtils.isEmpty(orderBean.getRefundList()) ? null : RefundStatus.getByCode(orderBean.getRefundList().get(0).getStatus());
-        //订单接单
-        BaseQueryOrderRequest orderConfirmRequest = orderSdkAdapter.getOrderConfirmRequest(request.getOperator(), orderBean);
-        BaseOrderResponse confirmOrderResponse = orderCenterSdkService.orderConfirmTake(orderConfirmRequest);
+        // 订单接单
+        saasOrderService.orderAffirm(request, orderBean);
         //获取门店信息
-        StoreResponse storeInfo = storeCenterService.getStoreInfo(new StoreInfoRequest(orderBean.getCompanyId(), orderBean.getShopId()),"");
-        if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(),storeInfo.getStatusCode().toString()) || storeInfo.getBizVO() == null) {
+        StoreResponse storeInfo = storeCenterService.getStoreInfo(new StoreInfoRequest(orderBean.getCompanyId(), orderBean.getShopId()), "");
+        if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), storeInfo.getStatusCode().toString()) || storeInfo.getBizVO() == null) {
             return ResponseUtil.error(ResponseResult.STORE_NOT_FOUND);
         }
-        //处理1秒重复接单问题 订单服务接单返回20067重复操作，20018状态机不支持认为接单成功
-        if ("20067".equals(confirmOrderResponse.getErrcode().toString()) || "20018".equals(confirmOrderResponse.getErrcode().toString()) || "50002".equals(confirmOrderResponse.getErrcode().toString()) ) {
-            return ResponseUtil.success(new OrderManagerResponse(storeInfo.getBizVO().getOrderPrintConfig(),orderBean.getGmtExpect(),refundStatus));
-        }
-        if( ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(),confirmOrderResponse.getErrcode().toString())){
-            return ResponseUtil.error(ResponseResult.ORDER_ACCEPT_FAILED);
-        }
-        //创建配送单
-        Pair<Boolean, String> deliveryResponse = orderDeliveryService.createDelivery(orderBean, storeInfo, request.getOperator());
-        if (!deliveryResponse.getKey()){
-            return ResponseUtil.error(ResponseResult.ORDER_ACCEPT_FAILED_CREATE_DELIVERY_FAILED);
-        }
+        // 创建配送单
+        orderDeliveryService.createDelivery(orderBean, storeInfo, request.getOperator());
         // 推送pos消息中心
-        orderBaseService.sendMessage(orderBean, OperateType.ORDER_CONFIRM,request.getReason());
-        return ResponseUtil.success(new OrderManagerResponse(storeInfo.getBizVO().getOrderPrintConfig(),orderBean.getGmtExpect(),refundStatus));
+        orderBaseService.sendMessage(orderBean, OperateType.ORDER_CONFIRM, request.getReason());
+        return ResponseUtil.success(new OrderManagerResponse(storeInfo.getBizVO().getOrderPrintConfig(), orderBean.getGmtExpect(),
+                CollectionUtils.isEmpty(orderBean.getRefundList()) ? null : RefundStatus.getByCode(orderBean.getRefundList().get(0).getStatus())));
     }
 
     /**
@@ -97,14 +86,10 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
      */
     @Override
     public BaseResponse<OrderManagerResponse> orderDone(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
-        //订单制作完成
-        BaseQueryOrderRequest orderDoneRequest = orderSdkAdapter.getOrderConfirmRequest(request.getOperator(), orderBean);
-        BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderDone(orderDoneRequest);
-        if (baseOrderResponse==null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(),baseOrderResponse.getErrcode().toString())){
-            return ResponseUtil.error(ResponseResult.DELIVERY_FAIL);
-        }
+        // 订单制作完成
+        saasOrderService.orderDone(request, orderBean);
         // 推送pos消息中心
-        orderBaseService.sendMessage(orderBean, OperateType.ORDER_DONE,request.getReason());
+        orderBaseService.sendMessage(orderBean, OperateType.ORDER_DONE, request.getReason());
         return ResponseUtil.success();
     }
 
@@ -117,14 +102,10 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
      */
     @Override
     public BaseResponse<OrderManagerResponse> orderDelivery(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
-        //订单配送
-        BaseQueryOrderRequest orderDeliveryRequest = orderSdkAdapter.getOrderDeliveryRequest(request.getOperator(), orderBean);
-        BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderSend(orderDeliveryRequest);
-        if (baseOrderResponse==null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(),baseOrderResponse.getErrcode().toString())){
-            return ResponseUtil.error(ResponseResult.DELIVERY_FAIL);
-        }
+        // 订单配送
+        saasOrderService.orderDelivery(request, orderBean);
         // 推送pos消息中心
-        orderBaseService.sendMessage(orderBean, OperateType.ORDER_SEND,request.getReason());
+        orderBaseService.sendMessage(orderBean, OperateType.ORDER_SEND, request.getReason());
         return ResponseUtil.success();
     }
 
@@ -137,14 +118,10 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
      */
     @Override
     public BaseResponse<OrderManagerResponse> orderAffirm(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
-        //订单完成
-        BaseQueryOrderRequest orderAffirmRequest = orderSdkAdapter.getOrderDeliveryRequest(request.getOperator(), orderBean);
-        BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderAffirm(orderAffirmRequest);
-        if (baseOrderResponse==null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(),baseOrderResponse.getErrcode().toString())){
-            return ResponseUtil.error(ResponseResult.DELIVERY_FAIL);
-        }
+        // 订单完成
+        saasOrderService.orderAffirm(request, orderBean);
         // 推送pos消息中心
-        orderBaseService.sendMessage(orderBean, OperateType.ORDER_AFFIRM,request.getReason());
+        orderBaseService.sendMessage(orderBean, OperateType.ORDER_AFFIRM, request.getReason());
         return ResponseUtil.success();
     }
 

order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderService.java

@@ -2,6 +2,7 @@ package cn.freemud.management.service.impl;
 
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
+import cn.freemud.management.entities.dto.response.order.OrderManagerResponse;
 import cn.freemud.management.enums.ResponseResult;
 import cn.freemud.management.intercept.OrderServiceException;
 import cn.freemud.management.util.ResponseUtil;
@@ -33,6 +34,27 @@ public class SaasOrderService {
     @Autowired
     private OrderCenterSdkService orderCenterSdkService;
 
+
+    /**
+     * 确认接单
+     * @param request
+     * @param orderBean
+     * @return
+     */
+    public BaseResponse orderConfirm(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean){
+        //订单接单
+        BaseQueryOrderRequest orderConfirmRequest = orderSdkAdapter.getOrderConfirmRequest(request.getOperator(), orderBean);
+        BaseOrderResponse confirmOrderResponse = orderCenterSdkService.orderConfirmTake(orderConfirmRequest);
+        //处理1秒重复接单问题 订单服务接单返回20067重复操作，20018状态机不支持认为接单成功
+        if ("20067".equals(confirmOrderResponse.getErrcode().toString()) || "20018".equals(confirmOrderResponse.getErrcode().toString()) || "50002".equals(confirmOrderResponse.getErrcode().toString()) ) {
+            return ResponseUtil.success();
+        }
+        if( ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(),confirmOrderResponse.getErrcode().toString())){
+            throw new OrderServiceException(ResponseResult.ORDER_ACCEPT_FAILED);
+        }
+        return ResponseUtil.success();
+    }
+
     /**
      * 订单制作完成
      * @param request