From 5e7b0ed4a154ad067cbcf4aa1a1c7cce32f9864c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 26 四月 2024 18:02:17 +0800
Subject: [PATCH] 唯品会链接解析升级
---
fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java
index a5c3f16..9ec9da1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java
@@ -8,13 +8,14 @@
import javax.annotation.Resource;
import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-import com.yeshi.fanli.dto.ConfigParamsDTO;
+import com.yeshi.fanli.dto.GoodsMoneyConfigParamsDTO;
import com.yeshi.fanli.dto.jd.JDFilter;
import com.yeshi.fanli.dto.jd.JDSearchResult;
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
@@ -65,7 +66,7 @@
}
// 鑾峰彇鍟嗗搧淇℃伅
- JSONObject data = userShareGoodsRecordService.getGoodsGroupDetail(shareId,acceptData.getSystem());
+ JSONObject data = userShareGoodsRecordService.getGoodsGroupDetail(shareId, acceptData.getSystem());
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鑾峰彇澶辫触"));
@@ -78,7 +79,6 @@
*
* @param callback
* @param shareId 鍒嗕韩id
- * @param source 鏉ユ簮
* @param out
*/
@RequestMapping(value = "getList")
@@ -93,7 +93,7 @@
List<UserShareGoodsGroup> list = userShareGoodsRecordService.listByRecordId(shareId);
if (list != null && list.size() > 0) {
- List<Long> listIdTB = new ArrayList<Long>();
+ List<String> listIdTB = new ArrayList<>();
List<Long> listIdJD = new ArrayList<Long>();
List<Long> listIdPDD = new ArrayList<Long>();
@@ -111,9 +111,9 @@
if (Constant.SOURCE_TYPE_TAOBAO == goodsType) {
listIdTB.add(commonGoods.getGoodsId());
} else if (Constant.SOURCE_TYPE_JD == goodsType) {
- listIdJD.add(commonGoods.getGoodsId());
+ listIdJD.add(Long.parseLong(commonGoods.getGoodsId()));
} else if (Constant.SOURCE_TYPE_PDD == goodsType) {
- listIdPDD.add(commonGoods.getGoodsId());
+ listIdPDD.add(Long.parseLong(commonGoods.getGoodsId()));
}
}
@@ -153,7 +153,7 @@
sf.setPage(1);
sf.setPageSize(100);
sf.setGoodsIdList(listIdPDD.toArray(ids));
- PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(sf,"437032");
+ PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(sf, "437032");
if (result != null) {
listPDD = result.getGoodsList();
}
@@ -166,7 +166,7 @@
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate(acceptData.getSystem());
BigDecimal shareRate = hongBaoManageService.getShareRate(acceptData.getSystem());
- ConfigParamsDTO configParamsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,
+ GoodsMoneyConfigParamsDTO configParamsDTO = new GoodsMoneyConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,
hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP, acceptData.getSystem()));
@@ -179,13 +179,13 @@
if (goodsType == null) {
goodsType = Constant.SOURCE_TYPE_TAOBAO;
}
- Long commonGid = commonGoods.getGoodsId();
+ String commonGid = commonGoods.getGoodsId();
if (goodsType == Constant.SOURCE_TYPE_TAOBAO && listTB != null && listTB.size() > 0) {
int state = 1; // 榛樿鍋滃敭
for (TaoBaoGoodsBrief goodsDetail : listTB) {
- Long goodsId = goodsDetail.getAuctionId();
- if (goodsId == commonGid || goodsId.equals(commonGid)) {
+ String goodsId = goodsDetail.getAuctionId();
+ if (TaoBaoUtil.isEqual(goodsId, commonGid)) {
state = 0; // 鍦ㄥ敭
break;
}
@@ -197,7 +197,7 @@
int state = 1; // 榛樿鍋滃敭
for (JDGoods goodsDetail : listJD) {
Long goodsId = goodsDetail.getSkuId();
- if (goodsId == commonGid || goodsId.equals(commonGid)) {
+ if (goodsId == Long.parseLong(commonGid)) {
state = 0; // 鍦ㄥ敭
break;
}
@@ -209,7 +209,7 @@
int state = 1; // 榛樿鍋滃敭
for (PDDGoodsDetail goodsDetail : listPDD) {
Long goodsId = goodsDetail.getGoodsId();
- if (goodsId == commonGid || goodsId.equals(commonGid)) {
+ if (goodsId == Long.parseLong(commonGid)) {
state = 0; // 鍦ㄥ敭
break;
}
--
Gitblit v1.8.0