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/hongbao/HongBaoServiceImpl.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java
index bf51162..d191a72 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java
@@ -10,7 +10,6 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import org.apache.ibatis.annotations.Param;
import org.hibernate.HibernateException;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
@@ -59,7 +58,6 @@
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.order.OrderItemServcie;
import com.yeshi.fanli.service.inter.order.OrderService;
-import com.yeshi.fanli.service.inter.push.PushService;
import com.yeshi.fanli.service.inter.user.AccountDetailsService;
import com.yeshi.fanli.service.inter.user.AccountMessageService;
import com.yeshi.fanli.service.inter.user.MoneyRecordService;
@@ -870,8 +868,8 @@
@Transactional
public void updateHongBao(HongBao hongBao, TaoBaoOrder taoBaoOrder) {
- BigDecimal rate = new BigDecimal(hongBaoManageMapper.selectByKey("hongbao_goods_proportion").getValue())
- .divide(new BigDecimal(100));
+ BigDecimal proportion = hongBaoManageService.getFanLiRate();
+ BigDecimal rate = proportion.divide(new BigDecimal(100));
// 鏇存柊绾㈠寘椤�
HongBao updateHongBao = new HongBao();
updateHongBao.setId(hongBao.getId());
@@ -981,8 +979,8 @@
public void addHongBao(Order order, TaoBaoOrder taoBaoOrder, Long orderItemId) {
OrderItem orderItem = orderItemMapper.selectByPrimaryKey(orderItemId);
// 璁㈠崟杩斿埄姣斾緥
- BigDecimal baseRate = new BigDecimal(hongBaoManageMapper.selectByKey("hongbao_goods_proportion").getValue())
- .divide(new BigDecimal(100));
+ BigDecimal proportion = hongBaoManageService.getFanLiRate();
+ BigDecimal baseRate = proportion.divide(new BigDecimal(100));
// 鍒涘缓绾㈠寘
JSONObject data = new JSONObject();
--
Gitblit v1.8.0