From 6c68cf469de71773039c2cca8498f35b80b2891b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 05 九月 2023 18:36:07 +0800
Subject: [PATCH] 唯品会订单修改/猜你喜欢过来的商品不能分享
---
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/ConsumerController.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/ConsumerController.java b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/ConsumerController.java
index 69aec0a..33ebab8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/ConsumerController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/ConsumerController.java
@@ -20,7 +20,7 @@
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
-import com.yeshi.fanli.dto.ConfigParamsDTO;
+import com.yeshi.fanli.dto.GoodsMoneyConfigParamsDTO;
import com.yeshi.fanli.dto.WXMPAcceptData;
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
@@ -93,13 +93,12 @@
*
* @param acceptData
* @param uid
- * @param id
* @param type
* @param goodsType
* @param out
*/
@RequestMapping("collectionGoods")
- public void collectionGoods(WXMPAcceptData acceptData, Long uid, Long goodsId, int type, Integer goodsType,
+ public void collectionGoods(WXMPAcceptData acceptData, Long uid, String goodsId, int type, Integer goodsType,
PrintWriter out) {
try {
if (goodsType == null || goodsType < 2 || goodsType > 3) {
@@ -120,9 +119,9 @@
}
if (goodsType == Constant.SOURCE_TYPE_JD) {
- JDGoods jdGoods = jdGoodsCacheUtil.getGoodsInfo(goodsId);
+ JDGoods jdGoods = jdGoodsCacheUtil.getGoodsInfo(Long.parseLong(goodsId));
if (jdGoods == null) {
- jdGoods = JDApiUtil.getGoodsDetail(goodsId);
+ jdGoods = JDApiUtil.getGoodsDetail(Long.parseLong(goodsId));
}
if (jdGoods == null) {
out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�"));
@@ -130,7 +129,7 @@
}
collectionGoodsV2Service.addJDCollection(uid, jdGoods);
} else if (goodsType == Constant.SOURCE_TYPE_PDD) {
- PDDGoodsDetail pddGoods = pinDuoDuoCacheUtil.getGoodsInfo(goodsId);
+ PDDGoodsDetail pddGoods = pinDuoDuoCacheUtil.getGoodsInfo(Long.parseLong(goodsId));
if (pddGoods == null) {
out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�"));
return;
@@ -210,7 +209,7 @@
List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>();
if (collectionGoodsList != null && collectionGoodsList.size() > 0) {
- List<Long> listGid = new ArrayList<Long>();
+ List<String> listGid = new ArrayList<>();
for (CollectionGoodsV2 collectionGoodsV2 : collectionGoodsList) {
CommonGoods commonGoods = collectionGoodsV2.getCommonGoods();
if (commonGoods == null || commonGoods.getGoodsType() != Constant.SOURCE_TYPE_TAOBAO) {
@@ -233,7 +232,7 @@
}
}
- ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
+ GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
acceptData.getVersion(),acceptData.getSystem());
@@ -246,9 +245,9 @@
if (listTaoKeGoods != null && listTaoKeGoods.size() > 0
&& commonGoods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
int state = 1; // 榛樿鍋滃敭
- Long goodsId = commonGoods.getGoodsId();
+ String goodsId = commonGoods.getGoodsId();
for (TaoBaoGoodsBrief taoKeGoods : listTaoKeGoods) {
- Long auctionId = taoKeGoods.getAuctionId();
+ String auctionId = taoKeGoods.getAuctionId();
if (goodsId == auctionId || goodsId.equals(auctionId)) {
state = 0; // 鍦ㄥ敭
break;
@@ -349,7 +348,7 @@
JSONArray array = new JSONArray();
if (list != null && list.size() > 0) {
Gson gson = gsonBuilder.create();
- ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
+ GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
acceptData.getVersion(),acceptData.getSystem());
for (ScanHistoryV2 sh : list) {
CommonGoods commonGoods = sh.getCommonGoods();
--
Gitblit v1.8.0