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/service/impl/dynamic/GoodsEvaluateServiceImpl.java |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java
index 9d61096..6e6efe9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java
@@ -32,7 +32,7 @@
 import org.yeshi.utils.tencentcloud.COSManager;
 
 import com.yeshi.fanli.dao.dynamic.GoodsEvaluateDao;
-import com.yeshi.fanli.dto.ConfigParamsDTO;
+import com.yeshi.fanli.dto.GoodsMoneyConfigParamsDTO;
 import com.yeshi.fanli.dto.jd.JDCouponInfo;
 import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
 import com.yeshi.fanli.dto.suning.SuningGoodsInfo;
@@ -426,7 +426,7 @@
         GoodsDetailVO goodsDetailVO = null;
         JDGoods jdGoods = null;
         PDDGoodsDetail pddGoods = null;
-        ConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+        GoodsMoneyConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
         params.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
         if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
             try {
@@ -652,7 +652,7 @@
 
     public GoodsDetailVO getGoodsDetailVO(Long goodsId, Integer goodsType, SystemEnum system) throws GoodsEvaluateException {
         GoodsDetailVO goodsDetail = null;
-        ConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+        GoodsMoneyConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
         params.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
         if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
             try {
@@ -1828,7 +1828,7 @@
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
             for (GoodsEvaluate goodsEvaluate : list) {
-                ConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", goodsEvaluate.getSystem());
+                GoodsMoneyConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", goodsEvaluate.getSystem());
                 params.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(goodsEvaluate.getSystem()));
                 // 鏄惁2涓皬鏃朵箣鍐呭凡鏇存柊
                 Date updateTime = goodsEvaluate.getUpdateTime();
@@ -1921,7 +1921,7 @@
         }
     }
 
-    private GoodsDetailVO getGoodsNewInfo(String goodsId, int goodsType, ConfigParamsDTO paramsDTO) {
+    private GoodsDetailVO getGoodsNewInfo(String goodsId, int goodsType, GoodsMoneyConfigParamsDTO paramsDTO) {
         GoodsDetailVO vo = null;
         if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
             TaoBaoGoodsBrief goods;
@@ -1982,7 +1982,7 @@
         imgs.addAll(goodsBrief.getImgList());
 
         // 鍟嗗搧VO
-        ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+        GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
         paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
         GoodsDetailVO goodsVO = GoodsDetailVOFactory.convertTaoBao(goodsBrief, paramsDTO);
 
@@ -2107,7 +2107,7 @@
         }
 
         // 鍟嗗搧VO
-        ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+        GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
         paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
         GoodsDetailVO goodsVO = GoodsDetailVOFactory.convertTaoBao(goodsBrief, paramsDTO);
 
@@ -2294,7 +2294,7 @@
                 return false;
             }
 
-            ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+            GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
             paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
             GoodsDetailVO goodsVO = GoodsDetailVOFactory.convertTaoBao(goodsBrief, paramsDTO);
 
@@ -2524,7 +2524,7 @@
                 if (queryExist == null || queryExist.size() == 0) {
                     continue;
                 }
-                ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+                GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
                 paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
                 GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);
                 updateGoods(queryExist, goodsNew);
@@ -2546,7 +2546,7 @@
                 continue;
             }
 
-            ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+            GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
             paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
             GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertJDGoods(jdGoods, paramsDTO);
 
@@ -2565,7 +2565,7 @@
                 continue;
             }
 
-            ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+            GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
             paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
             GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertPDDGoods(pddGoods, paramsDTO);
             updateGoods(queryExist, goodsNew);
@@ -2584,7 +2584,7 @@
                 continue;
             }
 
-            ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+            GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
             paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
             GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertVIPGoods(goods, paramsDTO);
             updateGoods(queryExist, goodsNew);
@@ -2602,7 +2602,7 @@
             if (queryExist == null || queryExist.size() == 0) {
                 continue;
             }
-            ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+            GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
             paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
             GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertSuningGoods(goods, paramsDTO);
             updateGoods(queryExist, goodsNew);

--
Gitblit v1.8.0