dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
cun-nan 2024-03-07 17:00:09 +08:00
parent 07e128f836
commit 57adb30134
4 changed files with 24 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue
View File

@ -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)
},
// 取消按钮

8
fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue
View File

@ -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)
},
// 取消按钮

48
fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue
View File

@ -116,12 +116,12 @@
<el-form-item label="活动名称" prop="activeName">
<el-input v-model="form.activeName" placeholder="请输入活动名称" />
</el-form-item>
<el-form-item label="会员等级" prop="" >
<el-form-item label="会员等级" prop="gradeIds" >
<el-select v-model="form.gradeIds" multiple clearable placeholder="会员等级" @change="change">
<el-option :label="item.name" :value="item.id.toString()" v-for="(item,index) in userGradeList" :key="index" > </el-option>
</el-select>
</el-form-item>
<el-form-item label="不活跃用户" prop="">
<el-form-item label="不活跃用户" prop="days">
<div style="display: flex;align-items: center">
<el-input-number v-model="form.days" :min="1" :max="999" label="描述文字"></el-input-number>
<div style="margin-left: 5px">天 <span style="color: red">(查找最近N天未进行消费的用户)</span> </div>
@ -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 = "添加一键发券";
},

12
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/impl/ActiveOneCouponServiceImpl.java
View File

@ -206,14 +206,18 @@ public class ActiveOneCouponServiceImpl extends ServiceImpl<ActiveOneCouponMappe
//优惠券
if (activeOneCouponChild.getActiveGift().equals("1")){
CardFavorable byId = cardFavorableService.getById(activeOneCouponChild.getVouchersId());
cardFavorableArrayList.add(byId);
cardFavorableIds.add(byId.getId());
if (ObjectUtil.isNotEmpty(byId)) {
cardFavorableArrayList.add(byId);
cardFavorableIds.add(byId.getId());
}
}
//兑换券
if (activeOneCouponChild.getActiveGift().equals("2")){
CardExchange byId = exchangeService.getById(activeOneCouponChild.getVouchersId());
cardExchangeArrayList.add(byId);
cardExchangeIds.add(byId.getId());
if (ObjectUtil.isNotEmpty(byId)) {
cardExchangeArrayList.add(byId);
cardExchangeIds.add(byId.getId());
}
}
}
String[] split = oneCoupon.getGradeId().split(",");