From ee5c8055b1c0dd7c67a9025a76b10bd287c93d9a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 四月 2020 09:52:27 +0800
Subject: [PATCH] 资金明细增加团队分红
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java | 230 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 162 insertions(+), 68 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 385e1b3..4f063a0 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
@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller.client.v2;
import java.io.PrintWriter;
+import java.lang.reflect.InvocationTargetException;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
@@ -9,6 +10,7 @@
import javax.annotation.Resource;
+import org.apache.commons.beanutils.PropertyUtils;
import org.json.simple.JSONArray;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,11 +30,13 @@
import com.yeshi.fanli.entity.accept.AcceptData;
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.goods.CommonGoods;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.jd.JDGoodsClass;
import com.yeshi.fanli.entity.system.BusinessSystem;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.system.SystemClientParams;
import com.yeshi.fanli.entity.taobao.ClientTBPid;
import com.yeshi.fanli.entity.taobao.TLJBuyGoods;
@@ -49,6 +53,7 @@
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.dynamic.GoodsEvaluateService;
import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
import com.yeshi.fanli.service.inter.goods.ScanHistoryV2Service;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
@@ -61,7 +66,7 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
-import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
+import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.TBPidService;
@@ -70,6 +75,8 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
+import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;
+import com.yeshi.fanli.service.manger.user.UserLevelManager;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
@@ -89,6 +96,7 @@
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
+import com.yeshi.fanli.util.user.UserLevelUtil;
import com.yeshi.fanli.vo.goods.CouponInfoVO;
import com.yeshi.fanli.vo.goods.GoodsDetailExtraVO;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
@@ -141,7 +149,7 @@
private TaoBaoUnionConfigService taoBaoUnionConfigService;
@Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+ private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
@Resource
private HongBaoManageService hongBaoManageService;
@@ -193,6 +201,29 @@
@Resource
private UserVIPInfoService userVIPInfoService;
+
+ @Resource
+ private UserVipConfigService userVipConfigService;
+
+ @Resource
+ private GoodsEvaluateService goodsEvaluateService;
+
+ @Resource
+ private UserLevelManager userLevelManager;
+
+ private ConfigParamsDTO getParamsDTO(String platform, String version, Long uid) {
+ UserLevelEnum level = UserLevelEnum.daRen;
+ if (uid != null && uid > 0) {
+ level = userLevelManager.getUserLevel(uid);
+ if (level != null) {
+ if (System.currentTimeMillis() < Constant.NEW_ORDER_FANLI_RULE_TIME)
+ level = UserLevelUtil.getOldLevel(level);
+ }
+ }
+ if (level == null)
+ level = UserLevelEnum.daRen;
+ return hongBaoManageService.getShowComputeRate(platform, version, level);
+ }
/**
* 娣樺疂鍟嗗搧璇︽儏
@@ -256,6 +287,7 @@
app.setPid(TaoBaoConstant.TAOBAO_COMMON_PID);
app.setAdzoneId(TaoBaoConstant.TAOBAO_COMMON_PID.split("_")[3]);
goods = TaoKeApiUtil.searchGoodsDetail(id, app);
+
final TaoBaoGoodsBrief finalGoods = goods;
if (goods != null) {
ThreadUtil.run(new Runnable() {
@@ -269,6 +301,7 @@
} catch (TaobaoGoodsDownException e) {
// 鍟嗗搧涓嬫灦
ThreadUtil.run(new Runnable() {
+
public void run() {
taoBaoGoodsUpdateService.offlineTaoBaoGoods(id);
}
@@ -340,6 +373,11 @@
for (String img : tb.getImgList()) {
finalImgList.add(TbImgUtil.getTBSizeImg(img, 600));
}
+
+ if (finalImgList.size() == 0) {
+ finalImgList.add(tb.getPictUrl());
+ }
+
if (!StringUtil.isNullOrEmpty(tb.getPictUrlWhite()))
finalImgList.add(0, tb.getPictUrlWhite());
@@ -357,21 +395,28 @@
// 澶ф窐瀹㈠晢鍝佽繃婊�
try {
- goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods);
+ goods = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goods, acceptData.getPlatform(),
+ acceptData.getVersion());
+
+ // goods = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goods);
+
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
- ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,
- hongBaoManageService.getVIPFanLiRate());
+ ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid);
+ paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
+
GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);
if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {
goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());
- goodsDetail.getMoneyInfo().setShareMoney(
- "楼" + TaoBaoUtil.getGoodsHongBaoMoney(goods, hongBaoManageService.getVIPShareRate()));
+ goodsDetail.getMoneyInfo().setShareMoney("楼" + TaoBaoUtil.getGoodsHongBaoMoney(goods,
+ hongBaoManageService.getShareRate(UserLevelEnum.superVIP)));
+ goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());
+ goodsDetail.getMoneyInfo().setCompositionInfo(goodsDetail.getMoneyInfo().getMaxCompositionInfo());
}
+ goodsDetail.getMoneyInfo()
+ .setRateInfoHelpUrl(configService.get(ConfigKeyEnum.goodsDetailFanliRateHelpUrl.getKey()));
if (TaoBaoUtil.isYUShou(goods)) {
if (!StringUtil.isNullOrEmpty(goods.getPresaleDiscountFeeText())) {
@@ -404,7 +449,7 @@
}
extraVO.setTbPidInfo(clientTBPid);
- extraVO.setDetailUrl("http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);
+ extraVO.setDetailUrl("http://apph5.banliapp.com/apppage/goods_img.html?id=" + id);
// 鍒嗕韩璧氫汉鎻愮ず
MoneyInfoVO moneyInfo = goodsDetail.getMoneyInfo();
@@ -469,7 +514,7 @@
moneyType = 2;
fanliValid = true;
shareValid = false;
- helpLink = configService.get("zigoulijian_nofanli_help");
+ helpLink = configService.get(ConfigKeyEnum.zigoulijianNofanliHelp.getKey());
BigDecimal tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);
@@ -528,20 +573,24 @@
RewardCouponVO rewardCoupon = new RewardCouponVO();
rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
JSONObject params1 = new JSONObject();
- if (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion()))
- params1.put("url", configService.get("special_guide_reward_coupon_link"));
+ if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))
+ params1.put("url", configService.get(ConfigKeyEnum.specialGuideRewardCouponLink.getKey()));
else
- params1.put("url", configService.get("vip_link"));
- rewardCoupon
- .setMaxMoney("楼" + TaoBaoUtil.getGoodsHongBaoMoney(goods, hongBaoManageService.getVIPFanLiRate()));
- if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ params1.put("url", userVipConfigService.getValueByKey("vip_link"));
+ rewardCoupon.setMaxMoney(goodsDetail.getMoneyInfo().getMaxMoney());
+ if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
rewardCoupon.setDesc("杩�");
- params1.put("url", configService.get("vip_link"));
+ params1.put("url", userVipConfigService.getValueByKey("vip_link"));
rewardCoupon.getJumpDetail().setNeedLogin(true);
} else
rewardCoupon.setDesc("鐢ㄨ繑鍒╁鍔卞埜鏈�楂樿繑");
rewardCoupon.setParams(params1.toString());
+
otherInfo.setRewardCoupon(rewardCoupon);
+ if ("ios".equalsIgnoreCase(acceptData.getPlatform())
+ && configService.iosOnLining(Integer.parseInt(acceptData.getVersion())))
+ otherInfo.setRewardCoupon(null);
+
goodsDetail.setOtherInfo(otherInfo);
}
extraVO.setFanliValid(fanliValid);
@@ -554,7 +603,7 @@
// 鍒嗕韩璺緞
if (StringUtil.isNullOrEmpty(helpLink)) {
- helpLink = configService.get("no_rebate_help_link");
+ helpLink = configService.get(ConfigKeyEnum.noRebateHelpLink.getKey());
}
// 鍒嗕韩璺緞
@@ -562,6 +611,28 @@
shareInfoVO.setHelpLink(helpLink);
extraVO.setShare(shareInfoVO);
+ if (goodsDetail.isHasCoupon()) {
+ // 璁剧疆couponList
+ List<CouponInfoVO> couponInfoList = new ArrayList<>();
+ couponInfoList.add(goodsDetail.getCouponInfo());
+ if (Constant.IS_TEST) {
+ CouponInfoVO coupon = new CouponInfoVO();
+ try {
+ PropertyUtils.copyProperties(coupon, goodsDetail.getCouponInfo());
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ } catch (InvocationTargetException e) {
+ e.printStackTrace();
+ } catch (NoSuchMethodException e) {
+ e.printStackTrace();
+ }
+ coupon.setShopCoupon(true);
+ coupon.setLink(
+ "https://uland.taobao.com/quan/detail?sellerId=725677994&activityId=d03aa6d23a5a4040afb3942e7ea9a007");
+ couponInfoList.add(coupon);
+ }
+ goodsDetail.setCouponInfoList(couponInfoList);
+ }
JSONObject object = new JSONObject();
object.put("extra", JsonUtil.getApiCommonGson().toJson(extraVO));
object.put("goods", JsonUtil.getApiCommonGson().toJson(goodsDetail));
@@ -589,8 +660,9 @@
* @param from
* @param out
*/
- @RequestMapping(value = "getDetailJD", method = RequestMethod.POST)
+ @RequestMapping(value = "getDetailJD")
public void getDetialJD(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) {
+ // uid=2255993L;
// 绯荤粺楠岃瘉
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
acceptData.getPackages());
@@ -619,16 +691,18 @@
// 淇濆瓨缂撳瓨
jdGoodsCacheUtil.saveGoodsInfo(jdGoods);
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
- ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,
- hongBaoManageService.getVIPFanLiRate());
+ ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid);
+ paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
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()));
+ goodsDetail.getMoneyInfo().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();
@@ -646,13 +720,13 @@
if (commissionShare != null && commissionShare.compareTo(threeClass.getSelfComm()) > 0) {
jdGoods.setCommissionPlus(threeClass.getSelfComm());
// plus杩斿埄
- BigDecimal fanliMoneyPlus = JDUtil.getGoodsFanLiMoneyPlus(jdGoods, fanLiRate);
+ BigDecimal fanliMoneyPlus = JDUtil.getGoodsFanLiMoneyPlus(jdGoods,
+ hongBaoManageService.getFanLiRate());
otherInfo.setFanliMoneyPlus("浜笢plus杩斅�" + fanliMoneyPlus);
// 浣跨敤濂栧姳鍒告渶楂樿繑
- if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
- maxMoneyPlus = "锛堜含涓減lus杩斅�"
- + fanliMoneyPlus.add(MoneyBigDecimalUtil.mul(fanliMoneyPlus, Constant.MAX_REWARD_RATE))
- + "锛�";
+ if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
+ maxMoneyPlus = "锛堜含涓減lus杩斅�" + JDUtil.getGoodsFanLiMoneyPlus(jdGoods,
+ hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP)) + "锛�";
} else
maxMoneyPlus = "锛堜含涓減lus鏈�楂樿繑楼"
+ fanliMoneyPlus.add(MoneyBigDecimalUtil.mul(fanliMoneyPlus, Constant.MAX_REWARD_RATE))
@@ -666,21 +740,26 @@
rewardCoupon.setMaxMoneyPlus(maxMoneyPlus);
rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
JSONObject params1 = new JSONObject();
- if (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion()))
- params1.put("url", configService.get("special_guide_reward_coupon_link"));
+ if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))
+ params1.put("url", configService.get(ConfigKeyEnum.specialGuideRewardCouponLink.getKey()));
else
- params1.put("url", configService.get("vip_link"));
+ params1.put("url", userVipConfigService.getValueByKey("vip_link"));
- rewardCoupon.setMaxMoney("楼" + JDUtil.getGoodsFanLiMoney(jdGoods, hongBaoManageService.getVIPFanLiRate()));
- if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ rewardCoupon.setMaxMoney(goodsDetail.getMoneyInfo().getMaxMoney());
+ if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
rewardCoupon.setDesc("杩�");
- params1.put("url", configService.get("vip_link"));
+ params1.put("url", userVipConfigService.getValueByKey("vip_link"));
rewardCoupon.getJumpDetail().setNeedLogin(true);
} else {
rewardCoupon.setDesc("鐢ㄨ繑鍒╁鍔卞埜鏈�楂樿繑");
}
rewardCoupon.setParams(params1.toString());
+
otherInfo.setRewardCoupon(rewardCoupon);
+ if ("ios".equalsIgnoreCase(acceptData.getPlatform())
+ && configService.iosOnLining(Integer.parseInt(acceptData.getVersion())))
+ otherInfo.setRewardCoupon(null);
+
goodsDetail.setOtherInfo(otherInfo);
CouponInfoVO couponInfo = goodsDetail.getCouponInfo();
@@ -712,7 +791,7 @@
List<ShamUser> listShareUser = new ArrayList<ShamUser>();
// 浜笢寮�鍚垎浜�
- String open = configService.get("share_jd_open");
+ String open = configService.get(ConfigKeyEnum.shareOpenJD.getKey());
if ("1".equals(open.trim())) {
extraVO.setShareValid(true);
MoneyInfoVO moneyInfo = goodsDetail.getMoneyInfo();
@@ -765,7 +844,7 @@
extraVO.setFanliValid(true);
if (StringUtil.isNullOrEmpty(helpLink)) {
- helpLink = configService.get("no_rebate_help_link");
+ helpLink = configService.get(ConfigKeyEnum.noRebateHelpLink.getKey());
}
ShareVO shareInfoVO = new ShareVO();
@@ -778,11 +857,18 @@
out.print(JsonUtil.loadTrueResult(object.toString()));
final JDGoods goods = jdGoods;
+ final Long fuid = uid;
ThreadUtil.run(new Runnable() {
public void run() {
// 娣诲姞娴忚璁板綍
try {
- scanHistoryV2Service.addJDScanHistory(uid, acceptData.getDevice(), goods);
+ scanHistoryV2Service.addJDScanHistory(fuid, acceptData.getDevice(), goods);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ try {
+ goodsEvaluateService.updateJDGoods(goods);
} catch (Exception e) {
e.printStackTrace();
}
@@ -815,37 +901,42 @@
return;
}
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
- ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,
- hongBaoManageService.getVIPFanLiRate());
+ ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid);
+ paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
+
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()));
+ goodsDetail.getMoneyInfo().setShareMoney("楼" + PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods,
+ 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();
RewardCouponVO rewardCoupon = new RewardCouponVO();
rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
JSONObject params1 = new JSONObject();
- if (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion()))
- params1.put("url", configService.get("special_guide_reward_coupon_link"));
+ if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))
+ params1.put("url", configService.get(ConfigKeyEnum.specialGuideRewardCouponLink.getKey()));
else
- params1.put("url", configService.get("vip_link"));
+ params1.put("url", userVipConfigService.getValueByKey("vip_link"));
- rewardCoupon
- .setMaxMoney("楼" + PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods, hongBaoManageService.getVIPFanLiRate()));
- if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ rewardCoupon.setMaxMoney(goodsDetail.getMoneyInfo().getMaxMoney());
+ if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
rewardCoupon.setDesc("杩�");
- params1.put("url", configService.get("vip_link"));
+ params1.put("url", userVipConfigService.getValueByKey("vip_link"));
rewardCoupon.getJumpDetail().setNeedLogin(true);
} else
rewardCoupon.setDesc("鐢ㄨ繑鍒╁鍔卞埜鏈�楂樿繑");
rewardCoupon.setParams(params1.toString());
otherInfo.setRewardCoupon(rewardCoupon);
+ if ("ios".equalsIgnoreCase(acceptData.getPlatform())
+ && configService.iosOnLining(Integer.parseInt(acceptData.getVersion())))
+ otherInfo.setRewardCoupon(null);
goodsDetail.setOtherInfo(otherInfo);
CouponInfoVO couponInfo = goodsDetail.getCouponInfo();
@@ -873,7 +964,7 @@
}
// 鍥炬枃璇︽儏
- extraVO.setDetailUrl("http://apph5.yeshitv.com/apppage/goods_img_pdd.html?id=" + id);
+ extraVO.setDetailUrl("http://apph5.banliapp.com/apppage/goods_img_pdd.html?id=" + id);
String salesTip = pddGoods.getSalesTip();
if (!StringUtil.isNullOrEmpty(salesTip)) {
@@ -933,7 +1024,7 @@
extraVO.setShareValid(true);
if (StringUtil.isNullOrEmpty(helpLink)) {
- helpLink = configService.get("no_rebate_help_link");
+ helpLink = configService.get(ConfigKeyEnum.noRebateHelpLink.getKey());
}
ShareVO shareInfoVO = new ShareVO();
@@ -955,6 +1046,12 @@
// 娣诲姞娴忚璁板綍
try {
scanHistoryV2Service.addPDDScanHistory(uid, acceptData.getDevice(), pddGoods);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ try {
+ goodsEvaluateService.updatePDDGoods(pddGoods);
} catch (Exception e) {
e.printStackTrace();
}
@@ -989,10 +1086,7 @@
list = list.subList(0, 10);
}
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
- ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,
- hongBaoManageService.getVIPFanLiRate());
+ ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), null);
List<GoodsDetailVO> listDetailVO = new ArrayList<GoodsDetailVO>();
for (JDGoods goods : list) {
@@ -1033,10 +1127,8 @@
goodsList = goodsList.subList(0, 10);
}
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
- ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate,
- Constant.MAX_REWARD_RATE, hongBaoManageService.getVIPFanLiRate());
+ ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(),
+ null);
for (PDDGoodsDetail goods : goodsList) {
listDetailVO.add(GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO));
}
@@ -1079,10 +1171,7 @@
if (goodsList != null && goodsList.size() > 0) {
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
- ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,
- hongBaoManageService.getVIPFanLiRate());
+ ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), null);
goodsList.parallelStream().forEach(goods -> {
if (goods != null) {
@@ -1176,6 +1265,10 @@
}
jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "",
uid + "");
+ if (jumpLink == null) {
+ jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, null, JDApiUtil.POSITION_FANLI + "",
+ uid + "");
+ }
} else {
jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "",
uid + "");
@@ -1359,7 +1452,8 @@
Map<String, GoodsDetailVO> tempGoodsList = new HashMap<>();
ConfigParamsDTO params = new ConfigParamsDTO(hongBaoManageService.getFanLiRate(),
- hongBaoManageService.getShareRate(), new BigDecimal(80), hongBaoManageService.getVIPFanLiRate());
+ hongBaoManageService.getShareRate(), new BigDecimal(80),
+ hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP));
if (tbGoodsList.size() > 0) {
List<TaoBaoGoodsBrief> goodsList = null;
--
Gitblit v1.8.0