Browse Source

1、兑换码模块调整

master
Aug 1 month ago
parent
commit
5c8ff7985f
4 changed files with 30 additions and 6 deletions
  1. +6
    -3
      admin-hanhai-vue/src/views/assessmentCode/AssessmentCodeList.vue
  2. +5
    -3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/assessmentController/ConfigController.java
  3. +18
    -0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/bean/AssessmentCode.java
  4. +1
    -0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ConfigService.java

+ 6
- 3
admin-hanhai-vue/src/views/assessmentCode/AssessmentCodeList.vue View File

@ -12,9 +12,9 @@
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator"> <div class="table-operator">
<!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> --> <!-- <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-button type="primary" icon="download" @click="handleExportXls('兑换码信息表')">导出</a-button> -->
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
@ -195,6 +195,9 @@
"/assessment/config/generateCode", "/assessment/config/generateCode",
this.formaaaa this.formaaaa
).then(res=>{ ).then(res=>{
//
this.queryParam = {}
this.loadData(1);
}) })
}, },
initDictConfig(){ initDictConfig(){


+ 5
- 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/assessmentController/ConfigController.java View File

@ -3,7 +3,9 @@ package org.jeecg.modules.api.assessmentController;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result; 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.bean.PageBean;
import org.jeecg.modules.api.service.ConfigService; import org.jeecg.modules.api.service.ConfigService;
import org.jeecg.modules.assessmentBanner.entity.AssessmentBanner; import org.jeecg.modules.assessmentBanner.entity.AssessmentBanner;
@ -48,9 +50,9 @@ public class ConfigController {
@ApiOperation(value="系统配置-生成兑换码", notes="系统配置-生成兑换码") @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());
} }
} }

+ 18
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/bean/AssessmentCode.java View File

@ -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;
}

+ 1
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ConfigService.java View File

@ -2,6 +2,7 @@ package org.jeecg.modules.api.service;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.jeecg.common.api.vo.Result; 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.bean.PageBean;
import org.jeecg.modules.assessmentBanner.entity.AssessmentBanner; import org.jeecg.modules.assessmentBanner.entity.AssessmentBanner;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;


Loading…
Cancel
Save