From a1be6075c6b1365a7abc66bf559d6058039248ab Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 19 五月 2021 18:13:29 +0800 Subject: [PATCH] 淘礼金兼容 --- fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/ConsumerController.java | 6 +++--- 1 files changed, 3 insertions(+), 3 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..62bfcd0 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; @@ -233,7 +233,7 @@ } } - ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(), + GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion(),acceptData.getSystem()); @@ -349,7 +349,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