Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118'…

performance-web/src/main/java/com/clx/performance/aspect/ResetPasswordAnnotationAop.java

@@ -68,7 +68,7 @@ public class ResetPasswordAnnotationAop {
                 sendMessageMachineCheckComponent.sendMessageMachineSelectCheck(request, sendMobileCaptchaParam);
                 mobile = sendMobileCaptchaParam.getMobile();
                 String content = redisTemplate.opsForValue().get(RedisConstants.MESSAGE_MOBILE_CAPTCHA + mobile);
-                if (StringUtils.isNoneBlank(content)) {
+                if (StringUtils.isNotBlank(content)) {
                     token = UUID.randomUUID().toString();
                     redisTemplate.opsForValue().set(RedisConstants.MESSAGE_RESET_PASSWORD_TOKEN + mobile, token);
                     redisTemplate.expire(RedisConstants.MESSAGE_RESET_PASSWORD_TOKEN + mobile, 60, TimeUnit.SECONDS);

performance-web/src/main/java/com/clx/performance/component/OrderChildLoanComponent.java

 package com.clx.performance.component;
 
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.vo.feign.FeignOrderInfoVO;
@@ -82,16 +83,16 @@ public class OrderChildLoanComponent {
 
         if (OrderGoodsOverWeightEnum.NO.getCode().equals(overWeight)) {
             log.info("3.进行标吨判断");
-            determine(orderGoods.getPendingOrderFreight().multiply(new BigDecimal(35)), ownerInfoFeignVO, orderGoods.getOrderNo(), childNo);
+            determine(orderGoods.getPendingOrderFreight().multiply(new BigDecimal(35)), ownerInfoFeignVO, orderGoods, childNo, overWeight);
         } else {
             log.info("3.进行超吨判断");
-            determine(orderGoods.getPendingOrderFreight().multiply(new BigDecimal(50)), ownerInfoFeignVO, orderGoods.getOrderNo(), childNo);
+            determine(orderGoods.getPendingOrderFreight().multiply(new BigDecimal(50)), ownerInfoFeignVO, orderGoods, childNo, overWeight);
         }
     }
 
-    public void determine(BigDecimal orderChildPrice, OwnerInfoFeignVO ownerInfoFeignVO, String orderNo, String childNo) {
-        log.info("4.预估运费{},货主{},订单号{},运单号{}", orderChildPrice, ownerInfoFeignVO.getUserNo(), orderNo, childNo);
-        List<OwnerRunningWaterRecord> runningWaterRecordList = ownerRunningWaterRecordDao.getOwnerRunningWaterRecord(orderNo);
+    public void determine(BigDecimal orderChildPrice, OwnerInfoFeignVO ownerInfoFeignVO, OrderGoods orderGoods, String childNo, Integer overWeight) {
+        log.info("4.预估运费{},货主{},订单号{},运单号{}", orderChildPrice, ownerInfoFeignVO.getUserNo(), orderGoods.getOrderNo(), childNo);
+        List<OwnerRunningWaterRecord> runningWaterRecordList = ownerRunningWaterRecordDao.getOwnerRunningWaterRecord(orderGoods.getOrderNo());
         BigDecimal frozen = runningWaterRecordList.stream().filter(item -> {
             return item.getRunningWaterType().equals(OwnerAccountEnum.RunningWaterStatus.FROZEN.getCode())
                     && item.getAccountType().equals(OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode())
@@ -107,8 +108,17 @@ public class OrderChildLoanComponent {
         log.info("5.查询预付运费相关流水：订单冻结预付运费{}, 扣除流水{}", frozen, takeOut);
         if (subtract.compareTo(BigDecimal.ZERO) > 0) {
             //查询未结算的运单（没有产生扣除流水的运单）
-            List<OrderChild> orderChildList = orderChildDao.selectInTransitOrderChildLtUnsettle(orderNo);
-            BigDecimal orderChildSum = orderChildList.stream().map(OrderChild::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
+            List<OrderChild> orderChildList = orderChildDao.selectInTransitOrderChildLtUnsettle(orderGoods.getOrderNo());
+            if (CollectionUtil.isEmpty(orderChildList)) {
+                log.info("当前未产生未结算的运单");
+                return;
+            }
+            BigDecimal orderChildSum = null;
+            if (OrderGoodsOverWeightEnum.NO.getCode().equals(overWeight)) {
+                orderChildSum = orderGoods.getPendingOrderFreight().multiply(new BigDecimal(35)).multiply(new BigDecimal(orderChildList.size()));
+            } else {
+                orderChildSum = orderGoods.getPendingOrderFreight().multiply(new BigDecimal(50)).multiply(new BigDecimal(orderChildList.size()));
+            }
             BigDecimal ans = subtract.subtract(orderChildSum);
             log.info("6.当前订单冻结的预付运费还有剩余, 查询查询未结算的运单（没有产生扣除流水的运单）总计{},账户剩余{}", orderChildSum, subtract);