From 95c11133bd778a27672c77af85d420b90b8e65e8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 05 Sep 2022 15:41:10 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallTeamLeaderController.java | 2 +-
src/main/java/cc/mrbird/febs/mall/vo/AdminLeaderBonusSettingVo.java | 2 +-
src/main/java/cc/mrbird/febs/mall/controller/ViewMallTeamLeaderController.java | 2 +-
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallTeamLeaderController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallTeamLeaderController.java
index add177a..dce5a70 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallTeamLeaderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallTeamLeaderController.java
@@ -105,7 +105,7 @@
bonusSwitchDic.setValue(bonusSwitch.toString());
dataDictionaryCustomMapper.updateById(bonusSwitchDic);
- Double bonusPercent = adminLeaderBonusSettingVo.getBonusPercent();
+ Double bonusPercent = Double.parseDouble(adminLeaderBonusSettingVo.getBonusPercent());
if(1 <= bonusPercent || 0 >= bonusPercent){
return new FebsResponse().fail().message("请输入合适的百分比小数");
}
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallTeamLeaderController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallTeamLeaderController.java
index 18c4ba6..a8cd9e1 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallTeamLeaderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallTeamLeaderController.java
@@ -78,7 +78,7 @@
}
DataDictionaryCustom bonusPercent = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.BONUS_PERCENT.getType(), DataDictionaryEnum.BONUS_PERCENT.getCode());
if (ObjectUtil.isNotNull(bonusPercent)) {
- adminLeaderBonusSettingVo.setBonusPercent(Double.parseDouble(bonusSwitch.getValue()));
+ adminLeaderBonusSettingVo.setBonusPercent(bonusPercent.getValue());
}
model.addAttribute("leaderBonusSetting", adminLeaderBonusSettingVo);
return FebsUtil.view("modules/leader/leaderBonusSetting");
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index e9f6284..1a298c0 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -187,9 +187,9 @@
BigDecimal delivaryAmount = addOrderDto.getDeliveryAmount() == null ? BigDecimal.ZERO : addOrderDto.getDeliveryAmount();
if(BigDecimal.ZERO.compareTo(delivaryAmount) < 0 && 1 == addOrderDto.getIsHome()){
total = total.add(delivaryAmount);
+ orderInfo.setCarriage(delivaryAmount);
}
orderInfo.setAmount(total);
- orderInfo.setCarriage(carriage);
MallAddressInfo address = mallAddressInfoMapper.selectAddressInfoByMemberIdAndId(member.getId(), addOrderDto.getAddressId());
orderInfo.setName(address.getName());
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminLeaderBonusSettingVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminLeaderBonusSettingVo.java
index 576ea5b..bbcc787 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminLeaderBonusSettingVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminLeaderBonusSettingVo.java
@@ -9,5 +9,5 @@
//团长返利开关1：开启2：关闭
private Integer bonusSwitch;
//返利百分比
- private Double bonusPercent;
+ private String bonusPercent;
}
--
Gitblit v1.9.1