From 9e1da10fc5de5a596995ef9b5dadf8d3b3b41754 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: Tue, 5 Mar 2024 15:55:51 +0800
Subject: [PATCH] bug

---
 .../views/EventMarketing/SaveBlock/index.vue  | 12 ++++----
 .../EventMarketing/cardExchange/index.vue     | 29 +++++++++++--------
 .../EventMarketing/cardFavorable/index.vue    |  5 ++++
 .../views/EventMarketing/giftBlock/index.vue  |  5 ++++
 .../impl/ActiveOneCouponServiceImpl.java      | 28 +++++++++++++++++-
 .../activeOneCoupon/vo/ActiveOneCouponVO.java |  5 ++++
 .../cardExchange/entity/CardExchange.java     |  1 +
 .../service/impl/CardExchangeServiceImpl.java | 11 +++++--
 .../cardFavorable/entity/CardFavorable.java   |  1 +
 .../impl/CardFavorableServiceImpl.java        |  5 ++++
 10 files changed, 80 insertions(+), 22 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
index ae260108d..e64b3ad5f 100644
--- a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
@@ -27,10 +27,9 @@
               align="center"
               style="width: 100%">
               <el-table-column
-                prop="sort"
-                label="排序"
-                align="center"
-                width="110">
+                label="序号"
+                type="index"
+              >
               </el-table-column>
               <el-table-column
                 prop="groupOriented"
@@ -422,9 +421,8 @@
                   label="券类型"
                   width="80">
                   <template slot-scope="scope">
-                    <span v-if="scope.row.giftCardType == 0" >油品券</span>
-                    <span v-if="scope.row.giftCardType == 1"  >商品券</span>
-                    <span v-if="scope.row.giftCardType == 2"  >通用券</span>
+                    <span v-if="scope.row.giftCardType == 0" >商品兑换券</span>
+                    <span v-if="scope.row.giftCardType == 1" >洗车券</span>
                   </template>
                 </el-table-column>
                 <el-table-column
diff --git a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
index 79bc8153c..bcad5d892 100644
--- a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
@@ -62,18 +62,10 @@
       </el-row>
 
       <el-table v-loading="loading" :data="exchangeList" @selection-change="handleSelectionChange">
-        <el-table-column label="是否在线" align="center" prop="isonline">
-          <template slot-scope="scope">
-            <span v-if="scope.row.isonline == 0">在线</span>
-            <span v-if="scope.row.isonline == 1">下线</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="兑换券状态" align="center" prop="status">
-          <template slot-scope="scope">
-            <span v-if="scope.row.status == 0">  <el-tag>启用</el-tag> </span>
-            <span v-if="scope.row.status == 1">  <el-tag type="danger">禁用</el-tag> </span>
-
-          </template>
+        <el-table-column
+          label="序号"
+          type="index"
+        >
         </el-table-column>
         <el-table-column label="兑换券名称" align="center" prop="name"/>
         <el-table-column label="兑换券类型 " align="center" prop="type">
@@ -103,6 +95,19 @@
             <span>{{ scope.row.createTime }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="是否在线" align="center" prop="isonline">
+          <template slot-scope="scope">
+            <span v-if="scope.row.isonline == 0">在线</span>
+            <span v-if="scope.row.isonline == 1">下线</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="兑换券状态" align="center" prop="status">
+          <template slot-scope="scope">
+            <span v-if="scope.row.status == 0">  <el-tag>启用</el-tag> </span>
+            <span v-if="scope.row.status == 1">  <el-tag type="danger">禁用</el-tag> </span>
+
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
diff --git a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
index 8f3d88772..d882f8025 100644
--- a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
@@ -48,6 +48,11 @@
 
     <el-table v-loading="loading" :data="favorableList" @selection-change="handleSelectionChange">
 <!--      <el-table-column label="是否在线 0：在线 1： 下线" align="center" prop="isonline" />-->
+      <el-table-column
+        label="序号"
+        type="index"
+      >
+      </el-table-column>
       <el-table-column label="优惠券名称" align="center" prop="name" />
       <el-table-column label="卡券类型 " align="center" prop="type" >
                   <template slot-scope="scope">
diff --git a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
index b8f310dc9..416957b64 100644
--- a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
@@ -174,6 +174,11 @@
         <el-table
           :data="tableData"
           style="width: 100%">
+          <el-table-column
+            label="序号"
+            type="index"
+          >
+          </el-table-column>
           <el-table-column
             prop="number"
             label="电子礼品卡号"
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 b300f8f7b..11fa559c5 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
@@ -181,7 +181,7 @@ public class ActiveOneCouponServiceImpl extends ServiceImpl<ActiveOneCouponMappe
     @Override
     public ActiveOneCouponVO getOneById(Serializable id) {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
-
+        ArrayList<String> ids = new ArrayList<>();
         ActiveOneCouponVO activeOneCouponVO = new ActiveOneCouponVO();
         ActiveOneCoupon oneCoupon = getById(id);
         BeanUtils.copyProperties(oneCoupon, activeOneCouponVO);
@@ -191,18 +191,29 @@ public class ActiveOneCouponServiceImpl extends ServiceImpl<ActiveOneCouponMappe
         List<ActiveOneCouponChild> activeOneCouponChildren = activeOneCouponChildService.list(queryWrapper);
         ArrayList<CardFavorable> cardFavorableArrayList = new ArrayList<>();
         ArrayList<CardExchange> cardExchangeArrayList = new ArrayList<>();
+        ArrayList<Integer> cardFavorableIds = new ArrayList<>();
+        ArrayList<Integer> cardExchangeIds = new ArrayList<>();
         for (ActiveOneCouponChild activeOneCouponChild : activeOneCouponChildren) {
             //优惠券
             if (activeOneCouponChild.getActiveGift().equals("1")){
                 CardFavorable byId = cardFavorableService.getById(activeOneCouponChild.getVouchersId());
                 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());
             }
         }
+        String[] split = oneCoupon.getGradeId().split(",");
+        for (String s : split) {
+            ids.add(s);
+        }
+        activeOneCouponVO.setGradeIds(ids);
+        activeOneCouponVO.setCardExchangeIds(cardExchangeIds);
+        activeOneCouponVO.setCardFavorableIds(cardFavorableIds);
         activeOneCouponVO.setCardFavorableList(cardFavorableArrayList);
         activeOneCouponVO.setCardExchangeList(cardExchangeArrayList);
         return activeOneCouponVO;
@@ -214,6 +225,21 @@ public class ActiveOneCouponServiceImpl extends ServiceImpl<ActiveOneCouponMappe
         boolean flag = false;
         ActiveOneCoupon activeOneCoupon = new ActiveOneCoupon();
         BeanUtils.copyProperties(activeOneCouponDTO,activeOneCoupon);
+        activeOneCoupon.setConditions(activeOneCouponDTO.getCondition());
+
+        //会员等级
+        String gradeIdStr = "";
+        String gradeIdName = "";
+        Integer[] gradeIds = activeOneCouponDTO.getGradeIds();
+        for (Integer gradeId : gradeIds) {
+            gradeIdStr+=gradeId + ",";
+            MtUserGradeVO mtUserGrade = mtUserGradeMapper.selectByGradeId(gradeId);
+            gradeIdName +=  mtUserGrade.getName() + ",";
+        }
+        activeOneCoupon.setGradeId(gradeIdStr);
+        activeOneCoupon.setGradeName(gradeIdName);
+
+
         flag= updateById(activeOneCoupon);
 
         //更新子表数据
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/vo/ActiveOneCouponVO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/vo/ActiveOneCouponVO.java
index 0d806355f..e57c70e89 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/vo/ActiveOneCouponVO.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/vo/ActiveOneCouponVO.java
@@ -13,6 +13,8 @@ import java.util.List;
 @Data
 public class ActiveOneCouponVO extends ActiveOneCoupon implements Serializable {
     private List<LJUserVos> vosList;
+    //会员等级ids
+    private List<String> gradeIds;
     //优惠券领取数量
     private Integer couponReceiveCount;
     //优惠券使用数量
@@ -35,4 +37,7 @@ public class ActiveOneCouponVO extends ActiveOneCoupon implements Serializable {
     private List<CardFavorable> cardFavorableList;
     private List<CardExchange> cardExchangeList;
     private List<LJUserVos> userVos;
+    private List<Integer> cardFavorableIds;
+    //兑换券ids
+    private List<Integer>  cardExchangeIds;
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/entity/CardExchange.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/entity/CardExchange.java
index 8f5ef5691..4f096341f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/entity/CardExchange.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/entity/CardExchange.java
@@ -29,6 +29,7 @@ public class CardExchange extends Model<CardExchange> {
     private Integer storeId;
     //是否在线 0：在线 1： 下线
     private String isonline;
+    private String cardDetail;
     //兑换券状态 0：启用 1： 禁用
     private String status;
     //兑换券名称
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/service/impl/CardExchangeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/service/impl/CardExchangeServiceImpl.java
index 9131d2142..3d678e2f0 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/service/impl/CardExchangeServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/service/impl/CardExchangeServiceImpl.java
@@ -55,8 +55,15 @@ public class CardExchangeServiceImpl extends ServiceImpl<CardExchangeMapper, Car
         String secretKey = "sQPoC/1do9BZMkg8I5c09A==";
         CryptoUtils.encryptSymmetrically(secretKey, null,cardExchange.getQrCodeLink(), CryptoUtils.Algorithm.Encryption.AES_ECB_PKCS5);
         Integer giftId = cardExchange.getGiftId();
-        LJGoods ljGoods = goodsService.selectLJGoodsById(giftId);
-        cardExchange.setGiftName(ljGoods.getName());
+        if (ObjectUtils.isNotEmpty(giftId)){
+            LJGoods ljGoods = goodsService.selectLJGoodsById(giftId);
+            cardExchange.setGiftName(ljGoods.getName());
+        }
+        if (cardExchange.getType().equals("0")){
+            cardExchange.setCardDetail("可兑换-"+cardExchange.getGiftName());
+        }else {
+            cardExchange.setCardDetail("可兑换-"+"洗车券");
+        }
         return save(cardExchange);
     }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/entity/CardFavorable.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/entity/CardFavorable.java
index c1cbac44e..bd4b90d5f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/entity/CardFavorable.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/entity/CardFavorable.java
@@ -27,6 +27,7 @@ public class CardFavorable extends Model<CardFavorable> {
     private Integer storeId;
     //是否在线 0：在线 1： 下线
     private String isonline;
+    private String cardDetail;
     //优惠券名称
     private String name;
     //卡券类型 0：油品券 1：商品券 2：通用券
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableServiceImpl.java
index bd1d5e8b4..65e7457e0 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableServiceImpl.java
@@ -70,6 +70,11 @@ public class CardFavorableServiceImpl extends ServiceImpl<CardFavorableMapper, C
             oil += s + ",";
         }
         cardFavorable.setOilType(oil);
+        if (cardFavorableDTO.getType().equals("0")){
+            cardFavorable.setCardDetail("满"+cardFavorableDTO.getSatisfiedAmount()+"减"+cardFavorableDTO.getDiscountAmount());
+        }else {
+            cardFavorable.setCardDetail("满"+cardFavorableDTO.getSatisfiedAmount()+"打"+cardFavorableDTO.getSpecialDiscount()+"折");
+        }
         return save(cardFavorable);
     }