From 80e39e3a40283521fc732c930aa51d9bece7c146 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 03 六月 2020 15:15:49 +0800
Subject: [PATCH] 云发单 后台管理
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 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 a754074..8e3e28d 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
@@ -660,7 +660,7 @@
if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) {
- getCloudInfo(goodsDetail); // 浜戝彂鍗曟枃妗堜俊鎭�
+ getCloudInfo(goodsDetail, extraVO); // 浜戝彂鍗曟枃妗堜俊鎭�
}
JSONObject object = new JSONObject();
@@ -882,7 +882,7 @@
extraVO.setShare(shareInfoVO);
if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) {
- getCloudInfo(goodsDetail); // 浜戝彂鍗曟枃妗堜俊鎭�
+ getCloudInfo(goodsDetail, extraVO); // 浜戝彂鍗曟枃妗堜俊鎭�
}
JSONObject object = new JSONObject();
@@ -1071,7 +1071,7 @@
}
if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) {
- getCloudInfo(goodsDetail); // 浜戝彂鍗曟枃妗堜俊鎭�
+ getCloudInfo(goodsDetail, extraVO); // 浜戝彂鍗曟枃妗堜俊鎭�
}
JSONObject object = new JSONObject();
@@ -1210,7 +1210,7 @@
extraVO.setShare(shareInfoVO);
// 浜戝彂鍗曟枃妗堜俊鎭�
- getCloudInfo(goodsDetail);
+ getCloudInfo(goodsDetail, extraVO);
JSONObject object = new JSONObject();
object.put("extra", JsonUtil.getApiCommonGson().toJson(extraVO));
@@ -1344,7 +1344,7 @@
extraVO.setShare(shareInfoVO);
// 浜戝彂鍗曟枃妗堜俊鎭�
- getCloudInfo(goodsDetail);
+ getCloudInfo(goodsDetail, extraVO);
JSONObject object = new JSONObject();
object.put("extra", JsonUtil.getApiCommonGson().toJson(extraVO));
@@ -1373,7 +1373,7 @@
* // 浜戝彂鍗曟枃妗堜俊鎭�
* @param goodsDetail
*/
- private void getCloudInfo(GoodsDetailVO goodsDetail) {
+ private void getCloudInfo(GoodsDetailVO goodsDetail, GoodsDetailExtraVO extraVO) {
if (!goodsDetail.isHasCoupon()) {
return;
}
@@ -1397,12 +1397,8 @@
}
if (!StringUtil.isNullOrEmpty(cloudText) && !StringUtil.isNullOrEmpty(cloudPic)) {
- OtherInfo otherInfo = goodsDetail.getOtherInfo();
- if (otherInfo == null)
- otherInfo = new OtherInfo();
- otherInfo.setCloudPic(cloudPic);
- otherInfo.setCloudText(cloudText);
- goodsDetail.setOtherInfo(otherInfo);
+ extraVO.setCloudPic(cloudPic);
+ extraVO.setCloudText(cloudText);
}
}
}
--
Gitblit v1.8.0