运单

performance-web/src/main/java/com/clx/performance/controller/app/DriverOrderChildController.java

@@ -2,6 +2,7 @@ package com.clx.performance.controller.app;
 
 import com.clx.performance.param.app.*;
 import com.clx.performance.service.OrderChildService;
+import com.clx.performance.vo.app.SaveOrderChildVO;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -32,7 +33,7 @@ public class DriverOrderChildController {
 
     @ApiOperation(value = "接单", notes = "<br>By:艾庆国")
     @PostMapping("/saveOrderChild")
-    public Result<SaveOrderChildVo> saveOrderChild(@RequestBody @Validated OrderChildSaveParam param) {
+    public Result<SaveOrderChildVO> saveOrderChild(@RequestBody @Validated OrderChildSaveParam param) {
 
         return Result.ok(orderChildService.saveOrderChild(param));
     }

performance-web/src/main/java/com/clx/performance/service/OrderChildService.java

@@ -3,6 +3,7 @@ package com.clx.performance.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.app.*;
 import com.clx.performance.param.pc.PagePoundAuditParam;
+import com.clx.performance.vo.app.SaveOrderChildVO;
 import com.clx.performance.vo.pc.OrderChildPoundAuditVO;
 
 
@@ -15,7 +16,7 @@ import com.clx.performance.vo.pc.OrderChildPoundAuditVO;
 
 public interface OrderChildService {
 
-    SaveOrderChildVo saveOrderChild(OrderChildSaveParam param);
+    SaveOrderChildVO saveOrderChild(OrderChildSaveParam param);
 
     void updateGotoSendAddress(OrderChildGoToSendAddressParam param);
     void updateArriveSendAddress(OrderChildArriveSendAddressParam param);

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -13,6 +13,7 @@ import com.clx.performance.param.app.*;
 import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.service.OrderChildLogService;
 import com.clx.performance.service.OrderChildService;
+import com.clx.performance.vo.app.SaveOrderChildVO;
 import com.clx.performance.vo.pc.OrderChildPoundAuditVO;
 import com.msl.common.enums.ResultCodeEnum;
 import com.msl.common.exception.ServiceSystemException;
@@ -52,7 +53,7 @@ public class OrderChildServiceImpl implements OrderChildService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public SaveOrderChildVo saveOrderChild(OrderChildSaveParam param) {
+    public SaveOrderChildVO saveOrderChild(OrderChildSaveParam param) {
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
 
         Long userNo = loginUserInfo.getUserNo();
@@ -116,7 +117,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChildLogService.saveOrderChildLog(childNo, OrderChildLogEnum.Type.CREATED.getCode(), OrderChildLogEnum.Type.CREATED.getMsg(),
                 1, loginUserInfo.getUserNo(), loginUserInfo.getUserName());
 
-        SaveOrderChildVo result = new SaveOrderChildVo();
+        SaveOrderChildVO result = new SaveOrderChildVO();
         result.setChildNo(childNo);
         return result;
     }
@@ -306,7 +307,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setUnloadTime(LocalDateTime.now());
         orderChild.setWeight(orderChildWeightCalc(orderChild));
 
-        orderChild.setStatus(OrderChildEnum.Status.DRIVER_CONFIRM.getCode());
+        orderChild.setStatus(OrderChildEnum.Status.UNLOAD.getCode());
         orderChildDao.updateUnload(orderChild);
 
         orderChildImageDao.batchSaveEntity(imageList);
@@ -373,7 +374,7 @@ public class OrderChildServiceImpl implements OrderChildService {
 //        orderChild.setUnloadTime(now);
         orderChild.setWeight(orderChildWeightCalc(orderChild));
 
-        orderChild.setStatus(OrderChildEnum.Status.DRIVER_CONFIRM.getCode());
+        orderChild.setStatus(OrderChildEnum.Status.UNLOAD.getCode());
         orderChildDao.updateLoadAndUnload(orderChild);
 
         orderChildImageDao.deleteLoadAndUnload(childNo);
@@ -392,7 +393,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         String childNo = param.getChildNo();
 
         OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(ResultCodeEnum.FAIL);
-        if (!Objects.equals(orderChild.getStatus(), OrderChildEnum.Status.DRIVER_CONFIRM.getCode())){
+        if (!Objects.equals(orderChild.getStatus(), OrderChildEnum.Status.UNLOAD.getCode())){
             throw new ServiceSystemException(ResultCodeEnum.FAIL);
         }