From 235a867e15a86c3666c3e57727a7d6bb828e08de Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 07 十一月 2019 16:41:09 +0800
Subject: [PATCH] 微信支付查询是否成功修改,商城订单查询修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackBalanceServiceImpl.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackBalanceServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackBalanceServiceImpl.java
index 2cf5583..7da0ce9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackBalanceServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackBalanceServiceImpl.java
@@ -32,13 +32,12 @@
@Override
public BigDecimal getBalance(Long uid) {
if (uid == null || uid == 0)
- return null;
-
+ return new BigDecimal(0);
+
RedPackBalance redPackBalance = redPackBalanceMapper.selectByPrimaryKey(uid);
if (redPackBalance != null)
- return redPackBalance.getMoney();
-
- return null;
+ return redPackBalance.getMoney();
+ return new BigDecimal(0);
}
@Override
@@ -50,6 +49,7 @@
redPackBalance = new RedPackBalance();
redPackBalance.setId(uid);
redPackBalance.setMoney(money);
+ redPackBalance.setState(RedPackBalance.STATE_INIT);
redPackBalance.setCreateTime(new Date());
redPackBalance.setUpdateTime(new Date());
redPackBalanceMapper.insertSelective(redPackBalance);
@@ -65,8 +65,19 @@
throw new RedPackBalanceException(1, "鍙傛暟浼犻�掍笉瀹屾暣");
// 鍔犲叆鏄庣粏
redPackDetailService.insertSelective(detail);
- // 鍑忓皯绾㈠寘
- redPackBalanceMapper.addRedPack(uid, money);
+ // 娣诲姞绾㈠寘
+ RedPackBalance redPackBalance = redPackBalanceMapper.selectForUpdate(uid);
+ if (redPackBalance == null) {
+ redPackBalance = new RedPackBalance();
+ redPackBalance.setId(uid);
+ redPackBalance.setMoney(money);
+ redPackBalance.setState(RedPackBalance.STATE_INIT);
+ redPackBalance.setCreateTime(new Date());
+ redPackBalance.setUpdateTime(new Date());
+ redPackBalanceMapper.insertSelective(redPackBalance);
+ } else {
+ redPackBalanceMapper.addRedPack(uid, money);
+ }
}
@Override
--
Gitblit v1.8.0