From fe879975a3e8a0a1aa280fb839e02d159bfbcff8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 18:04:38 +0800
Subject: [PATCH] 金币任务多次获取bug修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java | 45 +++++++++++++++------------------------------
1 files changed, 15 insertions(+), 30 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 103e439..b538eb8 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);
}
@@ -277,13 +265,15 @@
auditRecord.setBeforeMoney(user.getMyHongBao());
auditRecord.setExtract(extract);
+ Date minTime = new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 180L);
// 缁熻鏁版嵁
- int orderCount50More = orderUserStatisticService.countHongBaoOrderCount50MoreByUid(user.getId());
- BigDecimal weiQuanOrderFanAmount = orderUserStatisticService.sumWeiQuanOrderFanAmountByUid(user.getId());
- int weiQuanOrderCount = orderUserStatisticService.countWeiQuanOrderByUid(user.getId());
- int safeOrderCount = orderUserStatisticService.countSafeOrderByUid(user.getId());
- auditRecord.setExtraInfoStr(new Gson().toJson(new ExtractOrderStatisticDTO(orderCount50More, weiQuanOrderCount,
- weiQuanOrderFanAmount, safeOrderCount)));
+ int orderCount50More = orderUserStatisticService.countOrderCount100MoreByUidAndMinTime(user.getId(), minTime);
+
+ BigDecimal weiQuanOrderFanAmount = orderUserStatisticService.sumWeiQuanOrderFanAmountByUid(user.getId(),
+ minTime);
+ int weiQuanOrderCount = orderUserStatisticService.countWeiQuanOrderByUid(user.getId(), minTime);
+ auditRecord.setExtraInfoStr(new Gson()
+ .toJson(new ExtractOrderStatisticDTO(orderCount50More, weiQuanOrderCount, weiQuanOrderFanAmount, 0)));
extractAuditRecordMapper.insertSelective(auditRecord);
// 鏂扮増璧勯噾璇︽儏
@@ -301,7 +291,6 @@
// 鍑忓幓璐︽埛璧勯噾
userMoneyService.subUserMoney(extract.getUserInfo().getId(), extract.getMoney(), userMoneyDetail);
- userNotificationService.extractApply(extract.getUserInfo().getId());
// 娣诲姞鏂扮増閫氱煡
userMoneyMsgNotificationService.extractApplay(extract);
@@ -387,6 +376,7 @@
*/
@Transactional
private void extractByZhiFuBao(Extract extract, AdminUser adminUser) {
+ LogHelper.userErrorInfo("鎻愮幇:寮�濮嬮�氳繃鎻愮幇-"+extract.getId());
String privateKey = Constant.alipayConfig.getPrivateKey();
AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",
Constant.alipayConfig.getAppId(), privateKey, "json", "gbk", null, "RSA2");
@@ -405,15 +395,17 @@
AlipayFundTransToaccountTransferResponse response = null;
try {
response = alipayClient.execute(request);
+ LogHelper.userErrorInfo("鎻愮幇:鏀粯瀹濋�氳繃鎻愮幇鎴愬姛-"+extract.getId());
} catch (AlipayApiException e) {
e.printStackTrace();
- LogHelper.userErrorInfo("鏀粯瀹濇彁鐜板紓甯革細" + response + ",鎻愮幇淇℃伅" + GsonUtil.toJson(extract));
+ LogHelper.userErrorInfo("鎻愮幇:鏀粯瀹濇彁鐜板紓甯革細" + response + ",鎻愮幇淇℃伅" + GsonUtil.toJson(extract));
}
try {
CMQManager.getInstance().addExtractResultMsg(extract, response, adminUser);
+ LogHelper.userErrorInfo("鎻愮幇:娣诲姞澶勭悊闃熷垪鎴愬姛-"+extract.getId());
} catch (Exception e) {
- LogHelper.userErrorInfo("鏀粯瀹濇彁鐜癈MQ寮傚父锛�" + new Gson().toJson(response) + ",鎻愮幇淇℃伅" + GsonUtil.toJson(extract));
+ LogHelper.userErrorInfo("鎻愮幇:鏀粯瀹濇彁鐜癈MQ寮傚父锛�" + new Gson().toJson(response) + ",鎻愮幇淇℃伅" + GsonUtil.toJson(extract));
}
}
@@ -465,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() + "]");
@@ -506,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) {
@@ -732,7 +717,7 @@
}
@Override
- public BigDecimal sumTodayApplyMoney(Long uid) {
- return extractMapper.sumToadyApplyByUid(uid);
+ public BigDecimal sumTodayApplyMoney(Long uid,String day) {
+ return extractMapper.sumToadyApplyByUid(uid,day);
}
}
--
Gitblit v1.8.0