attiya/ebike-share
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: attiya:7038a7eff19b407c44e012adbba2d9711ea38f49
Branches Tags
attiya:main
..
compare: attiya:13d1c7535f4020908c6397e89abf4da6557d1ecb
Branches Tags
attiya:main

2 Commits
7038a7eff1 ... 13d1c7535f

Author SHA1 Message Date
attiya
13d1c7535f Merge remote-tracking branch 'origin/main' 2025-04-21 09:34:33 +08:00
attiya
bb28d61fef 默认支付 2025-04-21 09:34:25 +08:00
1 changed files with 2 additions and 0 deletions
Show Stats Expand all files Collapse all files

2
ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java
View File

@ -30,6 +30,7 @@ import jakarta.annotation.Resource;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
@ -150,6 +151,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, UserOrd
long minutes = TimeUtils.betweenMinutes(userOrders.getStartTime(), LocalDateTime.now()); long minutes = TimeUtils.betweenMinutes(userOrders.getStartTime(), LocalDateTime.now());
//TODO:时间校验：根据规则做时间校验、判断收费多少.需要支付则为待支付状态、不需要则为取消状态 //TODO:时间校验：根据规则做时间校验、判断收费多少.需要支付则为待支付状态、不需要则为取消状态
userOrders.setStatus(OrderStatus.PENDING_PAYMENT); userOrders.setStatus(OrderStatus.PENDING_PAYMENT);
userOrders.setTotalAmount(BigDecimal.ZERO);
userOrdersMapper.update(userOrders); userOrdersMapper.update(userOrders);
//关锁,并且等待结果 //关锁,并且等待结果
CompletableFuture<String> stringCompletableFuture = ebikeCoreHandler.executeCommand(ecuInfo, CmdCode.LOCK, Long.valueOf(bikeInfoDto.getBikeId()), userId); CompletableFuture<String> stringCompletableFuture = ebikeCoreHandler.executeCommand(ecuInfo, CmdCode.LOCK, Long.valueOf(bikeInfoDto.getBikeId()), userId);