From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java | 210 ++++++++++++++++++++++++++++++---------------------
1 files changed, 123 insertions(+), 87 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java
index 160003f..e78a478 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java
@@ -5,9 +5,11 @@
import javax.annotation.Resource;
import org.springframework.cache.annotation.Cacheable;
+import org.springframework.context.annotation.Lazy;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
+import com.yeshi.fanli.dao.mybatis.ThreeSaleMapper;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.integral.IntegralTask;
import com.yeshi.fanli.entity.integral.IntegralTask.FrequencyEnum;
@@ -16,15 +18,13 @@
import com.yeshi.fanli.exception.integral.IntegralGetException;
import com.yeshi.fanli.exception.integral.IntegralTaskRecordException;
import com.yeshi.fanli.log.LogHelper;
-import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.integral.IntegralGetService;
import com.yeshi.fanli.service.inter.integral.IntegralTaskRecordService;
import com.yeshi.fanli.service.inter.integral.IntegralTaskService;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.annotation.integral.IntegralGetVersionLimit;
-import net.sf.json.JSONObject;
-
+@Lazy
@Service
public class IntegralGetServiceImpl implements IntegralGetService {
@@ -35,20 +35,26 @@
private IntegralTaskRecordService integralTaskRecordService;
@Resource
- private ThreeSaleSerivce threeSaleSerivce;
+ private ThreeSaleMapper threeSaleMapper;
@Resource
private RedisManager redisManager;
+ // TODO 鏈塨ug
+ private UserInfo getBossByUid(Long uid) {
+ return threeSaleMapper.selectBoss(uid);
+ }
+
+ @IntegralGetVersionLimit(uid="#uid")
@Override
- public IntegralTaskRecord addEventStatistic(Long uid, String event, JSONObject params) throws IntegralGetException {
+ public IntegralTaskRecord addEventStatistic(Long uid, String event) throws IntegralGetException {
Date nowDate = new Date();
IntegralTask task = integralTaskService.getByCidAndUniqueKey(null, event);
if (task == null)
throw new IntegralGetException(1, "浜嬩欢绫诲瀷涓嶅瓨鍦�");
if (TaskUniqueKeyEnum.inShop == TaskUniqueKeyEnum.valueOf(event)) {
- UserInfo boss = threeSaleSerivce.getBoss(uid);
+ UserInfo boss = getBossByUid(uid);
if (boss != null)
addInShopLevelOne(boss.getId()); // 涓嬬骇娴忚搴楅摵
}
@@ -80,58 +86,62 @@
} catch (IntegralTaskRecordException e) {
throw new IntegralGetException(3, "娣诲姞璁板綍澶辫触");
}
-
- // switch (event) {
- // case "recommendSearch":
- // break;
- // case "shareInvite":
- // break;
- // case "inShop":
- // break;
- // case "scanPush":
- // break;
- // case "scanGoods":
- // break;
- // case "scanHomeBanner":
- // break;
- // case "scanSpecial":
- // break;
- // case "scanTBCart":
- // break;
- // }
}
+ @Cacheable(value = "integralGetCache", key = "'addRecommendSearch-'+#uid")
@Override
- public void addRecommendSearch(Long uid) throws IntegralGetException {
-
+ public IntegralTaskRecord addRecommendSearch(Long uid) {
+ try {
+ return addEventStatistic(uid, TaskUniqueKeyEnum.recommendSearch.name());
+ } catch (IntegralGetException e) {
+ e.printStackTrace();
+ }
+ return null;
}
@Cacheable(value = "integralGetCache", key = "'addSearchResultScan-'+#uid+'-'+#kw")
@Override
- public void addSearchResultScan(Long uid, String kw) throws IntegralGetException {
- System.out.println("鎼滅储");
+ public IntegralTaskRecord addSearchResultScan(Long uid, String kw) {
+ try {
+ return addEventStatistic(uid, TaskUniqueKeyEnum.scanSearchResult.name());
+ } catch (IntegralGetException e) {
+ e.printStackTrace();
+ }
+
+ return null;
}
+ @Cacheable(value = "integralGetCache", key = "'addShareInvite-'+#uid")
@Override
- public void addShareInvite(Long uid) throws IntegralGetException {
-
+ public IntegralTaskRecord addShareInvite(Long uid) {
+ try {
+ return addEventStatistic(uid, TaskUniqueKeyEnum.shareInvite.name());
+ } catch (IntegralGetException e) {
+ e.printStackTrace();
+ }
+ return null;
}
+ @Cacheable(value = "integralGetCache", key = "'addIntoShop-'+#uid+'-'+#shopUrlMD5")
@Override
- public void addIntoShop(Long uid) throws IntegralGetException {
- // TODO Auto-generated method stub
-
+ public IntegralTaskRecord addIntoShop(Long uid, String shopUrlMD5) {
+ try {
+ return addEventStatistic(uid, TaskUniqueKeyEnum.inShop.name());
+ } catch (IntegralGetException e) {
+ e.printStackTrace();
+ }
+ return null;
}
@IntegralGetVersionLimit(uid = "#uid")
@Async()
private void addInShopLevelOne(Long uid) {
try {
- UserInfo boss = threeSaleSerivce.getBoss(uid);
+ UserInfo boss = getBossByUid(uid);
if (boss != null)
addInShopLevelTwo(boss.getId()); // 浜岀骇闃熷憳
- addEventStatistic(uid, TaskUniqueKeyEnum.inShopLevelOne.name(), null);
+ addEventStatistic(uid, TaskUniqueKeyEnum.inShopLevelOne.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -141,40 +151,66 @@
@Async()
private void addInShopLevelTwo(Long uid) {
try {
- addEventStatistic(uid, TaskUniqueKeyEnum.inShopLevelTwo.name(), null);
+ addEventStatistic(uid, TaskUniqueKeyEnum.inShopLevelTwo.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
}
+ @Cacheable(value = "integralGetCache", key = "'addScanPushHistory-'+#uid")
@Override
- public void addScanPushHistory(Long uid) throws IntegralGetException {
- // TODO Auto-generated method stub
-
+ public IntegralTaskRecord addScanPushHistory(Long uid) {
+ try {
+ return addEventStatistic(uid, TaskUniqueKeyEnum.scanPush.name());
+ } catch (IntegralGetException e) {
+ e.printStackTrace();
+ }
+ return null;
}
+ @Cacheable(value = "integralGetCache", key = "'addScanGoodsDetail-'+#uid+'-'+#goodsType+'-'+#goodsId")
@Override
- public void addScanGoodsDetail(Long uid, int goodsType, Long goodsId) {
- // TODO Auto-generated method stub
-
+ public IntegralTaskRecord addScanGoodsDetail(Long uid, int goodsType, Long goodsId) {
+ try {
+ return addEventStatistic(uid, TaskUniqueKeyEnum.scanGoods.name());
+ } catch (IntegralGetException e) {
+ e.printStackTrace();
+ }
+ return null;
}
+ @Cacheable(value = "integralGetCache", key = "'addScanRecommendBanner-'+#uid+'-'+#id")
@Override
- public void addScanRecommendBanner(Long uid) {
- // TODO Auto-generated method stub
-
+ public IntegralTaskRecord addScanRecommendBanner(Long uid, String id) {
+ try {
+ return addEventStatistic(uid, TaskUniqueKeyEnum.scanHomeBanner.name());
+ } catch (IntegralGetException e) {
+ e.printStackTrace();
+ }
+ return null;
}
+ @Cacheable(value = "integralGetCache", key = "'addScanRecommendSpecial-'+#uid+'-'+#id")
@Override
- public void addScanRecommendSpecial(Long uid) {
- // TODO Auto-generated method stub
+ public IntegralTaskRecord addScanRecommendSpecial(Long uid, String id) {
+ try {
+ return addEventStatistic(uid, TaskUniqueKeyEnum.scanSpecial.name());
+ } catch (IntegralGetException e) {
+ e.printStackTrace();
+ }
+ return null;
}
+ @Cacheable(value = "integralGetCache", key = "'addScanTaoBaoCart-'+#uid")
@Override
- public void addScanTaoBaoCart(Long uid) {
- // TODO Auto-generated method stub
-
+ public IntegralTaskRecord addScanTaoBaoCart(Long uid) {
+ try {
+ return addEventStatistic(uid, TaskUniqueKeyEnum.scanTBCart.name());
+ } catch (IntegralGetException e) {
+ e.printStackTrace();
+ }
+ return null;
}
@IntegralGetVersionLimit(uid = "#uid")
@@ -182,7 +218,7 @@
@Override
public void addTaoLiJinBuy(Long uid, Long goodsId) {
try {
- addEventStatistic(uid, TaskUniqueKeyEnum.taoLiJinBuy.name(), null);
+ addEventStatistic(uid, TaskUniqueKeyEnum.taoLiJinBuy.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -193,11 +229,11 @@
@Override
public void addInviteLevelOne(Long uid, Long workerId) {
try {
- UserInfo boss = threeSaleSerivce.getBoss(uid);
+ UserInfo boss = getBossByUid(uid);
if (boss != null)
addInviteLevelTwo(boss.getId());
-
- addEventStatistic(uid, TaskUniqueKeyEnum.inviteLevelOne.name(), null);
+
+ addEventStatistic(uid, TaskUniqueKeyEnum.inviteLevelOne.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -212,7 +248,7 @@
@Async()
private void addInviteLevelTwo(Long uid) {
try {
- addEventStatistic(uid, TaskUniqueKeyEnum.inviteLevelTwo.name(), null);
+ addEventStatistic(uid, TaskUniqueKeyEnum.inviteLevelTwo.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -223,7 +259,7 @@
@Override
public void addShareSingleGoods(Long uid) {
try {
- addEventStatistic(uid, TaskUniqueKeyEnum.shareSingleGoods.name(), null);
+ addEventStatistic(uid, TaskUniqueKeyEnum.shareSingleGoods.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -234,7 +270,7 @@
@Override
public void addShareMultipleGoods(Long uid) {
try {
- addEventStatistic(uid, TaskUniqueKeyEnum.shareMultipleGoods.name(), null);
+ addEventStatistic(uid, TaskUniqueKeyEnum.shareMultipleGoods.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -245,7 +281,7 @@
@Override
public void addShareTLJGoods(Long uid) {
try {
- addEventStatistic(uid, TaskUniqueKeyEnum.shareTLJGoods.name(), null);
+ addEventStatistic(uid, TaskUniqueKeyEnum.shareTLJGoods.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -256,7 +292,7 @@
@Override
public void addGiveRebateCoupon(Long uid) {
try {
- addEventStatistic(uid, TaskUniqueKeyEnum.giveRebateCoupon.name(), null);
+ addEventStatistic(uid, TaskUniqueKeyEnum.giveRebateCoupon.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -267,7 +303,7 @@
@Override
public void addGiveFreeCoupon(Long uid) {
try {
- addEventStatistic(uid, TaskUniqueKeyEnum.giveFreeCoupon.name(), null);
+ addEventStatistic(uid, TaskUniqueKeyEnum.giveFreeCoupon.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -278,7 +314,7 @@
@Override
public void addGiveTaoLiJin(Long uid) {
try {
- addEventStatistic(uid, TaskUniqueKeyEnum.giveTaoLiJin.name(), null);
+ addEventStatistic(uid, TaskUniqueKeyEnum.giveTaoLiJin.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -289,7 +325,7 @@
@Override
public void addCloseRecommendGoods(Long uid) {
try {
- addEventStatistic(uid, TaskUniqueKeyEnum.closeRecommendGoods.name(), null);
+ addEventStatistic(uid, TaskUniqueKeyEnum.closeRecommendGoods.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -300,11 +336,11 @@
@Override
public void addCouponRebate(Long uid) {
try {
- UserInfo boss = threeSaleSerivce.getBoss(uid);
+ UserInfo boss = getBossByUid(uid);
if (boss != null)
addCouponRebateLevelOne(boss.getId());
-
- addEventStatistic(uid, TaskUniqueKeyEnum.couponRebate.name(), null);
+
+ addEventStatistic(uid, TaskUniqueKeyEnum.couponRebate.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -319,11 +355,11 @@
@Async()
private void addCouponRebateLevelOne(Long uid) {
try {
- UserInfo boss = threeSaleSerivce.getBoss(uid);
+ UserInfo boss = getBossByUid(uid);
if (boss != null)
addCouponRebateLevelTwo(boss.getId()); // 浜岀骇闃熷憳
-
- addEventStatistic(uid, TaskUniqueKeyEnum.couponRebateLevelOne.name(), null);
+
+ addEventStatistic(uid, TaskUniqueKeyEnum.couponRebateLevelOne.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -338,7 +374,7 @@
@Async()
private void addCouponRebateLevelTwo(Long uid) {
try {
- addEventStatistic(uid, TaskUniqueKeyEnum.couponRebateLevelTwo.name(), null);
+ addEventStatistic(uid, TaskUniqueKeyEnum.couponRebateLevelTwo.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -349,11 +385,11 @@
@Override
public void addRebateOrder(Long uid) {
try {
- UserInfo boss = threeSaleSerivce.getBoss(uid);
+ UserInfo boss = getBossByUid(uid);
if (boss != null)
addInviteOrderLevelOne(boss.getId());
-
- addEventStatistic(uid, TaskUniqueKeyEnum.rebateOrder.name(), null);
+
+ addEventStatistic(uid, TaskUniqueKeyEnum.rebateOrder.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -368,11 +404,11 @@
@Async()
private void addInviteOrderLevelOne(Long uid) {
try {
- UserInfo boss = threeSaleSerivce.getBoss(uid);
+ UserInfo boss = getBossByUid(uid);
if (boss != null)
addInviteOrderLevelTwo(boss.getId());
-
- addEventStatistic(uid, TaskUniqueKeyEnum.inviteOrderLevelOne.name(), null);
+
+ addEventStatistic(uid, TaskUniqueKeyEnum.inviteOrderLevelOne.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -387,7 +423,7 @@
@Async()
private void addInviteOrderLevelTwo(Long uid) {
try {
- addEventStatistic(uid, TaskUniqueKeyEnum.inviteOrderLevelTwo.name(), null);
+ addEventStatistic(uid, TaskUniqueKeyEnum.inviteOrderLevelTwo.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -398,7 +434,7 @@
@Override
public void addShareOrder(Long uid) {
try {
- addEventStatistic(uid, TaskUniqueKeyEnum.shareOrder.name(), null);
+ addEventStatistic(uid, TaskUniqueKeyEnum.shareOrder.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -409,7 +445,7 @@
@Override
public void addBindWeiXin(Long uid) {
try {
- addEventStatistic(uid, TaskUniqueKeyEnum.bindWeiXin.name(), null);
+ addEventStatistic(uid, TaskUniqueKeyEnum.bindWeiXin.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -420,7 +456,7 @@
@Override
public void addBindPhone(Long uid) {
try {
- addEventStatistic(uid, TaskUniqueKeyEnum.bindPhone.name(), null);
+ addEventStatistic(uid, TaskUniqueKeyEnum.bindPhone.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -431,7 +467,7 @@
@Override
public void addBindTaoBao(Long uid) {
try {
- addEventStatistic(uid, TaskUniqueKeyEnum.bindTaoBao.name(), null);
+ addEventStatistic(uid, TaskUniqueKeyEnum.bindTaoBao.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -442,7 +478,7 @@
@Override
public void addSetWeiXinNum(Long uid) {
try {
- addEventStatistic(uid, TaskUniqueKeyEnum.setWeiXinNum.name(), null);
+ addEventStatistic(uid, TaskUniqueKeyEnum.setWeiXinNum.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -453,7 +489,7 @@
@Override
public void addSetGender(Long uid) {
try {
- addEventStatistic(uid, TaskUniqueKeyEnum.setGender.name(), null);
+ addEventStatistic(uid, TaskUniqueKeyEnum.setGender.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -464,7 +500,7 @@
@Override
public void addSetPortrait(Long uid) {
try {
- addEventStatistic(uid, TaskUniqueKeyEnum.setPortrait.name(), null);
+ addEventStatistic(uid, TaskUniqueKeyEnum.setPortrait.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -475,7 +511,7 @@
@Override
public void addSetNickname(Long uid) {
try {
- addEventStatistic(uid, TaskUniqueKeyEnum.setNickName.name(), null);
+ addEventStatistic(uid, TaskUniqueKeyEnum.setNickName.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -486,7 +522,7 @@
@Override
public void addBindAlipay(Long uid) {
try {
- addEventStatistic(uid, TaskUniqueKeyEnum.bindAlipay.name(), null);
+ addEventStatistic(uid, TaskUniqueKeyEnum.bindAlipay.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -497,7 +533,7 @@
@Override
public void addInviteActivate(Long uid) {
try {
- addEventStatistic(uid, TaskUniqueKeyEnum.inviteActivate.name(), null);
+ addEventStatistic(uid, TaskUniqueKeyEnum.inviteActivate.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
--
Gitblit v1.8.0