版本区分

yujian

2019-11-12 46a33cb062800fe051a75dd025a57d70994217d5

 fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java

@@ -15,6 +15,7 @@
import com.yeshi.fanli.dto.mq.user.body.UserAccountBindingMQMsg;

import com.yeshi.fanli.dto.msg.MsgRedPackAddContentDTO;

import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum;

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

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

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

import com.yeshi.fanli.entity.order.CommonOrder;

@@ -25,6 +26,7 @@
import com.yeshi.fanli.service.inter.redpack.RedPackBalanceService;

import com.yeshi.fanli.service.inter.redpack.RedPackConfigService;

import com.yeshi.fanli.service.inter.redpack.RedPackWinInviteService;

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

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

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

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

@@ -32,6 +34,7 @@
import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.VersionUtil;

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

import com.yeshi.fanli.util.annotation.redpack.RedPackGetVersionLimit;

import com.yeshi.fanli.util.factory.RedPackDetailFactory;

@@ -67,6 +70,9 @@
   @Resource   

   private IntegralTaskRecordService integralTaskRecordService;

   

   @Resource

   private UserActiveLogService userActiveLogService;

	
   

   @Override

   public List<RedPackWinInvite> getRewardList(int start, int count, Long uid) {

@@ -96,6 +102,15 @@
      // 上一级的奖励

      UserInfo boss = threeSaleSerivce.getBoss(uid);

      if(boss != null) {

         UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(boss.getId());

         if (activeLog != null) {

            // 小于2.0.2版本不增加积分

            if (!VersionUtil.greaterThan_2_0_2("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",

                  activeLog.getVersionCode()))

               return;

         }

			
			
         bossReward(boss.getId(), uid, source, orderNo);

      }

   }

@@ -230,25 +245,25 @@
   }

   

   

   @RedPackGetVersionLimit(uid = "#bindingMQMsg.uid")

   @RequestSerializableByKeyService(key = "#bindingMQMsg.uid")

   public void userAccountBinding(UserAccountBindingMQMsg bindingMQMsg) throws Exception{

      Integer type = bindingMQMsg.getType();

      if (type == UserAccountBindingMQMsg.TYPE_PHONE || type == UserAccountBindingMQMsg.TYPE_TAOBAO) {

         inviteSucceedReward(bindingMQMsg.getUid());

      }

   }

	
	
	
   @Override

   @Transactional

   @RedPackGetVersionLimit(uid = "#uid")

   @RequestSerializableByKeyService(key = "#uid")

   @Transactional(rollbackFor = Exception.class)

   public void inviteSucceedReward(Long uid) throws Exception{

      // 验证是否存在上级

      UserInfo boss = threeSaleSerivce.getBoss(uid);

      if(boss == null) 

         return;

      

      UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(boss.getId());

      if (activeLog != null) {

         // 小于2.0.2版本不增加积分

         if (!VersionUtil.greaterThan_2_0_2("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",

               activeLog.getVersionCode()))

            return;

      }

		
		
      // 同一队员奖励一次

      long totalReward = redPackWinInviteMapper.countByUidAndTeamUidAndType(boss.getId(), uid, RedPackWinInviteTypeEnum.inviteSucceed.name());

      if (totalReward > 0)