From ff076ec18ccc61d9d03863d859000e4a46c19a76 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 27 十二月 2019 11:20:35 +0800
Subject: [PATCH] 自购返利维权到账修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 70 ++++++++++++++++++----------------
1 files changed, 37 insertions(+), 33 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
index e1c4b4b..be91b5d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
@@ -54,6 +54,7 @@
import com.yeshi.fanli.service.inter.user.HistorySearchService;
import com.yeshi.fanli.service.inter.user.TokenRecordService;
import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
+import com.yeshi.fanli.service.manger.goods.jd.JDGoodsLinkParseManager;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.DouYinUtil;
@@ -133,6 +134,9 @@
@Resource
private BrandInfoService brandInfoService;
+ @Resource
+ private JDGoodsLinkParseManager jdGoodsLinkParseManager;
+
/**
* 绮樿创鏉夸俊鎭帹鑽�
*
@@ -149,6 +153,7 @@
}
// 鍘婚櫎鍓嶅悗绌烘牸
text = text.trim();
+ String originalText=text;
try {
TokenVO tokenVO = tokenRecordService.discernToken(text, uid, acceptData);
@@ -227,7 +232,7 @@
tb = TaoBaoUtil.isAlimama(id);
if (tb == null) {
type = 4;
- tb = getTaoBaoGoodsBriefFromGoodsId(id);
+ tb = getTaoBaoGoodsBriefFromGoodsId(id,originalText);
}
} else if (text.contains("http://zmnxbc.com")) { // 鎵嬫満绔ぉ鐚獳PP鍒嗕韩
tb = TaoBaoUtil.parsePhoneShareUrlByTM(text);
@@ -239,7 +244,7 @@
tb = TaoBaoUtil.isAlimama(id);
if (tb == null) {
type = 4;
- tb = getTaoBaoGoodsBriefFromGoodsId(id);
+ tb = getTaoBaoGoodsBriefFromGoodsId(id,originalText);
}
} else if (text.contains("v.douyin.com")) { // 鎶栭煶
analysisDouYin(acceptData, text, out);
@@ -250,7 +255,7 @@
if (tb == null) {
String goodsId = TaoBaoUtil.getGoodsIdByPhoneShareUrl(text);
if (!StringUtil.isNullOrEmpty(goodsId)) {
- tb = getTaoBaoGoodsBriefFromGoodsId(goodsId);
+ tb = getTaoBaoGoodsBriefFromGoodsId(goodsId,originalText);
if (tb != null)
type = 4;
}
@@ -267,7 +272,7 @@
// 棰嗗埜鐭繛鎺�
if (StringUtil.isNullOrEmpty(jdId) && text.contains("u.jd.com")) {
- jdId = JDUtil.getJDGoodsIdByUJD(text);
+ jdId = jdGoodsLinkParseManager.parseGoodsIdByJDShortUrl(text);
}
if (!StringUtil.isNullOrEmpty(jdId)) {
@@ -360,14 +365,11 @@
commonGoods = CommonGoodsFactory.create(goodsBrief);
}
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
data.put("type", type);
- data.put("goods",
- gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods, new ConfigParamsDTO(fanLiRate,
- shareRate, Constant.MAX_REWARD_RATE, hongBaoManageService.getVIPFanLiRate()))));
+ data.put("goods", gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods,
+ hongBaoManageService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion()))));
out.print(JsonUtil.loadTrueResult(data));
return;
}
@@ -403,12 +405,22 @@
out.print(JsonUtil.loadTrueResult(root));
}
- private TaoBaoGoodsBrief getTaoBaoGoodsBriefFromGoodsId(String goodsId) {
+ private TaoBaoGoodsBrief getTaoBaoGoodsBriefFromGoodsId(String goodsId, String text) {
TaoBaoGoodsBrief tb = TaoBaoUtil.getTmallGoodsInfo(goodsId);
if (tb == null && NumberUtil.isNumeric(goodsId)) {// 鏄暟瀛�
- tb = TaoBaoUtil.getSimpleGoodsBrief(Long.parseLong(goodsId));
- if (tb != null) {
- tb.setPictUrl(TbImgUtil.getTBSize220Img(tb.getPictUrl()));
+// tb = TaoBaoUtil.getSimpleGoodsBrief(Long.parseLong(goodsId));
+// if (tb != null) {
+// tb.setPictUrl(TbImgUtil.getTBSize220Img(tb.getPictUrl()));
+// }
+ if (tb == null) {
+ tb = new TaoBaoGoodsBrief();
+ if (text.trim().indexOf("銆�") == 0 && text.trim().indexOf("銆�") > 0) {
+ // 鎴彇鏍囬
+ String title = text.trim().substring(1, text.trim().lastIndexOf("銆�"));
+ tb.setAuctionId(Long.parseLong(goodsId));
+ tb.setTitle(title);
+ tb.setPictUrl("http://");
+ }
}
}
return tb;
@@ -483,17 +495,14 @@
return false;
}
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
JSONObject data = new JSONObject();
data.put("type", 3);
data.put("goods",
- gson.toJson(GoodsDetailVOFactory.convertTaoBao(goodsBrief,
- new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,
- hongBaoManageService.getVIPFanLiRate()))));
+ gson.toJson(GoodsDetailVOFactory.convertTaoBao(goodsBrief, hongBaoManageService
+ .getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion()))));
out.print(JsonUtil.loadTrueResult(data));
return true;
}
@@ -763,10 +772,8 @@
}
List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>();
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
- ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,
- hongBaoManageService.getVIPFanLiRate());
+ ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
for (TaoBaoGoodsBrief goods : taoBaoGoodsBriefs) {
list.add(GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO));
@@ -786,13 +793,15 @@
|| ("android".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0_2(platform, version))) {
BrandInfoVO brandInfoVO = null;
try {
- brandInfoVO = brandInfoService.listByAlikeName(key);
+ brandInfoVO = brandInfoService.listByAlikeName(key, acceptData.getPlatform(),
+ acceptData.getVersion());
} catch (Exception e) {
}
if (brandInfoVO != null)
data.put("shop", JsonUtil.getApiCommonGson().toJson(brandInfoVO));
} else {
- List<TaoBaoShopVO> listShop = taoBaoShopService.getShopByKeyV2(key);
+ List<TaoBaoShopVO> listShop = taoBaoShopService.getShopByKeyV2(key, acceptData.getPlatform(),
+ acceptData.getVersion());
if (listShop != null && listShop.size() > 0 && listShop.get(0).getListGoodsVO() != null
&& listShop.get(0).getListGoodsVO().size() > 2) {
TaoBaoShopVO taoBaoShop = listShop.get(0);
@@ -969,13 +978,10 @@
List<JDGoods> goodsList = result.getGoodsList();
if (goodsList != null && goodsList.size() > 0) {
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
- ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,
- hongBaoManageService.getVIPFanLiRate());
-
+ ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
for (JDGoods goods : goodsList) {
GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO);
if (hasCoupon) {
@@ -1056,10 +1062,8 @@
Gson gson = JsonUtil.getApiCommonGson();
List<PDDGoodsDetail> goodsList = result.getGoodsList();
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 = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
for (PDDGoodsDetail goods : goodsList) {
GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO);
--
Gitblit v1.8.0