From 61c21f17b1ad94e4b0018c7e385195bab21b0b5c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 09 九月 2019 19:00:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java | 118 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 93 insertions(+), 25 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..d251491 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
@@ -9,6 +9,8 @@
import javax.annotation.Resource;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.yeshi.utils.DateUtil;
@@ -50,6 +52,7 @@
@Resource
private IntegralTaskService integralTaskService;
+ @Lazy
@Resource
private IntegralTaskClassService integralTaskClassService;
@@ -209,7 +212,12 @@
IntegralTaskRecord record = integralTaskRecordMapper.selectByPrimaryKey(id);
if (record == null)
continue;
-
+
+ // 宸查鍙�
+ Integer state = record.getState();
+ if (state != null && state == 1)
+ continue;
+
if (addDetail(uid, record))
totalGoldCoin += record.getGoldCoin();
}
@@ -291,19 +299,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);
@@ -364,55 +371,116 @@
return integralTaskRecordMapper.listByUidAndTaskId(uid, taskId, (page - 1) * count, count);
}
- /**
- * 琚個璇蜂汉涓嬩簡棣栧崟锛堢涓�绗旇繑鍒╄鍗曪級 鐩存帴缁欓個璇蜂汉涓�绗旈噾甯�
- * @param uid
- */
+
+ @Async()
@Override
- public void firstOrderRewardInviter(Long uid, String beizu) {
- UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
- if (userInfoExtra == null)
+ public void firstRebateOrderRewardBoss(Long uid, Long originUid, String beizu) {
+ if (uid == null || originUid == null)
return;
String reward = configService.get("first_order_reward_boss");
if (StringUtil.isNullOrEmpty(reward))
return;
+ firstOrderReward(uid, originUid, Integer.parseInt(reward), "涓�", beizu);
+ }
+
+ @Async()
+ @Override
+ public void firstRebateOrderRewardBossSuper(Long uid, Long originUid, String beizu) {
+ if (uid == null || originUid == null)
+ return;
+
+ String reward = configService.get("first_order_reward_boss_super");
+ if (StringUtil.isNullOrEmpty(reward))
+ return;
+ firstOrderReward(uid, originUid, Integer.parseInt(reward), "浜�", beizu);
+ }
+
+
+ @Async()
+ @Override
+ public void firstShareOrderReward(Long uid, String beizu) {
+ if(uid == null)
+ return;
+
+ String reward = configService.get("first_share_order_reward");
+ if (StringUtil.isNullOrEmpty(reward))
+ return;
+ firstOrderReward(uid, null, Integer.parseInt(reward), null, beizu);
+ }
+
+
+ @Async()
+ @Override
+ public void firstSharerOrderRewardBoss(Long uid, Long originUid, String beizu) {
+ if (uid == null || originUid == null)
+ return;
+
+ String reward = configService.get("first_share_order_reward_boss");
+ if (StringUtil.isNullOrEmpty(reward))
+ return;
+ firstOrderReward(uid, originUid, Integer.parseInt(reward), "涓�", beizu);
+ }
+
+
+ /**
+ * 闃熷憳棣栧崟濂栧姳閲戝竵
+ * @param uid
+ * @param addGoldCoin
+ * @param level 鎵�灞炲摢绾ч槦鍛�
+ * @param beizu
+ */
+ private void firstOrderReward(Long uid, Long originUid, Integer addGoldCoin, String level, String beizu) {
+ String uniqueKey = "firstOrder-"+ uid.toString();
+ if (originUid != null)
+ uniqueKey = uniqueKey + "-" + originUid;
+
+ // 鍒ゆ柇鏄惁宸查鍙�
+ IntegralDetail detailRecord = integralDetailService.getDetailByUniqueKey(uniqueKey);
+ if (detailRecord != null)
+ return;
+
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ if (userInfoExtra == null)
+ return;
Integer goldCoin = userInfoExtra.getGoldCoin();
if (goldCoin == null)
goldCoin = 0;
-
- int addGoldCoin = Integer.parseInt(reward);
goldCoin = goldCoin + addGoldCoin;
try {
- // 澧炲姞閲戝竵
UserInfoExtra extra = new UserInfoExtra();
extra.setId(userInfoExtra.getId());
extra.setGoldCoin(goldCoin);
userInfoExtraService.saveUserInfoExtra(extra);
} catch (UserInfoExtraException e) {
- e.printStackTrace();
+ LogHelper.errorDetailInfo(e);
return;
}
// 閲戝竵璇︽儏
IntegralDetail detail = new IntegralDetail();
- detail.setTitle("闃熷憳棣栫瑪濂栧姳");
+ detail.setTitle("閲戝竵濂栧姳");
detail.setUid(uid);
detail.setMoney(addGoldCoin);
detail.setRemark(beizu);
+ detail.setUniqueKey(uniqueKey);
detail.setCreateTime(new Date());
integralDetailService.insertSelective(detail);
// 娑堟伅
MsgOtherRewardIntegralDTO msgOther = new MsgOtherRewardIntegralDTO();
msgOther.setTitle("閲戝竵濂栧姳");
- msgOther.setSource("涓�绾ч槦鍛橀绗斾笅鍗曪紝绯荤粺濂栧姳閭�璇蜂汉閲戝竵");
msgOther.setNum(addGoldCoin + "閲戝竵");
msgOther.setTotal(goldCoin + "閲戝竵");
- msgOther.setExplain("浠呬竴绾ч槦鍛橀绗斾笅鍗曞鍔憋紙宸插埌璐︼級");
- userOtherMsgNotificationService.firstOrderRewardMsg(uid, "", msgOther);
+ if (StringUtil.isNullOrEmpty(level)) {
+ msgOther.setSource("棣栫瑪鍒嗕韩璁㈠崟锛岀郴缁熷鍔遍噾甯� ");
+ msgOther.setExplain("棣栫瑪鍒嗕韩璁㈠崟寰楀埌鐨勫閲戜笉瓒�0.01鍏冩椂濂栧姳 ");
+ } else {
+ msgOther.setSource(level + "绾ч槦鍛橀娆′笅鍗曪紝绯荤粺濂栧姳閲戝竵 ");
+ msgOther.setExplain("浠呮柊閭�璇烽槦鍛橀涓嬪崟浣犲緱鍒扮殑濂栭噾涓嶈冻0.01鍏冩椂濂栧姳 ");
+ }
+ userOtherMsgNotificationService.firstOrderRewardMsg(uid, null, msgOther);
}
-
}
--
Gitblit v1.8.0