From ec8a9e969c51e3b68f5a06ca43016b7d48d3cf8a 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: Fri, 15 Mar 2024 11:12:27 +0800
Subject: [PATCH] bug

---
 .../controller/ActiveNewlywedsRecordsController.java   |  2 +-
 .../mapper/xml/CardFavorableRecordMapper.xml           | 10 ++++++----
 .../marketingActivity/cardFavorable/vo/CouponVO.java   |  1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/controller/ActiveNewlywedsRecordsController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/controller/ActiveNewlywedsRecordsController.java
index a9cfa0aae..ea23ee948 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/controller/ActiveNewlywedsRecordsController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/controller/ActiveNewlywedsRecordsController.java
@@ -70,7 +70,7 @@ public class ActiveNewlywedsRecordsController extends BaseController {
         queryWrapper1.eq(ActiveNewlyweds::getStatus,0);
         ActiveNewlyweds activeNewlyweds = activeNewlywedsService.getOne(queryWrapper1);
         if (ObjectUtils.isEmpty(activeNewlyweds)){
-            return getFailureResult("0");
+            return getSuccessResult("0");
         }
         //活动记录
         LambdaQueryWrapper<ActiveNewlywedsRecords> queryWrapper = new LambdaQueryWrapper<>();
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml
index 2c2a05c59..551ae6c6f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml
@@ -92,13 +92,14 @@
         card_favorables.instruction,
         card_favorables.cardRecordId,
         card_favorables.endTime,
+        card_favorables.createTime,
         card_favorables.useStatus,
         card_favorables.exclusiveFunction
         from
         (SELECT
             '优惠券' AS couponType,
             cf.NAME couponName ,cf.id id,cf.discount_amount couponAmount,cf.card_detail couponContent,cf.instruction instruction,
-            cfr.id cardRecordId, cfr.end_time endTime, cf.exclusive_function exclusiveFunction,cfr.status useStatus
+            cfr.id cardRecordId, cfr.end_time endTime, cf.exclusive_function exclusiveFunction,cfr.status useStatus,cfr.create_time createTime
         FROM
             card_favorable cf
                 LEFT JOIN card_favorable_record cfr ON  cf.id = cfr.card_favorable_id
@@ -115,7 +116,7 @@
         SELECT
             '兑换券' AS couponType,
             ce.NAME couponName, ce.id id, ce.count couponAmount, ce.card_detail couponContent,ce.use_instructions instruction,cer.id cardRecordId,
-            cer.out_time endTime, ce.qr_code_link exclusiveFunction,cer.status useStatus
+            cer.out_time endTime, ce.qr_code_link exclusiveFunction,cer.status useStatus,cer.create_time createTime
         FROM
             card_exchange_record cer
                 LEFT JOIN card_exchange ce ON cer.card_exchange_id = ce.id
@@ -132,7 +133,7 @@
         SELECT
             '洗车券' AS couponType,
             ce.NAME couponName, ce.id id, ce.count couponAmount, ce.card_detail couponContent, ce.use_instructions instruction,
-            cer.id cardRecordId, cer.out_time endTime, ce.qr_code_link exclusiveFunction,cer.status useStatus
+            cer.id cardRecordId, cer.out_time endTime, ce.qr_code_link exclusiveFunction,cer.status useStatus,cer.create_time createTime
         FROM
             card_exchange_record cer
                 LEFT JOIN card_exchange ce ON cer.card_exchange_id = ce.id
@@ -149,7 +150,7 @@
         SELECT
             '洗车卡' AS couponType,
             ce.NAME couponName, ce.id id, ce.count couponAmount, ce.use_instructions couponContent,ce.use_instructions instruction,cer.id cardRecordId,
-            cer.out_time endTime, ce.qr_code_link exclusiveFunction,cer.status useStatus
+            cer.out_time endTime, ce.qr_code_link exclusiveFunction,cer.status useStatus,cer.create_time createTime
         FROM
             card_exchange_record cer
                 LEFT JOIN card_exchange ce ON cer.card_exchange_id = ce.id
@@ -168,6 +169,7 @@
                 and card_favorables.couponType = #{cardFavorableDTOS.couponType}
             </if>
         </where>
+        order by card_favorables.createTime desc
     </select>
 
     <select id="getCanUserCardFavorableList" resultType="com.fuint.business.marketingActivity.cardFavorable.vo.CardFavorableRecordVO">
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/vo/CouponVO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/vo/CouponVO.java
index 9d2f8e77e..f52cb1853 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/vo/CouponVO.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/vo/CouponVO.java
@@ -33,4 +33,5 @@ public class CouponVO implements Serializable {
     //券结束时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     private Date endTime;
+    private Date createTime;
 }