From e2741d692b5d2e382ae3159a131d54a9ca75aa6f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 12 七月 2019 10:39:52 +0800
Subject: [PATCH] Merge branch 'master' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinOriginServiceImpl.java |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 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 ad1567a..5e8164d 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
@@ -407,7 +407,7 @@
 		// 15澶╁墠杩囨湡
 		Date date = null;
 		try {
-			date = DateUtil.reduceDay(15, new Date());
+			date = DateUtil.reduceDay(14, new Date());
 		} catch (ParseException e) {
 			e.printStackTrace();
 		}
@@ -423,16 +423,27 @@
 		
 		BigDecimal total = new BigDecimal(0);
 		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) {
@@ -446,7 +457,7 @@
 				content.setState("绾㈠寘鏀跺洖");
 				content.setSource("浜嶽"+ sd.format(shareTime) + "]鍒涘缓鐨勫垎浜湭琚鍙栭儴鍒�");
 				content.setTimeDesc("閫�鍥炰簬" + time);
-				content.setMoney(userTaoLiJinOrigin.getMoneySurplus());
+				content.setMoney(moneySurplus);
 				content.setReason("鏈瑪閫�鍥炴帹骞跨孩鍖呬粠閫�鍥炴棩璧疯嚦浠婂苟鏈骇鐢熷垎浜褰�");
 				content.setResult("闀挎湡鏈娇鐢ㄦ敹鍥�");
 				userOtherMsgNotificationService.taoLiJinMsg(uid, "濡傛湁鐤戦棶璇疯仈绯讳汉宸ュ鏈�", content);
@@ -455,16 +466,13 @@
 				// 娑堟伅
 				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());
 		}
 		
 		// 鐢ㄦ埛鍓╀綑娣樼ぜ閲�

--
Gitblit v1.8.0