diff --git a/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue b/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue index a17a7e3f1..0bf8e1892 100644 --- a/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue @@ -436,15 +436,16 @@ export default { let data = { // discount :this.form.activeDiscountChildList.discount, // amount:this.form.activeDiscountChildList.amount, - discount :this.activeDiscountChildList.discount, - amount:this.activeDiscountChildList.amount, + discount :"", + amount:"", } - this.form.activeDiscountChildList.push(data) + console.log(data) + // this.form.activeDiscountChildList.push(data) this.activeDiscountChildList.push(data) }, deleteactiveDiscountChildList(index){ - this.form.activeDiscountChildList.splice(index, 1) + // this.form.activeDiscountChildList.splice(index, 1) this.activeDiscountChildList.splice(index, 1) }, // 取消按钮 diff --git a/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue b/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue index 5aef0e80f..70f242ed1 100644 --- a/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue @@ -402,15 +402,15 @@ export default { let data = { // amount :this.form.activeDiscountChildList.discount, // deductionAmount:this.form.activeDiscountChildList.amount, - amount :this.activeDiscountChildList.discount, - deductionAmount:this.activeDiscountChildList.amount, + amount :"", + deductionAmount:"", } - this.form.activeDiscountChildList.push(data) + // this.form.activeDiscountChildList.push(data) this.activeDiscountChildList.push(data) }, deleteactiveDiscountChildList(index){ - this.form.activeDiscountChildList.splice(index, 1) + // this.form.activeDiscountChildList.splice(index, 1) this.activeDiscountChildList.splice(index, 1) }, // 取消按钮 diff --git a/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue b/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue index 993613fcb..e7cf95309 100644 --- a/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue +++ b/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue @@ -116,12 +116,12 @@ - + - +
(查找最近N天未进行消费的用户)
@@ -605,48 +605,13 @@ export default { days:15, // 表单校验 rules: { - adaptOil: [ + activeName: [ { required: true, message: '必填项不能为空', trigger: 'blur' }, ], - name: [ - { required: true, message: '必填项不能为空', trigger: 'blur' }, + gradeIds: [ + { required: true, message: '必填项不能为空', trigger: 'change' }, ], - participationConditionMoney: [ - { required: true, message: '必填项不能为空', trigger: 'blur' }, - ], - activeStartTime: [ - { required: true, message: '必填项不能为空', trigger: 'blur' }, - ], - activeEndTime: [ - { required: true, message: '必填项不能为空', trigger: 'blur' }, - ], - adaptUserType: [ - { required: true, message: '必填项不能为空', trigger: 'blur' }, - ], dieselUserLevel: [ - { required: true, message: '必填项不能为空', trigger: 'blur' }, - ], gasolineUserLevel: [ - { required: true, message: '必填项不能为空', trigger: 'blur' }, - ], naturalUserLevel: [ - { required: true, message: '必填项不能为空', trigger: 'blur' }, - ], participationCondition: [ - { required: true, message: '必填项不能为空', trigger: 'blur' }, - ], participationAcount: [ - { required: true, message: '必填项不能为空', trigger: 'blur' }, - ], limitAcount: [ - { required: true, message: '必填项不能为空', trigger: 'blur' }, - ], activeGift: [ - { required: true, message: '必填项不能为空', trigger: 'blur' }, - ], - status: [ - { required: true, message: '必填项不能为空', trigger: 'blur' }, - ], - isonline: [ - { required: true, message: '必填项不能为空', trigger: 'blur' }, - ], - points: [ - { required: true, message: '必填项不能为空', trigger: 'blur' }, - ], - activeConsumptionChildList: [ + days: [ { required: true, message: '必填项不能为空', trigger: 'blur' }, ], } @@ -993,6 +958,7 @@ export default { /** 新增按钮操作 */ handleAdd() { this.reset(); + this.rlist = [] this.open = true; this.title = "添加一键发券"; }, diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/impl/ActiveOneCouponServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/impl/ActiveOneCouponServiceImpl.java index a8459f200..dce3c06d0 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/impl/ActiveOneCouponServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/impl/ActiveOneCouponServiceImpl.java @@ -206,14 +206,18 @@ public class ActiveOneCouponServiceImpl extends ServiceImpl