From 9063aa5a8459f8a01f07a8fd6613a78ff36af087 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Sat, 27 Sep 2025 15:20:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=BB=9F=E4=B8=80=20?=
 =?UTF-8?q?=E9=A2=86=E5=8F=96=E8=AE=B0=E5=BD=95=20=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MkShopCouponRecordServiceImpl.java   | 37 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java
index 6262a098..e472b6c9 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java
@@ -5,6 +5,7 @@ import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.czg.account.dto.QueryReceiveDto;
+import com.czg.account.entity.PictureGallery;
 import com.czg.account.entity.ShopInfo;
 import com.czg.account.entity.ShopUser;
 import com.czg.account.entity.UserInfo;
@@ -28,6 +29,7 @@ import com.czg.utils.AssertUtil;
 import com.czg.utils.PageUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
+import com.mybatisflex.core.update.UpdateWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -80,9 +82,27 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
     @Override
     public Page<MkShopCouponRecordDTO> getRecord(MkShopCouponRecordDTO mkShopCouponRecordDTO, String startTime, String endTime) {
         Map<Long, UserInfo> userInfoMap = new HashMap<>();
+        if (mkShopCouponRecordDTO.getCouponId() == null) {
+            throw new CzgException("优惠券Id不能为空");
+        }
+
+        ShopCoupon coupon = couponService.selectOneById(mkShopCouponRecordDTO.getCouponId());
+        AssertUtil.isNull(coupon, "优惠券不存在");
         QueryWrapper recordQueryWrapper = new QueryWrapper();
+        if (coupon.getSyncId() != null) {
+            recordQueryWrapper.and(q -> {
+                q.eq(MkShopCouponRecord::getCouponId, coupon.getId()).or(q1 -> {
+                    q1.eq(MkShopCouponRecord::getCouponSyncId, coupon.getSyncId());
+                });
+            });
+        }else {
+            recordQueryWrapper.and(q -> {
+                q.eq(MkShopCouponRecord::getCouponId, coupon.getId()).or(q1 -> {
+                    q1.eq(ShopCoupon::getSyncId, coupon.getId());
+                });
+            });
+        }
         recordQueryWrapper.eq(MkShopCouponRecord::getShopId, mkShopCouponRecordDTO.getShopId())
-                .eq(MkShopCouponRecord::getCouponId, mkShopCouponRecordDTO.getCouponId())
                 .eq(MkShopCouponRecord::getIsDel, 0)
                 .eq(MkShopCouponRecord::getStatus, mkShopCouponRecordDTO.getStatus())
                 .orderBy(MkShopCouponRecord::getCreateTime).desc();
@@ -190,7 +210,20 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
             record.setUseEndTime(end);
             save(record);
         }
-        couponService.update(coupon, true);
+        QueryWrapper queryWrapper = new QueryWrapper();
+        ShopCoupon newCoupon = new ShopCoupon();
+        newCoupon.setLeftNum(coupon.getLeftNum());
+        if (coupon.getSyncId() != null) {
+            queryWrapper.and(q -> {
+                q.eq(ShopCoupon::getId, coupon.getSyncId()).or(q1 -> {
+                    q1.eq(ShopCoupon::getSyncId, coupon.getSyncId());
+                });
+            });
+            couponService.updateByQuery(newCoupon, queryWrapper);
+        } else {
+            queryWrapper.eq(ShopCoupon::getId, coupon.getId());
+            couponService.update(coupon, true);
+        }
     }