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("请输入合适的百分比小数"); } 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"); 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()); 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; }
