Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into…

performance-api/src/main/java/com/clx/performance/enums/BreakContractSettlementLogEnum.java

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Optional;
+
+public enum BreakContractSettlementLogEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum Type {
+        CREATE_SETTLEMENT(1, "创建结算单"),
+        UPLOAD_SETTLEMENT (2, "上传结算凭证"),
+        OWNER_TO_BE_CONFIRMED(3, "货主确认结算单"),
+        SHIPPER_TO_PAYMENT(4, "货主付款"),
+        PLATFORM_CONFIRMED_OWNER_PAYMENT(5, "平台确认付款"),
+        PLATFORM_TO_PAYMENT(6, "平台付款"),
+        OWNER_CONFIRMED_PLATFORM_PAYMENT(7, "货主确认付款"),
+        COMPLETED(8, "已完结"),
+
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<Type> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> Objects.equals(e.getCode(), code)).findFirst();
+        }
+
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(Type::getMsg).orElse(null);
+        }
+    }
+
+
+    @Getter
+    @AllArgsConstructor
+    public enum DeleteStatus {
+        NO(0, "否"),
+        YES(1, "是"),
+
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+    }
+
+
+}

performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java

@@ -77,7 +77,8 @@ public enum PerformanceResultEnum implements ResultEnum {
 
     BREAK_CONTRACT_NO_FOUND(1600, "违约不存在"),
     BREAK_CONTRACT_RULE_NAME_EXIST(1601, "违约规则名称已存在"),
-    BREAK_CONTRACT_RULE_NO_FOUND(1601, "违约规则不存在"),
+    BREAK_CONTRACT_RULE_NO_FOUND(1602, "违约规则不存在"),
+    STATUS_CHANGED(1603, "状态已变更，请重新刷新页面"),
 
     ;
     private final int code;

performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/carrier/CarrierUploadInvoiceImgParam.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 CarrierUploadInvoiceImgParam  {
+
+    @NotNull(message = "id不能为空")
+    @ApiModelProperty(value = "id", example = "100")
+    private Integer id;
+
+    @NotNull(message = "结算凭证不能为空")
+    @ApiModelProperty(value="结算凭证",example = "/123.img")
+    private String invoiceImg;
+
+}

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.CarrierUploadInvoiceImgParam;
 import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementOwnerParam;
 import com.clx.performance.service.breakcontract.BreakContractSettlementOwnerService;
 import com.clx.performance.vo.pc.breakcontract.carrier.CarrierBreakContractSettlementOwnerDetailVO;
@@ -59,4 +60,11 @@ public class CarrierBreakContractSettlementOwnerController {
         return Result.ok(breakContractSettlementOwnerService.getCarrierBreakContractSettlementOwnerDetail(id));
     }
 
+    @ApiOperation(value = "上传结算凭证",notes = "<br>By:李瑞新")
+    @PostMapping("/uploadInvoiceImg")
+    public Result uploadInvoiceImg(@RequestBody @Validated CarrierUploadInvoiceImgParam param) {
+        breakContractSettlementOwnerService.uploadInvoiceImg(param);
+        return Result.ok();
+    }
+
 }

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

@@ -6,6 +6,7 @@ import com.clx.performance.mapper.breakcontract.BreakContractSettlementOwnerMapp
 import com.clx.performance.model.breakcontract.BreakContractSettlementOwner;
 import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementOwnerParam;
 import com.msl.common.dao.BaseDao;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @author liruixin
@@ -13,5 +14,8 @@ import com.msl.common.dao.BaseDao;
  * Time 16:02
  */
 public interface BreakContractSettlementOwnerDao extends BaseDao<BreakContractSettlementOwnerMapper, BreakContractSettlementOwner, Integer> {
+
     IPage<BreakContractSettlementOwner> pageCarrierBreakContractSettlementOwnerList(PageCarrierBreakContractSettlementOwnerParam param);
+
+    boolean uploadInvoiceImg(@Param("id")Integer id, @Param("invoiceImg")String invoiceImg);
 }

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

@@ -22,6 +22,8 @@ import java.util.Objects;
  */
 @Repository
 public class BreakContractSettlementOwnerDaoImpl extends BaseDaoImpl<BreakContractSettlementOwnerMapper, BreakContractSettlementOwner, Integer> implements BreakContractSettlementOwnerDao {
+
+
     @Override
     public IPage<BreakContractSettlementOwner> pageCarrierBreakContractSettlementOwnerList(PageCarrierBreakContractSettlementOwnerParam param) {
         LambdaQueryWrapper<BreakContractSettlementOwner> query = new LambdaQueryWrapper<>();
@@ -34,4 +36,14 @@ public class BreakContractSettlementOwnerDaoImpl extends BaseDaoImpl<BreakContra
         query.orderByDesc(BreakContractSettlementOwner::getId);
         return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
     }
+
+    @Override
+    public boolean uploadInvoiceImg(Integer id, String invoiceImg) {
+        return update(lUdWrapper()
+                .eq(BreakContractSettlementOwner::getId, id)
+                .eq(BreakContractSettlementOwner::getStatus, BreakContractSettlementOwnerEnum.Status.TO_BE_LOCKED.getCode())
+                .set(BreakContractSettlementOwner::getInvoiceImg, invoiceImg)
+                .set(BreakContractSettlementOwner::getStatus, BreakContractSettlementOwnerEnum.Status.OWNER_TO_BE_CONFIRMED.getCode())
+        );
+    }
 }

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

@@ -6,4 +6,6 @@ package com.clx.performance.service.breakcontract;
  * Time 16:02
  */
 public interface BreakContractSettlementLogService {
+
+    void saveBreakSettlementLog(String settlementNo,Integer type,String remark,Integer createType,Long createBy,String createName);
 }

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.CarrierUploadInvoiceImgParam;
 import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementOwnerParam;
 import com.clx.performance.vo.pc.breakcontract.carrier.CarrierBreakContractSettlementOwnerDetailVO;
 import com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractSettlementOwnerVO;
@@ -18,4 +19,6 @@ public interface BreakContractSettlementOwnerService  {
     SXSSFWorkbook exportCarrierBreakContractSettlementOwnerList(PageCarrierBreakContractSettlementOwnerParam param);
 
     CarrierBreakContractSettlementOwnerDetailVO getCarrierBreakContractSettlementOwnerDetail(Integer id);
+
+    void uploadInvoiceImg(CarrierUploadInvoiceImgParam param);
 }

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

 package com.clx.performance.service.impl.breakcontract;
 
+import com.clx.performance.dao.breakcontract.BreakContractSettlementLogDao;
+import com.clx.performance.dao.breakcontract.BreakContractSettlementOwnerDetailDao;
+import com.clx.performance.model.breakcontract.BreakContractSettlementLog;
 import com.clx.performance.service.breakcontract.BreakContractSettlementLogService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 /**
@@ -9,5 +14,21 @@ import org.springframework.stereotype.Service;
  * Time 16:02
  */
 @Service
+@Slf4j
+@AllArgsConstructor
 public class BreakContractSettlementLogServiceImpl implements BreakContractSettlementLogService {
+
+    private final BreakContractSettlementLogDao breakContractSettlementLogDao;
+
+    @Override
+    public void saveBreakSettlementLog(String settlementNo, Integer type, String remark, Integer createType, Long createBy, String createName) {
+        BreakContractSettlementLog breakContractSettlementLog = new BreakContractSettlementLog();
+        breakContractSettlementLog.setCreateBy(createBy);
+        breakContractSettlementLog.setCreateName(createName);
+        breakContractSettlementLog.setCreateType(createType);
+        breakContractSettlementLog.setRemark(remark);
+        breakContractSettlementLog.setSettlementNo(settlementNo);
+        breakContractSettlementLog.setType(type);
+        breakContractSettlementLogDao.saveEntity(breakContractSettlementLog);
+    }
 }

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

@@ -5,10 +5,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.breakcontract.BreakContractSettlementLogDao;
 import com.clx.performance.dao.breakcontract.BreakContractSettlementOwnerDao;
+import com.clx.performance.enums.BreakContractSettlementLogEnum;
+import com.clx.performance.enums.BreakContractSettlementOwnerEnum;
+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.CarrierUploadInvoiceImgParam;
 import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementOwnerParam;
+import com.clx.performance.service.breakcontract.BreakContractSettlementLogService;
 import com.clx.performance.service.breakcontract.BreakContractSettlementOwnerService;
 import com.clx.performance.struct.breakcontract.BreakContractSettlementLogStruct;
 import com.clx.performance.struct.breakcontract.BreakContractSettlementOwnerStruct;
@@ -19,6 +24,9 @@ import com.clx.performance.utils.excel.ExcelUtil;
 import com.clx.performance.vo.pc.breakcontract.carrier.CarrierBreakContractSettlementLogVO;
 import com.clx.performance.vo.pc.breakcontract.carrier.CarrierBreakContractSettlementOwnerDetailVO;
 import com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractSettlementOwnerVO;
+import com.msl.common.exception.ServiceSystemException;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
@@ -26,6 +34,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author liruixin
@@ -41,6 +50,7 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
     private final BreakContractSettlementOwnerStruct breakContractSettlementOwnerStruct;
     private final BreakContractSettlementLogDao breakContractSettlementLogDao;
     private final BreakContractSettlementLogStruct breakContractSettlementLogStruct;
+    private final BreakContractSettlementLogService breakContractSettlementLogService;
     
 
     @Override
@@ -118,4 +128,20 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
         detail.setLogs(settlementLogVOS);
         return detail;
     }
+
+    @Override
+    public void uploadInvoiceImg(CarrierUploadInvoiceImgParam 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.uploadInvoiceImg(param.getId(),param.getInvoiceImg());
+
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        //保存结算单日志----上传结算凭证
+        breakContractSettlementLogService.saveBreakSettlementLog(settlementOwner.getSettlementNo(),
+                BreakContractSettlementLogEnum.Type.CREATE_SETTLEMENT.getCode(),BreakContractSettlementLogEnum.Type.CREATE_SETTLEMENT.getMsg(),
+                OrderChildLogEnum.CreateType.PLATFORM.getCode(),loginUserInfo.getUserNo(),loginUserInfo.getUserName());
+    }
 }