From 3276ced4ae824588cb8c78f96003e4ce57b0b188 Mon Sep 17 00:00:00 2001 From: zhaohengkun Date: Wed, 16 Oct 2024 16:17:19 +0800 Subject: [PATCH] bug1 --- .../views/EventMarketing/SaveBlock/index.vue | 7 +- .../activeConsumption/index.vue | 25 +- .../EventMarketing/activeNewlyweds/index.vue | 26 +- .../EventMarketing/newCertificate/index.vue | 40 ++- .../openCardGift/TimeLimited.vue | 228 ++++++++++++------ .../EventMarketing/openCardGift/birthday.vue | 25 +- .../EventMarketing/openCardGift/invite.vue | 25 +- .../EventMarketing/openCardGift/popUp.vue | 25 +- .../EventMarketing/openCardGift/separate.vue | 8 +- .../openCardGift/userConsume.vue | 25 +- .../openCardGift/userRecharge.vue | 25 +- .../oilConfig/oilPrice/comp/addprice.vue | 4 +- .../views/oilConfig/oilPrice/comp/oilcon.vue | 2 + .../src/views/oilConfig/oilPrice/index1.vue | 2 +- .../controller/CardCouponController.java | 2 +- .../mapper/xml/CardCouponMapper.xml | 1 + .../service/impl/CardCouponServiceImpl.java | 4 +- 17 files changed, 345 insertions(+), 129 deletions(-) diff --git a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue index 7e9392ed0..9f55c8c58 100644 --- a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue +++ b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue @@ -333,7 +333,7 @@ label="数量" width="240"> @@ -562,9 +562,8 @@ import {delLJGoods, listLJGoods} from "@/api/convenienceStore/ljgoods"; youhuiquan:{ name:'', status:'1', - putType:'1', pageNum: 1, - pageSize: 10, + pageSize: 1000, }, ytotal:0, //请求兑换券列表时的参数 @@ -807,6 +806,8 @@ import {delLJGoods, listLJGoods} from "@/api/convenienceStore/ljgoods"; giftCardTime: "", //券有效期 giftCardTotal: 1,//券数量 instruction: row.instruction,//使用说明 + tfTotal: row.tfTotal, + tfGetNum: row.tfGetNum, } this.youhuiquanlist.push(data) this.$message.success("新增成功") diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue index e625016d5..b5ce9edd1 100644 --- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue @@ -206,16 +206,20 @@ 送 - + - - - + + + @@ -442,6 +446,17 @@ export default { this.getUserLabelList() }, methods: { + updateMax(item) { + //先清空之前的值 + item.giftCardTotal = 1; + // 更新最大值 + const selectedOption = this.cardCouponList.find(option => option.id === item.vouchersId); + if (selectedOption) { + item.max = selectedOption.tfTotal - selectedOption.tfGetNum; + } else { + item.max = 0; // 默认值或处理未找到的情况 + } + }, handleCheckedCitiesChange(e) { console.log(e, this.checkedCities) @@ -523,7 +538,7 @@ export default { }, getCardCoupon() { - listCardCoupon({status: 1, putType: 1}).then(res => { + listCardCoupon({status: 1}).then(res => { this.cardCouponList = res.data.records }) }, diff --git a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue index 0f409d82e..f7532fb29 100644 --- a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue @@ -77,16 +77,20 @@
赠送
- + - - - + + +
@@ -239,9 +243,21 @@ export default { this.getCardCoupon() }, methods: { + updateMax(item) { + //先清空之前的值 + item.giftCardTotal = 1; + // 更新最大值 + const selectedOption = this.cardCouponList.find(option => option.id === item.vouchersId); + if (selectedOption) { + item.max = selectedOption.tfTotal - selectedOption.tfGetNum; + } else { + item.max = 0; // 默认值或处理未找到的情况 + } + }, getCardCoupon() { - listCardCoupon({status: 1, putType: 1}).then(res => { + listCardCoupon({status: 1}).then(res => { this.cardCouponList = res.data.records + console.log("数据",this.cardCouponList) }) }, getInfo() { diff --git a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue index 6daa95d61..edb957376 100644 --- a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue +++ b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue @@ -148,12 +148,30 @@ +
+ + + + +
满
+ + + +
优惠
+ + + +
+ + +
-
满
@@ -174,15 +192,15 @@
- +
范围
- +
~
- +
优惠
@@ -195,11 +213,11 @@
- f +
满
- +
每
@@ -765,7 +783,7 @@ export default { if (!this.ruleForm.useType) { callback(new Error("请选择优惠券使用条件")); } else if (!this.ruleForm.reachAmount) { - callback(new Error("请输入满多少元可用")); + callback(new Error("请输入限制条件")); } else if (!this.ruleForm.reduceAmount) { callback(new Error("请输入优惠金额")); } else { @@ -790,7 +808,7 @@ export default { if (!this.ruleForm.useType) { callback(new Error("请选择优惠券使用条件")); } else if (!this.ruleForm.reachAmount) { - callback(new Error("请输入满多少元可用")); + callback(new Error("请输入限制条件")); } else if (!this.ruleForm.ljOilNum) { callback(new Error("请输入升数")); } else if (!this.ruleForm.ljOilAmount) { @@ -858,7 +876,7 @@ export default { return '订单金额 范围' + row.zkStartAmount + '元 ~ ' + row.zkEndAmount + '元 优惠' + row.zkData + '折' } if (row.useType == 2) { - return '实收金额 范围' + row.zkStartAmount + '元 ~ ' + row.zkEndAmount + '元 优惠' + row.zkData + '折' + return '加油升数 范围' + row.zkStartAmount + '元 ~ ' + row.zkEndAmount + '元 优惠' + row.zkData + '折' } } @@ -867,7 +885,7 @@ export default { return '订单金额 满' + row.reachAmount + '元 每' + row.ljOilNum + 'L 减' + row.ljOilAmount + '元' } if (row.useType == 2) { - return '实收金额 满' + row.reachAmount + '元 每' + row.ljOilNum + 'L 减' + row.ljOilAmount + '元' + return '加油升数 满' + row.reachAmount + '元 每' + row.ljOilNum + 'L 减' + row.ljOilAmount + '元' } } diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue index 052e5e007..59baeb12e 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue @@ -136,6 +136,9 @@ prop="paymentType" label="支付方式" > + - +
折扣请填写0~1的数字。例如输入0.8，表示打8折
 - +
减价金额不能小于 0.01
 @@ -268,9 +271,17 @@ label="优惠价（元/L）" > @@ -322,10 +333,11 @@ v-if="dict.value!='APPLET_CODE'" :key="dict.value" :label="dict.value" - :value="dict.value">{{dict.label}} + :value="dict.value">{{ dict.label }} + - + - +
- + @@ -368,7 +380,7 @@ - + @@ -378,7 +390,7 @@
到
 - + @@ -386,21 +398,7 @@
- - - - - - - - - - - - - - - + @@ -539,12 +537,55 @@ export default { title: '', name: '', region: '', - category: '', + category: '1', disValue: '', type: [], oilList: [] }, rules: { + activeStartTime: [ + {required: true, message: '请选择开始时间', trigger: 'change'}, + ], + activeEndTime:[ + {required: true, message: '请选择结束时间', trigger: 'change'} + ], + timeApplyStart: [ + { + validator: (rule, value, callback) => { + if (this.ruleForm1.dayStartTime === undefined) { + callback(new Error('请选择开始时间点')); + } else if (this.ruleForm1.dayEndTime === undefined) { + callback(new Error('请选择结束时间点')); + } else if (this.ruleForm1.dayStartTime > this.ruleForm1.dayEndTime) { + callback(new Error('结束时间必须晚于开始时间')); + } else { + callback(); + } + + }, + } + ], + moneyMax: [ + {required: true, message: '请输入订单最高金额', trigger: 'blur'}, + ], + literMax: [ + {required: true, message: '请输入最高加油升数', trigger: 'blur'}, + ], + moneyMin: [ + {required: true, message: '请输入订单最低金额', trigger: 'blur'}, + ], + literMin: [ + {required: true, message: '请输入最低加油升数', trigger: 'blur'}, + ], + consumeType: [ + {required: true, message: '请选择消费类型', trigger: 'change'}, + ], + disValue:[ + {required: true, message: '请输入优惠金额', trigger: 'change'} + ], + 'oilList.*.price': [ + {required: true, message: '请输入优惠价', trigger: 'change'} + ], title: [ {required: true, message: '请输入名称', trigger: 'blur'}, ], @@ -557,12 +598,6 @@ export default { paymentType: [ {required: true, message: '请输入支付方式', trigger: 'blur'}, ], - moneyMin: [ - {required: true, message: '请输入实收金额', trigger: 'blur'}, - ], - literMin: [ - {required: true, message: '请输入加油升数', trigger: 'blur'}, - ], disMax: [ {required: true, message: '请输入优惠金额', trigger: 'blur'}, ], @@ -603,7 +638,7 @@ export default { ruleForm1: { activeType: 2, timeType: 0, - consumeType:'', + consumeType: '', paymentType: [] } } @@ -612,9 +647,65 @@ export default { this.getList() this.getRuleList() }, + watch: { + 'ruleForm.category': function (newVal, oldVal) { + // 当类型切换的时候 清空 折扣 和 减价 字段 + this.ruleForm.disValue = null; + + }, + 'ruleForm.disValue': function (newVal, oldVal) { + + console.log('监听', newVal) + + if (this.ruleForm.category == 2) { + + // 这地方 必须产生新数组 elementui 对数据监听都是浅层的 + this.ruleForm.oilList = this.ruleForm.oilList.map(item => ({ + ...item, + price: Number((item.oilPrice * newVal).toFixed(2)) + })); + } + + if (this.ruleForm.category == 3) { + + this.ruleForm.oilList = this.ruleForm.oilList.map(item => ({ + ...item, + price: Number((item.oilPrice - newVal).toFixed(2)) + })); + } + + if (newVal == null) { + this.clearOilListPrice() + } + } + }, methods: { + //支付方式 转义 + getPaymentTypeStr(value) { + + let valueList = value.split(","); + + console.log(this.dict.type.payment_type) + + let newValueList = valueList.map((item) => { + let matchedLabel = this.dict.type.payment_type.find((item1) => item1.value === item)?.label; + return matchedLabel || item; // 如果没有找到匹配的 label，则返回原来的 item + }); + + //数组 转字符串 + return newValueList.join(",") + + }, + //清空油品 优惠价属性 + clearOilListPrice() { + this.ruleForm.oilList = this.ruleForm.oilList.map( + item => ({ + ...item, + price: null + })) + }, // 重置活动规则 - resetRule(){ + resetRule() { this.ruleForm1 = { activeType: 2, timeType: 0, @@ -625,7 +716,7 @@ export default { this.monthDay = [] }, // 删除活动规则 - deleteRule(data){ + deleteRule(data) { deletePriceRule(data.id).then(res => { this.$message.success("删除成功") this.getRuleList() @@ -641,12 +732,12 @@ export default { this.getUserLabelList() this.showDialogVisible = true - if (res.data){ + if (res.data) { this.ruleForm1 = res.data if (res.data.paymentType) this.ruleForm1.paymentType = res.data.paymentType.split(",") if (res.data.babelIds) this.ruleForm1.babelIds = res.data.babelIds.split(",") - if (res.data.timeSlots){ + if (res.data.timeSlots) { if (res.data.timeType == "0") { this.weekDay = this.ruleForm1.timeSlots.split(",") } else if (this.ruleForm1.timeType == "1") { @@ -658,15 +749,6 @@ export default { }, // 提交活动规则 submitRuleForm() { - if (this.ruleForm1.consumeType == 1){ - if (!this.ruleForm1.literMin || !this.ruleForm1.literMax){ - this.$message.error("请填写消费条件信息") - } - }else { - if (!this.ruleForm1.moneyMin || !this.ruleForm1.moneyMax){ - this.$message.error("请填写消费条件信息") - } - } this.$refs["ruleForm1"].validate((valid) => { if (valid) { if (this.ruleForm1.paymentType) this.ruleForm1.paymentType = this.ruleForm1.paymentType.toString() @@ -703,7 +785,7 @@ export default { }, // 查询限时优惠列表信息 getTimeShareList() { - getRequestList({pageNo: 1, pageSize: 10000,activeType:2}).then(res => { + getRequestList({pageNo: 1, pageSize: 10000, activeType: 2}).then(res => { this.timeShareList = res.data.records }) }, @@ -755,7 +837,7 @@ export default { title: '', name: '', region: '', - category: '', + category: '1', disValue: '', type: [], oilList: [] @@ -774,30 +856,34 @@ export default { // 新增/修改 addSeparateList() { - this.centerDialogVisible = false - if (this.ruleForm.id) { - updateActivePrice(this.ruleForm).then(res => { - if (res.code == 200) { - this.$message({ - message: '添加成功', - type: 'success' - }) - this.getList() - } - }) - } else { - postaddList(this.ruleForm).then(res => { - if (res.code == 200) { - this.$message({ - message: '添加成功', - type: 'success' - }) - this.getList() - } - }) - } + this.$refs["ruleForm"].validate((valid) => { + if (valid) { + this.centerDialogVisible = false + if (this.ruleForm.id) { + updateActivePrice(this.ruleForm).then(res => { + if (res.code == 200) { + this.$message({ + message: '添加成功', + type: 'success' + }) + this.getList() + } + }) + } else { + postaddList(this.ruleForm).then(res => { + if (res.code == 200) { + this.$message({ + message: '添加成功', + type: 'success' + }) + this.getList() + } + }) + } + } + }) }, //列表查询 getList() { diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/birthday.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/birthday.vue index 38c760998..4968b40ac 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/birthday.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/birthday.vue @@ -93,16 +93,20 @@
赠送
- + - - - + + +
@@ -258,6 +262,17 @@ export default { this.listUserGrade() }, methods: { + updateMax(item) { + //先清空之前的值 + item.giftCardTotal = 1; + // 更新最大值 + const selectedOption = this.cardCouponList.find(option => option.id === item.vouchersId); + if (selectedOption) { + item.max = selectedOption.tfTotal - selectedOption.tfGetNum; + } else { + item.max = 0; // 默认值或处理未找到的情况 + } + }, listUserGrade() { listUserGrade({page: 1, pageSize: 1000}).then(res => { if (res.code == 200) { @@ -266,7 +281,7 @@ export default { }) }, getCardCoupon() { - listCardCoupon({status: 1, putType: 1}).then(res => { + listCardCoupon({status: 1}).then(res => { this.cardCouponList = res.data.records }) }, diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/invite.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/invite.vue index 07d199246..462dd1682 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/invite.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/invite.vue @@ -78,16 +78,20 @@
赠送
- + - - - + + +
@@ -238,8 +242,19 @@ export default { this.getCardCoupon() }, methods: { + updateMax(item) { + //先清空之前的值 + item.giftCardTotal = 1; + // 更新最大值 + const selectedOption = this.cardCouponList.find(option => option.id === item.vouchersId); + if (selectedOption) { + item.max = selectedOption.tfTotal - selectedOption.tfGetNum; + } else { + item.max = 0; // 默认值或处理未找到的情况 + } + }, getCardCoupon() { - listCardCoupon({status: 1, putType: 1}).then(res => { + listCardCoupon({status: 1}).then(res => { this.cardCouponList = res.data.records }) }, diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue index fba90067f..7f3794e56 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue @@ -99,16 +99,20 @@
赠送
- + - - - + + +
@@ -299,6 +303,17 @@ export default { this.listUserGrade() }, methods: { + updateMax(item) { + //先清空之前的值 + item.giftCardTotal = 1; + // 更新最大值 + const selectedOption = this.cardCouponList.find(option => option.id === item.vouchersId); + if (selectedOption) { + item.max = selectedOption.tfTotal - selectedOption.tfGetNum; + } else { + item.max = 0; // 默认值或处理未找到的情况 + } + }, //自定义表单验证逻辑 validateTimeRange(rule, value, callback) { const { suitTimeSlotFront, suitTimeSlotAfter } = this.ruleForm; @@ -335,7 +350,7 @@ export default { }) }, getCardCoupon(){ - listCardCoupon({status:1,putType:1}).then(res => { + listCardCoupon({status:1}).then(res => { this.cardCouponList = res.data.records }) }, diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue index 35337bf38..9e2202575 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue @@ -280,8 +280,6 @@ v-model="scope.row.price" type="number" controls-position="right" - :min="0.1" - :max="999" > @@ -352,7 +350,7 @@
- + @@ -561,7 +559,7 @@ export default { {required: true, message: '请输入支付方式', trigger: 'blur'}, ], moneyMin: [ - {required: true, message: '请输入实收最低金额', trigger: 'blur'}, + {required: true, message: '请输入订单最低金额', trigger: 'blur'}, ], literMin: [ {required: true, message: '请输入最低加油升数', trigger: 'blur'}, @@ -585,7 +583,7 @@ export default { {required: true, message: '请选择消费类型', trigger: 'change'}, ], moneyMax: [ - {required: true, message: '请输入实收最高金额', trigger: 'blur'}, + {required: true, message: '请输入订单最高金额', trigger: 'blur'}, ], literMax: [ {required: true, message: '请输入最高加油升数', trigger: 'blur'}, diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue index 3e9651057..5779e5fae 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue @@ -105,16 +105,20 @@
赠送
- + - - - + + +
@@ -284,6 +288,17 @@ export default { this.getOilList() }, methods: { + updateMax(item) { + //先清空之前的值 + item.giftCardTotal = 1; + // 更新最大值 + const selectedOption = this.cardCouponList.find(option => option.id === item.vouchersId); + if (selectedOption) { + item.max = selectedOption.tfTotal - selectedOption.tfGetNum; + } else { + item.max = 0; // 默认值或处理未找到的情况 + } + }, getOilList(){ getOilNameList().then(response => { this.oilNameList = response.data; @@ -315,7 +330,7 @@ export default { }) }, getCardCoupon(){ - listCardCoupon({status:1,putType:1}).then(res => { + listCardCoupon({status:1}).then(res => { this.cardCouponList = res.data.records }) }, diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/userRecharge.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/userRecharge.vue index 388751037..d2dfdaac7 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/userRecharge.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/userRecharge.vue @@ -92,16 +92,20 @@
赠送
- + - - - + + +
@@ -260,6 +264,17 @@ export default { this.listUserGrade() }, methods: { + updateMax(item) { + //先清空之前的值 + item.giftCardTotal = 1; + // 更新最大值 + const selectedOption = this.cardCouponList.find(option => option.id === item.vouchersId); + if (selectedOption) { + item.max = selectedOption.tfTotal - selectedOption.tfGetNum; + } else { + item.max = 0; // 默认值或处理未找到的情况 + } + }, listUserGrade() { listUserGrade({page:1,pageSize:1000}).then(res => { if (res.code == 200) { @@ -268,7 +283,7 @@ export default { }) }, getCardCoupon(){ - listCardCoupon({status:1,putType:1}).then(res => { + listCardCoupon({status:1}).then(res => { this.cardCouponList = res.data.records }) }, diff --git a/fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue b/fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue index a88c3b4ab..c1d13b11c 100644 --- a/fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue +++ b/fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue @@ -164,7 +164,9 @@ export default { 预设油价记录
- 新增预设油价
diff --git a/fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue b/fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue index f0cedb0c2..f3023fc4c 100644 --- a/fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue +++ b/fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue @@ -131,6 +131,8 @@ export default { } }, async oilTypeMethods(data) { + console.log(this.$store) + if (data === 1) { // this.oilNumber = {} this.dialogFormNumberEdit = true diff --git a/fuintAdmin/src/views/oilConfig/oilPrice/index1.vue b/fuintAdmin/src/views/oilConfig/oilPrice/index1.vue index 2dfaebbdf..9a9b0d0d7 100644 --- a/fuintAdmin/src/views/oilConfig/oilPrice/index1.vue +++ b/fuintAdmin/src/views/oilConfig/oilPrice/index1.vue @@ -2,7 +2,7 @@
- 油价配置 + 油价配置(老页面)
+ cc.tf_total - cc.tf_get_num >0 and cc.store_id = #{cardCoupon.storeId} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponServiceImpl.java index f3c991d97..7db51d1d4 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponServiceImpl.java @@ -52,7 +52,9 @@ public class CardCouponServiceImpl extends ServiceImpl pageVo(Page page, CardCoupon cardCoupon) { - return baseMapper.pageVo( page, cardCoupon); + IPage cardCouponIPage = baseMapper.pageVo(page, cardCoupon); + + return cardCouponIPage; } @Override