Merge remote-tracking branch 'origin/v5.5_settlement_20231011' into v5.5_settlement_20231011

performance-api/src/main/java/com/clx/performance/vo/pc/CarrierSettlementOwnerDetailVO.java → performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierSettlementOwnerDetailVO.java

-package com.clx.performance.vo.pc;
+package com.clx.performance.vo.pc.carrier.settle;
 
 import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModelProperty;

performance-api/src/main/java/com/clx/performance/vo/pc/SettlementLogVO.java → performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/SettlementLogVO.java

-package com.clx.performance.vo.pc;
+package com.clx.performance.vo.pc.carrier.settle;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

performance-api/src/main/java/com/clx/performance/vo/pc/SettlementMergeVO.java → performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/SettlementMergeVO.java

-package com.clx.performance.vo.pc;
+package com.clx.performance.vo.pc.carrier.settle;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

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

 package com.clx.performance.controller.pc.carrier;
 
 import com.clx.performance.service.SettlementOwnerService;
-import com.clx.performance.vo.pc.CarrierSettlementOwnerDetailVO;
+import com.clx.performance.vo.pc.carrier.settle.CarrierSettlementOwnerDetailVO;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;

performance-web/src/main/java/com/clx/performance/model/SettlementLog.java

@@ -29,6 +29,7 @@ public class SettlementLog implements HasKey<Integer> {
     private String settlementNo;                    //结算单编号
     private Integer type;                           //类型
     private String remark;                          //内容
+    private Integer createType;                     //操作人类型1-货主， 2-承运端，3-司机
     private Long createBy;                          //操作人编号
     private String createName;                      //操作人名称
     private LocalDateTime createTime;                      //创建时间

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

@@ -8,4 +8,7 @@ package com.clx.performance.service;
  * Time 09:43
  */
 public interface SettlementLogService  {
+
+    void saveSettlementLog(String settlementNo, Integer type, String remark,
+                           Integer createType,Long createBy, String createName);
 }

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

 package com.clx.performance.service;
 
 
-import com.clx.performance.vo.pc.CarrierSettlementOwnerDetailVO;
+import com.clx.performance.vo.pc.carrier.settle.CarrierSettlementOwnerDetailVO;
 
 /**
  * @author liruixin

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

 package com.clx.performance.service.impl;
 
+import com.clx.performance.dao.SettlementLogDao;
+import com.clx.performance.model.SettlementLog;
 import com.clx.performance.service.SettlementLogService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -8,6 +13,26 @@ import org.springframework.stereotype.Service;
  * Date 2023-10-12
  * Time 09:43
  */
+@Slf4j
 @Service
+@AllArgsConstructor
 public class SettlementLogServiceImpl  implements SettlementLogService {
+
+    @Autowired
+    private final SettlementLogDao settlementLogDao;
+
+
+    @Override
+    public void saveSettlementLog(String settlementNo, Integer type, String remark, Integer createType, Long createBy, String createName) {
+
+        SettlementLog settlementLog = new SettlementLog();
+        settlementLog.setSettlementNo(settlementNo);
+        settlementLog.setType(type);
+        settlementLog.setRemark(remark);
+        settlementLog.setCreateType(createType);
+        settlementLog.setCreateBy(createBy);
+        settlementLog.setCreateName(createName);
+
+        settlementLogDao.saveEntity(settlementLog);
+    }
 }

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

@@ -8,8 +8,8 @@ import com.clx.performance.model.SettlementOwner;
 import com.clx.performance.service.SettlementOwnerService;
 import com.clx.performance.struct.SettlementLogStruct;
 import com.clx.performance.struct.SettlementOwnerStruct;
-import com.clx.performance.vo.pc.CarrierSettlementOwnerDetailVO;
-import com.clx.performance.vo.pc.SettlementLogVO;
+import com.clx.performance.vo.pc.carrier.settle.CarrierSettlementOwnerDetailVO;
+import com.clx.performance.vo.pc.carrier.settle.SettlementLogVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

performance-web/src/main/java/com/clx/performance/struct/SettlementLogStruct.java

 package com.clx.performance.struct;
 
 import com.clx.performance.model.SettlementLog;
-import com.clx.performance.vo.pc.SettlementLogVO;
+import com.clx.performance.vo.pc.carrier.settle.SettlementLogVO;
 import com.msl.common.utils.DateStructUtil;
 import com.msl.common.utils.DateUtils;
 import org.mapstruct.Mapper;

performance-web/src/main/java/com/clx/performance/struct/SettlementOwnerStruct.java

@@ -2,8 +2,8 @@ package com.clx.performance.struct;
 
 import com.clx.performance.enums.SettlementOwnerEnum;
 import com.clx.performance.model.SettlementOwner;
-import com.clx.performance.vo.pc.CarrierSettlementOwnerDetailVO;
-import com.clx.performance.vo.pc.SettlementMergeVO;
+import com.clx.performance.vo.pc.carrier.settle.CarrierSettlementOwnerDetailVO;
+import com.clx.performance.vo.pc.carrier.settle.SettlementMergeVO;
 import com.msl.common.utils.DateStructUtil;
 import com.msl.common.utils.DateUtils;
 import org.mapstruct.Mapper;