Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into test

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

@@ -5,7 +5,6 @@ import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
 
 /**
  * @ClassName UpdatePerformanceProgressParam
@@ -26,7 +25,7 @@ public class UpdatePerformanceProgressParam {
 
 
     @ApiModelProperty("今日预计完成吨数")
-    private BigDecimal todayExpectComplete;
+    private String todayExpectComplete;
 
 
     @ApiModelProperty("交易要求到站时间")

performance-api/src/main/java/com/clx/performance/vo/pc/PerformanceProgressVO.java

 package com.clx.performance.vo.pc;
 
 import com.clx.performance.enums.OrderEnum;
+import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -81,6 +82,7 @@ public class PerformanceProgressVO{
     }
 
     @ApiModelProperty("司机运费")
+    @MoneyOutConvert
     private BigDecimal driverFreightPrice;
 
     
@@ -171,6 +173,7 @@ public class PerformanceProgressVO{
 
     
     @ApiModelProperty("测算运费")
+    @MoneyOutConvert
     private BigDecimal predictionFreightPrice;
 
     

performance-web/src/main/java/com/clx/performance/extranal/user/impl/AddressServiceImpl.java

@@ -16,7 +16,6 @@ import org.springframework.stereotype.Service;
 @AllArgsConstructor
 public class AddressServiceImpl implements AddressService {
     private final AddressFeign addressFeign;
-    private final static StringBuffer sb = new StringBuffer();
 
     @Override
     public Optional<FeignAddressVO> getSendAndReceiveAddress(Integer sendAddressId, Integer receiveAddressId) {
@@ -34,11 +33,15 @@ public class AddressServiceImpl implements AddressService {
 
     @Override
     public String generateAddressDetail(String ... args) {
+        StringBuilder sb = new StringBuilder();
+        String detail = args[args.length-1];
         for (String arg : args) {
-            if(StringUtils.isNotBlank(arg)){
+            if(StringUtils.isNotBlank(arg) && !detail.contains(arg)){
                 sb.append(arg);
             }
         }
+        sb.append(detail);
         return sb.toString();
     }
+
 }

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

@@ -33,6 +33,7 @@ import com.clx.performance.utils.gd.GdService;
 import com.clx.performance.vo.pc.PerformanceProgressDetailVO;
 import com.clx.performance.vo.pc.PerformanceProgressOperationLogVO;
 import com.clx.performance.vo.pc.PerformanceProgressVO;
+import com.google.common.base.Joiner;
 import com.msl.common.base.Optional;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.utils.DateUtils;
@@ -124,6 +125,14 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
 
         List<PerformanceProgressVO> records = performanceProgressStruct.convertList(page.getRecords());
 
+        records.forEach(item->{
+                    if(StringUtils.isNotBlank(item.getSeniorLogisticsManagerName())){
+                        item.setSeniorLogisticsManagerName(Joiner.on(",")
+                                .join(JSON.parseArray(item.getSeniorLogisticsManagerName())));
+                    }
+                }
+        );
+
         returnPage.setPages(page.getPages());
         returnPage.setTotal(page.getTotal());
         returnPage.setRecords(records);
@@ -201,14 +210,25 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
         BigDecimal todayExpectComplete = Objects.nonNull(item.getTodayExpectComplete())
                 ?item.getTodayExpectComplete():BigDecimal.ZERO;
 
-        if(Objects.nonNull(param.getTodayExpectComplete())
-                && todayExpectComplete.compareTo(param.getTodayExpectComplete()) != 0){
-            PerformanceProgressLog log = performanceProgressLogService.generateLog(item.getOrderNo(),
-                    PerformanceProgressEnum.LogType.TODAY_EXPECT_COMPLETE,
-                    param.getTodayExpectComplete(),userNo,userName);
-            update.setTodayExpectComplete(param.getTodayExpectComplete());
-            logs.add(log);
-            change = true;
+        if(StringUtils.isNotBlank(param.getTodayExpectComplete())){
+            if(new BigDecimal(param.getTodayExpectComplete()).compareTo(todayExpectComplete) !=  0){
+                PerformanceProgressLog log = performanceProgressLogService.generateLog(item.getOrderNo(),
+                        PerformanceProgressEnum.LogType.TODAY_EXPECT_COMPLETE,
+                        param.getTodayExpectComplete(),userNo,userName);
+                update.setTodayExpectComplete(new BigDecimal(param.getTodayExpectComplete()));
+                logs.add(log);
+                change = true;
+            }
+        }else{
+               //今日预计完成吨数从有变成无
+              if(todayExpectComplete.compareTo(BigDecimal.ZERO) != 0){
+                  PerformanceProgressLog log = performanceProgressLogService.generateLog(item.getOrderNo(),
+                          PerformanceProgressEnum.LogType.TODAY_EXPECT_COMPLETE,
+                          BigDecimal.ZERO,userNo,userName);
+                  update.setTodayExpectComplete(new BigDecimal(param.getTodayExpectComplete()));
+                  logs.add(log);
+                  change = true;
+              }
         }
 
         if(!StringUtils.equals(item.getTradeRequireArriveStationTime(),param.getTradeRequireArriveStationTime())){
@@ -260,6 +280,7 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
         }
     }
 
+
     @Override
     public PerformanceProgressDetailVO getPerformanceProgressDetail(Integer id) {
         PerformanceProgress item = performanceProgressDao.getEntityByKey(id).orElseThrow(ResultEnum.DATA_NOT_FIND);