zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
Cauchy
2023-10-09 17:55:28 +08:00
parent 768dbff7fc
commit 6ab08f7a29
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java
View File

@@ -163,7 +163,6 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrderEntity
// 交易失败 9 // 交易失败 9
BuyOrderEntity orderEntity = this.getOne(new QueryWrapper<BuyOrderEntity>().eq("user_id", userId) BuyOrderEntity orderEntity = this.getOne(new QueryWrapper<BuyOrderEntity>().eq("user_id", userId)
.eq("order_sn", orderSn)); .eq("order_sn", orderSn));
if (type.equals("0")) { if (type.equals("0")) {
orderEntity.setOrderStatus("1"); orderEntity.setOrderStatus("1");
} else if (type.equals("9")) { } else if (type.equals("9")) {

13
src/main/java/com/peanut/modules/pay/weChatPay/controller/WeChatPayController.java
View File

@@ -188,16 +188,9 @@ public class WeChatPayController {
String orderNo = resourceMap.get("out_trade_no").toString(); String orderNo = resourceMap.get("out_trade_no").toString();
// 根据订单号，做幂等处理，并且在对业务数据进行状态检查和处理之前，要采用数据锁进行并发控制，以避免函数重入造成的数据混乱 // 根据订单号，做幂等处理，并且在对业务数据进行状态检查和处理之前，要采用数据锁进行并发控制，以避免函数重入造成的数据混乱
BuyOrderEntity order = this.buyOrderService.getOne(new QueryWrapper<BuyOrderEntity>().eq("order_sn", orderNo)); BuyOrderEntity order = this.buyOrderService.getOne(new QueryWrapper<BuyOrderEntity>().eq("order_sn", orderNo));
PayWechatOrderEntity wechatEntity;
if (!ObjectUtils.isEmpty(order)) {
wechatEntity = this.payWechatOrderService.getOne(new QueryWrapper<PayWechatOrderEntity>().eq("order_sn", order.getOrderSn()));
} else {
log.error("无效订单！");
return R.error(500, "无效订单！");
}
// 1.根据订单id获取订单信息 // 1.根据订单id获取订单信息
if ("order".equals(order.getOrderType())) { if ("order".equals(order.getOrderType())) {
BuyOrderEntity orderEntity = buyOrderService.getBaseMapper().selectOne(new QueryWrapper<BuyOrderEntity>().eq("order_sn", wechatEntity.getOrderSn())); BuyOrderEntity orderEntity = buyOrderService.getBaseMapper().selectOne(new QueryWrapper<BuyOrderEntity>().eq("order_sn", orderNo));
BigDecimal realMoney = orderEntity.getRealMoney(); BigDecimal realMoney = orderEntity.getRealMoney();
// 查询订单的所有 book_id // 查询订单的所有 book_id
List<Integer> orderBookIdList = shopProudictBookService.getOrderBookId(order.getOrderSn()); List<Integer> orderBookIdList = shopProudictBookService.getOrderBookId(order.getOrderSn());
@@ -217,11 +210,9 @@ public class WeChatPayController {
entity.setBookId(bookId); entity.setBookId(bookId);
userEbookBuyEntities.add(entity); userEbookBuyEntities.add(entity);
} }
boolean b = userEbookBuyService.saveBatch(userEbookBuyEntities); userEbookBuyService.saveBatch(userEbookBuyEntities);
if (wechatEntity.getTotalAmount().compareTo(realMoney) == 0) {
buyOrderService.updateOrderStatus(order.getUserId(), order.getOrderSn(), "0"); buyOrderService.updateOrderStatus(order.getUserId(), order.getOrderSn(), "0");
} }
}
if ("point".equals(order.getOrderType())) { if ("point".equals(order.getOrderType())) {
PayWechatOrderEntity buy_order_id = payWechatOrderService.getBaseMapper().selectOne(new QueryWrapper<PayWechatOrderEntity>().eq("order_sn", order.getOrderSn())); PayWechatOrderEntity buy_order_id = payWechatOrderService.getBaseMapper().selectOne(new QueryWrapper<PayWechatOrderEntity>().eq("order_sn", order.getOrderSn()));
Integer buyorder = buy_order_id.getBuyOrderId(); Integer buyorder = buy_order_id.getBuyOrderId();