From 6a3b85d3850c766cfe7749313791f2a9eee23606 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Thu, 29 Aug 2024 15:14:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activeConsumption/index.vue | 177 +++++++++--------- .../EventMarketing/activeNewlyweds/index.vue | 20 +- .../entity/ActiveConsumption.java | 18 +- .../ActiveConsumptionChildService.java | 2 + .../ActiveConsumptionChildServiceImpl.java | 12 ++ 5 files changed, 117 insertions(+), 112 deletions(-) diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue index d9af066c9..d7af3c31f 100644 --- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue @@ -661,7 +661,7 @@
- +
@@ -676,14 +676,14 @@ {{ item }}
至 @@ -731,20 +731,23 @@
- - + + + + + + + - - - - - - - - + + - - + + 每个会员每天限制参与的次数，0标识不限 - - + + 每个会员每月限制参与的次数，0标识不限 - - + + 每个会员累计限制参与的次数，0标识不限
- +
编辑
- - - + + - - + +
按
- + @@ -790,7 +793,7 @@
赠送积分
+ @click="addPoints(pointOrderType)">
@@ -809,7 +812,7 @@
按
- + @@ -817,7 +820,7 @@
赠送成长值
+ @click="addGrowthValues(growthValueOrderType)">
@@ -826,7 +829,8 @@ 送 - +
按
- + @@ -844,7 +848,7 @@
赠送优惠券
+ @click="addCoupons(couponOrderType)">
@@ -853,12 +857,14 @@ 送 - - - - + + - +
- 重置 + 取消 保存 @@ -891,10 +897,11 @@ import { listFavorable, looklook, looklooklook, - editActiveConsumption + editActiveConsumption, getInfoActivity } from "@/api/EventMarketing/activeConsumption"; import {listUserGrade} from "@/api/staff/user/usergrade"; import {getOilNameList} from "@/api/order/oilnumgun"; +import {listCardCoupon} from "@/api/EventMarketing/cardCoupon"; export default { name: "ActiveConsumption", @@ -1011,14 +1018,8 @@ export default { ruleForm: { - name: '', - region: '', - date1: '', - date2: '', - delivery: false, - type: [], - resource: '', - desc: '' + paymentType:[], + activeGift:[] }, ifWrite: true, tindex1: 0, @@ -1033,65 +1034,71 @@ export default { pointList: [], growthValueList: [], couponList: [], + pointOrderType: "", + growthValueOrderType: "", + couponOrderType: "", + // 优惠券列表信息 + cardCouponList: [], // 表单校验 rules: { - adaptOil: [ - {required: true, message: '必填项不能为空', trigger: 'blur'}, - ], - moneyType: [ - {required: true, message: '必填项不能为空', trigger: 'blur'}, - ], name: [ - {required: true, message: '必填项不能为空', trigger: 'blur'}, + {required: true, message: '活动名称不能为空', trigger: 'blur'}, ], - participationConditionMoney: [ - {required: true, message: '必填项不能为空', trigger: 'blur'}, + activityTimeType: [ + {required: true, message: '活动时间不能为空', trigger: 'blur'}, ], - activeStartTime: [ - {required: true, message: '必填项不能为空', trigger: 'blur'}, + suitTimeSlotFront: [ + {required: true, message: '时间段不能为空', trigger: 'blur'}, ], - activeEndTime: [ - {required: true, message: '必填项不能为空', trigger: 'blur'}, + dieselUserLevel: [ + {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'}, + paymentType: [ + {required: true, message: '可使用支付方式不能为空', trigger: 'blur'}, ], - status: [ - {required: true, message: '必填项不能为空', trigger: 'blur'}, + everyDayCeiling: [ + {required: true, message: '每人每天参与上限不能为空', trigger: 'blur'}, ], - isonline: [ - {required: true, message: '必填项不能为空', trigger: 'blur'}, + monthlyCeiling: [ + {required: true, message: '每人每月参与上限不能为空', trigger: 'blur'}, ], - points: [ - {required: true, message: '必填项不能为空', trigger: 'blur'}, + accumulateCeiling: [ + {required: true, message: '每人累计参与上限不能为空', trigger: 'blur'}, ], - activeConsumptionChildList: [ - {required: true, message: '必填项不能为空', trigger: 'blur'}, + noticeContent: [ + {required: true, message: '通知内容不能为空', trigger: 'blur'}, + ], + activityDetails: [ + {required: true, message: '活动详情不能为空', trigger: 'blur'}, ], } }; }, created() { - this.getList(); + // this.getList(); // this.getoiltypeliet() this.getoilName() this.listUserGrade() + + this.getInfo() + this.getCardCoupon() }, methods: { + getInfo(){ + getInfoActivity().then(res => { + if (res.data) { + this.ruleForm = res.data + if (res.data.couponList) this.couponList = res.data.couponList + }else { + + } + }) + }, + getCardCoupon() { + listCardCoupon({status: 1, putType: 1}).then(res => { + this.cardCouponList = res.data.records + }) + }, addPoints(orderType) { let data = { activeGift: 0, diff --git a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue index 27dd27198..9f34cf849 100644 --- a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue @@ -617,9 +617,11 @@
赠送 - - - + @@ -736,16 +738,7 @@ export default { activeNewlywedsChildList: [], }, - ruleForm: { - name: '', - region: '', - date1: '', - date2: '', - delivery: false, - type: [], - resource: '', - desc: '' - }, + ruleForm: {}, ifWrite: true, tindex1: 0, activityTimeTypeList: [ @@ -797,6 +790,7 @@ export default { activeTimeType:0, courtesyReward:[] } + this.tindex1 = 0 } }) }, diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/entity/ActiveConsumption.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/entity/ActiveConsumption.java index e56f749e5..fb1cf8c71 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/entity/ActiveConsumption.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/entity/ActiveConsumption.java @@ -36,6 +36,10 @@ public class ActiveConsumption extends Model { private String moneyType; //满足金额 private Double participationConditionMoney; + /** + *活动时间类型：0永久有效；1自定义 + */ + private String activityTimeType; //活动开始时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date activeStartTime; @@ -83,20 +87,6 @@ public class ActiveConsumption extends Model { //描述信息 @TableField(exist = false) private String exchangeFrom; - /** - *活动时间类型：0永久有效；1自定义 - */ - private String activityTimeType; - /** - *活动时间前 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date activityTimeFront; - /** - *活动时间后 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date activityTimeAfter; /** *适用时间段类型：0每周、1每月 */ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/ActiveConsumptionChildService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/ActiveConsumptionChildService.java index 53627efc5..78159adb2 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/ActiveConsumptionChildService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/ActiveConsumptionChildService.java @@ -23,4 +23,6 @@ public interface ActiveConsumptionChildService extends IService detailRecord(ActiveConsumption activeConsumption); CardFavorableCountVO detailCount(Serializable id); + + List selectByActiveId(Integer activeConsumptionId,String activeGift); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionChildServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionChildServiceImpl.java index b49e048f0..33f5a5d49 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionChildServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionChildServiceImpl.java @@ -1,6 +1,8 @@ package com.fuint.business.marketingActivity.activeConsumption.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fuint.business.marketingActivity.activeConsumption.entity.ActiveConsumption; import com.fuint.business.marketingActivity.activeConsumption.entity.ActiveConsumptionChild; @@ -125,4 +127,14 @@ public class ActiveConsumptionChildServiceImpl extends ServiceImpl selectByActiveId(Integer activeConsumptionId, String activeGift) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("active_consumption_id",activeConsumptionId); + if (ObjectUtil.isNotEmpty(activeGift)) { + queryWrapper.eq("active_gift",activeGift); + } + return null; + } }