From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralGetServiceImpl.java | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralGetServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralGetServiceImpl.java
index 6781527..840a024 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralGetServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralGetServiceImpl.java
@@ -71,11 +71,11 @@
if (task == null)
throw new IntegralGetException(1, "浜嬩欢绫诲瀷涓嶅瓨鍦�");
- if (TaskUniqueKeyEnum.inShop == TaskUniqueKeyEnum.valueOf(event)) {
- UserInfo boss = getBossByUid(uid);
- if (boss != null)
- addInShopLevelOne(boss.getId()); // 涓嬬骇娴忚搴楅摵
- }
+// if (TaskUniqueKeyEnum.inShop == TaskUniqueKeyEnum.valueOf(event)) {
+// UserInfo boss = getBossByUid(uid);
+// if (boss != null)
+// addInShopLevelOne(boss.getId()); // 涓嬬骇娴忚搴楅摵
+// }
if (task.getFrequency() == FrequencyEnum.everyday) {
int count = integralTaskRecordService.countGetCountByTaskIdAndDay(task.getId(), uid, nowDate);
@@ -276,7 +276,7 @@
addEventStatistic(uid, TaskUniqueKeyEnum.inviteLevelOne.name());
} catch (Exception e) {
- // LogHelper.errorDetailInfo(e);
+ //LogHelper.errorDetailInfo(e);
}
}
@@ -292,7 +292,7 @@
try {
addEventStatistic(uid, TaskUniqueKeyEnum.inviteLevelTwo.name());
} catch (Exception e) {
- // LogHelper.errorDetailInfo(e);
+ //LogHelper.errorDetailInfo(e);
}
}
@@ -386,9 +386,9 @@
@Override
public void addCouponRebate(Long uid) {
try {
- UserInfo boss = getBossByUid(uid);
- if (boss != null)
- addCouponRebateLevelOne(boss.getId());
+// UserInfo boss = getBossByUid(uid);
+// if (boss != null)
+// addCouponRebateLevelOne(boss.getId());
addEventStatistic(uid, TaskUniqueKeyEnum.couponRebate.name());
} catch (Exception e) {
@@ -455,19 +455,19 @@
*
* @param uid
*/
- @IntegralGetVersionLimit(uid = "#uid")
- @RequestSerializableByKeyService(key = "#uid")
+ //@IntegralGetVersionLimit(uid = "#uid")
+ //@RequestSerializableByKeyService(key = "#uid")
@Async()
@Transactional
@Override
public void addInviteOrderLevelOne(Long uid, String orderNo, int sourceType) {
try {
- IntegralTaskRecord record = addEventStatistic(uid, TaskUniqueKeyEnum.inviteOrderLevelOne.name());
- if (record != null) {
- userGetIntegralFromOrderRecordService.addRecord(
- UserGetIntegralFromOrderRecordFactory.create(UserGetIntegralFromOrderRecord.TYPE_RECIEVE_MONEY,
- uid, orderNo, sourceType, record.getGoldCoin()));
- }
+// IntegralTaskRecord record = addEventStatistic(uid, TaskUniqueKeyEnum.inviteOrderLevelOne.name());
+// if (record != null) {
+// userGetIntegralFromOrderRecordService.addRecord(
+// UserGetIntegralFromOrderRecordFactory.create(UserGetIntegralFromOrderRecord.TYPE_RECIEVE_MONEY,
+// uid, orderNo, sourceType, record.getGoldCoin()));
+// }
} catch (Exception e) {
// LogHelper.errorDetailInfo(e);
@@ -479,19 +479,19 @@
*
* @param uid
*/
- @IntegralGetVersionLimit(uid = "#uid")
- @RequestSerializableByKeyService(key = "#uid")
+ //@IntegralGetVersionLimit(uid = "#uid")
+ //@RequestSerializableByKeyService(key = "#uid")
@Async()
@Transactional
@Override
public void addInviteOrderLevelTwo(Long uid, String orderNo, int sourceType) {
try {
- IntegralTaskRecord record = addEventStatistic(uid, TaskUniqueKeyEnum.inviteOrderLevelTwo.name());
- if (record != null) {
- userGetIntegralFromOrderRecordService.addRecord(
- UserGetIntegralFromOrderRecordFactory.create(UserGetIntegralFromOrderRecord.TYPE_RECIEVE_MONEY,
- uid, orderNo, sourceType, record.getGoldCoin()));
- }
+// IntegralTaskRecord record = addEventStatistic(uid, TaskUniqueKeyEnum.inviteOrderLevelTwo.name());
+// if (record != null) {
+// userGetIntegralFromOrderRecordService.addRecord(
+// UserGetIntegralFromOrderRecordFactory.create(UserGetIntegralFromOrderRecord.TYPE_RECIEVE_MONEY,
+// uid, orderNo, sourceType, record.getGoldCoin()));
+// }
} catch (Exception e) {
// LogHelper.errorDetailInfo(e);
--
Gitblit v1.8.0