取消结算单

performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/carrier/CarrierCancelSettlementParam.java

+package com.clx.performance.param.pc.breakcontract.carrier;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class CarrierCancelSettlementParam {
+
+    @NotNull(message = "id不能为空")
+    @ApiModelProperty(value = "id", example = "100")
+    private Integer id;
+
+}

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

 package com.clx.performance.controller.pc.breakcontract.carrier;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.breakcontract.carrier.CarrierCancelSettlementParam;
 import com.clx.performance.param.pc.breakcontract.carrier.CarrierUploadInvoiceImgParam;
 import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementOwnerParam;
 import com.clx.performance.service.breakcontract.BreakContractSettlementOwnerService;
@@ -67,4 +68,11 @@ public class CarrierBreakContractSettlementOwnerController {
         return Result.ok();
     }
 
+    @ApiOperation(value = "取消结算单",notes = "<br>By:李瑞新")
+    @PostMapping("/uploadCancelSettlement")
+    public Result uploadCancelSettlement(@RequestBody @Validated CarrierCancelSettlementParam param) {
+        breakContractSettlementOwnerService.uploadCancelSettlement(param);
+        return Result.ok();
+    }
+
 }

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

@@ -18,4 +18,6 @@ public interface BreakContractSettlementOwnerDao extends BaseDao<BreakContractSe
     IPage<BreakContractSettlementOwner> pageCarrierBreakContractSettlementOwnerList(PageCarrierBreakContractSettlementOwnerParam param);
 
     boolean uploadInvoiceImg(@Param("id")Integer id, @Param("invoiceImg")String invoiceImg);
+
+    boolean uploadCancelSettlement(@Param("id")Integer id);
 }

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

@@ -45,4 +45,13 @@ public class BreakContractSettlementOwnerDaoImpl extends BaseDaoImpl<BreakContra
                 .set(BreakContractSettlementOwner::getStatus, BreakContractSettlementOwnerEnum.Status.OWNER_TO_BE_CONFIRMED.getCode())
         );
     }
+
+    @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())
+        );
+    }
 }

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

 package com.clx.performance.service.breakcontract;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.breakcontract.carrier.CarrierCancelSettlementParam;
 import com.clx.performance.param.pc.breakcontract.carrier.CarrierUploadInvoiceImgParam;
 import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementOwnerParam;
 import com.clx.performance.vo.pc.breakcontract.carrier.CarrierBreakContractSettlementOwnerDetailVO;
@@ -21,4 +22,6 @@ public interface BreakContractSettlementOwnerService  {
     CarrierBreakContractSettlementOwnerDetailVO getCarrierBreakContractSettlementOwnerDetail(Integer id);
 
     void uploadInvoiceImg(CarrierUploadInvoiceImgParam param);
+
+    void uploadCancelSettlement(CarrierCancelSettlementParam param);
 }

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

@@ -11,6 +11,7 @@ import com.clx.performance.enums.OrderChildLogEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.model.breakcontract.BreakContractSettlementLog;
 import com.clx.performance.model.breakcontract.BreakContractSettlementOwner;
+import com.clx.performance.param.pc.breakcontract.carrier.CarrierCancelSettlementParam;
 import com.clx.performance.param.pc.breakcontract.carrier.CarrierUploadInvoiceImgParam;
 import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementOwnerParam;
 import com.clx.performance.service.breakcontract.BreakContractSettlementLogService;
@@ -31,6 +32,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -130,6 +132,7 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void uploadInvoiceImg(CarrierUploadInvoiceImgParam param) {
 
         BreakContractSettlementOwner settlementOwner = breakContractSettlementOwnerDao.getEntityByKey(param.getId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
@@ -144,4 +147,20 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
                 BreakContractSettlementLogEnum.Type.CREATE_SETTLEMENT.getCode(),BreakContractSettlementLogEnum.Type.CREATE_SETTLEMENT.getMsg(),
                 OrderChildLogEnum.CreateType.PLATFORM.getCode(),loginUserInfo.getUserNo(),loginUserInfo.getUserName());
     }
+
+    @Override
+    public void uploadCancelSettlement(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());
+
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        //保存结算单日志----取消结算单
+        breakContractSettlementLogService.saveBreakSettlementLog(settlementOwner.getSettlementNo(),
+                BreakContractSettlementLogEnum.Type.CANCEL.getCode(),BreakContractSettlementLogEnum.Type.CANCEL.getMsg(),
+                OrderChildLogEnum.CreateType.PLATFORM.getCode(),loginUserInfo.getUserNo(),loginUserInfo.getUserName());
+    }
 }