From a05437d3e7f6f2eea3942595fdb7258a2862d4f5 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Sat, 8 Mar 2025 17:41:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=B1=BB=E5=9E=8Bke?=
 =?UTF-8?q?y?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/account/vo/UserCouponVo.java        | 2 --
 .../service/account/service/impl/ShopActivateServiceImpl.java | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/UserCouponVo.java b/cash-common/cash-common-service/src/main/java/com/czg/account/vo/UserCouponVo.java
index 6889f94e..48f95c69 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/UserCouponVo.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/vo/UserCouponVo.java
@@ -25,8 +25,6 @@ public class UserCouponVo {
 
     //优惠券类型 1 满减 2 商品券
     private Integer type;
-    //数量
-    private Integer num;
     //到期时间
     private Date endTime;
     private String useRestrictions;
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopActivateServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopActivateServiceImpl.java
index 1acddb0e..a083eccc 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopActivateServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopActivateServiceImpl.java
@@ -160,14 +160,14 @@ public class ShopActivateServiceImpl extends ServiceImpl<ShopActivateMapper, Sho
      * 获取优惠券详细信息 目前仅返回 id 名称 剩余数量 赠送数量
      */
     private List<ShopCoupon> getCoupons(String couponJson) {
-        Map<Long, Integer> couponMap = JSONObject.parseObject(couponJson, new TypeReference<>() {
+        Map<String, Integer> couponMap = JSONObject.parseObject(couponJson, new TypeReference<>() {
         });
         List<ShopCoupon> list = couponService.queryChain()
                 .select(ShopCoupon::getId, ShopCoupon::getTitle, ShopCoupon::getLeftNumber)
                 .eq(ShopCoupon::getId, couponMap.keySet())
                 .list();
         list.forEach(coupon -> {
-            coupon.setNumber(couponMap.get(coupon.getId()));
+            coupon.setNumber(couponMap.get(coupon.getId().toString()));
         });
         return list;
     }