From 590ada2db7ab452073b0c3ade26d91b087ed0008 Mon Sep 17 00:00:00 2001 From: ds Date: Sat, 2 Nov 2024 09:09:37 +0800 Subject: [PATCH] 11.2 --- fuintAdmin/src/views/member/index.vue | 61 +++++++++++++++---- .../userGroup/entity/UserMassSend.java | 16 +++++ 2 files changed, 64 insertions(+), 13 deletions(-) diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue index 6f6795d77..4c2d98d10 100644 --- a/fuintAdmin/src/views/member/index.vue +++ b/fuintAdmin/src/views/member/index.vue @@ -589,7 +589,7 @@ - + - - - - - - + + +
+
+ +
+ +
+
+ +
- - - +
+
+
+ + + +
+
+ + + + + + +
+
+
+ - + + + {{ form1.sendUserNum }} @@ -739,6 +765,7 @@ import {getListApi} from "@/api/setting/message"; import {addUserMassSend} from "@/api/userGroup/userMassSend"; import {deleteUserMassSendRecord, listUserMassSendRecord} from "@/api/userGroup/userMassSendRecord"; import {listUserLabel} from "@/api/staff/user/userlabel"; +import {getCardCouponNum} from "@/api/EventMarketing/cardCoupon"; export default { name: "MemberIndex", @@ -776,6 +803,8 @@ export default { } ], + // 优惠券列表信息 + couponList:[], addMember: [], // 余额 balance: '', @@ -907,8 +936,14 @@ export default { this.getConfig(); this.getUserList(); this.getMessageList() + this.getCardCoupon() }, methods: { + getCardCoupon(){ + getCardCouponNum({status:1}).then(res => { + this.couponList = res.data + }) + }, handleAvatarSuccess(res, file) { this.imageUrl = URL.createObjectURL(file.raw); }, diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/entity/UserMassSend.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/entity/UserMassSend.java index 97fdc49d7..87bce631c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/entity/UserMassSend.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/entity/UserMassSend.java @@ -80,6 +80,22 @@ public class UserMassSend extends BaseEntity implements Serializable { * 群发礼品：0、积分；1、优惠券；2、成长值 */ private String senfGift; + + /** + * 赠送积分 + */ + private Integer points; + + /** + * 优惠券ID + */ + private Integer couponId; + + /** + * 赠送优惠券张数 + */ + private Integer couponTotal; + /** * 短信模板id */