Merge branch 'v6.9_bug_20231117' into test

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

@@ -155,8 +155,9 @@ public enum OrderChildEnum {
 
     // 完成
     public static final List<Integer> FINISH_lIST = Arrays.asList(
-            Status.UNSETTLE.getCode()
-
+            Status.UNLOAD.getCode(),
+            Status.UNSETTLE.getCode(),
+            Status.COMPLETE.getCode()
     );
 
     // 运单数据同步一部状态

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

@@ -25,4 +25,6 @@ public class OrderChildReportParam {
     @ApiModelProperty(value = "开始时间 必填")
     @NotNull(message = "开始时间")
     private String beginTime;
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;
 }

performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java

@@ -91,7 +91,7 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
 
     BigDecimal sumAlreadyTransportWeightByOrderNo(String orderNo);
 
-    List<Double> getFreightPrice( Integer sendAddressId,Integer receiveAddressId);
+    List<Double> getFreightPrice( Integer sendAddressId,Integer receiveAddressId,String orderNo);
 
 
 }

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

@@ -251,7 +251,7 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
 
 
     @Override
-    public List<Double> getFreightPrice( Integer sendAddressId,Integer receiveAddressId) {
-        return baseMapper.getFreightPrice(sendAddressId,receiveAddressId);
+    public List<Double> getFreightPrice( Integer sendAddressId,Integer receiveAddressId,String orderNo) {
+        return baseMapper.getFreightPrice(orderNo,sendAddressId,receiveAddressId);
     }
 }

performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsMapper.java

@@ -87,8 +87,9 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
 
     @Select("select pending_order_freight from order_goods where " +
             " send_address_id = #{sendAddressId} and" +
-            " receive_address_id = #{receiveAddressId}  order by id desc limit 10 ")
-    List<Double> getFreightPrice(@Param("sendAddressId") Integer sendAddressId,
+            " receive_address_id = #{receiveAddressId} and order_no != #{orderNo}  order by id desc limit 10 ")
+    List<Double> getFreightPrice(@Param("orderNo") String orderNo,
+                                 @Param("sendAddressId") Integer sendAddressId,
                                                   @Param("receiveAddressId") Integer receiveAddressId);
 
 }

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

@@ -743,7 +743,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     @Override
     public FreightEstimateVO listFreightEstimate(OrderChildReportParam param) {
         List<Double> lossNet = orderChildDao.getLossNet(param);
-        List<Double> freightPrice = orderGoodsDao.getFreightPrice(param.getSendAddressId(), param.getReceiveAddressId());
+        List<Double> freightPrice = orderGoodsDao.getFreightPrice(param.getSendAddressId(), param.getReceiveAddressId(),param.getOrderNo());
         FreightEstimateVO freightEstimateVO= new FreightEstimateVO();
         freightEstimateVO.setLossNet(lossNet);
         freightEstimateVO.setFreightPriceList(freightPrice);

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

@@ -27,6 +27,7 @@ import com.msl.common.base.PageData;
 import com.msl.common.enums.ResultCodeEnum;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
+import com.msl.common.utils.DateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
@@ -41,6 +42,8 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.time.Duration;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -367,6 +370,20 @@ public class TruckServiceImpl implements TruckService {
 
     @Override
     public List<TruckTraceVO> getTruckTrace(TruckTraceParam param) {
+        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime endTime = DateUtils.parseDateTime(param.getEndTime()).get();
+        if(endTime.isAfter(now)){
+            throw new ServiceSystemException(ResultEnum.PARAM_ERROR,"结束时间不能早于当前时间");
+        }
+        LocalDateTime beginTime = DateUtils.parseDateTime(param.getBeginTime()).get();
+        if(beginTime.isAfter(endTime)){
+            throw new ServiceSystemException(ResultEnum.PARAM_ERROR,"开始时间不能早于结束时间");
+        }
+
+        long seconds  = Duration.between(beginTime, endTime).getSeconds();
+        if(seconds > 129600){
+            throw new ServiceSystemException(ResultEnum.PARAM_ERROR,"开始时间和结束时间不能相差超于3天");
+        }
         List<TruckTraceDTO> truckTrace = zjxlGpsService.getTruckTrace(param.getTruckNo(), param.getBeginTime(),
                 param.getEndTime());
         List<TruckTraceVO> result = new ArrayList<>();