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

订单新增是否免费订单标识

Browse Source
This commit is contained in:
yanglei 2025-12-17 16:24:55 +08:00
parent 9fb8af07c3
commit 7a6e27980a
3 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ebike-payment/src/main/java/com/cdzy/payment/model/entity/EbikeOrder.java
View File

@ -211,4 +211,9 @@ public class EbikeOrder implements Serializable {
* 删除状态（true表示已删除） * 删除状态（true表示已删除）
*/ */
private Boolean isDeleted; private Boolean isDeleted;
/**
* 是否免费订单 true-免费 false-收费
*/
private Boolean isFreeOrder;
} }

5
ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeOrder.java
View File

@ -211,4 +211,9 @@ public class EbikeOrder implements Serializable {
* 删除状态（true表示已删除） * 删除状态（true表示已删除）
*/ */
private Boolean isDeleted; private Boolean isDeleted;
/**
* 是否免费订单 true-免费 false-收费
*/
private Boolean isFreeOrder;
} }

7
ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java
View File

@ -96,7 +96,6 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
.createTime(LocalDateTime.now()) .createTime(LocalDateTime.now())
.build(); .build();
save(order); save(order);
try {
// 尝试开锁 // 尝试开锁
EbikeUnlockResultDto unlockResult = attemptUnlockWithValidation(bikeCode, userId); EbikeUnlockResultDto unlockResult = attemptUnlockWithValidation(bikeCode, userId);
if (!unlockResult.isSuccess()) { if (!unlockResult.isSuccess()) {
@ -110,10 +109,6 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
.build(); .build();
updateById(orders); updateById(orders);
return getById(order.getOrderId()); return getById(order.getOrderId());
} catch (Exception e) {
log.error("开锁失败, userId={}, bikeCode={}", userId, bikeCode, e);
throw new RuntimeException("开锁失败", e);
}
} }
@ -252,12 +247,14 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
order.setTotalAmount(BigDecimal.ZERO); order.setTotalAmount(BigDecimal.ZERO);
order.setActualAmount(BigDecimal.ZERO); order.setActualAmount(BigDecimal.ZERO);
order.setOrderStatus(OrderStatus.PAID); order.setOrderStatus(OrderStatus.PAID);
order.setIsFreeOrder(Boolean.TRUE);
updateById(order); updateById(order);
return order.getOrderId(); return order.getOrderId();
} }
order.setOrderStatus(OrderStatus.PENDING_PAYMENT); order.setOrderStatus(OrderStatus.PENDING_PAYMENT);
order.setTotalAmount(totalAmount); order.setTotalAmount(totalAmount);
order.setActualAmount(totalAmount); order.setActualAmount(totalAmount);
order.setIsFreeOrder(Boolean.FALSE);
updateById(order); updateById(order);
//生成支付订单 //生成支付订单
EbikePayment payment = EbikePayment.builder() EbikePayment payment = EbikePayment.builder()