diff --git a/fuintAdmin/src/views/member/manage.vue b/fuintAdmin/src/views/member/manage.vue index 6d7ca7293..c524978fd 100644 --- a/fuintAdmin/src/views/member/manage.vue +++ b/fuintAdmin/src/views/member/manage.vue @@ -510,8 +510,8 @@ - - + + @@ -558,9 +558,12 @@ - + + {{ item }}日 + + - + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+
+
+
+
+ + + +
+
+ + + +
+
+ + + + + + +
+
+
- + + + + -
+ - - - + + {{ form1.sendUserNum }} + + @@ -632,6 +682,7 @@ import {listUserLabel} from "@/api/staff/user/userlabel"; import {listUserGrade} from "@/api/staff/user/usergrade"; import {getOilNameList, oilNumberList} from "@/api/order/oilnumgun"; import {getListApi} from "@/api/setting/message"; +import {getCardCouponNum} from "@/api/EventMarketing/cardCoupon"; export default { data() { @@ -691,6 +742,8 @@ export default { } ], + // 优惠券列表信息 + couponList:[], total: 0, queryParams: { page: 1, @@ -779,8 +832,15 @@ export default { created() { this.getList() this.getUserLabelList() + this.getCardCoupon() }, methods: { + + getCardCoupon(){ + getCardCouponNum({status:1}).then(res => { + this.couponList = res.data + }) + }, // 定时群发选择分组 chooseGroup(){ this.groupList.forEach(item => { diff --git a/fuintAdmin/src/views/member/userLabel.vue b/fuintAdmin/src/views/member/userLabel.vue index a1601a1f7..a049ef59f 100644 --- a/fuintAdmin/src/views/member/userLabel.vue +++ b/fuintAdmin/src/views/member/userLabel.vue @@ -114,13 +114,13 @@ - + 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 87bce631c..6fde7433b 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 @@ -86,6 +86,11 @@ public class UserMassSend extends BaseEntity implements Serializable { */ private Integer points; + /** + * 赠送成长值 + */ + private Integer growthValue; + /** * 优惠券ID */