接口修改

performance-web/src/main/java/com/clx/performance/controller/pc/breakcontract/carrier/CarrierBreakContractSettlementOwnerController.java

@@ -67,9 +67,9 @@ public class CarrierBreakContractSettlementOwnerController {
     }
 
     @ApiOperation(value = "取消结算单",notes = "<br>By:李瑞新")
-    @PostMapping("/uploadCancelSettlement")
-    public Result uploadCancelSettlement(@RequestBody @Validated CarrierCancelSettlementParam param) {
-        breakContractSettlementOwnerService.uploadCancelSettlement(param);
+    @PostMapping("/updateCancelSettlement")
+    public Result updateCancelSettlement(@RequestBody @Validated CarrierCancelSettlementParam param) {
+        breakContractSettlementOwnerService.updateCancelSettlement(param);
         return Result.ok();
     }
 

performance-web/src/main/java/com/clx/performance/dao/breakcontract/BreakContractSettlementOwnerDao.java

@@ -20,10 +20,8 @@ public interface BreakContractSettlementOwnerDao extends BaseDao<BreakContractSe
 
     boolean uploadInvoiceImg(@Param("id")Integer id, @Param("invoiceImg")String invoiceImg);
 
-    boolean uploadCancelSettlement(@Param("id")Integer id);
+    boolean updateStatus(@Param("id")Integer id,@Param("from")Integer from,@Param("to")Integer to);
 
     boolean saveCarrierBreakContractPayee(CarrierBreakContractSavePayeeParam param);
 
-
-    boolean updateCarrierBreakContractPayeeConfirm(@Param("id")Integer id);
 }

performance-web/src/main/java/com/clx/performance/dao/impl/breakcontract/BreakContractSettlementOwnerDaoImpl.java

@@ -47,15 +47,6 @@ public class BreakContractSettlementOwnerDaoImpl extends BaseDaoImpl<BreakContra
         );
     }
 
-    @Override
-    public boolean uploadCancelSettlement(Integer id) {
-        return update(lUdWrapper()
-                .eq(BreakContractSettlementOwner::getId, id)
-                .eq(BreakContractSettlementOwner::getStatus, BreakContractSettlementOwnerEnum.Status.TO_BE_LOCKED.getCode())
-                .set(BreakContractSettlementOwner::getStatus, BreakContractSettlementOwnerEnum.Status.CANCEL.getCode())
-        );
-    }
-
     @Override
     public boolean saveCarrierBreakContractPayee(CarrierBreakContractSavePayeeParam param) {
         return update(lUdWrapper()
@@ -69,12 +60,13 @@ public class BreakContractSettlementOwnerDaoImpl extends BaseDaoImpl<BreakContra
         );
     }
 
+
     @Override
-    public boolean updateCarrierBreakContractPayeeConfirm(Integer id) {
+    public boolean updateStatus(Integer id, Integer from, Integer to) {
         return update(lUdWrapper()
                 .eq(BreakContractSettlementOwner::getId, id)
-                .eq(BreakContractSettlementOwner::getStatus, BreakContractSettlementOwnerEnum.Status.PLATFORM_CONFIRMED_OWNER_PAYMENT.getCode())
-                .set(BreakContractSettlementOwner::getStatus, BreakContractSettlementOwnerEnum.Status.COMPLETED.getCode())
+                .eq(BreakContractSettlementOwner::getStatus, from)
+                .set(BreakContractSettlementOwner::getStatus, to)
         );
     }
 }

performance-web/src/main/java/com/clx/performance/service/breakcontract/BreakContractSettlementOwnerService.java

@@ -21,7 +21,7 @@ public interface BreakContractSettlementOwnerService  {
 
     void uploadInvoiceImg(CarrierUploadInvoiceImgParam param);
 
-    void uploadCancelSettlement(CarrierCancelSettlementParam param);
+    void updateCancelSettlement(CarrierCancelSettlementParam param);
 
     void saveCarrierBreakContractPayee(CarrierBreakContractSavePayeeParam param);
 

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

@@ -148,13 +148,13 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void uploadCancelSettlement(CarrierCancelSettlementParam param) {
+    public void updateCancelSettlement(CarrierCancelSettlementParam param) {
         BreakContractSettlementOwner settlementOwner = breakContractSettlementOwnerDao.getEntityByKey(param.getId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         if(!Objects.equals(settlementOwner.getStatus(), BreakContractSettlementOwnerEnum.Status.TO_BE_LOCKED.getCode())){
             throw new ServiceSystemException(PerformanceResultEnum.STATUS_CHANGED);
         }
 
-        breakContractSettlementOwnerDao.uploadCancelSettlement(param.getId());
+        breakContractSettlementOwnerDao.updateStatus(param.getId(),BreakContractSettlementOwnerEnum.Status.TO_BE_LOCKED.getCode(),BreakContractSettlementOwnerEnum.Status.CANCEL.getCode());
 
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
         //保存结算单日志----取消结算单
@@ -188,7 +188,8 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
             throw new ServiceSystemException(PerformanceResultEnum.STATUS_CHANGED);
         }
 
-        breakContractSettlementOwnerDao.updateCarrierBreakContractPayeeConfirm(param.getId());
+        breakContractSettlementOwnerDao.updateStatus(param.getId(),BreakContractSettlementOwnerEnum.Status.PLATFORM_CONFIRMED_OWNER_PAYMENT.getCode(),BreakContractSettlementOwnerEnum.Status.COMPLETED.getCode());
+
 
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
         //保存结算单日志----平台付款