From c2f8720cbbe48e79cd31c7ef4244d20a1cb66897 Mon Sep 17 00:00:00 2001 From: 13405411873 <1994398261@qq.com> Date: Tue, 17 Sep 2024 16:51:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=AE=BE=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/EventMarketing/SaveBlock.js | 4 +- .../views/EventMarketing/SaveBlock/index.vue | 41 ++----- .../EventMarketing/storeOilBlock/index.vue | 108 +++++++++++++++++- .../controller/CardValueRuleController.java | 18 ++- .../cardValueRule/entity/CardValueRule.java | 10 +- 5 files changed, 135 insertions(+), 46 deletions(-) diff --git a/fuintAdmin/src/api/EventMarketing/SaveBlock.js b/fuintAdmin/src/api/EventMarketing/SaveBlock.js index 8ad1c0661..97f8becd4 100644 --- a/fuintAdmin/src/api/EventMarketing/SaveBlock.js +++ b/fuintAdmin/src/api/EventMarketing/SaveBlock.js @@ -57,11 +57,11 @@ export function deletedelById(id) { }) } -export function cardValueRule() { +export function cardValueRule(data) { return request({ url: 'cardValueRule/nowRule', method: 'get', - + params: data }) } export function saveOrUpdate(data) { diff --git a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue index 73e629a39..89ee38b1d 100644 --- a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue +++ b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue @@ -437,10 +437,10 @@ - + - + @@ -484,33 +484,6 @@ - -
-
- - -
不限
-
-
- - -
自定义
- - - - -
-
- @@ -708,10 +681,10 @@ import { methods:{ addCrule(){ this.Crule =! this.Crule - cardValueRule().then(res=>{ + cardValueRule({type:'0'}).then(res=>{ this.ruleForm = res.data this.ruleForm.oilNumber = res.data.oilNumber.split(',') - console.log(this.ruleForm,'1231232') + }) oilNumberList1().then(res=>{ console.log(res) @@ -723,9 +696,10 @@ import { if (valid) { this.ruleForm.oilNumber = this.ruleForm.oilNumber.join(',') saveOrUpdate(this.ruleForm).then(res=>{ - console.log(res) + if(res.code == 200){ - this.$message.success('添加成功') + this.$message.success('成功') + this.Crule = false } }) } else { @@ -736,6 +710,7 @@ import { }, resetForm(formName) { this.$refs[formName].resetFields(); + this.Crule = false }, // 请求兑换券 getlistExchange(){ diff --git a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue index 2ef2c1b1a..44a6d3e5a 100644 --- a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue +++ b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue @@ -45,7 +45,7 @@
新型加油卡，以储油为特色，让车主提前锁定油价，享受便捷灵活的加油体验
- + 编辑囤油卡规则 新增囤油卡活动
@@ -231,6 +231,26 @@ />
+ + + + + + + + + + + + + + + 保存 + 取消 + + + + import { getList,oilName,addList,eitList,getById,getoilnum,getstatistics,deleteById,cardFuleOrders} from "@/api/EventMarketing/oilBlock"; - import {cardValueRecordList, deletedelById} from "@/api/EventMarketing/SaveBlock"; + import {cardValueRecordList, cardValueRule, deletedelById, saveOrUpdate} from "@/api/EventMarketing/SaveBlock"; + import {oilNumberList1} from "@/api/order/oilnumgun"; export default { dicts: ['oil_type'], name: 'index', data(){ return{ + Crule:false, gbPrice:null, oilPrice:null, tjlist:[], @@ -347,7 +369,64 @@ total:0, pageNo:1, pageSize:10, + oilForm:{}, + ruleInfo: { + participationNo: [ + { required: true, message: '不能为空', trigger: 'blur' }, + ], + activeName: [ + { required: true, message: '不能为空', trigger: 'blur' }, + ], + refuelMoney: [ + { required: true, message: '不能为空', trigger: 'blur' }, + ], + growthValue: [ + { required: true, message: '不能为空', trigger: 'blur' }, + ], + points: [ + { required: true, message: '不能为空', trigger: 'blur' }, + ], + giftBalance: [ + { required: true, message: '不能为空', trigger: 'blur' }, + ], + membershipLevel:[ + { required: true, message: '不能为空', trigger: 'blur' }, + ], + rechargeBalance: [ + { required: true, message: '不能为空', trigger: 'blur' }, + ], + groupOriented: [ + { required: true, message: '不能为空', trigger: 'blur' }, + ], + sort: [ + { required: true, message: '不能为空', trigger: 'blur' }, + ], + employeeCommission: [ + { required: true, message: '不能为空', trigger: 'blur' }, + ], + royaltyType: [ + { required: true, message: '不能为空', trigger: 'blur' }, + ], + resource: [ + { required: true, message: '不能为空', trigger: 'blur' }, + ], + activeTime: [ + { required: true, message: '不能为空', trigger: 'blur' }, + ], + activeStatus: [ + { required: true, message: '不能为空', trigger: 'blur' }, + ], + paymentValue: [ + { required: true, message: '不能为空', trigger: 'blur' }, + ], + amountCommission: [ + { required: true, message: '不能为空', trigger: 'blur' }, + ], + percentageCommissions: [ + { required: true, message: '不能为空', trigger: 'blur' }, + ], + }, options:[ { value: '0', @@ -469,6 +548,31 @@ }, methods:{ + submitForms(formName) { + this.$refs[formName].validate((valid) => { + if (valid) { + saveOrUpdate(this.oilForm).then(res=>{ + if(res.code == 200){ + this.$message.success('成功') + this.Crule = false + } + }) + } else { + return false; + } + }); + }, + resetForm(formName) { + this.$refs[formName].resetFields(); + this.Crule = false + }, + addCrule(){ + this.Crule =! this.Crule + cardValueRule({type:'1'}).then(res=>{ + this.oilForm = res.data + + }) + }, lookorder(){ this.orderShow = !this.orderShow this.RecordList() diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueRule/controller/CardValueRuleController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueRule/controller/CardValueRuleController.java index cf909a4a6..f9aac5764 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueRule/controller/CardValueRuleController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueRule/controller/CardValueRuleController.java @@ -12,6 +12,7 @@ import com.fuint.business.marketingActivity.cardValueRule.service.CardValueRuleS import com.fuint.common.util.TokenUtil; import com.fuint.framework.web.BaseController; import com.fuint.framework.web.ResponseObject; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -54,10 +55,21 @@ public class CardValueRuleController extends BaseController { * @return 单条数据 */ @GetMapping("/nowRule") - public ResponseObject selectOne() { + public ResponseObject selectOne(String type) { LambdaQueryWrapper queryWrapper =new LambdaQueryWrapper(); - queryWrapper.eq(CardValueRule::getStoreId, TokenUtil.getNowAccountInfo().getStoreId()).last("limit 1"); - return getSuccessResult(Optional.ofNullable(this.cardValueRuleService.getOne(queryWrapper)).orElse(new CardValueRule())); + queryWrapper.eq(CardValueRule::getStoreId, TokenUtil.getNowAccountInfo().getStoreId()) + .eq(CardValueRule::getType,type).last("limit 1"); + CardValueRule one = this.cardValueRuleService.getOne(queryWrapper); + if (ObjectUtils.isEmpty(one)){ + one =new CardValueRule(); + one.setType(type); + } + if (type.equals("0")){ + one.setName("储值卡"); + }else { + one.setName("囤油卡"); + } + return getSuccessResult(one); } /** diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueRule/entity/CardValueRule.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueRule/entity/CardValueRule.java index b738e84b3..d25397329 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueRule/entity/CardValueRule.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueRule/entity/CardValueRule.java @@ -26,6 +26,8 @@ public class CardValueRule extends Model { private Integer storeId; //名称 private String name; + //0储值卡1囤油卡 + private String type; //权益说明 private String qyDetail; //规则说明 @@ -38,12 +40,8 @@ public class CardValueRule extends Model { private String productLimit; //商品id private String productIds; - //1不限制2自定义 有效期 - private String timeLimit; - //生效开始时间 - private Date effectiveDateStart; - //生效结束时间 - private Date effectiveDateEnd; + + //创建者 private String createBy; //创建时间