From d4c19062530c46203b0950b20e66afdeefcdf3a6 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期一, 10 十二月 2018 14:13:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java
index 3fd8bf6..a7b4937 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java
@@ -30,6 +30,7 @@
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
+import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.user.TBPidService;
import com.yeshi.fanli.service.inter.user.UserAccountService;
@@ -77,6 +78,9 @@
@Resource
private UserAccountService userAccountService;
+
+ @Resource
+ private HongBaoManageService hongBaoManageService;
@Override
public void addShareGoodsHistory(UserShareGoodsHistory history) {
@@ -136,7 +140,8 @@
if (StringUtil.isNullOrEmpty(goods.getCouponLink()) && StringUtil.isNullOrEmpty(goods.getAuctionUrl())) {
throw new ShareGoodsException(10, "杞摼澶辫触");
}
- BigDecimal rate = new BigDecimal(hongBaoManageMapper.selectByKey("hongbao_goods_proportion").getValue());
+
+ BigDecimal rate = hongBaoManageService.getShareRate();
// 鍒涘缓娣樺彛浠�
TaoBaoLink tbLink = new TaoBaoLink(); // TaoBaoUtil.getTbLinkForShare(goods.getAuctionId(),
--
Gitblit v1.8.0