From 5e45fd7b3c2893d76bc02999e1da6899fb84cb78 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Thu, 7 Mar 2024 15:43:36 +0800 Subject: [PATCH 1/2] bug --- .../views/EventMarketing/activeDiscount/index.vue | 14 +++++++++----- .../views/EventMarketing/activeFullminus/index.vue | 14 +++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue b/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue index 1c2b47033..95784ce0a 100644 --- a/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue @@ -193,12 +193,12 @@ -
+
- 满 元 + 满 元
- 打 折 + 打 折
@@ -428,14 +428,18 @@ export default { // 新增 addactiveDiscountChildList(){ let data = { - discount :this.form.activeDiscountChildList.discount, - amount:this.form.activeDiscountChildList.amount, + // discount :this.form.activeDiscountChildList.discount, + // amount:this.form.activeDiscountChildList.amount, + discount :this.activeDiscountChildList.discount, + amount:this.activeDiscountChildList.amount, } this.form.activeDiscountChildList.push(data) + this.activeDiscountChildList.push(data) }, deleteactiveDiscountChildList(index){ this.form.activeDiscountChildList.splice(index, 1) + this.activeDiscountChildList.splice(index, 1) }, // 取消按钮 cancel() { diff --git a/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue b/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue index a5f1d5890..5119d6ed6 100644 --- a/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue @@ -181,12 +181,12 @@ -
+
- 满 元 + 满 元
- 减 元 + 减 元
@@ -394,14 +394,18 @@ export default { // 新增 addactiveDiscountChildList(){ let data = { - amount :this.form.activeDiscountChildList.discount, - deductionAmount:this.form.activeDiscountChildList.amount, + // amount :this.form.activeDiscountChildList.discount, + // deductionAmount:this.form.activeDiscountChildList.amount, + amount :this.activeDiscountChildList.discount, + deductionAmount:this.activeDiscountChildList.amount, } this.form.activeDiscountChildList.push(data) + this.activeDiscountChildList.push(data) }, deleteactiveDiscountChildList(index){ this.form.activeDiscountChildList.splice(index, 1) + this.activeDiscountChildList.splice(index, 1) }, // 取消按钮 cancel() { From 2e3575b4de09c4ad854706e4da2a490fbcfd5a7d Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Thu, 7 Mar 2024 16:11:59 +0800 Subject: [PATCH 2/2] bug --- .../activeConsumption/index.vue | 4 +++- .../impl/ActiveConsumptionServiceImpl.java | 20 +++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue index 449a09161..7a51bea9e 100644 --- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue @@ -213,7 +213,7 @@ -
+
选择优惠券
新增
{ this.form = response.data; + if (!response.data.activeGift) this.form.activeGift = "" if(response.data.activeConsumptionChildList && response.data.activeConsumptionChildList.length >0){ this.form.tableDatas = response.data.activeConsumptionChildList.filter(item => item.activeGift == '1') this.tableData1 = response.data.activeConsumptionChildList.filter(item => item.activeGift == '1') this.tableDatas = response.data.activeConsumptionChildList.filter(item => item.activeGift == '2') this.form.shiwudata = response.data.activeConsumptionChildList.filter(item => item.activeGift == '4') } + console.log(this.tableData1) this.open = true; this.title = "修改消费有礼活动"; }); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java index f8d819e82..f0856c08b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java @@ -287,17 +287,17 @@ public class ActiveConsumptionServiceImpl extends ServiceImpl