From b26ab14c4cdfa3329ac1b057abf09461115fb8b3 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 18 十月 2019 14:54:52 +0800
Subject: [PATCH] 自动提现优化
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java | 51 ++++++++++++++++++++++++++++++---------------------
1 files changed, 30 insertions(+), 21 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 7558cbb..4c29b74 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
@@ -961,6 +961,9 @@
int pageSize = 100;
int maxSize = 300;
Date nowDate = new Date();
+ // 涓�銆佽嚜鍔ㄦ彁鐜伴拡瀵圭殑鐢ㄦ埛缇わ細 鍓嶆彁鏉′欢:鐢ㄦ埛鍦ㄨ窛浠�60澶╁埌90澶╁唴鏈椿璺冭繃鐨勭敤鎴�
+ String beganDate = DateUtil.reduceDayTostring(90, nowDate);
+ String endDate = DateUtil.reduceDayTostring(60, nowDate);
// 鏉′欢3锛氳窛绂讳笂涓�娆℃垚鍔熼鍙栧井淇＄孩鍖呭凡缁忚秴杩囦簡30澶╂椂闂达紝鍙湪绗�31澶╁啀娆′笅鍙戯紱
String receivedDate = DateUtil.reduceDayTostring(30, nowDate);
// 鏉′欢4锛氳窛绂讳笂涓�娆℃湭鎴愬姛棰嗗彇寰俊绾㈠寘宸茬粡瓒呰繃浜�15澶╂椂闂达紝鍙湪绗�16澶╁啀娆′笅鍙戯紱
@@ -973,7 +976,7 @@
while (true) {
// 鏌ヨ婊¤冻鏉′欢 1銆�2 鐨剈id
- List<UserInfo> listUser = userInfoService.getAutoExtractUserIds(page * pageSize, pageSize, minSurplus);
+ List<UserInfo> listUser = userInfoService.getAutoExtractUser(page * pageSize, pageSize, minSurplus, beganDate, endDate);
if (listUser == null || listUser.isEmpty())
break;
@@ -1019,6 +1022,9 @@
int pageSize = 100;
int maxSize = 301; // appId + 瀹為檯openid300涓�
Date nowDate = new Date();
+ // 涓�銆佽嚜鍔ㄦ彁鐜伴拡瀵圭殑鐢ㄦ埛缇わ細 鍓嶆彁鏉′欢:鐢ㄦ埛鍦ㄨ窛浠�60澶╁埌90澶╁唴鏈椿璺冭繃鐨勭敤鎴�
+ String beganDate = DateUtil.reduceDayTostring(90, nowDate);
+ String endDate = DateUtil.reduceDayTostring(60, nowDate);
// 鏉′欢3锛氳窛绂讳笂涓�娆℃垚鍔熼鍙栧井淇＄孩鍖呭凡缁忚秴杩囦簡30澶╂椂闂达紝鍙湪绗�31澶╁啀娆′笅鍙戯紱
String receivedDate = DateUtil.reduceDayTostring(30, nowDate);
// 鏉′欢4锛氳窛绂讳笂涓�娆℃湭鎴愬姛棰嗗彇寰俊绾㈠寘宸茬粡瓒呰繃浜�15澶╂椂闂达紝鍙湪绗�16澶╁啀娆′笅鍙戯紱
@@ -1035,7 +1041,7 @@
while (true) {
// 鏌ヨ婊¤冻鏉′欢 1銆�2 鐨剈id
- List<UserInfo> listUser = userInfoService.getAutoExtractUserIds(page * pageSize, pageSize, minSurplus);
+ List<UserInfo> listUser = userInfoService.getAutoExtractUser(page * pageSize, pageSize, minSurplus, beganDate, endDate);
if (listUser == null || listUser.isEmpty())
break;
@@ -1136,8 +1142,8 @@
// 鐘舵�佽繃婊�
String statusOld = record.getStatus();
- if (StringUtil.isNullOrEmpty(statusOld) ||ExtractWeiXinRecord.REFUND.equals(statusOld)
- || ExtractWeiXinRecord.RFUND_ING.equals(statusOld))
+ if (StringUtil.isNullOrEmpty(statusOld) || ExtractWeiXinRecord.REFUND.equals(statusOld)
+ || ExtractWeiXinRecord.RECEIVED.equals(statusOld))
return;
ExtractWeiXinRecord updeteRecord = new ExtractWeiXinRecord();
@@ -1191,25 +1197,28 @@
}
}
updeteRecord.setStatus(status);
-
- // 鏇存柊绾㈠寘璁板綍
extractWeiXinRecordService.updateByPrimaryKeySelective(updeteRecord);
- if (!ExtractWeiXinRecord.REFUND.equals(status))
- return;
-
- // 璧勯噾鏄庣粏
- UserMoneyDetail detail = new UserMoneyDetail();
- detail.setCreateTime(new Date());
- detail.setIdentifyCode(StringUtil.Md5(UserMoneyDetailTypeEnum.extractAutoWXRefund.name() + ":" + record.getId()));
- detail.setMoney(record.getMoney());
- detail.setTitle(UserMoneyDetailTypeEnum.extractAutoWXRefund.getDesc());
- detail.setType(UserMoneyDetailTypeEnum.extractAutoWXRefund);
- detail.setUpdateTime(new Date());
- detail.setUserInfo(new UserInfo(record.getUid()));
-
- // 璧勯噾璁＄畻
- userMoneyService.addUserMoney(record.getUid(), record.getMoney(), detail);
+ if (ExtractWeiXinRecord.RECEIVED.equals(status)) {
+ // 鍙戦�佹秷鎭�氱煡
+ userMoneyMsgNotificationService.extractAuto(record, "宸查鍙�-宸叉彁鐜�", null, null);
+ } else if (ExtractWeiXinRecord.REFUND.equals(status)) {
+ // 璧勯噾鏄庣粏
+ UserMoneyDetail detail = new UserMoneyDetail();
+ detail.setCreateTime(new Date());
+ detail.setIdentifyCode(StringUtil.Md5(UserMoneyDetailTypeEnum.extractAutoWXRefund.name() + ":" + record.getId()));
+ detail.setMoney(record.getMoney());
+ detail.setTitle(UserMoneyDetailTypeEnum.extractAutoWXRefund.getDesc());
+ detail.setType(UserMoneyDetailTypeEnum.extractAutoWXRefund);
+ detail.setUpdateTime(new Date());
+ detail.setUserInfo(new UserInfo(record.getUid()));
+
+ // 璧勯噾璁＄畻
+ userMoneyService.addUserMoney(record.getUid(), record.getMoney(), detail);
+
+ // 鍙戦�佹秷鎭�氱煡
+ userMoneyMsgNotificationService.extractAuto(record, "宸查��鍥�-浣欓涓�", null, null);
+ }
}
}
--
Gitblit v1.8.0