From 265ab3517c78252956bfd9a6586fb47f8d01f941 Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Thu, 31 Jul 2025 15:25:20 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D:=E8=BD=A6=E8=BE=86?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E3=80=81=E8=BD=A6=E8=BE=86=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gather/mqtt/MqttConnectionFactory.java    |  2 +-
 .../impl/EbikeBikeInfoServiceImpl.java        |  2 +-
 .../mapper/EbikeComponentInventoryMapper.java | 26 +++++++++++++++++++
 .../impl/EbikeComponentServiceImpl.java       | 14 ++++++----
 .../service/impl/UserOrdersServiceImpl.java   |  4 +--
 .../service/impl/WxPayServiceImpl.java        | 26 +++++++++++++++++++
 6 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/ebike-gather/src/main/java/org/cdzy/gather/mqtt/MqttConnectionFactory.java b/ebike-gather/src/main/java/org/cdzy/gather/mqtt/MqttConnectionFactory.java
index 576e5742..fab17706 100644
--- a/ebike-gather/src/main/java/org/cdzy/gather/mqtt/MqttConnectionFactory.java
+++ b/ebike-gather/src/main/java/org/cdzy/gather/mqtt/MqttConnectionFactory.java
@@ -19,7 +19,7 @@ import java.util.UUID;
  * MQTT 连接工厂（负责创建/销毁连接）
  */
 @Slf4j
-public class MqttConnectionFactory extends BasePooledObjectFactory<Channel> {
+public class    MqttConnectionFactory extends BasePooledObjectFactory<Channel> {
     private final EventLoopGroup workerGroup = new NioEventLoopGroup();
 
     @Override
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 480218cf..53eddca4 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
@@ -1533,7 +1533,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
                 .leftJoin(EBIKE_ECU_INFO).on(EBIKE_ECU_INFO.ECU_ID.eq(EBIKE_BIKE_INFO.ECU_ID))
                 .where(EBIKE_ECU_INFO.ECU_SN.in(ecuSnDto.getList()))
                 .where(EBIKE_BIKE_INFO.IS_IN_WAREHOUSE.eq("0"))
-                .where(EBIKE_BIKE_INFO.USAGE_STATUS.eq(2));
+                .where(EBIKE_BIKE_INFO.STATE.eq("2"));
         return ebikeBikeInfoMapper.selectListByQueryAs(query, EbikeOrderBikeDto.class);
     }
 
diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/mapper/EbikeComponentInventoryMapper.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/mapper/EbikeComponentInventoryMapper.java
index ed740ea7..ee48a459 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/mapper/EbikeComponentInventoryMapper.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/mapper/EbikeComponentInventoryMapper.java
@@ -2,6 +2,8 @@ package com.cdzy.ebikeoperate.mapper;
 
 import com.cdzy.ebikeoperate.model.pojo.EbikeComponentInventory;
 import com.mybatisflex.core.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  *  映射层。
@@ -11,4 +13,28 @@ import com.mybatisflex.core.BaseMapper;
  */
 public interface EbikeComponentInventoryMapper extends BaseMapper<EbikeComponentInventory> {
 
+
+//    @Select({
+//            "SELECT COUNT(1) FROM ebike_component_inventory a" +
+//                    "WHERE (a.item_code =  #{itemCode} or a.serial_number= #{itemCode}) " +
+//                    "AND a.component_type = #{componentType} " +
+//                    "AND a.state = #{state} "
+//    })
+//    int selectCount(@Param("itemCode") String itemCode,@Param("componentType") String componentType,@Param("state") Integer state);
+
+    @Select({
+            "<script>",
+            "SELECT COUNT(1) FROM ebike_component_inventory a",
+            "WHERE (a.item_code = #{itemCode} OR a.serial_number = #{itemCode})",
+            "AND a.component_type = #{componentType}",
+            "<if test='state != null'>",
+            "AND a.state = #{state}",
+            "</if>",
+            "</script>"
+    })
+    int selectCount(
+            @Param("itemCode") String itemCode,
+            @Param("componentType") String componentType,
+            @Param("state") Integer state
+    );
 }
diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeComponentServiceImpl.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeComponentServiceImpl.java
index dc0ca7ee..36ec0b18 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeComponentServiceImpl.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeComponentServiceImpl.java
@@ -841,13 +841,17 @@ public class EbikeComponentServiceImpl implements EbikeComponentService {
     }
 
     public boolean isDuplicateEntry(String itemCode, String componentType, Boolean isNew) {
-        QueryWrapper query = new QueryWrapper();
-        query.eq("item_code", itemCode);
-        query.eq("component_type", componentType);
+//        QueryWrapper query = new QueryWrapper();
+//        query.and(qw -> qw.eq("item_code", itemCode).or().eq("serial_number", itemCode));
+//        query.eq("component_type", componentType);
+
+        Integer state = null;
         if (!isNew) {
-            query.eq("state", 1); // 假设 1 表示已已入库
+//            query.eq("state", 1); // 假设 1 表示已已入库
+            state=1;
         }
-        long count = ebikeComponentInventoryMapper.selectCountByQuery(query); // 查询符合条件的记录数
+        long count = ebikeComponentInventoryMapper.selectCount(itemCode,componentType,state);
+//        long count = ebikeComponentInventoryMapper.selectCountByQuery(query); // 查询符合条件的记录数
         return count > 0; // 如果记录数大于 0，说明已经存在重复入库
     }
 
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 35b1f8d6..6b4f4062 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
@@ -103,10 +103,10 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
         }
         FeignEbikeBikeInfoDto bikeInfoDto = jsonResult.getData();
         // 判断车辆状态
-        if ("3".equals(bikeInfoDto.getState())) {
+        if ("骑行中".equals(bikeInfoDto.getState())) {
             throw new RuntimeException("车辆使用中");
         }
-        if ("4".equals(bikeInfoDto.getState())) {
+        if ("待维修".equals(bikeInfoDto.getState())) {
             throw new RuntimeException("车辆故障,暂不可用");
         }
         FeignEbikeEcuInfo ecuInfo = bikeInfoDto.getEbikeEcuInfo();
diff --git a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/WxPayServiceImpl.java b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/WxPayServiceImpl.java
index 497a1ea7..22f9deb0 100644
--- a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/WxPayServiceImpl.java
+++ b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/WxPayServiceImpl.java
@@ -119,6 +119,7 @@ public class WxPayServiceImpl implements WxPayService {
         EbikePayment ebikePayment = ebikePaymentService.getByOrderId(orderId);
         if (ebikePayment != null) {
             String tradeState = ebikePayment.getTradeState();
+
             if (String.valueOf(Transaction.TradeStateEnum.SUCCESS.ordinal()).equals(tradeState)) {
                 log.info("订单已经支付成功，订单号：{}", orderId);
                 r.put("error", "订单已经支付成功");
@@ -149,6 +150,31 @@ public class WxPayServiceImpl implements WxPayService {
                 r.put("error", "订单状态异常: ");
                 return r;
             }
+
+            // 获取两小时后的时间
+            LocalDateTime createTime = ebikePayment.getCreateTime();
+//            // 定义一个持续时间为2小时的Duration
+//            Duration twoHours = Duration.ofHours(2);
+//            LocalDateTime twoHoursLater = createTime.plus(twoHours);
+
+            // 判断当前时间是否大于两小时前的时间
+            LocalDateTime now = LocalDateTime.now();
+//            if (now.isAfter(twoHoursLater)) {
+//                //时间过期
+//                ebikePayment.setPaymentId(StringUtils.generateSnowflakeId("paymentId"));
+//                ebikePayment.setCreateTime(now);
+//            }
+            
+            // 计算两个时间点之间的差异
+            Duration duration = Duration.between(createTime, now);
+            // 获取差异的秒数
+            long seconds = duration.getSeconds();
+            // 判断是否大于7200秒（即2小时）
+            if (seconds > 7200) {
+                //时间过期
+                ebikePayment.setPaymentId(StringUtils.generateSnowflakeId("paymentId"));
+                ebikePayment.setCreateTime(now);
+            }
         }
         //查询订单, orderFeingClient.getOrderById(orderId)
         EbikePaymentDto paymentDto = ebikePaymentService.getPaymentDetails(orderId);