From dcc9e23af5cc800768dfa7802be5962862598a1d Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sat, 11 May 2024 14:39:23 +0800
Subject: [PATCH] 香港新环境
---
src/main/java/cc/mrbird/febs/dapp/controller/ViewAdminMallGoodsController.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ViewAdminMallGoodsController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ViewAdminMallGoodsController.java
index 918cdf7..378c9bf 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ViewAdminMallGoodsController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ViewAdminMallGoodsController.java
@@ -129,8 +129,9 @@
// @RequiresPermissions("deliverGoods:update")
public String deliverGoods(@PathVariable long id, Model model) {
AdminMallOrderVo data = mallGoodsService.getMallOrderInfoById(id);
+ data.setId(id);
model.addAttribute("deliverInfo", data);
- return FebsUtil.view("modules/order/deliverGoods");
+ return FebsUtil.view("goods/deliverGoods");
}
@GetMapping("profitSetting")
@@ -227,6 +228,20 @@
String withDrawFee = ObjectUtil.isEmpty(withDrawFeeDic.getValue()) ? "0" : withDrawFeeDic.getValue();
hlmBasicPerkDto.setWithDrawFee(withDrawFee);
}
+ DataDictionaryCustom minWithdrawDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.MIN_WITHDRAW_AMOUNT.getType(),
+ DataDictionaryEnum.MIN_WITHDRAW_AMOUNT.getCode());
+ if (withDrawFeeDic != null) {
+ String minWithdraw = ObjectUtil.isEmpty(minWithdrawDic.getValue()) ? "0" : minWithdrawDic.getValue();
+ hlmBasicPerkDto.setMinWithdraw(minWithdraw);
+ }
+ DataDictionaryCustom maxWithdrawDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.MAX_WITHDRAW_AMOUNT.getType(),
+ DataDictionaryEnum.MAX_WITHDRAW_AMOUNT.getCode());
+ if (maxWithdrawDic != null) {
+ String maxWithdraw = ObjectUtil.isEmpty(maxWithdrawDic.getValue()) ? "0" : maxWithdrawDic.getValue();
+ hlmBasicPerkDto.setMaxWithdraw(maxWithdraw);
+ }
model.addAttribute("hlmBasicPerk", hlmBasicPerkDto);
return FebsUtil.view("goods/basicPerkSetting");
}
--
Gitblit v1.9.1