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/TaoBaoGoodsBriefServiceImpl.java | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/TaoBaoGoodsBriefServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/TaoBaoGoodsBriefServiceImpl.java
index be3d202..37b740e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/TaoBaoGoodsBriefServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/TaoBaoGoodsBriefServiceImpl.java
@@ -299,36 +299,32 @@
@Override
public String getGoodsUserHongBao(TaoBaoGoodsBrief goods) {
- Map<String, String> convertMap = hongBaoManageService.convertMap();
- String proportion = convertMap.get("hongbao_goods_proportion");
- return TaoBaoUtil.getGoodsHongBaoInfo(goods, new BigDecimal(proportion));
+ BigDecimal rate = hongBaoManageService.getFanLiRate();
+ return TaoBaoUtil.getGoodsHongBaoInfo(goods, rate);
}
@Override
public BigDecimal getShareGoodsUserHongBao(TaoBaoGoodsBrief goods) {
- Map<String, String> convertMap = hongBaoManageService.convertMap();
- String proportion = convertMap.get("hongbao_goods_proportion");
- return TaoBaoUtil.getShareGoodsHongBaoInfo(goods, new BigDecimal(proportion));
+ BigDecimal rate = hongBaoManageService.getShareRate();
+ return TaoBaoUtil.getShareGoodsHongBaoInfo(goods, rate);
}
@Override
public List<TaoBaoGoodsBrief> queryByAuctionId(Long auctionId) {
return taoBaoGoodsBriefMapper.queryByAuctionId(auctionId);
}
-
+
@Override
public List<TaoBaoGoodsBrief> listQueryByAuctionId(List<Long> list) {
return taoBaoGoodsBriefMapper.queryGoodsByAuctionId(list);
}
-
-
@Override
public int insertSelective(TaoBaoGoodsBrief taoBaoGoodsBrief) {
return taoBaoGoodsBriefMapper.insertSelective(taoBaoGoodsBrief);
}
-
+
@Override
public int insertBatch(List<TaoBaoGoodsBrief> list) {
@@ -344,8 +340,7 @@
public int updateByPrimaryKey(TaoBaoGoodsBrief taoBaoGoodsBrief) {
return taoBaoGoodsBriefMapper.updateByPrimaryKey(taoBaoGoodsBrief);
}
-
-
+
@Override
public void updateTBGoodsWithNewInfo(TaoBaoGoodsBrief tb) throws NotExistObjectException {
if (tb == null)
@@ -478,7 +473,7 @@
if (goodsBrief.getZkPrice() == null)
goodsBrief.setZkPrice(defaultZero);
-
+
}
@Override
@@ -515,10 +510,9 @@
return taoBaoGoodsBrief;
}
-
@Override
public void updateBatchSelective(List<TaoBaoGoodsBrief> list) {
- taoBaoGoodsBriefMapper.updateBatchSelective(list);
+ taoBaoGoodsBriefMapper.updateBatchSelective(list);
}
-
+
}
--
Gitblit v1.8.0