From 6fe21a5a22418f07af46b6be86019265d82b3ed1 Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Wed, 30 Apr 2025 10:33:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8D=A2=E7=94=B5=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ebikemaintenance/service/EbikeBikeOrderService.java  | 2 +-
 .../service/impl/EbikeBikeInfoServiceImpl.java           | 3 ++-
 .../service/impl/EbikeBikeOrderServiceImpl.java          | 3 ++-
 .../cdzy/orders/service/impl/UserOrdersServiceImpl.java  | 9 +++++++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeOrderService.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeOrderService.java
index 95cd9eef..97884efd 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeOrderService.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeOrderService.java
@@ -22,5 +22,5 @@ public interface EbikeBikeOrderService extends IService<EbikeBikeOrder> {
      * @param bikeId 车辆ID
      * @param receiverId 处理人ID
      */
-    void doneChangeBattery(String bikeId,String receiverId);
+    String doneChangeBattery(String bikeId,String receiverId);
 }
diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
index fce3f4e3..8334e782 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
@@ -750,13 +750,14 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
         }
         StaffFeign staffFeign = result.getData();
         //匹配工单ID、将其完成
-        orderService.doneChangeBattery(ebikeBikeInfo.getBikeId(),String.valueOf(staffFeign.getStaffId()));
+        String orderId = orderService.doneChangeBattery(ebikeBikeInfo.getBikeId(), String.valueOf(staffFeign.getStaffId()));
         //生成换电记录
         EbikeBikeBatterychange batteryChange = new EbikeBikeBatterychange();
         batteryChange.setBikeId(ebikeBikeInfo.getBikeId());
         batteryChange.setNbatteryId(newBattery.getBatteryId());
         batteryChange.setObatteryId(oldBatteryId);
         batteryChange.setOperateUser(String.valueOf(staffFeign.getStaffId()));
+        batteryChange.setOrderId(orderId);
         ebikeBikeBatterychangeMapper.insert(batteryChange);
     }
 
diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeOrderServiceImpl.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeOrderServiceImpl.java
index 03fd447e..12dc5aba 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeOrderServiceImpl.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeOrderServiceImpl.java
@@ -55,7 +55,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
     }
 
     @Override
-    public void doneChangeBattery(String bikeId, String receiverId) {
+    public String doneChangeBattery(String bikeId, String receiverId) {
         QueryWrapper queryWrapper = QueryWrapper.create()
                 .where(EBIKE_BIKE_ORDER.BIKE_ID.eq(bikeId))
                 .where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq("2"))
@@ -68,5 +68,6 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
         bikeOrder.setHandleAt(LocalDateTime.now());
         bikeOrder.setReceiverId(receiverId);
         this.mapper.update(bikeOrder);
+        return bikeOrder.getOrderId();
     }
 }
diff --git a/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java b/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java
index d23d3e07..261c7877 100644
--- a/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java
+++ b/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java
@@ -340,7 +340,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
      * @param userOrders               订单信息
      */
     void costCalculation(ResFeignEbikeSysRcostsetDto feignEbikeSysRcostsetDto, ResGPSDto resGpsDto, FeignEbikeRegionDto regionDto, EbikeUserOrders userOrders) {
-        BigDecimal totalAmount = new BigDecimal(0);
+        BigDecimal totalAmount = BigDecimal.ZERO;
         List<EbikeOrderDetails> list = new ArrayList<>();
         //是否在运营区内
         boolean pointInOperation = bikeInOperation(resGpsDto.getLongitude(), resGpsDto.getLatitude(), regionDto.getOrgId(), regionDto.getRegionId());
@@ -384,6 +384,11 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
             default -> defaultCostCalculation(list, userOrders, feignEbikeSysRcostsetDto, userOrders.getOrderId());
         };
         totalAmount = totalAmount.add(decimal);
+        BigDecimal cappedAmount = feignEbikeSysRcostsetDto.getCappedAmount();
+        int result  = cappedAmount.compareTo(totalAmount);
+        if (result == 1){
+            totalAmount = cappedAmount;
+        }
         userOrders.setStatus(OrderStatus.PENDING_PAYMENT);
         userOrders.setTotalAmount(totalAmount);
         orderDetailsMapper.insertBatch(list);
@@ -417,7 +422,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
      * @param orderId                  订单编号
      * @return 当前时间段收取金额
      */
-    BigDecimal timeFee(TimeSegment timeSegment, ResFeignEbikeSysRcostsetDto feignEbikeSysRcostsetDto, List<EbikeOrderDetails> list, long orderId) {
+    BigDecimal timeFee(TimeSegment timeSegment, ResFeignEbikeSysRcostsetDto feignEbikeSysRcostsetDto, List<EbikeOrderDetails> list, long        orderId) {
         BigDecimal decimal = BigDecimal.ZERO;
 //        LocalDateTime start = timeSegment.getStart();
 //        LocalDateTime end = timeSegment.getEnd();