From 59aced4fe04f7e2fdcca81cb9ef279a70522301e Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 25 十二月 2019 12:30:44 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/config/HongBaoManageServiceImpl.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/config/HongBaoManageServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/config/HongBaoManageServiceImpl.java
index 86ab526..96ff416 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/config/HongBaoManageServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/config/HongBaoManageServiceImpl.java
@@ -12,12 +12,15 @@
import org.springframework.transaction.annotation.Transactional;
import com.yeshi.fanli.dao.mybatis.HongBaoManageMapper;
+import com.yeshi.fanli.dto.ConfigParamsDTO;
import com.yeshi.fanli.dto.order.OrderHongBaoRateParams;
import com.yeshi.fanli.entity.bus.user.HongBaoManage;
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.exception.order.HongBaoException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
+import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.VersionUtil;
@Service
public class HongBaoManageServiceImpl implements HongBaoManageService {
@@ -342,4 +345,17 @@
throw new HongBaoException(2, "鏈尮閰嶅埌姣斾緥鍙傛暟");
}
+ @Override
+ public ConfigParamsDTO getShowComputeRate(String platform, String version) {
+
+ BigDecimal fanLiRate = getFanLiRate();
+ BigDecimal shareRate = getShareRate();
+ ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,
+ getVIPFanLiRate());
+ if (VersionUtil.greaterThan_2_1(platform, version)) {
+ paramsDTO.setMaxRewardRate(null);
+ }
+ return paramsDTO;
+ }
+
}
--
Gitblit v1.8.0