Merge remote-tracking branch 'origin/div' into div

yujian

2019-11-20 0f9a0a76b170bceac867dd5cd009e518ac6646e4

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralGetServiceImpl.java

@@ -7,6 +7,7 @@
import org.springframework.context.annotation.Lazy;

import org.springframework.scheduling.annotation.Async;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



import com.yeshi.fanli.dao.mybatis.ThreeSaleMapper;

import com.yeshi.fanli.entity.bus.user.UserInfo;

@@ -17,6 +18,7 @@
import com.yeshi.fanli.entity.integral.IntegralTask.TaskUniqueKeyEnum;

import com.yeshi.fanli.entity.integral.IntegralTaskRank;

import com.yeshi.fanli.entity.integral.IntegralTaskRecord;

import com.yeshi.fanli.entity.integral.UserGetIntegralFromOrderRecord;

import com.yeshi.fanli.exception.integral.IntegralGetException;

import com.yeshi.fanli.exception.integral.IntegralTaskRecordException;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

@@ -24,11 +26,12 @@
import com.yeshi.fanli.service.inter.user.integral.IntegralTaskRankService;

import com.yeshi.fanli.service.inter.user.integral.IntegralTaskRecordService;

import com.yeshi.fanli.service.inter.user.integral.IntegralTaskService;

import com.yeshi.fanli.service.inter.user.integral.UserGetIntegralFromOrderRecordService;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.annotation.RequestSerializableByKey;

import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService;

import com.yeshi.fanli.util.annotation.integral.IntegralGetFrequencyLimit;

import com.yeshi.fanli.util.annotation.integral.IntegralGetVersionLimit;

import com.yeshi.fanli.util.factory.integral.UserGetIntegralFromOrderRecordFactory;



@Lazy

@Service

@@ -51,6 +54,9 @@


   @Resource

   private IntegralTaskRankService integralTaskRankService;



   @Resource

   private UserGetIntegralFromOrderRecordService userGetIntegralFromOrderRecordService;



   private UserInfo getBossByUid(Long uid) {

      return threeSaleMapper.selectBoss(uid);

@@ -429,10 +435,16 @@
   @IntegralGetVersionLimit(uid = "#uid")

   @RequestSerializableByKeyService(key = "#uid")

   @Async()

   @Transactional

   @Override

   public void addRebateOrder(Long uid) {

   public void addRebateOrder(Long uid, String orderNo, int sourceType) {

      try {

         addEventStatistic(uid, TaskUniqueKeyEnum.rebateOrder.name());

         IntegralTaskRecord record = addEventStatistic(uid, TaskUniqueKeyEnum.rebateOrder.name());

         if (record != null) {

            userGetIntegralFromOrderRecordService.addRecord(

                  UserGetIntegralFromOrderRecordFactory.create(UserGetIntegralFromOrderRecord.TYPE_RECIEVE_MONEY,

                        uid, orderNo, sourceType, record.getGoldCoin()));

         }

      } catch (Exception e) {

         //LogHelper.errorDetailInfo(e);

      }

@@ -446,10 +458,17 @@
   @IntegralGetVersionLimit(uid = "#uid")

   @RequestSerializableByKeyService(key = "#uid")

   @Async()

   @Transactional

   @Override

   public void addInviteOrderLevelOne(Long uid) {

   public void addInviteOrderLevelOne(Long uid, String orderNo, int sourceType) {

      try {

         addEventStatistic(uid, TaskUniqueKeyEnum.inviteOrderLevelOne.name());

         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);

      }

@@ -463,10 +482,17 @@
   @IntegralGetVersionLimit(uid = "#uid")

   @RequestSerializableByKeyService(key = "#uid")

   @Async()

   @Transactional

   @Override

   public void addInviteOrderLevelTwo(Long uid) {

   public void addInviteOrderLevelTwo(Long uid, String orderNo, int sourceType) {

      try {

         addEventStatistic(uid, TaskUniqueKeyEnum.inviteOrderLevelTwo.name());

         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);

      }

@@ -475,10 +501,16 @@
   @IntegralGetVersionLimit(uid = "#uid")

   @RequestSerializableByKeyService(key = "#uid")

   @Async()

   @Transactional

   @Override

   public void addShareOrder(Long uid) {

   public void addShareOrder(Long uid, String orderNo, int sourceType) {

      try {

         addEventStatistic(uid, TaskUniqueKeyEnum.shareOrder.name());

         IntegralTaskRecord record = addEventStatistic(uid, TaskUniqueKeyEnum.shareOrder.name());

         if (record != null) {

            userGetIntegralFromOrderRecordService.addRecord(

                  UserGetIntegralFromOrderRecordFactory.create(UserGetIntegralFromOrderRecord.TYPE_RECIEVE_MONEY,

                        uid, orderNo, sourceType, record.getGoldCoin()));

         }

      } catch (Exception e) {

         //LogHelper.errorDetailInfo(e);

      }