From 84dd8c1579ea198aff6ca8afac05a5e8f6af9faf Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 21 五月 2021 10:46:22 +0800
Subject: [PATCH] 淘礼金功能完善
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 24a44e0..95be3ef 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
@@ -14,7 +14,7 @@
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.common.CommonContentNav;
import com.yeshi.fanli.dto.common.CommonContentResult;
import com.yeshi.fanli.dto.common.CommonContentTypeEnum;
@@ -165,14 +165,14 @@
if (result != null)
goodsList = result.getGoodsList();
- ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
+ GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
acceptData.getVersion(),acceptData.getSystem());
for (TaoBaoGoodsBrief taoBaoGoodsBrief : goodsList) {
GoodsDetailVO vo = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, paramsDTO);
if (type == CommonContentTypeEnum.mianDan)// 鍏嶅崟鍟嗗搧
{
- vo.getMoneyInfo().setFanliMoney("楼" + TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief));
- vo.getMoneyInfo().setShareMoney("楼" + TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief));
+ vo.getMoneyInfo().setFanliMoney("楼" + TaoBaoUtil.getCouponPrice(taoBaoGoodsBrief));
+ vo.getMoneyInfo().setShareMoney("楼" + TaoBaoUtil.getCouponPrice(taoBaoGoodsBrief));
vo.getMoneyInfo().setMaxMoney(null);
}
array.add(gson.toJson(vo));
@@ -214,7 +214,7 @@
if (goodsList != null && goodsList.size() > 0) {
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
- ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
+ GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
acceptData.getVersion(),acceptData.getSystem());
for (JDGoods goods : goodsList) {
@@ -265,7 +265,7 @@
if (goodsList != null && goodsList.size() > 0) {
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
- ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
+ GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
acceptData.getVersion(),acceptData.getSystem());
for (PDDGoodsDetail goods : goodsList) {
--
Gitblit v1.8.0