From ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 18 二月 2020 12:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java | 124 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 115 insertions(+), 9 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 5e7a117..3d47565 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
@@ -53,6 +53,7 @@
import com.yeshi.fanli.entity.common.AdminUser;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.exception.ExtractException;
import com.yeshi.fanli.exception.NotExistObjectException;
import com.yeshi.fanli.exception.ObjectStateException;
@@ -172,10 +173,10 @@
updateExtract.setId(id);
updateExtract.setState(Extract.STATE_PROCESSING);
extractMapper.updateByPrimaryKeySelective(updateExtract);
- //TODO 鏂扮増閮ㄧ讲鍚庡垹闄�
+ // TODO 鏂扮増閮ㄧ讲鍚庡垹闄�
// 鏀瑰彉璧勯噾璁板綍鐘舵��
- UserMoneyDetail detail = userMoneyDetailService
- .selectByTypeAndUidAndIdentifyCode(UserMoneyDetailTypeEnum.extract, find.getUserInfo().getId(), find.getId());
+ UserMoneyDetail detail = userMoneyDetailService.selectByTypeAndUidAndIdentifyCode(
+ UserMoneyDetailTypeEnum.extract, find.getUserInfo().getId(), find.getId());
if (detail != null) {
UserMoneyDetail update = new UserMoneyDetail(detail.getId());
update.setShow(true);
@@ -188,7 +189,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);
@@ -268,9 +269,9 @@
&& (System.currentTimeMillis() - history.getCreateTime().getTime()) < 1000 * 60 * 60 * 24 * 7L)
return 111;
- final String autoExtract = configService.get("extract_way"); // 鏄惁鑷姩杞处
- final String maxCount = configService.get("extract_count_day");
- final String maxMoney = configService.get("extract_money_day");
+ final String autoExtract = configService.get(ConfigKeyEnum.extractWay.getKey()); // 鏄惁鑷姩杞处
+ final String maxCount = configService.get(ConfigKeyEnum.extractDayCount.getKey());
+ final String maxMoney = configService.get(ConfigKeyEnum.extractMoneyDay.getKey());
UserInfo user = userInfoMapper.selectByPrimaryKeyForUpdate(extract.getUserInfo().getId());
// 浣欓涓嶈冻
@@ -426,7 +427,7 @@
response = alipayClient.execute(request);
LogHelper.userErrorInfo("鎻愮幇:鏀粯瀹濋�氳繃鎻愮幇鎴愬姛-" + extract.getId());
} catch (AlipayApiException e) {
- e.printStackTrace();
+ LogHelper.errorDetailInfo(e, "鏀粯瀹濊浆璐﹀紓甯�:" + extract.getId(), "");
LogHelper.userErrorInfo("鎻愮幇:鏀粯瀹濇彁鐜板紓甯革細" + response + ",鎻愮幇淇℃伅" + GsonUtil.toJson(extract));
}
@@ -541,7 +542,7 @@
return extractMapper.selectByPrimaryKey(id);
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
@Override
public void checkExtract(Long uid) throws ExtractException {
BigDecimal compensateMoney = extractMapper.computeCompensateByUid(uid);
@@ -1087,6 +1088,111 @@
return listOpendIDs;
}
+ @Override
+ public List<UserInfo> preAutoUserTo1212() throws Exception {
+ int page = 0;
+ int pageSize = 100;
+ int maxSize = 300;
+ Date nowDate = new Date();
+ // 鏉′欢3锛氳窛绂讳笂涓�娆℃垚鍔熼鍙栧井淇＄孩鍖呭凡缁忚秴杩囦簡30澶╂椂闂达紝鍙湪绗�31澶╁啀娆′笅鍙戯紱
+ String receivedDate = DateUtil.reduceDayTostring(30, nowDate);
+ // 鏉′欢4锛氳窛绂讳笂涓�娆℃湭鎴愬姛棰嗗彇寰俊绾㈠寘宸茬粡瓒呰繃浜�15澶╂椂闂达紝鍙湪绗�16澶╁啀娆′笅鍙戯紱
+ String refundDate = DateUtil.reduceDayTostring(15, nowDate);
+ // 浣欓鏈�浣庨檺鍒�
+ List<UserInfo> list = new ArrayList<UserInfo>();
+ while (true) {
+ // 鏌ヨ婊¤冻鏉′欢 1銆�2 鐨剈id
+ List<UserInfo> listUser = userInfoService.getAutoExtractUserTo1212(page * pageSize, pageSize);
+ if (listUser == null || listUser.isEmpty())
+ break;
+
+ List<Long> listId = new ArrayList<Long>();
+ for (UserInfo userInfo : listUser) {
+ listId.add(userInfo.getId());
+ }
+
+ // 鏌ヨ璁板綍鏄惁婊¤冻
+ List<Long> listValid = extractWeiXinRecordService.getValidUsers(listId, receivedDate, refundDate);
+ if (listValid == null || listValid.isEmpty()) {
+ page++;
+ continue;
+ }
+
+ for (Long uid : listValid) {
+ if (list.size() >= maxSize)
+ break;
+ for (UserInfo userInfo : listUser) {
+ if (list.size() >= maxSize)
+ break;
+
+ if (userInfo.getId().longValue() == uid.longValue()) {
+ list.add(userInfo);
+ break;
+ }
+ }
+ }
+
+ if (list.size() >= maxSize)
+ break;
+
+ page++;
+ }
+ return list;
+ }
+
+ @Override
+ public List<String> getAutoExtractOpenIdsTo1212() throws Exception {
+ int page = 0;
+ int pageSize = 100;
+ int maxSize = 301; // appId + 瀹為檯openid300涓�
+ Date nowDate = new Date();
+ // 鏉′欢3锛氳窛绂讳笂涓�娆℃垚鍔熼鍙栧井淇＄孩鍖呭凡缁忚秴杩囦簡30澶╂椂闂达紝鍙湪绗�31澶╁啀娆′笅鍙戯紱
+ String receivedDate = DateUtil.reduceDayTostring(30, nowDate);
+ // 鏉′欢4锛氳窛绂讳笂涓�娆℃湭鎴愬姛棰嗗彇寰俊绾㈠寘宸茬粡瓒呰繃浜�15澶╂椂闂达紝鍙湪绗�16澶╁啀娆′笅鍙戯紱
+ String refundDate = DateUtil.reduceDayTostring(15, nowDate);
+
+ // 鎻愮幇閲戦
+ BigDecimal money = BigDecimal.valueOf(1);
+
+ List<String> listOpendIDs = new ArrayList<String>();
+ // 棣栬appID
+ listOpendIDs.add(Constant.getWXAccount(null, null).getAppId());
+
+ while (true) {
+ // 鏌ヨ婊¤冻鏉′欢 1銆�2 鐨剈id
+ List<UserInfo> listUser = userInfoService.getAutoExtractUserTo1212(page * pageSize, pageSize);
+ if (listUser == null || listUser.isEmpty())
+ break;
+
+ List<Long> listId = new ArrayList<Long>();
+ for (UserInfo userInfo : listUser) {
+ listId.add(userInfo.getId());
+ }
+
+ // 鏌ヨ璁板綍鏄惁婊¤冻
+ List<Long> listValid = extractWeiXinRecordService.getValidUsers(listId, receivedDate, refundDate);
+ if (listValid == null || listValid.isEmpty()) {
+ page++;
+ continue;
+ }
+
+ for (Long uid : listValid) {
+ UserInfo userInfo = subHongBaoByUid(uid, money, money);
+ if (userInfo != null) {
+ listOpendIDs.add(userInfo.getWxOpenId());
+ if (listOpendIDs.size() >= maxSize)
+ break;
+ }
+ }
+
+ if (listOpendIDs.size() >= maxSize)
+ break;
+
+ page++;
+ }
+ return listOpendIDs;
+ }
+
@Transactional(rollbackFor = Exception.class)
private UserInfo subHongBaoByUid(Long uid, BigDecimal money, BigDecimal minSurplus) {
UserInfo userInfo = userInfoMapper.selectByPrimaryKeyForUpdate(uid);
--
Gitblit v1.8.0