From e1a62ec62e7331d97af9302e90e1ce44af8235eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 一月 2021 15:26:55 +0800
Subject: [PATCH] 拼多多授权绑定
---
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/GoodsController.java | 68 ++++++++++++++++-----------------
1 files changed, 33 insertions(+), 35 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 de4fe52..b4e2176 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
@@ -10,6 +10,8 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.entity.SystemEnum;
+import com.yeshi.fanli.util.*;
import org.json.simple.JSONArray;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -59,11 +61,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
-import com.yeshi.fanli.tag.PageEntity;
-import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.JumpDetailUtil;
-import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.ThreadUtil;
+import com.yeshi.common.entity.PageEntity;
import com.yeshi.fanli.util.cache.JDGoodsCacheUtil;
import com.yeshi.fanli.util.cache.PinDuoDuoCacheUtil;
import com.yeshi.fanli.util.factory.CommonGoodsFactory;
@@ -150,12 +148,14 @@
*/
@RequestMapping(value = "getTopCategory", method = RequestMethod.POST)
public void getTopCategory(WXMPAcceptData acceptData, Long uid, PrintWriter out) {
+
+ SystemEnum system= SystemInfoUtil.getSystemByWXCXCAppId(acceptData.getAppId());
JSONObject data = new JSONObject();
- data.put("list", configService.get(ConfigKeyEnum.jdWXMPClass.getKey()));
+ data.put("list", configService.getValue(ConfigKeyEnum.jdWXMPClass.getKey(),system));
String tips = null;
if (uid == null || uid <= 0) {
- tips = configService.get(ConfigKeyEnum.tipGuideNewUser.getKey());
+ tips = configService.getValue(ConfigKeyEnum.tipGuideNewUser.getKey(),system);
} else {
long rebateOrder = hongBaoV2CountService.countRebateOrder(uid);
long shareOrInviteOrder = hongBaoV2CountService.countShareOrInviteOrder(uid);
@@ -163,13 +163,13 @@
// 鐔熷鐗�
} else if (rebateOrder <= 0 && shareOrInviteOrder <= 0) {
// 鏂颁汉鐗�
- tips = configService.get(ConfigKeyEnum.tipGuideNewUser.getKey());
+ tips = configService.getValue(ConfigKeyEnum.tipGuideNewUser.getKey(),system);
} else if (rebateOrder > 0 && shareOrInviteOrder <= 0) {
// 鐪侀挶鐗�
- tips = configService.get(ConfigKeyEnum.tipGuideSaveMoney.getKey());
+ tips = configService.getValue(ConfigKeyEnum.tipGuideSaveMoney.getKey(),system);
} else {
// 璧氶挶鐗�
- tips = configService.get(ConfigKeyEnum.tipGuideShareInvite.getKey());
+ tips = configService.getValue(ConfigKeyEnum.tipGuideShareInvite.getKey(),system);
}
}
@@ -200,7 +200,7 @@
String platform = acceptData.getPlatform();
int version = Integer.parseInt(acceptData.getVersion());
List<BannerVO> picList = swiperPictureService.getByBannerCardAndVersion("index_top", platform,
- version);
+ version,acceptData.getSystem());
if (picList == null) {
picList = new ArrayList<>();
}
@@ -236,7 +236,7 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
- acceptData.getVersion());
+ acceptData.getVersion(),acceptData.getSystem());
for (JDGoods goods : goodsList) {
GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO);
if (goodsDetailVO.isHasCoupon()) {
@@ -258,7 +258,6 @@
* @param goodsId
* 鍟嗗搧id
* @param uid
- * @param code
* 閭�璇风爜
* @param goodsType
* 鍟嗗搧绫诲瀷
@@ -318,19 +317,19 @@
jdGoodsCacheUtil.saveGoodsInfo(jdGoods);
ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
- acceptData.getVersion());
+ acceptData.getVersion(),acceptData.getSystem());
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.getShareRate(UserLevelEnum.superVIP)));
+ .setShareMoney("楼" + JDUtil.getGoodsFanLiMoney(jdGoods, hongBaoManageService.getShareRate(UserLevelEnum.superVIP,acceptData.getSystem())));
goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());
goodsDetail.getMoneyInfo().setCompositionInfo(goodsDetail.getMoneyInfo().getMaxCompositionInfo());
}
goodsDetail.getMoneyInfo()
- .setRateInfoHelpUrl(configService.get(ConfigKeyEnum.goodsDetailFanliRateHelpUrl.getKey()));
+ .setRateInfoHelpUrl(configService.getValue(ConfigKeyEnum.goodsDetailFanliRateHelpUrl.getKey(),acceptData.getSystem()));
// 闄勫姞淇℃伅
OtherInfo otherInfo = new OtherInfo();
@@ -349,12 +348,12 @@
jdGoods.setCommissionPlus(threeClass.getSelfComm());
// plus杩斿埄
BigDecimal fanliMoneyPlus = JDUtil.getGoodsFanLiMoneyPlus(jdGoods,
- hongBaoManageService.getFanLiRate());
+ hongBaoManageService.getFanLiRate(acceptData.getSystem()));
otherInfo.setFanliMoneyPlus("浜笢plus杩斅�" + fanliMoneyPlus);
// 浣跨敤濂栧姳鍒告渶楂樿繑
maxMoneyPlus = "锛堜含涓減lus杩斅�"
- + JDUtil.getGoodsFanLiMoneyPlus(jdGoods, hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP)) + "锛�";
+ + JDUtil.getGoodsFanLiMoneyPlus(jdGoods, hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP,acceptData.getSystem())) + "锛�";
}
}
@@ -374,7 +373,7 @@
// 鍒搁摼鎺ュ鐞�
String materialId = "https://item.jd.com/" + id + ".html";
String url = JDApiUtil.convertLinkWithSubUnionId(materialId, couponInfo.getLink(),
- JDApiUtil.POSITION_COUPON + "", null);
+ null,JDApiUtil.POSITION_COUPON + "", null);
couponInfo.setLink(url);
}
@@ -391,14 +390,14 @@
// IOS鏄惁姝ｅ湪涓婄嚎
if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {
String version = acceptData.getVersion();
- extraVO.setIosOnling(configService.iosOnLining(Integer.parseInt(version)));
+ extraVO.setIosOnling(configService.iosOnLining(Integer.parseInt(version),acceptData.getSystem()));
}
Long inOrderCount30Days = jdGoods.getInOrderCount30Days();
List<ShamUser> listShareUser = new ArrayList<ShamUser>();
// 浜笢寮�鍚垎浜�
- String open = configService.get(ConfigKeyEnum.shareOpenJD.getKey());
+ String open = configService.getValue(ConfigKeyEnum.shareOpenJD.getKey(),acceptData.getSystem());
if ("1".equals(open.trim())) {
extraVO.setShareValid(true);
MoneyInfoVO moneyInfo = goodsDetail.getMoneyInfo();
@@ -430,7 +429,7 @@
extraVO.setDetailUrl("https://in.m.jd.com/product/jieshao/video/" + id + ".html");
// 鍟嗗搧閾炬帴
- String h5Url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(),
+ String h5Url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(acceptData.getSystem()),
Constant.systemCommonConfig.getShareGoodsPagePathJD(), "", id + "");
try {
extraVO.setH5Url(HttpUtil.getShortLink(h5Url));
@@ -442,7 +441,7 @@
extraVO.setFanliValid(true);
if (StringUtil.isNullOrEmpty(helpLink)) {
- helpLink = configService.get(ConfigKeyEnum.noRebateHelpLink.getKey());
+ helpLink = configService.getValue(ConfigKeyEnum.noRebateHelpLink.getKey(),acceptData.getSystem());
}
ShareVO shareInfoVO = new ShareVO();
@@ -488,13 +487,13 @@
}
ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
- acceptData.getVersion());
+ acceptData.getVersion(),acceptData.getSystem());
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.getShareRate(UserLevelEnum.superVIP)));
+ "楼" + PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods, hongBaoManageService.getShareRate(UserLevelEnum.superVIP,acceptData.getSystem())));
}
if (goodsDetail.getCouponInfo() != null) {
@@ -516,7 +515,7 @@
CouponInfoVO couponInfo = goodsDetail.getCouponInfo();
PDDPromotionUrl convertUrl = null;
if (couponInfo != null) {
- convertUrl = PinDuoDuoApiUtil.convert(id, PinDuoDuoApiUtil.PID_COUPON + "", null);
+ convertUrl = PinDuoDuoApiUtil.convert(id, PinDuoDuoApiUtil.PID_COUPON + "", null,false);
if (convertUrl != null)
couponInfo.setLink(convertUrl.getUrl());
}
@@ -573,7 +572,7 @@
}
// 鍒嗕韩璺緞
- String h5Url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(),
+ String h5Url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(acceptData.getSystem()),
Constant.systemCommonConfig.getShareGoodsPagePathPDD(), "", id + "");
try {
extraVO.setH5Url(HttpUtil.getShortLink(h5Url));
@@ -586,7 +585,7 @@
extraVO.setShareValid(true);
if (StringUtil.isNullOrEmpty(helpLink)) {
- helpLink = configService.get(ConfigKeyEnum.noRebateHelpLink.getKey());
+ helpLink = configService.getValue(ConfigKeyEnum.noRebateHelpLink.getKey(),acceptData.getSystem());
}
ShareVO shareInfoVO = new ShareVO();
@@ -647,7 +646,7 @@
}
ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
- acceptData.getVersion());
+ acceptData.getVersion(),acceptData.getSystem());
List<GoodsDetailVO> listDetailVO = new ArrayList<GoodsDetailVO>();
for (JDGoods goods : list) {
@@ -679,7 +678,7 @@
Long[] strings = new Long[goodsIdList.size()];
pddfilter.setGoodsIdList(goodsIdList.toArray(strings));
- PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter);
+ PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter,Constant.PDD_SEARCH_CUSTOMER_PARAMS);
if (result != null) {
List<PDDGoodsDetail> goodsList = result.getGoodsList();
if (goodsList != null && goodsList.size() > 0) {
@@ -689,7 +688,7 @@
}
ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService
- .getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion());
+ .getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion(),acceptData.getSystem());
for (PDDGoodsDetail goods : goodsList) {
listDetailVO.add(GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO));
}
@@ -722,7 +721,6 @@
* @param goodsId
* 鍟嗗搧id
* @param uid
- * @param code
* 閭�璇风爜
* @param goodsType
* 鍟嗗搧绫诲瀷
@@ -781,7 +779,7 @@
if (share) {
position = JDApiUtil.POSITION_SHARE;
}
- String jdLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, position + "", subUnionId);
+ String jdLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, null,position + "", subUnionId);
try {
jumpLink = "/pages/union/proxy/proxy?spreadUrl=" + URLEncoder.encode(jdLink, "UTF-8");
} catch (Exception e) {
@@ -876,7 +874,7 @@
return;
}
ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
- acceptData.getVersion());
+ acceptData.getVersion(),acceptData.getSystem());
GoodsDetailVO goods = GoodsDetailVOFactory.convertJDGoods(jdGoods, paramsDTO);
String scene = goodsType + "#" + goodsId + "#" + inviteCode;
@@ -934,7 +932,7 @@
return;
}
ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
- acceptData.getVersion());
+ acceptData.getVersion(),acceptData.getSystem());
GoodsDetailVO goods = GoodsDetailVOFactory.convertPDDGoods(pddGoods, paramsDTO);
String scene = goodsType + "#" + goodsId + "#" + inviteCode;
--
Gitblit v1.8.0