From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 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 99a99f9..7366ddd 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
@@ -277,13 +277,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);
// 鏂扮増璧勯噾璇︽儏
@@ -387,6 +389,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 +408,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));
}
}
@@ -732,7 +737,7 @@
}
@Override
- public double countTodayMoney(Long uid) {
- return extractMapper.countTodayMoney(uid);
+ public BigDecimal sumTodayApplyMoney(Long uid,String day) {
+ return extractMapper.sumToadyApplyByUid(uid,day);
}
}
--
Gitblit v1.8.0