From 61c21f17b1ad94e4b0018c7e385195bab21b0b5c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 09 九月 2019 19:00:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java | 32 ++++++++++++--------------------
1 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java
index 7366ddd..5f21e95 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java
@@ -58,12 +58,10 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
import com.yeshi.fanli.service.inter.user.UserMoneyService;
-import com.yeshi.fanli.service.inter.user.UserNotificationService;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.GsonUtil;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
-import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
import net.sf.json.JSONObject;
@@ -109,9 +107,6 @@
@Resource
private PushService pushService;
-
- @Resource
- private UserNotificationService userNotificationService;
@Resource
private UserMoneyDetailMapper userMoneyDetailMapper;
@@ -224,13 +219,6 @@
extractAuditRecordMapper.updateByPrimaryKeySelective(auditRecord);
// 鏂扮増璧勯噾璇︽儏
- try {
- userNotificationService.extractWrong(user.getId(), find,
- TimeUtil.getGernalTime(find.getExtractTime(), "yyyy-MM-dd HH:mm"));
- } catch (Exception e) {
- e.printStackTrace();
- }
-
// 鏂扮増閫氱煡
userMoneyMsgNotificationService.extractFail(find, reason);
}
@@ -303,7 +291,6 @@
// 鍑忓幓璐︽埛璧勯噾
userMoneyService.subUserMoney(extract.getUserInfo().getId(), extract.getMoney(), userMoneyDetail);
- userNotificationService.extractApply(extract.getUserInfo().getId());
// 娣诲姞鏂扮増閫氱煡
userMoneyMsgNotificationService.extractApplay(extract);
@@ -470,10 +457,6 @@
userMoneyService.addUserMoney(user.getId(), extract.getMoney(), userMoneyDetail);
try {
-
- userNotificationService.extractTransferFail(user.getId(),
- TimeUtil.getGernalTime(extract.getExtractTime(), "yyyy-MM-dd HH:mm"));
-
LogHelper.userInfo("鏀粯瀹濊浆璐﹀け璐�:[鎻愮幇IP锛�" + extract.getIp() + ",鎵�杞处鍙�:" + extract.getAccount() + ",鐪熷疄濮撳悕锛�"
+ extract.getName() + ",鎵�杞噾棰濓細" + extract.getMoney() + ",澶辫触鍘熷洜" + extract.getReason() + "]");
@@ -511,9 +494,6 @@
extractMapper.updateByPrimaryKeySelective(updateExtract);
try {
- userNotificationService.extractSuccess(extract.getUserInfo().getId(), extract,
- TimeUtil.getGernalTime(extract.getExtractTime(), "yyyy-MM-dd HH:mm"));
-
LogHelper.userInfo("鏀粯瀹濊浆璐︽垚鍔�:[鎻愮幇IP锛�" + extract.getIp() + ",鎵�杞处鍙�:" + extract.getAccount() + ",鐪熷疄濮撳悕锛�"
+ extract.getName() + ",鎵�杞噾棰濓細" + extract.getMoney() + "]");
} catch (Exception e) {
@@ -740,4 +720,16 @@
public BigDecimal sumTodayApplyMoney(Long uid,String day) {
return extractMapper.sumToadyApplyByUid(uid,day);
}
+
+ @Override
+ public BigDecimal sumVerifyingMoney(Long uid) {
+ List<Integer> stateList=new ArrayList<>();
+ stateList.add(Extract.STATE_NOT_PROCESS);
+ stateList.add(Extract.STATE_PROCESSING);
+ BigDecimal money= extractMapper.sumMoneyByUidAndState(uid, stateList);
+ if(money==null)
+ return new BigDecimal(0);
+ else
+ return money;
+ }
}
--
Gitblit v1.8.0