From 04d91110c96358577580c1b840625d8a254bb1aa Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Wed, 5 Jan 2022 16:57:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cweb/controller/HighCouponAgentController.java   | 9 ++++++++-
 .../com/hai/service/impl/HighCouponAgentServiceImpl.java | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighCouponAgentController.java b/hai-cweb/src/main/java/com/cweb/controller/HighCouponAgentController.java
index 5645137b..c904232d 100644
--- a/hai-cweb/src/main/java/com/cweb/controller/HighCouponAgentController.java
+++ b/hai-cweb/src/main/java/com/cweb/controller/HighCouponAgentController.java
@@ -20,6 +20,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DeadlockLoserDataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
@@ -64,9 +65,15 @@ public class HighCouponAgentController {
                 log.error("HighCouponAgentController -> queryConvertCode() error!","兑换码已被使用");
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "兑换码已被使用");
             }
-
+            if (convertCode.getCouponCodeId() != null) {
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "兑换码已被使用");
+            }
             return ResponseMsgUtil.success(highCouponAgentService.useConvertCode(body.getString("code")));
 
+        } catch (DeadlockLoserDataAccessException deadlockLoserDataAccessException) {
+            log.error("HighActivityController -> userLottery() error!", "服务器繁忙");
+            return ResponseMsgUtil.builderResponse(ErrorCode.SERVER_BUSY_ERROR.getCode(),ErrorCode.SERVER_BUSY_ERROR.getMsg(),null);
+
         } catch (Exception e) {
             log.error("HighCouponAgentController --> useConvertCode() error!", e);
             return ResponseMsgUtil.exception(e);
diff --git a/hai-service/src/main/java/com/hai/service/impl/HighCouponAgentServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighCouponAgentServiceImpl.java
index 89e1dd80..4e2fa5ee 100644
--- a/hai-service/src/main/java/com/hai/service/impl/HighCouponAgentServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/HighCouponAgentServiceImpl.java
@@ -382,6 +382,9 @@ public class HighCouponAgentServiceImpl implements HighCouponAgentService {
         if (convertCode.getStatus() == 3) {
             throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "兑换码已被使用");
         }
+        if (convertCode.getCouponCodeId() != null) {
+            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "兑换码已被使用");
+        }
         // 查询未销售的卡券
         List<HighCouponCode> codeList = highCouponCodeService.getNoSaleCode(convertCode.getCouponId());
         if (codeList.size() == 0) {