From 788deca1b4a24f8a24e49c24f7d89975a1d74bbe Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 03 十一月 2019 23:31:25 +0800
Subject: [PATCH] 商城订单退款处理

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java
index 3f99051..697d4a4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java
@@ -236,16 +236,10 @@
 				totalGoldCoin += record.getGoldCoin();
 		}
 
-		Integer goldCoin = userInfoExtra.getGoldCoin();
-		if (goldCoin == null)
-			goldCoin = 0;
-
-		goldCoin = goldCoin + totalGoldCoin;
-
 		// 鏇存柊閲戝竵
-		userInfoExtraService.updateGoldCoin(userInfoExtra.getId(), goldCoin);
+		userInfoExtraService.updateGoldCoin(userInfoExtra.getId(), totalGoldCoin);
 
-		return goldCoin;
+		return totalGoldCoin+(userInfoExtra.getGoldCoin()==null?0:userInfoExtra.getGoldCoin());
 	}
 
 	@Transactional
@@ -312,7 +306,7 @@
 			FrequencyEnum frequency = integralTask.getFrequency();
 			if (frequency == FrequencyEnum.everyday) {
 				int num = integralTaskRecordMapper.countByTaskIdTodayNum(uid, taskId,
-						TimeUtil.getWholeTime(record.getCreateTime().getTime()));
+						TimeUtil.getWholeTime(record.getCreateTime().getTime()), record.getId());
 				if (num <= 0)
 					num = 1;
 				String title = taskClass.getName() + "-" + integralTask.getName() + "-绗�" + num + "娆�";

--
Gitblit v1.8.0