From 4bcc6fbe0242586ea65f9ce76463807acd0f7f94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Wed, 16 Oct 2024 14:05:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B010.16?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FleetInfoServiceImpl.java    | 69 +++++++++----------
 1 file changed, 33 insertions(+), 36 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetInfoServiceImpl.java
index 6160fb432..c900e76cd 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetInfoServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetInfoServiceImpl.java
@@ -212,7 +212,7 @@ public class FleetInfoServiceImpl extends ServiceImpl<FleetInfoMapper, FleetInfo
             fleetInfo.setGiveAmount(fleetInfo1.getGiveAmount() + fleetInfo.getGiveAmount1());
             fleetInfo.setTotalBalance(fleetInfo1.getTotalBalance() + fleetInfo.getRechargeAmount1() + fleetInfo.getGiveAmount1());
         }
-        return  baseMapper.updateById(fleetInfo);
+        return baseMapper.updateById(fleetInfo);
     }
 
     /**
@@ -233,9 +233,9 @@ public class FleetInfoServiceImpl extends ServiceImpl<FleetInfoMapper, FleetInfo
      * @return
      */
     @Override
-    public List<FleetInfoUniVo> queryByStoreId(Integer storeId,Integer userId) {
+    public List<FleetInfoUniVo> queryByStoreId(Integer storeId, Integer userId) {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
-        if (ObjectUtil.isEmpty(userId)){
+        if (ObjectUtil.isEmpty(userId)) {
             userId = nowAccountInfo.getId();
         }
         //查询当前登录人的车队信息
@@ -386,7 +386,7 @@ public class FleetInfoServiceImpl extends ServiceImpl<FleetInfoMapper, FleetInfo
         int i = baseMapper.updateById(fleetInfo);
         if (i > 0) {
             return fleetInfo.getId();
-        }else {
+        } else {
             throw new RuntimeException("编辑失败");
         }
     }
@@ -432,13 +432,13 @@ public class FleetInfoServiceImpl extends ServiceImpl<FleetInfoMapper, FleetInfo
         //查找车队成员
         FleetMember fleetMember = fleetMemberMapper.selectOne(new LambdaQueryWrapper<FleetMember>()
                 .eq(FleetMember::getUserId, allOrderInfo.getUserId())
-                .orderBy(true,true,FleetMember::getCreateTime)
+                .orderBy(true, true, FleetMember::getCreateTime)
                 .last("limit 1"));
         // 获取当前车队卡
         FleetInfo fleetInfo = baseMapper.selectOne(new LambdaQueryWrapper<FleetInfo>()
                 .eq(FleetInfo::getId, fleetMember.getFleetId()));
         //判断支付金额是否超过当前余额
-        if (money > fleetInfo.getTotalBalance()){
+        if (money > fleetInfo.getTotalBalance()) {
             throw new RuntimeException("支付金额超过当前车队余额");
         }
 
@@ -510,36 +510,33 @@ public class FleetInfoServiceImpl extends ServiceImpl<FleetInfoMapper, FleetInfo
         if (ObjectUtil.isEmpty(fleetConsumeRecord)) {
             throw new RuntimeException("车队订单不存在");
         }
-        if ("paid".equals(fleetConsumeRecord.getOrderStatus())) {
-            //退款金额
-            Double refundMoney = fleetConsumeRecord.getNetReceiptsAmount();
-            //获取当前车队卡
-            FleetInfo fleetInfo = baseMapper.selectOne(new LambdaQueryWrapper<FleetInfo>()
-                    .eq(FleetInfo::getId, fleetConsumeRecord.getFleetId()));
-            //计算赠送金额与充值金额比例
-            double recharge = fleetInfo.getRechargeAmount() / fleetInfo.getTotalBalance();
-            double give = fleetInfo.getGiveAmount() / fleetInfo.getTotalBalance();
-            fleetInfo.setTotalBalance(fleetInfo.getTotalBalance() + refundMoney);
-            fleetInfo.setRechargeAmount(fleetInfo.getRechargeAmount() + (refundMoney * recharge));
-            fleetInfo.setGiveAmount(fleetInfo.getGiveAmount() + (refundMoney * give));
-            //将退款金额修改回去
-            baseMapper.updateById(fleetInfo);
-            //修改车队成员的余额
-            FleetMember fleetMember = fleetMemberMapper.selectOne(new LambdaQueryWrapper<FleetMember>()
-                    .eq(FleetMember::getUserId, allOrderInfo.getUserId()));
-            fleetMember.setRemainingCreditLimit(fleetMember.getRemainingCreditLimit() + refundMoney);
-            fleetMember.setUsedCreditLimit(fleetMember.getUsedCreditLimit() - refundMoney);
-            fleetMember.setUpdateBy(nowAccountInfo.getStaffId().toString());
-            fleetMember.setUpdateTime(DateUtil.date());
-            //更新余额
-            fleetMemberMapper.updateById(fleetMember);
-            //将车队订单表改为退款
-            fleetConsumeRecord.setOrderStatus("refund");
-            fleetConsumeRecord.setUpdateTime(DateUtil.date());
-            fleetConsumeRecord.setUpdateBy(nowAccountInfo.getStaffId().toString());
-            return fleetConsumeRecordMapper.updateById(fleetConsumeRecord);
-        }
-        return 0;
+        //退款金额
+        Double refundMoney = fleetConsumeRecord.getNetReceiptsAmount();
+        //获取当前车队卡
+        FleetInfo fleetInfo = baseMapper.selectOne(new LambdaQueryWrapper<FleetInfo>()
+                .eq(FleetInfo::getId, fleetConsumeRecord.getFleetId()));
+        //计算赠送金额与充值金额比例
+        double recharge = fleetInfo.getRechargeAmount() / fleetInfo.getTotalBalance();
+        double give = fleetInfo.getGiveAmount() / fleetInfo.getTotalBalance();
+        fleetInfo.setTotalBalance(fleetInfo.getTotalBalance() + refundMoney);
+        fleetInfo.setRechargeAmount(fleetInfo.getRechargeAmount() + (refundMoney * recharge));
+        fleetInfo.setGiveAmount(fleetInfo.getGiveAmount() + (refundMoney * give));
+        //将退款金额修改回去
+        baseMapper.updateById(fleetInfo);
+        //修改车队成员的余额
+        FleetMember fleetMember = fleetMemberMapper.selectOne(new LambdaQueryWrapper<FleetMember>()
+                .eq(FleetMember::getUserId, allOrderInfo.getUserId()));
+        fleetMember.setRemainingCreditLimit(fleetMember.getRemainingCreditLimit() + refundMoney);
+        fleetMember.setUsedCreditLimit(fleetMember.getUsedCreditLimit() - refundMoney);
+        fleetMember.setUpdateBy(nowAccountInfo.getStaffId().toString());
+        fleetMember.setUpdateTime(DateUtil.date());
+        //更新余额
+        fleetMemberMapper.updateById(fleetMember);
+        //将车队订单表改为退款
+        fleetConsumeRecord.setOrderStatus("refund");
+        fleetConsumeRecord.setUpdateTime(DateUtil.date());
+        fleetConsumeRecord.setUpdateBy(nowAccountInfo.getStaffId().toString());
+        return fleetConsumeRecordMapper.updateById(fleetConsumeRecord);
     }