Merge remote-tracking branch 'origin/v7.6_small_version_fix_20231204' into test

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

@@ -69,6 +69,9 @@ public class CarrierPageSettlementDriverVO {
     private String createTime;
     @ApiModelProperty(value = "结算平台 1：马上来  2：网运平台")
     private String settlementPlatform;
+    @ApiModelProperty(value = "支付失败原因")
+    private String payErrorMsg;
+
 
 
 

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

@@ -309,10 +309,12 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         if (orderGoodsParams.getExtractWeight().compareTo(oldOrderGoods.getAlreadyTransportWeight()) < 0) {
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前货单提取吨数不能小于货单已拉运吨数");
         }
+
         //考虑到借吨、恢复吨数的货单，逻辑判断实际的提取吨数
         BigDecimal realExtractWeight = oldOrderGoods.getResidueTransportWeight().compareTo(BigDecimal.ZERO) == 0?
                 oldOrderGoods.getAlreadyTransportWeight():oldOrderGoods.getAlreadyTransportWeight().add(oldOrderGoods.getResidueTransportWeight());
         oldOrderGoods.setExtractWeight(realExtractWeight);
+        //本次提取增加或者减少的吨数  =  本次提取的吨数 - 货单原实际提取吨数
         BigDecimal answer = orderGoodsParams.getExtractWeight().subtract(realExtractWeight);
         int flag = answer.compareTo(BigDecimal.ZERO);
         //归还吨数
@@ -364,6 +366,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
             log.info("回填吨数：{}", JSONUtil.parse(rollbackOrderWeightParam));
             orderFeign.rollbackOrderWeight(rollbackOrderWeightParam);
         } else {
+            //当编辑吨数等于0 的时候，不进行拦截
             orderGoodsParams.setResidueTransportWeight(oldOrderGoods.getResidueTransportWeight());
         }
 
@@ -458,7 +461,8 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
      * 限制货单更新剩余吨数不能小于35吨
      **/
     private void limitOrderGoodsResidueWeight(BigDecimal residueTransportWeight){
-        if(residueTransportWeight.compareTo(new BigDecimal("35")) < 0){
+
+        if(residueTransportWeight.compareTo(BigDecimal.ZERO) != 0 &&  residueTransportWeight.compareTo(new BigDecimal("35")) < 0){
             throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"当前货单剩余吨数不足35吨，无法挂单");
         }
     }