From c9cbad5f5d18c6b2ac5a063e41007933d7028329 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 07 七月 2020 15:24:17 +0800
Subject: [PATCH] 返利配置文件加入系统区分

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java |   64 ++++++++++++++++---------------
 1 files changed, 33 insertions(+), 31 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 b891c76..4415aa6 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
@@ -9,6 +9,7 @@
 
 import javax.annotation.Resource;
 
+import com.yeshi.fanli.entity.SystemEnum;
 import org.json.simple.JSONArray;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -226,7 +227,7 @@
     @Resource
     private HongBaoManageService hongBaoManageService;
 
-    private ConfigParamsDTO getParamsDTO(String platform, String version, Long uid) {
+    private ConfigParamsDTO getParamsDTO(String platform, String version, Long uid, SystemEnum system) {
         UserLevelEnum level = UserLevelEnum.daRen;
         if (uid != null && uid > 0) {
             level = userLevelManager.getUserLevel(uid);
@@ -237,7 +238,8 @@
         }
         if (level == null)
             level = UserLevelEnum.daRen;
-        return orderHongBaoMoneyComputeService.getShowComputeRate(platform, version, level);
+
+        return orderHongBaoMoneyComputeService.getShowComputeRate(platform, version, level,system);
     }
 
     private TaoBaoGoodsBrief filterDaTaoKeGoodsInfo(TaoBaoGoodsBrief goods) {
@@ -289,7 +291,7 @@
         }
 
         BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
-                acceptData.getPackages());
+                acceptData.getPackages(),acceptData.getSystem());
         if (system == null) {
             out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
             return;
@@ -447,14 +449,14 @@
             LogHelper.errorDetailInfo(e);
         }
 
-        ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid);
-        paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
+        ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid,acceptData.getSystem());
+        paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(acceptData.getSystem()));
 
         GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);
         if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {
             goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());
             goodsDetail.getMoneyInfo().setShareMoney("楼" + TaoBaoUtil.getGoodsHongBaoMoney(goods,
-                    hongBaoManageService.getShareRate(UserLevelEnum.superVIP), true));
+                    hongBaoManageService.getShareRate(UserLevelEnum.superVIP,acceptData.getSystem()), true));
             goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());
             goodsDetail.getMoneyInfo().setCompositionInfo(goodsDetail.getMoneyInfo().getMaxCompositionInfo());
         }
@@ -696,7 +698,7 @@
         // uid=2255993L;
         // 绯荤粺楠岃瘉
         BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
-                acceptData.getPackages());
+                acceptData.getPackages(),acceptData.getSystem());
         if (system == null) {
             out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
             return;
@@ -722,13 +724,13 @@
         // 淇濆瓨缂撳瓨
         jdGoodsCacheUtil.saveGoodsInfo(jdGoods);
 
-        ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid);
-        paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
+        ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid,acceptData.getSystem());
+        paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(acceptData.getSystem()));
         GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertJDGoods(jdGoods, paramsDTO);
         if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {
             goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());
             goodsDetail.getMoneyInfo().setShareMoney("楼"
-                    + JDUtil.getGoodsFanLiMoney(jdGoods, hongBaoManageService.getShareRate(UserLevelEnum.superVIP)));
+                    + JDUtil.getGoodsFanLiMoney(jdGoods, hongBaoManageService.getShareRate(UserLevelEnum.superVIP,acceptData.getSystem())));
             goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());
             goodsDetail.getMoneyInfo().setCompositionInfo(goodsDetail.getMoneyInfo().getMaxCompositionInfo());
         }
@@ -752,12 +754,12 @@
                     jdGoods.setCommissionPlus(threeClass.getSelfComm());
                     // plus杩斿埄
                     BigDecimal fanliMoneyPlus = JDUtil.getGoodsFanLiMoneyPlus(jdGoods,
-                            hongBaoManageService.getFanLiRate());
+                            hongBaoManageService.getFanLiRate(acceptData.getSystem()));
                     otherInfo.setFanliMoneyPlus("浜笢plus杩斅�" + fanliMoneyPlus);
                     // 浣跨敤濂栧姳鍒告渶楂樿繑
                     if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
                         maxMoneyPlus = "锛堜含涓減lus杩斅�" + JDUtil.getGoodsFanLiMoneyPlus(jdGoods,
-                                hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP)) + "锛�";
+                                hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP,acceptData.getSystem())) + "锛�";
                     } else
                         maxMoneyPlus = "锛堜含涓減lus鏈�楂樿繑楼"
                                 + fanliMoneyPlus.add(MoneyBigDecimalUtil.mul(fanliMoneyPlus, Constant.MAX_REWARD_RATE))
@@ -924,7 +926,7 @@
     public void getDetialPDD(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) {
         // 绯荤粺楠岃瘉
         BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
-                acceptData.getPackages());
+                acceptData.getPackages(),acceptData.getSystem());
         if (system == null) {
             out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
             return;
@@ -936,14 +938,14 @@
             return;
         }
 
-        ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid);
-        paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
+        ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid,acceptData.getSystem());
+        paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(acceptData.getSystem()));
 
         GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertPDDGoods(pddGoods, paramsDTO);
         if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {
             goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());
             goodsDetail.getMoneyInfo().setShareMoney("楼" + PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods,
-                    hongBaoManageService.getShareRate(UserLevelEnum.superVIP)));
+                    hongBaoManageService.getShareRate(UserLevelEnum.superVIP,acceptData.getSystem())));
             goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());
             goodsDetail.getMoneyInfo().setCompositionInfo(goodsDetail.getMoneyInfo().getMaxCompositionInfo());
         }
@@ -1122,7 +1124,7 @@
     public void getDetialVIP(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) {
         // 绯荤粺楠岃瘉
         BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
-                acceptData.getPackages());
+                acceptData.getPackages(),acceptData.getSystem());
         if (system == null) {
             out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
             return;
@@ -1134,14 +1136,14 @@
             return;
         }
 
-        ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid);
-        paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
+        ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid,acceptData.getSystem());
+        paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(acceptData.getSystem()));
 
         GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertVIPGoods(vipGoodsInfo, paramsDTO);
         if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {
             goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());
             goodsDetail.getMoneyInfo().setShareMoney("楼" + VipShopUtil.getGoodsFanLiMoney(vipGoodsInfo,
-                    hongBaoManageService.getShareRate(UserLevelEnum.superVIP)));
+                    hongBaoManageService.getShareRate(UserLevelEnum.superVIP,acceptData.getSystem())));
             goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());
             goodsDetail.getMoneyInfo().setCompositionInfo(goodsDetail.getMoneyInfo().getMaxCompositionInfo());
         }
@@ -1251,7 +1253,7 @@
     public void getDetialSuning(AcceptData acceptData, String id, Long uid, String from, PrintWriter out) {
         // 绯荤粺楠岃瘉
         BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
-                acceptData.getPackages());
+                acceptData.getPackages(),acceptData.getSystem());
         if (system == null) {
             out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
             return;
@@ -1266,14 +1268,14 @@
             return;
         }
 
-        ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid);
-        paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
+        ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid,acceptData.getSystem());
+        paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(acceptData.getSystem()));
 
         GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertSuningGoods(suningGoodsInfo, paramsDTO);
         if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {
             goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());
             goodsDetail.getMoneyInfo().setShareMoney("楼" + SuningUtil.getGoodsFanLiMoney(suningGoodsInfo,
-                    hongBaoManageService.getShareRate(UserLevelEnum.superVIP)));
+                    hongBaoManageService.getShareRate(UserLevelEnum.superVIP,acceptData.getSystem())));
             goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());
             goodsDetail.getMoneyInfo().setCompositionInfo(goodsDetail.getMoneyInfo().getMaxCompositionInfo());
         }
@@ -1464,7 +1466,7 @@
                     list = list.subList(0, 10);
                 }
 
-                ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), null);
+                ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), null,acceptData.getSystem());
                 List<GoodsDetailVO> listDetailVO = new ArrayList<GoodsDetailVO>();
 
                 for (JDGoods goods : list) {
@@ -1506,7 +1508,7 @@
                             }
 
                             ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(),
-                                    null);
+                                    null,acceptData.getSystem());
                             for (PDDGoodsDetail goods : goodsList) {
                                 listDetailVO.add(GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO));
                             }
@@ -1552,7 +1554,7 @@
                 if (resultList != null) {
                     if (resultList != null && resultList.size() > 0) {
                         ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
-                                acceptData.getVersion());
+                                acceptData.getVersion(),acceptData.getSystem());
 
                         for (SuningGoodsInfo goods : resultList) {
                             GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertSuningGoods(goods, paramsDTO);
@@ -1575,7 +1577,7 @@
             }
 
             List<GoodsDetailVO> listExtra = new ArrayList<GoodsDetailVO>();
-            ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), null);
+            ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), null,acceptData.getSystem());
             goodsList.parallelStream().forEach(goods -> {
                 if (goods != null) {
                     listExtra.add(GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO));
@@ -1940,9 +1942,9 @@
 
         Map<String, GoodsDetailVO> tempGoodsList = new HashMap<>();
 
-        ConfigParamsDTO params = new ConfigParamsDTO(hongBaoManageService.getFanLiRate(),
-                hongBaoManageService.getShareRate(), new BigDecimal(80),
-                hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP));
+        ConfigParamsDTO params = new ConfigParamsDTO(hongBaoManageService.getFanLiRate(acceptData.getSystem()),
+                hongBaoManageService.getShareRate(acceptData.getSystem()), new BigDecimal(80),
+                hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP,acceptData.getSystem()));
 
         if (tbGoodsList.size() > 0) {
             List<TaoBaoGoodsBrief> goodsList = null;

--
Gitblit v1.8.0