加入任务

admin

2019-09-06 2012b3b5db3c6b06535a68f775bcc81b16151b90

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java

@@ -25,6 +25,7 @@
import com.yeshi.fanli.entity.bus.user.ShamUser;

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

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

import com.yeshi.fanli.entity.common.JumpDetailV2;

import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

import com.yeshi.fanli.entity.jd.JDGoods;

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

@@ -39,6 +40,7 @@
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

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

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

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

@@ -62,6 +64,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TaoBaoConstant;

@@ -84,6 +87,7 @@
import com.yeshi.fanli.vo.goods.GoodsDetailVO;

import com.yeshi.fanli.vo.goods.MoneyInfoVO;

import com.yeshi.fanli.vo.goods.OtherInfo;

import com.yeshi.fanli.vo.goods.RewardCouponVO;

import com.yeshi.fanli.vo.goods.ShareVO;

import com.yeshi.fanli.vo.goods.ShopInfoVO;

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

@@ -173,7 +177,10 @@


   @Resource

   private IntegralGetService integralGetService;

	


   @Resource

   private JumpDetailV2Service jumpDetailV2Service;



   /**

    * 淘宝商品详情

    * 

@@ -529,7 +536,15 @@
            else

               goodsDetail.setZkPrice(goodsDetail.getZkPrice().subtract(tljHongBao));

         }



      } else {// 普通购买

         OtherInfo otherInfo = new OtherInfo();

         RewardCouponVO rewardCoupon = new RewardCouponVO();

         rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("integralExchange"));

         rewardCoupon.setMaxMoney("¥" + MoneyBigDecimalUtil.mul(TaoBaoUtil.getGoodsHongBaoMoney(goods, fanLiRate),

               Constant.MAX_REWARD_RATE));

         rewardCoupon.setDesc("用返利奖励券最高返");

         otherInfo.setRewardCoupon(rewardCoupon);

         goodsDetail.setOtherInfo(otherInfo);

      }

      extraVO.setFanliValid(fanliValid);

      extraVO.setShareValid(shareValid);

@@ -609,6 +624,16 @@
      BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

      BigDecimal shareRate = hongBaoManageService.getShareRate();

      GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertJDGoods(jdGoods, fanLiRate, shareRate);



      // 附加信息

      OtherInfo otherInfo = new OtherInfo();

      RewardCouponVO rewardCoupon = new RewardCouponVO();

      rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("integralExchange"));

      rewardCoupon.setMaxMoney(

            "¥" + MoneyBigDecimalUtil.mul(JDUtil.getGoodsFanLiMoney(jdGoods, fanLiRate), Constant.MAX_REWARD_RATE));

      rewardCoupon.setDesc("用返利奖励券最高返");

      otherInfo.setRewardCoupon(rewardCoupon);

      goodsDetail.setOtherInfo(otherInfo);



      CouponInfoVO couponInfo = goodsDetail.getCouponInfo();

      if (couponInfo != null) {

@@ -744,6 +769,17 @@
      BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

      BigDecimal shareRate = hongBaoManageService.getShareRate();

      GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertPDDGoods(pddGoods, fanLiRate, shareRate);



      // 附加信息

      OtherInfo otherInfo = new OtherInfo();

      RewardCouponVO rewardCoupon = new RewardCouponVO();

      rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("integralExchange"));

      rewardCoupon.setMaxMoney("¥" + MoneyBigDecimalUtil.mul(PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods, fanLiRate),

            Constant.MAX_REWARD_RATE));

      rewardCoupon.setDesc("用返利奖励券最高返");

      otherInfo.setRewardCoupon(rewardCoupon);

      goodsDetail.setOtherInfo(otherInfo);



      CouponInfoVO couponInfo = goodsDetail.getCouponInfo();

      PDDPromotionUrl convertUrl = null;

      if (couponInfo != null) {

@@ -1069,7 +1105,7 @@
      data.put("native", true);

      data.put("jumpLink", jumpLink);

      out.print(JsonUtil.loadTrueResult(data));

		


      // 获得金币

      integralGetService.addCouponRebate(uid);

   }

@@ -1114,7 +1150,7 @@
      data.put("jumpLink", convertUrl.getUrl());

      data.put("nativeJumpLink", PinDuoDuoUtil.getAndroidNativeURI(convertUrl.getUrl()));

      out.print(JsonUtil.loadTrueResult(data));

		


      // 获得金币

      integralGetService.addCouponRebate(uid);

   }