抖音修改，饿了么初步集成，唯品会初步集成

admin

2019-10-11 6d33f770806ef059629b94cf74cb48a09b86502c

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java

@@ -30,9 +30,6 @@
import com.yeshi.fanli.exception.user.UserInfoExtraException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.SystemCouponService;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.integral.IntegralGetService;

import com.yeshi.fanli.service.inter.msg.UserInviteMsgNotificationService;

import com.yeshi.fanli.service.inter.msg.UserOtherMsgNotificationService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinGiveRecordService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;

@@ -42,6 +39,9 @@
import com.yeshi.fanli.service.inter.user.UserSystemCouponGiveRecordService;

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

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

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TokenUtil;

@@ -210,10 +210,10 @@
            UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

            if (userInfoExtra == null || StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {

               tips.add("确认领取后，你将成为赠送者的一级队员；");

               tips.add("返利券奖励券，可用于“已到账”的返利订单，在返利的基础上再获得一定比例的返利；");

               tips.add("板栗快省奖励券，可用于“已到账”的返利订单，在返利的基础上再获得一定比例的返利；");

               tips.add("成功领取后，请到“我的-福利中心”中查看。");

            } else {

               tips.add("返利券奖励券，可用于“已到账”的返利订单，在返利的基础上再获得一定比例的返利；");

               tips.add("板栗快省奖励券，可用于“已到账”的返利订单，在返利的基础上再获得一定比例的返利；");

               tips.add("成功领取后，请到“我的-福利中心”中查看。");

            }

         } else {

@@ -221,20 +221,22 @@
         }

      } else if (tokenType == TokenTypeEnum.taoLiJin) {

         type = 12;

         UserTaoLiJinGiveRecord giveRecord = userTaoLiJinGiveRecordService

               .selectByPrimaryKey(Long.parseLong(identify));

         if (giveRecord == null || giveRecord.getState() == UserTaoLiJinGiveRecord.STATE_OVERDUE) {

			
         UserTaoLiJinGiveRecord giveRecord = userTaoLiJinGiveRecordService.selectByPrimaryKey(Long.parseLong(identify));

         if (giveRecord == null)

            throw new TokenRecordException(1, "口令已失效");

			
         BigDecimal amount = giveRecord.getAmount();

         num = Integer.parseInt(amount.setScale(0).toString());

			
         if(giveRecord.getState() == UserTaoLiJinGiveRecord.STATE_OVERDUE) {

            tips.add("哎呀，推广红包已失效了！");

         } else if (giveRecord.getState() == UserTaoLiJinGiveRecord.STATE_RECEIVE) {

            tips.add("哎呀，推广红包已被领取了！");

         } else if (giveRecord.getState() == UserTaoLiJinGiveRecord.STATE_INIT) {

            if (uid == null || uid <= 0)

               throw new TokenRecordException(1001, "温馨提示，[推广红包]需要登录后领取");



            state = true;

            BigDecimal amount = giveRecord.getAmount();

            num = Integer.parseInt(amount.setScale(0).toString());

				
            UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

            if (userInfoExtra == null || StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {

               tips.add("确认领取后，你将成为赠送者的一级队员；");

@@ -341,7 +343,7 @@
         UserSystemCoupon userSystemCoupon= null;

         try {

            userSystemCoupon = userSystemCouponService.insertUserCoupon(uid, CouponTypeEnum.freeCoupon.name(),

                  UserSystemCoupon.SOURCE_GIVE, null);

                  UserSystemCoupon.SOURCE_GIVE, null,true);

         } catch (Exception e) {

            LogHelper.errorDetailInfo(e);

            throw new TokenRecordException(1, "领取失败");

@@ -435,7 +437,7 @@
         UserSystemCoupon userSystemCoupon= null;

         try {

            userSystemCoupon = userSystemCouponService.insertUserCoupon(uid, CouponTypeEnum.rebatePercentCoupon.name(),

                  UserSystemCoupon.SOURCE_GIVE, systemCoupon.getPercent());

                  UserSystemCoupon.SOURCE_GIVE, systemCoupon.getPercent(),true);

         } catch (Exception e) {

            LogHelper.errorDetailInfo(e);

            throw new TokenRecordException(1, "领取失败");