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/tlj/UserTaoLiJinOriginServiceImpl.java | 80 +++++++++++++++++++++++++---------------
1 files changed, 50 insertions(+), 30 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinOriginServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinOriginServiceImpl.java
index 184b22f..f70da5a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinOriginServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinOriginServiceImpl.java
@@ -404,35 +404,58 @@
@Override
public void overdueHongBao(Long uid) {
- // 15澶╁墠杩囨湡
- Date date = null;
+ if (uid == null) {
+ return;
+ }
+
+ // 15澶╁墠杩囨湡- 闈炵瓑绾х孩鍖�
try {
- date = DateUtil.reduceDay(15, new Date());
+ Date date = DateUtil.reduceDay(14, new Date());
+ List<UserTaoLiJinOrigin> list = userTaoLiJinOriginMapper.getOverdueTaoLiJin(uid, date);
+ executeOverdueHongBao(uid, date, list);
} catch (ParseException e) {
e.printStackTrace();
}
- if (date == null) {
- return;
+ // 30澶╁墠杩囨湡 - 绛夌骇绾㈠寘
+ try {
+ Date date = DateUtil.reduceDay(29, new Date());
+ List<UserTaoLiJinOrigin> list = userTaoLiJinOriginMapper.getOverdueTaoLiJinByRank(uid, date);
+ executeOverdueHongBao(uid, date, list);
+ } catch (ParseException e) {
+ e.printStackTrace();
}
-
- List<UserTaoLiJinOrigin> list = userTaoLiJinOriginMapper.getOverdueTaoLiJin(uid, date);
+ }
+
+
+ public void executeOverdueHongBao(Long uid, Date date, List<UserTaoLiJinOrigin> list) {
if (list == null || list.size() == 0) {
return;
}
-
+
BigDecimal total = new BigDecimal(0);
- for (UserTaoLiJinOrigin userTaoLiJinOrigin: list) {
+ for (UserTaoLiJinOrigin userTaoLiJinOrigin : list) {
+ SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH.mm");
+ String time = sd.format(userTaoLiJinOrigin.getCreateTime());
+
+ BigDecimal moneySurplus = userTaoLiJinOrigin.getMoneySurplus();
+ total = MoneyBigDecimalUtil.add(total, moneySurplus);
+
+ String rightsId = null;
+ boolean refund = false;
+ TaoLiJinOriginEnum originEnum = userTaoLiJinOrigin.getOrigin();
+ if (TaoLiJinOriginEnum.refund.equals(originEnum)) {
+ refund = true;
+ rightsId = userTaoLiJinOrigin.getRightsId();
+ }
+
UserTaoLiJinOrigin origin = new UserTaoLiJinOrigin();
origin.setId(userTaoLiJinOrigin.getId());
origin.setMoneySurplus(new BigDecimal(0));
origin.setUpdateTime(new Date());
userTaoLiJinOriginMapper.updateByPrimaryKeySelective(origin);
-
- SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd hh.mm");
- String time = sd.format(userTaoLiJinOrigin.getCreateTime());
- if (origin.getOrigin().equals(TaoLiJinOriginEnum.refund)) {
- String rightsId = userTaoLiJinOrigin.getRightsId();
+
+ if (refund) {
UserTaoLiJinReport report = userTaoLiJinReportService.selectByPrimaryKey(rightsId);
Date shareTime = null;
if (report == null) {
@@ -440,42 +463,39 @@
} else {
shareTime = report.getCreateTime();
}
-
+
// 娑堟伅
MsgOtherTaoLiJinContentDTO content = new MsgOtherTaoLiJinContentDTO();
content.setState("绾㈠寘鏀跺洖");
- content.setSource("浜嶽"+ sd.format(shareTime) + "]鍒涘缓鐨勫垎浜湭琚鍙栭儴鍒�");
+ content.setSource("浜嶽" + sd.format(shareTime) + "]鍒涘缓鐨勫垎浜湭琚鍙栭儴鍒�");
content.setTimeDesc("閫�鍥炰簬" + time);
- content.setMoney(userTaoLiJinOrigin.getMoneySurplus());
+ content.setMoney(moneySurplus);
content.setReason("鏈瑪閫�鍥炴帹骞跨孩鍖呬粠閫�鍥炴棩璧疯嚦浠婂苟鏈骇鐢熷垎浜褰�");
content.setResult("闀挎湡鏈娇鐢ㄦ敹鍥�");
userOtherMsgNotificationService.taoLiJinMsg(uid, "濡傛湁鐤戦棶璇疯仈绯讳汉宸ュ鏈�", content);
-
+
} else {
// 娑堟伅
MsgOtherTaoLiJinContentDTO content = new MsgOtherTaoLiJinContentDTO();
content.setState("绾㈠寘鏀跺洖");
- content.setSource(origin.getOrigin().getDesc());
+ content.setSource(originEnum.getDesc());
content.setTimeDesc("鑾峰緱浜�" + time);
- content.setMoney(userTaoLiJinOrigin.getMoneySurplus());
+ content.setMoney(moneySurplus);
content.setReason("鏈瑪鎺ㄥ箍绾㈠寘浠庤幏寰楁棩璧疯嚦浠婂苟鏈骇鐢熷垎浜褰�");
content.setResult("闀挎湡鏈娇鐢ㄦ敹鍥�");
userOtherMsgNotificationService.taoLiJinMsg(uid, "濡傛湁鐤戦棶璇疯仈绯讳汉宸ュ鏈�", content);
}
-
-
- total = MoneyBigDecimalUtil.add(total, userTaoLiJinOrigin.getMoneySurplus());
}
-
+
// 鐢ㄦ埛鍓╀綑娣樼ぜ閲�
UserMoneyExtra userMoneyExtra = userMoneyExtraService.selectByPrimaryKey(uid);
if (userMoneyExtra == null || userMoneyExtra.getTlj() == null) {
return;
}
-
+
UserMoneyExtra updateExtra = new UserMoneyExtra();
updateExtra.setUid(uid);
-
+
BigDecimal tljSelf = userMoneyExtra.getTljSelf();
if (tljSelf != null && tljSelf.compareTo(new BigDecimal(0)) > 0) { // 鍓╀綑娣樼ぜ閲�-- 鑷喘
BigDecimal sub = MoneyBigDecimalUtil.sub(tljSelf, total);
@@ -484,12 +504,11 @@
} else {
updateExtra.setTljSelf(new BigDecimal(0));
}
- }
+ }
updateExtra.setTlj(MoneyBigDecimalUtil.sub(userMoneyExtra.getTlj(), total));
updateExtra.setUpdateTime(new Date());
userMoneyExtraService.updateByPrimaryKeySelective(updateExtra);
-
-
+
// 鎻掑叆鏄庣粏
UserTaoLiJinDetail detail = new UserTaoLiJinDetail();
detail.setUid(uid);
@@ -499,7 +518,8 @@
detail.setCreateTime(new Date());
userTaoLiJinDetailService.insertSelective(detail);
}
-
+
+
@Override
public List<UserTaoLiJinOrigin> getSurplusLiJin(long uid) {
return userTaoLiJinOriginMapper.getSurplusLiJin(uid);
--
Gitblit v1.8.0