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

admin

2019-10-11 6d33f770806ef059629b94cf74cb48a09b86502c

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

@@ -25,7 +25,6 @@
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;

@@ -47,7 +46,6 @@
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.integral.IntegralGetService;

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;

@@ -63,6 +61,7 @@
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.integral.IntegralGetService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.RedisManager;

@@ -539,9 +538,9 @@
      } else {// 普通购买

         OtherInfo otherInfo = new OtherInfo();

         RewardCouponVO rewardCoupon = new RewardCouponVO();

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

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

         JSONObject params1=new JSONObject();

         params1.put("balanceMore", true);

         params1.put("url", configService.get("special_guide_reward_coupon_link"));

         rewardCoupon.setParams(params1.toString());

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

               Constant.MAX_REWARD_RATE)));

@@ -631,9 +630,9 @@
      // 附加信息

      OtherInfo otherInfo = new OtherInfo();

      RewardCouponVO rewardCoupon = new RewardCouponVO();

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

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

      JSONObject params1=new JSONObject();

      params1.put("balanceMore", true);

      params1.put("url", configService.get("special_guide_reward_coupon_link"));

      rewardCoupon.setParams(params1.toString());

      rewardCoupon.setMaxMoney(

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

@@ -779,9 +778,9 @@
      // 附加信息

      OtherInfo otherInfo = new OtherInfo();

      RewardCouponVO rewardCoupon = new RewardCouponVO();

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

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

      JSONObject params1=new JSONObject();

      params1.put("balanceMore", true);

      params1.put("url", configService.get("special_guide_reward_coupon_link"));

      rewardCoupon.setParams(params1.toString());

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

            Constant.MAX_REWARD_RATE)));