更新bug修改

admin

2019-06-25 fdc0107ce99b959423a2baf3cb1b31abb96f0169

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java

@@ -80,9 +80,9 @@
import com.yeshi.fanli.service.inter.goods.SuperRecommendBannerV2Service;

import com.yeshi.fanli.service.inter.goods.SuperRecommendSpecialService;

import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;

import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.homemodule.DeviceSexService;
import com.yeshi.fanli.service.inter.goods.recommend.RecommendGoodsDeleteHistoryService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

import com.yeshi.fanli.service.inter.goods.recommend.RecommendGoodsDeleteHistoryService;

import com.yeshi.fanli.service.inter.homemodule.DeviceSexService;

import com.yeshi.fanli.service.inter.homemodule.SpecialService;

import com.yeshi.fanli.service.inter.homemodule.SuperSpecialService;

import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;

@@ -98,8 +98,8 @@
import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;

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

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

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

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

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

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

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

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

@@ -120,6 +120,7 @@
import com.yeshi.fanli.util.taobao.TaoBaoCouponUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

import com.yeshi.fanli.util.taobao.TaoLiJinUtil;

import com.yeshi.fanli.vo.msg.ClientTextStyleVO;

import com.yeshi.fanli.vo.tlj.SpreadHongBao;

import com.yeshi.fanli.vo.user.UserSettingsVO;

@@ -240,9 +241,6 @@
   private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;

   

   @Resource

   private GoodsTaoLiJinRateService goodsTaoLiJinRateService;

	
   @Resource

   private UserMoneyExtraService userMoneyExtraService;

   

   @Resource

@@ -256,6 +254,10 @@
   

   @Resource

   private DeviceSexService deviceSexService;

	
   @Resource

   private UserTaoLiJinRecordService userTaoLiJinRecordService;



   

   



@@ -2180,9 +2182,32 @@
      

      // 推广红包

      if (from != null && from.equals("taolijin")) {

         // 计算推广红包

         String warningRate = configTaoLiJinService.getValueByKey("warning_value");

         BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods);

			
         // 推广红包 不能小于1

         if (spreadMoney.compareTo(new BigDecimal(1.1)) < 0) {

            out.print(JsonUtil.loadFalseResult(2, "商品不存在"));

            return;

         }

			
         // 是否为新用户

         boolean isNewUser = userInfoExtraService.isNewUser(uid);

         if (!isNewUser) {

         if (isNewUser) {

            // 判定为老用户： 新人只要使用了新人红包，也就是那1块钱，那么，他看到的分享爆款中的商品-就只能分享。

            long countRecord = userTaoLiJinRecordService.countRecordByUid(uid);

            if (countRecord > 0) {

               isNewUser = false;

            }

         }

			
         SpreadHongBao spreadHongBao = new SpreadHongBao();

         if (isNewUser) {

            spreadHongBao.setMoney("1");

         } else {

            spreadHongBao.setMoney(spreadMoney.toString());

				
            moneyType = 2;

            fanliValid = false;

            ClientTextStyleVO textStyleVO1 = new ClientTextStyleVO();

@@ -2195,7 +2220,7 @@
            textStyleVO3.setContent("，好友");

            textStyleVO3.setColor("#666666");

            ClientTextStyleVO textStyleVO4 = new ClientTextStyleVO();

            textStyleVO4.setContent("领红包");

            textStyleVO4.setContent("领红包！");

            textStyleVO4.setColor("#F14242");

            

            List<ClientTextStyleVO> listText = new ArrayList<ClientTextStyleVO>();

@@ -2206,18 +2231,8 @@
            

            data.put("listTip", listText);

         } 

			
         BigDecimal spreadMoney = goodsTaoLiJinRateService.getGoodsSpreadMoney(goods);

         // 推广红包 不能小于1

         if (spreadMoney.compareTo(new BigDecimal(1)) < 0) {

            out.print(JsonUtil.loadFalseResult(2, "商品不存在"));

            return;

         }

         SpreadHongBao spreadHongBao = new SpreadHongBao();

         spreadHongBao.setMoney(spreadMoney.toString());

         spreadHongBao.setTip("当日领取，两天内使用，过时无效");

         goodsJson.put("spreadHongBao", spreadHongBao);

			
         

         // 用户剩余可以淘礼金验证

         UserMoneyExtra userMoneyExtra = userMoneyExtraService.selectByPrimaryKey(uid);

@@ -2488,6 +2503,10 @@
               continue;

            }

            

            if (!VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {

               continue;

            } 
				
            // 是否需要弹出框

            if (name.equals("账户等级特权")) { 

               if (uid != null) {