admin
2019-06-27 69e16079864ca08dca53637f969ac1463a491110
Merge remote-tracking branch 'origin/master'
2个文件已修改
8 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
@@ -316,7 +316,6 @@
            
            TaoBaoGoodsBrief goods = taoBaoLink.getGoods();
            
            // 计算推广红包
            String warningRate = configTaoLiJinService.getValueByKey("warning_value");
            BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods);
@@ -328,7 +327,7 @@
            }
            
            JSONObject data = new JSONObject();
            data.put("spreadMoney", "淘礼金 ¥" + spreadMoney.toString());
            data.put("spreadMoney", " ¥" + spreadMoney.toString());
            
            String taoLiJinLink = null;
            Long tljId = null;
fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java
@@ -423,10 +423,9 @@
            // 计算分享奖金
            BigDecimal shareMoney = new BigDecimal(0);
            BigDecimal commission = userTaoLiJinRecordVO.getCommission();
            if (commission != null && commission.compareTo(shareMoney) > 1) {
            if (commission != null && commission.compareTo(shareMoney) > 0) {
                BigDecimal shareRate = hongBaoManageService.getShareRate();
                shareMoney = MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil.mul(commission, new BigDecimal("0.01")),
                        MoneyBigDecimalUtil.div(shareRate, new BigDecimal(100)));
                shareMoney = MoneyBigDecimalUtil.mul(commission, MoneyBigDecimalUtil.div(shareRate, new BigDecimal(100)));
                shareMoney = BigDecimalUtil.getWithNoZera(shareMoney);
            }