结算单增加日志

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

 package com.clx.performance.service.impl.settle;
 
-import com.clx.order.enums.ResultEnum;
 import com.clx.performance.dao.settle.SettlementDriverDao;
 import com.clx.performance.dao.settle.SettlementDriverDetailDao;
 import com.clx.performance.dao.settle.SettlementOwnerDao;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
+import com.clx.performance.enums.OrderChildLogEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.enums.settle.SettlementLogEnum;
 import com.clx.performance.enums.settle.SettlementOwnerEnum;
 import com.clx.performance.extranal.user.OwnerInfoService;
 import com.clx.performance.model.settle.SettlementDriver;
@@ -13,22 +14,19 @@ import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.model.settle.SettlementOwner;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.service.impl.UniqueOrderNumService;
+import com.clx.performance.service.settle.SettlementLogService;
 import com.clx.performance.service.settle.SettlementMqHandlerService;
 import com.clx.performance.service.settle.SettlementService;
 import com.clx.performance.utils.LocalDateTimeUtils;
 import com.clx.performance.vo.mq.SettlementDetailAddMqParam;
 import com.clx.performance.vo.mq.SettlementDetailInvoiceTypeSyncMqParam;
 import com.clx.user.vo.feign.OwnerInfoFeignVO;
-import com.msl.common.exception.ServiceSystemException;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
-import java.math.BigInteger;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
@@ -55,6 +53,9 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     @Autowired
     private SettlementService settlementService;
 
+    @Autowired
+    private  SettlementLogService settlementLogService;
+
 
 
     @Override
@@ -146,6 +147,11 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementOwner.setStatus(SettlementOwnerEnum.Status.TO_BE_LOCKED.getCode());
 
         settlementOwnerDao.saveEntity(settlementOwner);
+
+        //保存结算单日志----创建结算单
+        settlementLogService.saveSettlementLog(settlementNo,
+                SettlementLogEnum.Type.CREATE_SETTLEMENT.getCode(),SettlementLogEnum.Type.CREATE_SETTLEMENT.getMsg(),
+                OrderChildLogEnum.CreateType.PLATFORM.getCode(),0L,"系统");
     }
 
     /**
@@ -211,6 +217,11 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementOwner.setStatus(SettlementOwnerEnum.Status.TO_BE_ACCOUNT.getCode());
 
         settlementOwnerDao.saveEntity(settlementOwner);
+
+        //保存结算单日志----创建结算单
+        settlementLogService.saveSettlementLog(settlementNo,
+                SettlementLogEnum.Type.CREATE_SETTLEMENT.getCode(),SettlementLogEnum.Type.CREATE_SETTLEMENT.getMsg(),
+                OrderChildLogEnum.CreateType.PLATFORM.getCode(),0L,"系统");
     }
 
     /**

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

@@ -35,6 +35,7 @@ import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -95,15 +96,26 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
         }
 
         String settlementNo = settlementOwner.getSettlementNo();
-        //更新状态为待货主付款
-        settlementOwnerDao.updateStatusBySettlementNo(settlementNo,SettlementOwnerEnum.Status.SHIPPER_TO_PAYMENT.getCode());
-
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
-        //保存结算单日志
+        //保存结算单日志----货主确认结算单
         settlementLogService.saveSettlementLog(settlementNo,
                 SettlementLogEnum.Type.OWNER_TO_BE_CONFIRMED.getCode(),SettlementLogEnum.Type.OWNER_TO_BE_CONFIRMED.getMsg(),
                 OrderChildLogEnum.CreateType.OWNER.getCode(),loginUserInfo.getUserNo(),loginUserInfo.getUserName());
+        int status;
+        if(settlementOwner.getSettlementFreight().compareTo(BigDecimal.ZERO) >0){
+            status = SettlementOwnerEnum.Status.SHIPPER_TO_PAYMENT.getCode();
+        }else if(settlementOwner.getSettlementFreight().compareTo(BigDecimal.ZERO) <0){
+            status = SettlementOwnerEnum.Status.PLATFORM_TO_PAYMENT.getCode();
+        }else{
+            status = SettlementOwnerEnum.Status.COMPLETED.getCode();
+            //保存结算单日志----已完结
+            settlementLogService.saveSettlementLog(settlementNo,
+                    SettlementLogEnum.Type.COMPLETED.getCode(),SettlementLogEnum.Type.COMPLETED.getMsg(),
+                    OrderChildLogEnum.CreateType.OWNER.getCode(),loginUserInfo.getUserNo(),loginUserInfo.getUserName());
+        }
 
+        //更新状态
+        settlementOwnerDao.updateStatusBySettlementNo(settlementNo,status);
     }
 
     @Override