From 4f06b79e7711e76158b420f83a02ad2d0477f85dd82cc33e5eca5146d113b6d0 Mon Sep 17 00:00:00 2001
From: yanglei <yanglei@stargraph.cn>
Date: Thu, 13 Nov 2025 18:03:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EbikePaymentServiceImpl.java |  6 +--
 ebike-user/pom.xml                            |  5 +++
 .../user/service/impl/EbikeOrderImpl.java     |  4 ++
 .../cdzy/user/EbikeUserApplicationTests.java  | 40 +++++++++++++++++++
 4 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 ebike-user/src/test/java/com/cdzy/user/EbikeUserApplicationTests.java

diff --git a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikePaymentServiceImpl.java b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikePaymentServiceImpl.java
index c0d1fd6..36b9d18 100644
--- a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikePaymentServiceImpl.java
+++ b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikePaymentServiceImpl.java
@@ -175,11 +175,11 @@ public class EbikePaymentServiceImpl extends ServiceImpl<EbikePaymentMapper, Ebi
     /**
      * 根据支付id查询支付记录
      *
-     * @param paymentId 支付id
+     * @param tradeId 支付id
      */
-    private EbikePayment getByPaymentId(String paymentId) {
+    private EbikePayment getByPaymentId(String tradeId) {
         QueryWrapper query = QueryWrapper.create()
-                .where(EBIKE_PAYMENT.PAYMENT_ID.eq(paymentId));
+                .where(EBIKE_PAYMENT.TRADE_ID.eq(tradeId));
         return this.getOne(query);
     }
 
diff --git a/ebike-user/pom.xml b/ebike-user/pom.xml
index 2496848..8898d6d 100644
--- a/ebike-user/pom.xml
+++ b/ebike-user/pom.xml
@@ -164,6 +164,11 @@
             <version>1.18.2</version> <!-- 请使用最新版本 -->
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+
     </dependencies>
 
     <profiles>
diff --git a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderImpl.java b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderImpl.java
index 3a5f444..875b26b 100644
--- a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderImpl.java
+++ b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderImpl.java
@@ -21,6 +21,7 @@ import com.ebike.feign.model.dto.FeignEbikeUserBikeInfo;
 import com.ebike.feign.model.dto.FeignEbikeUserLockDto;
 import com.ebike.feign.model.dto.FeignOrderPaymentDto;
 import com.ebike.feign.model.vo.FeignEbikeBikeRadiusVo;
+import com.mybatisflex.core.keygen.impl.SnowFlakeIDKeyGenerator;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 import feign.FeignException;
@@ -57,6 +58,8 @@ public class EbikeOrderImpl extends ServiceImpl<EbikeOrderMapper, EbikeOrder> im
     @Resource
     private EbikePaymentService ebikePaymentService;
 
+    private static final SnowFlakeIDKeyGenerator snowFlakeIDKeyGenerator = new SnowFlakeIDKeyGenerator();
+
     @Transactional
     @Override
     public EbikeOrder saveRide(EbikeUserCyclingDto orderDto) {
@@ -200,6 +203,7 @@ public class EbikeOrderImpl extends ServiceImpl<EbikeOrderMapper, EbikeOrder> im
                 .orderId(order.getOrderId())
                 .costPrice(order.getTotalAmount())
                 .paymentMethod(EbikePaymentMethod.WECHAT)
+                .tradeId(String.valueOf(snowFlakeIDKeyGenerator.nextId()))
                 .currency("CNY")
                 .userId(endDto.getUserId())
                 .operatorId(order.getOperatorId())
diff --git a/ebike-user/src/test/java/com/cdzy/user/EbikeUserApplicationTests.java b/ebike-user/src/test/java/com/cdzy/user/EbikeUserApplicationTests.java
new file mode 100644
index 0000000..301c906
--- /dev/null
+++ b/ebike-user/src/test/java/com/cdzy/user/EbikeUserApplicationTests.java
@@ -0,0 +1,40 @@
+package com.cdzy.user;
+
+import com.cdzy.user.enums.EbikePaymentMethod;
+import com.cdzy.user.enums.EbikePaymentTradeStatus;
+import com.cdzy.user.mapper.EbikePaymentMapper;
+import com.cdzy.user.model.entity.EbikePayment;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.mybatisflex.core.keygen.impl.SnowFlakeIDKeyGenerator;
+import jakarta.annotation.Resource;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@SpringBootTest
+class EbikeUserApplicationTests {
+
+    @Resource
+    private EbikePaymentMapper  ebikePaymentMapper;
+
+    private static final SnowFlakeIDKeyGenerator snowFlakeIDKeyGenerator = new SnowFlakeIDKeyGenerator();
+
+    @Test
+    void contextLoads() throws JsonProcessingException {
+        EbikePayment payment = EbikePayment.builder()
+                .orderId(346502255632748545L)
+                .costPrice(BigDecimal.ONE)
+                .paymentMethod(EbikePaymentMethod.WECHAT)
+                .tradeId(String.valueOf(snowFlakeIDKeyGenerator.nextId()))
+                .currency("CNY")
+                .userId(344326061705474047L)
+                .operatorId(11L)
+                .createTime(LocalDateTime.now())
+                .tradeStatus(EbikePaymentTradeStatus.NO_PAYMENT)
+                .build();
+        ebikePaymentMapper.insert(payment);
+    }
+
+}