From 5c8ff7985f1b9d6067b6a5c56cdfc366bbb113f8 Mon Sep 17 00:00:00 2001
From: Aug <17674666882@163.com>
Date: Mon, 29 Sep 2025 16:38:37 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=85=91=E6=8D=A2=E7=A0=81=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/assessmentCode/AssessmentCodeList.vue    |  9 ++++++---
 .../api/assessmentController/ConfigController.java     |  8 +++++---
 .../org/jeecg/modules/api/bean/AssessmentCode.java     | 18 ++++++++++++++++++
 .../org/jeecg/modules/api/service/ConfigService.java   |  1 +
 4 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/bean/AssessmentCode.java

diff --git a/admin-hanhai-vue/src/views/assessmentCode/AssessmentCodeList.vue b/admin-hanhai-vue/src/views/assessmentCode/AssessmentCodeList.vue
index 3650e76..b35f35d 100644
--- a/admin-hanhai-vue/src/views/assessmentCode/AssessmentCodeList.vue
+++ b/admin-hanhai-vue/src/views/assessmentCode/AssessmentCodeList.vue
@@ -12,9 +12,9 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> -->
-      <a-input-number v-model="formaaaa.num" placeholder="请输入数量" style="width: 100%" />
-      <a-input-number v-model="formaaaa.discountAmount" placeholder="请输入抵扣金额" style="width: 100%" />
-      <a-button @click="addCode" type="primary" icon="plus">生成兑换码</a-button>
+      生成数量&nbsp;&nbsp;<a-input-number v-model="formaaaa.num" placeholder="请输入数量" style="width: 4%" />&nbsp;&nbsp;&nbsp;&nbsp;
+      抵扣金额&nbsp;&nbsp;<a-input-number v-model="formaaaa.discountAmount" placeholder="请输入抵扣金额" style="width: 4%" />&nbsp;&nbsp;&nbsp;&nbsp;
+      <a-button @click="addCode" type="primary" >生成兑换码</a-button>
       <!-- <a-button type="primary" icon="download" @click="handleExportXls('兑换码信息表')">导出</a-button> -->
       <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
@@ -195,6 +195,9 @@
           "/assessment/config/generateCode",
           this.formaaaa
         ).then(res=>{
+          // 刷新页面
+          this.queryParam = {}
+          this.loadData(1);
         })
       },
       initDictConfig(){
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/assessmentController/ConfigController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/assessmentController/ConfigController.java
index 5a5f766..ae80f50 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/assessmentController/ConfigController.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/assessmentController/ConfigController.java
@@ -3,7 +3,9 @@ package org.jeecg.modules.api.assessmentController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.api.bean.AssessmentCode;
 import org.jeecg.modules.api.bean.PageBean;
 import org.jeecg.modules.api.service.ConfigService;
 import org.jeecg.modules.assessmentBanner.entity.AssessmentBanner;
@@ -48,9 +50,9 @@ public class ConfigController {
 
 
     @ApiOperation(value="系统配置-生成兑换码", notes="系统配置-生成兑换码")
-    @RequestMapping(value = "/generateCode", method = {RequestMethod.POST})
-    public Result<?> generateCode(int num, BigDecimal discountAmount){
-        return configService.generateCode(num, discountAmount);
+    @RequestMapping(value = "/generateCode", method = {RequestMethod.GET})
+    public Result<?> generateCode(AssessmentCode assessmentCode){
+        return configService.generateCode(assessmentCode.getNum(), assessmentCode.getDiscountAmount());
     }
 
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/bean/AssessmentCode.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/bean/AssessmentCode.java
new file mode 100644
index 0000000..c709d5d
--- /dev/null
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/bean/AssessmentCode.java
@@ -0,0 +1,18 @@
+package org.jeecg.modules.api.bean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class AssessmentCode {
+
+    /**数量*/
+    @ApiModelProperty(value = "数量" )
+    private Integer num;
+    /**抵扣金额*/
+    @ApiModelProperty(value = "抵扣金额" )
+    private BigDecimal discountAmount;
+
+}
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ConfigService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ConfigService.java
index 750f026..93db45d 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ConfigService.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ConfigService.java
@@ -2,6 +2,7 @@ package org.jeecg.modules.api.service;
 
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.api.bean.AssessmentCode;
 import org.jeecg.modules.api.bean.PageBean;
 import org.jeecg.modules.assessmentBanner.entity.AssessmentBanner;
 import org.springframework.web.bind.annotation.RequestMapping;