Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
  时舟年andCursor
|
af2422c114 |
@@ -1,202 +0,0 @@
|
||||
import java.util.Base64;
|
||||
import java.math.BigInteger;
|
||||
import java.io.ByteArrayInputStream;
|
||||
|
||||
public class KeyAnalyzer {
|
||||
public static void main(String[] args) {
|
||||
String privateKeyBase64 = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUIKPuIdfpOrej3LVpO1Arc2hSgmdB+YIPSiBVYPXa6AuAmil9mpbtSikQJ7Uu7lX4JyTW4QxQ06rPFKnFWVKkzivAElAgMBAAECggEAJd0AJ37iTlMpDQ90xqe7hvRQxAu256gbQ9nrqLY97g0/KIw6WEZSPakFX6gvdvb/NzKmUyAIEKGLoh6tXdZk6qfOqc/6BeK47nIcBfwT9/zerjNUVvn34w4aHyNINieMMHQ+Id8PUZmqWH+Euz9ilVTosuyEPwUZulLvUQqwXzU5VnwVghURbUhDd+ecBJACWgemRun6d5241PQXNYAdH1k7cETd8GfIi3qclhhJrxi7tu5tq4YGCXQIoz7HCLim7GIvT0M+FRgSw2EOrHnAQNFeQ/vQbP71ttLoTxehL6Se9dfWrV5OI+Y/T7vR2F84Qt0iNbaxyJGir7siKDFIwQKBgQDXDzinx3/TasplM78pR/0CtuuKr1Ch02LOPrTosJ1qf1OohxQThowhOTxMsBlgYSKu9s1QRffUUXEqYXxd2B6lzDKfggwO6U2XxIcxWeNow0xoFfqcXYSg7Ga2sCr9uhdwxIdFQNF7SNBpT8ht4fJrRX6mWY1nHybpyTDQ4xoQNQKBgQC6m+yiOoi5JD3zVSSJq/iq5DJPA5B4aoP+t5u9lp2Q7iVO0QI5ilBlEKGE4VOU0glnXlDTfuqEYooMY85ekl4WGb3AOT0PhLL2i+gO2nlWBzf4HPzB/hibjfyPyniRM03cHkG3HXucL7Sne6FwERcfjEqjUd2cdP1l89PNrq4rMQKBgQCMmjABSWYh8/y1I5rEQ4OAJdVjC3GdC1Xa35ZpVybjvLEWSpHunhW5lvD8dllw8LC7UTI0XDpGPqTM/4VO2YBYB2PFc0Gs8g0/v0ZgFpOeJ6kpl80MM/wFNemFYTIKRoMSv/psZY9PmfBgGcBBTuquBXZjDcNr+yr2yAm5V/DvTQKBgHqRi94KoF8q5N39IKCkqhJlDH5FkxDktYoKw2rFkPzuzuZz9gghRyj6wXxsG9/2DWMt2dzw0czehFoa/CO188KEadPmRKr6uCmkP2nyKhxNZX+8WnB5G2Sg4DD6BjMpBYz8+qDx5ozx8LDJTYI0V4HLPgMD9JGdbgsXGhlREOkhAoGALr6IQOXnviWNAhCdc7rrsaMLMPbLZ1wqzWtQUG1JxDobbpzEP4CW/mvW5pMn58mSBg5qbXhyDI4fFP0CPb98QIz2tGnIzYyFzdKmF5Z1N7X1OF9O+tsSqASoBZzTqB4fr/o4mz0s9JCeriBR2LWjsbsDU13DTLsfQpWbtOnIy70=";
|
||||
|
||||
System.out.println("========== 密钥分析开始 ==========");
|
||||
System.out.println("密钥长度: " + privateKeyBase64.length());
|
||||
|
||||
byte[] keyBytes = Base64.getDecoder().decode(privateKeyBase64);
|
||||
System.out.println("解码后长度: " + keyBytes.length + " bytes");
|
||||
|
||||
// 打印前30字节
|
||||
System.out.print("前30字节(hex): ");
|
||||
for (int i = 0; i < 30 && i < keyBytes.length; i++) {
|
||||
System.out.printf("%02X ", keyBytes[i]);
|
||||
}
|
||||
System.out.println();
|
||||
|
||||
// 解析ASN.1结构
|
||||
try {
|
||||
parseASN1(keyBytes);
|
||||
} catch (Exception e) {
|
||||
System.out.println("解析失败: " + e.getMessage());
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
static void parseASN1(byte[] keyBytes) throws Exception {
|
||||
ByteArrayInputStream bis = new ByteArrayInputStream(keyBytes);
|
||||
|
||||
// 读取SEQUENCE
|
||||
int tag = bis.read();
|
||||
System.out.println("第一个tag: 0x" + Integer.toHexString(tag));
|
||||
|
||||
if (tag == 0x30) {
|
||||
System.out.println("这是SEQUENCE");
|
||||
|
||||
// 读取长度
|
||||
int len = readASN1Length(bis);
|
||||
System.out.println("SEQUENCE长度: " + len);
|
||||
|
||||
// 检查下一个tag
|
||||
int nextTag = bis.read();
|
||||
System.out.println("下一个tag: 0x" + Integer.toHexString(nextTag));
|
||||
|
||||
if (nextTag == 0x02) {
|
||||
// INTEGER
|
||||
int intLen = readASN1Length(bis);
|
||||
byte[] versionBytes = new byte[intLen];
|
||||
bis.read(versionBytes);
|
||||
int version = new BigInteger(versionBytes).intValue();
|
||||
System.out.println("版本INTEGER值: " + version);
|
||||
|
||||
// 检查这是PKCS#8还是PKCS#1
|
||||
// PKCS#8: version=0后是SEQUENCE(算法标识符)
|
||||
// PKCS#1: version=0后是INTEGER(modulus)
|
||||
int afterVersionTag = bis.read();
|
||||
System.out.println("版本后的tag: 0x" + Integer.toHexString(afterVersionTag));
|
||||
|
||||
if (afterVersionTag == 0x30) {
|
||||
System.out.println(">>> 这是PKCS#8格式 (version后是SEQUENCE)");
|
||||
|
||||
// 解析PKCS#8
|
||||
// AlgorithmIdentifier: SEQUENCE { OID, NULL }
|
||||
int algLen = readASN1Length(bis);
|
||||
System.out.println("AlgorithmIdentifier长度: " + algLen);
|
||||
|
||||
// 跳过AlgorithmIdentifier内容
|
||||
byte[] algBytes = new byte[algLen];
|
||||
bis.read(algBytes);
|
||||
|
||||
// 打印OID
|
||||
System.out.print("OID bytes: ");
|
||||
for (int i = 0; i < algBytes.length; i++) {
|
||||
System.out.printf("%02X ", algBytes[i]);
|
||||
}
|
||||
System.out.println();
|
||||
|
||||
// 下一个应该是OCTET STRING (包含私钥)
|
||||
int octetTag = bis.read();
|
||||
System.out.println("下一个tag: 0x" + Integer.toHexString(octetTag));
|
||||
|
||||
if (octetTag == 0x04) {
|
||||
System.out.println("这是OCTET STRING (包含私钥数据)");
|
||||
int octetLen = readASN1Length(bis);
|
||||
System.out.println("OCTET STRING长度: " + octetLen);
|
||||
|
||||
// OCTET STRING内容是PKCS#1私钥
|
||||
byte[] pkcs1Bytes = new byte[octetLen];
|
||||
bis.read(pkcs1Bytes);
|
||||
|
||||
System.out.print("PKCS#1私钥前20字节: ");
|
||||
for (int i = 0; i < 20; i++) {
|
||||
System.out.printf("%02X ", pkcs1Bytes[i]);
|
||||
}
|
||||
System.out.println();
|
||||
|
||||
// 解析PKCS#1私钥
|
||||
ByteArrayInputStream pkcs1Stream = new ByteArrayInputStream(pkcs1Bytes);
|
||||
int pkcs1Tag = pkcs1Stream.read();
|
||||
System.out.println("PKCS#1第一个tag: 0x" + Integer.toHexString(pkcs1Tag));
|
||||
|
||||
if (pkcs1Tag == 0x30) {
|
||||
int pkcs1Len = readASN1Length(pkcs1Stream);
|
||||
System.out.println("PKCS#1 SEQUENCE长度: " + pkcs1Len);
|
||||
|
||||
// version
|
||||
int vTag = pkcs1Stream.read();
|
||||
int vLen = readASN1Length(pkcs1Stream);
|
||||
byte[] vBytes = new byte[vLen];
|
||||
pkcs1Stream.read(vBytes);
|
||||
System.out.println("PKCS#1版本: " + new BigInteger(vBytes));
|
||||
|
||||
// 解析私钥参数
|
||||
parsePKCS1(pkcs1Stream);
|
||||
}
|
||||
}
|
||||
} else if (afterVersionTag == 0x02) {
|
||||
System.out.println(">>> 这是PKCS#1格式 (version后是INTEGER)");
|
||||
|
||||
// 继续解析PKCS#1
|
||||
parsePKCS1(bis);
|
||||
} else {
|
||||
System.out.println(">>> 未知格式 (tag: 0x" + Integer.toHexString(afterVersionTag) + ")");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void parsePKCS1(ByteArrayInputStream bis) throws Exception {
|
||||
System.out.println("\n========== 解析PKCS#1私钥参数 ==========");
|
||||
|
||||
// modulus
|
||||
BigInteger modulus = readASN1Integer(bis);
|
||||
System.out.println("modulus长度: " + modulus.bitLength() + " bits");
|
||||
|
||||
// publicExponent
|
||||
BigInteger publicExponent = readASN1Integer(bis);
|
||||
System.out.println("publicExponent: " + publicExponent);
|
||||
|
||||
// privateExponent
|
||||
BigInteger privateExponent = readASN1Integer(bis);
|
||||
System.out.println("privateExponent长度: " + privateExponent.bitLength() + " bits");
|
||||
|
||||
// prime1
|
||||
BigInteger prime1 = readASN1Integer(bis);
|
||||
System.out.println("prime1长度: " + prime1.bitLength() + " bits");
|
||||
|
||||
// prime2
|
||||
BigInteger prime2 = readASN1Integer(bis);
|
||||
System.out.println("prime2长度: " + prime2.bitLength() + " bits");
|
||||
|
||||
// 验证 prime1 * prime2 == modulus
|
||||
BigInteger calculatedModulus = prime1.multiply(prime2);
|
||||
boolean valid = calculatedModulus.equals(modulus);
|
||||
System.out.println("\n验证 prime1 * prime2 == modulus: " + valid);
|
||||
|
||||
if (!valid) {
|
||||
System.out.println(">>> 密钥数学关系不正确！这是无效的RSA私钥");
|
||||
System.out.println("计算得到的modulus长度: " + calculatedModulus.bitLength() + " bits");
|
||||
}
|
||||
|
||||
// exponent1
|
||||
BigInteger exponent1 = readASN1Integer(bis);
|
||||
System.out.println("exponent1长度: " + exponent1.bitLength() + " bits");
|
||||
|
||||
// exponent2
|
||||
BigInteger exponent2 = readASN1Integer(bis);
|
||||
System.out.println("exponent2长度: " + exponent2.bitLength() + " bits");
|
||||
|
||||
// coefficient
|
||||
BigInteger coefficient = readASN1Integer(bis);
|
||||
System.out.println("coefficient长度: " + coefficient.bitLength() + " bits");
|
||||
|
||||
System.out.println("\n========== 解析完成 ==========");
|
||||
}
|
||||
|
||||
static int readASN1Length(ByteArrayInputStream bis) throws Exception {
|
||||
int firstByte = bis.read();
|
||||
if ((firstByte & 0x80) == 0) {
|
||||
return firstByte;
|
||||
}
|
||||
int numBytes = firstByte & 0x7F;
|
||||
int length = 0;
|
||||
for (int i = 0; i < numBytes; i++) {
|
||||
length = (length << 8) | (bis.read() & 0xFF);
|
||||
}
|
||||
return length;
|
||||
}
|
||||
|
||||
static BigInteger readASN1Integer(ByteArrayInputStream bis) throws Exception {
|
||||
int tag = bis.read();
|
||||
if (tag != 0x02) throw new Exception("期望INTEGER tag: 0x02, 实际: 0x" + Integer.toHexString(tag));
|
||||
int len = readASN1Length(bis);
|
||||
byte[] data = new byte[len];
|
||||
bis.read(data);
|
||||
return new BigInteger(1, data);
|
||||
}
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
Manifest-Version: 1.0
|
||||
Created-By: Maven JAR Plugin 3.4.2
|
||||
Build-Jdk-Spec: 21
|
||||
Implementation-Title: Gym Payment
|
||||
Implementation-Version: 1.0.0
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
artifactId=gym-payment
|
||||
groupId=cn.novalon.gym.manage
|
||||
version=1.0.0
|
||||
@@ -1,85 +0,0 @@
|
||||
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>cn.novalon.gym.manage</groupId>
|
||||
<artifactId>gym-manage-api</artifactId>
|
||||
<version>1.0.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>gym-payment</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>Gym Payment</name>
|
||||
<description>Payment Module - Integrates Huifu Payment Gateway</description>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>cn.novalon.gym.manage</groupId>
|
||||
<artifactId>manage-common</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-webflux</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springdoc</groupId>
|
||||
<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.projectreactor</groupId>
|
||||
<artifactId>reactor-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-all</artifactId>
|
||||
<version>5.8.25</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.squareup.okhttp3</groupId>
|
||||
<artifactId>okhttp</artifactId>
|
||||
<version>4.12.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-validation</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>3.4.2</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.11.0</version>
|
||||
<configuration>
|
||||
<source>21</source>
|
||||
<target>21</target>
|
||||
<annotationProcessorPaths>
|
||||
<path>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<version>${lombok.version}</version>
|
||||
</path>
|
||||
</annotationProcessorPaths>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
-1
@@ -1 +0,0 @@
|
||||
cn.novalon.gym.manage.payment.config.HuifuPayConfig
|
||||
@@ -14,7 +14,6 @@
|
||||
3. [团课管理接口](#团课管理接口)
|
||||
- [获取所有团课](#获取所有团课)
|
||||
- [分页获取团课](#分页获取团课)
|
||||
- [多条件查询团课](#多条件查询团课)
|
||||
- [根据ID获取团课详情](#根据ID获取团课详情)
|
||||
- [创建团课](#创建团课)
|
||||
- [更新团课](#更新团课)
|
||||
@@ -155,149 +154,6 @@
|
||||
|
||||
---
|
||||
|
||||
### 多条件查询团课
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| **HTTP方法** | POST |
|
||||
| **接口路径** | `/api/groupCourse/search` |
|
||||
| **所属文件** | `GroupCourseHandler.java` |
|
||||
|
||||
**功能说明**: 支持团课名称模糊查询、类型筛选、日期范围、时间段、价格排序、剩余名额排序等多条件组合查询，默认不查询不可预约的团课（已取消或已结束）。
|
||||
|
||||
**请求体**:
|
||||
|
||||
```json
|
||||
{
|
||||
"courseName": "瑜伽",
|
||||
"courseType": 1,
|
||||
"startDate": "2026-06-01T00:00:00",
|
||||
"endDate": "2026-06-30T23:59:59",
|
||||
"timePeriod": "morning",
|
||||
"priceSort": "asc",
|
||||
"remainingMost": true,
|
||||
"page": 0,
|
||||
"size": 10
|
||||
}
|
||||
```
|
||||
|
||||
| 参数名 | 类型 | 必填 | 默认值 | 说明 |
|
||||
|--------|------|------|--------|------|
|
||||
| courseName | String | 否 | - | 课程名称（模糊查询，不区分大小写） |
|
||||
| courseType | Long | 否 | - | 课程类型ID |
|
||||
| startDate | LocalDateTime | 否 | - | 查询开始日期 |
|
||||
| endDate | LocalDateTime | 否 | - | 查询结束日期 |
|
||||
| timePeriod | String | 否 | - | 时间段：`morning`(6:00-12:00)、`afternoon`(12:00-18:00)、`evening`(18:00-24:00) |
|
||||
| priceSort | String | 否 | - | 价格排序：`asc`(从低到高)、`desc`(从高到低) |
|
||||
| remainingMost | Boolean | 否 | false | 是否按剩余名额最多排序 |
|
||||
| page | Integer | 否 | 0 | 页码，从0开始 |
|
||||
| size | Integer | 否 | 10 | 每页数量，最大100 |
|
||||
|
||||
**查询条件优先级说明**:
|
||||
|
||||
| 优先级 | 条件类型 | 说明 |
|
||||
|--------|----------|------|
|
||||
| 1 | 默认过滤 | 自动过滤已删除和不可预约的团课（status != 0） |
|
||||
| 2 | 基础筛选 | courseName、courseType、startDate、endDate、timePeriod |
|
||||
| 3 | 排序规则 | remainingMost优先，其次priceSort，默认按startTime升序 |
|
||||
|
||||
**成功响应** (200 OK):
|
||||
|
||||
```json
|
||||
{
|
||||
"success": true,
|
||||
"message": "查询成功",
|
||||
"data": {
|
||||
"content": [
|
||||
{
|
||||
"id": 1,
|
||||
"courseName": "瑜伽入门",
|
||||
"coachId": 1,
|
||||
"courseType": 1,
|
||||
"startTime": "2026-06-15T09:00:00",
|
||||
"endTime": "2026-06-15T10:00:00",
|
||||
"maxMembers": 20,
|
||||
"currentMembers": 5,
|
||||
"status": 0,
|
||||
"location": "健身房A区",
|
||||
"coverImage": "https://example.com/yoga.jpg",
|
||||
"description": "适合初学者的瑜伽课程",
|
||||
"pointCardAmount": 1,
|
||||
"storedValueAmount": 50.00,
|
||||
"createdAt": "2026-06-01T10:00:00",
|
||||
"updatedAt": "2026-06-01T10:00:00"
|
||||
}
|
||||
],
|
||||
"totalPages": 3,
|
||||
"totalElements": 25,
|
||||
"currentPage": 0,
|
||||
"pageSize": 10,
|
||||
"first": true,
|
||||
"last": false
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
**失败响应** (400 Bad Request):
|
||||
|
||||
```json
|
||||
{
|
||||
"success": false,
|
||||
"message": "查询失败的原因"
|
||||
}
|
||||
```
|
||||
|
||||
**使用示例**:
|
||||
|
||||
1. **查询瑜伽课程**
|
||||
```json
|
||||
{
|
||||
"courseName": "瑜伽"
|
||||
}
|
||||
```
|
||||
|
||||
2. **查询特定类型的早晨课程**
|
||||
```json
|
||||
{
|
||||
"courseType": 1,
|
||||
"timePeriod": "morning"
|
||||
}
|
||||
```
|
||||
|
||||
3. **查询下周的课程，按价格从低到高排序**
|
||||
```json
|
||||
{
|
||||
"startDate": "2026-06-16T00:00:00",
|
||||
"endDate": "2026-06-22T23:59:59",
|
||||
"priceSort": "asc"
|
||||
}
|
||||
```
|
||||
|
||||
4. **查询剩余名额最多的晚间课程**
|
||||
```json
|
||||
{
|
||||
"timePeriod": "evening",
|
||||
"remainingMost": true
|
||||
}
|
||||
```
|
||||
|
||||
5. **多条件组合查询**
|
||||
```json
|
||||
{
|
||||
"courseName": "瑜伽",
|
||||
"courseType": 1,
|
||||
"startDate": "2026-06-01T00:00:00",
|
||||
"endDate": "2026-06-30T23:59:59",
|
||||
"timePeriod": "morning",
|
||||
"priceSort": "asc",
|
||||
"remainingMost": true,
|
||||
"page": 0,
|
||||
"size": 10
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 根据ID获取团课详情
|
||||
|
||||
| 属性 | 值 |
|
||||
@@ -604,26 +460,26 @@
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| **HTTP方法** | POST |
|
||||
| **接口路径** | `/api/groupCourse/signin/{memberId}` |
|
||||
| **接口路径** | `/api/groupCourse/{courseId}/signin` |
|
||||
| **所属文件** | `GroupCourseHandler.java` |
|
||||
|
||||
**路径参数**:
|
||||
|
||||
| 参数名 | 类型 | 必填 | 说明 |
|
||||
|--------|------|------|------|
|
||||
| memberId | Long | 是 | 会员ID |
|
||||
| courseId | Long | 是 | 团课ID |
|
||||
|
||||
**请求体**:
|
||||
|
||||
```json
|
||||
{
|
||||
"courseId": 1
|
||||
"memberId": 1001
|
||||
}
|
||||
```
|
||||
|
||||
| 参数名 | 类型 | 必填 | 说明 |
|
||||
|--------|------|------|------|
|
||||
| courseId | Long | **是** | 团课ID |
|
||||
| memberId | Long | **是** | 会员ID |
|
||||
|
||||
**成功响应** (200 OK):
|
||||
|
||||
@@ -638,39 +494,16 @@
|
||||
}
|
||||
```
|
||||
|
||||
**失败响应** (400 Bad Request) —— 校验规则及对应错误信息:
|
||||
|
||||
| 序号 | 校验规则 | 错误信息 |
|
||||
|------|----------|----------|
|
||||
| 1 | 团课不存在或已被删除 | `团课不存在或已删除` |
|
||||
| 2 | 团课状态为"已取消" | `团课已取消，无法签到` |
|
||||
| 3 | 团课状态为"已结束" | `团课已结束，无法签到` |
|
||||
| 4 | 当前时间早于开课前2小时 | `未到签到时间，请在开课前2小时内签到` |
|
||||
| 5 | 当前时间晚于团课结束时间 | `团课已结束，无法签到` |
|
||||
| 6 | 课程当前人数已达上限 | `课程已满员，无法签到` |
|
||||
| 7 | 用户今日无到店签到记录 | `请先完成到店签到` |
|
||||
| 8 | 到店签到状态非SUCCESS | `到店签到未成功，请重新签到` |
|
||||
| 9 | 用户未预约此课程 | `您未预约此课程，无法签到` |
|
||||
| - | 请求体为空 | `请求体不能为空` |
|
||||
| - | 请求体缺少courseId | `courseId不能为空` |
|
||||
|
||||
> **说明**: 校验按上表顺序依次执行，命中第一个失败条件即返回对应错误信息。
|
||||
|
||||
**失败响应示例**:
|
||||
**失败响应** (400 Bad Request):
|
||||
|
||||
```json
|
||||
{
|
||||
"success": false,
|
||||
"message": "未到签到时间，请在开课前2小时内签到"
|
||||
"message": "课程已满员"
|
||||
}
|
||||
```
|
||||
|
||||
```json
|
||||
{
|
||||
"success": false,
|
||||
"message": "您未预约此课程，无法签到"
|
||||
}
|
||||
```
|
||||
---
|
||||
|
||||
### 删除团课
|
||||
|
||||
@@ -1660,14 +1493,7 @@
|
||||
### 团课管理
|
||||
1. **创建团课**：课程名称为必填项
|
||||
2. **取消团课**：需提前24小时通知，否则拒绝操作
|
||||
3. **团课签到**：严格按以下顺序校验，任一不通过即拒绝签到：
|
||||
- 团课是否存在且未被删除
|
||||
- 团课状态不为"已取消"
|
||||
- 团课状态不为"已结束"（含已过结束时间）
|
||||
- 当前时间在开课前2小时内（签到时间窗口）
|
||||
- 课程当前人数未达到最大人数上限
|
||||
- 用户今日已成功到店签到（查询 sign_in_record 表当日 SUCCESS 记录）
|
||||
- 用户已预约该课程（有效预约）
|
||||
3. **团课签到**：验证课程状态必须为正常，且未达最大人数限制
|
||||
4. **删除团课**：采用软删除机制，数据保留可恢复
|
||||
|
||||
### 团课预约
|
||||
|
||||
@@ -1,530 +0,0 @@
|
||||
# 团课推荐模块 API 文档
|
||||
|
||||
> **文档版本**: v1.0
|
||||
> **创建日期**: 2026-06-15
|
||||
> **作者**: 张翔
|
||||
> **状态**: 正式发布
|
||||
|
||||
---
|
||||
|
||||
## 📋 目录
|
||||
|
||||
1. [概述](#概述)
|
||||
2. [基础路径](#基础路径)
|
||||
3. [团课推荐管理接口](#团课推荐管理接口)
|
||||
- [获取所有团课推荐](#获取所有团课推荐)
|
||||
- [获取所有启用的团课推荐](#获取所有启用的团课推荐)
|
||||
- [根据ID获取团课推荐](#根据ID获取团课推荐)
|
||||
- [根据团课ID获取推荐](#根据团课ID获取推荐)
|
||||
- [创建团课推荐](#创建团课推荐)
|
||||
- [更新团课推荐](#更新团课推荐)
|
||||
- [删除团课推荐](#删除团课推荐)
|
||||
- [启用团课推荐](#启用团课推荐)
|
||||
- [禁用团课推荐](#禁用团课推荐)
|
||||
4. [数据模型](#数据模型)
|
||||
- [GroupCourseRecommend（团课推荐）](#GroupCourseRecommend团课推荐)
|
||||
5. [状态码说明](#状态码说明)
|
||||
6. [业务规则](#业务规则)
|
||||
|
||||
---
|
||||
|
||||
## 概述
|
||||
|
||||
团课推荐模块提供团课推荐信息的创建、编辑、查询、删除和状态管理功能。推荐信息包含团课ID、推荐标题、推荐内容、推荐理由、优先级等必要信息，支持按优先级排序展示。
|
||||
|
||||
## 基础路径
|
||||
|
||||
所有接口的基础路径为: `http://{host}:{port}/api/groupCourse/recommend`
|
||||
|
||||
---
|
||||
|
||||
## 团课推荐管理接口
|
||||
|
||||
### 获取所有团课推荐
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| **HTTP方法** | GET |
|
||||
| **接口路径** | `/api/groupCourse/recommend/list` |
|
||||
| **所属文件** | `GroupCourseRecommendHandler.java` |
|
||||
|
||||
**请求参数**:
|
||||
|
||||
| 参数名 | 类型 | 必填 | 默认值 | 说明 |
|
||||
|--------|------|------|--------|------|
|
||||
| sortBy | string | 否 | priority | 排序字段（支持：priority、createdAt、updatedAt） |
|
||||
| sortOrder | string | 否 | desc | 排序方式（asc-升序，desc-降序） |
|
||||
|
||||
**成功响应** (200 OK):
|
||||
|
||||
```json
|
||||
[
|
||||
{
|
||||
"id": 1,
|
||||
"courseId": 1,
|
||||
"recommendTitle": "本周热门课程",
|
||||
"recommendContent": "这是一门非常棒的课程，快来参加吧！",
|
||||
"recommendReason": "教练专业，课程内容丰富",
|
||||
"priority": 10,
|
||||
"isActive": true,
|
||||
"groupCourse": {
|
||||
"id": 1,
|
||||
"courseName": "瑜伽入门",
|
||||
"coachId": 1,
|
||||
"courseType": 1,
|
||||
"startTime": "2026-06-15T09:00:00",
|
||||
"endTime": "2026-06-15T10:00:00",
|
||||
"maxMembers": 20,
|
||||
"currentMembers": 15,
|
||||
"status": 0,
|
||||
"location": "健身房A区",
|
||||
"coverImage": "https://example.com/yoga.jpg",
|
||||
"description": "适合初学者的瑜伽课程"
|
||||
},
|
||||
"createdAt": "2026-06-15T10:00:00",
|
||||
"updatedAt": "2026-06-15T10:00:00"
|
||||
}
|
||||
]
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 获取所有启用的团课推荐
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| **HTTP方法** | GET |
|
||||
| **接口路径** | `/api/groupCourse/recommend/active` |
|
||||
| **所属文件** | `GroupCourseRecommendHandler.java` |
|
||||
|
||||
**功能说明**: 获取系统中所有已启用的团课推荐列表，按优先级从高到低排序。
|
||||
|
||||
**成功响应** (200 OK):
|
||||
|
||||
```json
|
||||
[
|
||||
{
|
||||
"id": 2,
|
||||
"courseId": 3,
|
||||
"recommendTitle": "新学员推荐",
|
||||
"recommendContent": "专为新学员设计的入门课程，轻松上手",
|
||||
"recommendReason": "零基础友好，教练耐心指导",
|
||||
"priority": 20,
|
||||
"isActive": true,
|
||||
"groupCourse": {
|
||||
"id": 3,
|
||||
"courseName": "基础有氧",
|
||||
"coachId": 2,
|
||||
"courseType": 2,
|
||||
"startTime": "2026-06-16T18:00:00",
|
||||
"endTime": "2026-06-16T19:00:00",
|
||||
"maxMembers": 30,
|
||||
"currentMembers": 8,
|
||||
"status": 0,
|
||||
"location": "健身房B区",
|
||||
"coverImage": "https://example.com/aerobic.jpg",
|
||||
"description": "适合所有健身水平的有氧课程"
|
||||
},
|
||||
"createdAt": "2026-06-15T11:00:00",
|
||||
"updatedAt": "2026-06-15T11:00:00"
|
||||
}
|
||||
]
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 根据ID获取团课推荐
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| **HTTP方法** | GET |
|
||||
| **接口路径** | `/api/groupCourse/recommend/{id}` |
|
||||
| **所属文件** | `GroupCourseRecommendHandler.java` |
|
||||
|
||||
**路径参数**:
|
||||
|
||||
| 参数名 | 类型 | 必填 | 说明 |
|
||||
|--------|------|------|------|
|
||||
| id | Long | 是 | 团课推荐ID |
|
||||
|
||||
**成功响应** (200 OK):
|
||||
|
||||
```json
|
||||
{
|
||||
"id": 1,
|
||||
"courseId": 1,
|
||||
"recommendTitle": "本周热门课程",
|
||||
"recommendContent": "这是一门非常棒的课程，快来参加吧！",
|
||||
"recommendReason": "教练专业，课程内容丰富",
|
||||
"priority": 10,
|
||||
"isActive": true,
|
||||
"groupCourse": {
|
||||
"id": 1,
|
||||
"courseName": "瑜伽入门",
|
||||
"coachId": 1,
|
||||
"courseType": 1,
|
||||
"startTime": "2026-06-15T09:00:00",
|
||||
"endTime": "2026-06-15T10:00:00",
|
||||
"maxMembers": 20,
|
||||
"currentMembers": 15,
|
||||
"status": 0,
|
||||
"location": "健身房A区",
|
||||
"coverImage": "https://example.com/yoga.jpg",
|
||||
"description": "适合初学者的瑜伽课程"
|
||||
},
|
||||
"createdAt": "2026-06-15T10:00:00",
|
||||
"updatedAt": "2026-06-15T10:00:00"
|
||||
}
|
||||
```
|
||||
|
||||
**失败响应** (404 Not Found):
|
||||
|
||||
```json
|
||||
{}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 根据团课ID获取推荐
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| **HTTP方法** | GET |
|
||||
| **接口路径** | `/api/groupCourse/recommend/course/{courseId}` |
|
||||
| **所属文件** | `GroupCourseRecommendHandler.java` |
|
||||
|
||||
**路径参数**:
|
||||
|
||||
| 参数名 | 类型 | 必填 | 说明 |
|
||||
|--------|------|------|------|
|
||||
| courseId | Long | 是 | 团课ID |
|
||||
|
||||
**成功响应** (200 OK):
|
||||
|
||||
```json
|
||||
[
|
||||
{
|
||||
"id": 1,
|
||||
"courseId": 1,
|
||||
"recommendTitle": "本周热门课程",
|
||||
"recommendContent": "这是一门非常棒的课程，快来参加吧！",
|
||||
"recommendReason": "教练专业，课程内容丰富",
|
||||
"priority": 10,
|
||||
"isActive": true,
|
||||
"groupCourse": {
|
||||
"id": 1,
|
||||
"courseName": "瑜伽入门",
|
||||
"coachId": 1,
|
||||
"courseType": 1,
|
||||
"startTime": "2026-06-15T09:00:00",
|
||||
"endTime": "2026-06-15T10:00:00",
|
||||
"maxMembers": 20,
|
||||
"currentMembers": 15,
|
||||
"status": 0,
|
||||
"location": "健身房A区"
|
||||
},
|
||||
"createdAt": "2026-06-15T10:00:00",
|
||||
"updatedAt": "2026-06-15T10:00:00"
|
||||
}
|
||||
]
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 创建团课推荐
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| **HTTP方法** | POST |
|
||||
| **接口路径** | `/api/groupCourse/recommend` |
|
||||
| **所属文件** | `GroupCourseRecommendHandler.java` |
|
||||
|
||||
**请求体**:
|
||||
|
||||
```json
|
||||
{
|
||||
"courseId": 1,
|
||||
"recommendTitle": "本周热门课程",
|
||||
"recommendContent": "这是一门非常棒的课程，快来参加吧！",
|
||||
"recommendReason": "教练专业，课程内容丰富",
|
||||
"priority": 10,
|
||||
"isActive": true
|
||||
}
|
||||
```
|
||||
|
||||
| 参数名 | 类型 | 必填 | 默认值 | 说明 |
|
||||
|--------|------|------|--------|------|
|
||||
| courseId | Long | **是** | - | 团课ID（必须是有效的团课） |
|
||||
| recommendTitle | String | 否 | - | 推荐标题 |
|
||||
| recommendContent | String | 否 | - | 推荐内容 |
|
||||
| recommendReason | String | 否 | - | 推荐理由 |
|
||||
| priority | Integer | 否 | 0 | 优先级（数字越大优先级越高） |
|
||||
| isActive | Boolean | 否 | true | 是否启用 |
|
||||
|
||||
**成功响应** (200 OK):
|
||||
|
||||
```json
|
||||
{
|
||||
"success": true,
|
||||
"message": "团课推荐创建成功",
|
||||
"data": {
|
||||
"id": 1,
|
||||
"courseId": 1,
|
||||
"recommendTitle": "本周热门课程",
|
||||
"recommendContent": "这是一门非常棒的课程，快来参加吧！",
|
||||
"recommendReason": "教练专业，课程内容丰富",
|
||||
"priority": 10,
|
||||
"isActive": true,
|
||||
"createdAt": "2026-06-15T10:00:00",
|
||||
"updatedAt": "2026-06-15T10:00:00"
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
**失败响应** (400 Bad Request):
|
||||
|
||||
```json
|
||||
{
|
||||
"success": false,
|
||||
"message": "团课ID不能为空"
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 更新团课推荐
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| **HTTP方法** | PUT |
|
||||
| **接口路径** | `/api/groupCourse/recommend/{id}` |
|
||||
| **所属文件** | `GroupCourseRecommendHandler.java` |
|
||||
|
||||
**路径参数**:
|
||||
|
||||
| 参数名 | 类型 | 必填 | 说明 |
|
||||
|--------|------|------|------|
|
||||
| id | Long | 是 | 团课推荐ID |
|
||||
|
||||
**请求体**:
|
||||
|
||||
```json
|
||||
{
|
||||
"recommendTitle": "本周热门课程（更新）",
|
||||
"recommendContent": "更新后的推荐内容",
|
||||
"recommendReason": "更新后的推荐理由",
|
||||
"priority": 15,
|
||||
"isActive": true
|
||||
}
|
||||
```
|
||||
|
||||
| 参数名 | 类型 | 必填 | 说明 |
|
||||
|--------|------|------|------|
|
||||
| courseId | Long | 否 | 团课ID |
|
||||
| recommendTitle | String | 否 | 推荐标题 |
|
||||
| recommendContent | String | 否 | 推荐内容 |
|
||||
| recommendReason | String | 否 | 推荐理由 |
|
||||
| priority | Integer | 否 | 优先级 |
|
||||
| isActive | Boolean | 否 | 是否启用 |
|
||||
|
||||
**成功响应** (200 OK):
|
||||
|
||||
```json
|
||||
{
|
||||
"success": true,
|
||||
"message": "团课推荐更新成功",
|
||||
"data": {
|
||||
"id": 1,
|
||||
"courseId": 1,
|
||||
"recommendTitle": "本周热门课程（更新）",
|
||||
"recommendContent": "更新后的推荐内容",
|
||||
"recommendReason": "更新后的推荐理由",
|
||||
"priority": 15,
|
||||
"isActive": true,
|
||||
"updatedAt": "2026-06-15T12:00:00"
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
**失败响应** (400 Bad Request):
|
||||
|
||||
```json
|
||||
{
|
||||
"success": false,
|
||||
"message": "团课推荐不存在"
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 删除团课推荐
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| **HTTP方法** | DELETE |
|
||||
| **接口路径** | `/api/groupCourse/recommend/{id}` |
|
||||
| **所属文件** | `GroupCourseRecommendHandler.java` |
|
||||
|
||||
**路径参数**:
|
||||
|
||||
| 参数名 | 类型 | 必填 | 说明 |
|
||||
|--------|------|------|------|
|
||||
| id | Long | 是 | 团课推荐ID |
|
||||
|
||||
**成功响应** (200 OK):
|
||||
|
||||
```json
|
||||
{
|
||||
"success": true,
|
||||
"message": "团课推荐删除成功"
|
||||
}
|
||||
```
|
||||
|
||||
**失败响应** (400 Bad Request):
|
||||
|
||||
```json
|
||||
{
|
||||
"success": false,
|
||||
"message": "团课推荐不存在"
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 启用团课推荐
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| **HTTP方法** | POST |
|
||||
| **接口路径** | `/api/groupCourse/recommend/{id}/enable` |
|
||||
| **所属文件** | `GroupCourseRecommendHandler.java` |
|
||||
|
||||
**路径参数**:
|
||||
|
||||
| 参数名 | 类型 | 必填 | 说明 |
|
||||
|--------|------|------|------|
|
||||
| id | Long | 是 | 团课推荐ID |
|
||||
|
||||
**成功响应** (200 OK):
|
||||
|
||||
```json
|
||||
{
|
||||
"success": true,
|
||||
"message": "团课推荐启用成功",
|
||||
"data": {
|
||||
"id": 1,
|
||||
"courseId": 1,
|
||||
"recommendTitle": "本周热门课程",
|
||||
"isActive": true
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
**失败响应** (400 Bad Request):
|
||||
|
||||
```json
|
||||
{
|
||||
"success": false,
|
||||
"message": "团课推荐不存在"
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 禁用团课推荐
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| **HTTP方法** | POST |
|
||||
| **接口路径** | `/api/groupCourse/recommend/{id}/disable` |
|
||||
| **所属文件** | `GroupCourseRecommendHandler.java` |
|
||||
|
||||
**路径参数**:
|
||||
|
||||
| 参数名 | 类型 | 必填 | 说明 |
|
||||
|--------|------|------|------|
|
||||
| id | Long | 是 | 团课推荐ID |
|
||||
|
||||
**成功响应** (200 OK):
|
||||
|
||||
```json
|
||||
{
|
||||
"success": true,
|
||||
"message": "团课推荐禁用成功",
|
||||
"data": {
|
||||
"id": 1,
|
||||
"courseId": 1,
|
||||
"recommendTitle": "本周热门课程",
|
||||
"isActive": false
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
**失败响应** (400 Bad Request):
|
||||
|
||||
```json
|
||||
{
|
||||
"success": false,
|
||||
"message": "团课推荐不存在"
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 数据模型
|
||||
|
||||
### GroupCourseRecommend（团课推荐）
|
||||
|
||||
| 字段名 | 类型 | 说明 |
|
||||
|--------|------|------|
|
||||
| id | Long | 主键ID |
|
||||
| courseId | Long | 团课ID（关联group_course.id） |
|
||||
| recommendTitle | String | 推荐标题 |
|
||||
| recommendContent | String | 推荐内容 |
|
||||
| recommendReason | String | 推荐理由 |
|
||||
| priority | Integer | 优先级（数字越大优先级越高），默认0 |
|
||||
| isActive | Boolean | 是否启用，默认true |
|
||||
| groupCourse | GroupCourse | 关联的团课信息（查询时自动填充） |
|
||||
| createdBy | String | 创建人 |
|
||||
| updatedBy | String | 更新人 |
|
||||
| createdAt | LocalDateTime | 创建时间 |
|
||||
| updatedAt | LocalDateTime | 更新时间 |
|
||||
| deletedAt | LocalDateTime | 删除时间（软删除） |
|
||||
|
||||
---
|
||||
|
||||
## 状态码说明
|
||||
|
||||
### 推荐状态
|
||||
|
||||
| 状态值 | 含义 |
|
||||
|--------|------|
|
||||
| true | 启用 |
|
||||
| false | 禁用 |
|
||||
|
||||
---
|
||||
|
||||
## 业务规则
|
||||
|
||||
### 团课推荐管理
|
||||
1. **创建推荐**：团课ID为必填项，且必须是有效的团课
|
||||
2. **优先级排序**：获取启用的推荐列表时，按优先级从高到低排序
|
||||
3. **删除推荐**：采用软删除机制，数据保留可恢复
|
||||
4. **状态管理**：支持启用/禁用推荐状态，禁用的推荐不会在推荐列表中显示
|
||||
|
||||
---
|
||||
|
||||
## 附录：错误响应格式
|
||||
|
||||
所有接口的错误响应统一格式：
|
||||
|
||||
```json
|
||||
{
|
||||
"success": false,
|
||||
"message": "错误描述信息"
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
*文档结束*
|
||||
@@ -1,123 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>cn.novalon.gym.manage</groupId>
|
||||
<artifactId>gym-manage-api</artifactId>
|
||||
<version>1.0.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>gym-auth</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>Gym Auth</name>
|
||||
<description>Phone Authentication Module - Phone Number Login Services</description>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>cn.novalon.gym.manage</groupId>
|
||||
<artifactId>manage-common</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.novalon.gym.manage</groupId>
|
||||
<artifactId>manage-db</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.novalon.gym.manage</groupId>
|
||||
<artifactId>manage-sys</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.novalon.gym.manage</groupId>
|
||||
<artifactId>gym-member</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-webflux</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springdoc</groupId>
|
||||
<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-security</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.data</groupId>
|
||||
<artifactId>spring-data-commons</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.projectreactor</groupId>
|
||||
<artifactId>reactor-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-all</artifactId>
|
||||
<version>5.8.25</version>
|
||||
</dependency>
|
||||
<!-- 阿里云一键登录服务 -->
|
||||
<dependency>
|
||||
<groupId>com.aliyun</groupId>
|
||||
<artifactId>aliyun-java-sdk-dypnsapi</artifactId>
|
||||
<version>1.2.12</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.aliyun</groupId>
|
||||
<artifactId>aliyun-java-sdk-core</artifactId>
|
||||
<version>4.6.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.aliyun</groupId>
|
||||
<artifactId>dysmsapi20170525</artifactId>
|
||||
<version>2.0.0</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>3.4.2</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>default-jar</id>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>jar</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.11.0</version>
|
||||
<configuration>
|
||||
<source>21</source>
|
||||
<target>21</target>
|
||||
<annotationProcessorPaths>
|
||||
<path>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<version>${lombok.version}</version>
|
||||
</path>
|
||||
</annotationProcessorPaths>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
-7
@@ -1,7 +0,0 @@
|
||||
package cn.novalon.gym.manage.auth.config;
|
||||
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
@Configuration
|
||||
public class AuthConfig {
|
||||
}
|
||||
-47
@@ -1,47 +0,0 @@
|
||||
package cn.novalon.gym.manage.auth.config;
|
||||
|
||||
import lombok.Data;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
/**
|
||||
* 阿里云短信配置属性类
|
||||
*
|
||||
* @author auto-generated
|
||||
* @date 2026-06-20
|
||||
*/
|
||||
@Data
|
||||
@Configuration
|
||||
@ConfigurationProperties(prefix = "alibaba.cloud.sms")
|
||||
public class SmsProperties {
|
||||
|
||||
/**
|
||||
* 访问密钥ID
|
||||
*/
|
||||
private String accessKeyId;
|
||||
|
||||
/**
|
||||
* 访问密钥密钥
|
||||
*/
|
||||
private String accessKeySecret;
|
||||
|
||||
/**
|
||||
* 短信签名名称
|
||||
*/
|
||||
private String signName;
|
||||
|
||||
/**
|
||||
* 短信模板CODE
|
||||
*/
|
||||
private String templateCode;
|
||||
|
||||
/**
|
||||
* 短信验证码长度（默认6位）
|
||||
*/
|
||||
private int codeLength = 6;
|
||||
|
||||
/**
|
||||
* 短信验证码有效期（秒，默认300秒=5分钟）
|
||||
*/
|
||||
private long codeExpireSeconds = 300;
|
||||
}
|
||||
-26
@@ -1,26 +0,0 @@
|
||||
package cn.novalon.gym.manage.auth.dto;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.Pattern;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* 手机号验证码登录请求DTO
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class PhoneCodeLoginDto {
|
||||
|
||||
@NotBlank(message = "手机号不能为空")
|
||||
@Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
|
||||
private String phone;
|
||||
|
||||
@NotBlank(message = "验证码不能为空")
|
||||
@Pattern(regexp = "^\\d{4,6}$", message = "验证码格式不正确")
|
||||
private String code;
|
||||
}
|
||||
-27
@@ -1,27 +0,0 @@
|
||||
package cn.novalon.gym.manage.auth.dto;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.Pattern;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* 手机号一键登录请求DTO
|
||||
* uniapp官方一键登录流程：前端通过云函数获取手机号，直接传给后端
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class PhoneLoginDto {
|
||||
|
||||
@NotBlank(message = "手机号不能为空")
|
||||
@Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
|
||||
private String phone;
|
||||
|
||||
private String nickname;
|
||||
|
||||
private String avatar;
|
||||
}
|
||||
-22
@@ -1,22 +0,0 @@
|
||||
package cn.novalon.gym.manage.auth.dto;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.Pattern;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* 发送短信验证码请求DTO
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class SendCodeRequest {
|
||||
|
||||
@NotBlank(message = "手机号不能为空")
|
||||
@Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
|
||||
private String phone;
|
||||
}
|
||||
@@ -1,25 +0,0 @@
|
||||
package cn.novalon.gym.manage.auth.dto;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.Pattern;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* 短信验证码登录请求DTO
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class SmsLoginDto {
|
||||
|
||||
@NotBlank(message = "手机号不能为空")
|
||||
@Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
|
||||
private String phone;
|
||||
|
||||
@NotBlank(message = "验证码不能为空")
|
||||
private String code;
|
||||
}
|
||||
-58
@@ -1,58 +0,0 @@
|
||||
package cn.novalon.gym.manage.auth.handler;
|
||||
|
||||
import cn.novalon.gym.manage.auth.dto.PhoneCodeLoginDto;
|
||||
import cn.novalon.gym.manage.auth.dto.PhoneLoginDto;
|
||||
import cn.novalon.gym.manage.auth.service.PhoneAuthService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.reactive.function.server.ServerRequest;
|
||||
import org.springframework.web.reactive.function.server.ServerResponse;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
@Slf4j
|
||||
@Component
|
||||
@RequiredArgsConstructor
|
||||
@Tag(name = "手机号认证", description = "手机号一键登录与验证码登录")
|
||||
public class PhoneAuthHandler {
|
||||
|
||||
private final PhoneAuthService phoneAuthService;
|
||||
|
||||
@Operation(summary = "手机号一键登录", description = "使用uniapp官方运营商认证，直接手机号登录或注册")
|
||||
public Mono<ServerResponse> oneClickLogin(ServerRequest request) {
|
||||
log.info("收到手机号一键登录请求");
|
||||
|
||||
return request.bodyToMono(PhoneLoginDto.class)
|
||||
.flatMap(phoneAuthService::oneClickLogin)
|
||||
.flatMap(response -> ServerResponse.ok()
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.bodyValue(response));
|
||||
}
|
||||
|
||||
@Operation(summary = "发送短信验证码", description = "使用阿里云发送短信验证码")
|
||||
public Mono<ServerResponse> sendSmsCode(ServerRequest request) {
|
||||
log.info("收到发送短信验证码请求");
|
||||
|
||||
return request.bodyToMono(PhoneLoginDto.class)
|
||||
.flatMap(dto -> phoneAuthService.sendSmsCode(dto.getPhone()))
|
||||
.flatMap(success -> ServerResponse.ok()
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.bodyValue(Map.of("success", success, "message", success ? "验证码发送成功" : "验证码发送失败")));
|
||||
}
|
||||
|
||||
@Operation(summary = "手机号验证码登录", description = "使用阿里云短信验证码登录或注册")
|
||||
public Mono<ServerResponse> codeLogin(ServerRequest request) {
|
||||
log.info("收到手机号验证码登录请求");
|
||||
|
||||
return request.bodyToMono(PhoneCodeLoginDto.class)
|
||||
.flatMap(phoneAuthService::codeLogin)
|
||||
.flatMap(response -> ServerResponse.ok()
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.bodyValue(response));
|
||||
}
|
||||
}
|
||||
-37
@@ -1,37 +0,0 @@
|
||||
package cn.novalon.gym.manage.auth.service;
|
||||
|
||||
import cn.novalon.gym.manage.auth.dto.PhoneLoginDto;
|
||||
import cn.novalon.gym.manage.auth.dto.PhoneCodeLoginDto;
|
||||
import cn.novalon.gym.manage.auth.vo.PhoneLoginVO;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
/**
|
||||
* 手机号认证服务接口
|
||||
*/
|
||||
public interface PhoneAuthService {
|
||||
|
||||
/**
|
||||
* 手机号一键登录（uniapp官方运营商认证）
|
||||
* 已注册则直接登录，未注册则自动注册后登录
|
||||
*
|
||||
* @param request 登录请求
|
||||
* @return 登录响应
|
||||
*/
|
||||
Mono<PhoneLoginVO> oneClickLogin(PhoneLoginDto request);
|
||||
|
||||
/**
|
||||
* 发送短信验证码（阿里云）
|
||||
*
|
||||
* @param phone 手机号
|
||||
* @return 是否发送成功
|
||||
*/
|
||||
Mono<Boolean> sendSmsCode(String phone);
|
||||
|
||||
/**
|
||||
* 手机号验证码登录（阿里云）
|
||||
*
|
||||
* @param request 登录请求
|
||||
* @return 登录响应
|
||||
*/
|
||||
Mono<PhoneLoginVO> codeLogin(PhoneCodeLoginDto request);
|
||||
}
|
||||
-35
@@ -1,35 +0,0 @@
|
||||
package cn.novalon.gym.manage.auth.service;
|
||||
|
||||
/**
|
||||
* 短信服务接口
|
||||
*
|
||||
* @author auto-generated
|
||||
* @date 2026-06-20
|
||||
*/
|
||||
public interface SmsService {
|
||||
|
||||
/**
|
||||
* 发送短信验证码
|
||||
*
|
||||
* @param phone 手机号
|
||||
* @return 发送结果
|
||||
*/
|
||||
boolean sendVerificationCode(String phone);
|
||||
|
||||
/**
|
||||
* 验证短信验证码
|
||||
*
|
||||
* @param phone 手机号
|
||||
* @param code 验证码
|
||||
* @return 验证结果
|
||||
*/
|
||||
boolean verifyCode(String phone, String code);
|
||||
|
||||
/**
|
||||
* 获取验证码（用于测试或特殊场景）
|
||||
*
|
||||
* @param phone 手机号
|
||||
* @return 验证码
|
||||
*/
|
||||
String getVerificationCode(String phone);
|
||||
}
|
||||
-177
@@ -1,177 +0,0 @@
|
||||
package cn.novalon.gym.manage.auth.service.impl;
|
||||
|
||||
import cn.novalon.gym.manage.auth.dto.PhoneCodeLoginDto;
|
||||
import cn.novalon.gym.manage.auth.dto.PhoneLoginDto;
|
||||
import cn.novalon.gym.manage.auth.service.PhoneAuthService;
|
||||
import cn.novalon.gym.manage.auth.service.SmsService;
|
||||
import cn.novalon.gym.manage.auth.vo.PhoneLoginVO;
|
||||
import cn.novalon.gym.manage.common.exception.ErrorCode;
|
||||
import cn.novalon.gym.manage.common.exception.SystemException;
|
||||
import cn.novalon.gym.manage.member.entity.Member;
|
||||
import cn.novalon.gym.manage.member.es.entity.MemberES;
|
||||
import cn.novalon.gym.manage.member.es.repository.MemberESRepository;
|
||||
import cn.novalon.gym.manage.member.repository.IMemberRepository;
|
||||
import cn.novalon.gym.manage.member.util.AesUtil;
|
||||
import cn.novalon.gym.manage.member.util.EsSyncUtils;
|
||||
import cn.novalon.gym.manage.member.util.MemberNoGenerator;
|
||||
import cn.novalon.gym.manage.sys.security.JwtTokenProvider;
|
||||
import jakarta.annotation.PostConstruct;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Slf4j
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class PhoneAuthServiceImpl implements PhoneAuthService {
|
||||
|
||||
private final IMemberRepository memberRepository;
|
||||
private final MemberESRepository memberESRepository;
|
||||
private final EsSyncUtils esSyncUtils;
|
||||
private final JwtTokenProvider jwtTokenProvider;
|
||||
private final SmsService smsService;
|
||||
|
||||
private EsSyncUtils.EntitySyncer<Member, MemberES, String> memberSyncer;
|
||||
|
||||
@PostConstruct
|
||||
public void init() {
|
||||
this.memberSyncer = esSyncUtils.bind(Member.class, MemberES.class, memberESRepository);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<PhoneLoginVO> oneClickLogin(PhoneLoginDto request) {
|
||||
log.info("手机号一键登录, phone: {}", request.getPhone());
|
||||
|
||||
String encryptedPhone = encryptPhone(request.getPhone());
|
||||
|
||||
return memberRepository.findByPhone(encryptedPhone)
|
||||
.flatMap(existingMember -> {
|
||||
log.info("手机号已注册，直接登录, memberId: {}", existingMember.getId());
|
||||
return doLogin(existingMember, false, request);
|
||||
})
|
||||
.switchIfEmpty(Mono.defer(() -> {
|
||||
log.info("手机号未注册，创建新会员");
|
||||
return createNewMemberAndLogin(request, encryptedPhone);
|
||||
}));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Boolean> sendSmsCode(String phone) {
|
||||
log.info("发送短信验证码, phone: {}", phone);
|
||||
return Mono.fromCallable(() -> smsService.sendVerificationCode(phone));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<PhoneLoginVO> codeLogin(PhoneCodeLoginDto request) {
|
||||
log.info("手机号验证码登录, phone: {}", request.getPhone());
|
||||
|
||||
return Mono.fromCallable(() -> smsService.verifyCode(request.getPhone(), request.getCode()))
|
||||
.flatMap(verified -> {
|
||||
if (!verified) {
|
||||
log.warn("验证码验证失败, phone: {}", request.getPhone());
|
||||
return Mono.error(new SystemException(ErrorCode.SYSTEM_INTERNAL_ERROR, "验证码错误或已过期"));
|
||||
}
|
||||
|
||||
String encryptedPhone = encryptPhone(request.getPhone());
|
||||
|
||||
return memberRepository.findByPhone(encryptedPhone)
|
||||
.flatMap(existingMember -> {
|
||||
log.info("手机号已注册，直接登录, memberId: {}", existingMember.getId());
|
||||
return doLogin(existingMember, false, null);
|
||||
})
|
||||
.switchIfEmpty(Mono.defer(() -> {
|
||||
log.info("手机号未注册，创建新会员");
|
||||
PhoneLoginDto registerRequest = new PhoneLoginDto();
|
||||
registerRequest.setPhone(request.getPhone());
|
||||
return createNewMemberAndLogin(registerRequest, encryptedPhone);
|
||||
}));
|
||||
});
|
||||
}
|
||||
|
||||
private Mono<PhoneLoginVO> createNewMemberAndLogin(PhoneLoginDto request, String encryptedPhone) {
|
||||
String memberNo = MemberNoGenerator.generate();
|
||||
log.info("生成会员号: {}", memberNo);
|
||||
|
||||
Member member = new Member();
|
||||
member.setMemberNo(memberNo);
|
||||
member.setPhone(encryptedPhone);
|
||||
member.setNickname(request != null ? request.getNickname() : null);
|
||||
member.setAvatar(request != null ? request.getAvatar() : null);
|
||||
member.setLastLoginAt(LocalDateTime.now());
|
||||
member.setIsDeleted(false);
|
||||
|
||||
return memberRepository.save(member)
|
||||
.doOnSuccess(memberSyncer::sync)
|
||||
.flatMap(savedMember -> {
|
||||
log.info("新会员创建成功, memberId: {}, memberNo: {}", savedMember.getId(), savedMember.getMemberNo());
|
||||
return doLogin(savedMember, true, request);
|
||||
});
|
||||
}
|
||||
|
||||
private Mono<PhoneLoginVO> doLogin(Member member, boolean isNewUser, PhoneLoginDto request) {
|
||||
log.info("登录成功, memberId: {}", member.getId());
|
||||
|
||||
member.setLastLoginAt(LocalDateTime.now());
|
||||
|
||||
if (isNewUser && request != null) {
|
||||
if ((member.getNickname() == null || member.getNickname().isEmpty())
|
||||
&& request.getNickname() != null && !request.getNickname().isEmpty()) {
|
||||
member.setNickname(request.getNickname());
|
||||
}
|
||||
if ((member.getAvatar() == null || member.getAvatar().isEmpty())
|
||||
&& request.getAvatar() != null && !request.getAvatar().isEmpty()) {
|
||||
member.setAvatar(request.getAvatar());
|
||||
}
|
||||
}
|
||||
|
||||
return memberRepository.save(member)
|
||||
.doOnSuccess(memberSyncer::sync)
|
||||
.map(this::buildLoginResponse);
|
||||
}
|
||||
|
||||
private PhoneLoginVO buildLoginResponse(Member member) {
|
||||
boolean needCompleteInfo = member.getNickname() == null || member.getNickname().isEmpty();
|
||||
|
||||
List<String> roles = new ArrayList<>();
|
||||
String accessToken = jwtTokenProvider.generateToken(String.valueOf(member.getId()), member.getId(), roles);
|
||||
|
||||
log.info("JWT Token 生成成功, memberId: {}", member.getId());
|
||||
|
||||
PhoneLoginVO vo = new PhoneLoginVO();
|
||||
vo.setMemberId(member.getId());
|
||||
vo.setMemberNo(member.getMemberNo());
|
||||
vo.setAccessToken(accessToken);
|
||||
vo.setRefreshToken(accessToken);
|
||||
vo.setExpiresIn(86400);
|
||||
vo.setIsNewUser(member.getCreatedAt() == null ? false :
|
||||
member.getCreatedAt().isAfter(LocalDateTime.now().minusMinutes(1)));
|
||||
vo.setNeedCompleteInfo(needCompleteInfo);
|
||||
vo.setNickname(member.getNickname());
|
||||
vo.setAvatar(member.getAvatar());
|
||||
vo.setPhone(decryptPhone(member.getPhone()));
|
||||
return vo;
|
||||
}
|
||||
|
||||
private String encryptPhone(String phoneNumber) {
|
||||
try {
|
||||
return AesUtil.encrypt(phoneNumber);
|
||||
} catch (Exception e) {
|
||||
log.error("手机号加密失败", e);
|
||||
throw new SystemException(ErrorCode.SYSTEM_INTERNAL_ERROR, "手机号加密失败");
|
||||
}
|
||||
}
|
||||
|
||||
private String decryptPhone(String encryptedPhone) {
|
||||
try {
|
||||
return AesUtil.decrypt(encryptedPhone);
|
||||
} catch (Exception e) {
|
||||
log.error("手机号解密失败", e);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
-148
@@ -1,148 +0,0 @@
|
||||
package cn.novalon.gym.manage.auth.service.impl;
|
||||
|
||||
import cn.hutool.core.util.RandomUtil;
|
||||
import cn.novalon.gym.manage.auth.config.SmsProperties;
|
||||
import cn.novalon.gym.manage.auth.service.SmsService;
|
||||
import cn.novalon.gym.manage.common.constant.RedisKeyConstants;
|
||||
import cn.novalon.gym.manage.common.util.RedisUtil;
|
||||
import com.aliyun.dysmsapi20170525.Client;
|
||||
import com.aliyun.dysmsapi20170525.models.SendSmsRequest;
|
||||
import com.aliyun.dysmsapi20170525.models.SendSmsResponse;
|
||||
import com.aliyun.teaopenapi.models.Config;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.Duration;
|
||||
|
||||
/**
|
||||
* 短信服务实现类
|
||||
*
|
||||
* @author auto-generated
|
||||
* @date 2026-06-20
|
||||
*/
|
||||
@Slf4j
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class SmsServiceImpl implements SmsService {
|
||||
|
||||
private final SmsProperties smsProperties;
|
||||
private final RedisUtil redisUtil;
|
||||
|
||||
@Override
|
||||
public boolean sendVerificationCode(String phone) {
|
||||
log.info("发送短信验证码, phone: {}", phone);
|
||||
|
||||
try {
|
||||
// 生成验证码
|
||||
String code = generateCode();
|
||||
|
||||
// 发送短信
|
||||
boolean sent = sendSms(phone, code);
|
||||
|
||||
if (sent) {
|
||||
// 将验证码存入Redis，5分钟过期
|
||||
String cacheKey = RedisKeyConstants.SMS_CODE + phone;
|
||||
redisUtil.setWithExpire(cacheKey, code, smsProperties.getCodeExpireSeconds())
|
||||
.doOnSuccess(result -> log.info("验证码已缓存, phone: {}, code: {}, expire: {}s",
|
||||
phone, code, smsProperties.getCodeExpireSeconds()))
|
||||
.block();
|
||||
|
||||
log.info("短信验证码发送成功, phone: {}", phone);
|
||||
return true;
|
||||
}
|
||||
|
||||
log.warn("短信验证码发送失败, phone: {}", phone);
|
||||
return false;
|
||||
|
||||
} catch (Exception e) {
|
||||
log.error("发送短信验证码异常, phone: {}", phone, e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean verifyCode(String phone, String code) {
|
||||
log.info("验证短信验证码, phone: {}", phone);
|
||||
|
||||
try {
|
||||
String cacheKey = RedisKeyConstants.SMS_CODE + phone;
|
||||
String cachedCode = redisUtil.get(cacheKey, String.class).block();
|
||||
|
||||
if (cachedCode == null) {
|
||||
log.warn("验证码已过期或不存在, phone: {}", phone);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (cachedCode.equals(code)) {
|
||||
// 验证成功后删除验证码
|
||||
redisUtil.delete(cacheKey).block();
|
||||
log.info("验证码验证成功, phone: {}", phone);
|
||||
return true;
|
||||
}
|
||||
|
||||
log.warn("验证码不匹配, phone: {}, input: {}, cached: {}", phone, code, cachedCode);
|
||||
return false;
|
||||
|
||||
} catch (Exception e) {
|
||||
log.error("验证短信验证码异常, phone: {}", phone, e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getVerificationCode(String phone) {
|
||||
try {
|
||||
String cacheKey = RedisKeyConstants.SMS_CODE + phone;
|
||||
return redisUtil.get(cacheKey, String.class).block();
|
||||
} catch (Exception e) {
|
||||
log.error("获取验证码异常, phone: {}", phone, e);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 生成验证码
|
||||
*/
|
||||
private String generateCode() {
|
||||
return RandomUtil.randomNumbers(smsProperties.getCodeLength());
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送短信
|
||||
*/
|
||||
private boolean sendSms(String phone, String code) throws Exception {
|
||||
log.info("调用阿里云短信API发送短信, phone: {}, code: {}", phone, code);
|
||||
|
||||
// 创建阿里云短信客户端
|
||||
Config config = new Config()
|
||||
.setAccessKeyId(smsProperties.getAccessKeyId())
|
||||
.setAccessKeySecret(smsProperties.getAccessKeySecret())
|
||||
.setEndpoint("dysmsapi.aliyuncs.com");
|
||||
|
||||
Client client = new Client(config);
|
||||
|
||||
// 构建发送短信请求
|
||||
SendSmsRequest request = new SendSmsRequest()
|
||||
.setPhoneNumbers(phone)
|
||||
.setSignName(smsProperties.getSignName())
|
||||
.setTemplateCode(smsProperties.getTemplateCode())
|
||||
.setTemplateParam("{\"code\":\"" + code + "\"}");
|
||||
|
||||
// 发送短信
|
||||
SendSmsResponse response = client.sendSms(request);
|
||||
|
||||
log.info("阿里云短信API响应, phone: {}, code: {}, message: {}",
|
||||
phone, response.getBody().getCode(), response.getBody().getMessage());
|
||||
|
||||
// 判断发送结果
|
||||
if ("OK".equals(response.getBody().getCode())) {
|
||||
return true;
|
||||
}
|
||||
|
||||
log.error("阿里云短信发送失败, phone: {}, code: {}, message: {}",
|
||||
phone, response.getBody().getCode(), response.getBody().getMessage());
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -1,36 +0,0 @@
|
||||
package cn.novalon.gym.manage.auth.vo;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* 手机号一键登录响应VO
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class PhoneLoginVO {
|
||||
|
||||
private Long memberId;
|
||||
|
||||
private String memberNo;
|
||||
|
||||
private String phone;
|
||||
|
||||
private String accessToken;
|
||||
|
||||
private String refreshToken;
|
||||
|
||||
private Integer expiresIn;
|
||||
|
||||
private Boolean isNewUser;
|
||||
|
||||
private Boolean needCompleteInfo;
|
||||
|
||||
private String nickname;
|
||||
|
||||
private String avatar;
|
||||
}
|
||||
-5
@@ -1,5 +0,0 @@
|
||||
cn.novalon.gym.manage.auth.handler.PhoneAuthHandler
|
||||
cn.novalon.gym.manage.auth.service.impl.PhoneAuthServiceImpl
|
||||
cn.novalon.gym.manage.auth.service.impl.SmsServiceImpl
|
||||
cn.novalon.gym.manage.auth.config.AuthConfig
|
||||
cn.novalon.gym.manage.auth.config.SmsProperties
|
||||
@@ -1,12 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<FindBugsFilter>
|
||||
<Match>
|
||||
<Class name="~.*\.entity\..*" />
|
||||
</Match>
|
||||
<Match>
|
||||
<Class name="~.*\.dto\..*" />
|
||||
</Match>
|
||||
<Match>
|
||||
<Class name="~.*\.converter\..*" />
|
||||
</Match>
|
||||
</FindBugsFilter>
|
||||
-43
@@ -1,43 +0,0 @@
|
||||
package cn.novalon.gym.manage.checkIn.config;
|
||||
|
||||
import cn.novalon.gym.manage.checkIn.websocket.MyWebSocketHandler;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.web.reactive.HandlerMapping;
|
||||
import org.springframework.web.reactive.handler.SimpleUrlHandlerMapping;
|
||||
import org.springframework.web.reactive.socket.WebSocketHandler;
|
||||
import org.springframework.web.reactive.socket.server.support.WebSocketHandlerAdapter;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@Configuration
|
||||
public class WebSocketConfig {
|
||||
|
||||
@Autowired
|
||||
private MyWebSocketHandler myWebSocketHandler;
|
||||
|
||||
/**
|
||||
* 注册 WebSocket 路由映射
|
||||
* 路径对应前端连接的 ws://xxx/webSocket/checkIn
|
||||
*/
|
||||
@Bean
|
||||
public HandlerMapping webSocketMapping() {
|
||||
Map<String, WebSocketHandler> map = new HashMap<>();
|
||||
map.put("/webSocket/checkIn", myWebSocketHandler);
|
||||
|
||||
SimpleUrlHandlerMapping mapping = new SimpleUrlHandlerMapping();
|
||||
mapping.setUrlMap(map);
|
||||
mapping.setOrder(10); // 设置优先级
|
||||
return mapping;
|
||||
}
|
||||
|
||||
/**
|
||||
* 注册 WebSocket 处理器适配器（必须）
|
||||
*/
|
||||
@Bean
|
||||
public WebSocketHandlerAdapter handlerAdapter() {
|
||||
return new WebSocketHandlerAdapter();
|
||||
}
|
||||
}
|
||||
+1
-5
@@ -206,8 +206,4 @@ public class SignInRecord {
|
||||
public void restore() {
|
||||
this.isDelete = false;
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
}
|
||||
=======
|
||||
}
|
||||
>>>>>>> f52451d (feat: 添加签到模块和数据库表结构)
|
||||
}
|
||||
+1
-27
@@ -1,12 +1,7 @@
|
||||
package cn.novalon.gym.manage.checkIn.handler;
|
||||
|
||||
import cn.novalon.gym.manage.checkIn.service.impl.CheckServiceImpl;
|
||||
<<<<<<< HEAD
|
||||
import cn.novalon.gym.manage.checkIn.websocket.MyWebSocketHandler;
|
||||
=======
|
||||
import cn.novalon.gym.manage.checkIn.vo.SignInRecordVO;
|
||||
import cn.novalon.gym.manage.checkIn.vo.SignInStatsVO;
|
||||
>>>>>>> f52451d (feat: 添加签到模块和数据库表结构)
|
||||
import cn.novalon.gym.manage.sys.util.AuthUtil;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -17,7 +12,6 @@ import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.reactive.function.server.ServerRequest;
|
||||
import org.springframework.web.reactive.function.server.ServerResponse;
|
||||
import reactor.core.publisher.Mono;
|
||||
import cn.novalon.gym.manage.checkIn.websocket.MyWebSocketHandler;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
@@ -42,7 +36,6 @@ public class CheckInHandler {
|
||||
public Mono<ServerResponse> checkIn(ServerRequest request) {
|
||||
|
||||
Long memberId = authUtil.getMemberIdOrThrow(request);
|
||||
|
||||
return request.bodyToMono(Map.class)
|
||||
.flatMap(body -> {
|
||||
String qrContent = (String) body.get("qrContent");
|
||||
@@ -88,12 +81,7 @@ public class CheckInHandler {
|
||||
* @return
|
||||
*/
|
||||
public Mono<ServerResponse> getSignInRecords(ServerRequest request) {
|
||||
<<<<<<< HEAD
|
||||
Long memberId = authUtil.getMemberIdOrThrow(request);
|
||||
=======
|
||||
Long memberId = 1L;
|
||||
// authUtil.getMemberIdOrThrow(request);
|
||||
>>>>>>> f52451d (feat: 添加签到模块和数据库表结构)
|
||||
|
||||
String startDateStr = request.queryParam("startDate").orElse(null);
|
||||
String endDateStr = request.queryParam("endDate").orElse(null);
|
||||
@@ -139,12 +127,7 @@ public class CheckInHandler {
|
||||
* @return
|
||||
*/
|
||||
public Mono<ServerResponse> getSignInStatistics(ServerRequest request) {
|
||||
<<<<<<< HEAD
|
||||
Long memberId = authUtil.getMemberIdOrThrow(request);
|
||||
=======
|
||||
Long memberId = 1L;
|
||||
// authUtil.getMemberIdOrThrow(request);
|
||||
>>>>>>> f52451d (feat: 添加签到模块和数据库表结构)
|
||||
|
||||
String startDateStr = request.queryParam("startDate").orElse(null);
|
||||
String endDateStr = request.queryParam("endDate").orElse(null);
|
||||
@@ -169,12 +152,7 @@ public class CheckInHandler {
|
||||
* @return
|
||||
*/
|
||||
public Mono<ServerResponse> exportSignInRecords(ServerRequest request) {
|
||||
<<<<<<< HEAD
|
||||
Long memberId = authUtil.getMemberIdOrThrow(request);
|
||||
=======
|
||||
Long memberId = 1L;
|
||||
// authUtil.getMemberIdOrThrow(request);
|
||||
>>>>>>> f52451d (feat: 添加签到模块和数据库表结构)
|
||||
|
||||
String startDateStr = request.queryParam("startDate").orElse(null);
|
||||
String endDateStr = request.queryParam("endDate").orElse(null);
|
||||
@@ -212,8 +190,4 @@ public class CheckInHandler {
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.bodyValue(Map.of("code", 200, "message", "success", "data", stats)));
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
}
|
||||
=======
|
||||
}
|
||||
>>>>>>> f52451d (feat: 添加签到模块和数据库表结构)
|
||||
}
|
||||
+1
-5
@@ -78,8 +78,4 @@ public interface ICheckInService {
|
||||
* @return 签到统计VO
|
||||
*/
|
||||
Mono<SignInStatsVO> getDailySignInStats(LocalDate date);
|
||||
<<<<<<< HEAD
|
||||
}
|
||||
=======
|
||||
}
|
||||
>>>>>>> f52451d (feat: 添加签到模块和数据库表结构)
|
||||
}
|
||||
-49
@@ -2,11 +2,6 @@ package cn.novalon.gym.manage.checkIn.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.json.JSONUtil;
|
||||
<<<<<<< HEAD
|
||||
import cn.hutool.extra.qrcode.QrCodeUtil;
|
||||
import cn.hutool.extra.qrcode.QrConfig;
|
||||
=======
|
||||
>>>>>>> f52451d (feat: 添加签到模块和数据库表结构)
|
||||
import cn.novalon.gym.manage.checkIn.config.QRCodeConfig;
|
||||
import cn.novalon.gym.manage.checkIn.constant.QRRedisKey;
|
||||
import cn.novalon.gym.manage.checkIn.entity.SignInRecord;
|
||||
@@ -24,11 +19,8 @@ import cn.novalon.gym.manage.member.entity.MemberCardRecord;
|
||||
import cn.novalon.gym.manage.member.enums.MemberCardType;
|
||||
import cn.novalon.gym.manage.member.repository.MemberCardRecordRepository;
|
||||
import cn.novalon.gym.manage.member.repository.MemberCardRepository;
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
import cn.hutool.extra.qrcode.QrCodeUtil;
|
||||
import cn.hutool.extra.qrcode.QrConfig;
|
||||
>>>>>>> f52451d (feat: 添加签到模块和数据库表结构)
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
@@ -92,10 +84,7 @@ public class CheckServiceImpl implements ICheckInService {
|
||||
public Mono<String> checkIn(Long memberId, String qrContent) {
|
||||
String key = RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now();
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
// 先检查当天是否已经签到（从数据库查询，作为重复签到的额外保障）
|
||||
>>>>>>> f52451d (feat: 添加签到模块和数据库表结构)
|
||||
return checkTodayAlreadySignedIn(memberId)
|
||||
.flatMap(existingRecord -> {
|
||||
String checkInTime = existingRecord.getSignInTime().format(DATE_FORMATTER);
|
||||
@@ -137,14 +126,11 @@ public class CheckServiceImpl implements ICheckInService {
|
||||
});
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
/**
|
||||
* 检查会员当天是否已经签到
|
||||
* @param memberId 会员ID
|
||||
* @return 如果已签到返回签到记录，否则返回空
|
||||
*/
|
||||
>>>>>>> f52451d (feat: 添加签到模块和数据库表结构)
|
||||
private Mono<SignInRecord> checkTodayAlreadySignedIn(Long memberId) {
|
||||
LocalDateTime startOfDay = LocalDate.now().atStartOfDay();
|
||||
LocalDateTime endOfDay = LocalDate.now().atTime(LocalTime.MAX);
|
||||
@@ -152,11 +138,6 @@ public class CheckServiceImpl implements ICheckInService {
|
||||
return signInRecordRepository.findByMemberIdAndDate(memberId, startOfDay, endOfDay);
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
private Mono<String> processCheckIn(Long memberId, Long memberCardRecordId, Map<String, Object> redisMap, String qrContent) {
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
|
||||
=======
|
||||
/**
|
||||
* 处理签到逻辑
|
||||
*/
|
||||
@@ -164,7 +145,6 @@ public class CheckServiceImpl implements ICheckInService {
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
|
||||
// 发送实时进度通知
|
||||
>>>>>>> f52451d (feat: 添加签到模块和数据库表结构)
|
||||
MyWebSocketHandler.sendProgress(qrContent, "VALIDATE_CARD", "正在验证会员卡...");
|
||||
|
||||
return memberCardRecordRepository.findById(memberCardRecordId)
|
||||
@@ -183,15 +163,10 @@ public class CheckServiceImpl implements ICheckInService {
|
||||
return Mono.error(new RuntimeException("会员卡已过期"));
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
MyWebSocketHandler.sendProgress(qrContent, "VALIDATE_BOOKING", "会员卡验证通过，正在检查预约信息...");
|
||||
|
||||
=======
|
||||
// 发送实时进度通知
|
||||
MyWebSocketHandler.sendProgress(qrContent, "VALIDATE_BOOKING", "会员卡验证通过，正在检查预约信息...");
|
||||
|
||||
// 检查是否有需要签到的团课预约
|
||||
>>>>>>> f52451d (feat: 添加签到模块和数据库表结构)
|
||||
return validateBooking(memberId, now)
|
||||
.then(memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(cardRecord.getMemberCardId())
|
||||
.switchIfEmpty(Mono.defer(() -> {
|
||||
@@ -199,10 +174,7 @@ public class CheckServiceImpl implements ICheckInService {
|
||||
return Mono.error(new RuntimeException("会员卡类型不存在"));
|
||||
}))
|
||||
.flatMap(card -> {
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
// 发送实时进度通知
|
||||
>>>>>>> f52451d (feat: 添加签到模块和数据库表结构)
|
||||
MyWebSocketHandler.sendProgress(qrContent, "DEDUCT_USAGE", "正在扣减会员卡次数...");
|
||||
|
||||
return deductCardUsage(cardRecord, card)
|
||||
@@ -223,12 +195,9 @@ public class CheckServiceImpl implements ICheckInService {
|
||||
});
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
/**
|
||||
* 验证预约信息
|
||||
*/
|
||||
>>>>>>> f52451d (feat: 添加签到模块和数据库表结构)
|
||||
private Mono<Void> validateBooking(Long memberId, LocalDateTime now) {
|
||||
return groupCourseBookingService.getBookingsByMemberId(memberId)
|
||||
.filter(booking -> {
|
||||
@@ -260,12 +229,9 @@ public class CheckServiceImpl implements ICheckInService {
|
||||
});
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
/**
|
||||
* 扣减会员卡使用次数/金额
|
||||
*/
|
||||
>>>>>>> f52451d (feat: 添加签到模块和数据库表结构)
|
||||
private Mono<MemberCardRecord> deductCardUsage(MemberCardRecord record, MemberCard card) {
|
||||
MemberCardType cardType = MemberCardType.valueOf(card.getMemberCardType());
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
@@ -301,12 +267,9 @@ public class CheckServiceImpl implements ICheckInService {
|
||||
}
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
/**
|
||||
* 保存签到记录
|
||||
*/
|
||||
>>>>>>> f52451d (feat: 添加签到模块和数据库表结构)
|
||||
private Mono<Void> saveSignInRecord(Long memberId, Long memberCardRecordId, Long memberCardId) {
|
||||
SignInRecord record = SignInRecord.builder()
|
||||
.memberId(memberId)
|
||||
@@ -321,12 +284,9 @@ public class CheckServiceImpl implements ICheckInService {
|
||||
return signInRecordRepository.save(record).then();
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
/**
|
||||
* 构建成功响应
|
||||
*/
|
||||
>>>>>>> f52451d (feat: 添加签到模块和数据库表结构)
|
||||
private String buildSuccessResponse(LocalDateTime dateTime) {
|
||||
Map<String, Object> res = new HashMap<>();
|
||||
res.put("message", "签到成功");
|
||||
@@ -334,12 +294,9 @@ public class CheckServiceImpl implements ICheckInService {
|
||||
return JSONUtil.toJsonStr(res);
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
/**
|
||||
* 查找会员的有效会员卡（优先选择有效期最早到期的）
|
||||
*/
|
||||
>>>>>>> f52451d (feat: 添加签到模块和数据库表结构)
|
||||
private Mono<MemberCardRecord> findValidMemberCard(Long memberId) {
|
||||
return memberCardRecordRepository.findActiveCardsByMemberId(memberId)
|
||||
.filter(record -> {
|
||||
@@ -357,11 +314,8 @@ public class CheckServiceImpl implements ICheckInService {
|
||||
.next();
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
// ==================== 签到记录管理功能 ====================
|
||||
|
||||
>>>>>>> f52451d (feat: 添加签到模块和数据库表结构)
|
||||
@Override
|
||||
public Flux<SignInRecordVO> getSignInRecords(Long memberId, LocalDate startTime, LocalDate endTime) {
|
||||
LocalDateTime start = startTime.atStartOfDay();
|
||||
@@ -459,12 +413,9 @@ public class CheckServiceImpl implements ICheckInService {
|
||||
);
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
/**
|
||||
* 转换实体到VO
|
||||
*/
|
||||
>>>>>>> f52451d (feat: 添加签到模块和数据库表结构)
|
||||
private SignInRecordVO convertToVO(SignInRecord record) {
|
||||
SignInRecordVO vo = new SignInRecordVO();
|
||||
vo.setId(record.getId());
|
||||
|
||||
+1
-79
@@ -77,11 +77,7 @@ public class MyWebSocketHandler implements WebSocketHandler {
|
||||
.doOnError(e -> {
|
||||
log.error("接收消息出错，sessionId={}", sessionId, e);
|
||||
})
|
||||
<<<<<<< HEAD
|
||||
.subscribe();
|
||||
=======
|
||||
.subscribe(); // 必须订阅，否则不会执行
|
||||
>>>>>>> f52451d (feat: 添加签到模块和数据库表结构)
|
||||
|
||||
// 发送流给客户端
|
||||
return session.send(sink.asFlux().map(session::textMessage))
|
||||
@@ -104,10 +100,7 @@ public class MyWebSocketHandler implements WebSocketHandler {
|
||||
* @return 是否发送成功
|
||||
*/
|
||||
public static boolean sendMessageToClient(String qrContent, String message) {
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
// 先清理超时连接
|
||||
>>>>>>> f52451d (feat: 添加签到模块和数据库表结构)
|
||||
cleanupTimeoutConnections();
|
||||
|
||||
Sinks.Many<String> sink = qrContentToSink.get(qrContent);
|
||||
@@ -137,77 +130,6 @@ public class MyWebSocketHandler implements WebSocketHandler {
|
||||
String progressMessage = buildMessage("PROGRESS", message);
|
||||
sendMessageToClient(qrContent, progressMessage);
|
||||
log.debug("发送进度消息: qrContent={}, step={}, message={}", qrContent, step, message);
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送签到成功消息
|
||||
*
|
||||
* @param qrContent 二维码内容
|
||||
* @param memberId 会员ID
|
||||
* @param signInTime 签到时间
|
||||
*/
|
||||
public static void sendSuccess(String qrContent, Long memberId, String signInTime) {
|
||||
String successMessage = buildMessage("SUCCESS", "签到成功！欢迎光临\n会员ID: " + memberId + "\n签到时间: " + signInTime);
|
||||
sendMessageToClient(qrContent, successMessage);
|
||||
log.info("发送成功消息: qrContent={}, memberId={}", qrContent, memberId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送签到失败消息
|
||||
*
|
||||
* @param qrContent 二维码内容
|
||||
* @param reason 失败原因
|
||||
*/
|
||||
public static void sendFailure(String qrContent, String reason) {
|
||||
String failureMessage = buildMessage("FAILURE", "签到失败：" + reason);
|
||||
sendMessageToClient(qrContent, failureMessage);
|
||||
log.warn("发送失败消息: qrContent={}, reason={}", qrContent, reason);
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建标准消息格式
|
||||
*
|
||||
* @param type 消息类型
|
||||
* @param content 消息内容
|
||||
* @return 格式化后的消息字符串
|
||||
*/
|
||||
private static String buildMessage(String type, String content) {
|
||||
return JSONUtil.toJsonStr(Map.of(
|
||||
"type", type,
|
||||
"content", content,
|
||||
"timestamp", System.currentTimeMillis()
|
||||
));
|
||||
}
|
||||
|
||||
/**
|
||||
* 清理超时连接
|
||||
*/
|
||||
private static void cleanupTimeoutConnections() {
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
qrContentToCreateTime.entrySet().removeIf(entry -> {
|
||||
LocalDateTime createTime = entry.getValue();
|
||||
long secondsDiff = java.time.Duration.between(createTime, now).getSeconds();
|
||||
if (secondsDiff > TIMEOUT_SECONDS) {
|
||||
String qrContent = entry.getKey();
|
||||
qrContentToSink.remove(qrContent);
|
||||
log.debug("清理超时连接: qrContent={}, 超时时间={}秒", qrContent, secondsDiff);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取当前连接数
|
||||
*
|
||||
* @return 连接数
|
||||
*/
|
||||
public static int getConnectionCount() {
|
||||
cleanupTimeoutConnections();
|
||||
return qrContentToSink.size();
|
||||
>>>>>>> f52451d (feat: 添加签到模块和数据库表结构)
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -277,4 +199,4 @@ public class MyWebSocketHandler implements WebSocketHandler {
|
||||
cleanupTimeoutConnections();
|
||||
return qrContentToSink.size();
|
||||
}
|
||||
}
|
||||
}
|
||||
-3
@@ -25,10 +25,7 @@ import reactor.test.StepVerifier;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
import java.time.LocalTime;
|
||||
>>>>>>> f52451d (feat: 添加签到模块和数据库表结构)
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>cn.novalon.gym.manage</groupId>
|
||||
<artifactId>gym-manage-api</artifactId>
|
||||
<version>1.0.0</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<groupId>cn.novalon.gym.manage</groupId>
|
||||
<artifactId>gym-coupon</artifactId>
|
||||
<version>1.0.0</version>
|
||||
<name>gym-coupon</name>
|
||||
<description>Coupon Management Module</description>
|
||||
<url/>
|
||||
<licenses>
|
||||
<license/>
|
||||
</licenses>
|
||||
<developers>
|
||||
<developer/>
|
||||
</developers>
|
||||
<scm>
|
||||
<connection/>
|
||||
<developerConnection/>
|
||||
<tag/>
|
||||
<url/>
|
||||
</scm>
|
||||
<properties>
|
||||
<java.version>21</java.version>
|
||||
</properties>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>cn.novalon.gym.manage</groupId>
|
||||
<artifactId>manage-common</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.novalon.gym.manage</groupId>
|
||||
<artifactId>manage-sys</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.novalon.gym.manage</groupId>
|
||||
<artifactId>manage-db</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-webflux</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-data-r2dbc</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-validation</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springdoc</groupId>
|
||||
<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.swagger.core.v3</groupId>
|
||||
<artifactId>swagger-annotations-jakarta</artifactId>
|
||||
<version>2.2.43</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.novalon.gym.manage</groupId>
|
||||
<artifactId>gym-member</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
+75
@@ -0,0 +1,75 @@
|
||||
package cn.novalon.gym.manage.coupon.converter;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.novalon.gym.manage.coupon.domain.CouponTemplate;
|
||||
import cn.novalon.gym.manage.coupon.domain.MemberCoupon;
|
||||
import cn.novalon.gym.manage.coupon.entity.CouponTemplateEntity;
|
||||
import cn.novalon.gym.manage.coupon.entity.MemberCouponEntity;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* 优惠券相关转换器
|
||||
*/
|
||||
@Component
|
||||
@Slf4j
|
||||
public class CouponConverter {
|
||||
|
||||
/**
|
||||
* 将优惠券模板实体转换为领域模型
|
||||
*/
|
||||
public CouponTemplate toCouponTemplate(CouponTemplateEntity entity) {
|
||||
if (entity == null) {
|
||||
return null;
|
||||
}
|
||||
CouponTemplate couponTemplate = new CouponTemplate();
|
||||
BeanUtil.copyProperties(entity, couponTemplate);
|
||||
log.debug("转换优惠券模板实体到领域模型：couponId={}", entity.getId());
|
||||
return couponTemplate;
|
||||
}
|
||||
|
||||
/**
|
||||
* 将优惠券模板领域模型转换为实体
|
||||
*/
|
||||
public CouponTemplateEntity toCouponTemplateEntity(CouponTemplate domain) {
|
||||
if (domain == null) {
|
||||
return null;
|
||||
}
|
||||
CouponTemplateEntity entity = new CouponTemplateEntity();
|
||||
BeanUtil.copyProperties(domain, entity);
|
||||
if (domain.getId() != null) {
|
||||
entity.markNotNew();
|
||||
}
|
||||
log.debug("转换优惠券模板领域模型到实体：couponId={}", domain.getId());
|
||||
return entity;
|
||||
}
|
||||
|
||||
/**
|
||||
* 将会员优惠券实体转换为领域模型
|
||||
*/
|
||||
public MemberCoupon toMemberCoupon(MemberCouponEntity entity) {
|
||||
if (entity == null) {
|
||||
return null;
|
||||
}
|
||||
MemberCoupon memberCoupon = new MemberCoupon();
|
||||
BeanUtil.copyProperties(entity, memberCoupon);
|
||||
log.debug("转换会员优惠券实体到领域模型：memberCouponId={}", entity.getId());
|
||||
return memberCoupon;
|
||||
}
|
||||
|
||||
/**
|
||||
* 将会员优惠券领域模型转换为实体
|
||||
*/
|
||||
public MemberCouponEntity toMemberCouponEntity(MemberCoupon domain) {
|
||||
if (domain == null) {
|
||||
return null;
|
||||
}
|
||||
MemberCouponEntity entity = new MemberCouponEntity();
|
||||
BeanUtil.copyProperties(domain, entity);
|
||||
if (domain.getId() != null) {
|
||||
entity.markNotNew();
|
||||
}
|
||||
log.debug("转换会员优惠券领域模型到实体：memberCouponId={}", domain.getId());
|
||||
return entity;
|
||||
}
|
||||
}
|
||||
+43
@@ -0,0 +1,43 @@
|
||||
package cn.novalon.gym.manage.coupon.dao;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.entity.CouponTemplateEntity;
|
||||
import org.springframework.data.r2dbc.repository.Modifying;
|
||||
import org.springframework.data.r2dbc.repository.Query;
|
||||
import org.springframework.data.r2dbc.repository.R2dbcRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Repository
|
||||
public interface CouponTemplateDao extends R2dbcRepository<CouponTemplateEntity, Long> {
|
||||
|
||||
Mono<CouponTemplateEntity> findByIdIsAndDeletedAtIsNull(Long id);
|
||||
|
||||
Flux<CouponTemplateEntity> findAllByDeletedAtIsNull();
|
||||
|
||||
Flux<CouponTemplateEntity> findByNameContainingAndDeletedAtIsNull(String name);
|
||||
|
||||
Flux<CouponTemplateEntity> findByCouponTypeAndDeletedAtIsNull(String couponType);
|
||||
|
||||
Flux<CouponTemplateEntity> findByStatusAndDeletedAtIsNull(String status);
|
||||
|
||||
Mono<CouponTemplateEntity> findByClaimCodeAndDeletedAtIsNull(String claimCode);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE coupon_template SET deleted_at = :deletedAt WHERE id = :id")
|
||||
Mono<Integer> softDelete(Long id, LocalDateTime deletedAt);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE coupon_template SET status = :status, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> updateStatus(Long id, String status, LocalDateTime updatedAt);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE coupon_template SET issued_count = issued_count + :count, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> incrementIssuedCount(Long id, int count, LocalDateTime updatedAt);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE coupon_template SET used_count = used_count + :count, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> incrementUsedCount(Long id, int count, LocalDateTime updatedAt);
|
||||
}
|
||||
+28
@@ -0,0 +1,28 @@
|
||||
package cn.novalon.gym.manage.coupon.dao;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.entity.MemberCouponEntity;
|
||||
import org.springframework.data.r2dbc.repository.Modifying;
|
||||
import org.springframework.data.r2dbc.repository.Query;
|
||||
import org.springframework.data.r2dbc.repository.R2dbcRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
@Repository
|
||||
public interface MemberCouponDao extends R2dbcRepository<MemberCouponEntity, Long> {
|
||||
|
||||
Flux<MemberCouponEntity> findByTemplateIdAndDeletedAtIsNull(Long templateId);
|
||||
|
||||
Flux<MemberCouponEntity> findByMemberIdAndDeletedAtIsNull(Long memberId);
|
||||
|
||||
Mono<Long> countByTemplateIdAndMemberIdAndDeletedAtIsNull(Long templateId, Long memberId);
|
||||
|
||||
@Query("SELECT COUNT(*) FROM member_coupon WHERE template_id = :templateId AND status = :status AND deleted_at IS NULL")
|
||||
Mono<Long> countByTemplateIdAndStatus(Long templateId, String status);
|
||||
|
||||
Mono<MemberCouponEntity> findByCouponCodeAndDeletedAtIsNull(String couponCode);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE member_coupon SET status = 'EXPIRED', updated_at = :now WHERE status = 'AVAILABLE' AND expire_at < :now AND deleted_at IS NULL")
|
||||
Mono<Integer> expireAvailableCoupons(java.time.LocalDateTime now);
|
||||
}
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
package cn.novalon.gym.manage.coupon.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
@Schema(description = "领取码兑换优惠券请求")
|
||||
public class ClaimCouponRequest {
|
||||
|
||||
@Schema(description = "会员ID", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private Long memberId;
|
||||
|
||||
@Schema(description = "领取码", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private String claimCode;
|
||||
|
||||
public Long getMemberId() {
|
||||
return memberId;
|
||||
}
|
||||
|
||||
public void setMemberId(Long memberId) {
|
||||
this.memberId = memberId;
|
||||
}
|
||||
|
||||
public String getClaimCode() {
|
||||
return claimCode;
|
||||
}
|
||||
|
||||
public void setClaimCode(String claimCode) {
|
||||
this.claimCode = claimCode;
|
||||
}
|
||||
}
|
||||
+86
@@ -0,0 +1,86 @@
|
||||
package cn.novalon.gym.manage.coupon.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Schema(description = "优惠券统计数据")
|
||||
public class CouponStatistics {
|
||||
|
||||
@Schema(description = "优惠券模板ID")
|
||||
private Long templateId;
|
||||
|
||||
@Schema(description = "已发放数量")
|
||||
private long issuedCount;
|
||||
|
||||
@Schema(description = "已使用数量")
|
||||
private long usedCount;
|
||||
|
||||
@Schema(description = "可用数量")
|
||||
private long availableCount;
|
||||
|
||||
@Schema(description = "已过期数量")
|
||||
private long expiredCount;
|
||||
|
||||
@Schema(description = "核销率（百分比）")
|
||||
private BigDecimal redemptionRate;
|
||||
|
||||
@Schema(description = "累计优惠金额")
|
||||
private BigDecimal totalDiscountAmount;
|
||||
|
||||
public Long getTemplateId() {
|
||||
return templateId;
|
||||
}
|
||||
|
||||
public void setTemplateId(Long templateId) {
|
||||
this.templateId = templateId;
|
||||
}
|
||||
|
||||
public long getIssuedCount() {
|
||||
return issuedCount;
|
||||
}
|
||||
|
||||
public void setIssuedCount(long issuedCount) {
|
||||
this.issuedCount = issuedCount;
|
||||
}
|
||||
|
||||
public long getUsedCount() {
|
||||
return usedCount;
|
||||
}
|
||||
|
||||
public void setUsedCount(long usedCount) {
|
||||
this.usedCount = usedCount;
|
||||
}
|
||||
|
||||
public long getAvailableCount() {
|
||||
return availableCount;
|
||||
}
|
||||
|
||||
public void setAvailableCount(long availableCount) {
|
||||
this.availableCount = availableCount;
|
||||
}
|
||||
|
||||
public long getExpiredCount() {
|
||||
return expiredCount;
|
||||
}
|
||||
|
||||
public void setExpiredCount(long expiredCount) {
|
||||
this.expiredCount = expiredCount;
|
||||
}
|
||||
|
||||
public BigDecimal getRedemptionRate() {
|
||||
return redemptionRate;
|
||||
}
|
||||
|
||||
public void setRedemptionRate(BigDecimal redemptionRate) {
|
||||
this.redemptionRate = redemptionRate;
|
||||
}
|
||||
|
||||
public BigDecimal getTotalDiscountAmount() {
|
||||
return totalDiscountAmount;
|
||||
}
|
||||
|
||||
public void setTotalDiscountAmount(BigDecimal totalDiscountAmount) {
|
||||
this.totalDiscountAmount = totalDiscountAmount;
|
||||
}
|
||||
}
|
||||
+209
@@ -0,0 +1,209 @@
|
||||
package cn.novalon.gym.manage.coupon.domain;
|
||||
|
||||
import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "优惠券模板")
|
||||
public class CouponTemplate extends BaseDomain {
|
||||
|
||||
//优惠券名称
|
||||
private String name;
|
||||
|
||||
@Schema(description = "优惠券描述")
|
||||
private String description;
|
||||
|
||||
@Schema(description = "优惠券类型：CASH/DISCOUNT/COURSE/EXPERIENCE", example = "CASH")
|
||||
private String couponType;
|
||||
|
||||
@Schema(description = "优惠值：满减/课程/体验为金额，折扣券为比例(0.9=9折)", example = "20.00")
|
||||
private BigDecimal discountValue;
|
||||
|
||||
@Schema(description = "使用门槛金额", example = "100.00")
|
||||
private BigDecimal thresholdAmount;
|
||||
|
||||
@Schema(description = "有效期类型：FIXED_DATE/DAYS_AFTER_CLAIM", example = "FIXED_DATE")
|
||||
private String validityType;
|
||||
|
||||
@Schema(description = "固定有效期开始时间")
|
||||
private LocalDateTime startTime;
|
||||
|
||||
@Schema(description = "固定有效期结束时间")
|
||||
private LocalDateTime endTime;
|
||||
|
||||
@Schema(description = "领取后有效天数")
|
||||
private Integer validDays;
|
||||
|
||||
@Schema(description = "适用商品范围：ALL/SPECIFIC", example = "ALL")
|
||||
private String applyScope;
|
||||
|
||||
@Schema(description = "指定商品ID列表（JSON数组字符串）")
|
||||
private String applyProductIds;
|
||||
|
||||
@Schema(description = "发放总量，-1表示不限量", example = "1000")
|
||||
private Integer totalQuantity;
|
||||
|
||||
@Schema(description = "每人限领数量", example = "1")
|
||||
private Integer perUserLimit;
|
||||
|
||||
@Schema(description = "是否可叠加使用", example = "false")
|
||||
private Boolean stackable;
|
||||
|
||||
@Schema(description = "领取码")
|
||||
private String claimCode;
|
||||
|
||||
@Schema(description = "状态：DRAFT/ACTIVE/TERMINATED/EXPIRED", example = "DRAFT")
|
||||
private String status;
|
||||
|
||||
@Schema(description = "已发放数量")
|
||||
private Integer issuedCount;
|
||||
|
||||
@Schema(description = "已使用数量")
|
||||
private Integer usedCount;
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public String getCouponType() {
|
||||
return couponType;
|
||||
}
|
||||
|
||||
public void setCouponType(String couponType) {
|
||||
this.couponType = couponType;
|
||||
}
|
||||
|
||||
public BigDecimal getDiscountValue() {
|
||||
return discountValue;
|
||||
}
|
||||
|
||||
public void setDiscountValue(BigDecimal discountValue) {
|
||||
this.discountValue = discountValue;
|
||||
}
|
||||
|
||||
public BigDecimal getThresholdAmount() {
|
||||
return thresholdAmount;
|
||||
}
|
||||
|
||||
public void setThresholdAmount(BigDecimal thresholdAmount) {
|
||||
this.thresholdAmount = thresholdAmount;
|
||||
}
|
||||
|
||||
public String getValidityType() {
|
||||
return validityType;
|
||||
}
|
||||
|
||||
public void setValidityType(String validityType) {
|
||||
this.validityType = validityType;
|
||||
}
|
||||
|
||||
public LocalDateTime getStartTime() {
|
||||
return startTime;
|
||||
}
|
||||
|
||||
public void setStartTime(LocalDateTime startTime) {
|
||||
this.startTime = startTime;
|
||||
}
|
||||
|
||||
public LocalDateTime getEndTime() {
|
||||
return endTime;
|
||||
}
|
||||
|
||||
public void setEndTime(LocalDateTime endTime) {
|
||||
this.endTime = endTime;
|
||||
}
|
||||
|
||||
public Integer getValidDays() {
|
||||
return validDays;
|
||||
}
|
||||
|
||||
public void setValidDays(Integer validDays) {
|
||||
this.validDays = validDays;
|
||||
}
|
||||
|
||||
public String getApplyScope() {
|
||||
return applyScope;
|
||||
}
|
||||
|
||||
public void setApplyScope(String applyScope) {
|
||||
this.applyScope = applyScope;
|
||||
}
|
||||
|
||||
public String getApplyProductIds() {
|
||||
return applyProductIds;
|
||||
}
|
||||
|
||||
public void setApplyProductIds(String applyProductIds) {
|
||||
this.applyProductIds = applyProductIds;
|
||||
}
|
||||
|
||||
public Integer getTotalQuantity() {
|
||||
return totalQuantity;
|
||||
}
|
||||
|
||||
public void setTotalQuantity(Integer totalQuantity) {
|
||||
this.totalQuantity = totalQuantity;
|
||||
}
|
||||
|
||||
public Integer getPerUserLimit() {
|
||||
return perUserLimit;
|
||||
}
|
||||
|
||||
public void setPerUserLimit(Integer perUserLimit) {
|
||||
this.perUserLimit = perUserLimit;
|
||||
}
|
||||
|
||||
public Boolean getStackable() {
|
||||
return stackable;
|
||||
}
|
||||
|
||||
public void setStackable(Boolean stackable) {
|
||||
this.stackable = stackable;
|
||||
}
|
||||
|
||||
public String getClaimCode() {
|
||||
return claimCode;
|
||||
}
|
||||
|
||||
public void setClaimCode(String claimCode) {
|
||||
this.claimCode = claimCode;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public Integer getIssuedCount() {
|
||||
return issuedCount;
|
||||
}
|
||||
|
||||
public void setIssuedCount(Integer issuedCount) {
|
||||
this.issuedCount = issuedCount;
|
||||
}
|
||||
|
||||
public Integer getUsedCount() {
|
||||
return usedCount;
|
||||
}
|
||||
|
||||
public void setUsedCount(Integer usedCount) {
|
||||
this.usedCount = usedCount;
|
||||
}
|
||||
}
|
||||
+32
@@ -0,0 +1,32 @@
|
||||
package cn.novalon.gym.manage.coupon.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
@Schema(description = "优惠券发放请求")
|
||||
public class DistributeCouponRequest {
|
||||
|
||||
@Schema(description = "目标会员ID列表", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private List<Long> memberIds;
|
||||
|
||||
@Schema(description = "发放方式：MANUAL/BATCH，默认MANUAL", example = "MANUAL")
|
||||
private String distributeType;
|
||||
|
||||
public List<Long> getMemberIds() {
|
||||
return memberIds;
|
||||
}
|
||||
|
||||
public void setMemberIds(List<Long> memberIds) {
|
||||
this.memberIds = memberIds;
|
||||
}
|
||||
|
||||
public String getDistributeType() {
|
||||
return distributeType;
|
||||
}
|
||||
|
||||
public void setDistributeType(String distributeType) {
|
||||
this.distributeType = distributeType;
|
||||
}
|
||||
}
|
||||
+49
@@ -0,0 +1,49 @@
|
||||
package cn.novalon.gym.manage.coupon.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
@Schema(description = "优惠券发放结果")
|
||||
public class DistributeCouponResult {
|
||||
|
||||
@Schema(description = "成功发放数量")
|
||||
private int successCount;
|
||||
|
||||
@Schema(description = "失败数量")
|
||||
private int failCount;
|
||||
|
||||
@Schema(description = "提示信息")
|
||||
private String message;
|
||||
|
||||
public DistributeCouponResult() {
|
||||
}
|
||||
|
||||
public DistributeCouponResult(int successCount, int failCount, String message) {
|
||||
this.successCount = successCount;
|
||||
this.failCount = failCount;
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public int getSuccessCount() {
|
||||
return successCount;
|
||||
}
|
||||
|
||||
public void setSuccessCount(int successCount) {
|
||||
this.successCount = successCount;
|
||||
}
|
||||
|
||||
public int getFailCount() {
|
||||
return failCount;
|
||||
}
|
||||
|
||||
public void setFailCount(int failCount) {
|
||||
this.failCount = failCount;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
}
|
||||
+109
@@ -0,0 +1,109 @@
|
||||
package cn.novalon.gym.manage.coupon.domain;
|
||||
|
||||
import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "会员优惠券")
|
||||
public class MemberCoupon extends BaseDomain {
|
||||
|
||||
@Schema(description = "优惠券模板ID")
|
||||
private Long templateId;
|
||||
|
||||
@Schema(description = "会员ID")
|
||||
private Long memberId;
|
||||
|
||||
@Schema(description = "优惠券码")
|
||||
private String couponCode;
|
||||
|
||||
@Schema(description = "状态：AVAILABLE/USED/EXPIRED/INVALID")
|
||||
private String status;
|
||||
|
||||
@Schema(description = "发放方式：MANUAL/BATCH/AUTO/CLAIM")
|
||||
private String distributeType;
|
||||
|
||||
@Schema(description = "领取时间")
|
||||
private LocalDateTime receivedAt;
|
||||
|
||||
@Schema(description = "过期时间")
|
||||
private LocalDateTime expireAt;
|
||||
|
||||
@Schema(description = "使用时间")
|
||||
private LocalDateTime usedAt;
|
||||
|
||||
@Schema(description = "关联订单ID")
|
||||
private Long orderId;
|
||||
|
||||
public Long getTemplateId() {
|
||||
return templateId;
|
||||
}
|
||||
|
||||
public void setTemplateId(Long templateId) {
|
||||
this.templateId = templateId;
|
||||
}
|
||||
|
||||
public Long getMemberId() {
|
||||
return memberId;
|
||||
}
|
||||
|
||||
public void setMemberId(Long memberId) {
|
||||
this.memberId = memberId;
|
||||
}
|
||||
|
||||
public String getCouponCode() {
|
||||
return couponCode;
|
||||
}
|
||||
|
||||
public void setCouponCode(String couponCode) {
|
||||
this.couponCode = couponCode;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public String getDistributeType() {
|
||||
return distributeType;
|
||||
}
|
||||
|
||||
public void setDistributeType(String distributeType) {
|
||||
this.distributeType = distributeType;
|
||||
}
|
||||
|
||||
public LocalDateTime getReceivedAt() {
|
||||
return receivedAt;
|
||||
}
|
||||
|
||||
public void setReceivedAt(LocalDateTime receivedAt) {
|
||||
this.receivedAt = receivedAt;
|
||||
}
|
||||
|
||||
public LocalDateTime getExpireAt() {
|
||||
return expireAt;
|
||||
}
|
||||
|
||||
public void setExpireAt(LocalDateTime expireAt) {
|
||||
this.expireAt = expireAt;
|
||||
}
|
||||
|
||||
public LocalDateTime getUsedAt() {
|
||||
return usedAt;
|
||||
}
|
||||
|
||||
public void setUsedAt(LocalDateTime usedAt) {
|
||||
this.usedAt = usedAt;
|
||||
}
|
||||
|
||||
public Long getOrderId() {
|
||||
return orderId;
|
||||
}
|
||||
|
||||
public void setOrderId(Long orderId) {
|
||||
this.orderId = orderId;
|
||||
}
|
||||
}
|
||||
+210
@@ -0,0 +1,210 @@
|
||||
package cn.novalon.gym.manage.coupon.entity;
|
||||
|
||||
import cn.novalon.gym.manage.db.entity.BaseEntity;
|
||||
import org.springframework.data.relational.core.mapping.Column;
|
||||
import org.springframework.data.relational.core.mapping.Table;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Table("coupon_template")
|
||||
public class CouponTemplateEntity extends BaseEntity {
|
||||
|
||||
@Column("name")
|
||||
private String name;
|
||||
|
||||
@Column("description")
|
||||
private String description;
|
||||
|
||||
@Column("coupon_type")
|
||||
private String couponType;
|
||||
|
||||
@Column("discount_value")
|
||||
private BigDecimal discountValue;
|
||||
|
||||
@Column("threshold_amount")
|
||||
private BigDecimal thresholdAmount;
|
||||
|
||||
@Column("validity_type")
|
||||
private String validityType;
|
||||
|
||||
@Column("start_time")
|
||||
private LocalDateTime startTime;
|
||||
|
||||
@Column("end_time")
|
||||
private LocalDateTime endTime;
|
||||
|
||||
@Column("valid_days")
|
||||
private Integer validDays;
|
||||
|
||||
@Column("apply_scope")
|
||||
private String applyScope;
|
||||
|
||||
@Column("apply_product_ids")
|
||||
private String applyProductIds;
|
||||
|
||||
@Column("total_quantity")
|
||||
private Integer totalQuantity;
|
||||
|
||||
@Column("per_user_limit")
|
||||
private Integer perUserLimit;
|
||||
|
||||
@Column("stackable")
|
||||
private Boolean stackable;
|
||||
|
||||
@Column("claim_code")
|
||||
private String claimCode;
|
||||
|
||||
@Column("status")
|
||||
private String status;
|
||||
|
||||
@Column("issued_count")
|
||||
private Integer issuedCount;
|
||||
|
||||
@Column("used_count")
|
||||
private Integer usedCount;
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public String getCouponType() {
|
||||
return couponType;
|
||||
}
|
||||
|
||||
public void setCouponType(String couponType) {
|
||||
this.couponType = couponType;
|
||||
}
|
||||
|
||||
public BigDecimal getDiscountValue() {
|
||||
return discountValue;
|
||||
}
|
||||
|
||||
public void setDiscountValue(BigDecimal discountValue) {
|
||||
this.discountValue = discountValue;
|
||||
}
|
||||
|
||||
public BigDecimal getThresholdAmount() {
|
||||
return thresholdAmount;
|
||||
}
|
||||
|
||||
public void setThresholdAmount(BigDecimal thresholdAmount) {
|
||||
this.thresholdAmount = thresholdAmount;
|
||||
}
|
||||
|
||||
public String getValidityType() {
|
||||
return validityType;
|
||||
}
|
||||
|
||||
public void setValidityType(String validityType) {
|
||||
this.validityType = validityType;
|
||||
}
|
||||
|
||||
public LocalDateTime getStartTime() {
|
||||
return startTime;
|
||||
}
|
||||
|
||||
public void setStartTime(LocalDateTime startTime) {
|
||||
this.startTime = startTime;
|
||||
}
|
||||
|
||||
public LocalDateTime getEndTime() {
|
||||
return endTime;
|
||||
}
|
||||
|
||||
public void setEndTime(LocalDateTime endTime) {
|
||||
this.endTime = endTime;
|
||||
}
|
||||
|
||||
public Integer getValidDays() {
|
||||
return validDays;
|
||||
}
|
||||
|
||||
public void setValidDays(Integer validDays) {
|
||||
this.validDays = validDays;
|
||||
}
|
||||
|
||||
public String getApplyScope() {
|
||||
return applyScope;
|
||||
}
|
||||
|
||||
public void setApplyScope(String applyScope) {
|
||||
this.applyScope = applyScope;
|
||||
}
|
||||
|
||||
public String getApplyProductIds() {
|
||||
return applyProductIds;
|
||||
}
|
||||
|
||||
public void setApplyProductIds(String applyProductIds) {
|
||||
this.applyProductIds = applyProductIds;
|
||||
}
|
||||
|
||||
public Integer getTotalQuantity() {
|
||||
return totalQuantity;
|
||||
}
|
||||
|
||||
public void setTotalQuantity(Integer totalQuantity) {
|
||||
this.totalQuantity = totalQuantity;
|
||||
}
|
||||
|
||||
public Integer getPerUserLimit() {
|
||||
return perUserLimit;
|
||||
}
|
||||
|
||||
public void setPerUserLimit(Integer perUserLimit) {
|
||||
this.perUserLimit = perUserLimit;
|
||||
}
|
||||
|
||||
public Boolean getStackable() {
|
||||
return stackable;
|
||||
}
|
||||
|
||||
public void setStackable(Boolean stackable) {
|
||||
this.stackable = stackable;
|
||||
}
|
||||
|
||||
public String getClaimCode() {
|
||||
return claimCode;
|
||||
}
|
||||
|
||||
public void setClaimCode(String claimCode) {
|
||||
this.claimCode = claimCode;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public Integer getIssuedCount() {
|
||||
return issuedCount;
|
||||
}
|
||||
|
||||
public void setIssuedCount(Integer issuedCount) {
|
||||
this.issuedCount = issuedCount;
|
||||
}
|
||||
|
||||
public Integer getUsedCount() {
|
||||
return usedCount;
|
||||
}
|
||||
|
||||
public void setUsedCount(Integer usedCount) {
|
||||
this.usedCount = usedCount;
|
||||
}
|
||||
}
|
||||
+110
@@ -0,0 +1,110 @@
|
||||
package cn.novalon.gym.manage.coupon.entity;
|
||||
|
||||
import cn.novalon.gym.manage.db.entity.BaseEntity;
|
||||
import org.springframework.data.relational.core.mapping.Column;
|
||||
import org.springframework.data.relational.core.mapping.Table;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Table("member_coupon")
|
||||
public class MemberCouponEntity extends BaseEntity {
|
||||
|
||||
@Column("template_id")
|
||||
private Long templateId;
|
||||
|
||||
@Column("member_id")
|
||||
private Long memberId;
|
||||
|
||||
@Column("coupon_code")
|
||||
private String couponCode;
|
||||
|
||||
@Column("status")
|
||||
private String status;
|
||||
|
||||
@Column("distribute_type")
|
||||
private String distributeType;
|
||||
|
||||
@Column("received_at")
|
||||
private LocalDateTime receivedAt;
|
||||
|
||||
@Column("expire_at")
|
||||
private LocalDateTime expireAt;
|
||||
|
||||
@Column("used_at")
|
||||
private LocalDateTime usedAt;
|
||||
|
||||
@Column("order_id")
|
||||
private Long orderId;
|
||||
|
||||
public Long getTemplateId() {
|
||||
return templateId;
|
||||
}
|
||||
|
||||
public void setTemplateId(Long templateId) {
|
||||
this.templateId = templateId;
|
||||
}
|
||||
|
||||
public Long getMemberId() {
|
||||
return memberId;
|
||||
}
|
||||
|
||||
public void setMemberId(Long memberId) {
|
||||
this.memberId = memberId;
|
||||
}
|
||||
|
||||
public String getCouponCode() {
|
||||
return couponCode;
|
||||
}
|
||||
|
||||
public void setCouponCode(String couponCode) {
|
||||
this.couponCode = couponCode;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public String getDistributeType() {
|
||||
return distributeType;
|
||||
}
|
||||
|
||||
public void setDistributeType(String distributeType) {
|
||||
this.distributeType = distributeType;
|
||||
}
|
||||
|
||||
public LocalDateTime getReceivedAt() {
|
||||
return receivedAt;
|
||||
}
|
||||
|
||||
public void setReceivedAt(LocalDateTime receivedAt) {
|
||||
this.receivedAt = receivedAt;
|
||||
}
|
||||
|
||||
public LocalDateTime getExpireAt() {
|
||||
return expireAt;
|
||||
}
|
||||
|
||||
public void setExpireAt(LocalDateTime expireAt) {
|
||||
this.expireAt = expireAt;
|
||||
}
|
||||
|
||||
public LocalDateTime getUsedAt() {
|
||||
return usedAt;
|
||||
}
|
||||
|
||||
public void setUsedAt(LocalDateTime usedAt) {
|
||||
this.usedAt = usedAt;
|
||||
}
|
||||
|
||||
public Long getOrderId() {
|
||||
return orderId;
|
||||
}
|
||||
|
||||
public void setOrderId(Long orderId) {
|
||||
this.orderId = orderId;
|
||||
}
|
||||
}
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
package cn.novalon.gym.manage.coupon.enums;
|
||||
|
||||
/**
|
||||
* 优惠券适用商品范围
|
||||
*/
|
||||
public enum ApplyScope {
|
||||
/** 全场通用 */
|
||||
ALL,
|
||||
/** 指定商品 */
|
||||
SPECIFIC
|
||||
}
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
package cn.novalon.gym.manage.coupon.enums;
|
||||
|
||||
/**
|
||||
* 优惠券模板状态
|
||||
*/
|
||||
public enum CouponTemplateStatus {
|
||||
/** 草稿 */
|
||||
DRAFT,
|
||||
/** 进行中 */
|
||||
ACTIVE,
|
||||
/** 已终止 */
|
||||
TERMINATED,
|
||||
/** 已过期 */
|
||||
EXPIRED
|
||||
}
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
package cn.novalon.gym.manage.coupon.enums;
|
||||
|
||||
/**
|
||||
* 优惠券类型
|
||||
*/
|
||||
public enum CouponType {
|
||||
/** 满减券 */
|
||||
CASH,
|
||||
/** 折扣券 */
|
||||
DISCOUNT,
|
||||
/** 课程券 */
|
||||
COURSE,
|
||||
/** 体验券（会员体验专用） */
|
||||
EXPERIENCE
|
||||
}
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
package cn.novalon.gym.manage.coupon.enums;
|
||||
|
||||
/**
|
||||
* 优惠券发放方式
|
||||
*/
|
||||
public enum DistributeType {
|
||||
/** 手动发放（指定会员） */
|
||||
MANUAL,
|
||||
/** 批量发放（按会员分组） */
|
||||
BATCH,
|
||||
/** 自动发放（触发规则） */
|
||||
AUTO,
|
||||
/** 领取码/二维码领取 */
|
||||
CLAIM
|
||||
}
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
package cn.novalon.gym.manage.coupon.enums;
|
||||
|
||||
/**
|
||||
* 会员优惠券状态
|
||||
*/
|
||||
public enum MemberCouponStatus {
|
||||
/** 可用 */
|
||||
AVAILABLE,
|
||||
/** 已使用 */
|
||||
USED,
|
||||
/** 已过期 */
|
||||
EXPIRED,
|
||||
/** 已作废 */
|
||||
INVALID
|
||||
}
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
package cn.novalon.gym.manage.coupon.enums;
|
||||
|
||||
/**
|
||||
* 优惠券有效期类型
|
||||
*/
|
||||
public enum ValidityType {
|
||||
/** 固定日期 */
|
||||
FIXED_DATE,
|
||||
/** 领取后X天 */
|
||||
DAYS_AFTER_CLAIM
|
||||
}
|
||||
+77
@@ -0,0 +1,77 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.converter;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleActivity;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleItem;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleOrder;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.entity.FlashSaleActivityEntity;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.entity.FlashSaleItemEntity;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.entity.FlashSaleOrderEntity;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Component
|
||||
public class FlashSaleConverter {
|
||||
|
||||
public FlashSaleActivity toActivity(FlashSaleActivityEntity entity) {
|
||||
if (entity == null) {
|
||||
return null;
|
||||
}
|
||||
FlashSaleActivity domain = new FlashSaleActivity();
|
||||
BeanUtil.copyProperties(entity, domain);
|
||||
return domain;
|
||||
}
|
||||
|
||||
public FlashSaleActivityEntity toActivityEntity(FlashSaleActivity domain) {
|
||||
if (domain == null) {
|
||||
return null;
|
||||
}
|
||||
FlashSaleActivityEntity entity = new FlashSaleActivityEntity();
|
||||
BeanUtil.copyProperties(domain, entity);
|
||||
if (domain.getId() != null) {
|
||||
entity.markNotNew();
|
||||
}
|
||||
return entity;
|
||||
}
|
||||
|
||||
public FlashSaleItem toItem(FlashSaleItemEntity entity) {
|
||||
if (entity == null) {
|
||||
return null;
|
||||
}
|
||||
FlashSaleItem domain = new FlashSaleItem();
|
||||
BeanUtil.copyProperties(entity, domain);
|
||||
return domain;
|
||||
}
|
||||
|
||||
public FlashSaleItemEntity toItemEntity(FlashSaleItem domain) {
|
||||
if (domain == null) {
|
||||
return null;
|
||||
}
|
||||
FlashSaleItemEntity entity = new FlashSaleItemEntity();
|
||||
BeanUtil.copyProperties(domain, entity);
|
||||
if (domain.getId() != null) {
|
||||
entity.markNotNew();
|
||||
}
|
||||
return entity;
|
||||
}
|
||||
|
||||
public FlashSaleOrder toOrder(FlashSaleOrderEntity entity) {
|
||||
if (entity == null) {
|
||||
return null;
|
||||
}
|
||||
FlashSaleOrder domain = new FlashSaleOrder();
|
||||
BeanUtil.copyProperties(entity, domain);
|
||||
return domain;
|
||||
}
|
||||
|
||||
public FlashSaleOrderEntity toOrderEntity(FlashSaleOrder domain) {
|
||||
if (domain == null) {
|
||||
return null;
|
||||
}
|
||||
FlashSaleOrderEntity entity = new FlashSaleOrderEntity();
|
||||
BeanUtil.copyProperties(domain, entity);
|
||||
if (domain.getId() != null) {
|
||||
entity.markNotNew();
|
||||
}
|
||||
return entity;
|
||||
}
|
||||
}
|
||||
+31
@@ -0,0 +1,31 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.dao;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.flashsale.entity.FlashSaleActivityEntity;
|
||||
import org.springframework.data.r2dbc.repository.Modifying;
|
||||
import org.springframework.data.r2dbc.repository.Query;
|
||||
import org.springframework.data.r2dbc.repository.R2dbcRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Repository
|
||||
public interface FlashSaleActivityDao extends R2dbcRepository<FlashSaleActivityEntity, Long> {
|
||||
|
||||
Mono<FlashSaleActivityEntity> findByIdIsAndDeletedAtIsNull(Long id);
|
||||
|
||||
Flux<FlashSaleActivityEntity> findAllByDeletedAtIsNull();
|
||||
|
||||
Flux<FlashSaleActivityEntity> findByNameContainingAndDeletedAtIsNull(String name);
|
||||
|
||||
Flux<FlashSaleActivityEntity> findByStatusAndDeletedAtIsNull(String status);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE flash_sale_activity SET deleted_at = :deletedAt WHERE id = :id")
|
||||
Mono<Integer> softDelete(Long id, LocalDateTime deletedAt);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE flash_sale_activity SET status = :status, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> updateStatus(Long id, String status, LocalDateTime updatedAt);
|
||||
}
|
||||
+31
@@ -0,0 +1,31 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.dao;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.flashsale.entity.FlashSaleItemEntity;
|
||||
import org.springframework.data.r2dbc.repository.Modifying;
|
||||
import org.springframework.data.r2dbc.repository.Query;
|
||||
import org.springframework.data.r2dbc.repository.R2dbcRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Repository
|
||||
public interface FlashSaleItemDao extends R2dbcRepository<FlashSaleItemEntity, Long> {
|
||||
|
||||
Mono<FlashSaleItemEntity> findByIdIsAndDeletedAtIsNull(Long id);
|
||||
|
||||
Flux<FlashSaleItemEntity> findByActivityIdAndDeletedAtIsNull(Long activityId);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE flash_sale_item SET stock = stock - :quantity, updated_at = :updatedAt WHERE id = :id AND stock >= :quantity")
|
||||
Mono<Integer> deductStock(Long id, int quantity, LocalDateTime updatedAt);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE flash_sale_item SET stock = stock + :quantity, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> restoreStock(Long id, int quantity, LocalDateTime updatedAt);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE flash_sale_item SET sold_count = sold_count + :count, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> incrementSoldCount(Long id, int count, LocalDateTime updatedAt);
|
||||
}
|
||||
+38
@@ -0,0 +1,38 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.dao;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.flashsale.entity.FlashSaleOrderEntity;
|
||||
import org.springframework.data.r2dbc.repository.Modifying;
|
||||
import org.springframework.data.r2dbc.repository.Query;
|
||||
import org.springframework.data.r2dbc.repository.R2dbcRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Repository
|
||||
public interface FlashSaleOrderDao extends R2dbcRepository<FlashSaleOrderEntity, Long> {
|
||||
|
||||
Mono<FlashSaleOrderEntity> findByIdIsAndDeletedAtIsNull(Long id);
|
||||
|
||||
Flux<FlashSaleOrderEntity> findByMemberIdAndDeletedAtIsNull(Long memberId);
|
||||
|
||||
Flux<FlashSaleOrderEntity> findByActivityIdAndDeletedAtIsNull(Long activityId);
|
||||
|
||||
Mono<Long> countByActivityIdAndMemberIdAndStatusAndDeletedAtIsNull(
|
||||
Long activityId, Long memberId, String status);
|
||||
|
||||
Mono<Long> countByItemIdAndMemberIdAndStatusInAndDeletedAtIsNull(
|
||||
Long itemId, Long memberId, java.util.Collection<String> statuses);
|
||||
|
||||
@Query("SELECT * FROM flash_sale_order WHERE status = :status AND expire_at < :now AND deleted_at IS NULL")
|
||||
Flux<FlashSaleOrderEntity> findExpiredPendingOrders(String status, LocalDateTime now);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE flash_sale_order SET status = :status, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> updateStatus(Long id, String status, LocalDateTime updatedAt);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE flash_sale_order SET status = :status, pay_at = :payAt, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> markPaid(Long id, String status, LocalDateTime payAt, LocalDateTime updatedAt);
|
||||
}
|
||||
+74
@@ -0,0 +1,74 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.domain;
|
||||
|
||||
import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "秒杀活动")
|
||||
public class FlashSaleActivity extends BaseDomain {
|
||||
|
||||
private String name;
|
||||
private String description;
|
||||
private LocalDateTime startTime;
|
||||
private LocalDateTime endTime;
|
||||
private Integer payTimeoutMinutes;
|
||||
private Integer perUserLimit;
|
||||
private String status;
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public LocalDateTime getStartTime() {
|
||||
return startTime;
|
||||
}
|
||||
|
||||
public void setStartTime(LocalDateTime startTime) {
|
||||
this.startTime = startTime;
|
||||
}
|
||||
|
||||
public LocalDateTime getEndTime() {
|
||||
return endTime;
|
||||
}
|
||||
|
||||
public void setEndTime(LocalDateTime endTime) {
|
||||
this.endTime = endTime;
|
||||
}
|
||||
|
||||
public Integer getPayTimeoutMinutes() {
|
||||
return payTimeoutMinutes;
|
||||
}
|
||||
|
||||
public void setPayTimeoutMinutes(Integer payTimeoutMinutes) {
|
||||
this.payTimeoutMinutes = payTimeoutMinutes;
|
||||
}
|
||||
|
||||
public Integer getPerUserLimit() {
|
||||
return perUserLimit;
|
||||
}
|
||||
|
||||
public void setPerUserLimit(Integer perUserLimit) {
|
||||
this.perUserLimit = perUserLimit;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
}
|
||||
+92
@@ -0,0 +1,92 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.domain;
|
||||
|
||||
import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Schema(description = "秒杀商品")
|
||||
public class FlashSaleItem extends BaseDomain {
|
||||
|
||||
private Long activityId;
|
||||
private String productType;
|
||||
private Long productId;
|
||||
private String productName;
|
||||
private BigDecimal originalPrice;
|
||||
private BigDecimal seckillPrice;
|
||||
private Integer stock;
|
||||
private Integer soldCount;
|
||||
private Integer perUserLimit;
|
||||
|
||||
public Long getActivityId() {
|
||||
return activityId;
|
||||
}
|
||||
|
||||
public void setActivityId(Long activityId) {
|
||||
this.activityId = activityId;
|
||||
}
|
||||
|
||||
public String getProductType() {
|
||||
return productType;
|
||||
}
|
||||
|
||||
public void setProductType(String productType) {
|
||||
this.productType = productType;
|
||||
}
|
||||
|
||||
public Long getProductId() {
|
||||
return productId;
|
||||
}
|
||||
|
||||
public void setProductId(Long productId) {
|
||||
this.productId = productId;
|
||||
}
|
||||
|
||||
public String getProductName() {
|
||||
return productName;
|
||||
}
|
||||
|
||||
public void setProductName(String productName) {
|
||||
this.productName = productName;
|
||||
}
|
||||
|
||||
public BigDecimal getOriginalPrice() {
|
||||
return originalPrice;
|
||||
}
|
||||
|
||||
public void setOriginalPrice(BigDecimal originalPrice) {
|
||||
this.originalPrice = originalPrice;
|
||||
}
|
||||
|
||||
public BigDecimal getSeckillPrice() {
|
||||
return seckillPrice;
|
||||
}
|
||||
|
||||
public void setSeckillPrice(BigDecimal seckillPrice) {
|
||||
this.seckillPrice = seckillPrice;
|
||||
}
|
||||
|
||||
public Integer getStock() {
|
||||
return stock;
|
||||
}
|
||||
|
||||
public void setStock(Integer stock) {
|
||||
this.stock = stock;
|
||||
}
|
||||
|
||||
public Integer getSoldCount() {
|
||||
return soldCount;
|
||||
}
|
||||
|
||||
public void setSoldCount(Integer soldCount) {
|
||||
this.soldCount = soldCount;
|
||||
}
|
||||
|
||||
public Integer getPerUserLimit() {
|
||||
return perUserLimit;
|
||||
}
|
||||
|
||||
public void setPerUserLimit(Integer perUserLimit) {
|
||||
this.perUserLimit = perUserLimit;
|
||||
}
|
||||
}
|
||||
+84
@@ -0,0 +1,84 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.domain;
|
||||
|
||||
import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "秒杀订单")
|
||||
public class FlashSaleOrder extends BaseDomain {
|
||||
|
||||
private Long activityId;
|
||||
private Long itemId;
|
||||
private Long memberId;
|
||||
private Integer quantity;
|
||||
private BigDecimal payAmount;
|
||||
private String status;
|
||||
private LocalDateTime expireAt;
|
||||
private LocalDateTime payAt;
|
||||
|
||||
public Long getActivityId() {
|
||||
return activityId;
|
||||
}
|
||||
|
||||
public void setActivityId(Long activityId) {
|
||||
this.activityId = activityId;
|
||||
}
|
||||
|
||||
public Long getItemId() {
|
||||
return itemId;
|
||||
}
|
||||
|
||||
public void setItemId(Long itemId) {
|
||||
this.itemId = itemId;
|
||||
}
|
||||
|
||||
public Long getMemberId() {
|
||||
return memberId;
|
||||
}
|
||||
|
||||
public void setMemberId(Long memberId) {
|
||||
this.memberId = memberId;
|
||||
}
|
||||
|
||||
public Integer getQuantity() {
|
||||
return quantity;
|
||||
}
|
||||
|
||||
public void setQuantity(Integer quantity) {
|
||||
this.quantity = quantity;
|
||||
}
|
||||
|
||||
public BigDecimal getPayAmount() {
|
||||
return payAmount;
|
||||
}
|
||||
|
||||
public void setPayAmount(BigDecimal payAmount) {
|
||||
this.payAmount = payAmount;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public LocalDateTime getExpireAt() {
|
||||
return expireAt;
|
||||
}
|
||||
|
||||
public void setExpireAt(LocalDateTime expireAt) {
|
||||
this.expireAt = expireAt;
|
||||
}
|
||||
|
||||
public LocalDateTime getPayAt() {
|
||||
return payAt;
|
||||
}
|
||||
|
||||
public void setPayAt(LocalDateTime payAt) {
|
||||
this.payAt = payAt;
|
||||
}
|
||||
}
|
||||
+82
@@ -0,0 +1,82 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Schema(description = "秒杀统计数据")
|
||||
public class FlashSaleStatistics {
|
||||
|
||||
private Long activityId;
|
||||
private long totalOrders;
|
||||
private long pendingOrders;
|
||||
private long paidOrders;
|
||||
private long cancelledOrders;
|
||||
private long expiredOrders;
|
||||
private long totalSoldQuantity;
|
||||
private BigDecimal totalRevenue;
|
||||
|
||||
public Long getActivityId() {
|
||||
return activityId;
|
||||
}
|
||||
|
||||
public void setActivityId(Long activityId) {
|
||||
this.activityId = activityId;
|
||||
}
|
||||
|
||||
public long getTotalOrders() {
|
||||
return totalOrders;
|
||||
}
|
||||
|
||||
public void setTotalOrders(long totalOrders) {
|
||||
this.totalOrders = totalOrders;
|
||||
}
|
||||
|
||||
public long getPendingOrders() {
|
||||
return pendingOrders;
|
||||
}
|
||||
|
||||
public void setPendingOrders(long pendingOrders) {
|
||||
this.pendingOrders = pendingOrders;
|
||||
}
|
||||
|
||||
public long getPaidOrders() {
|
||||
return paidOrders;
|
||||
}
|
||||
|
||||
public void setPaidOrders(long paidOrders) {
|
||||
this.paidOrders = paidOrders;
|
||||
}
|
||||
|
||||
public long getCancelledOrders() {
|
||||
return cancelledOrders;
|
||||
}
|
||||
|
||||
public void setCancelledOrders(long cancelledOrders) {
|
||||
this.cancelledOrders = cancelledOrders;
|
||||
}
|
||||
|
||||
public long getExpiredOrders() {
|
||||
return expiredOrders;
|
||||
}
|
||||
|
||||
public void setExpiredOrders(long expiredOrders) {
|
||||
this.expiredOrders = expiredOrders;
|
||||
}
|
||||
|
||||
public long getTotalSoldQuantity() {
|
||||
return totalSoldQuantity;
|
||||
}
|
||||
|
||||
public void setTotalSoldQuantity(long totalSoldQuantity) {
|
||||
this.totalSoldQuantity = totalSoldQuantity;
|
||||
}
|
||||
|
||||
public BigDecimal getTotalRevenue() {
|
||||
return totalRevenue;
|
||||
}
|
||||
|
||||
public void setTotalRevenue(BigDecimal totalRevenue) {
|
||||
this.totalRevenue = totalRevenue;
|
||||
}
|
||||
}
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
@Schema(description = "秒杀抢购请求")
|
||||
public class GrabRequest {
|
||||
|
||||
private Long itemId;
|
||||
private Long memberId;
|
||||
private Integer quantity;
|
||||
|
||||
public Long getItemId() {
|
||||
return itemId;
|
||||
}
|
||||
|
||||
public void setItemId(Long itemId) {
|
||||
this.itemId = itemId;
|
||||
}
|
||||
|
||||
public Long getMemberId() {
|
||||
return memberId;
|
||||
}
|
||||
|
||||
public void setMemberId(Long memberId) {
|
||||
this.memberId = memberId;
|
||||
}
|
||||
|
||||
public Integer getQuantity() {
|
||||
return quantity;
|
||||
}
|
||||
|
||||
public void setQuantity(Integer quantity) {
|
||||
this.quantity = quantity;
|
||||
}
|
||||
}
|
||||
+88
@@ -0,0 +1,88 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.entity;
|
||||
|
||||
import cn.novalon.gym.manage.db.entity.BaseEntity;
|
||||
import org.springframework.data.relational.core.mapping.Column;
|
||||
import org.springframework.data.relational.core.mapping.Table;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Table("flash_sale_activity")
|
||||
public class FlashSaleActivityEntity extends BaseEntity {
|
||||
|
||||
@Column("name")
|
||||
private String name;
|
||||
|
||||
@Column("description")
|
||||
private String description;
|
||||
|
||||
@Column("start_time")
|
||||
private LocalDateTime startTime;
|
||||
|
||||
@Column("end_time")
|
||||
private LocalDateTime endTime;
|
||||
|
||||
@Column("pay_timeout_minutes")
|
||||
private Integer payTimeoutMinutes;
|
||||
|
||||
@Column("per_user_limit")
|
||||
private Integer perUserLimit;
|
||||
|
||||
@Column("status")
|
||||
private String status;
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public LocalDateTime getStartTime() {
|
||||
return startTime;
|
||||
}
|
||||
|
||||
public void setStartTime(LocalDateTime startTime) {
|
||||
this.startTime = startTime;
|
||||
}
|
||||
|
||||
public LocalDateTime getEndTime() {
|
||||
return endTime;
|
||||
}
|
||||
|
||||
public void setEndTime(LocalDateTime endTime) {
|
||||
this.endTime = endTime;
|
||||
}
|
||||
|
||||
public Integer getPayTimeoutMinutes() {
|
||||
return payTimeoutMinutes;
|
||||
}
|
||||
|
||||
public void setPayTimeoutMinutes(Integer payTimeoutMinutes) {
|
||||
this.payTimeoutMinutes = payTimeoutMinutes;
|
||||
}
|
||||
|
||||
public Integer getPerUserLimit() {
|
||||
return perUserLimit;
|
||||
}
|
||||
|
||||
public void setPerUserLimit(Integer perUserLimit) {
|
||||
this.perUserLimit = perUserLimit;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
}
|
||||
+110
@@ -0,0 +1,110 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.entity;
|
||||
|
||||
import cn.novalon.gym.manage.db.entity.BaseEntity;
|
||||
import org.springframework.data.relational.core.mapping.Column;
|
||||
import org.springframework.data.relational.core.mapping.Table;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Table("flash_sale_item")
|
||||
public class FlashSaleItemEntity extends BaseEntity {
|
||||
|
||||
@Column("activity_id")
|
||||
private Long activityId;
|
||||
|
||||
@Column("product_type")
|
||||
private String productType;
|
||||
|
||||
@Column("product_id")
|
||||
private Long productId;
|
||||
|
||||
@Column("product_name")
|
||||
private String productName;
|
||||
|
||||
@Column("original_price")
|
||||
private BigDecimal originalPrice;
|
||||
|
||||
@Column("seckill_price")
|
||||
private BigDecimal seckillPrice;
|
||||
|
||||
@Column("stock")
|
||||
private Integer stock;
|
||||
|
||||
@Column("sold_count")
|
||||
private Integer soldCount;
|
||||
|
||||
@Column("per_user_limit")
|
||||
private Integer perUserLimit;
|
||||
|
||||
public Long getActivityId() {
|
||||
return activityId;
|
||||
}
|
||||
|
||||
public void setActivityId(Long activityId) {
|
||||
this.activityId = activityId;
|
||||
}
|
||||
|
||||
public String getProductType() {
|
||||
return productType;
|
||||
}
|
||||
|
||||
public void setProductType(String productType) {
|
||||
this.productType = productType;
|
||||
}
|
||||
|
||||
public Long getProductId() {
|
||||
return productId;
|
||||
}
|
||||
|
||||
public void setProductId(Long productId) {
|
||||
this.productId = productId;
|
||||
}
|
||||
|
||||
public String getProductName() {
|
||||
return productName;
|
||||
}
|
||||
|
||||
public void setProductName(String productName) {
|
||||
this.productName = productName;
|
||||
}
|
||||
|
||||
public BigDecimal getOriginalPrice() {
|
||||
return originalPrice;
|
||||
}
|
||||
|
||||
public void setOriginalPrice(BigDecimal originalPrice) {
|
||||
this.originalPrice = originalPrice;
|
||||
}
|
||||
|
||||
public BigDecimal getSeckillPrice() {
|
||||
return seckillPrice;
|
||||
}
|
||||
|
||||
public void setSeckillPrice(BigDecimal seckillPrice) {
|
||||
this.seckillPrice = seckillPrice;
|
||||
}
|
||||
|
||||
public Integer getStock() {
|
||||
return stock;
|
||||
}
|
||||
|
||||
public void setStock(Integer stock) {
|
||||
this.stock = stock;
|
||||
}
|
||||
|
||||
public Integer getSoldCount() {
|
||||
return soldCount;
|
||||
}
|
||||
|
||||
public void setSoldCount(Integer soldCount) {
|
||||
this.soldCount = soldCount;
|
||||
}
|
||||
|
||||
public Integer getPerUserLimit() {
|
||||
return perUserLimit;
|
||||
}
|
||||
|
||||
public void setPerUserLimit(Integer perUserLimit) {
|
||||
this.perUserLimit = perUserLimit;
|
||||
}
|
||||
}
|
||||
+100
@@ -0,0 +1,100 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.entity;
|
||||
|
||||
import cn.novalon.gym.manage.db.entity.BaseEntity;
|
||||
import org.springframework.data.relational.core.mapping.Column;
|
||||
import org.springframework.data.relational.core.mapping.Table;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Table("flash_sale_order")
|
||||
public class FlashSaleOrderEntity extends BaseEntity {
|
||||
|
||||
@Column("activity_id")
|
||||
private Long activityId;
|
||||
|
||||
@Column("item_id")
|
||||
private Long itemId;
|
||||
|
||||
@Column("member_id")
|
||||
private Long memberId;
|
||||
|
||||
@Column("quantity")
|
||||
private Integer quantity;
|
||||
|
||||
@Column("pay_amount")
|
||||
private BigDecimal payAmount;
|
||||
|
||||
@Column("status")
|
||||
private String status;
|
||||
|
||||
@Column("expire_at")
|
||||
private LocalDateTime expireAt;
|
||||
|
||||
@Column("pay_at")
|
||||
private LocalDateTime payAt;
|
||||
|
||||
public Long getActivityId() {
|
||||
return activityId;
|
||||
}
|
||||
|
||||
public void setActivityId(Long activityId) {
|
||||
this.activityId = activityId;
|
||||
}
|
||||
|
||||
public Long getItemId() {
|
||||
return itemId;
|
||||
}
|
||||
|
||||
public void setItemId(Long itemId) {
|
||||
this.itemId = itemId;
|
||||
}
|
||||
|
||||
public Long getMemberId() {
|
||||
return memberId;
|
||||
}
|
||||
|
||||
public void setMemberId(Long memberId) {
|
||||
this.memberId = memberId;
|
||||
}
|
||||
|
||||
public Integer getQuantity() {
|
||||
return quantity;
|
||||
}
|
||||
|
||||
public void setQuantity(Integer quantity) {
|
||||
this.quantity = quantity;
|
||||
}
|
||||
|
||||
public BigDecimal getPayAmount() {
|
||||
return payAmount;
|
||||
}
|
||||
|
||||
public void setPayAmount(BigDecimal payAmount) {
|
||||
this.payAmount = payAmount;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public LocalDateTime getExpireAt() {
|
||||
return expireAt;
|
||||
}
|
||||
|
||||
public void setExpireAt(LocalDateTime expireAt) {
|
||||
this.expireAt = expireAt;
|
||||
}
|
||||
|
||||
public LocalDateTime getPayAt() {
|
||||
return payAt;
|
||||
}
|
||||
|
||||
public void setPayAt(LocalDateTime payAt) {
|
||||
this.payAt = payAt;
|
||||
}
|
||||
}
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.enums;
|
||||
|
||||
/**
|
||||
* 秒杀活动状态
|
||||
*/
|
||||
public enum FlashSaleActivityStatus {
|
||||
DRAFT,
|
||||
ACTIVE,
|
||||
TERMINATED,
|
||||
EXPIRED
|
||||
}
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.enums;
|
||||
|
||||
/**
|
||||
* 秒杀订单状态
|
||||
*/
|
||||
public enum FlashSaleOrderStatus {
|
||||
PENDING,
|
||||
PAID,
|
||||
CANCELLED,
|
||||
EXPIRED
|
||||
}
|
||||
+219
@@ -0,0 +1,219 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.handler;
|
||||
|
||||
import cn.novalon.gym.manage.common.dto.PageRequest;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleActivity;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleItem;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleOrder;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.GrabRequest;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.service.IFlashSaleActivityService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.reactive.function.server.ServerRequest;
|
||||
import org.springframework.web.reactive.function.server.ServerResponse;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@Component
|
||||
@Tag(name = "秒杀管理", description = "秒杀相关操作")
|
||||
public class FlashSaleHandler {
|
||||
|
||||
private final IFlashSaleActivityService flashSaleService;
|
||||
|
||||
public FlashSaleHandler(IFlashSaleActivityService flashSaleService) {
|
||||
this.flashSaleService = flashSaleService;
|
||||
}
|
||||
|
||||
@Operation(summary = "获取所有秒杀活动")
|
||||
public Mono<ServerResponse> getAllActivities(ServerRequest request) {
|
||||
boolean includeDeleted = Boolean.parseBoolean(request.queryParam("includeDeleted").orElse("false"));
|
||||
return ServerResponse.ok()
|
||||
.body(flashSaleService.findAll(includeDeleted), FlashSaleActivity.class);
|
||||
}
|
||||
|
||||
@Operation(summary = "分页获取秒杀活动")
|
||||
public Mono<ServerResponse> getActivitiesByPage(ServerRequest request) {
|
||||
return request.bodyToMono(PageRequest.class)
|
||||
.flatMap(pageRequest -> {
|
||||
String status = request.queryParam("status").orElse(null);
|
||||
normalizePageRequest(pageRequest);
|
||||
return flashSaleService.findByPage(pageRequest, status)
|
||||
.flatMap(response -> ServerResponse.ok().bodyValue(response));
|
||||
});
|
||||
}
|
||||
|
||||
@Operation(summary = "搜索秒杀活动")
|
||||
public Mono<ServerResponse> searchActivities(ServerRequest request) {
|
||||
String keyword = request.queryParam("keyword").orElse("");
|
||||
String status = request.queryParam("status").orElse(null);
|
||||
return ServerResponse.ok()
|
||||
.body(flashSaleService.findByKeywordAndStatus(keyword, status), FlashSaleActivity.class);
|
||||
}
|
||||
|
||||
@Operation(summary = "根据ID获取秒杀活动")
|
||||
public Mono<ServerResponse> getActivityById(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return flashSaleService.findById(id)
|
||||
.flatMap(activity -> ServerResponse.ok().bodyValue(activity))
|
||||
.switchIfEmpty(ServerResponse.notFound().build());
|
||||
}
|
||||
|
||||
@Operation(summary = "创建秒杀活动")
|
||||
public Mono<ServerResponse> createActivity(ServerRequest request) {
|
||||
return request.bodyToMono(FlashSaleActivity.class)
|
||||
.flatMap(activity -> {
|
||||
if (activity.getName() == null || activity.getName().isEmpty()) {
|
||||
return badRequest("活动名称不能为空");
|
||||
}
|
||||
return flashSaleService.create(activity)
|
||||
.flatMap(created -> successResponse("秒杀活动创建成功", created))
|
||||
.onErrorResume(this::errorResponse);
|
||||
});
|
||||
}
|
||||
|
||||
@Operation(summary = "更新秒杀活动")
|
||||
public Mono<ServerResponse> updateActivity(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return request.bodyToMono(FlashSaleActivity.class)
|
||||
.flatMap(activity -> flashSaleService.update(id, activity)
|
||||
.flatMap(updated -> successResponse("秒杀活动更新成功", updated))
|
||||
.onErrorResume(this::errorResponse));
|
||||
}
|
||||
|
||||
@Operation(summary = "删除秒杀活动")
|
||||
public Mono<ServerResponse> deleteActivity(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return flashSaleService.delete(id)
|
||||
.then(Mono.defer(() -> successResponse("秒杀活动删除成功", null)))
|
||||
.onErrorResume(this::errorResponse);
|
||||
}
|
||||
|
||||
@Operation(summary = "发布秒杀活动")
|
||||
public Mono<ServerResponse> publishActivity(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return flashSaleService.publish(id)
|
||||
.flatMap(activity -> successResponse("秒杀活动发布成功", activity))
|
||||
.onErrorResume(this::errorResponse);
|
||||
}
|
||||
|
||||
@Operation(summary = "终止秒杀活动")
|
||||
public Mono<ServerResponse> terminateActivity(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return flashSaleService.terminate(id)
|
||||
.flatMap(activity -> successResponse("秒杀活动已终止", activity))
|
||||
.onErrorResume(this::errorResponse);
|
||||
}
|
||||
|
||||
@Operation(summary = "获取秒杀统计")
|
||||
public Mono<ServerResponse> getStatistics(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return flashSaleService.getStatistics(id)
|
||||
.flatMap(stats -> ServerResponse.ok().bodyValue(stats))
|
||||
.onErrorResume(this::errorResponse);
|
||||
}
|
||||
|
||||
@Operation(summary = "获取秒杀商品列表")
|
||||
public Mono<ServerResponse> getItems(ServerRequest request) {
|
||||
String activityIdStr = request.queryParam("activityId").orElse(null);
|
||||
if (activityIdStr == null) {
|
||||
return badRequest("activityId不能为空");
|
||||
}
|
||||
Long activityId = Long.valueOf(activityIdStr);
|
||||
return ServerResponse.ok()
|
||||
.body(flashSaleService.findItemsByActivityId(activityId), FlashSaleItem.class);
|
||||
}
|
||||
|
||||
@Operation(summary = "创建秒杀商品")
|
||||
public Mono<ServerResponse> createItem(ServerRequest request) {
|
||||
return request.bodyToMono(FlashSaleItem.class)
|
||||
.flatMap(item -> flashSaleService.createItem(item)
|
||||
.flatMap(created -> successResponse("秒杀商品创建成功", created))
|
||||
.onErrorResume(this::errorResponse));
|
||||
}
|
||||
|
||||
@Operation(summary = "更新秒杀商品")
|
||||
public Mono<ServerResponse> updateItem(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return request.bodyToMono(FlashSaleItem.class)
|
||||
.flatMap(item -> flashSaleService.updateItem(id, item)
|
||||
.flatMap(updated -> successResponse("秒杀商品更新成功", updated))
|
||||
.onErrorResume(this::errorResponse));
|
||||
}
|
||||
|
||||
@Operation(summary = "秒杀抢购")
|
||||
public Mono<ServerResponse> grab(ServerRequest request) {
|
||||
return request.bodyToMono(GrabRequest.class)
|
||||
.flatMap(body -> {
|
||||
if (body.getItemId() == null || body.getMemberId() == null) {
|
||||
return badRequest("itemId和memberId不能为空");
|
||||
}
|
||||
return flashSaleService.grab(body)
|
||||
.flatMap(order -> successResponse("抢购成功，请尽快支付", order))
|
||||
.onErrorResume(this::errorResponse);
|
||||
});
|
||||
}
|
||||
|
||||
@Operation(summary = "支付秒杀订单")
|
||||
public Mono<ServerResponse> payOrder(ServerRequest request) {
|
||||
Long orderId = Long.valueOf(request.pathVariable("orderId"));
|
||||
return flashSaleService.payOrder(orderId)
|
||||
.flatMap(order -> successResponse("支付成功", order))
|
||||
.onErrorResume(this::errorResponse);
|
||||
}
|
||||
|
||||
@Operation(summary = "取消秒杀订单")
|
||||
public Mono<ServerResponse> cancelOrder(ServerRequest request) {
|
||||
Long orderId = Long.valueOf(request.pathVariable("orderId"));
|
||||
return flashSaleService.cancelOrder(orderId)
|
||||
.flatMap(order -> successResponse("订单已取消", order))
|
||||
.onErrorResume(this::errorResponse);
|
||||
}
|
||||
|
||||
@Operation(summary = "获取会员秒杀订单")
|
||||
public Mono<ServerResponse> getOrdersByMember(ServerRequest request) {
|
||||
Long memberId = Long.valueOf(request.pathVariable("memberId"));
|
||||
return ServerResponse.ok()
|
||||
.body(flashSaleService.findOrdersByMemberId(memberId), FlashSaleOrder.class);
|
||||
}
|
||||
|
||||
private void normalizePageRequest(PageRequest pageRequest) {
|
||||
if (pageRequest.getPage() < 0) {
|
||||
pageRequest.setPage(0);
|
||||
}
|
||||
if (pageRequest.getSize() <= 0 || pageRequest.getSize() > 100) {
|
||||
pageRequest.setSize(10);
|
||||
}
|
||||
if (pageRequest.getSort() == null || pageRequest.getSort().isEmpty()) {
|
||||
pageRequest.setSort("id");
|
||||
}
|
||||
if (pageRequest.getOrder() == null || pageRequest.getOrder().isEmpty()) {
|
||||
pageRequest.setOrder("desc");
|
||||
}
|
||||
}
|
||||
|
||||
private Mono<ServerResponse> successResponse(String message, Object data) {
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("success", true);
|
||||
response.put("message", message);
|
||||
if (data != null) {
|
||||
response.put("data", data);
|
||||
}
|
||||
return ServerResponse.ok().bodyValue(response);
|
||||
}
|
||||
|
||||
private Mono<ServerResponse> badRequest(String message) {
|
||||
Map<String, Object> error = new HashMap<>();
|
||||
error.put("success", false);
|
||||
error.put("message", message);
|
||||
return ServerResponse.badRequest().bodyValue(error);
|
||||
}
|
||||
|
||||
private Mono<ServerResponse> errorResponse(Throwable error) {
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("success", false);
|
||||
response.put("message", error.getMessage());
|
||||
return ServerResponse.badRequest().bodyValue(response);
|
||||
}
|
||||
}
|
||||
+26
@@ -0,0 +1,26 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.repository;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleActivity;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
public interface IFlashSaleActivityRepository {
|
||||
|
||||
Mono<FlashSaleActivity> findById(Long id);
|
||||
|
||||
Flux<FlashSaleActivity> findAll(boolean includeDeleted);
|
||||
|
||||
Flux<FlashSaleActivity> findByKeyword(String keyword);
|
||||
|
||||
Flux<FlashSaleActivity> findByStatus(String status);
|
||||
|
||||
Flux<FlashSaleActivity> findByKeywordAndStatus(String keyword, String status);
|
||||
|
||||
Mono<FlashSaleActivity> save(FlashSaleActivity activity);
|
||||
|
||||
Mono<FlashSaleActivity> update(FlashSaleActivity activity);
|
||||
|
||||
Mono<Void> deleteById(Long id);
|
||||
|
||||
Mono<Void> updateStatus(Long id, String status);
|
||||
}
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.repository;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleItem;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
public interface IFlashSaleItemRepository {
|
||||
|
||||
Mono<FlashSaleItem> findById(Long id);
|
||||
|
||||
Flux<FlashSaleItem> findByActivityId(Long activityId);
|
||||
|
||||
Mono<FlashSaleItem> save(FlashSaleItem item);
|
||||
|
||||
Mono<FlashSaleItem> update(FlashSaleItem item);
|
||||
|
||||
Mono<Boolean> deductStock(Long id, int quantity);
|
||||
|
||||
Mono<Void> restoreStock(Long id, int quantity);
|
||||
|
||||
Mono<Void> incrementSoldCount(Long id, int count);
|
||||
}
|
||||
+26
@@ -0,0 +1,26 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.repository;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleOrder;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
public interface IFlashSaleOrderRepository {
|
||||
|
||||
Mono<FlashSaleOrder> findById(Long id);
|
||||
|
||||
Flux<FlashSaleOrder> findByMemberId(Long memberId);
|
||||
|
||||
Flux<FlashSaleOrder> findByActivityId(Long activityId);
|
||||
|
||||
Flux<FlashSaleOrder> findExpiredPendingOrders();
|
||||
|
||||
Mono<Long> countByItemIdAndMemberIdAndStatusIn(Long itemId, Long memberId, Collection<String> statuses);
|
||||
|
||||
Mono<FlashSaleOrder> save(FlashSaleOrder order);
|
||||
|
||||
Mono<Void> updateStatus(Long id, String status);
|
||||
|
||||
Mono<Void> markPaid(Long id, String status);
|
||||
}
|
||||
+109
@@ -0,0 +1,109 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.repository.impl;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.flashsale.converter.FlashSaleConverter;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.dao.FlashSaleActivityDao;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleActivity;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.entity.FlashSaleActivityEntity;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.repository.IFlashSaleActivityRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Repository
|
||||
@Transactional
|
||||
public class FlashSaleActivityRepository implements IFlashSaleActivityRepository {
|
||||
|
||||
private final FlashSaleActivityDao activityDao;
|
||||
private final FlashSaleConverter converter;
|
||||
|
||||
public FlashSaleActivityRepository(FlashSaleActivityDao activityDao, FlashSaleConverter converter) {
|
||||
this.activityDao = activityDao;
|
||||
this.converter = converter;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleActivity> findById(Long id) {
|
||||
return activityDao.findByIdIsAndDeletedAtIsNull(id).map(converter::toActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<FlashSaleActivity> findAll(boolean includeDeleted) {
|
||||
if (includeDeleted) {
|
||||
return activityDao.findAll().map(converter::toActivity);
|
||||
}
|
||||
return activityDao.findAllByDeletedAtIsNull().map(converter::toActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<FlashSaleActivity> findByKeyword(String keyword) {
|
||||
if (keyword == null || keyword.isEmpty()) {
|
||||
return findAll(false);
|
||||
}
|
||||
return activityDao.findByNameContainingAndDeletedAtIsNull(keyword).map(converter::toActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<FlashSaleActivity> findByStatus(String status) {
|
||||
if (status == null || status.isEmpty()) {
|
||||
return findAll(false);
|
||||
}
|
||||
return activityDao.findByStatusAndDeletedAtIsNull(status).map(converter::toActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<FlashSaleActivity> findByKeywordAndStatus(String keyword, String status) {
|
||||
Flux<FlashSaleActivity> result = findByKeyword(keyword);
|
||||
if (status != null && !status.isEmpty()) {
|
||||
result = result.filter(a -> status.equals(a.getStatus()));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleActivity> save(FlashSaleActivity activity) {
|
||||
return activityDao.save(converter.toActivityEntity(activity)).map(converter::toActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleActivity> update(FlashSaleActivity activity) {
|
||||
return activityDao.findByIdIsAndDeletedAtIsNull(activity.getId())
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("秒杀活动不存在")))
|
||||
.flatMap(existing -> {
|
||||
existing.markNotNew();
|
||||
if (activity.getName() != null) {
|
||||
existing.setName(activity.getName());
|
||||
}
|
||||
if (activity.getDescription() != null) {
|
||||
existing.setDescription(activity.getDescription());
|
||||
}
|
||||
if (activity.getStartTime() != null) {
|
||||
existing.setStartTime(activity.getStartTime());
|
||||
}
|
||||
if (activity.getEndTime() != null) {
|
||||
existing.setEndTime(activity.getEndTime());
|
||||
}
|
||||
if (activity.getPayTimeoutMinutes() != null) {
|
||||
existing.setPayTimeoutMinutes(activity.getPayTimeoutMinutes());
|
||||
}
|
||||
if (activity.getPerUserLimit() != null) {
|
||||
existing.setPerUserLimit(activity.getPerUserLimit());
|
||||
}
|
||||
existing.setUpdatedAt(LocalDateTime.now());
|
||||
return activityDao.save(existing);
|
||||
})
|
||||
.map(converter::toActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> deleteById(Long id) {
|
||||
return activityDao.softDelete(id, LocalDateTime.now()).then();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> updateStatus(Long id, String status) {
|
||||
return activityDao.updateStatus(id, status, LocalDateTime.now()).then();
|
||||
}
|
||||
}
|
||||
+90
@@ -0,0 +1,90 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.repository.impl;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.flashsale.converter.FlashSaleConverter;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.dao.FlashSaleItemDao;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleItem;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.entity.FlashSaleItemEntity;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.repository.IFlashSaleItemRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Repository
|
||||
@Transactional
|
||||
public class FlashSaleItemRepository implements IFlashSaleItemRepository {
|
||||
|
||||
private final FlashSaleItemDao itemDao;
|
||||
private final FlashSaleConverter converter;
|
||||
|
||||
public FlashSaleItemRepository(FlashSaleItemDao itemDao, FlashSaleConverter converter) {
|
||||
this.itemDao = itemDao;
|
||||
this.converter = converter;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleItem> findById(Long id) {
|
||||
return itemDao.findByIdIsAndDeletedAtIsNull(id).map(converter::toItem);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<FlashSaleItem> findByActivityId(Long activityId) {
|
||||
return itemDao.findByActivityIdAndDeletedAtIsNull(activityId).map(converter::toItem);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleItem> save(FlashSaleItem item) {
|
||||
return itemDao.save(converter.toItemEntity(item)).map(converter::toItem);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleItem> update(FlashSaleItem item) {
|
||||
return itemDao.findByIdIsAndDeletedAtIsNull(item.getId())
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("秒杀商品不存在")))
|
||||
.flatMap(existing -> {
|
||||
existing.markNotNew();
|
||||
if (item.getProductType() != null) {
|
||||
existing.setProductType(item.getProductType());
|
||||
}
|
||||
if (item.getProductId() != null) {
|
||||
existing.setProductId(item.getProductId());
|
||||
}
|
||||
if (item.getProductName() != null) {
|
||||
existing.setProductName(item.getProductName());
|
||||
}
|
||||
if (item.getOriginalPrice() != null) {
|
||||
existing.setOriginalPrice(item.getOriginalPrice());
|
||||
}
|
||||
if (item.getSeckillPrice() != null) {
|
||||
existing.setSeckillPrice(item.getSeckillPrice());
|
||||
}
|
||||
if (item.getStock() != null) {
|
||||
existing.setStock(item.getStock());
|
||||
}
|
||||
if (item.getPerUserLimit() != null) {
|
||||
existing.setPerUserLimit(item.getPerUserLimit());
|
||||
}
|
||||
existing.setUpdatedAt(LocalDateTime.now());
|
||||
return itemDao.save(existing);
|
||||
})
|
||||
.map(converter::toItem);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Boolean> deductStock(Long id, int quantity) {
|
||||
return itemDao.deductStock(id, quantity, LocalDateTime.now())
|
||||
.map(rows -> rows != null && rows > 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> restoreStock(Long id, int quantity) {
|
||||
return itemDao.restoreStock(id, quantity, LocalDateTime.now()).then();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> incrementSoldCount(Long id, int count) {
|
||||
return itemDao.incrementSoldCount(id, count, LocalDateTime.now()).then();
|
||||
}
|
||||
}
|
||||
+68
@@ -0,0 +1,68 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.repository.impl;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.flashsale.converter.FlashSaleConverter;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.dao.FlashSaleOrderDao;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleOrder;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.enums.FlashSaleOrderStatus;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.repository.IFlashSaleOrderRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Collection;
|
||||
|
||||
@Repository
|
||||
@Transactional
|
||||
public class FlashSaleOrderRepository implements IFlashSaleOrderRepository {
|
||||
|
||||
private final FlashSaleOrderDao orderDao;
|
||||
private final FlashSaleConverter converter;
|
||||
|
||||
public FlashSaleOrderRepository(FlashSaleOrderDao orderDao, FlashSaleConverter converter) {
|
||||
this.orderDao = orderDao;
|
||||
this.converter = converter;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleOrder> findById(Long id) {
|
||||
return orderDao.findByIdIsAndDeletedAtIsNull(id).map(converter::toOrder);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<FlashSaleOrder> findByMemberId(Long memberId) {
|
||||
return orderDao.findByMemberIdAndDeletedAtIsNull(memberId).map(converter::toOrder);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<FlashSaleOrder> findByActivityId(Long activityId) {
|
||||
return orderDao.findByActivityIdAndDeletedAtIsNull(activityId).map(converter::toOrder);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<FlashSaleOrder> findExpiredPendingOrders() {
|
||||
return orderDao.findExpiredPendingOrders(
|
||||
FlashSaleOrderStatus.PENDING.name(), LocalDateTime.now()).map(converter::toOrder);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Long> countByItemIdAndMemberIdAndStatusIn(Long itemId, Long memberId, Collection<String> statuses) {
|
||||
return orderDao.countByItemIdAndMemberIdAndStatusInAndDeletedAtIsNull(itemId, memberId, statuses);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleOrder> save(FlashSaleOrder order) {
|
||||
return orderDao.save(converter.toOrderEntity(order)).map(converter::toOrder);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> updateStatus(Long id, String status) {
|
||||
return orderDao.updateStatus(id, status, LocalDateTime.now()).then();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> markPaid(Long id, String status) {
|
||||
return orderDao.markPaid(id, status, LocalDateTime.now(), LocalDateTime.now()).then();
|
||||
}
|
||||
}
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.scheduler;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.flashsale.service.IFlashSaleActivityService;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.scheduling.annotation.Scheduled;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* 秒杀订单过期定时任务
|
||||
*
|
||||
* 功能：定期检查已过期的待支付订单，取消订单并恢复库存
|
||||
*/
|
||||
@Component
|
||||
public class FlashSaleOrderExpireScheduler {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(FlashSaleOrderExpireScheduler.class);
|
||||
|
||||
private final IFlashSaleActivityService flashSaleService;
|
||||
|
||||
public FlashSaleOrderExpireScheduler(IFlashSaleActivityService flashSaleService) {
|
||||
this.flashSaleService = flashSaleService;
|
||||
}
|
||||
|
||||
@Scheduled(fixedRate = 60000)
|
||||
public void processExpiredOrders() {
|
||||
logger.debug("定时任务开始检查过期秒杀订单");
|
||||
|
||||
flashSaleService.processExpiredOrders()
|
||||
.subscribe(
|
||||
count -> logger.debug("定时任务完成，处理了 {} 个过期秒杀订单", count),
|
||||
error -> logger.error("秒杀订单过期定时任务执行失败：{}", error.getMessage(), error)
|
||||
);
|
||||
}
|
||||
}
|
||||
+50
@@ -0,0 +1,50 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.service;
|
||||
|
||||
import cn.novalon.gym.manage.common.dto.PageRequest;
|
||||
import cn.novalon.gym.manage.common.dto.PageResponse;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleActivity;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleItem;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleOrder;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleStatistics;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.GrabRequest;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
public interface IFlashSaleActivityService {
|
||||
|
||||
Mono<FlashSaleActivity> findById(Long id);
|
||||
|
||||
Flux<FlashSaleActivity> findAll(boolean includeDeleted);
|
||||
|
||||
Flux<FlashSaleActivity> findByKeywordAndStatus(String keyword, String status);
|
||||
|
||||
Mono<PageResponse<FlashSaleActivity>> findByPage(PageRequest pageRequest, String status);
|
||||
|
||||
Mono<FlashSaleActivity> create(FlashSaleActivity activity);
|
||||
|
||||
Mono<FlashSaleActivity> update(Long id, FlashSaleActivity activity);
|
||||
|
||||
Mono<Void> delete(Long id);
|
||||
|
||||
Mono<FlashSaleActivity> publish(Long id);
|
||||
|
||||
Mono<FlashSaleActivity> terminate(Long id);
|
||||
|
||||
Flux<FlashSaleItem> findItemsByActivityId(Long activityId);
|
||||
|
||||
Mono<FlashSaleItem> createItem(FlashSaleItem item);
|
||||
|
||||
Mono<FlashSaleItem> updateItem(Long id, FlashSaleItem item);
|
||||
|
||||
Mono<FlashSaleOrder> grab(GrabRequest request);
|
||||
|
||||
Mono<FlashSaleOrder> payOrder(Long orderId);
|
||||
|
||||
Mono<FlashSaleOrder> cancelOrder(Long orderId);
|
||||
|
||||
Flux<FlashSaleOrder> findOrdersByMemberId(Long memberId);
|
||||
|
||||
Mono<FlashSaleStatistics> getStatistics(Long id);
|
||||
|
||||
Mono<Long> processExpiredOrders();
|
||||
}
|
||||
+390
@@ -0,0 +1,390 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.service.impl;
|
||||
|
||||
import cn.novalon.gym.manage.common.dto.PageRequest;
|
||||
import cn.novalon.gym.manage.common.dto.PageResponse;
|
||||
import cn.novalon.gym.manage.common.util.SnowflakeId;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleActivity;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleItem;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleOrder;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleStatistics;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.GrabRequest;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.enums.FlashSaleActivityStatus;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.enums.FlashSaleOrderStatus;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.repository.IFlashSaleActivityRepository;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.repository.IFlashSaleItemRepository;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.repository.IFlashSaleOrderRepository;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.service.IFlashSaleActivityService;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Service;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Arrays;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class FlashSaleActivityService implements IFlashSaleActivityService {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(FlashSaleActivityService.class);
|
||||
|
||||
private final IFlashSaleActivityRepository activityRepository;
|
||||
private final IFlashSaleItemRepository itemRepository;
|
||||
private final IFlashSaleOrderRepository orderRepository;
|
||||
|
||||
public FlashSaleActivityService(IFlashSaleActivityRepository activityRepository,
|
||||
IFlashSaleItemRepository itemRepository,
|
||||
IFlashSaleOrderRepository orderRepository) {
|
||||
this.activityRepository = activityRepository;
|
||||
this.itemRepository = itemRepository;
|
||||
this.orderRepository = orderRepository;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleActivity> findById(Long id) {
|
||||
return activityRepository.findById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<FlashSaleActivity> findAll(boolean includeDeleted) {
|
||||
return activityRepository.findAll(includeDeleted);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<FlashSaleActivity> findByKeywordAndStatus(String keyword, String status) {
|
||||
return activityRepository.findByKeywordAndStatus(keyword, status);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<PageResponse<FlashSaleActivity>> findByPage(PageRequest pageRequest, String status) {
|
||||
int page = Math.max(pageRequest.getPage(), 0);
|
||||
int size = pageRequest.getSize() <= 0 || pageRequest.getSize() > 100 ? 10 : pageRequest.getSize();
|
||||
String keyword = pageRequest.getKeyword();
|
||||
|
||||
return activityRepository.findByKeywordAndStatus(keyword, status)
|
||||
.sort(Comparator.comparing(FlashSaleActivity::getCreatedAt,
|
||||
Comparator.nullsLast(Comparator.reverseOrder())))
|
||||
.collectList()
|
||||
.map(list -> {
|
||||
long total = list.size();
|
||||
int fromIndex = Math.min(page * size, list.size());
|
||||
int toIndex = Math.min(fromIndex + size, list.size());
|
||||
List<FlashSaleActivity> content = list.subList(fromIndex, toIndex);
|
||||
int totalPages = size == 0 ? 0 : (int) Math.ceil((double) total / size);
|
||||
return new PageResponse<>(content, totalPages, total, page, size);
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleActivity> create(FlashSaleActivity activity) {
|
||||
return validateActivity(activity)
|
||||
.flatMap(validated -> {
|
||||
validated.generateId();
|
||||
validated.setStatus(FlashSaleActivityStatus.DRAFT.name());
|
||||
applyDefaults(validated);
|
||||
return activityRepository.save(validated);
|
||||
})
|
||||
.doOnSuccess(a -> logger.info("秒杀活动创建成功 - id={}, name={}", a.getId(), a.getName()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleActivity> update(Long id, FlashSaleActivity activity) {
|
||||
return activityRepository.findById(id)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("秒杀活动不存在")))
|
||||
.flatMap(existing -> {
|
||||
if (!FlashSaleActivityStatus.DRAFT.name().equals(existing.getStatus())) {
|
||||
return Mono.error(new RuntimeException("仅草稿状态的秒杀活动可编辑"));
|
||||
}
|
||||
activity.setId(id);
|
||||
return validateActivity(activity)
|
||||
.flatMap(activityRepository::update);
|
||||
})
|
||||
.doOnSuccess(a -> logger.info("秒杀活动更新成功 - id={}", id));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> delete(Long id) {
|
||||
return activityRepository.findById(id)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("秒杀活动不存在")))
|
||||
.flatMap(existing -> {
|
||||
if (!FlashSaleActivityStatus.DRAFT.name().equals(existing.getStatus())) {
|
||||
return Mono.error(new RuntimeException("仅草稿状态的秒杀活动可删除"));
|
||||
}
|
||||
return activityRepository.deleteById(id);
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleActivity> publish(Long id) {
|
||||
return activityRepository.findById(id)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("秒杀活动不存在")))
|
||||
.flatMap(existing -> {
|
||||
if (!FlashSaleActivityStatus.DRAFT.name().equals(existing.getStatus())) {
|
||||
return Mono.error(new RuntimeException("仅草稿状态的秒杀活动可发布"));
|
||||
}
|
||||
return validateActivity(existing)
|
||||
.flatMap(validated -> activityRepository.updateStatus(id, FlashSaleActivityStatus.ACTIVE.name())
|
||||
.then(activityRepository.findById(id)));
|
||||
})
|
||||
.doOnSuccess(a -> logger.info("秒杀活动发布成功 - id={}", id));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleActivity> terminate(Long id) {
|
||||
return activityRepository.findById(id)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("秒杀活动不存在")))
|
||||
.flatMap(existing -> {
|
||||
if (!FlashSaleActivityStatus.ACTIVE.name().equals(existing.getStatus())) {
|
||||
return Mono.error(new RuntimeException("仅进行中的秒杀活动可终止"));
|
||||
}
|
||||
return activityRepository.updateStatus(id, FlashSaleActivityStatus.TERMINATED.name())
|
||||
.then(activityRepository.findById(id));
|
||||
})
|
||||
.doOnSuccess(a -> logger.info("秒杀活动已终止 - id={}", id));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<FlashSaleItem> findItemsByActivityId(Long activityId) {
|
||||
return itemRepository.findByActivityId(activityId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleItem> createItem(FlashSaleItem item) {
|
||||
return validateItem(item)
|
||||
.flatMap(validated -> activityRepository.findById(validated.getActivityId())
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("秒杀活动不存在")))
|
||||
.flatMap(activity -> {
|
||||
if (!FlashSaleActivityStatus.DRAFT.name().equals(activity.getStatus())) {
|
||||
return Mono.error(new RuntimeException("仅草稿状态的秒杀活动可添加商品"));
|
||||
}
|
||||
validated.setId(SnowflakeId.nextId());
|
||||
validated.setSoldCount(0);
|
||||
if (validated.getPerUserLimit() == null) {
|
||||
validated.setPerUserLimit(activity.getPerUserLimit() != null ? activity.getPerUserLimit() : 1);
|
||||
}
|
||||
return itemRepository.save(validated);
|
||||
}));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleItem> updateItem(Long id, FlashSaleItem item) {
|
||||
return itemRepository.findById(id)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("秒杀商品不存在")))
|
||||
.flatMap(existing -> activityRepository.findById(existing.getActivityId())
|
||||
.flatMap(activity -> {
|
||||
if (!FlashSaleActivityStatus.DRAFT.name().equals(activity.getStatus())) {
|
||||
return Mono.error(new RuntimeException("活动已发布，不可修改商品"));
|
||||
}
|
||||
item.setId(id);
|
||||
return validateItem(item)
|
||||
.flatMap(itemRepository::update);
|
||||
}));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleOrder> grab(GrabRequest request) {
|
||||
if (request.getItemId() == null || request.getMemberId() == null) {
|
||||
return Mono.error(new RuntimeException("itemId和memberId不能为空"));
|
||||
}
|
||||
int quantity = request.getQuantity() != null && request.getQuantity() > 0 ? request.getQuantity() : 1;
|
||||
|
||||
return itemRepository.findById(request.getItemId())
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("秒杀商品不存在")))
|
||||
.flatMap(item -> activityRepository.findById(item.getActivityId())
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("秒杀活动不存在")))
|
||||
.flatMap(activity -> validateActivityForGrab(activity)
|
||||
.then(checkUserLimit(item, activity, request.getMemberId(), quantity))
|
||||
.then(itemRepository.deductStock(item.getId(), quantity))
|
||||
.flatMap(success -> {
|
||||
if (!success) {
|
||||
return Mono.error(new RuntimeException("库存不足"));
|
||||
}
|
||||
return createOrder(item, activity, request.getMemberId(), quantity)
|
||||
.onErrorResume(e -> itemRepository.restoreStock(item.getId(), quantity)
|
||||
.then(Mono.error(e)));
|
||||
})));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleOrder> payOrder(Long orderId) {
|
||||
return orderRepository.findById(orderId)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("秒杀订单不存在")))
|
||||
.flatMap(order -> {
|
||||
if (!FlashSaleOrderStatus.PENDING.name().equals(order.getStatus())) {
|
||||
return Mono.error(new RuntimeException("订单状态不允许支付"));
|
||||
}
|
||||
if (order.getExpireAt() != null && order.getExpireAt().isBefore(LocalDateTime.now())) {
|
||||
return Mono.error(new RuntimeException("订单已过期"));
|
||||
}
|
||||
return orderRepository.markPaid(orderId, FlashSaleOrderStatus.PAID.name())
|
||||
.then(itemRepository.incrementSoldCount(order.getItemId(), order.getQuantity()))
|
||||
.then(orderRepository.findById(orderId));
|
||||
})
|
||||
.doOnSuccess(o -> logger.info("秒杀订单支付成功 - orderId={}", orderId));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleOrder> cancelOrder(Long orderId) {
|
||||
return orderRepository.findById(orderId)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("秒杀订单不存在")))
|
||||
.flatMap(order -> {
|
||||
if (!FlashSaleOrderStatus.PENDING.name().equals(order.getStatus())) {
|
||||
return Mono.error(new RuntimeException("仅待支付订单可取消"));
|
||||
}
|
||||
return orderRepository.updateStatus(orderId, FlashSaleOrderStatus.CANCELLED.name())
|
||||
.then(itemRepository.restoreStock(order.getItemId(), order.getQuantity()))
|
||||
.then(orderRepository.findById(orderId));
|
||||
})
|
||||
.doOnSuccess(o -> logger.info("秒杀订单已取消 - orderId={}", orderId));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<FlashSaleOrder> findOrdersByMemberId(Long memberId) {
|
||||
return orderRepository.findByMemberId(memberId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleStatistics> getStatistics(Long id) {
|
||||
return activityRepository.findById(id)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("秒杀活动不存在")))
|
||||
.flatMap(activity -> orderRepository.findByActivityId(id)
|
||||
.collectList()
|
||||
.map(orders -> {
|
||||
FlashSaleStatistics stats = new FlashSaleStatistics();
|
||||
stats.setActivityId(id);
|
||||
stats.setTotalOrders(orders.size());
|
||||
stats.setPendingOrders(countByStatus(orders, FlashSaleOrderStatus.PENDING));
|
||||
stats.setPaidOrders(countByStatus(orders, FlashSaleOrderStatus.PAID));
|
||||
stats.setCancelledOrders(countByStatus(orders, FlashSaleOrderStatus.CANCELLED));
|
||||
stats.setExpiredOrders(countByStatus(orders, FlashSaleOrderStatus.EXPIRED));
|
||||
|
||||
long soldQty = orders.stream()
|
||||
.filter(o -> FlashSaleOrderStatus.PAID.name().equals(o.getStatus()))
|
||||
.mapToLong(o -> o.getQuantity() != null ? o.getQuantity() : 0)
|
||||
.sum();
|
||||
stats.setTotalSoldQuantity(soldQty);
|
||||
|
||||
BigDecimal revenue = orders.stream()
|
||||
.filter(o -> FlashSaleOrderStatus.PAID.name().equals(o.getStatus()))
|
||||
.map(o -> o.getPayAmount() != null ? o.getPayAmount() : BigDecimal.ZERO)
|
||||
.reduce(BigDecimal.ZERO, BigDecimal::add);
|
||||
stats.setTotalRevenue(revenue);
|
||||
|
||||
return stats;
|
||||
}));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Long> processExpiredOrders() {
|
||||
return orderRepository.findExpiredPendingOrders()
|
||||
.flatMap(order -> orderRepository.updateStatus(order.getId(), FlashSaleOrderStatus.EXPIRED.name())
|
||||
.then(itemRepository.restoreStock(order.getItemId(), order.getQuantity()))
|
||||
.thenReturn(1L))
|
||||
.reduce(0L, Long::sum)
|
||||
.doOnSuccess(count -> {
|
||||
if (count > 0) {
|
||||
logger.info("已处理 {} 个过期秒杀订单", count);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private Mono<FlashSaleOrder> createOrder(FlashSaleItem item, FlashSaleActivity activity,
|
||||
Long memberId, int quantity) {
|
||||
int timeoutMinutes = activity.getPayTimeoutMinutes() != null ? activity.getPayTimeoutMinutes() : 5;
|
||||
BigDecimal payAmount = item.getSeckillPrice().multiply(BigDecimal.valueOf(quantity));
|
||||
|
||||
FlashSaleOrder order = new FlashSaleOrder();
|
||||
order.setId(SnowflakeId.nextId());
|
||||
order.setActivityId(activity.getId());
|
||||
order.setItemId(item.getId());
|
||||
order.setMemberId(memberId);
|
||||
order.setQuantity(quantity);
|
||||
order.setPayAmount(payAmount);
|
||||
order.setStatus(FlashSaleOrderStatus.PENDING.name());
|
||||
order.setExpireAt(LocalDateTime.now().plusMinutes(timeoutMinutes));
|
||||
|
||||
return orderRepository.save(order);
|
||||
}
|
||||
|
||||
private Mono<Void> checkUserLimit(FlashSaleItem item, FlashSaleActivity activity,
|
||||
Long memberId, int quantity) {
|
||||
int itemLimit = item.getPerUserLimit() != null ? item.getPerUserLimit() : 1;
|
||||
int activityLimit = activity.getPerUserLimit() != null ? activity.getPerUserLimit() : 1;
|
||||
int effectiveLimit = Math.min(itemLimit, activityLimit);
|
||||
|
||||
return orderRepository.countByItemIdAndMemberIdAndStatusIn(
|
||||
item.getId(), memberId,
|
||||
Arrays.asList(FlashSaleOrderStatus.PENDING.name(), FlashSaleOrderStatus.PAID.name()))
|
||||
.flatMap(count -> {
|
||||
if (count + quantity > effectiveLimit) {
|
||||
return Mono.error(new RuntimeException("超出每人限购数量"));
|
||||
}
|
||||
return Mono.empty();
|
||||
});
|
||||
}
|
||||
|
||||
private Mono<Void> validateActivityForGrab(FlashSaleActivity activity) {
|
||||
if (!FlashSaleActivityStatus.ACTIVE.name().equals(activity.getStatus())) {
|
||||
return Mono.error(new RuntimeException("秒杀活动未开始或已结束"));
|
||||
}
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
if (activity.getStartTime() != null && now.isBefore(activity.getStartTime())) {
|
||||
return Mono.error(new RuntimeException("秒杀活动尚未开始"));
|
||||
}
|
||||
if (activity.getEndTime() != null && now.isAfter(activity.getEndTime())) {
|
||||
return Mono.error(new RuntimeException("秒杀活动已结束"));
|
||||
}
|
||||
return Mono.empty();
|
||||
}
|
||||
|
||||
private Mono<FlashSaleActivity> validateActivity(FlashSaleActivity activity) {
|
||||
if (activity.getName() == null || activity.getName().isBlank()) {
|
||||
return Mono.error(new RuntimeException("活动名称不能为空"));
|
||||
}
|
||||
if (activity.getStartTime() == null || activity.getEndTime() == null) {
|
||||
return Mono.error(new RuntimeException("活动开始和结束时间不能为空"));
|
||||
}
|
||||
if (activity.getEndTime().isBefore(activity.getStartTime())) {
|
||||
return Mono.error(new RuntimeException("结束时间不能早于开始时间"));
|
||||
}
|
||||
return Mono.just(activity);
|
||||
}
|
||||
|
||||
private Mono<FlashSaleItem> validateItem(FlashSaleItem item) {
|
||||
if (item.getActivityId() == null) {
|
||||
return Mono.error(new RuntimeException("活动ID不能为空"));
|
||||
}
|
||||
if (item.getProductType() == null || item.getProductName() == null) {
|
||||
return Mono.error(new RuntimeException("商品类型和名称不能为空"));
|
||||
}
|
||||
if (item.getProductId() == null) {
|
||||
return Mono.error(new RuntimeException("商品ID不能为空"));
|
||||
}
|
||||
if (item.getOriginalPrice() == null || item.getSeckillPrice() == null) {
|
||||
return Mono.error(new RuntimeException("原价和秒杀价不能为空"));
|
||||
}
|
||||
if (item.getSeckillPrice().compareTo(item.getOriginalPrice()) >= 0) {
|
||||
return Mono.error(new RuntimeException("秒杀价必须低于原价"));
|
||||
}
|
||||
if (item.getStock() == null || item.getStock() < 0) {
|
||||
return Mono.error(new RuntimeException("库存不能为空且不能为负数"));
|
||||
}
|
||||
return Mono.just(item);
|
||||
}
|
||||
|
||||
private void applyDefaults(FlashSaleActivity activity) {
|
||||
if (activity.getPayTimeoutMinutes() == null) {
|
||||
activity.setPayTimeoutMinutes(5);
|
||||
}
|
||||
if (activity.getPerUserLimit() == null) {
|
||||
activity.setPerUserLimit(1);
|
||||
}
|
||||
}
|
||||
|
||||
private long countByStatus(List<FlashSaleOrder> orders, FlashSaleOrderStatus status) {
|
||||
return orders.stream().filter(o -> status.name().equals(o.getStatus())).count();
|
||||
}
|
||||
}
|
||||
+77
@@ -0,0 +1,77 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.converter;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyActivity;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyParticipant;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyTeam;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.entity.GroupBuyActivityEntity;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.entity.GroupBuyParticipantEntity;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.entity.GroupBuyTeamEntity;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Component
|
||||
public class GroupBuyConverter {
|
||||
|
||||
public GroupBuyActivity toActivity(GroupBuyActivityEntity entity) {
|
||||
if (entity == null) {
|
||||
return null;
|
||||
}
|
||||
GroupBuyActivity domain = new GroupBuyActivity();
|
||||
BeanUtil.copyProperties(entity, domain);
|
||||
return domain;
|
||||
}
|
||||
|
||||
public GroupBuyActivityEntity toActivityEntity(GroupBuyActivity domain) {
|
||||
if (domain == null) {
|
||||
return null;
|
||||
}
|
||||
GroupBuyActivityEntity entity = new GroupBuyActivityEntity();
|
||||
BeanUtil.copyProperties(domain, entity);
|
||||
if (domain.getId() != null) {
|
||||
entity.markNotNew();
|
||||
}
|
||||
return entity;
|
||||
}
|
||||
|
||||
public GroupBuyTeam toTeam(GroupBuyTeamEntity entity) {
|
||||
if (entity == null) {
|
||||
return null;
|
||||
}
|
||||
GroupBuyTeam domain = new GroupBuyTeam();
|
||||
BeanUtil.copyProperties(entity, domain);
|
||||
return domain;
|
||||
}
|
||||
|
||||
public GroupBuyTeamEntity toTeamEntity(GroupBuyTeam domain) {
|
||||
if (domain == null) {
|
||||
return null;
|
||||
}
|
||||
GroupBuyTeamEntity entity = new GroupBuyTeamEntity();
|
||||
BeanUtil.copyProperties(domain, entity);
|
||||
if (domain.getId() != null) {
|
||||
entity.markNotNew();
|
||||
}
|
||||
return entity;
|
||||
}
|
||||
|
||||
public GroupBuyParticipant toParticipant(GroupBuyParticipantEntity entity) {
|
||||
if (entity == null) {
|
||||
return null;
|
||||
}
|
||||
GroupBuyParticipant domain = new GroupBuyParticipant();
|
||||
BeanUtil.copyProperties(entity, domain);
|
||||
return domain;
|
||||
}
|
||||
|
||||
public GroupBuyParticipantEntity toParticipantEntity(GroupBuyParticipant domain) {
|
||||
if (domain == null) {
|
||||
return null;
|
||||
}
|
||||
GroupBuyParticipantEntity entity = new GroupBuyParticipantEntity();
|
||||
BeanUtil.copyProperties(domain, entity);
|
||||
if (domain.getId() != null) {
|
||||
entity.markNotNew();
|
||||
}
|
||||
return entity;
|
||||
}
|
||||
}
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.dao;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.entity.GroupBuyActivityEntity;
|
||||
import org.springframework.data.r2dbc.repository.Modifying;
|
||||
import org.springframework.data.r2dbc.repository.Query;
|
||||
import org.springframework.data.r2dbc.repository.R2dbcRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Repository
|
||||
public interface GroupBuyActivityDao extends R2dbcRepository<GroupBuyActivityEntity, Long> {
|
||||
|
||||
Mono<GroupBuyActivityEntity> findByIdIsAndDeletedAtIsNull(Long id);
|
||||
|
||||
Flux<GroupBuyActivityEntity> findAllByDeletedAtIsNull();
|
||||
|
||||
Flux<GroupBuyActivityEntity> findByNameContainingAndDeletedAtIsNull(String name);
|
||||
|
||||
Flux<GroupBuyActivityEntity> findByStatusAndDeletedAtIsNull(String status);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE group_buy_activity SET deleted_at = :deletedAt WHERE id = :id")
|
||||
Mono<Integer> softDelete(Long id, LocalDateTime deletedAt);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE group_buy_activity SET status = :status, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> updateStatus(Long id, String status, LocalDateTime updatedAt);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE group_buy_activity SET sold_count = sold_count + :count, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> incrementSoldCount(Long id, int count, LocalDateTime updatedAt);
|
||||
}
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.dao;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.entity.GroupBuyParticipantEntity;
|
||||
import org.springframework.data.r2dbc.repository.Modifying;
|
||||
import org.springframework.data.r2dbc.repository.Query;
|
||||
import org.springframework.data.r2dbc.repository.R2dbcRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Repository
|
||||
public interface GroupBuyParticipantDao extends R2dbcRepository<GroupBuyParticipantEntity, Long> {
|
||||
|
||||
Flux<GroupBuyParticipantEntity> findByTeamIdAndDeletedAtIsNull(Long teamId);
|
||||
|
||||
Flux<GroupBuyParticipantEntity> findByActivityIdAndDeletedAtIsNull(Long activityId);
|
||||
|
||||
@Query("""
|
||||
SELECT p.* FROM group_buy_participant p
|
||||
INNER JOIN group_buy_team t ON p.team_id = t.id
|
||||
WHERE p.activity_id = :activityId AND p.member_id = :memberId
|
||||
AND p.status = :participantStatus AND t.status = :teamStatus
|
||||
AND p.deleted_at IS NULL AND t.deleted_at IS NULL
|
||||
""")
|
||||
Flux<GroupBuyParticipantEntity> findActiveParticipantInFormingTeam(
|
||||
Long activityId, Long memberId, String participantStatus, String teamStatus);
|
||||
|
||||
Mono<Long> countByActivityIdAndDeletedAtIsNull(Long activityId);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE group_buy_participant SET status = :status, updated_at = :updatedAt WHERE team_id = :teamId")
|
||||
Mono<Integer> updateStatusByTeamId(Long teamId, String status, LocalDateTime updatedAt);
|
||||
}
|
||||
+38
@@ -0,0 +1,38 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.dao;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.entity.GroupBuyTeamEntity;
|
||||
import org.springframework.data.r2dbc.repository.Modifying;
|
||||
import org.springframework.data.r2dbc.repository.Query;
|
||||
import org.springframework.data.r2dbc.repository.R2dbcRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Repository
|
||||
public interface GroupBuyTeamDao extends R2dbcRepository<GroupBuyTeamEntity, Long> {
|
||||
|
||||
Mono<GroupBuyTeamEntity> findByIdIsAndDeletedAtIsNull(Long id);
|
||||
|
||||
Flux<GroupBuyTeamEntity> findByActivityIdAndDeletedAtIsNull(Long activityId);
|
||||
|
||||
Flux<GroupBuyTeamEntity> findByActivityIdAndStatusAndDeletedAtIsNull(Long activityId, String status);
|
||||
|
||||
Flux<GroupBuyTeamEntity> findByStatusAndDeletedAtIsNull(String status);
|
||||
|
||||
@Query("SELECT * FROM group_buy_team WHERE status = :status AND expire_at < :now AND deleted_at IS NULL")
|
||||
Flux<GroupBuyTeamEntity> findExpiredFormingTeams(String status, LocalDateTime now);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE group_buy_team SET status = :status, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> updateStatus(Long id, String status, LocalDateTime updatedAt);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE group_buy_team SET current_members = current_members + :count, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> incrementCurrentMembers(Long id, int count, LocalDateTime updatedAt);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE group_buy_team SET status = :status, success_at = :successAt, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> markSuccess(Long id, String status, LocalDateTime successAt, LocalDateTime updatedAt);
|
||||
}
|
||||
+26
@@ -0,0 +1,26 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
@Schema(description = "创建拼团团队请求")
|
||||
public class CreateTeamRequest {
|
||||
|
||||
private Long activityId;
|
||||
private Long memberId;
|
||||
|
||||
public Long getActivityId() {
|
||||
return activityId;
|
||||
}
|
||||
|
||||
public void setActivityId(Long activityId) {
|
||||
this.activityId = activityId;
|
||||
}
|
||||
|
||||
public Long getMemberId() {
|
||||
return memberId;
|
||||
}
|
||||
|
||||
public void setMemberId(Long memberId) {
|
||||
this.memberId = memberId;
|
||||
}
|
||||
}
|
||||
+138
@@ -0,0 +1,138 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.domain;
|
||||
|
||||
import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "拼团活动")
|
||||
public class GroupBuyActivity extends BaseDomain {
|
||||
|
||||
private String name;
|
||||
private String description;
|
||||
private String productType;
|
||||
private Long productId;
|
||||
private String productName;
|
||||
private BigDecimal originalPrice;
|
||||
private BigDecimal groupPrice;
|
||||
private Integer requiredMembers;
|
||||
private Integer validHours;
|
||||
private LocalDateTime startTime;
|
||||
private LocalDateTime endTime;
|
||||
private Integer stock;
|
||||
private Integer soldCount;
|
||||
private String status;
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public String getProductType() {
|
||||
return productType;
|
||||
}
|
||||
|
||||
public void setProductType(String productType) {
|
||||
this.productType = productType;
|
||||
}
|
||||
|
||||
public Long getProductId() {
|
||||
return productId;
|
||||
}
|
||||
|
||||
public void setProductId(Long productId) {
|
||||
this.productId = productId;
|
||||
}
|
||||
|
||||
public String getProductName() {
|
||||
return productName;
|
||||
}
|
||||
|
||||
public void setProductName(String productName) {
|
||||
this.productName = productName;
|
||||
}
|
||||
|
||||
public BigDecimal getOriginalPrice() {
|
||||
return originalPrice;
|
||||
}
|
||||
|
||||
public void setOriginalPrice(BigDecimal originalPrice) {
|
||||
this.originalPrice = originalPrice;
|
||||
}
|
||||
|
||||
public BigDecimal getGroupPrice() {
|
||||
return groupPrice;
|
||||
}
|
||||
|
||||
public void setGroupPrice(BigDecimal groupPrice) {
|
||||
this.groupPrice = groupPrice;
|
||||
}
|
||||
|
||||
public Integer getRequiredMembers() {
|
||||
return requiredMembers;
|
||||
}
|
||||
|
||||
public void setRequiredMembers(Integer requiredMembers) {
|
||||
this.requiredMembers = requiredMembers;
|
||||
}
|
||||
|
||||
public Integer getValidHours() {
|
||||
return validHours;
|
||||
}
|
||||
|
||||
public void setValidHours(Integer validHours) {
|
||||
this.validHours = validHours;
|
||||
}
|
||||
|
||||
public LocalDateTime getStartTime() {
|
||||
return startTime;
|
||||
}
|
||||
|
||||
public void setStartTime(LocalDateTime startTime) {
|
||||
this.startTime = startTime;
|
||||
}
|
||||
|
||||
public LocalDateTime getEndTime() {
|
||||
return endTime;
|
||||
}
|
||||
|
||||
public void setEndTime(LocalDateTime endTime) {
|
||||
this.endTime = endTime;
|
||||
}
|
||||
|
||||
public Integer getStock() {
|
||||
return stock;
|
||||
}
|
||||
|
||||
public void setStock(Integer stock) {
|
||||
this.stock = stock;
|
||||
}
|
||||
|
||||
public Integer getSoldCount() {
|
||||
return soldCount;
|
||||
}
|
||||
|
||||
public void setSoldCount(Integer soldCount) {
|
||||
this.soldCount = soldCount;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
}
|
||||
+65
@@ -0,0 +1,65 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.domain;
|
||||
|
||||
import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "拼团参与人")
|
||||
public class GroupBuyParticipant extends BaseDomain {
|
||||
|
||||
private Long teamId;
|
||||
private Long activityId;
|
||||
private Long memberId;
|
||||
private Boolean isLeader;
|
||||
private String status;
|
||||
private LocalDateTime joinAt;
|
||||
|
||||
public Long getTeamId() {
|
||||
return teamId;
|
||||
}
|
||||
|
||||
public void setTeamId(Long teamId) {
|
||||
this.teamId = teamId;
|
||||
}
|
||||
|
||||
public Long getActivityId() {
|
||||
return activityId;
|
||||
}
|
||||
|
||||
public void setActivityId(Long activityId) {
|
||||
this.activityId = activityId;
|
||||
}
|
||||
|
||||
public Long getMemberId() {
|
||||
return memberId;
|
||||
}
|
||||
|
||||
public void setMemberId(Long memberId) {
|
||||
this.memberId = memberId;
|
||||
}
|
||||
|
||||
public Boolean getIsLeader() {
|
||||
return isLeader;
|
||||
}
|
||||
|
||||
public void setIsLeader(Boolean isLeader) {
|
||||
this.isLeader = isLeader;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public LocalDateTime getJoinAt() {
|
||||
return joinAt;
|
||||
}
|
||||
|
||||
public void setJoinAt(LocalDateTime joinAt) {
|
||||
this.joinAt = joinAt;
|
||||
}
|
||||
}
|
||||
+91
@@ -0,0 +1,91 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Schema(description = "拼团统计数据")
|
||||
public class GroupBuyStatistics {
|
||||
|
||||
private Long activityId;
|
||||
private long totalTeams;
|
||||
private long formingTeams;
|
||||
private long successTeams;
|
||||
private long failedTeams;
|
||||
private long cancelledTeams;
|
||||
private long totalParticipants;
|
||||
private long soldCount;
|
||||
private BigDecimal totalRevenue;
|
||||
|
||||
public Long getActivityId() {
|
||||
return activityId;
|
||||
}
|
||||
|
||||
public void setActivityId(Long activityId) {
|
||||
this.activityId = activityId;
|
||||
}
|
||||
|
||||
public long getTotalTeams() {
|
||||
return totalTeams;
|
||||
}
|
||||
|
||||
public void setTotalTeams(long totalTeams) {
|
||||
this.totalTeams = totalTeams;
|
||||
}
|
||||
|
||||
public long getFormingTeams() {
|
||||
return formingTeams;
|
||||
}
|
||||
|
||||
public void setFormingTeams(long formingTeams) {
|
||||
this.formingTeams = formingTeams;
|
||||
}
|
||||
|
||||
public long getSuccessTeams() {
|
||||
return successTeams;
|
||||
}
|
||||
|
||||
public void setSuccessTeams(long successTeams) {
|
||||
this.successTeams = successTeams;
|
||||
}
|
||||
|
||||
public long getFailedTeams() {
|
||||
return failedTeams;
|
||||
}
|
||||
|
||||
public void setFailedTeams(long failedTeams) {
|
||||
this.failedTeams = failedTeams;
|
||||
}
|
||||
|
||||
public long getCancelledTeams() {
|
||||
return cancelledTeams;
|
||||
}
|
||||
|
||||
public void setCancelledTeams(long cancelledTeams) {
|
||||
this.cancelledTeams = cancelledTeams;
|
||||
}
|
||||
|
||||
public long getTotalParticipants() {
|
||||
return totalParticipants;
|
||||
}
|
||||
|
||||
public void setTotalParticipants(long totalParticipants) {
|
||||
this.totalParticipants = totalParticipants;
|
||||
}
|
||||
|
||||
public long getSoldCount() {
|
||||
return soldCount;
|
||||
}
|
||||
|
||||
public void setSoldCount(long soldCount) {
|
||||
this.soldCount = soldCount;
|
||||
}
|
||||
|
||||
public BigDecimal getTotalRevenue() {
|
||||
return totalRevenue;
|
||||
}
|
||||
|
||||
public void setTotalRevenue(BigDecimal totalRevenue) {
|
||||
this.totalRevenue = totalRevenue;
|
||||
}
|
||||
}
|
||||
+74
@@ -0,0 +1,74 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.domain;
|
||||
|
||||
import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "拼团团队")
|
||||
public class GroupBuyTeam extends BaseDomain {
|
||||
|
||||
private Long activityId;
|
||||
private Long leaderMemberId;
|
||||
private Integer requiredMembers;
|
||||
private Integer currentMembers;
|
||||
private String status;
|
||||
private LocalDateTime expireAt;
|
||||
private LocalDateTime successAt;
|
||||
|
||||
public Long getActivityId() {
|
||||
return activityId;
|
||||
}
|
||||
|
||||
public void setActivityId(Long activityId) {
|
||||
this.activityId = activityId;
|
||||
}
|
||||
|
||||
public Long getLeaderMemberId() {
|
||||
return leaderMemberId;
|
||||
}
|
||||
|
||||
public void setLeaderMemberId(Long leaderMemberId) {
|
||||
this.leaderMemberId = leaderMemberId;
|
||||
}
|
||||
|
||||
public Integer getRequiredMembers() {
|
||||
return requiredMembers;
|
||||
}
|
||||
|
||||
public void setRequiredMembers(Integer requiredMembers) {
|
||||
this.requiredMembers = requiredMembers;
|
||||
}
|
||||
|
||||
public Integer getCurrentMembers() {
|
||||
return currentMembers;
|
||||
}
|
||||
|
||||
public void setCurrentMembers(Integer currentMembers) {
|
||||
this.currentMembers = currentMembers;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public LocalDateTime getExpireAt() {
|
||||
return expireAt;
|
||||
}
|
||||
|
||||
public void setExpireAt(LocalDateTime expireAt) {
|
||||
this.expireAt = expireAt;
|
||||
}
|
||||
|
||||
public LocalDateTime getSuccessAt() {
|
||||
return successAt;
|
||||
}
|
||||
|
||||
public void setSuccessAt(LocalDateTime successAt) {
|
||||
this.successAt = successAt;
|
||||
}
|
||||
}
|
||||
+17
@@ -0,0 +1,17 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
@Schema(description = "加入拼团团队请求")
|
||||
public class JoinTeamRequest {
|
||||
|
||||
private Long memberId;
|
||||
|
||||
public Long getMemberId() {
|
||||
return memberId;
|
||||
}
|
||||
|
||||
public void setMemberId(Long memberId) {
|
||||
this.memberId = memberId;
|
||||
}
|
||||
}
|
||||
+166
@@ -0,0 +1,166 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.entity;
|
||||
|
||||
import cn.novalon.gym.manage.db.entity.BaseEntity;
|
||||
import org.springframework.data.relational.core.mapping.Column;
|
||||
import org.springframework.data.relational.core.mapping.Table;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Table("group_buy_activity")
|
||||
public class GroupBuyActivityEntity extends BaseEntity {
|
||||
|
||||
@Column("name")
|
||||
private String name;
|
||||
|
||||
@Column("description")
|
||||
private String description;
|
||||
|
||||
@Column("product_type")
|
||||
private String productType;
|
||||
|
||||
@Column("product_id")
|
||||
private Long productId;
|
||||
|
||||
@Column("product_name")
|
||||
private String productName;
|
||||
|
||||
@Column("original_price")
|
||||
private BigDecimal originalPrice;
|
||||
|
||||
@Column("group_price")
|
||||
private BigDecimal groupPrice;
|
||||
|
||||
@Column("required_members")
|
||||
private Integer requiredMembers;
|
||||
|
||||
@Column("valid_hours")
|
||||
private Integer validHours;
|
||||
|
||||
@Column("start_time")
|
||||
private LocalDateTime startTime;
|
||||
|
||||
@Column("end_time")
|
||||
private LocalDateTime endTime;
|
||||
|
||||
@Column("stock")
|
||||
private Integer stock;
|
||||
|
||||
@Column("sold_count")
|
||||
private Integer soldCount;
|
||||
|
||||
@Column("status")
|
||||
private String status;
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public String getProductType() {
|
||||
return productType;
|
||||
}
|
||||
|
||||
public void setProductType(String productType) {
|
||||
this.productType = productType;
|
||||
}
|
||||
|
||||
public Long getProductId() {
|
||||
return productId;
|
||||
}
|
||||
|
||||
public void setProductId(Long productId) {
|
||||
this.productId = productId;
|
||||
}
|
||||
|
||||
public String getProductName() {
|
||||
return productName;
|
||||
}
|
||||
|
||||
public void setProductName(String productName) {
|
||||
this.productName = productName;
|
||||
}
|
||||
|
||||
public BigDecimal getOriginalPrice() {
|
||||
return originalPrice;
|
||||
}
|
||||
|
||||
public void setOriginalPrice(BigDecimal originalPrice) {
|
||||
this.originalPrice = originalPrice;
|
||||
}
|
||||
|
||||
public BigDecimal getGroupPrice() {
|
||||
return groupPrice;
|
||||
}
|
||||
|
||||
public void setGroupPrice(BigDecimal groupPrice) {
|
||||
this.groupPrice = groupPrice;
|
||||
}
|
||||
|
||||
public Integer getRequiredMembers() {
|
||||
return requiredMembers;
|
||||
}
|
||||
|
||||
public void setRequiredMembers(Integer requiredMembers) {
|
||||
this.requiredMembers = requiredMembers;
|
||||
}
|
||||
|
||||
public Integer getValidHours() {
|
||||
return validHours;
|
||||
}
|
||||
|
||||
public void setValidHours(Integer validHours) {
|
||||
this.validHours = validHours;
|
||||
}
|
||||
|
||||
public LocalDateTime getStartTime() {
|
||||
return startTime;
|
||||
}
|
||||
|
||||
public void setStartTime(LocalDateTime startTime) {
|
||||
this.startTime = startTime;
|
||||
}
|
||||
|
||||
public LocalDateTime getEndTime() {
|
||||
return endTime;
|
||||
}
|
||||
|
||||
public void setEndTime(LocalDateTime endTime) {
|
||||
this.endTime = endTime;
|
||||
}
|
||||
|
||||
public Integer getStock() {
|
||||
return stock;
|
||||
}
|
||||
|
||||
public void setStock(Integer stock) {
|
||||
this.stock = stock;
|
||||
}
|
||||
|
||||
public Integer getSoldCount() {
|
||||
return soldCount;
|
||||
}
|
||||
|
||||
public void setSoldCount(Integer soldCount) {
|
||||
this.soldCount = soldCount;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
}
|
||||
+77
@@ -0,0 +1,77 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.entity;
|
||||
|
||||
import cn.novalon.gym.manage.db.entity.BaseEntity;
|
||||
import org.springframework.data.relational.core.mapping.Column;
|
||||
import org.springframework.data.relational.core.mapping.Table;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Table("group_buy_participant")
|
||||
public class GroupBuyParticipantEntity extends BaseEntity {
|
||||
|
||||
@Column("team_id")
|
||||
private Long teamId;
|
||||
|
||||
@Column("activity_id")
|
||||
private Long activityId;
|
||||
|
||||
@Column("member_id")
|
||||
private Long memberId;
|
||||
|
||||
@Column("is_leader")
|
||||
private Boolean isLeader;
|
||||
|
||||
@Column("status")
|
||||
private String status;
|
||||
|
||||
@Column("join_at")
|
||||
private LocalDateTime joinAt;
|
||||
|
||||
public Long getTeamId() {
|
||||
return teamId;
|
||||
}
|
||||
|
||||
public void setTeamId(Long teamId) {
|
||||
this.teamId = teamId;
|
||||
}
|
||||
|
||||
public Long getActivityId() {
|
||||
return activityId;
|
||||
}
|
||||
|
||||
public void setActivityId(Long activityId) {
|
||||
this.activityId = activityId;
|
||||
}
|
||||
|
||||
public Long getMemberId() {
|
||||
return memberId;
|
||||
}
|
||||
|
||||
public void setMemberId(Long memberId) {
|
||||
this.memberId = memberId;
|
||||
}
|
||||
|
||||
public Boolean getIsLeader() {
|
||||
return isLeader;
|
||||
}
|
||||
|
||||
public void setIsLeader(Boolean isLeader) {
|
||||
this.isLeader = isLeader;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public LocalDateTime getJoinAt() {
|
||||
return joinAt;
|
||||
}
|
||||
|
||||
public void setJoinAt(LocalDateTime joinAt) {
|
||||
this.joinAt = joinAt;
|
||||
}
|
||||
}
|
||||
+88
@@ -0,0 +1,88 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.entity;
|
||||
|
||||
import cn.novalon.gym.manage.db.entity.BaseEntity;
|
||||
import org.springframework.data.relational.core.mapping.Column;
|
||||
import org.springframework.data.relational.core.mapping.Table;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Table("group_buy_team")
|
||||
public class GroupBuyTeamEntity extends BaseEntity {
|
||||
|
||||
@Column("activity_id")
|
||||
private Long activityId;
|
||||
|
||||
@Column("leader_member_id")
|
||||
private Long leaderMemberId;
|
||||
|
||||
@Column("required_members")
|
||||
private Integer requiredMembers;
|
||||
|
||||
@Column("current_members")
|
||||
private Integer currentMembers;
|
||||
|
||||
@Column("status")
|
||||
private String status;
|
||||
|
||||
@Column("expire_at")
|
||||
private LocalDateTime expireAt;
|
||||
|
||||
@Column("success_at")
|
||||
private LocalDateTime successAt;
|
||||
|
||||
public Long getActivityId() {
|
||||
return activityId;
|
||||
}
|
||||
|
||||
public void setActivityId(Long activityId) {
|
||||
this.activityId = activityId;
|
||||
}
|
||||
|
||||
public Long getLeaderMemberId() {
|
||||
return leaderMemberId;
|
||||
}
|
||||
|
||||
public void setLeaderMemberId(Long leaderMemberId) {
|
||||
this.leaderMemberId = leaderMemberId;
|
||||
}
|
||||
|
||||
public Integer getRequiredMembers() {
|
||||
return requiredMembers;
|
||||
}
|
||||
|
||||
public void setRequiredMembers(Integer requiredMembers) {
|
||||
this.requiredMembers = requiredMembers;
|
||||
}
|
||||
|
||||
public Integer getCurrentMembers() {
|
||||
return currentMembers;
|
||||
}
|
||||
|
||||
public void setCurrentMembers(Integer currentMembers) {
|
||||
this.currentMembers = currentMembers;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public LocalDateTime getExpireAt() {
|
||||
return expireAt;
|
||||
}
|
||||
|
||||
public void setExpireAt(LocalDateTime expireAt) {
|
||||
this.expireAt = expireAt;
|
||||
}
|
||||
|
||||
public LocalDateTime getSuccessAt() {
|
||||
return successAt;
|
||||
}
|
||||
|
||||
public void setSuccessAt(LocalDateTime successAt) {
|
||||
this.successAt = successAt;
|
||||
}
|
||||
}
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.enums;
|
||||
|
||||
/**
|
||||
* 拼团活动状态
|
||||
*/
|
||||
public enum GroupBuyActivityStatus {
|
||||
DRAFT,
|
||||
ACTIVE,
|
||||
TERMINATED,
|
||||
EXPIRED
|
||||
}
|
||||
+9
@@ -0,0 +1,9 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.enums;
|
||||
|
||||
/**
|
||||
* 拼团参与人状态
|
||||
*/
|
||||
public enum GroupBuyParticipantStatus {
|
||||
JOINED,
|
||||
CANCELLED
|
||||
}
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.enums;
|
||||
|
||||
/**
|
||||
* 拼团团队状态
|
||||
*/
|
||||
public enum GroupBuyTeamStatus {
|
||||
FORMING,
|
||||
SUCCESS,
|
||||
FAILED,
|
||||
CANCELLED
|
||||
}
|
||||
+10
@@ -0,0 +1,10 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.enums;
|
||||
|
||||
/**
|
||||
* 商品类型
|
||||
*/
|
||||
public enum ProductType {
|
||||
COURSE,
|
||||
MEMBER_CARD,
|
||||
PRODUCT
|
||||
}
|
||||
+220
@@ -0,0 +1,220 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.handler;
|
||||
|
||||
import cn.novalon.gym.manage.common.dto.PageRequest;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.CreateTeamRequest;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyActivity;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyTeam;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.JoinTeamRequest;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.service.IGroupBuyActivityService;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.service.IGroupBuyTeamService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.reactive.function.server.ServerRequest;
|
||||
import org.springframework.web.reactive.function.server.ServerResponse;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@Component
|
||||
@Tag(name = "拼团管理", description = "拼团相关操作")
|
||||
public class GroupBuyHandler {
|
||||
|
||||
private final IGroupBuyActivityService activityService;
|
||||
private final IGroupBuyTeamService teamService;
|
||||
|
||||
public GroupBuyHandler(IGroupBuyActivityService activityService, IGroupBuyTeamService teamService) {
|
||||
this.activityService = activityService;
|
||||
this.teamService = teamService;
|
||||
}
|
||||
|
||||
@Operation(summary = "获取所有拼团活动")
|
||||
public Mono<ServerResponse> getAllActivities(ServerRequest request) {
|
||||
boolean includeDeleted = Boolean.parseBoolean(request.queryParam("includeDeleted").orElse("false"));
|
||||
return ServerResponse.ok()
|
||||
.body(activityService.findAll(includeDeleted), GroupBuyActivity.class);
|
||||
}
|
||||
|
||||
@Operation(summary = "分页获取拼团活动")
|
||||
public Mono<ServerResponse> getActivitiesByPage(ServerRequest request) {
|
||||
return request.bodyToMono(PageRequest.class)
|
||||
.flatMap(pageRequest -> {
|
||||
String status = request.queryParam("status").orElse(null);
|
||||
normalizePageRequest(pageRequest);
|
||||
return activityService.findByPage(pageRequest, status)
|
||||
.flatMap(response -> ServerResponse.ok().bodyValue(response));
|
||||
});
|
||||
}
|
||||
|
||||
@Operation(summary = "搜索拼团活动")
|
||||
public Mono<ServerResponse> searchActivities(ServerRequest request) {
|
||||
String keyword = request.queryParam("keyword").orElse("");
|
||||
String status = request.queryParam("status").orElse(null);
|
||||
return ServerResponse.ok()
|
||||
.body(activityService.findByKeywordAndStatus(keyword, status), GroupBuyActivity.class);
|
||||
}
|
||||
|
||||
@Operation(summary = "根据ID获取拼团活动")
|
||||
public Mono<ServerResponse> getActivityById(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return activityService.findById(id)
|
||||
.flatMap(activity -> ServerResponse.ok().bodyValue(activity))
|
||||
.switchIfEmpty(ServerResponse.notFound().build());
|
||||
}
|
||||
|
||||
@Operation(summary = "创建拼团活动")
|
||||
public Mono<ServerResponse> createActivity(ServerRequest request) {
|
||||
return request.bodyToMono(GroupBuyActivity.class)
|
||||
.flatMap(activity -> {
|
||||
if (activity.getName() == null || activity.getName().isEmpty()) {
|
||||
return badRequest("活动名称不能为空");
|
||||
}
|
||||
return activityService.create(activity)
|
||||
.flatMap(created -> successResponse("拼团活动创建成功", created))
|
||||
.onErrorResume(this::errorResponse);
|
||||
});
|
||||
}
|
||||
|
||||
@Operation(summary = "更新拼团活动")
|
||||
public Mono<ServerResponse> updateActivity(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return request.bodyToMono(GroupBuyActivity.class)
|
||||
.flatMap(activity -> activityService.update(id, activity)
|
||||
.flatMap(updated -> successResponse("拼团活动更新成功", updated))
|
||||
.onErrorResume(this::errorResponse));
|
||||
}
|
||||
|
||||
@Operation(summary = "删除拼团活动")
|
||||
public Mono<ServerResponse> deleteActivity(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return activityService.delete(id)
|
||||
.then(Mono.defer(() -> successResponse("拼团活动删除成功", null)))
|
||||
.onErrorResume(this::errorResponse);
|
||||
}
|
||||
|
||||
@Operation(summary = "发布拼团活动")
|
||||
public Mono<ServerResponse> publishActivity(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return activityService.publish(id)
|
||||
.flatMap(activity -> successResponse("拼团活动发布成功", activity))
|
||||
.onErrorResume(this::errorResponse);
|
||||
}
|
||||
|
||||
@Operation(summary = "终止拼团活动")
|
||||
public Mono<ServerResponse> terminateActivity(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return activityService.terminate(id)
|
||||
.flatMap(activity -> successResponse("拼团活动已终止", activity))
|
||||
.onErrorResume(this::errorResponse);
|
||||
}
|
||||
|
||||
@Operation(summary = "获取拼团统计")
|
||||
public Mono<ServerResponse> getStatistics(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return activityService.getStatistics(id)
|
||||
.flatMap(stats -> ServerResponse.ok().bodyValue(stats))
|
||||
.onErrorResume(this::errorResponse);
|
||||
}
|
||||
|
||||
@Operation(summary = "创建拼团团队")
|
||||
public Mono<ServerResponse> createTeam(ServerRequest request) {
|
||||
return request.bodyToMono(CreateTeamRequest.class)
|
||||
.flatMap(body -> {
|
||||
if (body.getActivityId() == null || body.getMemberId() == null) {
|
||||
return badRequest("activityId和memberId不能为空");
|
||||
}
|
||||
return teamService.createTeam(body)
|
||||
.flatMap(team -> successResponse("拼团团队创建成功", team))
|
||||
.onErrorResume(this::errorResponse);
|
||||
});
|
||||
}
|
||||
|
||||
@Operation(summary = "加入拼团团队")
|
||||
public Mono<ServerResponse> joinTeam(ServerRequest request) {
|
||||
Long teamId = Long.valueOf(request.pathVariable("teamId"));
|
||||
return request.bodyToMono(JoinTeamRequest.class)
|
||||
.flatMap(body -> {
|
||||
if (body.getMemberId() == null) {
|
||||
return badRequest("memberId不能为空");
|
||||
}
|
||||
return teamService.joinTeam(teamId, body)
|
||||
.flatMap(team -> successResponse("加入拼团成功", team))
|
||||
.onErrorResume(this::errorResponse);
|
||||
});
|
||||
}
|
||||
|
||||
@Operation(summary = "取消拼团团队")
|
||||
public Mono<ServerResponse> cancelTeam(ServerRequest request) {
|
||||
Long teamId = Long.valueOf(request.pathVariable("teamId"));
|
||||
return teamService.cancelTeam(teamId)
|
||||
.flatMap(team -> successResponse("拼团团队已取消", team))
|
||||
.onErrorResume(this::errorResponse);
|
||||
}
|
||||
|
||||
@Operation(summary = "查询拼团团队列表")
|
||||
public Mono<ServerResponse> getTeams(ServerRequest request) {
|
||||
String activityIdStr = request.queryParam("activityId").orElse(null);
|
||||
if (activityIdStr == null) {
|
||||
return badRequest("activityId不能为空");
|
||||
}
|
||||
Long activityId = Long.valueOf(activityIdStr);
|
||||
String status = request.queryParam("status").orElse(null);
|
||||
return ServerResponse.ok()
|
||||
.body(teamService.findTeams(activityId, status), GroupBuyTeam.class);
|
||||
}
|
||||
|
||||
@Operation(summary = "获取拼团团队详情")
|
||||
public Mono<ServerResponse> getTeamById(ServerRequest request) {
|
||||
Long teamId = Long.valueOf(request.pathVariable("teamId"));
|
||||
return teamService.findTeamById(teamId)
|
||||
.flatMap(team -> teamService.findParticipantsByTeamId(teamId)
|
||||
.collectList()
|
||||
.flatMap(participants -> {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
result.put("team", team);
|
||||
result.put("participants", participants);
|
||||
return ServerResponse.ok().bodyValue(result);
|
||||
}))
|
||||
.switchIfEmpty(ServerResponse.notFound().build());
|
||||
}
|
||||
|
||||
private void normalizePageRequest(PageRequest pageRequest) {
|
||||
if (pageRequest.getPage() < 0) {
|
||||
pageRequest.setPage(0);
|
||||
}
|
||||
if (pageRequest.getSize() <= 0 || pageRequest.getSize() > 100) {
|
||||
pageRequest.setSize(10);
|
||||
}
|
||||
if (pageRequest.getSort() == null || pageRequest.getSort().isEmpty()) {
|
||||
pageRequest.setSort("id");
|
||||
}
|
||||
if (pageRequest.getOrder() == null || pageRequest.getOrder().isEmpty()) {
|
||||
pageRequest.setOrder("desc");
|
||||
}
|
||||
}
|
||||
|
||||
private Mono<ServerResponse> successResponse(String message, Object data) {
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("success", true);
|
||||
response.put("message", message);
|
||||
if (data != null) {
|
||||
response.put("data", data);
|
||||
}
|
||||
return ServerResponse.ok().bodyValue(response);
|
||||
}
|
||||
|
||||
private Mono<ServerResponse> badRequest(String message) {
|
||||
Map<String, Object> error = new HashMap<>();
|
||||
error.put("success", false);
|
||||
error.put("message", message);
|
||||
return ServerResponse.badRequest().bodyValue(error);
|
||||
}
|
||||
|
||||
private Mono<ServerResponse> errorResponse(Throwable error) {
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("success", false);
|
||||
response.put("message", error.getMessage());
|
||||
return ServerResponse.badRequest().bodyValue(response);
|
||||
}
|
||||
}
|
||||
+28
@@ -0,0 +1,28 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.repository;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyActivity;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
public interface IGroupBuyActivityRepository {
|
||||
|
||||
Mono<GroupBuyActivity> findById(Long id);
|
||||
|
||||
Flux<GroupBuyActivity> findAll(boolean includeDeleted);
|
||||
|
||||
Flux<GroupBuyActivity> findByKeyword(String keyword);
|
||||
|
||||
Flux<GroupBuyActivity> findByStatus(String status);
|
||||
|
||||
Flux<GroupBuyActivity> findByKeywordAndStatus(String keyword, String status);
|
||||
|
||||
Mono<GroupBuyActivity> save(GroupBuyActivity activity);
|
||||
|
||||
Mono<GroupBuyActivity> update(GroupBuyActivity activity);
|
||||
|
||||
Mono<Void> deleteById(Long id);
|
||||
|
||||
Mono<Void> updateStatus(Long id, String status);
|
||||
|
||||
Mono<Void> incrementSoldCount(Long id, int count);
|
||||
}
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.repository;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyParticipant;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
public interface IGroupBuyParticipantRepository {
|
||||
|
||||
Flux<GroupBuyParticipant> findByTeamId(Long teamId);
|
||||
|
||||
Flux<GroupBuyParticipant> findByActivityId(Long activityId);
|
||||
|
||||
Mono<Boolean> existsInFormingTeam(Long activityId, Long memberId);
|
||||
|
||||
Mono<Long> countByActivityId(Long activityId);
|
||||
|
||||
Mono<GroupBuyParticipant> save(GroupBuyParticipant participant);
|
||||
|
||||
Mono<Void> updateStatusByTeamId(Long teamId, String status);
|
||||
}
|
||||
+24
@@ -0,0 +1,24 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.repository;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyTeam;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
public interface IGroupBuyTeamRepository {
|
||||
|
||||
Mono<GroupBuyTeam> findById(Long id);
|
||||
|
||||
Flux<GroupBuyTeam> findByActivityId(Long activityId);
|
||||
|
||||
Flux<GroupBuyTeam> findByActivityIdAndStatus(Long activityId, String status);
|
||||
|
||||
Flux<GroupBuyTeam> findExpiredFormingTeams();
|
||||
|
||||
Mono<GroupBuyTeam> save(GroupBuyTeam team);
|
||||
|
||||
Mono<Void> updateStatus(Long id, String status);
|
||||
|
||||
Mono<Void> incrementCurrentMembers(Long id, int count);
|
||||
|
||||
Mono<Void> markSuccess(Long id, String status);
|
||||
}
|
||||
+133
@@ -0,0 +1,133 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.repository.impl;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.converter.GroupBuyConverter;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.dao.GroupBuyActivityDao;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyActivity;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.entity.GroupBuyActivityEntity;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.repository.IGroupBuyActivityRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Repository
|
||||
@Transactional
|
||||
public class GroupBuyActivityRepository implements IGroupBuyActivityRepository {
|
||||
|
||||
private final GroupBuyActivityDao activityDao;
|
||||
private final GroupBuyConverter converter;
|
||||
|
||||
public GroupBuyActivityRepository(GroupBuyActivityDao activityDao, GroupBuyConverter converter) {
|
||||
this.activityDao = activityDao;
|
||||
this.converter = converter;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyActivity> findById(Long id) {
|
||||
return activityDao.findByIdIsAndDeletedAtIsNull(id).map(converter::toActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<GroupBuyActivity> findAll(boolean includeDeleted) {
|
||||
if (includeDeleted) {
|
||||
return activityDao.findAll().map(converter::toActivity);
|
||||
}
|
||||
return activityDao.findAllByDeletedAtIsNull().map(converter::toActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<GroupBuyActivity> findByKeyword(String keyword) {
|
||||
if (keyword == null || keyword.isEmpty()) {
|
||||
return findAll(false);
|
||||
}
|
||||
return activityDao.findByNameContainingAndDeletedAtIsNull(keyword).map(converter::toActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<GroupBuyActivity> findByStatus(String status) {
|
||||
if (status == null || status.isEmpty()) {
|
||||
return findAll(false);
|
||||
}
|
||||
return activityDao.findByStatusAndDeletedAtIsNull(status).map(converter::toActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<GroupBuyActivity> findByKeywordAndStatus(String keyword, String status) {
|
||||
Flux<GroupBuyActivity> result = findByKeyword(keyword);
|
||||
if (status != null && !status.isEmpty()) {
|
||||
result = result.filter(a -> status.equals(a.getStatus()));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyActivity> save(GroupBuyActivity activity) {
|
||||
GroupBuyActivityEntity entity = converter.toActivityEntity(activity);
|
||||
return activityDao.save(entity).map(converter::toActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyActivity> update(GroupBuyActivity activity) {
|
||||
return activityDao.findByIdIsAndDeletedAtIsNull(activity.getId())
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("拼团活动不存在")))
|
||||
.flatMap(existing -> {
|
||||
existing.markNotNew();
|
||||
if (activity.getName() != null) {
|
||||
existing.setName(activity.getName());
|
||||
}
|
||||
if (activity.getDescription() != null) {
|
||||
existing.setDescription(activity.getDescription());
|
||||
}
|
||||
if (activity.getProductType() != null) {
|
||||
existing.setProductType(activity.getProductType());
|
||||
}
|
||||
if (activity.getProductId() != null) {
|
||||
existing.setProductId(activity.getProductId());
|
||||
}
|
||||
if (activity.getProductName() != null) {
|
||||
existing.setProductName(activity.getProductName());
|
||||
}
|
||||
if (activity.getOriginalPrice() != null) {
|
||||
existing.setOriginalPrice(activity.getOriginalPrice());
|
||||
}
|
||||
if (activity.getGroupPrice() != null) {
|
||||
existing.setGroupPrice(activity.getGroupPrice());
|
||||
}
|
||||
if (activity.getRequiredMembers() != null) {
|
||||
existing.setRequiredMembers(activity.getRequiredMembers());
|
||||
}
|
||||
if (activity.getValidHours() != null) {
|
||||
existing.setValidHours(activity.getValidHours());
|
||||
}
|
||||
if (activity.getStartTime() != null) {
|
||||
existing.setStartTime(activity.getStartTime());
|
||||
}
|
||||
if (activity.getEndTime() != null) {
|
||||
existing.setEndTime(activity.getEndTime());
|
||||
}
|
||||
if (activity.getStock() != null) {
|
||||
existing.setStock(activity.getStock());
|
||||
}
|
||||
existing.setUpdatedAt(LocalDateTime.now());
|
||||
return activityDao.save(existing);
|
||||
})
|
||||
.map(converter::toActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> deleteById(Long id) {
|
||||
return activityDao.softDelete(id, LocalDateTime.now()).then();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> updateStatus(Long id, String status) {
|
||||
return activityDao.updateStatus(id, status, LocalDateTime.now()).then();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> incrementSoldCount(Long id, int count) {
|
||||
return activityDao.incrementSoldCount(id, count, LocalDateTime.now()).then();
|
||||
}
|
||||
}
|
||||
+61
@@ -0,0 +1,61 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.repository.impl;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.converter.GroupBuyConverter;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.dao.GroupBuyParticipantDao;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyParticipant;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.enums.GroupBuyParticipantStatus;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.enums.GroupBuyTeamStatus;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.repository.IGroupBuyParticipantRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Repository
|
||||
@Transactional
|
||||
public class GroupBuyParticipantRepository implements IGroupBuyParticipantRepository {
|
||||
|
||||
private final GroupBuyParticipantDao participantDao;
|
||||
private final GroupBuyConverter converter;
|
||||
|
||||
public GroupBuyParticipantRepository(GroupBuyParticipantDao participantDao, GroupBuyConverter converter) {
|
||||
this.participantDao = participantDao;
|
||||
this.converter = converter;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<GroupBuyParticipant> findByTeamId(Long teamId) {
|
||||
return participantDao.findByTeamIdAndDeletedAtIsNull(teamId).map(converter::toParticipant);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<GroupBuyParticipant> findByActivityId(Long activityId) {
|
||||
return participantDao.findByActivityIdAndDeletedAtIsNull(activityId).map(converter::toParticipant);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Boolean> existsInFormingTeam(Long activityId, Long memberId) {
|
||||
return participantDao.findActiveParticipantInFormingTeam(
|
||||
activityId, memberId,
|
||||
GroupBuyParticipantStatus.JOINED.name(),
|
||||
GroupBuyTeamStatus.FORMING.name())
|
||||
.hasElements();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Long> countByActivityId(Long activityId) {
|
||||
return participantDao.countByActivityIdAndDeletedAtIsNull(activityId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyParticipant> save(GroupBuyParticipant participant) {
|
||||
return participantDao.save(converter.toParticipantEntity(participant)).map(converter::toParticipant);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> updateStatusByTeamId(Long teamId, String status) {
|
||||
return participantDao.updateStatusByTeamId(teamId, status, LocalDateTime.now()).then();
|
||||
}
|
||||
}
|
||||
+70
@@ -0,0 +1,70 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.repository.impl;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.converter.GroupBuyConverter;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.dao.GroupBuyTeamDao;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyTeam;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.enums.GroupBuyTeamStatus;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.repository.IGroupBuyTeamRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Repository
|
||||
@Transactional
|
||||
public class GroupBuyTeamRepository implements IGroupBuyTeamRepository {
|
||||
|
||||
private final GroupBuyTeamDao teamDao;
|
||||
private final GroupBuyConverter converter;
|
||||
|
||||
public GroupBuyTeamRepository(GroupBuyTeamDao teamDao, GroupBuyConverter converter) {
|
||||
this.teamDao = teamDao;
|
||||
this.converter = converter;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyTeam> findById(Long id) {
|
||||
return teamDao.findByIdIsAndDeletedAtIsNull(id).map(converter::toTeam);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<GroupBuyTeam> findByActivityId(Long activityId) {
|
||||
return teamDao.findByActivityIdAndDeletedAtIsNull(activityId).map(converter::toTeam);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<GroupBuyTeam> findByActivityIdAndStatus(Long activityId, String status) {
|
||||
if (status == null || status.isEmpty()) {
|
||||
return findByActivityId(activityId);
|
||||
}
|
||||
return teamDao.findByActivityIdAndStatusAndDeletedAtIsNull(activityId, status).map(converter::toTeam);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<GroupBuyTeam> findExpiredFormingTeams() {
|
||||
return teamDao.findExpiredFormingTeams(
|
||||
GroupBuyTeamStatus.FORMING.name(), LocalDateTime.now()).map(converter::toTeam);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyTeam> save(GroupBuyTeam team) {
|
||||
return teamDao.save(converter.toTeamEntity(team)).map(converter::toTeam);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> updateStatus(Long id, String status) {
|
||||
return teamDao.updateStatus(id, status, LocalDateTime.now()).then();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> incrementCurrentMembers(Long id, int count) {
|
||||
return teamDao.incrementCurrentMembers(id, count, LocalDateTime.now()).then();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> markSuccess(Long id, String status) {
|
||||
return teamDao.markSuccess(id, status, LocalDateTime.now(), LocalDateTime.now()).then();
|
||||
}
|
||||
}
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.scheduler;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.service.IGroupBuyTeamService;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.scheduling.annotation.Scheduled;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* 拼团过期团队定时任务
|
||||
*
|
||||
* 功能：定期检查已过期的拼团中团队，标记为失败
|
||||
*/
|
||||
@Component
|
||||
public class GroupBuyTeamExpireScheduler {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(GroupBuyTeamExpireScheduler.class);
|
||||
|
||||
private final IGroupBuyTeamService teamService;
|
||||
|
||||
public GroupBuyTeamExpireScheduler(IGroupBuyTeamService teamService) {
|
||||
this.teamService = teamService;
|
||||
}
|
||||
|
||||
@Scheduled(fixedRate = 60000)
|
||||
public void processExpiredTeams() {
|
||||
logger.debug("定时任务开始检查过期拼团团队");
|
||||
|
||||
teamService.processExpiredTeams()
|
||||
.subscribe(
|
||||
count -> logger.debug("定时任务完成，处理了 {} 个过期拼团团队", count),
|
||||
error -> logger.error("拼团过期定时任务执行失败：{}", error.getMessage(), error)
|
||||
);
|
||||
}
|
||||
}
|
||||
+31
@@ -0,0 +1,31 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.service;
|
||||
|
||||
import cn.novalon.gym.manage.common.dto.PageRequest;
|
||||
import cn.novalon.gym.manage.common.dto.PageResponse;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyActivity;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyStatistics;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
public interface IGroupBuyActivityService {
|
||||
|
||||
Mono<GroupBuyActivity> findById(Long id);
|
||||
|
||||
Flux<GroupBuyActivity> findAll(boolean includeDeleted);
|
||||
|
||||
Flux<GroupBuyActivity> findByKeywordAndStatus(String keyword, String status);
|
||||
|
||||
Mono<PageResponse<GroupBuyActivity>> findByPage(PageRequest pageRequest, String status);
|
||||
|
||||
Mono<GroupBuyActivity> create(GroupBuyActivity activity);
|
||||
|
||||
Mono<GroupBuyActivity> update(Long id, GroupBuyActivity activity);
|
||||
|
||||
Mono<Void> delete(Long id);
|
||||
|
||||
Mono<GroupBuyActivity> publish(Long id);
|
||||
|
||||
Mono<GroupBuyActivity> terminate(Long id);
|
||||
|
||||
Mono<GroupBuyStatistics> getStatistics(Long id);
|
||||
}
|
||||
+25
@@ -0,0 +1,25 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.service;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.CreateTeamRequest;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyParticipant;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyTeam;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.JoinTeamRequest;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
public interface IGroupBuyTeamService {
|
||||
|
||||
Mono<GroupBuyTeam> createTeam(CreateTeamRequest request);
|
||||
|
||||
Mono<GroupBuyTeam> joinTeam(Long teamId, JoinTeamRequest request);
|
||||
|
||||
Mono<GroupBuyTeam> cancelTeam(Long teamId);
|
||||
|
||||
Flux<GroupBuyTeam> findTeams(Long activityId, String status);
|
||||
|
||||
Mono<GroupBuyTeam> findTeamById(Long teamId);
|
||||
|
||||
Flux<GroupBuyParticipant> findParticipantsByTeamId(Long teamId);
|
||||
|
||||
Mono<Long> processExpiredTeams();
|
||||
}
|
||||
+226
@@ -0,0 +1,226 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.service.impl;
|
||||
|
||||
import cn.novalon.gym.manage.common.dto.PageRequest;
|
||||
import cn.novalon.gym.manage.common.dto.PageResponse;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyActivity;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyStatistics;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyTeam;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.enums.GroupBuyActivityStatus;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.enums.GroupBuyTeamStatus;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.repository.IGroupBuyActivityRepository;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.repository.IGroupBuyParticipantRepository;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.repository.IGroupBuyTeamRepository;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.service.IGroupBuyActivityService;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Service;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class GroupBuyActivityService implements IGroupBuyActivityService {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(GroupBuyActivityService.class);
|
||||
|
||||
private final IGroupBuyActivityRepository activityRepository;
|
||||
private final IGroupBuyTeamRepository teamRepository;
|
||||
private final IGroupBuyParticipantRepository participantRepository;
|
||||
|
||||
public GroupBuyActivityService(IGroupBuyActivityRepository activityRepository,
|
||||
IGroupBuyTeamRepository teamRepository,
|
||||
IGroupBuyParticipantRepository participantRepository) {
|
||||
this.activityRepository = activityRepository;
|
||||
this.teamRepository = teamRepository;
|
||||
this.participantRepository = participantRepository;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyActivity> findById(Long id) {
|
||||
return activityRepository.findById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<GroupBuyActivity> findAll(boolean includeDeleted) {
|
||||
return activityRepository.findAll(includeDeleted);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<GroupBuyActivity> findByKeywordAndStatus(String keyword, String status) {
|
||||
return activityRepository.findByKeywordAndStatus(keyword, status);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<PageResponse<GroupBuyActivity>> findByPage(PageRequest pageRequest, String status) {
|
||||
int page = Math.max(pageRequest.getPage(), 0);
|
||||
int size = pageRequest.getSize() <= 0 || pageRequest.getSize() > 100 ? 10 : pageRequest.getSize();
|
||||
String keyword = pageRequest.getKeyword();
|
||||
|
||||
return activityRepository.findByKeywordAndStatus(keyword, status)
|
||||
.sort(Comparator.comparing(GroupBuyActivity::getCreatedAt,
|
||||
Comparator.nullsLast(Comparator.reverseOrder())))
|
||||
.collectList()
|
||||
.map(list -> {
|
||||
long total = list.size();
|
||||
int fromIndex = Math.min(page * size, list.size());
|
||||
int toIndex = Math.min(fromIndex + size, list.size());
|
||||
List<GroupBuyActivity> content = list.subList(fromIndex, toIndex);
|
||||
int totalPages = size == 0 ? 0 : (int) Math.ceil((double) total / size);
|
||||
return new PageResponse<>(content, totalPages, total, page, size);
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyActivity> create(GroupBuyActivity activity) {
|
||||
return validateActivity(activity)
|
||||
.flatMap(validated -> {
|
||||
validated.generateId();
|
||||
validated.setStatus(GroupBuyActivityStatus.DRAFT.name());
|
||||
validated.setSoldCount(0);
|
||||
applyDefaults(validated);
|
||||
return activityRepository.save(validated);
|
||||
})
|
||||
.doOnSuccess(a -> logger.info("拼团活动创建成功 - id={}, name={}", a.getId(), a.getName()))
|
||||
.doOnError(error -> logger.error("拼团活动创建失败 - error: {}", error.getMessage()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyActivity> update(Long id, GroupBuyActivity activity) {
|
||||
return activityRepository.findById(id)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("拼团活动不存在")))
|
||||
.flatMap(existing -> {
|
||||
if (!GroupBuyActivityStatus.DRAFT.name().equals(existing.getStatus())) {
|
||||
return Mono.error(new RuntimeException("仅草稿状态的拼团活动可编辑"));
|
||||
}
|
||||
activity.setId(id);
|
||||
return validateActivity(activity)
|
||||
.flatMap(activityRepository::update);
|
||||
})
|
||||
.doOnSuccess(a -> logger.info("拼团活动更新成功 - id={}", id))
|
||||
.doOnError(error -> logger.error("拼团活动更新失败 - id={}, error: {}", id, error.getMessage()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> delete(Long id) {
|
||||
return activityRepository.findById(id)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("拼团活动不存在")))
|
||||
.flatMap(existing -> {
|
||||
if (!GroupBuyActivityStatus.DRAFT.name().equals(existing.getStatus())) {
|
||||
return Mono.error(new RuntimeException("仅草稿状态的拼团活动可删除"));
|
||||
}
|
||||
return activityRepository.deleteById(id);
|
||||
})
|
||||
.doOnSuccess(v -> logger.info("拼团活动删除成功 - id={}", id))
|
||||
.doOnError(error -> logger.error("拼团活动删除失败 - id={}, error: {}", id, error.getMessage()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyActivity> publish(Long id) {
|
||||
return activityRepository.findById(id)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("拼团活动不存在")))
|
||||
.flatMap(existing -> {
|
||||
if (!GroupBuyActivityStatus.DRAFT.name().equals(existing.getStatus())) {
|
||||
return Mono.error(new RuntimeException("仅草稿状态的拼团活动可发布"));
|
||||
}
|
||||
return validateActivity(existing)
|
||||
.flatMap(validated -> activityRepository.updateStatus(id, GroupBuyActivityStatus.ACTIVE.name())
|
||||
.then(activityRepository.findById(id)));
|
||||
})
|
||||
.doOnSuccess(a -> logger.info("拼团活动发布成功 - id={}", id))
|
||||
.doOnError(error -> logger.error("拼团活动发布失败 - id={}, error: {}", id, error.getMessage()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyActivity> terminate(Long id) {
|
||||
return activityRepository.findById(id)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("拼团活动不存在")))
|
||||
.flatMap(existing -> {
|
||||
if (!GroupBuyActivityStatus.ACTIVE.name().equals(existing.getStatus())) {
|
||||
return Mono.error(new RuntimeException("仅进行中的拼团活动可终止"));
|
||||
}
|
||||
return activityRepository.updateStatus(id, GroupBuyActivityStatus.TERMINATED.name())
|
||||
.then(activityRepository.findById(id));
|
||||
})
|
||||
.doOnSuccess(a -> logger.info("拼团活动已终止 - id={}", id))
|
||||
.doOnError(error -> logger.error("拼团活动终止失败 - id={}, error: {}", id, error.getMessage()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyStatistics> getStatistics(Long id) {
|
||||
return activityRepository.findById(id)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("拼团活动不存在")))
|
||||
.flatMap(activity -> teamRepository.findByActivityId(id)
|
||||
.collectList()
|
||||
.zipWith(participantRepository.countByActivityId(id))
|
||||
.map(tuple -> {
|
||||
List<GroupBuyTeam> teams = tuple.getT1();
|
||||
long participants = tuple.getT2();
|
||||
|
||||
GroupBuyStatistics stats = new GroupBuyStatistics();
|
||||
stats.setActivityId(id);
|
||||
stats.setTotalTeams(teams.size());
|
||||
stats.setFormingTeams(teams.stream()
|
||||
.filter(t -> GroupBuyTeamStatus.FORMING.name().equals(t.getStatus())).count());
|
||||
stats.setSuccessTeams(teams.stream()
|
||||
.filter(t -> GroupBuyTeamStatus.SUCCESS.name().equals(t.getStatus())).count());
|
||||
stats.setFailedTeams(teams.stream()
|
||||
.filter(t -> GroupBuyTeamStatus.FAILED.name().equals(t.getStatus())).count());
|
||||
stats.setCancelledTeams(teams.stream()
|
||||
.filter(t -> GroupBuyTeamStatus.CANCELLED.name().equals(t.getStatus())).count());
|
||||
stats.setTotalParticipants(participants);
|
||||
stats.setSoldCount(activity.getSoldCount() != null ? activity.getSoldCount() : 0);
|
||||
|
||||
BigDecimal groupPrice = activity.getGroupPrice() != null ? activity.getGroupPrice() : BigDecimal.ZERO;
|
||||
stats.setTotalRevenue(groupPrice.multiply(
|
||||
BigDecimal.valueOf(stats.getSuccessTeams() * activity.getRequiredMembers())));
|
||||
|
||||
return stats;
|
||||
}));
|
||||
}
|
||||
|
||||
private Mono<GroupBuyActivity> validateActivity(GroupBuyActivity activity) {
|
||||
if (activity.getName() == null || activity.getName().isBlank()) {
|
||||
return Mono.error(new RuntimeException("活动名称不能为空"));
|
||||
}
|
||||
if (activity.getProductType() == null || activity.getProductType().isBlank()) {
|
||||
return Mono.error(new RuntimeException("商品类型不能为空"));
|
||||
}
|
||||
if (activity.getProductId() == null) {
|
||||
return Mono.error(new RuntimeException("商品ID不能为空"));
|
||||
}
|
||||
if (activity.getOriginalPrice() == null || activity.getGroupPrice() == null) {
|
||||
return Mono.error(new RuntimeException("原价和拼团价不能为空"));
|
||||
}
|
||||
if (activity.getGroupPrice().compareTo(activity.getOriginalPrice()) >= 0) {
|
||||
return Mono.error(new RuntimeException("拼团价必须低于原价"));
|
||||
}
|
||||
if (activity.getRequiredMembers() == null || activity.getRequiredMembers() < 2) {
|
||||
return Mono.error(new RuntimeException("成团人数至少为2人"));
|
||||
}
|
||||
if (activity.getValidHours() == null || activity.getValidHours() <= 0) {
|
||||
return Mono.error(new RuntimeException("拼团有效时长必须大于0"));
|
||||
}
|
||||
if (activity.getStartTime() == null || activity.getEndTime() == null) {
|
||||
return Mono.error(new RuntimeException("活动开始和结束时间不能为空"));
|
||||
}
|
||||
if (activity.getEndTime().isBefore(activity.getStartTime())) {
|
||||
return Mono.error(new RuntimeException("结束时间不能早于开始时间"));
|
||||
}
|
||||
return Mono.just(activity);
|
||||
}
|
||||
|
||||
private void applyDefaults(GroupBuyActivity activity) {
|
||||
if (activity.getRequiredMembers() == null) {
|
||||
activity.setRequiredMembers(2);
|
||||
}
|
||||
if (activity.getValidHours() == null) {
|
||||
activity.setValidHours(24);
|
||||
}
|
||||
if (activity.getStock() == null) {
|
||||
activity.setStock(-1);
|
||||
}
|
||||
}
|
||||
}
|
||||
+200
@@ -0,0 +1,200 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.service.impl;
|
||||
|
||||
import cn.novalon.gym.manage.common.util.SnowflakeId;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.CreateTeamRequest;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyActivity;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyParticipant;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyTeam;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.JoinTeamRequest;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.enums.GroupBuyActivityStatus;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.enums.GroupBuyParticipantStatus;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.enums.GroupBuyTeamStatus;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.repository.IGroupBuyActivityRepository;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.repository.IGroupBuyParticipantRepository;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.repository.IGroupBuyTeamRepository;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.service.IGroupBuyTeamService;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Service;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Service
|
||||
public class GroupBuyTeamService implements IGroupBuyTeamService {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(GroupBuyTeamService.class);
|
||||
|
||||
private final IGroupBuyActivityRepository activityRepository;
|
||||
private final IGroupBuyTeamRepository teamRepository;
|
||||
private final IGroupBuyParticipantRepository participantRepository;
|
||||
|
||||
public GroupBuyTeamService(IGroupBuyActivityRepository activityRepository,
|
||||
IGroupBuyTeamRepository teamRepository,
|
||||
IGroupBuyParticipantRepository participantRepository) {
|
||||
this.activityRepository = activityRepository;
|
||||
this.teamRepository = teamRepository;
|
||||
this.participantRepository = participantRepository;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyTeam> createTeam(CreateTeamRequest request) {
|
||||
if (request.getActivityId() == null || request.getMemberId() == null) {
|
||||
return Mono.error(new RuntimeException("activityId和memberId不能为空"));
|
||||
}
|
||||
|
||||
return activityRepository.findById(request.getActivityId())
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("拼团活动不存在")))
|
||||
.flatMap(activity -> validateActivityForTeam(activity)
|
||||
.then(checkMemberNotInFormingTeam(activity.getId(), request.getMemberId()))
|
||||
.then(createTeamInternal(activity, request.getMemberId())));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyTeam> joinTeam(Long teamId, JoinTeamRequest request) {
|
||||
if (request.getMemberId() == null) {
|
||||
return Mono.error(new RuntimeException("memberId不能为空"));
|
||||
}
|
||||
|
||||
return teamRepository.findById(teamId)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("拼团团队不存在")))
|
||||
.flatMap(team -> {
|
||||
if (!GroupBuyTeamStatus.FORMING.name().equals(team.getStatus())) {
|
||||
return Mono.error(new RuntimeException("该团不在拼团中，无法加入"));
|
||||
}
|
||||
if (team.getExpireAt() != null && team.getExpireAt().isBefore(LocalDateTime.now())) {
|
||||
return Mono.error(new RuntimeException("该团已过期"));
|
||||
}
|
||||
return activityRepository.findById(team.getActivityId())
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("拼团活动不存在")))
|
||||
.flatMap(activity -> validateActivityForTeam(activity)
|
||||
.then(checkMemberNotInFormingTeam(activity.getId(), request.getMemberId()))
|
||||
.then(addParticipant(team, activity, request.getMemberId(), false))
|
||||
.flatMap(updatedTeam -> checkAndCompleteTeam(updatedTeam, activity)));
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyTeam> cancelTeam(Long teamId) {
|
||||
return teamRepository.findById(teamId)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("拼团团队不存在")))
|
||||
.flatMap(team -> {
|
||||
if (!GroupBuyTeamStatus.FORMING.name().equals(team.getStatus())) {
|
||||
return Mono.error(new RuntimeException("仅拼团中的团队可取消"));
|
||||
}
|
||||
return teamRepository.updateStatus(teamId, GroupBuyTeamStatus.CANCELLED.name())
|
||||
.then(participantRepository.updateStatusByTeamId(
|
||||
teamId, GroupBuyParticipantStatus.CANCELLED.name()))
|
||||
.then(teamRepository.findById(teamId));
|
||||
})
|
||||
.doOnSuccess(t -> logger.info("拼团团队已取消 - teamId={}", teamId));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<GroupBuyTeam> findTeams(Long activityId, String status) {
|
||||
if (activityId == null) {
|
||||
return Flux.error(new RuntimeException("activityId不能为空"));
|
||||
}
|
||||
return teamRepository.findByActivityIdAndStatus(activityId, status);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyTeam> findTeamById(Long teamId) {
|
||||
return teamRepository.findById(teamId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<GroupBuyParticipant> findParticipantsByTeamId(Long teamId) {
|
||||
return participantRepository.findByTeamId(teamId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Long> processExpiredTeams() {
|
||||
return teamRepository.findExpiredFormingTeams()
|
||||
.flatMap(team -> teamRepository.updateStatus(team.getId(), GroupBuyTeamStatus.FAILED.name())
|
||||
.then(participantRepository.updateStatusByTeamId(
|
||||
team.getId(), GroupBuyParticipantStatus.CANCELLED.name()))
|
||||
.thenReturn(1L))
|
||||
.reduce(0L, Long::sum)
|
||||
.doOnSuccess(count -> {
|
||||
if (count > 0) {
|
||||
logger.info("已处理 {} 个过期拼团团队", count);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private Mono<GroupBuyTeam> createTeamInternal(GroupBuyActivity activity, Long leaderMemberId) {
|
||||
int validHours = activity.getValidHours() != null ? activity.getValidHours() : 24;
|
||||
|
||||
GroupBuyTeam team = new GroupBuyTeam();
|
||||
team.setId(SnowflakeId.nextId());
|
||||
team.setActivityId(activity.getId());
|
||||
team.setLeaderMemberId(leaderMemberId);
|
||||
team.setRequiredMembers(activity.getRequiredMembers());
|
||||
team.setCurrentMembers(1);
|
||||
team.setStatus(GroupBuyTeamStatus.FORMING.name());
|
||||
team.setExpireAt(LocalDateTime.now().plusHours(validHours));
|
||||
|
||||
return teamRepository.save(team)
|
||||
.flatMap(saved -> addParticipant(saved, activity, leaderMemberId, true));
|
||||
}
|
||||
|
||||
private Mono<GroupBuyTeam> addParticipant(GroupBuyTeam team, GroupBuyActivity activity,
|
||||
Long memberId, boolean isLeader) {
|
||||
GroupBuyParticipant participant = new GroupBuyParticipant();
|
||||
participant.setId(SnowflakeId.nextId());
|
||||
participant.setTeamId(team.getId());
|
||||
participant.setActivityId(activity.getId());
|
||||
participant.setMemberId(memberId);
|
||||
participant.setIsLeader(isLeader);
|
||||
participant.setStatus(GroupBuyParticipantStatus.JOINED.name());
|
||||
participant.setJoinAt(LocalDateTime.now());
|
||||
|
||||
Mono<GroupBuyTeam> teamUpdate = isLeader
|
||||
? Mono.just(team)
|
||||
: teamRepository.incrementCurrentMembers(team.getId(), 1)
|
||||
.then(teamRepository.findById(team.getId()));
|
||||
|
||||
return participantRepository.save(participant)
|
||||
.then(teamUpdate);
|
||||
}
|
||||
|
||||
private Mono<GroupBuyTeam> checkAndCompleteTeam(GroupBuyTeam team, GroupBuyActivity activity) {
|
||||
return teamRepository.findById(team.getId())
|
||||
.flatMap(updated -> {
|
||||
if (updated.getCurrentMembers() >= updated.getRequiredMembers()) {
|
||||
return teamRepository.markSuccess(updated.getId(), GroupBuyTeamStatus.SUCCESS.name())
|
||||
.then(activityRepository.incrementSoldCount(activity.getId(), updated.getRequiredMembers()))
|
||||
.then(teamRepository.findById(updated.getId()));
|
||||
}
|
||||
return Mono.just(updated);
|
||||
});
|
||||
}
|
||||
|
||||
private Mono<Void> validateActivityForTeam(GroupBuyActivity activity) {
|
||||
if (!GroupBuyActivityStatus.ACTIVE.name().equals(activity.getStatus())) {
|
||||
return Mono.error(new RuntimeException("拼团活动未开始或已结束"));
|
||||
}
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
if (activity.getStartTime() != null && now.isBefore(activity.getStartTime())) {
|
||||
return Mono.error(new RuntimeException("拼团活动尚未开始"));
|
||||
}
|
||||
if (activity.getEndTime() != null && now.isAfter(activity.getEndTime())) {
|
||||
return Mono.error(new RuntimeException("拼团活动已结束"));
|
||||
}
|
||||
int stock = activity.getStock() != null ? activity.getStock() : -1;
|
||||
int sold = activity.getSoldCount() != null ? activity.getSoldCount() : 0;
|
||||
if (stock >= 0 && sold >= stock) {
|
||||
return Mono.error(new RuntimeException("拼团活动库存不足"));
|
||||
}
|
||||
return Mono.empty();
|
||||
}
|
||||
|
||||
private Mono<Void> checkMemberNotInFormingTeam(Long activityId, Long memberId) {
|
||||
return participantRepository.existsInFormingTeam(activityId, memberId)
|
||||
.flatMap(exists -> exists
|
||||
? Mono.error(new RuntimeException("您已在该活动的拼团中，不能重复参团"))
|
||||
: Mono.empty());
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user