From 6fb64247b9f4a74c386c06251fb678dfa9f48ada Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 28 十二月 2019 10:31:18 +0800
Subject: [PATCH] 版本修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java
index 6f03b3d..e86611f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java
@@ -188,7 +188,7 @@
return null;
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public synchronized void rejectExtract(long id, String reason, AdminUser admin)
throws ObjectStateException, NotExistObjectException {
Extract find = extractMapper.selectByPrimaryKey(id);
@@ -541,7 +541,7 @@
return extractMapper.selectByPrimaryKey(id);
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public void checkExtract(Long uid) throws ExtractException {
BigDecimal compensateMoney = extractMapper.computeCompensateByUid(uid);
@@ -1152,9 +1152,7 @@
String refundDate = DateUtil.reduceDayTostring(15, nowDate);
// 鎻愮幇閲戦
- BigDecimal money = BigDecimal.valueOf(Constant.AUTO_EXTRACT_MONEY);
- // 浣欓鏈�浣庨檺鍒�
- BigDecimal minSurplus = BigDecimal.valueOf(Constant.AUTO_EXTRACT_MIN_SURPLUS);
+ BigDecimal money = BigDecimal.valueOf(1);
List<String> listOpendIDs = new ArrayList<String>();
// 棣栬appID
@@ -1179,7 +1177,7 @@
}
for (Long uid : listValid) {
- UserInfo userInfo = subHongBaoByUid(uid, money, minSurplus);
+ UserInfo userInfo = subHongBaoByUid(uid, money, money);
if (userInfo != null) {
listOpendIDs.add(userInfo.getWxOpenId());
if (listOpendIDs.size() >= maxSize)
--
Gitblit v1.8.0