From ee1d39f11b9483b64a88029f1755a6e7166fea15 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期日, 26 四月 2020 16:49:21 +0800
Subject: [PATCH] 等级显示问题
---
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/GoodsController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 46 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/GoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/GoodsController.java
index ceb7f8c..b3de85a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/GoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/GoodsController.java
@@ -36,6 +36,7 @@
import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;
import com.yeshi.fanli.entity.bus.user.ShamUser;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.jd.JDGoodsClass;
@@ -61,7 +62,6 @@
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.JumpDetailUtil;
-import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.VersionUtil;
@@ -73,6 +73,7 @@
import com.yeshi.fanli.util.jd.JDUtil;
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoUtil;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.vo.goods.CouponInfoVO;
import com.yeshi.fanli.vo.goods.GoodsDetailExtraVO;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
@@ -263,7 +264,7 @@
* 椤甸潰鏉ユ簮
* @param out
*/
- @RequestMapping(value = "getGoodsDetial", method = RequestMethod.POST)
+ @RequestMapping(value = "getGoodsDetial")
public void getGoodsDetial(WXMPAcceptData acceptData, Long goodsId, Integer goodsType, String from, Long uid,
PrintWriter out) {
if (goodsType == null || goodsType < 2 || goodsType > 3) {
@@ -316,12 +317,18 @@
ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
acceptData.getVersion());
+ paramsDTO.setMaxRewardRate(null);
GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertJDGoods(jdGoods, paramsDTO);
if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {
goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());
goodsDetail.getMoneyInfo()
- .setShareMoney("楼" + JDUtil.getGoodsFanLiMoney(jdGoods, hongBaoManageService.getVIPShareRate()));
+ .setShareMoney("楼" + JDUtil.getGoodsFanLiMoney(jdGoods, hongBaoManageService.getShareRate(UserLevelEnum.superVIP)));
+ goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());
+ goodsDetail.getMoneyInfo().setCompositionInfo(goodsDetail.getMoneyInfo().getMaxCompositionInfo());
}
+
+ goodsDetail.getMoneyInfo()
+ .setRateInfoHelpUrl(configService.get(ConfigKeyEnum.goodsDetailFanliRateHelpUrl.getKey()));
// 闄勫姞淇℃伅
OtherInfo otherInfo = new OtherInfo();
@@ -343,13 +350,10 @@
hongBaoManageService.getFanLiRate());
otherInfo.setFanliMoneyPlus("浜笢plus杩斅�" + fanliMoneyPlus);
// 浣跨敤濂栧姳鍒告渶楂樿繑
- if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
- maxMoneyPlus = "锛堜含涓減lus杩斅�"
- + JDUtil.getGoodsFanLiMoneyPlus(jdGoods, hongBaoManageService.getVIPFanLiRate()) + "锛�";
- } else
- maxMoneyPlus = "锛堜含涓減lus鏈�楂樿繑楼"
- + fanliMoneyPlus.add(MoneyBigDecimalUtil.mul(fanliMoneyPlus, Constant.MAX_REWARD_RATE))
- + "锛�";
+
+ maxMoneyPlus = "锛堜含涓減lus杩斅�"
+ + JDUtil.getGoodsFanLiMoneyPlus(jdGoods, hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP)) + "锛�";
+
}
}
}
@@ -357,7 +361,10 @@
// 濂栧姳鍒歌繑鍒�
RewardCouponVO rewardCoupon = new RewardCouponVO();
rewardCoupon.setMaxMoneyPlus(maxMoneyPlus);
- rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
+
+ rewardCoupon.setMaxMoney(goodsDetail.getMoneyInfo().getMaxMoney());
+ rewardCoupon.setDesc("杩�");
+ otherInfo.setRewardCoupon(rewardCoupon);
goodsDetail.setOtherInfo(otherInfo);
CouponInfoVO couponInfo = goodsDetail.getCouponInfo();
@@ -440,6 +447,10 @@
shareInfoVO.setHelpLink(helpLink);
extraVO.setShare(shareInfoVO);
+ // 鍒ゆ柇vip
+ if (uid != null) {
+ extraVO.setVip(userVIPInfoService.isVIP(uid));
+ }
JSONObject object = new JSONObject();
object.put("extra", JsonUtil.getApiCommonGson().toJson(extraVO));
object.put("goods", JsonUtil.getApiCommonGson().toJson(goodsDetail));
@@ -468,7 +479,7 @@
* @param out
*/
private void getDetialPDD(WXMPAcceptData acceptData, Long id, Long uid, String from, PrintWriter out) {
- PDDGoodsDetail pddGoods = PinDuoDuoApiUtil.getGoodsDetail(id);
+ PDDGoodsDetail pddGoods =null; //PinDuoDuoApiUtil.getGoodsDetail(id);
if (pddGoods == null) {
out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧涓嶅瓨鍦�"));
return;
@@ -476,12 +487,29 @@
ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
acceptData.getVersion());
+ paramsDTO.setMaxRewardRate(null);
GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertPDDGoods(pddGoods, paramsDTO);
if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {
goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());
goodsDetail.getMoneyInfo().setShareMoney(
- "楼" + PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods, hongBaoManageService.getVIPShareRate()));
+ "楼" + PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods, hongBaoManageService.getShareRate(UserLevelEnum.superVIP)));
}
+
+ if (goodsDetail.getCouponInfo() != null) {
+ List<CouponInfoVO> list = new ArrayList<>();
+ list.add(goodsDetail.getCouponInfo());
+ goodsDetail.setCouponInfoList(list);
+ }
+
+ // 濂栧姳鍒歌繑鍒�
+ RewardCouponVO rewardCoupon = new RewardCouponVO();
+
+ rewardCoupon.setMaxMoney(goodsDetail.getMoneyInfo().getMaxMoney());
+ rewardCoupon.setDesc("杩�");
+
+ OtherInfo otherInfo = new OtherInfo();
+ otherInfo.setRewardCoupon(rewardCoupon);
+ goodsDetail.setOtherInfo(otherInfo);
CouponInfoVO couponInfo = goodsDetail.getCouponInfo();
PDDPromotionUrl convertUrl = null;
@@ -563,6 +591,11 @@
shareInfoVO.setHelpLink(helpLink);
extraVO.setShare(shareInfoVO);
+ // 鍒ゆ柇vip
+ if (uid != null) {
+ extraVO.setVip(userVIPInfoService.isVIP(uid));
+ }
+
if (convertUrl != null) {
extraVO.setCouponJumpLink(convertUrl.getUrl());
extraVO.setNativeCouponJumpLink(PinDuoDuoUtil.getAndroidNativeURI(convertUrl.getUrl()));
--
Gitblit v1.8.0