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 ServiceImpl1.18.2 + + org.springframework.boot + spring-boot-starter-test + + 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 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 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); + } + +}