From a4be9373da003a00e3b6f0f126fc606fef253e3d Mon Sep 17 00:00:00 2001
From: wst <2450473462@qq.com>
Date: Mon, 18 Nov 2024 17:06:00 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9F=A5=E8=AF=A2=E9=A2=86=E5=8F=96?=
 =?UTF-8?q?=E7=9A=84=E4=BC=98=E6=83=A0=E5=88=B8=E6=97=B6=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0couponMation=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/skyeye/coupon/entity/CouponUse.java | 5 +++++
 .../com/skyeye/coupon/service/impl/CouponServiceImpl.java | 4 ++--
 .../skyeye/coupon/service/impl/CouponUseServiceImpl.java  | 8 ++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/entity/CouponUse.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/entity/CouponUse.java
index 8656c7d4..066c2467 100644
--- a/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/entity/CouponUse.java
+++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/entity/CouponUse.java
@@ -14,6 +14,7 @@ import com.skyeye.common.entity.features.OperatorUserInfo;
 import lombok.Data;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName: CouponUse
@@ -36,6 +37,10 @@ public class CouponUse extends OperatorUserInfo {
     @ApiModelProperty(value = "优惠券id", required = "required")
     private String couponId;
 
+    @TableField(exist = false)
+    @Property(value = "优惠券信息")
+    private Map<String, Object> couponMation;
+
     @TableField(value = "state")
     @Property(value = "状态，参考#CouponUseState")
     private Integer state;
diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/service/impl/CouponServiceImpl.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/service/impl/CouponServiceImpl.java
index fc8f6421..e036c135 100644
--- a/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/service/impl/CouponServiceImpl.java
+++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/service/impl/CouponServiceImpl.java
@@ -185,8 +185,8 @@ public class CouponServiceImpl extends SkyeyeBusinessServiceImpl<CouponDao, Coup
     }
 
     @Override
-    public Coupon getFromCache(String id) {
-        Coupon coupon = super.getFromCache(id);
+    public Coupon getDataFromDb(String id) {
+        Coupon coupon = super.getDataFromDb(id);
         coupon.setCouponMaterialList(couponMaterialService.queryListByCouponId(id));
         setDrawState(Collections.singletonList(coupon));// 设置是否可以领取状态
         return coupon;
diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/service/impl/CouponUseServiceImpl.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/service/impl/CouponUseServiceImpl.java
index c489ee55..f1218832 100644
--- a/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/service/impl/CouponUseServiceImpl.java
+++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/service/impl/CouponUseServiceImpl.java
@@ -149,6 +149,13 @@ public class CouponUseServiceImpl extends SkyeyeBusinessServiceImpl<CouponUseDao
         queryWrapper.eq(MybatisPlusUtil.toColumns(CouponUse::getState), CouponUseState.USED.getKey());
     }
 
+    @Override
+    protected List<Map<String, Object>> queryPageDataList(InputObject inputObject) {
+        List<Map<String, Object>> mapList = super.queryPageDataList(inputObject);
+        couponService.setMationForMap(mapList, "couponId", "couponMation");
+        return mapList;
+    }
+
     @Override
     public List<Map<String, Object>> queryDataList(InputObject inputObject) {
         Map<String, Object> params = inputObject.getParams();
@@ -159,6 +166,7 @@ public class CouponUseServiceImpl extends SkyeyeBusinessServiceImpl<CouponUseDao
         }
         // 查询时获取数据
         List<CouponUse> list = list(queryWrapper);
+        couponService.setDataMation(list, CouponUse::getCouponId);
         return JSONUtil.toList(JSONUtil.toJsonStr(list), null);
     }