Merge remote-tracking branch 'origin/main'

fuintAdmin/src/views/member/index.vue

@@ -589,7 +589,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <!-- <el-row>
           <el-col :span="24">
             <el-form-item label="群发方式" prop="sendWay">
               <div style="display: flex">
@@ -603,20 +603,46 @@
               </div>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
 
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="群发礼品" prop="senfGift">
+
+        <el-form-item label="活动奖品" prop="senfGift">
+          <div style="display: flex">
+            <div style="width: 15%">
               <el-checkbox-group  v-model="form1.senfGift">
+                <div style="display: flex; font-size: 14px;">
                   <el-checkbox label="积分"></el-checkbox>
+                </div>
+                <div style="display: flex; font-size: 14px;margin: 15px 0;align-items: center">
                   <el-checkbox label="优惠券"></el-checkbox>
+                </div>
               </el-checkbox-group>
+            </div>
+            <div style="width: 85%">
+              <div style="display: flex; font-size: 14px;">
+                <el-input style="width: 100%; margin-left: 30px;" v-model="form1.points">
+                  <template slot="append">积分</template>
+                </el-input>
+              </div>
+              <div style="font-size: 14px;margin: 20px 0;display: flex;align-items: center">
+                <el-select v-model="form1.couponId" style="margin-left: 30px;width: 50%" >
+                  <el-option
+                    v-for="(item1,index1) in couponList"
+                    :key="index1"
+                    :label="item1.name"
+                    :value="item1.id"></el-option>
+                </el-select>
+                <el-input style="width: 40%; margin-left: 10px;" v-model="form1.couponTotal">
+                  <template slot="append">张</template>
+                </el-input>
+              </div>
+            </div>
+          </div>
         </el-form-item>
-          </el-col>
-        </el-row>
 
-        <el-row>
+
+
+        <!-- <el-row>
           <el-col :span="24">
             <el-form-item label="短信模板" prop="messageId" v-if="title != '修改会员'">
               <el-select v-model="form1.messageId" placeholder="请选择短信模板名称" style="width: 100%">
@@ -625,7 +651,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-form-item label="群发会员数量">
           {{ form1.sendUserNum }}
         </el-form-item>
@@ -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);
     },

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
      */