京东商品 券bug

yujian

2019-09-27 41aedac31eb4c5b9f7b98bacec18c45b3926d69c

 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,13 +40,15 @@
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;

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

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

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;

@@ -59,8 +62,9 @@
import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;

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

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

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

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

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;

@@ -83,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;

@@ -169,6 +174,12 @@


   @Resource

   private PinDuoDuoCacheUtil pinDuoDuoCacheUtil;



   @Resource

   private IntegralGetService integralGetService;



   @Resource

   private JumpDetailV2Service jumpDetailV2Service;



   /**

    * 淘宝商品详情

@@ -467,6 +478,15 @@
         otherInfo.setSpreadHongBao(spreadHongBao);

         goodsDetail.setOtherInfo(otherInfo);



         // 1.6.5后改为福利价

         if (com.yeshi.fanli.util.VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {

            if (goodsDetail.getCouponPrice() != null

                  && goodsDetail.getCouponPrice().compareTo(new BigDecimal(0)) > 0)

               goodsDetail.setCouponPrice(goodsDetail.getCouponPrice().subtract(spreadMoney));

            else

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

         }



         goodsDetail.getMoneyInfo().setFanliMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods,

               hongBaoManageService.getTLJShareRate(System.currentTimeMillis())));

         goodsDetail.getMoneyInfo().setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods,

@@ -495,17 +515,38 @@
         shareValid = false;

         helpLink = configService.get("zigoulijian_nofanli_help");



         String tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, new BigDecimal(70)).toString();

         BigDecimal tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);



         ReduceHongBao reduceHongBao = new ReduceHongBao();

         reduceHongBao.setLeft(buyGoods.getLeftHongBaoCount());

         reduceHongBao.setMoney(tljHongBao);

         reduceHongBao.setMoney(tljHongBao.toString());

         reduceHongBao.setName("付款立减 ");

         reduceHongBao.setTip("当日领取，当日内使用，过期失效");

         reduceHongBao.setTotal(buyGoods.getTotalHongBaoCount());



         OtherInfo otherInfo = new OtherInfo();

         otherInfo.setReduceHongBao(reduceHongBao);

         goodsDetail.setOtherInfo(otherInfo);



         // 1.6.5后改为福利价

         if (com.yeshi.fanli.util.VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {

            if (goodsDetail.getCouponPrice() != null

                  && goodsDetail.getCouponPrice().compareTo(new BigDecimal(0)) > 0)

               goodsDetail.setCouponPrice(goodsDetail.getCouponPrice().subtract(tljHongBao));

            else

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

         }

      } else {// 普通购买

         OtherInfo otherInfo = new OtherInfo();

         RewardCouponVO rewardCoupon = new RewardCouponVO();

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

         JSONObject params1=new JSONObject();

         params1.put("balanceMore", true);

         rewardCoupon.setParams(params1.toString());

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

               Constant.MAX_REWARD_RATE)));

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

         otherInfo.setRewardCoupon(rewardCoupon);

         goodsDetail.setOtherInfo(otherInfo);

      }

      extraVO.setFanliValid(fanliValid);

@@ -586,6 +627,19 @@
      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"));

      JSONObject params1=new JSONObject();

      params1.put("balanceMore", true);

      rewardCoupon.setParams(params1.toString());

      rewardCoupon.setMaxMoney(

            "¥" +JDUtil.getGoodsFanLiMoney(jdGoods, fanLiRate).add( 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) {

@@ -721,6 +775,20 @@
      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"));

      JSONObject params1=new JSONObject();

      params1.put("balanceMore", true);

      rewardCoupon.setParams(params1.toString());

      rewardCoupon.setMaxMoney("¥" +PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods, fanLiRate).add(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) {

@@ -943,9 +1011,7 @@
         try {

            goodsList = TaoKeApiUtil.getBatchGoodsInfo(ids);

         } catch (TaoKeApiException e1) {

            e1.printStackTrace();

         } catch (TaobaoGoodsDownException e1) {

            e1.printStackTrace();

         }



         if (goodsList != null && goodsList.size() > 0) {

@@ -1048,6 +1114,9 @@
      data.put("native", true);

      data.put("jumpLink", jumpLink);

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



      // 获得金币

      integralGetService.addCouponRebate(uid);

   }



   /**

@@ -1090,6 +1159,9 @@
      data.put("jumpLink", convertUrl.getUrl());

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

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



      // 获得金币

      integralGetService.addCouponRebate(uid);

   }



   /**