From da011b48602ef0ee6f07f8c6b0617ab99d5f0c40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Mon, 4 Mar 2024 15:56:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E5=8F=91=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/EventMarketing/SaveBlock/index.vue  |  4 +--
 .../views/EventMarketing/giftBlock/index.vue  | 31 ++++++++++---------
 .../controller/ActiveOneCouponController.java |  1 +
 .../impl/ActiveOneCouponServiceImpl.java      |  4 +--
 .../CardFavorableRecordController.java        |  4 +--
 .../impl/CardFuelRecordServiceImpl.java       |  5 +--
 .../service/impl/CardGiftServiceImpl.java     |  4 +--
 .../service/impl/CardValueServiceImpl.java    |  3 +-
 8 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
index e2863c4ed..ae260108d 100644
--- a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
@@ -101,7 +101,7 @@
                 </template>
               </el-table-column>
 
-              <el-table-column
+<!--              <el-table-column
                 prop="activeStatus"
                 label="活动状态"
                 align="center"
@@ -118,7 +118,7 @@
                   </el-switch>
                 </template>
 
-              </el-table-column>
+              </el-table-column>-->
 
               <el-table-column
                 prop="createTime"
diff --git a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
index b2fe59e9e..b8f310dc9 100644
--- a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
@@ -89,7 +89,7 @@
 
         </div>
         <div class="sshi">
-          <div class="tj-text">已使用卡量</div>
+          <div class="tj-text">未使用卡量</div>
           <el-divider></el-divider>
           <div class="tj-num" v-if="twolist&&twolist.length == 0 ">暂无数据...</div>
           <div>
@@ -125,7 +125,7 @@
 
         </div>
         <div class="sshi">
-          <div class="tj-text">未使用卡量</div>
+          <div class="tj-text">已使用卡量</div>
           <el-divider></el-divider>
           <div class="tj-num" v-if="threelist&&threelist.length == 0 ">暂无数据...</div>
           <div>
@@ -165,17 +165,15 @@
       </div>
 
       <el-card  style="margin-bottom: 20px">
-        <div>
+<!--        <div>
           <el-button type="primary" icon="el-icon-plus" @click="daking()" >新增礼品卡</el-button>
+        </div>-->
+        <div class="title_">
+          电子礼品卡列表
         </div>
         <el-table
           :data="tableData"
           style="width: 100%">
-          <el-table-column
-            prop="id"
-            label="ID"
-            width="80">
-          </el-table-column>
           <el-table-column
             prop="number"
             label="电子礼品卡号"
@@ -239,11 +237,11 @@
             width="220"
           >
           </el-table-column>
-          <el-table-column
+<!--          <el-table-column
             prop="remark"
             label="备注信息"
             width="280">
-          </el-table-column>
+          </el-table-column>-->
         </el-table>
         <pagination
           v-show="total>0"
@@ -579,9 +577,14 @@ import {
     margin-bottom: 15px;
     display: flex;
     justify-content: space-between;
-
-
-
-
   }
+.title_{
+  width: 100%;
+  display: flex;
+  align-items: center;
+  font-size: 20px;
+  font-weight: bold;
+  justify-content: center;
+  margin-bottom: 20px;
+}
 </style>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/controller/ActiveOneCouponController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/controller/ActiveOneCouponController.java
index c2129aac3..778c985f8 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/controller/ActiveOneCouponController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/controller/ActiveOneCouponController.java
@@ -88,5 +88,6 @@ public class ActiveOneCouponController extends BaseController {
     public ResponseObject delete(@RequestParam("idList") List<Long> idList) {
         return getSuccessResult(this.activeOneCouponService.removeByIds(idList));
     }
+
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/impl/ActiveOneCouponServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/impl/ActiveOneCouponServiceImpl.java
index c559eaf4c..be3b54008 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/impl/ActiveOneCouponServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/impl/ActiveOneCouponServiceImpl.java
@@ -73,11 +73,11 @@ public class ActiveOneCouponServiceImpl extends ServiceImpl<ActiveOneCouponMappe
         String gradeIdStr = "";
         String gradeIdName = "";
         Integer[] gradeIds = activeOneCouponDTO.getGradeIds();
-        for (Integer gradeId : gradeIds) {
+       /* for (Integer gradeId : gradeIds) {
             gradeIdStr+=gradeId + ",";
             MtUserGrade mtUserGrade = mtUserGradeMapper.selectById(gradeId);
             gradeIdName +=  mtUserGrade.getName() + ",";
-        }
+        }*/
         activeOneCoupon.setGradeId(gradeIdStr);
         activeOneCoupon.setGradeName(gradeIdName);
         activeOneCoupon.setStoreId(nowAccountInfo.getStoreId());
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java
index 393d2840c..b057446f9 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java
@@ -112,8 +112,8 @@ public class CardFavorableRecordController extends BaseController {
      * 查询一键发券会员数接口
      *
      */
-    @GetMapping("getAdaptUserList")
-    public ResponseObject getAdaptUserList(@Param("cardFavorableAdnUserDTO") CardFavorableAdnUserDTO cardFavorableAdnUserDTO) {
+    @PostMapping("getAdaptUserList")
+    public ResponseObject getAdaptUserList(@RequestBody CardFavorableAdnUserDTO cardFavorableAdnUserDTO) {
         return getSuccessResult(this.cardFavorableRecordService.getAdaptUserList(cardFavorableAdnUserDTO));
     }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
index 25a54776f..a922a15ef 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
@@ -277,8 +277,9 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
     @Autowired
     private RedisLock redisLock;
 
-    @Autowired
-    private StaffCommissionService staffCommissionService;
+    /*@Autowired
+    private StaffCommissionService staffCommissionService;*/
+
     private static String beforeLitres = new String("0");
     /**
      * 查询支付状态 修改相关关联表
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/service/impl/CardGiftServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/service/impl/CardGiftServiceImpl.java
index b1ab74696..68a2a8db7 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/service/impl/CardGiftServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/service/impl/CardGiftServiceImpl.java
@@ -155,10 +155,10 @@ public class CardGiftServiceImpl extends ServiceImpl<CardGiftMapper, CardGift> i
         if(ObjectUtils.isNotEmpty(cardGift.getStatus())) {
             queryWrapper.eq(CardGift::getStatus,cardGift.getStatus());
         }
-        if(ObjectUtils.isNotEmpty(cardGift.getStatus())) {
+        if(ObjectUtils.isNotEmpty(cardGift.getSailStatus())) {
             queryWrapper.eq(CardGift::getSailStatus,cardGift.getSailStatus());
         }
-        if(ObjectUtils.isNotEmpty(cardGift.getStatus())) {
+        if(ObjectUtils.isNotEmpty(cardGift.getCardAmount())) {
             queryWrapper.eq(CardGift::getCardAmount,cardGift.getCardAmount());
         }
         queryWrapper.eq(CardGift::getStoreId, TokenUtil.getNowAccountInfo().getStoreId());
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java
index 320a9faed..76bf71055 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java
@@ -262,13 +262,14 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
     @Override
     public boolean updateOneById(CardValueDTO cardValueDTO) {
         boolean update = false;
-        //更新新人有礼活动
+        //更新活动
         CardValue cardValue = new CardValue();
         BeanUtils.copyProperties(cardValueDTO,cardValue);
         if (cardValueDTO.getIsonline().equals("1")){
             cardValue.setActiveStatus("2");
             cardValue.setUpdateBy(TokenUtil.getNowAccountInfo().getRealName());
         }
+        cardValue.setMembershipLevel(arrayToString(cardValueDTO.getMembershipLevel()));
         update =updateById(cardValue);
         //更新子表数据
         LambdaQueryWrapper<CardValueChild> queryWrapper = new LambdaQueryWrapper<>();