From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java | 520 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 365 insertions(+), 155 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 99f7cac..92f3bb6 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
@@ -3,8 +3,9 @@
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.util.ArrayList;
-import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
@@ -16,6 +17,9 @@
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.taobao.TbImgUtil;
+import com.google.gson.Gson;
+import com.yeshi.fanli.dto.ConfigParamsDTO;
+import com.yeshi.fanli.dto.jd.JDCategoryInfo;
import com.yeshi.fanli.dto.jd.JDCouponInfo;
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.dto.pdd.PDDGoodsResult;
@@ -24,14 +28,16 @@
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.UserMoneyExtra;
-import com.yeshi.fanli.entity.common.JumpDetailV2;
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;
+import com.yeshi.fanli.entity.taobao.TLJFreeBuyGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoShop;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
@@ -47,22 +53,25 @@
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.integral.IntegralGetService;
+import com.yeshi.fanli.service.inter.jd.JDGoodsClassService;
+import com.yeshi.fanli.service.inter.money.UserMoneyExtraService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
+import com.yeshi.fanli.service.inter.redpack.UserTaoLiJinNewbiesService;
import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;
+import com.yeshi.fanli.service.inter.taobao.TLJFreeBuyGoodsService;
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.tlj.UserTaoLiJinOriginService;
-import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.TBPidService;
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.service.inter.user.vip.UserVIPInfoService;
+import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
@@ -70,6 +79,7 @@
import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.cache.JDGoodsCacheUtil;
import com.yeshi.fanli.util.cache.PinDuoDuoCacheUtil;
import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;
@@ -81,7 +91,6 @@
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.taobao.TaoLiJinUtil;
import com.yeshi.fanli.vo.goods.CouponInfoVO;
import com.yeshi.fanli.vo.goods.GoodsDetailExtraVO;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
@@ -91,8 +100,8 @@
import com.yeshi.fanli.vo.goods.ShareVO;
import com.yeshi.fanli.vo.goods.ShopInfoVO;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
+import com.yeshi.fanli.vo.tlj.NewUserHongBao;
import com.yeshi.fanli.vo.tlj.ReduceHongBao;
-import com.yeshi.fanli.vo.tlj.SpreadHongBao;
import net.sf.json.JSONObject;
@@ -134,7 +143,7 @@
private TaoBaoUnionConfigService taoBaoUnionConfigService;
@Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+ private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
@Resource
private HongBaoManageService hongBaoManageService;
@@ -146,13 +155,7 @@
private UserGoodsStorageService userGoodsStorageService;
@Resource
- private UserTaoLiJinOriginService userTaoLiJinOriginService;
-
- @Resource
private ConfigTaoLiJinService configTaoLiJinService;
-
- @Resource
- private UserTaoLiJinRecordService userTaoLiJinRecordService;
@Resource
private UserInfoExtraService userInfoExtraService;
@@ -180,6 +183,21 @@
@Resource
private JumpDetailV2Service jumpDetailV2Service;
+
+ @Resource
+ private JDGoodsClassService jdGoodsClassService;
+
+ @Resource
+ private TLJFreeBuyGoodsService tljFreeBuyGoodsService;
+
+ @Resource
+ private UserTaoLiJinNewbiesService userTaoLiJinNewbiesService;
+
+ @Resource
+ private UserVIPInfoService userVIPInfoService;
+
+ @Resource
+ private UserVipConfigService userVipConfigService;
/**
* 娣樺疂鍟嗗搧璇︽儏
@@ -227,7 +245,7 @@
LogHelper.test("鑾峰彇PID鑰楁椂锛�" + (java.lang.System.currentTimeMillis() - startTime));
- final List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
+ // final List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
// 鏄惁鍦ㄦ湇鍔＄杩涜杞摼
boolean convertInServer = configService.isConvertTaoBaoLinkInServer();
@@ -260,7 +278,6 @@
taoBaoGoodsUpdateService.offlineTaoBaoGoods(id);
}
});
-
}
} else {
@@ -297,7 +314,6 @@
}
if (goods != null) {
- goodsList.add(goods);
final TaoBaoGoodsBrief newGoods = goods;
ThreadUtil.run(new Runnable() {
public void run() {
@@ -312,10 +328,7 @@
});
}
- TaoBaoGoodsBrief tb = null;
- if (goodsList.size() > 0) {
- tb = goodsList.get(0);
- }
+ TaoBaoGoodsBrief tb = goods;
if (tb == null) {
out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧涓嶅瓨鍦�"));
@@ -326,25 +339,60 @@
tb.setImgList(new ArrayList<>());
}
- tb.getImgList().add(0, tb.getPictUrl());
+ // tb.getImgList().add(0, tb.getPictUrl());
List<String> finalImgList = new ArrayList<>();
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());
+ // 绉婚櫎鐩稿悓鍥剧墖
+ if (finalImgList.size() > 0)
+ for (int i = 0; i < finalImgList.size(); i++) {
+ if (i < finalImgList.size() - 1)
+ if (TbImgUtil.getTBSizeImg(finalImgList.get(i), 600)
+ .equalsIgnoreCase(TbImgUtil.getTBSizeImg(finalImgList.get(i + 1), 600))) {
+ finalImgList.remove(i--);
+ }
+ }
+
+ tb.setImgList(finalImgList);
+
// 澶ф窐瀹㈠晢鍝佽繃婊�
try {
- goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods);
+ goods = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goods);
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
- GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertTaoBao(goods, null, fanLiRate, shareRate);
+ ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
+
+ 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().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());
+ }
+ goodsDetail.getMoneyInfo()
+ .setRateInfoHelpUrl(configService.get(ConfigKeyEnum.goodsDetailFanliRateHelpUrl.getKey()));
+
+ if (TaoBaoUtil.isYUShou(goods)) {
+ if (!StringUtil.isNullOrEmpty(goods.getPresaleDiscountFeeText())) {
+ if (goodsDetail.getLabels() == null)
+ goodsDetail.setLabels(new ArrayList<>());
+ goodsDetail.getLabels().add(new ClientTextStyleVO(goods.getPresaleDiscountFeeText(), "#FF2B4E"));
+ }
+ }
+ // 鍦ㄦ爣棰樻坊鍔犱紭鎯犱俊鎭�
// 搴楅摵淇℃伅
TaoBaoShop shop = taoBaoShopService.getTaoBaoShop(id, goods.getSellerId());
@@ -368,7 +416,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();
@@ -421,87 +469,7 @@
boolean shareValid = true;
int moneyType = 1;
- // 鎺ㄥ箍绾㈠寘
- if (from != null && from.equals("taolijin")) {
- // 璁＄畻鎺ㄥ箍绾㈠寘
- String warningRate = configTaoLiJinService.getValueByKey("warning_value", new Date());
- BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods);
-
- // 鎺ㄥ箍绾㈠寘 涓嶈兘灏忎簬1
- if (spreadMoney.compareTo(new BigDecimal(1.1)) < 0) {
- out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧涓嶅瓨鍦�"));
- return;
- }
-
- // 鍙栨秷鏂扮敤鎴疯嚜璐�
- boolean isNewUser = false;// userInfoExtraService.isNewUser(uid);
- if (isNewUser) {
- // 鍒ゅ畾涓鸿�佺敤鎴凤細 鏂颁汉鍙浣跨敤浜嗘柊浜虹孩鍖咃紝涔熷氨鏄偅1鍧楅挶锛岄偅涔堬紝浠栫湅鍒扮殑鍒嗕韩鐖嗘涓殑鍟嗗搧-灏卞彧鑳藉垎浜��
- long countRecord = userTaoLiJinRecordService.countRecordByUid(uid);
- if (countRecord > 0) {
- isNewUser = false;
- }
- }
-
- SpreadHongBao spreadHongBao = new SpreadHongBao();
- if (isNewUser) {
- spreadHongBao.setMoney("1");
- } else {
- moneyType = 2;
- fanliValid = false;
- spreadHongBao.setMoney(spreadMoney.toString());
-
- ClientTextStyleVO textStyleVO1 = new ClientTextStyleVO();
- textStyleVO1.setContent("鍒嗕韩");
- textStyleVO1.setColor("#666666");
- ClientTextStyleVO textStyleVO2 = new ClientTextStyleVO();
- textStyleVO2.setContent("璧氬閲�");
- textStyleVO2.setColor("#F14242");
- ClientTextStyleVO textStyleVO3 = new ClientTextStyleVO();
- textStyleVO3.setContent("锛屽ソ鍙�");
- textStyleVO3.setColor("#666666");
- ClientTextStyleVO textStyleVO4 = new ClientTextStyleVO();
- textStyleVO4.setContent("棰嗙孩鍖咃紒");
- textStyleVO4.setColor("#F14242");
-
- List<ClientTextStyleVO> listText = new ArrayList<ClientTextStyleVO>();
- listText.add(textStyleVO1);
- listText.add(textStyleVO2);
- listText.add(textStyleVO3);
- listText.add(textStyleVO4);
- extraVO.setTip(listText);
- }
-
- spreadHongBao.setName("鎺ㄥ箍绾㈠寘 ");
- spreadHongBao.setTip("褰撴棩棰嗗彇锛屽綋鏃ュ唴浣跨敤锛岃繃鏈熷け鏁�");
- OtherInfo otherInfo = new OtherInfo();
- 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,
- hongBaoManageService.getTLJShareRate(System.currentTimeMillis())));
-
- // 鐢ㄦ埛娣樼ぜ閲�
- UserMoneyExtra userMoneyExtra = userMoneyExtraService.selectByPrimaryKey(uid);
- if (userMoneyExtra == null || userMoneyExtra.getTlj() == null) {
- extraVO.setUserTLJ(new BigDecimal(0).setScale(2).toString());
- } else {
- extraVO.setUserTLJ(userMoneyExtra.getTlj().setScale(2).toString());
- }
- helpLink = configTaoLiJinService.getValueByKey("share_goods_help_link", new Date());
-
- } else if (from != null && from.equals("taolijin_buy")) {
+ if (from != null && from.equals("taolijin_buy")) {
// 鏌ヨ鍒嗕韩搴�
TLJBuyGoods buyGoods = tljBuyGoodsService.selectByAuctionIdAndDay(id,
TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd"));
@@ -513,7 +481,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);
@@ -536,14 +504,60 @@
else
goodsDetail.setZkPrice(goodsDetail.getZkPrice().subtract(tljHongBao));
}
+ } else if (from != null && from.equals("taolijin_free_buy")) {
+ TLJFreeBuyGoods freeGoods = tljFreeBuyGoodsService.selectByAuctionIdAndDay(id,
+ TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd"));
+ if (freeGoods == null) {
+ out.print(JsonUtil.loadFalseResult(2, "鍏嶅崟鍟嗗搧宸蹭笅鏋�"));
+ return;
+ }
+
+ fanliValid = true;
+ shareValid = false;
+ BigDecimal couponPrice = goodsDetail.getCouponPrice();
+ if (couponPrice == null)
+ couponPrice = goodsDetail.getZkPrice();
+
+ NewUserHongBao newUserHongBao = new NewUserHongBao();
+ newUserHongBao.setMoney(couponPrice.setScale(2).toString());
+ newUserHongBao.setName("鏂颁汉绾㈠寘 ");
+ newUserHongBao.setTip("褰撴棩棰嗗彇锛屽綋鏃ュ唴浣跨敤锛岃繃鏈熷け鏁�");
+ newUserHongBao.setLeft(1);
+ newUserHongBao.setTotal(1);
+
+ OtherInfo otherInfo = new OtherInfo();
+ otherInfo.setReduceHongBao(newUserHongBao);
+ goodsDetail.setOtherInfo(otherInfo);
+
+ // 涓撳睘鏍囩
+ List<ClientTextStyleVO> labels = new ArrayList<ClientTextStyleVO>();
+ labels.add(new ClientTextStyleVO("鏂颁汉涓撳睘", "#FE0014"));
+ labels.add(new ClientTextStyleVO("瀹炰粯0鍏�", "#FF9600"));
+ goodsDetail.setLabels(labels);
+
} else {// 鏅�氳喘涔�
OtherInfo otherInfo = new OtherInfo();
RewardCouponVO rewardCoupon = new RewardCouponVO();
- rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("integralExchange"));
- rewardCoupon.setMaxMoney("楼" +TaoBaoUtil.getGoodsHongBaoMoney(goods, fanLiRate).add( MoneyBigDecimalUtil.mul(TaoBaoUtil.getGoodsHongBaoMoney(goods, fanLiRate),
- Constant.MAX_REWARD_RATE)));
- rewardCoupon.setDesc("鐢ㄨ繑鍒╁鍔卞埜鏈�楂樿繑");
+ rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
+ JSONObject params1 = new JSONObject();
+ if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))
+ params1.put("url", configService.get(ConfigKeyEnum.specialGuideRewardCouponLink.getKey()));
+ else
+ 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", 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);
@@ -556,7 +570,7 @@
// 鍒嗕韩璺緞
if (StringUtil.isNullOrEmpty(helpLink)) {
- helpLink = configService.get("no_rebate_help_link");
+ helpLink = configService.get(ConfigKeyEnum.noRebateHelpLink.getKey());
}
// 鍒嗕韩璺緞
@@ -621,25 +635,82 @@
// 淇濆瓨缂撳瓨
jdGoodsCacheUtil.saveGoodsInfo(jdGoods);
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
- GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertJDGoods(jdGoods, fanLiRate, shareRate);
+ ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
+ 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().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());
+ }
+ goodsDetail.getMoneyInfo()
+ .setRateInfoHelpUrl(configService.get(ConfigKeyEnum.goodsDetailFanliRateHelpUrl.getKey()));
// 闄勫姞淇℃伅
OtherInfo otherInfo = new OtherInfo();
+
+ // 浜笢plus杩斿埄
+ String maxMoneyPlus = null;
+ JDCategoryInfo categoryInfo = jdGoods.getCategoryInfo();
+ if (categoryInfo != null && categoryInfo.getCid3() != null && jdGoods.getCommissionInfo() != null) {
+ Long cid3 = categoryInfo.getCid3();
+ JDGoodsClass threeClass = jdGoodsClassService.getThreeClassByCid(Integer.parseInt(cid3.toString()));
+ if (threeClass != null && threeClass.getSelfComm() != null
+ && threeClass.getSelfComm().compareTo(new BigDecimal(0)) > 0) {
+ BigDecimal commissionShare = jdGoods.getCommissionInfo().getCommissionShare();
+ // plus姣斾緥 灏忎簬姝ｅ父姣斾緥
+ if (commissionShare != null && commissionShare.compareTo(threeClass.getSelfComm()) > 0) {
+ jdGoods.setCommissionPlus(threeClass.getSelfComm());
+ // plus杩斿埄
+ BigDecimal fanliMoneyPlus = JDUtil.getGoodsFanLiMoneyPlus(jdGoods,
+ 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))
+ + "锛�";
+ }
+ }
+ }
+
+ // 濂栧姳鍒歌繑鍒�
RewardCouponVO rewardCoupon = new RewardCouponVO();
- rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("integralExchange"));
- rewardCoupon.setMaxMoney(
- "楼" +JDUtil.getGoodsFanLiMoney(jdGoods, fanLiRate).add( MoneyBigDecimalUtil.mul(JDUtil.getGoodsFanLiMoney(jdGoods, fanLiRate), Constant.MAX_REWARD_RATE)));
- rewardCoupon.setDesc("鐢ㄨ繑鍒╁鍔卞埜鏈�楂樿繑");
+ rewardCoupon.setMaxMoneyPlus(maxMoneyPlus);
+ rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
+ JSONObject params1 = new JSONObject();
+ if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))
+ params1.put("url", configService.get(ConfigKeyEnum.specialGuideRewardCouponLink.getKey()));
+ else
+ 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", 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();
if (couponInfo != null) {
// 鍒搁摼鎺ュ鐞�
String materialId = "https://item.jd.com/" + id + ".html";
- String url = JDApiUtil.convertLink(materialId, couponInfo.getLink(), JDApiUtil.POSITION_COUPON + "", null);
+ String url = JDApiUtil.convertLinkWithSubUnionId(materialId, couponInfo.getLink(),
+ JDApiUtil.POSITION_COUPON + "", null);
couponInfo.setLink(url);
}
@@ -663,7 +734,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();
@@ -716,7 +787,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();
@@ -766,18 +837,40 @@
return;
}
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
- GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertPDDGoods(pddGoods, fanLiRate, shareRate);
+ ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
+ 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().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());
+ }
+ goodsDetail.getMoneyInfo()
+ .setRateInfoHelpUrl(configService.get(ConfigKeyEnum.goodsDetailFanliRateHelpUrl.getKey()));
// 闄勫姞淇℃伅
OtherInfo otherInfo = new OtherInfo();
RewardCouponVO rewardCoupon = new RewardCouponVO();
- rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("integralExchange"));
- rewardCoupon.setMaxMoney("楼" +PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods, fanLiRate).add(MoneyBigDecimalUtil.mul(PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods, fanLiRate),
- Constant.MAX_REWARD_RATE)));
- rewardCoupon.setDesc("鐢ㄨ繑鍒╁鍔卞埜鏈�楂樿繑");
+ rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
+ JSONObject params1 = new JSONObject();
+ if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))
+ params1.put("url", configService.get(ConfigKeyEnum.specialGuideRewardCouponLink.getKey()));
+ else
+ 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", 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();
@@ -805,7 +898,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)) {
@@ -865,7 +958,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();
@@ -921,12 +1014,12 @@
list = list.subList(0, 10);
}
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
+ ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
List<GoodsDetailVO> listDetailVO = new ArrayList<GoodsDetailVO>();
for (JDGoods goods : list) {
- listDetailVO.add(GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate));
+ listDetailVO.add(GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO));
}
// 鍙栧伓鏁颁釜鏁版嵁
@@ -963,10 +1056,10 @@
goodsList = goodsList.subList(0, 10);
}
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
+ ConfigParamsDTO paramsDTO = hongBaoManageService
+ .getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion());
for (PDDGoodsDetail goods : goodsList) {
- listDetailVO.add(GoodsDetailVOFactory.convertPDDGoods(goods, fanLiRate, shareRate));
+ listDetailVO.add(GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO));
}
}
}
@@ -982,7 +1075,7 @@
return;
}
- List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.getRelationGoodsRecommend(id, 10);
+ List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.guessLikeByAuctionId(id, 10);
// 鍒濆鍖�
if (goodsList == null) {
goodsList = new ArrayList<TaoBaoGoodsBrief>();
@@ -1007,8 +1100,8 @@
if (goodsList != null && goodsList.size() > 0) {
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
+ ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
goodsList.parallelStream().forEach(goods -> {
if (goods != null) {
@@ -1029,8 +1122,7 @@
}
if (taoBaoGoodsBrief != null) {
- listExtra.add(
- GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate, shareRate));
+ listExtra.add(GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, paramsDTO));
}
}
});
@@ -1065,12 +1157,13 @@
* @param acceptData
* @param uid
* @param id
+ * @param couponUrl
+ * -浼樻儬鍒搁摼鎺�
* @param source
- * @param request
* @param out
*/
@RequestMapping(value = "getJDLink")
- public void getJDLink(AcceptData acceptData, Long uid, Long id, String source, PrintWriter out) {
+ public void getJDLink(AcceptData acceptData, Long uid, Long id, String couponUrl, String source, PrintWriter out) {
if (uid == null || uid <= 0) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛ID涓嶈兘涓虹┖"));
return;
@@ -1093,13 +1186,19 @@
return;
}
- String couponUrl = null;
+ String jumpLink = null;
String materialId = "https://item.jd.com/" + id + ".html";
- JDCouponInfo couponInfo = goods.getCouponInfo();
- if (couponInfo != null) {
- couponUrl = couponInfo.getLink();
+ if (StringUtil.isNullOrEmpty(couponUrl)) {
+ JDCouponInfo couponInfo = JDUtil.getShowCouponInfo(goods.getCouponInfoList(), goods.getPrice());
+ if (couponInfo != null) {
+ couponUrl = couponInfo.getLink();
+ }
+ jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "",
+ uid + "");
+ } else {
+ jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "",
+ uid + "");
}
- String jumpLink = JDApiUtil.convertLink(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "", uid + "");
JSONObject data = new JSONObject();
data.put("native", true);
@@ -1108,6 +1207,28 @@
// 鑾峰緱閲戝竵
integralGetService.addCouponRebate(uid);
+ }
+
+ @RequestMapping(value = "getJDCouponLink")
+ public void getJDCouponLink(AcceptData acceptData, Long id, String couponUrl, PrintWriter out) {
+ if (StringUtil.isNullOrEmpty(couponUrl)) {
+ out.print(JsonUtil.loadFalseResult(1, "鍒搁摼鎺ヤ笉鑳戒负绌�"));
+ return;
+ }
+ if (id == null || id <= 0) {
+ out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧ID涓嶈兘涓虹┖"));
+ return;
+ }
+
+ String jumpLink = null;
+ String materialId = "https://item.jd.com/" + id + ".html";
+
+ jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "", null);
+
+ JSONObject data = new JSONObject();
+ data.put("native", true);
+ data.put("jumpLink", jumpLink);
+ out.print(JsonUtil.loadTrueResult(data));
}
/**
@@ -1211,4 +1332,93 @@
}
out.print(JsonUtil.loadTrueResult(data));
}
+
+ @RequestMapping(value = "listSimpleGoods", method = RequestMethod.POST)
+ public void listSimpleGoods(AcceptData acceptData, String goodsInfo, PrintWriter out) {
+ if (StringUtil.isNullOrEmpty(goodsInfo)) {
+ out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧淇℃伅涓虹┖"));
+ return;
+ }
+
+ net.sf.json.JSONArray array = net.sf.json.JSONArray.fromObject(goodsInfo);
+
+ List<CommonGoods> commonGoodsList = new ArrayList<>();
+
+ for (int i = 0; i < array.size(); i++) {
+ JSONObject obj = array.optJSONObject(i);
+ CommonGoods cg = new CommonGoods();
+ cg.setGoodsId(obj.optLong("goodsId"));
+ cg.setGoodsType(obj.optInt("goodsType"));
+ commonGoodsList.add(cg);
+ }
+
+ if (commonGoodsList.size() > 9) {
+ out.print(JsonUtil.loadFalseResult(1, "鏈�澶氬悓鏃惰幏鍙�9鏉℃暟鎹�"));
+ return;
+ }
+
+ // 鍒嗙鍚勪釜骞冲彴鐨勫晢鍝佷俊鎭�
+ List<Long> tbGoodsList = new ArrayList<>();
+ List<Long> jdGoodsList = new ArrayList<>();
+ List<Long> pddGoodsList = new ArrayList<>();
+
+ List<String> keyList = new ArrayList<>();
+
+ for (CommonGoods cg : commonGoodsList) {
+ keyList.add(cg.getGoodsId() + "-" + cg.getGoodsType());
+ if (cg.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
+ tbGoodsList.add(cg.getGoodsId());
+ } else if (cg.getGoodsType() == Constant.SOURCE_TYPE_JD) {
+ jdGoodsList.add(cg.getGoodsId());
+ } else if (cg.getGoodsType() == Constant.SOURCE_TYPE_PDD) {
+ pddGoodsList.add(cg.getGoodsId());
+ }
+ }
+
+ Map<String, GoodsDetailVO> tempGoodsList = new HashMap<>();
+
+ ConfigParamsDTO params = new ConfigParamsDTO(hongBaoManageService.getFanLiRate(),
+ hongBaoManageService.getShareRate(), new BigDecimal(80), hongBaoManageService.getVIPFanLiRate());
+ hongBaoManageService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion());
+
+ if (tbGoodsList.size() > 0) {
+ List<TaoBaoGoodsBrief> goodsList = null;
+ try {
+ goodsList = TaoKeApiUtil.getBatchGoodsInfo(tbGoodsList);
+ } catch (TaobaoGoodsDownException e) {
+ e.printStackTrace();
+ } catch (TaoKeApiException e) {
+ e.printStackTrace();
+ }
+ if (goodsList != null)
+ for (TaoBaoGoodsBrief goods : goodsList) {
+ goods.setTkRate(new BigDecimal(0));
+ tempGoodsList.put(goods.getAuctionId() + "-" + Constant.SOURCE_TYPE_TAOBAO,
+ GoodsDetailVOFactory.convertTaoBao(goods, params));
+ }
+ }
+ if (jdGoodsList.size() > 0) {
+ List<JDGoods> goodsList = JDApiUtil.getGoodsDetail(jdGoodsList);
+ for (JDGoods goods : goodsList) {
+ tempGoodsList.put(goods.getSkuId() + "-" + Constant.SOURCE_TYPE_JD,
+ GoodsDetailVOFactory.convertJDGoods(goods, params));
+ }
+ }
+ if (pddGoodsList.size() > 0) {
+ List<PDDGoodsDetail> goodsList = PinDuoDuoApiUtil.listGoodsDetail(pddGoodsList);
+ for (PDDGoodsDetail goods : goodsList) {
+ tempGoodsList.put(goods.getGoodsId() + "-" + Constant.SOURCE_TYPE_PDD,
+ GoodsDetailVOFactory.convertPDDGoods(goods, params));
+ }
+ }
+ List<GoodsDetailVO> voList = new ArrayList<>();
+ Gson gson = JsonUtil.getApiCommonGson();
+ for (String key : keyList) {
+ GoodsDetailVO vo = tempGoodsList.get(key);
+ if (vo != null) {
+ voList.add(vo);
+ }
+ }
+ out.print(JsonUtil.loadTrueResult(gson.toJson(voList)));
+ }
}
--
Gitblit v1.8.0