From 91ddd96c12ec25aaf6d0cb38d54288d863ab2b58 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 10 七月 2021 18:10:38 +0800
Subject: [PATCH] 礼金红包兼容
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java
index 6895aac..b0da38a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java
@@ -6,7 +6,10 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.lijin.manager.GoodsLijinMnager;
+import com.yeshi.fanli.util.CommonGoodsUtil;
+import com.yeshi.fanli.util.factory.CommonGoodsFactory;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -166,21 +169,21 @@
JSONArray array = new JSONArray();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
- List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
+ List<CommonGoods> goodsList = new ArrayList<>();
if (result != null)
goodsList = result.getGoodsList();
GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
acceptData.getVersion(), acceptData.getSystem());
- List<GoodsDetailVO> goodsDetailVOList = goodsLijinMnager.loadTBMoneyInfo(acceptData.getSystem(), uid, goodsList, paramsDTO);
+ List<GoodsDetailVO> goodsDetailVOList = goodsLijinMnager.loadCommonGoodsMoneyInfo(acceptData.getSystem(), uid, goodsList, paramsDTO);
int p = 0;
for (GoodsDetailVO vo : goodsDetailVOList) {
vo.setCreatetime(null);
if (type == CommonContentTypeEnum.mianDan)// 鍏嶅崟鍟嗗搧
{
- vo.getMoneyInfo().setFanliMoney("楼" + TaoBaoUtil.getCouponPrice(goodsList.get(p)));
- vo.getMoneyInfo().setShareMoney("楼" + TaoBaoUtil.getCouponPrice(goodsList.get(p)));
+ vo.getMoneyInfo().setFanliMoney("楼" + CommonGoodsUtil.getAfterUseCouplePrice(goodsList.get(p)));
+ vo.getMoneyInfo().setShareMoney("楼" + CommonGoodsUtil.getAfterUseCouplePrice(goodsList.get(p)));
vo.getMoneyInfo().setMaxMoney(null);
}
array.add(gson.toJson(vo));
@@ -305,7 +308,7 @@
&& searchResult.getTaoBaoGoodsBriefs().size() > 0) {
CommonContentResult result = new CommonContentResult();
result.setCount(searchResult.getPageEntity().getTotalCount());
- result.setGoodsList(searchResult.getTaoBaoGoodsBriefs());
+ result.setGoodsList(CommonGoodsFactory.createTaoBaoList(searchResult.getTaoBaoGoodsBriefs()));
return result;
}
return null;
--
Gitblit v1.8.0