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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -1,6 +1,5 @@
package com.yeshi.fanli.service.impl.user.integral;



import java.math.BigDecimal;

import java.text.ParseException;

import java.text.SimpleDateFormat;

import java.util.ArrayList;

@@ -16,13 +15,8 @@
import org.springframework.transaction.annotation.Transactional;

import org.yeshi.utils.DateUtil;



import com.aliyun.openservices.ons.api.Message;

import com.aliyun.openservices.ons.api.Producer;

import com.google.gson.Gson;

import com.yeshi.fanli.dao.mybatis.integral.IntegralTaskRecordMapper;

import com.yeshi.fanli.dto.mq.user.UserTopicTagEnum;

import com.yeshi.fanli.dto.mq.user.body.IntegralTaskMQMsg;

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

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

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

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

@@ -30,6 +24,7 @@
import com.yeshi.fanli.entity.integral.IntegralTaskClass;

import com.yeshi.fanli.entity.integral.IntegralTaskClass.UniqueKeyEnum;

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

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

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

import com.yeshi.fanli.exception.user.UserInfoExtraException;

import com.yeshi.fanli.log.LogHelper;

@@ -40,9 +35,9 @@
import com.yeshi.fanli.service.inter.user.integral.IntegralTaskClassService;

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.rocketmq.MQTopicName;



@Service

public class IntegralTaskRecordServiceImpl implements IntegralTaskRecordService {

@@ -82,6 +77,11 @@
      return integralTaskRecordMapper.countFinished(uid, cid, dateType);

   }



   @Override

   public void invalidGoldCoin() {

      integralTaskRecordMapper.invalidGoldCoin();

   }

	
   @Override

   public void finishedTask(long uid, long cid, long taskId, int goldCoin) {

      IntegralTaskRecord taskRecord = new IntegralTaskRecord();

@@ -239,7 +239,7 @@


         // 已领取

         Integer state = record.getState();

         if (state != null && state == 1)

         if (state != null && state != 0)

            continue;



         if (addDetail(uid, record))

@@ -252,7 +252,7 @@
      return totalGoldCoin + (userInfoExtra.getGoldCoin() == null ? 0 : userInfoExtra.getGoldCoin());

   }



   @Transactional

   @Transactional(rollbackFor = Exception.class)

   public boolean addDetail(Long uid, IntegralTaskRecord record) throws IntegralTaskRecordException {

      Long uid2 = record.getUid();

      if (uid2 == null || uid.longValue() != uid2.longValue())

@@ -350,7 +350,7 @@
      return integralTaskRecordMapper.countGetCountByTaskIdAndDay(taskId, uid, minTime, maxTime);

   }



   @Transactional

   @Transactional(rollbackFor = Exception.class)

   @Override

   public IntegralTaskRecord addRecord(IntegralTaskRecord record) throws IntegralTaskRecordException {

      if (record == null)

@@ -359,21 +359,16 @@
      if (record.getCid() == null || record.getTaskId() == null || record.getGoldCoin() == null

            || record.getState() == null || record.getUid() == null)

         throw new IntegralTaskRecordException(2, "数据不完成");



      Date date = new Date();

      if (record.getCreateTime() == null)

         record.setCreateTime(new Date());

         record.setCreateTime(date);



      if (record.getUpdateTime() == null)

         record.setUpdateTime(new Date());

         record.setUpdateTime(date);

		
      // 设置有效期

      record.setEndTime(DateUtil.plusDayDate(Constant.GOLD_COIN_VALID_DAYS, date));

      integralTaskRecordMapper.insertSelective(record);

      long count = integralTaskRecordMapper.getTotalGoldCoinByUid(record.getUid());

      if (count >= 200) {// 大于200发送消息

         IntegralTaskMQMsg msg = new IntegralTaskMQMsg(record.getUid(), count, new Date());

         Message message = new Message(MQTopicName.TOPIC_USER.name(), UserTopicTagEnum.integralTaskFinish.name(),

               new Gson().toJson(msg).getBytes());

         producer.send(message);

      }



      return record;

   }



@@ -394,10 +389,6 @@
      return integralTaskRecordMapper.listByUidAndTaskId(uid, taskId, (page - 1) * count, count);

   }



   @Override

   public long getTotalGoldCoinByUid(Long uid) {

      return integralTaskRecordMapper.getTotalGoldCoinByUid(uid);

   }



   @Async()

   @Override

@@ -405,7 +396,7 @@
      if (uid == null || originUid == null)

         return;



      String reward = configService.get("first_order_reward_boss");

      String reward = configService.get(ConfigKeyEnum.firstOrderRewardBoss.getKey());

      if (StringUtil.isNullOrEmpty(reward))

         return;

      firstOrderReward(uid, originUid, Integer.parseInt(reward), "一", beizu);

@@ -417,7 +408,7 @@
      if (uid == null || originUid == null)

         return;



      String reward = configService.get("first_order_reward_boss_super");

      String reward = configService.get(ConfigKeyEnum.firstOrderRewardBossSuper.getKey());

      if (StringUtil.isNullOrEmpty(reward))

         return;

      firstOrderReward(uid, originUid, Integer.parseInt(reward), "二", beizu);

@@ -429,10 +420,10 @@
      if (uid == null)

         return;



      String reward = configService.get("first_share_order_reward");

      String reward = configService.get(ConfigKeyEnum.firstShareOrderReward.getKey());

      if (StringUtil.isNullOrEmpty(reward))

         return;

      firstOrderReward(uid, null, Integer.parseInt(reward), null, beizu);

      //firstOrderReward(uid, null, Integer.parseInt(reward), null, beizu);

   }



   @Async()

@@ -441,7 +432,7 @@
      if (uid == null || originUid == null)

         return;



      String reward = configService.get("first_share_order_reward_boss");

      String reward = configService.get(ConfigKeyEnum.firstShareOrderRewardBoss.getKey());

      if (StringUtil.isNullOrEmpty(reward))

         return;

      firstOrderReward(uid, originUid, Integer.parseInt(reward), "一", beizu);

@@ -470,16 +461,18 @@
      if (userInfoExtra == null)

         return;



      Integer goldCoin = userInfoExtra.getGoldCoin();

      if (goldCoin == null)

         goldCoin = 0;

      goldCoin = goldCoin + addGoldCoin;



      int totalGoldCoin = 0;

      try {

         UserInfoExtra extra = new UserInfoExtra();

         extra.setId(userInfoExtra.getId());

         extra.setGoldCoin(goldCoin);

         Integer goldCoin = userInfoExtra.getGoldCoin();

         if (goldCoin == null) {

            extra.setGoldCoin(addGoldCoin);

         } else {

            extra.setGoldCoin(goldCoin + addGoldCoin);

         }

         userInfoExtraService.saveUserInfoExtra(extra);

         totalGoldCoin = extra.getGoldCoin();

      } catch (UserInfoExtraException e) {

         LogHelper.errorDetailInfo(e);

         return;

@@ -496,69 +489,14 @@
      integralDetailService.insertSelective(detail);



      // 消息

      MsgOtherRewardIntegralDTO msgOther = new MsgOtherRewardIntegralDTO();

      msgOther.setTitle("金币奖励");

      msgOther.setNum(addGoldCoin + "金币");

      msgOther.setTotal(goldCoin + "金币");

      if (StringUtil.isNullOrEmpty(level)) {

         msgOther.setSource("首笔分享订单，系统奖励金币 ");

         msgOther.setExplain("首笔分享订单得到的奖金不足0.01元时奖励 ");

      if (level.equalsIgnoreCase("一") || level.equalsIgnoreCase("1")) {

         // 直接粉丝

         userOtherMsgNotificationService.goldCoinOrderSubsidyMsg(originUid, addGoldCoin, totalGoldCoin, true);

      } else {

         msgOther.setSource(level + "级队员首次下单，系统奖励金币 ");

         msgOther.setExplain("仅新邀请队员首下单你得到的奖金不足0.01元时奖励 ");

         // 间接粉丝

         userOtherMsgNotificationService.goldCoinOrderSubsidyMsg(originUid, addGoldCoin, totalGoldCoin, false);

      }

      userOtherMsgNotificationService.firstOrderRewardMsg(uid, null, msgOther);

		
   }



   /**

    * 推广红包折算金币

    * 
    * @param uid

    * @param addGoldCoin

    * @param tlj

    */

   @Override

   public void taoLiJinExchange(Long uid, Integer addGoldCoin, BigDecimal tlj) {

      String uniqueKey = "taoLiJinExchange-" + uid.toString();

      IntegralDetail detailRecord = integralDetailService.getDetailByUniqueKey(uniqueKey);

      if (detailRecord != null)

         return;



      UserInfoExtra userInfoExtra = userInfoExtraService.getByUidForUpdate(uid);

      if (userInfoExtra == null)

         return;



      Integer goldCoin = userInfoExtra.getGoldCoin();

      if (goldCoin == null)

         goldCoin = 0;

      goldCoin = goldCoin + addGoldCoin;



      try {

         UserInfoExtra extra = new UserInfoExtra();

         extra.setId(userInfoExtra.getId());

         extra.setGoldCoin(goldCoin);

         userInfoExtraService.saveUserInfoExtra(extra);

      } catch (UserInfoExtraException e) {

         LogHelper.errorDetailInfo(e);

         return;

      }



      // 金币详情

      IntegralDetail detail = new IntegralDetail();

      detail.setTitle("推广红包下线-系统折算成金币");

      detail.setUid(uid);

      detail.setMoney(addGoldCoin);

      detail.setUniqueKey(uniqueKey);

      detail.setCreateTime(new Date());

      integralDetailService.insertSelective(detail);



      // 消息

      MsgOtherRewardIntegralDTO msgOther = new MsgOtherRewardIntegralDTO();

      msgOther.setTitle("推广红包");

      msgOther.setTotal("推广红包¥" + tlj.setScale(2));

      msgOther.setNum(goldCoin + "枚");

      msgOther.setSource("已进入到可用金币中");

      msgOther.setExplain("原推广红包功能下线，剩余推广红包按照10:1折算为金币 ");

      userOtherMsgNotificationService.taoLiJinExchangeMsg(uid, "本折算有且仅有一次", msgOther);

   }

	 
}