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/service/impl/dynamic/DynamicInfoServiceImpl.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
index 1b795c0..ba2fca8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
@@ -13,6 +13,7 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.entity.SystemEnum;
import org.apache.commons.beanutils.PropertyUtils;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.core.task.TaskExecutor;
@@ -106,9 +107,6 @@
@Resource
private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
- @Resource
- private GoodsEvaluateService goodsEvaluateService;
-
@Override
public void insert(DynamicInfo record) {
dynamicInfoDao.insert(record);
@@ -306,7 +304,7 @@
// 鍟嗗搧淇℃伅
List<GoodsPicture> listPicture = new ArrayList<GoodsPicture>();
for (TaoBaoGoodsBrief goodsBrief : listGoods) {
- BigDecimal proportion = hongBaoManageService.getFanLiRate();
+ BigDecimal proportion = hongBaoManageService.getFanLiRate(SystemEnum.blks);
TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief,
proportion.toString(), null);
taoBaoGoodsBriefExtra.setCouponInfo(null);
@@ -362,7 +360,7 @@
// 鍒嗕韩濂栭噾
BigDecimal shareMoney = new BigDecimal(0);
- BigDecimal proportion = hongBaoManageService.getFanLiRate();
+ BigDecimal proportion = hongBaoManageService.getFanLiRate(SystemEnum.blks);
for (DaTaoKeDetailV2 daTaoKe : listDaTaoKe) {
if (daTaoKeDetail == null) {
daTaoKeDetail = daTaoKe;
@@ -377,7 +375,7 @@
taoBaoGoodsBriefExtra.setState(1);
}
- BigDecimal money = taoBaoGoodsBriefService.getShareGoodsUserHongBao(taoBaoGoodsBrief);
+ BigDecimal money = taoBaoGoodsBriefService.getShareGoodsUserHongBao(taoBaoGoodsBrief,SystemEnum.blks);
shareMoney = MoneyBigDecimalUtil.add(shareMoney, money);
// 鍟嗗搧鍥剧墖
taoBaoGoodsBriefExtra.setUpdatetime(new Date());
@@ -495,7 +493,7 @@
}
TaoBaoGoodsBrief taoBaoGoodsBrief = TaoBaoUtil.convert(daTaoKe);
- BigDecimal proportion = hongBaoManageService.getFanLiRate();
+ BigDecimal proportion = hongBaoManageService.getFanLiRate(SystemEnum.blks);
TaoBaoGoodsBriefExtra goodsExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(),
null);
@@ -543,7 +541,7 @@
goodsExtra.setImgList(imgList);
// 鍒嗕韩濂栭噾
- BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(taoBaoGoodsBrief);
+ BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(taoBaoGoodsBrief,SystemEnum.blks);
ClientTextStyleVO shareMoneyDesc = new ClientTextStyleVO();
shareMoneyDesc.setColor("#FFFFFF");
shareMoneyDesc.setBottomColor("#E8AE48");
@@ -813,7 +811,7 @@
List<TaoBaoGoodsBrief> listGoods = new ArrayList<TaoBaoGoodsBrief>();
// 鍟嗗搧鍒楄〃
List<GoodsPicture> listPicture = new ArrayList<GoodsPicture>();
- BigDecimal proportion = hongBaoManageService.getFanLiRate();
+ BigDecimal proportion = hongBaoManageService.getFanLiRate(SystemEnum.blks);
// 鍒嗕韩濂栭噾
BigDecimal shareMoney = new BigDecimal(0);
@@ -832,7 +830,7 @@
taoBaoGoodsBriefExtra.setState(1);
}
- BigDecimal money = taoBaoGoodsBriefService.getShareGoodsUserHongBao(taoBaoGoodsBrief);
+ BigDecimal money = taoBaoGoodsBriefService.getShareGoodsUserHongBao(taoBaoGoodsBrief,SystemEnum.blks);
shareMoney = MoneyBigDecimalUtil.add(shareMoney, money);
} catch (TaobaoGoodsDownException e) {
taoBaoGoodsBrief = activityGoods.getTaoBaoGoodsBrief();
@@ -978,9 +976,9 @@
// 鎻愬彇鍟嗗搧
Map<Long, TaoBaoGoodsBrief> goodsMap = getFilterGoodsMap(list);
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
- ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP));
+ BigDecimal fanLiRate = hongBaoManageService.getFanLiRate(SystemEnum.blks);
+ BigDecimal shareRate = hongBaoManageService.getShareRate(SystemEnum.blks);
+ ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP,SystemEnum.blks));
for (DynamicInfo dynamicInfo : list) {
DynamicInfo dynamicNew = new DynamicInfo();
@@ -1083,7 +1081,7 @@
}
try {
- BigDecimal proportion = hongBaoManageService.getFanLiRate();
+ BigDecimal proportion = hongBaoManageService.getFanLiRate(SystemEnum.blks);
for (DynamicInfo dynamicInfo : list) {
// 閭�璇锋暟鎹笉鍋氭洿鏂�
long classId = dynamicInfo.getClassId();
@@ -1170,7 +1168,7 @@
// 鏇存柊鐑攢鍗曞搧鐨勫垎浜閲�
if (classId == 1) {
- BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(goodsBrief);
+ BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(goodsBrief,SystemEnum.blks);
ClientTextStyleVO shareMoneyDesc = new ClientTextStyleVO();
shareMoneyDesc.setColor("#FFFFFF");
shareMoneyDesc.setBottomColor("#E8AE48");
--
Gitblit v1.8.0