Merge remote-tracking branch 'origin/v12.5_weightBug_20240322' into release

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

@@ -121,6 +121,7 @@ public enum PerformanceResultEnum implements ResultEnum {
     PLATFORM_ACCOUNT_CONFIG_RECHARGE_MANY(1917, "充值平台账户配置不唯一"),
     PLATFORM_ACCOUNT_CONFIG_IS_NULL(1918, "平台账户未配置"),
     PLATFORM_ACCOUNT_CONFIG_MANY(1919, "平台账户配置不唯一"),
+
     ORDER_CHILD_SYNC_ERROR(2001, "承运同步网络货运异常"),
     BORROWER_NAME_EXIST(1701, "数据重复，请核实后重新提交"),
     BORROWER_DELETE_ENABLE_ERROR(1702, "无法删除启用数据"),
@@ -142,6 +143,13 @@ public enum PerformanceResultEnum implements ResultEnum {
     NB_BANK_AMOUNT_OUT_OF_RANGE_ERROR(1807, "明细金额超限"),
     NB_BANK_NAME_BANK_NO_MISSMATCH_ERROR(1808, "账户名称与银行记录不符"),
 
+    PLATFORM_ACCOUNT_CONFIG_ONLY(1913, "当前配置已存在"),
+    PLATFORM_ACCOUNT_CONFIG_WITHDRAWAL_IS_NULL(1914, "提现平台账户未配置"),
+    PLATFORM_ACCOUNT_CONFIG_WITHDRAWAL_MANY(1915, "提现平台账户配置不唯一"),
+    PLATFORM_ACCOUNT_CONFIG_RECHARGE_IS_NULL(1916, "充值平台账户未配置"),
+    PLATFORM_ACCOUNT_CONFIG_RECHARGE_MANY(1917, "充值平台账户配置不唯一"),
+    PLATFORM_ACCOUNT_CONFIG_IS_NULL(1918, "平台账户未配置"),
+    PLATFORM_ACCOUNT_CONFIG_MANY(1919, "平台账户配置不唯一"),
     GET_LOAN_RECORD(1901, "货主借款失败"),
     OWNER_ACCOUNT_ERROR(1902, "货主货款不足"),
 

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

@@ -741,7 +741,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
         update.setFinishTime(now);
         orderChildDao.updateEntityByKey(update);
 
-        orderCancelComponent.backFillTonnageForArtificial(orderChild.getOrderGoodsNo(), orderChild.getWeight());
+        orderCancelComponent.backFillTonnageForArtificial(orderChild.getOrderGoodsNo(), orderChild.getLoadNet());
         goodsOrderTruckRecordComponent.releaseAllDriverCard(orderChild.getOrderGoodsNo(), orderChild.getTruckNo());
         driverService.updateOrderStatus(orderChild.getDriverUserNo(), DriverInfoEnum.DriverStatus.NO.getCode(), orderChild.getTruckId(), 1);
 

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

@@ -173,6 +173,7 @@ public class OrderChildServiceImpl implements OrderChildService {
 
     @Autowired
     private OwnerRunningWaterRecordDao ownerRunningWaterRecordDao;
+
     @Autowired
     private OrderChildLoanComponent orderChildLoanComponent;
 
@@ -320,6 +321,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         // 订单已拉运吨数
         BigDecimal alreadyTransportWeight = orderGoodsDao.sumAlreadyTransportWeightByOrderNo(orderGoods.getOrderNo());
         if (alreadyTransportWeight.compareTo(orderInfo.getTransportWeight().subtract(new BigDecimal("35"))) > 0){
+
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_WEIGHT_LACK);
         }
 

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

@@ -48,6 +48,7 @@ import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO;
 import com.clx.performance.vo.pc.OwnerAccountVO;
 import com.clx.performance.vo.pc.carrier.settle.CarrierPagePlatformAccountConfigVO;
 import com.clx.performance.vo.pc.OwnerLoanAccountVO;
+import com.clx.performance.vo.pc.carrier.settle.CarrierPagePlatformAccountConfigVO;
 import com.clx.user.enums.owner.FreezeSettingEnum;
 import com.clx.user.feign.OwnerFeign;
 import com.clx.user.feign.OwnerInfoFeign;