From 83c56b01c49a766ebb480d5701c3638ce58f14c2 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 22 Dec 2023 15:07:53 +0800
Subject: [PATCH] 富文本框输入版本变化
---
src/main/resources/templates/febs/views/modules/goods/xcxSetting.html | 0
src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java | 34 -----------------
src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java | 35 +++++++++++++++++
3 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java
index a406e27..489c406 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java
@@ -6,6 +6,7 @@
import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.mall.dto.ScoreSettingDto;
+import cc.mrbird.febs.mall.dto.XcxSettingDto;
import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.entity.MallGoods;
import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
@@ -45,6 +46,40 @@
return FebsUtil.view("modules/goods/goodsList");
}
+
+ @GetMapping("xcxSetting")
+ @RequiresPermissions("xcxSetting:view")
+ public String xcxSetting(Model model) {
+ String appId = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.XCX_APP_ID.getType(),
+ DataDictionaryEnum.XCX_APP_ID.getCode()
+ ).getValue();
+ String mchId = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.XCX_MCH_ID.getType(),
+ DataDictionaryEnum.XCX_MCH_ID.getCode()
+ ).getValue();
+ String mchKey = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.XCX_MCH_KEY.getType(),
+ DataDictionaryEnum.XCX_MCH_KEY.getCode()
+ ).getValue();
+ String keyPath = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.XCX_MCH_KEY_PATH_P12.getType(),
+ DataDictionaryEnum.XCX_MCH_KEY_PATH_P12.getCode()
+ ).getValue();
+ String notifyUrl = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.XCX_NOTICE_URL.getType(),
+ DataDictionaryEnum.XCX_NOTICE_URL.getCode()
+ ).getValue();
+ XcxSettingDto xcxSettingDto = new XcxSettingDto();
+ xcxSettingDto.setAppId(appId);
+ xcxSettingDto.setMchId(mchId);
+ xcxSettingDto.setMchKey(mchKey);
+ xcxSettingDto.setKeyPath(keyPath);
+ xcxSettingDto.setNotifyUrl(notifyUrl);
+ model.addAttribute("xcxSetting", xcxSettingDto);
+ return FebsUtil.view("modules/goods/xcxSetting");
+ }
+
/**
* app商品列表
* @return
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
index bd53a6b..a4ae801 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
@@ -38,38 +38,4 @@
}
return FebsUtil.view("modules/system/cashOutSetting");
}
-
-
- @GetMapping("xcxSetting")
- @RequiresPermissions("xcxSetting:update")
- public String xcxSetting(Model model) {
- String appId = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
- DataDictionaryEnum.XCX_APP_ID.getType(),
- DataDictionaryEnum.XCX_APP_ID.getCode()
- ).getValue();
- String mchId = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
- DataDictionaryEnum.XCX_MCH_ID.getType(),
- DataDictionaryEnum.XCX_MCH_ID.getCode()
- ).getValue();
- String mchKey = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
- DataDictionaryEnum.XCX_MCH_KEY.getType(),
- DataDictionaryEnum.XCX_MCH_KEY.getCode()
- ).getValue();
- String keyPath = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
- DataDictionaryEnum.XCX_MCH_KEY_PATH_P12.getType(),
- DataDictionaryEnum.XCX_MCH_KEY_PATH_P12.getCode()
- ).getValue();
- String notifyUrl = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
- DataDictionaryEnum.XCX_NOTICE_URL.getType(),
- DataDictionaryEnum.XCX_NOTICE_URL.getCode()
- ).getValue();
- XcxSettingDto xcxSettingDto = new XcxSettingDto();
- xcxSettingDto.setAppId(appId);
- xcxSettingDto.setMchId(mchId);
- xcxSettingDto.setMchKey(mchKey);
- xcxSettingDto.setKeyPath(keyPath);
- xcxSettingDto.setNotifyUrl(notifyUrl);
- model.addAttribute("xcxSetting", xcxSettingDto);
- return FebsUtil.view("modules/system/xcxSetting");
- }
}
diff --git a/src/main/resources/templates/febs/views/modules/system/xcxSetting.html b/src/main/resources/templates/febs/views/modules/goods/xcxSetting.html
similarity index 100%
rename from src/main/resources/templates/febs/views/modules/system/xcxSetting.html
rename to src/main/resources/templates/febs/views/modules/goods/xcxSetting.html
--
Gitblit v1.9.1