From 27635d7b0d5141e3327f51190a40fbefab0d48eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 11 Mar 2025 09:34:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=88=86=E4=BA=AB?=
 =?UTF-8?q?=E5=A5=96=E5=8A=B1=E7=AE=A1=E7=90=86=E5=AD=97=E6=AE=B5=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/account/dto/ShopShareDTO.java   |  4 ++--
 .../service/impl/ShopShareServiceImpl.java       | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopShareDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopShareDTO.java
index 6f67e24a..7ad7f81b 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopShareDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopShareDTO.java
@@ -67,7 +67,7 @@ public class ShopShareDTO implements Serializable {
     /**
      * 新用户获得券
      */
-    private List<Long> newCouponIdList;
+    private List<Long> newCouponList;
 
     /**
      * 邀请人数
@@ -77,7 +77,7 @@ public class ShopShareDTO implements Serializable {
     /**
      * 奖励券
      */
-    private List<Long> rewardCouponIdList;
+    private List<Long> rewardCouponList;
 
     /**
      * 获取方法 get-新用户领取获得 use-新用户使用获得
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopShareServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopShareServiceImpl.java
index c0c2885d..3844657d 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopShareServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopShareServiceImpl.java
@@ -54,16 +54,16 @@ public class ShopShareServiceImpl extends ServiceImpl<ShopShareMapper, ShopShare
 
     @Override
     public Boolean add(Long shopId, ShopShareDTO shopShareDTO) {
-        if (shopShareDTO.getNewCouponIdList() != null && !shopShareDTO.getRewardCouponIdList().isEmpty()) {
-            long count = shopCouponService.count(new QueryWrapper().in(ShopCoupon::getId, shopShareDTO.getNewCouponIdList()).eq(ShopCoupon::getShopId, shopId));
-            if (count != shopShareDTO.getNewCouponIdList().size()) {
+        if (shopShareDTO.getNewCouponList() != null && !shopShareDTO.getRewardCouponList().isEmpty()) {
+            long count = shopCouponService.count(new QueryWrapper().in(ShopCoupon::getId, shopShareDTO.getNewCouponList()).eq(ShopCoupon::getShopId, shopId));
+            if (count != shopShareDTO.getNewCouponList().size()) {
                 throw new ApiNotPrintException("优惠券不存在");
             }
         }
 
-        if (shopShareDTO.getRewardCouponIdList() != null && !shopShareDTO.getRewardCouponIdList().isEmpty()) {
-            long count = shopCouponService.count(new QueryWrapper().in(ShopCoupon::getId, shopShareDTO.getRewardCouponIdList()).eq(ShopCoupon::getShopId, shopId));
-            if (count != shopShareDTO.getRewardCouponIdList().size()) {
+        if (shopShareDTO.getRewardCouponList() != null && !shopShareDTO.getRewardCouponList().isEmpty()) {
+            long count = shopCouponService.count(new QueryWrapper().in(ShopCoupon::getId, shopShareDTO.getRewardCouponList()).eq(ShopCoupon::getShopId, shopId));
+            if (count != shopShareDTO.getRewardCouponList().size()) {
                 throw new ApiNotPrintException("优惠券不存在");
             }
         }
@@ -72,8 +72,8 @@ public class ShopShareServiceImpl extends ServiceImpl<ShopShareMapper, ShopShare
             shopShare = new ShopShareVO();
             shopShare.setShopId(shopId);
         }
-        shopShare.setRewardCoupon(JSONArray.toJSONString(shopShareDTO.getRewardCouponIdList()));
-        shopShare.setNewCoupon(JSONArray.toJSONString(shopShareDTO.getNewCouponIdList()));
+        shopShare.setRewardCoupon(JSONArray.toJSONString(shopShareDTO.getRewardCouponList()));
+        shopShare.setNewCoupon(JSONArray.toJSONString(shopShareDTO.getNewCouponList()));
         BeanUtil.copyProperties(shopShareDTO, shopShare);
         return saveOrUpdate(shopShare);
     }