保存delivery status

order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java

@@ -11,6 +11,7 @@ import cn.freemud.enums.DeliveryStatus;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
+import cn.freemud.management.entities.dto.response.order.OrderManagerResponse;
 import cn.freemud.management.enums.OperateType;
 import cn.freemud.management.service.adapter.OrderManagerAdapter;
 import cn.freemud.service.Orderservice;
@@ -171,12 +172,21 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
         }
         if (deliveryStatus == DeliveryStatus.RIDERGETMEAL.getCode() || deliveryStatus == DeliveryStatus.RIDERSTARTDELIVERY.getCode()){
             orderManagerRequest.setOperateType(OperateType.ORDER_SEND.getOpType());
-            return orderManagerAdapter.orderDelivery(orderManagerRequest);
+            BaseResponse<OrderManagerResponse> baseResponse = orderManagerAdapter.orderDelivery(orderManagerRequest);
+            if(ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(baseResponse.getCode())) {
+                updateDeliveryStatus(request);
+            }
+            return baseResponse;
         } else if (deliveryStatus == DeliveryStatus.DELIVERYARRIVED.getCode() ){
             orderManagerRequest.setOperateType(OperateType.ORDER_AFFIRM.getOpType());
-            return orderManagerAdapter.orderAffirm(orderManagerRequest,null);
+            BaseResponse<OrderManagerResponse> baseResponse = orderManagerAdapter.orderAffirm(orderManagerRequest, null);
+            if(ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(baseResponse.getCode())) {
+                updateDeliveryStatus(request);
+            }
+            return baseResponse;
         } else if(deliveryStatus == DeliveryStatus.WATINGORDER.getCode() || deliveryStatus == DeliveryStatus.SYSTEMGETORDER.getCode()
                 || deliveryStatus == DeliveryStatus.ALLOTRIDER.getCode()|| deliveryStatus == DeliveryStatus.RIDERARRIVESTORE.getCode()) {
+            updateDeliveryStatus(request);
             return ResponseUtil.success();
         } else if(deliveryStatus == DeliveryStatus.COLLECTING.getCode()) {
             //推送订单到拉单队列
@@ -188,16 +198,20 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
                 ResponseUtil.error(ResponseResult.ORDER_COLLECT_FAILED);
             }
             //回调成功，记录汇集状态
-            UpdateDeliveryInfoByIdRequest updateDeliveryInfoByIdRequest = new UpdateDeliveryInfoByIdRequest();
-            updateDeliveryInfoByIdRequest.setOrderId(request.getOrderId());
-            updateDeliveryInfoByIdRequest.setOrderSubState(DeliveryStatus.COLLECTING.getCode());
-            updateDeliveryInfoByIdRequest.setOperator("sys");
-            orderCenterSdkService.updateDeliveryInfoById(updateDeliveryInfoByIdRequest);
+            updateDeliveryStatus(request);
             return ResponseUtil.success();
         }
         return ResponseUtil.error(ResponseResult.ORDER_DELIVERY_CALL_BACK_FAILED);
     }
 
+    private OrderBaseResponse updateDeliveryStatus(MacCafeCallbackUrlRequestDto request) {
+        UpdateDeliveryInfoByIdRequest updateDeliveryInfoByIdRequest = new UpdateDeliveryInfoByIdRequest();
+        updateDeliveryInfoByIdRequest.setOrderId(request.getOrderId());
+        updateDeliveryInfoByIdRequest.setOrderSubState(request.getDeliveryStatus());
+        updateDeliveryInfoByIdRequest.setOperator("sys");
+        return orderCenterSdkService.updateDeliveryInfoById(updateDeliveryInfoByIdRequest);
+    }
+
     /**
      * 配送单异常并且顾客更改配送地址
      *