From fdfd8e3a55428bf877c0ca93914c8509309da54a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 05 九月 2019 17:40:47 +0800
Subject: [PATCH] 抖音广告监测
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
index f7a7430..c28d2b9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
+++ b/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);
}
--
Gitblit v1.8.0