From 08b7e66bac11a7703e8fd369f02359077b586c03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Wed, 22 Oct 2025 11:32:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=91=E6=8D=A2=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/URedemptionController.java           | 15 ++++++--
 .../service/MkRedemptionConfigService.java    |  3 ++
 .../java/com/czg/market/vo/URedemptionVO.java | 36 +++++++++++++++++++
 .../impl/MkRedemptionConfigServiceImpl.java   | 30 ++++++++++++----
 4 files changed, 74 insertions(+), 10 deletions(-)
 create mode 100644 cash-common/cash-common-service/src/main/java/com/czg/market/vo/URedemptionVO.java

diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/URedemptionController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/URedemptionController.java
index f540d860..dc67da48 100644
--- a/cash-api/market-server/src/main/java/com/czg/controller/user/URedemptionController.java
+++ b/cash-api/market-server/src/main/java/com/czg/controller/user/URedemptionController.java
@@ -2,6 +2,7 @@ package com.czg.controller.user;
 
 import com.czg.market.dto.MkRedemptionDTO;
 import com.czg.market.service.MkRedemptionConfigService;
+import com.czg.market.vo.URedemptionVO;
 import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
 import jakarta.annotation.Resource;
@@ -17,17 +18,25 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/user/redemption")
 public class URedemptionController {
     @Resource
-    private MkRedemptionConfigService couponRedemptionConfigService;
+    private MkRedemptionConfigService redemptionConfigService;
 
     /**
      * 使用券码
      */
     @PostMapping("/exchange")
     public CzgResult<Boolean> exchange(@Validated @RequestBody MkRedemptionDTO dto) {
-        couponRedemptionConfigService.exchange(StpKit.USER.getLoginIdAsLong(), dto);
-
+        redemptionConfigService.exchange(StpKit.USER.getLoginIdAsLong(), dto);
         return CzgResult.success();
     }
 
+    /**
+     * 兑换码详细信息
+     * @param code 兑换码
+     */
+    @GetMapping
+    public CzgResult<URedemptionVO> get(@RequestParam String code) {
+        return CzgResult.success(redemptionConfigService.getInfo(code));
+    }
+
 
 }
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkRedemptionConfigService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkRedemptionConfigService.java
index 5ff6d2e3..2d273a52 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkRedemptionConfigService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkRedemptionConfigService.java
@@ -4,6 +4,7 @@ import com.czg.market.dto.MkRedemptionConfigDTO;
 import com.czg.market.dto.MkRedemptionDTO;
 import com.czg.market.vo.MkRedemptionCodeVO;
 import com.czg.market.vo.MkRedemptionConfigVO;
+import com.czg.market.vo.URedemptionVO;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.service.IService;
 import com.czg.market.entity.MkRedemptionConfig;
@@ -30,4 +31,6 @@ public interface MkRedemptionConfigService extends IService<MkRedemptionConfig>
     void exportCodeList(Long mainShopId, Long redemptionId, String code, Integer status, HttpServletResponse response, HttpServletRequest request, boolean isRecharge);
 
     void exchange(long userId, MkRedemptionDTO dto);
+
+    URedemptionVO getInfo(String code);
 }
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/URedemptionVO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/URedemptionVO.java
new file mode 100644
index 00000000..01a10024
--- /dev/null
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/URedemptionVO.java
@@ -0,0 +1,36 @@
+package com.czg.market.vo;
+
+import com.czg.market.dto.CouponInfoDTO;
+import com.mybatisflex.annotation.Column;
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 兑换码明细 实体类。
+ *
+ * @author zs
+ * @since 2025-10-21
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+public class URedemptionVO implements Serializable {
+
+    private String shopName;
+    private String name;
+    private List<CouponInfoDTO> couponInfoList;
+    private BigDecimal amount;
+
+}
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkRedemptionConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkRedemptionConfigServiceImpl.java
index b8558883..ccd2a578 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkRedemptionConfigServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkRedemptionConfigServiceImpl.java
@@ -8,6 +8,7 @@ import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import com.alibaba.fastjson2.JSONArray;
 import com.czg.account.dto.shopuser.ShopUserMoneyEditDTO;
+import com.czg.account.entity.ShopInfo;
 import com.czg.account.entity.ShopUser;
 import com.czg.account.service.ShopInfoService;
 import com.czg.account.service.ShopUserService;
@@ -25,6 +26,7 @@ import com.czg.market.service.MkEnableConfigService;
 import com.czg.market.service.MkShopCouponRecordService;
 import com.czg.market.vo.MkRedemptionConfigVO;
 import com.czg.market.vo.MkRedemptionCodeVO;
+import com.czg.market.vo.URedemptionVO;
 import com.czg.utils.AssertUtil;
 import com.czg.utils.MyQueryWrapper;
 import com.czg.utils.PageUtil;
@@ -282,16 +284,11 @@ public class MkRedemptionConfigServiceImpl extends ServiceImpl<MkCouponRedemptio
         }
     }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void exchange(long userId, MkRedemptionDTO dto) {
-
-        MkRedemptionCode redemptionCode = codeService.getOne(new QueryWrapper().eq(MkRedemptionCode::getCode, dto.getCode()));
+    private MkRedemptionConfigVO checkInfo(MkRedemptionCode redemptionCode) {
         AssertUtil.isNull(redemptionCode, "兑换码不存在");
         AssertUtil.isTrue(redemptionCode.getStatus() == 1, "兑换码已使用");
         Long mainShopId = redemptionCode.getMainShopId();
         enableConfigService.checkEnable(mainShopId, mainShopId, TableValueConstant.EnableConfig.Type.RECHARGE_REDEMPTION, true);
-        ShopUser shopUserInfo = shopUserService.getShopUserInfo(mainShopId, userId);
 
 
         AssertUtil.isTrue(redemptionCode.getStatus() != 0, "兑换码不存在");
@@ -305,6 +302,16 @@ public class MkRedemptionConfigServiceImpl extends ServiceImpl<MkCouponRedemptio
         if (config.getEndTime() != null) {
             AssertUtil.isTrue(config.getEndTime().isBefore(DateUtil.date().toLocalDateTime()), "兑换活动已结束");
         }
+        return config;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void exchange(long userId, MkRedemptionDTO dto) {
+        MkRedemptionCode redemptionCode = codeService.getOne(new QueryWrapper().eq(MkRedemptionCode::getCode, dto.getCode()));
+        MkRedemptionConfigVO config = checkInfo(redemptionCode);
+        ShopUser shopUserInfo = shopUserService.getShopUserInfo(redemptionCode.getMainShopId(), userId);
+
 
         if (config.getType() == 0) {
             ShopUserMoneyEditDTO shopUserMoneyEditDTO = new ShopUserMoneyEditDTO()
@@ -319,7 +326,7 @@ public class MkRedemptionConfigServiceImpl extends ServiceImpl<MkCouponRedemptio
             if (config.getCouponInfoList() != null && !config.getCouponInfoList().isEmpty()) {
                 config.getCouponInfoList().forEach(item -> {
                     MkShopCouponGiftDTO giftDTO = new MkShopCouponGiftDTO().setCouponId(item.getId())
-                            .setShopId(mainShopId)
+                            .setShopId(redemptionCode.getMainShopId())
                             .setSourceId(redemptionCode.getId())
                             .setShopUserId(shopUserInfo.getId())
                             .setSource("兑换码兑换");
@@ -347,4 +354,13 @@ public class MkRedemptionConfigServiceImpl extends ServiceImpl<MkCouponRedemptio
         AssertUtil.isTrue(!update, "库存不足");
 
     }
+
+    @Override
+    public URedemptionVO getInfo(String code) {
+        MkRedemptionCode redemptionCode = codeService.getOne(new QueryWrapper().eq(MkRedemptionCode::getCode, code).eq(MkRedemptionCode::getStatus, 0));
+        MkRedemptionConfigVO redemptionConfigVO = checkInfo(redemptionCode);
+        ShopInfo shopInfo = shopInfoService.getById(redemptionConfigVO.getMainShopId());
+        return new URedemptionVO().setShopName(shopInfo.getShopName())
+                .setName(redemptionConfigVO.getName()).setCouponInfoList(redemptionConfigVO.getCouponInfoList()).setAmount(redemptionConfigVO.getAmount());
+    }
 }