From 88d0062538fa813f383372fb8ea05219d3947b12 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 28 Aug 2023 11:33:57 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/dapp/controller/ViewAdminMallGoodsController.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 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 2191422..378c9bf 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ViewAdminMallGoodsController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ViewAdminMallGoodsController.java
@@ -10,6 +10,7 @@
import cc.mrbird.febs.dapp.service.IAdminMallGoodsService;
import cc.mrbird.febs.dapp.service.IMallNewsInfoService;
import cc.mrbird.febs.dapp.vo.AdminMallGoodsCategoryVo;
+import cc.mrbird.febs.dapp.vo.AdminMallOrderVo;
import cn.hutool.core.util.ObjectUtil;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -117,6 +118,22 @@
return FebsUtil.view("goods/orderMoneyFlow");
}
+ /**
+ * 订单-发货
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("deliverGoods/{id}")
+ @RequiresPermissions("orderMoneyFlow:update")
+// @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("goods/deliverGoods");
+ }
+
@GetMapping("profitSetting")
@RequiresPermissions("profitSetting:view")
public String profitSetting() {
@@ -211,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