From 63be8c54152c10eb35f01489ad8d6272f9e6b796 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期三, 29 四月 2026 19:47:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TExchangeCodePackageServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TExchangeCodePackageServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TExchangeCodePackageServiceImpl.java
index 53f27ff..8a22735 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TExchangeCodePackageServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TExchangeCodePackageServiceImpl.java
@@ -263,11 +263,11 @@
if (Objects.equals(detail.getStatus(), CODE_STATUS_BOUND)) {
throw new ServiceException("兑换码已绑定");
}
- String bindPhone = StringUtils.hasText(dto.getPhone()) ? dto.getPhone() : phone;
+ String bindPhone = StringUtils.hasText(phone) ? phone : dto.getPhone();
if (!StringUtils.hasText(bindPhone)) {
throw new ServiceException("绑定手机号不能为空");
}
- if (Objects.equals(exchangePackage.getUnlimitedReceiveLimit(), 1) && exchangePackage.getReceiveLimit() != null) {
+ if (exchangePackage.getReceiveLimit() != null && exchangePackage.getReceiveLimit() > 0) {
Long bindCount = codeDetailMapper.selectCount(new QueryWrapper<TExchangeCodeDetail>()
.eq("package_id", exchangePackage.getId())
.eq("bind_phone", bindPhone)
--
Gitblit v1.7.1