From 245f369b980e7d6f34a5a1aa9fb0bdaba1f63f5f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 02 九月 2019 14:20:29 +0800
Subject: [PATCH] 京东/拼多多维权订单修改

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java
index 0a0e335..fc802cc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java
@@ -291,19 +291,18 @@
 			}
 			detail.setTitle(taskClass.getName() + "-绗�" + num + "澶�");
 		} else {
-			int num = 0;
 			FrequencyEnum frequency = integralTask.getFrequency();
 			if (frequency == FrequencyEnum.everyday) {
-				num = integralTaskRecordMapper.countByTaskIdTodayNum(uid, taskId,
+				int num = integralTaskRecordMapper.countByTaskIdTodayNum(uid, taskId,
 						TimeUtil.getWholeTime(record.getCreateTime().getTime()));
+				if (num <= 0)
+					num = 1;
+				String title = taskClass.getName() + "-" + integralTask.getName() + "-绗�" + num + "娆�";
+				detail.setTitle(title);
 			} else if (frequency == FrequencyEnum.onlyOne) {
-				num = 1;
+				String title = taskClass.getName() + "-" + integralTask.getName();
+				detail.setTitle(title);
 			}
-
-			if (num <= 0)
-				num = 1;
-			String title = taskClass.getName() + "-" + integralTask.getName() + "-绗�" + num + "娆�";
-			detail.setTitle(title);
 		}
 
 		detail.setUid(uid);
@@ -411,8 +410,8 @@
 		msgOther.setSource("涓�绾ч槦鍛橀绗斾笅鍗曪紝绯荤粺濂栧姳閭�璇蜂汉閲戝竵");
 		msgOther.setNum(addGoldCoin + "閲戝竵");
 		msgOther.setTotal(goldCoin + "閲戝竵");
-		msgOther.setExplain("浠呬竴绾ч槦鍛橀绗斾笅鍗曞鍔憋紙宸插埌璐︼級");
-		userOtherMsgNotificationService.firstOrderRewardMsg(uid, "", msgOther);
+		msgOther.setExplain("浠呬竴绾ч槦鍛橀绗斾笅鍗曞鍔�");
+		userOtherMsgNotificationService.firstOrderRewardMsg(uid, "璁㈠崟宸插埌璐﹀悗绯荤粺浼氳嚜鍔ㄥ鍔�", msgOther);
 	}
 	
 }

--
Gitblit v1.8.0