Compare commits
7
Commits
v1.0.13
...
0aee11d824
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0aee11d824 | ||
|
|
e35cf3aa59 | ||
|
|
457e716b38 | ||
|
|
ab4a164680 | ||
|
|
9dfca25f8c | ||
|
|
e369a38e2e | ||
|
|
f1e10df6a7 |
@@ -11,7 +11,7 @@
|
||||
|
||||
<groupId>com.imyeyu.timiserverapi</groupId>
|
||||
<artifactId>TimiServerAPI</artifactId>
|
||||
<version>1.0.13</version>
|
||||
<version>1.0.14</version>
|
||||
<packaging>jar</packaging>
|
||||
<name>TimiServerAPI</name>
|
||||
<description>imyeyu.com API</description>
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.imyeyu.api.config;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.imyeyu.api.modules.common.entity.Multilingual;
|
||||
import com.imyeyu.api.modules.gao.bean.GaoUserInviteCache;
|
||||
import com.imyeyu.spring.bean.RedisConfigParams;
|
||||
import com.imyeyu.spring.config.AbstractRedisConfig;
|
||||
import com.imyeyu.spring.util.Redis;
|
||||
@@ -202,4 +203,10 @@ public class RedisConfig extends AbstractRedisConfig {
|
||||
public Redis<String, String> getClipboardRedisTemplate() {
|
||||
return getRedis(database, RedisSerializers.STRING, RedisSerializers.STRING);
|
||||
}
|
||||
|
||||
/// @return GAO 用户邀请,code: 邀请缓存
|
||||
@Bean("redisGaoUserInvite")
|
||||
public Redis<String, GaoUserInviteCache> getGaoUserInviteRedisTemplate() {
|
||||
return getRedis(database, RedisSerializers.STRING, RedisSerializers.jacksonSerializer(jackson, GaoUserInviteCache.class));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,6 +32,8 @@ public enum SettingModule {
|
||||
|
||||
TEMP_FILE(Setting.Module.TempFile.class),
|
||||
|
||||
USER(Setting.Module.User.class),
|
||||
|
||||
SYSTEM(Setting.Module.System.class),
|
||||
|
||||
SYSTEM_STATUS(Setting.Module.SystemStatus.class);
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.imyeyu.api.modules.common.service;
|
||||
|
||||
import com.imyeyu.api.modules.common.bean.SettingModule;
|
||||
import com.imyeyu.api.modules.common.bean.attachment.SettingSupport;
|
||||
import com.imyeyu.api.modules.common.entity.Setting;
|
||||
import com.imyeyu.java.TimiJava;
|
||||
import com.imyeyu.spring.service.BaseService;
|
||||
import com.imyeyu.utils.Text;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -19,7 +19,7 @@ public interface SettingService extends BaseService<Setting, String> {
|
||||
Setting getByCode(String bizType, String bizId, String code);
|
||||
|
||||
default Setting getSystem(Enum<?> bizType) {
|
||||
return getByCode(Text.bizClassName(bizType.getClass()), TimiJava.ZERO_UUID, bizType.toString());
|
||||
return getByCode(SettingModule.fromClass(bizType.getClass()).name(), TimiJava.ZERO_UUID, bizType.toString());
|
||||
}
|
||||
|
||||
List<Setting> listByBizId(String bizType, String bizId);
|
||||
|
||||
@@ -84,7 +84,7 @@ public enum GaoPermissionCode implements BuiltinPermissionCode {
|
||||
@Getter
|
||||
final boolean grantToStoreManager;
|
||||
|
||||
/// `true` 为初始化时授权给全局管理员角色
|
||||
/// `true` 为初始化时授权给门店管理角色
|
||||
@Getter
|
||||
final boolean grantToGlobalManager;
|
||||
|
||||
|
||||
@@ -12,8 +12,8 @@ import lombok.AllArgsConstructor;
|
||||
@AllArgsConstructor
|
||||
public enum GaoRoleCode implements BuiltinRoleCode {
|
||||
|
||||
/// 全局管理员
|
||||
GLOBAL_MANAGER("全局管理员", null),
|
||||
/// 门店管理
|
||||
GLOBAL_MANAGER("门店管理", null),
|
||||
|
||||
/// 店长
|
||||
STORE_MANAGER("店长", GLOBAL_MANAGER.name());
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
package com.imyeyu.api.modules.gao.bean;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/// GAO 用户邀请缓存
|
||||
///
|
||||
/// @author Codex
|
||||
/// @since 2026-08-13
|
||||
@Data
|
||||
public class GaoUserInviteCache {
|
||||
|
||||
/// 发起邀请的用户 ID
|
||||
private String inviterUserId;
|
||||
|
||||
/// 门店 ID
|
||||
private String storeId;
|
||||
|
||||
/// 角色 ID
|
||||
private String roleId;
|
||||
|
||||
/// 邀请来源或场景
|
||||
private String scene;
|
||||
|
||||
/// 邀请创建时间,毫秒时间戳
|
||||
private Long createdAt;
|
||||
|
||||
/// 邀请过期时间,毫秒时间戳
|
||||
private Long expireAt;
|
||||
}
|
||||
@@ -16,6 +16,7 @@ import com.imyeyu.api.modules.gao.service.GaoEventService;
|
||||
import com.imyeyu.api.modules.gao.service.GaoStoreService;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoCustomerEventRankView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoEventRecordPage;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoEventRecordPageResult;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoEventRecordRankPage;
|
||||
import com.imyeyu.api.modules.user.service.RoleChecker;
|
||||
import com.imyeyu.api.modules.user.service.UserLoginService;
|
||||
@@ -64,8 +65,12 @@ public class GaoEventRecordController {
|
||||
@RequireGaoPermission(GaoPermissionCode.EVENT_RECORD_READ)
|
||||
@PostMapping("/list")
|
||||
@JsonView(ResponseView.Public.class)
|
||||
public PageResult<GaoEventRecord> list(@RequestBody GaoEventRecordPage page) {
|
||||
PageResult<GaoEventRecord> result = service.pageByRange(page);
|
||||
public GaoEventRecordPageResult list(@RequestBody GaoEventRecordPage page) {
|
||||
PageResult<GaoEventRecord> pageResult = service.pageByRange(page);
|
||||
GaoEventRecordPageResult result = new GaoEventRecordPageResult();
|
||||
result.setTotal(pageResult.getTotal());
|
||||
result.setList(pageResult.getList());
|
||||
result.setNumberValueTotal(resolveNumberValueTotal(page));
|
||||
{
|
||||
List<String> customerIdList = result.getList().stream().map(GaoEventRecord::getCustomerId).toList();
|
||||
Map<String, GaoEvent> eventMap = eventService.mapByIdList(result.getList().stream().map(GaoEventRecord::getEventId).toList());
|
||||
@@ -80,6 +85,22 @@ public class GaoEventRecordController {
|
||||
return result;
|
||||
}
|
||||
|
||||
/// 根据列表筛选条件返回单个 NUMBER 事件的数值合计
|
||||
///
|
||||
/// @param page 登记记录范围查询请求
|
||||
/// @return 数值合计,不满足单个 NUMBER 事件条件时为空
|
||||
private Long resolveNumberValueTotal(GaoEventRecordPage page) {
|
||||
List<String> eventIdList = page.getEventIdList();
|
||||
if (eventIdList == null || eventIdList.size() != 1) {
|
||||
return null;
|
||||
}
|
||||
GaoEvent event = eventService.mapByIdList(eventIdList).get(eventIdList.get(0));
|
||||
if (event == null || event.getValueType() != GaoEvent.ValueType.NUMBER) {
|
||||
return null;
|
||||
}
|
||||
return service.sumNumberValueByRange(page);
|
||||
}
|
||||
|
||||
@AOPLog
|
||||
@RequestRateLimit
|
||||
@RequireGaoPermission(GaoPermissionCode.EVENT_RECORD_READ)
|
||||
|
||||
@@ -9,7 +9,14 @@ import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
|
||||
import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoUser;
|
||||
import com.imyeyu.api.modules.gao.service.GaoStoreService;
|
||||
import com.imyeyu.api.modules.gao.service.GaoUserInviteService;
|
||||
import com.imyeyu.api.modules.gao.service.GaoUserService;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoUserInviteCreateRequest;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoUserInviteCreateResponse;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoUserInviteRegisterData;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoUserInviteRegisterRequest;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoUserInviteValidateRequest;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoUserInviteValidateResponse;
|
||||
import com.imyeyu.api.modules.user.entity.Role;
|
||||
import com.imyeyu.api.modules.user.entity.User;
|
||||
import com.imyeyu.api.modules.user.service.RoleChecker;
|
||||
@@ -17,12 +24,15 @@ import com.imyeyu.api.modules.user.service.RoleService;
|
||||
import com.imyeyu.api.modules.user.service.UserLoginService;
|
||||
import com.imyeyu.api.modules.user.service.UserRoleService;
|
||||
import com.imyeyu.api.modules.user.service.UserService;
|
||||
import com.imyeyu.api.modules.user.vo.LoginResponse;
|
||||
import com.imyeyu.java.TimiJava;
|
||||
import com.imyeyu.spring.annotation.AOPLog;
|
||||
import com.imyeyu.spring.annotation.CaptchaValid;
|
||||
import com.imyeyu.spring.annotation.RequestRateLimit;
|
||||
import com.imyeyu.spring.bean.Page;
|
||||
import com.imyeyu.spring.bean.PageResult;
|
||||
import com.imyeyu.spring.util.ResponseView;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
@@ -32,6 +42,7 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
/// GAO 用户接口
|
||||
///
|
||||
@@ -46,11 +57,38 @@ public class GaoUserController {
|
||||
private final RoleService roleService;
|
||||
private final RoleChecker roleChecker;
|
||||
private final GaoUserService service;
|
||||
private final GaoUserInviteService inviteService;
|
||||
private final UserRoleService userRoleService;
|
||||
private final GaoStoreService gaoStoreService;
|
||||
private final UserLoginService userLoginService;
|
||||
private final AttachmentService attachmentService;
|
||||
|
||||
@AOPLog
|
||||
@RequestRateLimit
|
||||
@RequireGaoPermission(GaoPermissionCode.USER_CREATE)
|
||||
@PostMapping("/invite")
|
||||
public GaoUserInviteCreateResponse invite(@RequestBody @Valid GaoUserInviteCreateRequest req) {
|
||||
return inviteService.create(req);
|
||||
}
|
||||
|
||||
@AOPLog
|
||||
@RequestRateLimit(20)
|
||||
@PostMapping("/invite/validate")
|
||||
public GaoUserInviteValidateResponse validateInvite(@RequestBody @Valid GaoUserInviteValidateRequest req) {
|
||||
return inviteService.validate(req.getCode());
|
||||
}
|
||||
|
||||
@AOPLog
|
||||
@JsonView(ResponseView.Public.class)
|
||||
@CaptchaValid
|
||||
@RequestRateLimit(value = 5, inSeconds = 60)
|
||||
@PostMapping("/invite/register")
|
||||
public LoginResponse registerByInvite(@RequestBody @Valid GaoUserInviteRegisterRequest req) {
|
||||
GaoUserInviteRegisterData data = req.getData();
|
||||
String userId = inviteService.register(data);
|
||||
return userLoginService.login(UUID.randomUUID().toString(), userId);
|
||||
}
|
||||
|
||||
@AOPLog
|
||||
@RequestRateLimit
|
||||
@RequireGaoPermission(GaoPermissionCode.USER_READ)
|
||||
@@ -137,6 +175,7 @@ public class GaoUserController {
|
||||
@RequireGaoPermission(GaoPermissionCode.USER_READ)
|
||||
@PostMapping("/role/list")
|
||||
public List<Role> roleList() {
|
||||
// TODO 此接口获取本模块所有角色,需要限制角色
|
||||
return roleService.listByModuleCode(ModuleCode.GAO);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -38,6 +38,26 @@ public class GaoEvent extends UUIDEntity {
|
||||
DELETED
|
||||
}
|
||||
|
||||
/// 事件数值类型
|
||||
public enum ValueType {
|
||||
|
||||
/// 不携带数值
|
||||
NONE,
|
||||
|
||||
/// 携带整数数值
|
||||
NUMBER
|
||||
}
|
||||
|
||||
/// 事件数值单位
|
||||
public enum ValueUnit {
|
||||
|
||||
/// 金额分
|
||||
CENT,
|
||||
|
||||
/// 次数
|
||||
COUNT
|
||||
}
|
||||
|
||||
/// 登记限制类型
|
||||
///
|
||||
/// @author 夜雨
|
||||
@@ -70,6 +90,9 @@ public class GaoEvent extends UUIDEntity {
|
||||
final Long min;
|
||||
}
|
||||
|
||||
/// 统计图表颜色
|
||||
private String color;
|
||||
|
||||
/// 登记事件名称
|
||||
private String name;
|
||||
|
||||
@@ -79,8 +102,14 @@ public class GaoEvent extends UUIDEntity {
|
||||
/// 说明
|
||||
private String description;
|
||||
|
||||
/// 统计图表颜色
|
||||
private String color;
|
||||
/// 数值类型
|
||||
private ValueType valueType;
|
||||
|
||||
/// 数值单位
|
||||
private ValueUnit valueUnit;
|
||||
|
||||
/// true 为登记时必须提交 numberValue
|
||||
private Boolean requireValue;
|
||||
|
||||
/// 状态
|
||||
private Status status;
|
||||
|
||||
@@ -40,6 +40,15 @@ public class GaoEventRecord extends UUIDEntity {
|
||||
/// 操作管理员用户 ID
|
||||
private String operatorUserId;
|
||||
|
||||
/// 本次登记提交的积分值
|
||||
private Long pointValue;
|
||||
|
||||
/// 本次登记通过积分规则获得的积分总和
|
||||
private Long earnedPointValue;
|
||||
|
||||
/// 本次登记提交的整数业务数值
|
||||
private Long numberValue;
|
||||
|
||||
/// 备注
|
||||
private String remark;
|
||||
|
||||
@@ -52,10 +61,6 @@ public class GaoEventRecord extends UUIDEntity {
|
||||
/// 营业日递增序号
|
||||
private Long businessDayNo;
|
||||
|
||||
/// 本次登记提交的积分值,只参与积分触发,不落库
|
||||
@Transient
|
||||
private Long pointValue;
|
||||
|
||||
@Transient
|
||||
private GaoCustomer customer;
|
||||
|
||||
|
||||
@@ -42,7 +42,10 @@ public class GaoPointRule extends UUIDEntity {
|
||||
AFTER_COUNT_EVERY_TIME,
|
||||
|
||||
/// 使用登记接口提交的积分值触发
|
||||
SOURCE_VALUE
|
||||
SOURCE_VALUE,
|
||||
|
||||
/// 按来源事件数值累计分档触发
|
||||
CUSTOMER_EVENT_VALUE_TIER
|
||||
}
|
||||
|
||||
/// 积分值模式
|
||||
@@ -52,7 +55,10 @@ public class GaoPointRule extends UUIDEntity {
|
||||
FIXED,
|
||||
|
||||
/// 使用登记接口提交的积分值
|
||||
SOURCE_VALUE
|
||||
SOURCE_VALUE,
|
||||
|
||||
/// 使用条件配置中的分档积分值
|
||||
TIER
|
||||
}
|
||||
|
||||
/// 门店 ID
|
||||
|
||||
@@ -21,6 +21,28 @@ public interface GaoEventRecordMapper extends BaseMapper<GaoEventRecord, String>
|
||||
|
||||
Long count(String storeId, String customerId, String eventId, Long beginAt, Long endAt);
|
||||
|
||||
/// 查询事件中已携带数值的登记记录数量
|
||||
///
|
||||
/// @param eventId 事件 ID
|
||||
/// @return 携带数值的登记记录数量
|
||||
Long countByEventIdAndNumberValue(String eventId);
|
||||
|
||||
/// 汇总客户指定来源事件在时间范围内的数值
|
||||
///
|
||||
/// @param storeId 门店 ID
|
||||
/// @param customerId 客户 ID
|
||||
/// @param eventId 来源事件 ID
|
||||
/// @param beginAt 起始时间,包含
|
||||
/// @param endAt 结束时间,不包含
|
||||
/// @return 数值总和
|
||||
Long sumNumberValue(@Param("storeId") String storeId, @Param("customerId") String customerId, @Param("eventId") String eventId, @Param("beginAt") Long beginAt, @Param("endAt") Long endAt);
|
||||
|
||||
/// 回写登记记录最终获得的积分快照
|
||||
///
|
||||
/// @param id 登记记录 ID
|
||||
/// @param earnedPointValue 获得积分总和
|
||||
void updateEarnedPointValue(@Param("id") String id, @Param("earnedPointValue") Long earnedPointValue);
|
||||
|
||||
/// 按门店和登记日期统计登记记录数
|
||||
///
|
||||
/// @param storeId 门店 ID
|
||||
@@ -42,6 +64,12 @@ public interface GaoEventRecordMapper extends BaseMapper<GaoEventRecord, String>
|
||||
/// @return 登记事件记录列表
|
||||
List<GaoEventRecord> selectByRange(GaoEventRecordPage page);
|
||||
|
||||
/// 按登记记录列表条件汇总数值
|
||||
///
|
||||
/// @param page 登记记录范围查询请求
|
||||
/// @return 登记数值合计
|
||||
Long sumNumberValueByRange(GaoEventRecordPage page);
|
||||
|
||||
/// 统计客户登记排行榜总数
|
||||
///
|
||||
/// @param page 排行榜分页请求
|
||||
|
||||
@@ -32,6 +32,12 @@ public interface GaoEventRecordService extends BaseService<GaoEventRecord, Strin
|
||||
/// @return 登记事件记录列表
|
||||
PageResult<GaoEventRecord> pageByRange(GaoEventRecordPage req);
|
||||
|
||||
/// 按登记记录列表条件汇总数值
|
||||
///
|
||||
/// @param req 登记记录范围查询请求
|
||||
/// @return 登记数值合计
|
||||
Long sumNumberValueByRange(GaoEventRecordPage req);
|
||||
|
||||
/// 按时间范围查询客户登记排行榜
|
||||
///
|
||||
/// @param page 范围查询请求,不传时间为全部时间
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
package com.imyeyu.api.modules.gao.service;
|
||||
|
||||
import com.imyeyu.api.modules.gao.vo.GaoUserInviteCreateRequest;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoUserInviteCreateResponse;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoUserInviteRegisterData;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoUserInviteValidateResponse;
|
||||
|
||||
/// GAO 用户邀请注册服务
|
||||
///
|
||||
/// @author Codex
|
||||
/// @since 2026-08-13
|
||||
public interface GaoUserInviteService {
|
||||
|
||||
/// 创建 GAO 用户邀请
|
||||
///
|
||||
/// @param req 邀请创建请求
|
||||
/// @return 邀请 code 和过期时间
|
||||
GaoUserInviteCreateResponse create(GaoUserInviteCreateRequest req);
|
||||
|
||||
/// 校验 GAO 用户邀请是否可用
|
||||
///
|
||||
/// @param code 邀请 code
|
||||
/// @return 校验结果
|
||||
GaoUserInviteValidateResponse validate(String code);
|
||||
|
||||
/// 使用邀请注册 GAO 用户
|
||||
///
|
||||
/// @param data 注册数据
|
||||
/// @return 注册成功的用户 ID
|
||||
String register(GaoUserInviteRegisterData data);
|
||||
}
|
||||
+55
-16
@@ -87,7 +87,9 @@ public class GaoEventRecordServiceImplement extends AbstractEntityService<GaoEve
|
||||
String loginUserId = userLoginService.getRequireLoginUserId();
|
||||
Long registeredAt = TimiJava.defaultIfNull(record.getRegisteredAt(), Time.now());
|
||||
GaoEvent event = eventService.get(record.getEventId());
|
||||
TimiException.required(event, "not found event");
|
||||
TimiException.required(event.getStoreId(), "not found event.storeId");
|
||||
verifyRecordValue(event, record.getNumberValue());
|
||||
// 检查权限
|
||||
checkEventPermission(event);
|
||||
int registeredDateValue = dateValue(registeredAt);
|
||||
@@ -119,6 +121,8 @@ public class GaoEventRecordServiceImplement extends AbstractEntityService<GaoEve
|
||||
dbRecord.setRegisteredDateValue(registeredDateValue);
|
||||
dbRecord.setBusinessDayNo(businessDayNo);
|
||||
dbRecord.setPointValue(record.getPointValue());
|
||||
dbRecord.setNumberValue(record.getNumberValue());
|
||||
dbRecord.setEarnedPointValue(0L);
|
||||
super.create(dbRecord);
|
||||
// 附件
|
||||
if (i == 0) {
|
||||
@@ -170,24 +174,17 @@ public class GaoEventRecordServiceImplement extends AbstractEntityService<GaoEve
|
||||
Logger logger = new Logger(Logger.Module.GAO, "GAO_EVENT_RECORD_UPDATE");
|
||||
try {
|
||||
logger.setContent(jackson.writeValueAsString(record));
|
||||
TimiException.required(record.getCustomerId(), "not found record.customerId");
|
||||
TimiException.required(record.getEventId(), "not found record.eventId");
|
||||
GaoEventRecord dbRecord = get(record.getId());
|
||||
TimiException.required(dbRecord, "not found event record");
|
||||
TimiException.required(record.getStoreId() == null || record.getStoreId().equals(dbRecord.getStoreId()), "record.storeId invalid");
|
||||
verifyImmutableRecordFields(record, dbRecord);
|
||||
|
||||
record.setRegisteredAt(TimiJava.defaultIfNull(record.getRegisteredAt(), Time.now()));
|
||||
|
||||
GaoEvent event = eventService.get(record.getEventId());
|
||||
GaoEvent event = eventService.get(dbRecord.getEventId());
|
||||
TimiException.required(event, "not found event");
|
||||
TimiException.required(event.getStoreId(), "not found event.storeId");
|
||||
checkEventPermission(event);
|
||||
checkEventCreatable(record.getCustomerId(), event, record.getRegisteredAt());
|
||||
GaoCustomer customer = customerService.get(record.getCustomerId());
|
||||
TimiException.required(customer, "not found customer");
|
||||
TimiException.requiredTrue(event.getStoreId().equals(customer.getStoreId()), "客户和登记事件不属于同一门店");
|
||||
int registeredDateValue = dateValue(record.getRegisteredAt());
|
||||
record.setStoreId(event.getStoreId());
|
||||
record.setRegisteredDateValue(registeredDateValue);
|
||||
record.setBusinessDayNo(businessDayService.resolveOpenBusinessDay(event.getStoreId(), registeredDateValue).getBusinessDayNo());
|
||||
|
||||
super.update(record);
|
||||
dbRecord.setRemark(record.getRemark());
|
||||
super.update(dbRecord);
|
||||
attachmentService.updateByBizId(Attachment.BizType.GAO_EVENT_RECORD, record.getId(), record.getAttachmentList());
|
||||
logger.setLevel(Logger.Level.INFO);
|
||||
logger.setResult(record.getId());
|
||||
@@ -269,6 +266,12 @@ public class GaoEventRecordServiceImplement extends AbstractEntityService<GaoEve
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Long sumNumberValueByRange(GaoEventRecordPage page) {
|
||||
TimiException.required(page.getStoreId(), "not found page.storeId");
|
||||
return mapper.sumNumberValueByRange(page);
|
||||
}
|
||||
|
||||
@Override
|
||||
public byte[] export(GaoEventRecordPage page) throws IOException {
|
||||
TimiException.required(page.getStoreId(), "not found page.storeId");
|
||||
@@ -279,13 +282,29 @@ public class GaoEventRecordServiceImplement extends AbstractEntityService<GaoEve
|
||||
@Override
|
||||
public PageResult<GaoCustomerEventRankView> pageRankByRange(GaoEventRecordRankPage page) {
|
||||
TimiException.required(page.getStoreId(), "not found page.storeId");
|
||||
page.setTodayDateValue(dateValue(Time.now()));
|
||||
validateRankPage(page);
|
||||
if (page.getRankType() == GaoEventRecordRankPage.RankType.CONTINUOUS_DAYS) {
|
||||
page.setTodayDateValue(dateValue(Time.now()));
|
||||
}
|
||||
PageResult<GaoCustomerEventRankView> result = new PageResult<>();
|
||||
result.setTotal(mapper.countRankByRange(page));
|
||||
result.setList(mapper.selectRankByRange(page));
|
||||
return result;
|
||||
}
|
||||
|
||||
/// 校验登记数值排行的事件范围
|
||||
///
|
||||
/// @param page 排行榜查询请求
|
||||
private void validateRankPage(GaoEventRecordRankPage page) {
|
||||
if (page.getRankType() != GaoEventRecordRankPage.RankType.TOTAL_NUMBER_VALUE) {
|
||||
return;
|
||||
}
|
||||
List<String> eventIdList = page.getEventIdList();
|
||||
TimiException.requiredTrue(eventIdList != null && eventIdList.size() == 1, "按登记数值排行必须选择单个事件");
|
||||
GaoEvent event = eventService.mapByIdList(eventIdList).get(eventIdList.get(0));
|
||||
TimiException.requiredTrue(event != null && event.getValueType() == GaoEvent.ValueType.NUMBER, "按登记数值排行只能选择 NUMBER 事件");
|
||||
}
|
||||
|
||||
private void checkEventPermission(GaoEvent event) {
|
||||
List<String> roleCodeList = eventService.listRoleCode(event.getId());
|
||||
TimiException.requiredTrue(roleCodeList != null && !roleCodeList.isEmpty(), "登记事件未配置可登记角色");
|
||||
@@ -343,6 +362,26 @@ public class GaoEventRecordServiceImplement extends AbstractEntityService<GaoEve
|
||||
}
|
||||
}
|
||||
|
||||
private void verifyRecordValue(GaoEvent event, Long numberValue) {
|
||||
GaoEvent.ValueType valueType = TimiJava.defaultIfNull(event.getValueType(), GaoEvent.ValueType.NONE);
|
||||
if (numberValue != null) {
|
||||
TimiException.requiredTrue(0 <= numberValue, "numberValue 不能为负数");
|
||||
}
|
||||
if (valueType == GaoEvent.ValueType.NONE) {
|
||||
TimiException.requiredNull(numberValue, "NONE 事件不能提交 numberValue");
|
||||
} else if (Boolean.TRUE.equals(event.getRequireValue())) {
|
||||
TimiException.required(numberValue, "该事件必须提交 numberValue");
|
||||
}
|
||||
}
|
||||
|
||||
private void verifyImmutableRecordFields(GaoEventRecord request, GaoEventRecord dbRecord) {
|
||||
TimiException.requiredTrue(request.getCustomerId() == null || request.getCustomerId().equals(dbRecord.getCustomerId()), "登记记录 customerId 创建后不可修改");
|
||||
TimiException.requiredTrue(request.getEventId() == null || request.getEventId().equals(dbRecord.getEventId()), "登记记录 eventId 创建后不可修改");
|
||||
TimiException.requiredTrue(request.getRegisteredAt() == null || request.getRegisteredAt().equals(dbRecord.getRegisteredAt()), "登记记录 registeredAt 创建后不可修改");
|
||||
TimiException.requiredTrue(request.getPointValue() == null || request.getPointValue().equals(dbRecord.getPointValue()), "登记记录 pointValue 创建后不可修改");
|
||||
TimiException.requiredTrue(request.getNumberValue() == null || request.getNumberValue().equals(dbRecord.getNumberValue()), "登记记录 numberValue 创建后不可修改");
|
||||
}
|
||||
|
||||
private int dateValue(long time) {
|
||||
LocalDate date = Instant.ofEpochMilli(time).atZone(ZoneId.systemDefault()).toLocalDate();
|
||||
return Integer.parseInt(DAY_FORMATTER.format(date));
|
||||
|
||||
+41
@@ -5,6 +5,7 @@ import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoEvent;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoEventRoleRelation;
|
||||
import com.imyeyu.api.modules.gao.mapper.GaoEventMapper;
|
||||
import com.imyeyu.api.modules.gao.mapper.GaoEventRecordMapper;
|
||||
import com.imyeyu.api.modules.gao.mapper.GaoEventRoleRelationMapper;
|
||||
import com.imyeyu.api.modules.gao.service.GaoEventService;
|
||||
import com.imyeyu.api.modules.system.entity.Logger;
|
||||
@@ -45,6 +46,7 @@ public class GaoEventServiceImplement extends AbstractEntityService<GaoEvent, St
|
||||
private final LoggerService loggerService;
|
||||
|
||||
private final GaoEventMapper mapper;
|
||||
private final GaoEventRecordMapper eventRecordMapper;
|
||||
private final GaoEventRoleRelationMapper roleRelationMapper;
|
||||
|
||||
@Override
|
||||
@@ -64,6 +66,8 @@ public class GaoEventServiceImplement extends AbstractEntityService<GaoEvent, St
|
||||
logger.setContent(jackson.writeValueAsString(event));
|
||||
|
||||
event.setStatus(TimiJava.defaultIfNull(event.getStatus(), GaoEvent.Status.DRAFT));
|
||||
event.setValueType(TimiJava.defaultIfNull(event.getValueType(), GaoEvent.ValueType.NONE));
|
||||
event.setRequireValue(TimiJava.defaultIfNull(event.getRequireValue(), false));
|
||||
event.setRequirePhoto(TimiJava.defaultIfNull(event.getRequirePhoto(), false));
|
||||
event.setLimitType(TimiJava.defaultIfNull(event.getLimitType(), GaoEvent.LimitType.NONE));
|
||||
event.setSort(TimiJava.defaultIfNull(event.getSort(), 0));
|
||||
@@ -94,17 +98,36 @@ public class GaoEventServiceImplement extends AbstractEntityService<GaoEvent, St
|
||||
try {
|
||||
logger.setContent(jackson.writeValueAsString(event));
|
||||
GaoEvent dbEvent = get(event.getId());
|
||||
TimiException.required(dbEvent, "not found event");
|
||||
TimiException.requiredTrue(dbEvent.getStoreId().equals(event.getStoreId()), "event.storeId invalid");
|
||||
GaoEvent.ValueType oldValueType = dbEvent.getValueType();
|
||||
GaoEvent.ValueUnit oldValueUnit = dbEvent.getValueUnit();
|
||||
dbEvent.setName(event.getName());
|
||||
dbEvent.setDescription(event.getDescription());
|
||||
dbEvent.setColor(event.getColor());
|
||||
dbEvent.setStatus(event.getStatus());
|
||||
dbEvent.setValueType(TimiJava.defaultIfNull(event.getValueType(), oldValueType));
|
||||
if (event.getValueUnit() != null) {
|
||||
dbEvent.setValueUnit(event.getValueUnit());
|
||||
} else if (event.getValueType() != null && event.getValueType() != oldValueType) {
|
||||
dbEvent.setValueUnit(null);
|
||||
} else {
|
||||
dbEvent.setValueUnit(oldValueUnit);
|
||||
}
|
||||
if (event.getRequireValue() != null) {
|
||||
dbEvent.setRequireValue(event.getRequireValue());
|
||||
} else if (event.getValueType() != null && event.getValueType() != oldValueType) {
|
||||
dbEvent.setRequireValue(false);
|
||||
} else {
|
||||
dbEvent.setRequireValue(dbEvent.getRequireValue());
|
||||
}
|
||||
dbEvent.setRequirePhoto(event.getRequirePhoto());
|
||||
dbEvent.setLimitType(event.getLimitType());
|
||||
dbEvent.setLimitValue(event.getLimitValue());
|
||||
dbEvent.setBeginAt(event.getBeginAt());
|
||||
dbEvent.setEndAt(event.getEndAt());
|
||||
|
||||
verifyValueDefinitionChange(dbEvent, oldValueType, oldValueUnit);
|
||||
verifyEvent(dbEvent);
|
||||
mapper.update(dbEvent);
|
||||
saveRoleRelation(event.getId(), event.getRoleCodeList());
|
||||
@@ -190,6 +213,13 @@ public class GaoEventServiceImplement extends AbstractEntityService<GaoEvent, St
|
||||
}
|
||||
|
||||
private void verifyEvent(GaoEvent event) {
|
||||
GaoEvent.ValueType valueType = TimiJava.defaultIfNull(event.getValueType(), GaoEvent.ValueType.NONE);
|
||||
if (valueType == GaoEvent.ValueType.NONE) {
|
||||
TimiException.requiredNull(event.getValueUnit(), "NONE 事件不能配置数值单位");
|
||||
TimiException.requiredTrue(!Boolean.TRUE.equals(event.getRequireValue()), "NONE 事件不能要求提交数值");
|
||||
} else {
|
||||
TimiException.required(event.getValueUnit(), "NUMBER 事件必须配置数值单位");
|
||||
}
|
||||
if (TimiJava.isNotEmpty(event.getLimitType()) && event.getLimitType() != GaoEvent.LimitType.NONE) {
|
||||
TimiException.requiredTrue(event.getLimitType().getMin() < event.getLimitValue(), "约束值最低 %s".formatted(event.getLimitType().getMin()));
|
||||
}
|
||||
@@ -198,6 +228,17 @@ public class GaoEventServiceImplement extends AbstractEntityService<GaoEvent, St
|
||||
}
|
||||
}
|
||||
|
||||
private void verifyValueDefinitionChange(GaoEvent event, GaoEvent.ValueType oldValueType, GaoEvent.ValueUnit oldValueUnit) {
|
||||
if (oldValueType == event.getValueType() && oldValueUnit == event.getValueUnit()) {
|
||||
return;
|
||||
}
|
||||
Long count = eventRecordMapper.countByEventIdAndNumberValue(event.getId());
|
||||
if (0 < TimiJava.defaultIfNull(count, 0L)) {
|
||||
TimiException.requiredTrue(oldValueUnit == event.getValueUnit(), "事件已有数值登记记录,禁止修改 valueUnit");
|
||||
TimiException.requiredTrue(event.getValueType() == GaoEvent.ValueType.NUMBER, "事件已有数值登记记录,不能改为 NONE");
|
||||
}
|
||||
}
|
||||
|
||||
private void saveRoleRelation(String eventId, List<String> roleCodeList) {
|
||||
List<GaoEventRoleRelation> dbRoleRelationList = roleRelationMapper.selectAllByEventIdList(List.of(eventId));
|
||||
Set<String> roleCodeSet = TimiJava.defaultIfEmpty(roleCodeList, List.<String>of()).stream().filter(TimiJava::isNotEmpty).collect(Collectors.toSet());
|
||||
|
||||
+66
@@ -25,6 +25,8 @@ import java.util.List;
|
||||
@RequiredArgsConstructor
|
||||
public class GaoPointRuleServiceImplement extends AbstractEntityService<GaoPointRule, String> implements GaoPointRuleService {
|
||||
|
||||
private static final int MAX_TIER_COUNT = 100;
|
||||
|
||||
private final GaoPointRuleMapper mapper;
|
||||
private final GaoEventService eventService;
|
||||
|
||||
@@ -116,6 +118,13 @@ public class GaoPointRuleServiceImplement extends AbstractEntityService<GaoPoint
|
||||
return;
|
||||
}
|
||||
|
||||
if (rule.getTriggerType() == GaoPointRule.TriggerType.CUSTOMER_EVENT_VALUE_TIER) {
|
||||
TimiException.requiredTrue(rule.getPointMode() == GaoPointRule.PointMode.TIER, "CUSTOMER_EVENT_VALUE_TIER 规则必须使用 TIER 积分值模式");
|
||||
TimiException.requiredNull(rule.getPointValue(), "TIER 规则不能填写规则级积分值");
|
||||
verifyTierCondition(rule.getStoreId(), rule.getConditionJson());
|
||||
return;
|
||||
}
|
||||
|
||||
TimiException.requiredTrue(rule.getPointMode() == GaoPointRule.PointMode.FIXED, "固定触发规则必须使用 FIXED 积分值模式");
|
||||
TimiException.required(rule.getPointValue(), "not found rule.pointValue");
|
||||
TimiException.requiredTrue(0 < rule.getPointValue(), "rule.pointValue invalid");
|
||||
@@ -131,6 +140,63 @@ public class GaoPointRuleServiceImplement extends AbstractEntityService<GaoPoint
|
||||
}
|
||||
}
|
||||
|
||||
private void verifyTierCondition(String storeId, JsonNode conditionJson) {
|
||||
JsonNode condition = requireObjectCondition(conditionJson);
|
||||
JsonNode sourceEventIdNode = condition.get("sourceEventId");
|
||||
TimiException.requiredTrue(sourceEventIdNode != null && sourceEventIdNode.isTextual() && TimiJava.isNotEmpty(sourceEventIdNode.asText().trim()), "TIER.sourceEventId invalid");
|
||||
String sourceEventId = sourceEventIdNode.asText().trim();
|
||||
GaoEvent sourceEvent = eventService.get(sourceEventId);
|
||||
TimiException.required(sourceEvent, "TIER.sourceEventId 对应事件不存在");
|
||||
TimiException.requiredTrue(storeId.equals(sourceEvent.getStoreId()), "TIER 来源事件和规则不属于同一门店");
|
||||
TimiException.requiredTrue(sourceEvent.getValueType() == GaoEvent.ValueType.NUMBER, "TIER 来源事件必须配置为 NUMBER 类型");
|
||||
|
||||
JsonNode sourceValueField = condition.get("sourceValueField");
|
||||
TimiException.requiredTrue(sourceValueField != null && sourceValueField.isTextual() && "numberValue".equals(sourceValueField.asText()), "TIER.sourceValueField 目前只能是 numberValue");
|
||||
|
||||
JsonNode window = condition.get("window");
|
||||
TimiException.requiredTrue(window != null && window.isObject(), "TIER.window 必须是对象");
|
||||
JsonNode windowType = window.get("type");
|
||||
TimiException.requiredTrue(windowType != null && windowType.isTextual() && "ROLLING".equals(windowType.asText()), "TIER.window.type 目前只能是 ROLLING");
|
||||
JsonNode windowAmount = window.get("amount");
|
||||
TimiException.requiredTrue(windowAmount != null && windowAmount.isIntegralNumber() && 0 < windowAmount.longValue(), "TIER.window.amount invalid");
|
||||
JsonNode windowUnit = window.get("unit");
|
||||
TimiException.requiredTrue(windowUnit != null && windowUnit.isTextual() && "YEAR".equals(windowUnit.asText()), "TIER.window.unit 目前只能是 YEAR");
|
||||
|
||||
JsonNode tiers = condition.get("tiers");
|
||||
TimiException.requiredTrue(tiers != null && tiers.isArray() && !tiers.isEmpty(), "TIER.tiers 不能为空");
|
||||
TimiException.requiredTrue(tiers.size() <= MAX_TIER_COUNT, "TIER.tiers 数量不能超过 %d".formatted(MAX_TIER_COUNT));
|
||||
Long previousMax = null;
|
||||
for (int i = 0; i < tiers.size(); i++) {
|
||||
JsonNode tier = tiers.get(i);
|
||||
TimiException.requiredTrue(tier != null && tier.isObject(), "TIER.tiers[%d] 必须是对象".formatted(i));
|
||||
JsonNode minNode = tier.get("min");
|
||||
TimiException.requiredTrue(minNode != null && minNode.isIntegralNumber() && 0 <= minNode.longValue(), "TIER.tiers[%d].min invalid".formatted(i));
|
||||
long min = minNode.longValue();
|
||||
if (i == 0) {
|
||||
TimiException.requiredTrue(min == 0, "TIER 第一档 min 必须为 0");
|
||||
} else {
|
||||
TimiException.requiredTrue(previousMax != null && previousMax < Long.MAX_VALUE && min == previousMax + 1, "TIER 分档必须连续且不能重叠");
|
||||
}
|
||||
|
||||
JsonNode maxNode = tier.get("max");
|
||||
Long max = null;
|
||||
if (maxNode != null && !maxNode.isNull()) {
|
||||
TimiException.requiredTrue(maxNode.isIntegralNumber(), "TIER.tiers[%d].max invalid".formatted(i));
|
||||
max = maxNode.longValue();
|
||||
TimiException.requiredTrue(min <= max, "TIER.tiers[%d].min 或 max invalid".formatted(i));
|
||||
}
|
||||
if (i < tiers.size() - 1) {
|
||||
TimiException.requiredTrue(max != null, "除最后一档外 TIER.max 不能为空");
|
||||
TimiException.requiredTrue(max < Long.MAX_VALUE, "TIER 分档上限过大,无法继续配置下一档");
|
||||
} else {
|
||||
TimiException.requiredTrue(max == null, "最后一档 TIER.max 必须为空");
|
||||
}
|
||||
JsonNode pointValue = tier.get("pointValue");
|
||||
TimiException.requiredTrue(pointValue != null && pointValue.isIntegralNumber() && 0 <= pointValue.longValue(), "TIER.tiers[%d].pointValue invalid".formatted(i));
|
||||
previousMax = max;
|
||||
}
|
||||
}
|
||||
|
||||
private void verifySourceCondition(JsonNode conditionJson) {
|
||||
JsonNode condition = conditionJson == null ? null : requireObjectCondition(conditionJson);
|
||||
Long min = condition == null || condition.get("min") == null || condition.get("min").isNull() ? null : condition.get("min").isIntegralNumber() ? condition.get("min").longValue() : null;
|
||||
|
||||
+69
-22
@@ -6,16 +6,16 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
|
||||
import com.imyeyu.api.bean.ModuleCode;
|
||||
import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
|
||||
import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoPointLedger;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoPointRule;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoCustomer;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoEventRecord;
|
||||
import com.imyeyu.api.modules.gao.mapper.GaoPointLedgerMapper;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoPointLedger;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoPointRule;
|
||||
import com.imyeyu.api.modules.gao.mapper.GaoEventRecordMapper;
|
||||
import com.imyeyu.api.modules.gao.mapper.GaoPointLedgerMapper;
|
||||
import com.imyeyu.api.modules.gao.service.GaoCustomerService;
|
||||
import com.imyeyu.api.modules.gao.service.GaoPointLedgerService;
|
||||
import com.imyeyu.api.modules.gao.service.GaoPointRuleService;
|
||||
import com.imyeyu.api.modules.gao.service.GaoPointTriggerService;
|
||||
import com.imyeyu.api.modules.gao.service.GaoCustomerService;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoPointAdjustRequest;
|
||||
import com.imyeyu.api.modules.user.service.PermissionChecker;
|
||||
import com.imyeyu.api.modules.user.service.UserLoginService;
|
||||
@@ -26,6 +26,9 @@ import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.time.LocalDate;
|
||||
import java.time.ZoneId;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
@@ -51,26 +54,34 @@ public class GaoPointTriggerServiceImplement implements GaoPointTriggerService {
|
||||
@Override
|
||||
public void onEventRecordCreated(GaoEventRecord record) {
|
||||
TimiException.required(record, "not found event record");
|
||||
TimiException.required(record.getId(), "not found event record.id");
|
||||
TimiException.required(record.getStoreId(), "not found record.storeId");
|
||||
TimiException.required(record.getCustomerId(), "not found record.customerId");
|
||||
TimiException.required(record.getEventId(), "not found record.eventId");
|
||||
TimiException.required(record.getRegisteredAt(), "not found record.registeredAt");
|
||||
|
||||
List<GaoPointRule> ruleList = ruleService.listActive(record.getStoreId(), record.getEventId(), Time.now());
|
||||
Long count = null;
|
||||
long earnedPointValue = 0L;
|
||||
for (GaoPointRule rule : ruleList) {
|
||||
Long pointDelta = resolvePointDelta(record, rule, count);
|
||||
if (pointDelta == null) {
|
||||
RuleResolution resolution = resolveRule(record, rule, count);
|
||||
if (resolution == null) {
|
||||
continue;
|
||||
}
|
||||
if (count == null) {
|
||||
count = eventRecordMapper.count(record.getStoreId(), record.getCustomerId(), record.getEventId(), null, null);
|
||||
if (rule.getTriggerType() == GaoPointRule.TriggerType.FIRST_TIME || rule.getTriggerType() == GaoPointRule.TriggerType.AFTER_COUNT_EVERY_TIME) {
|
||||
count = count == null ? count(record) : count;
|
||||
}
|
||||
long pointDelta = resolution.pointDelta();
|
||||
if (0 < pointDelta) {
|
||||
ledgerService.earn(record, rule, pointDelta, resolution.sourcePayload());
|
||||
earnedPointValue = Math.addExact(earnedPointValue, pointDelta);
|
||||
}
|
||||
JsonNode sourcePayload = sourcePayload(record, rule, pointDelta);
|
||||
ledgerService.earn(record, rule, pointDelta, sourcePayload);
|
||||
if (Boolean.TRUE.equals(rule.getExclusive())) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
record.setEarnedPointValue(earnedPointValue);
|
||||
eventRecordMapper.updateEarnedPointValue(record.getId(), earnedPointValue);
|
||||
}
|
||||
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
@@ -104,25 +115,26 @@ public class GaoPointTriggerServiceImplement implements GaoPointTriggerService {
|
||||
return ledgerService.adjust(request, userLoginService.getRequireLoginUserId());
|
||||
}
|
||||
|
||||
private Long resolvePointDelta(GaoEventRecord record, GaoPointRule rule, Long count) {
|
||||
private RuleResolution resolveRule(GaoEventRecord record, GaoPointRule rule, Long count) {
|
||||
return switch (rule.getTriggerType()) {
|
||||
case EVERY_TIME -> rule.getPointValue();
|
||||
case EVERY_TIME -> new RuleResolution(rule.getPointValue(), null);
|
||||
case FIRST_TIME -> {
|
||||
long currentCount = count == null ? count(record) : count;
|
||||
yield currentCount == 1 ? rule.getPointValue() : null;
|
||||
yield currentCount == 1 ? new RuleResolution(rule.getPointValue(), null) : null;
|
||||
}
|
||||
case AFTER_COUNT_EVERY_TIME -> {
|
||||
JsonNode condition = rule.getConditionJson();
|
||||
long threshold = condition.get("threshold").longValue();
|
||||
boolean includeCurrent = condition.get("includeCurrent") == null || condition.get("includeCurrent").isNull() || condition.get("includeCurrent").asBoolean();
|
||||
long currentCount = count == null ? count(record) : count;
|
||||
yield includeCurrent ? threshold <= currentCount ? rule.getPointValue() : null : threshold < currentCount ? rule.getPointValue() : null;
|
||||
yield includeCurrent ? threshold <= currentCount ? new RuleResolution(rule.getPointValue(), null) : null : threshold < currentCount ? new RuleResolution(rule.getPointValue(), null) : null;
|
||||
}
|
||||
case SOURCE_VALUE -> resolveSourceValue(record, rule);
|
||||
case CUSTOMER_EVENT_VALUE_TIER -> resolveTier(record, rule);
|
||||
};
|
||||
}
|
||||
|
||||
private Long resolveSourceValue(GaoEventRecord record, GaoPointRule rule) {
|
||||
private RuleResolution resolveSourceValue(GaoEventRecord record, GaoPointRule rule) {
|
||||
if (record.getPointValue() == null) {
|
||||
return null;
|
||||
}
|
||||
@@ -136,17 +148,49 @@ public class GaoPointTriggerServiceImplement implements GaoPointTriggerService {
|
||||
TimiException.requiredTrue(min == null || min.isNull() || min.longValue() <= pointValue, "pointValue 小于规则最小值");
|
||||
TimiException.requiredTrue(max == null || max.isNull() || pointValue <= max.longValue(), "pointValue 大于规则最大值");
|
||||
}
|
||||
return pointValue;
|
||||
ObjectNode payload = jackson.createObjectNode();
|
||||
payload.put("submittedPointValue", pointValue);
|
||||
payload.put("validatedPointValue", pointValue);
|
||||
return new RuleResolution(pointValue, payload);
|
||||
}
|
||||
|
||||
private JsonNode sourcePayload(GaoEventRecord record, GaoPointRule rule, long pointDelta) {
|
||||
if (rule.getTriggerType() != GaoPointRule.TriggerType.SOURCE_VALUE) {
|
||||
return null;
|
||||
private RuleResolution resolveTier(GaoEventRecord record, GaoPointRule rule) {
|
||||
JsonNode condition = rule.getConditionJson();
|
||||
String sourceEventId = condition.get("sourceEventId").asText();
|
||||
long amount = condition.get("window").get("amount").longValue();
|
||||
ZoneId zone = ZoneId.systemDefault();
|
||||
LocalDate currentDate = Instant.ofEpochMilli(record.getRegisteredAt()).atZone(zone).toLocalDate();
|
||||
long windowBeginAt = currentDate.minusYears(amount).atStartOfDay(zone).toInstant().toEpochMilli();
|
||||
long windowEndAt = Math.addExact(record.getRegisteredAt(), 1L);
|
||||
long sumValue = TimiJava.defaultIfNull(eventRecordMapper.sumNumberValue(record.getStoreId(), record.getCustomerId(), sourceEventId, windowBeginAt, windowEndAt), 0L);
|
||||
|
||||
JsonNode matchedTier = null;
|
||||
for (JsonNode tier : condition.get("tiers")) {
|
||||
long min = tier.get("min").longValue();
|
||||
JsonNode maxNode = tier.get("max");
|
||||
if (min <= sumValue && (maxNode == null || maxNode.isNull() || sumValue <= maxNode.longValue())) {
|
||||
matchedTier = tier;
|
||||
break;
|
||||
}
|
||||
}
|
||||
TimiException.required(matchedTier, "TIER 没有匹配的分档");
|
||||
long pointDelta = matchedTier.get("pointValue").longValue();
|
||||
ObjectNode payload = jackson.createObjectNode();
|
||||
payload.put("submittedPointValue", record.getPointValue());
|
||||
payload.put("validatedPointValue", pointDelta);
|
||||
return payload;
|
||||
payload.put("triggerType", GaoPointRule.TriggerType.CUSTOMER_EVENT_VALUE_TIER.name());
|
||||
payload.put("sourceEventId", sourceEventId);
|
||||
payload.put("sourceValueField", "numberValue");
|
||||
payload.put("windowBeginAt", windowBeginAt);
|
||||
payload.put("windowEndAt", windowEndAt);
|
||||
payload.put("sumValue", sumValue);
|
||||
ObjectNode tierPayload = payload.putObject("tier");
|
||||
tierPayload.put("min", matchedTier.get("min").longValue());
|
||||
JsonNode maxNode = matchedTier.get("max");
|
||||
if (maxNode != null && !maxNode.isNull()) {
|
||||
tierPayload.put("max", maxNode.longValue());
|
||||
}
|
||||
tierPayload.put("pointValue", pointDelta);
|
||||
payload.put("pointDelta", pointDelta);
|
||||
return new RuleResolution(pointDelta, payload);
|
||||
}
|
||||
|
||||
private long count(GaoEventRecord record) {
|
||||
@@ -156,4 +200,7 @@ public class GaoPointTriggerServiceImplement implements GaoPointTriggerService {
|
||||
private String revokeKey(GaoEventRecord record, GaoPointLedger originLedger) {
|
||||
return "GAO_EVENT_RECORD:%s:LEDGER:%s:REVOKE".formatted(record.getId(), originLedger.getId());
|
||||
}
|
||||
|
||||
private record RuleResolution(Long pointDelta, JsonNode sourcePayload) {
|
||||
}
|
||||
}
|
||||
|
||||
+325
@@ -0,0 +1,325 @@
|
||||
package com.imyeyu.api.modules.gao.service.implement;
|
||||
|
||||
import com.imyeyu.api.bean.ModuleCode;
|
||||
import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
|
||||
import com.imyeyu.api.modules.gao.bean.GaoUserInviteCache;
|
||||
import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
|
||||
import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoStore;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoUser;
|
||||
import com.imyeyu.api.modules.gao.service.GaoStoreService;
|
||||
import com.imyeyu.api.modules.gao.service.GaoUserInviteService;
|
||||
import com.imyeyu.api.modules.gao.service.GaoUserService;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoUserInviteCreateRequest;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoUserInviteCreateResponse;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoUserInviteRegisterData;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoUserInviteValidateResponse;
|
||||
import com.imyeyu.api.modules.system.entity.Logger;
|
||||
import com.imyeyu.api.modules.system.service.LoggerService;
|
||||
import com.imyeyu.api.modules.user.entity.Role;
|
||||
import com.imyeyu.api.modules.user.entity.User;
|
||||
import com.imyeyu.api.modules.user.entity.UserRole;
|
||||
import com.imyeyu.api.modules.user.service.AuthorizationScopeService;
|
||||
import com.imyeyu.api.modules.user.service.PermissionChecker;
|
||||
import com.imyeyu.api.modules.user.service.RoleChecker;
|
||||
import com.imyeyu.api.modules.user.service.RoleService;
|
||||
import com.imyeyu.api.modules.user.service.UserLoginService;
|
||||
import com.imyeyu.api.modules.user.service.UserRoleService;
|
||||
import com.imyeyu.api.modules.user.service.UserService;
|
||||
import com.imyeyu.api.modules.user.bean.AuthOwnerType;
|
||||
import com.imyeyu.java.TimiJava;
|
||||
import com.imyeyu.java.bean.timi.TimiCode;
|
||||
import com.imyeyu.java.bean.timi.TimiException;
|
||||
import com.imyeyu.spring.util.Redis;
|
||||
import com.imyeyu.utils.Digest;
|
||||
import com.imyeyu.utils.Time;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Qualifier;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.security.SecureRandom;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
/// GAO 用户邀请注册服务实现
|
||||
///
|
||||
/// @author Codex
|
||||
/// @since 2026-08-13
|
||||
@Slf4j
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class GaoUserInviteServiceImplement implements GaoUserInviteService {
|
||||
|
||||
private static final String INVITE_KEY_PREFIX = "GAO:USER:INVITE:";
|
||||
private static final String CONSUME_LOCK_KEY_PREFIX = "GAO:USER:INVITE:CONSUME:";
|
||||
private static final String CREATE_CODE_LOCK_KEY = "GAO:USER:INVITE:CREATE:LOCK";
|
||||
private static final String CODE_CHARACTERS = "23456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
|
||||
private static final int CODE_LENGTH = 10;
|
||||
private static final long INVITE_TTL = Time.D * 7;
|
||||
private static final long CODE_LOCK_TTL = Time.S * 5;
|
||||
private static final long CONSUME_LOCK_TTL = Time.M * 2;
|
||||
private static final long REGISTER_RATE_LIMIT_TTL = Time.M * 10;
|
||||
private static final int CODE_RATE_LIMIT = 30;
|
||||
private static final int REGISTER_VALUE_RATE_LIMIT = 10;
|
||||
|
||||
private static final SecureRandom SECURE_RANDOM = new SecureRandom();
|
||||
|
||||
private final GaoStoreService gaoStoreService;
|
||||
private final GaoUserService gaoUserService;
|
||||
private final UserLoginService userLoginService;
|
||||
private final UserRoleService userRoleService;
|
||||
private final UserService userService;
|
||||
private final RoleService roleService;
|
||||
private final PermissionChecker permissionChecker;
|
||||
private final RoleChecker roleChecker;
|
||||
private final AuthorizationScopeService authorizationScopeService;
|
||||
private final LoggerService loggerService;
|
||||
|
||||
@Qualifier("redisGaoUserInvite")
|
||||
private final Redis<String, GaoUserInviteCache> redisInvite;
|
||||
|
||||
@Qualifier("redisLocker")
|
||||
private final Redis<String, Integer> redisLocker;
|
||||
|
||||
@Qualifier("redisRateLimit")
|
||||
private final Redis<String, Integer> redisRateLimit;
|
||||
|
||||
@Override
|
||||
public GaoUserInviteCreateResponse create(GaoUserInviteCreateRequest req) {
|
||||
Logger logger = new Logger(Logger.Module.GAO, Logger.Level.INFO, "GAO_USER_INVITE_CREATE");
|
||||
try {
|
||||
TimiException.required(req, "not found invite request");
|
||||
TimiException.required(req.getRoleId(), "not found roleId");
|
||||
|
||||
String inviterUserId = userLoginService.getRequireLoginUserId();
|
||||
logger.setUserId(inviterUserId);
|
||||
permissionChecker.checkAny(ModuleCode.GAO, GaoPermissionCode.USER_CREATE.getValue());
|
||||
boolean globalManager = authorizationScopeService.isSystemAdmin(inviterUserId)
|
||||
|| roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name());
|
||||
boolean storeManager = !globalManager;
|
||||
GaoStore loginStore = storeManager ? gaoStoreService.getByUserId(inviterUserId) : null;
|
||||
String storeId = storeManager ? loginStore == null ? null : loginStore.getId() : req.getStoreId();
|
||||
TimiException.required(storeId, "not found storeId");
|
||||
checkStoreScope(inviterUserId, storeId);
|
||||
|
||||
GaoStore store = requireActiveStore(storeId);
|
||||
Role role = requireInvitableRole(inviterUserId, req.getRoleId(), storeId);
|
||||
long createdAt = Time.now();
|
||||
long expireAt = createdAt + INVITE_TTL;
|
||||
|
||||
GaoUserInviteCache cache = new GaoUserInviteCache();
|
||||
cache.setInviterUserId(inviterUserId);
|
||||
cache.setStoreId(store.getId());
|
||||
cache.setRoleId(role.getId());
|
||||
cache.setScene(storeManager ? "STORE_MANAGER" : "STORE_MANAGEMENT");
|
||||
cache.setCreatedAt(createdAt);
|
||||
cache.setExpireAt(expireAt);
|
||||
String code = saveInvite(cache);
|
||||
|
||||
logger.setContent("storeId=%s;roleId=%s;scene=%s;createdAt=%d;expireAt=%d".formatted(
|
||||
store.getId(), role.getId(), cache.getScene(), createdAt, expireAt));
|
||||
logger.setResult("created");
|
||||
return new GaoUserInviteCreateResponse(code, expireAt);
|
||||
} catch (TimiException e) {
|
||||
logger.setLevel(Logger.Level.WARN);
|
||||
logger.setException(e.getMessage());
|
||||
throw e;
|
||||
} catch (Exception e) {
|
||||
logger.setLevel(Logger.Level.ERROR);
|
||||
logger.setException(TimiJava.serializeThrowable(e));
|
||||
log.error("GAO 邀请创建失败", e);
|
||||
throw new TimiException(TimiCode.ERROR, "邀请创建失败", e);
|
||||
} finally {
|
||||
loggerService.create(logger);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public GaoUserInviteValidateResponse validate(String code) {
|
||||
TimiException.required(code, "not found code");
|
||||
checkCodeRateLimit(code);
|
||||
GaoUserInviteCache cache = requireValidInvite(code);
|
||||
requireActiveStore(cache.getStoreId());
|
||||
requireValidRole(cache.getRoleId(), cache.getStoreId());
|
||||
return new GaoUserInviteValidateResponse(true, cache.getExpireAt());
|
||||
}
|
||||
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
@Override
|
||||
public String register(GaoUserInviteRegisterData data) {
|
||||
TimiException.required(data, "not found register data");
|
||||
String code = data.getCode();
|
||||
TimiException.required(code, "not found code");
|
||||
checkCodeRateLimit(code);
|
||||
checkRegisterValueRateLimit("NAME", data.getName());
|
||||
checkRegisterValueRateLimit("PHONE", data.getPhoneNo());
|
||||
String lockKey = getConsumeLockKey(code);
|
||||
TimiException.requiredTrue(redisLocker.lock(lockKey, 1, CONSUME_LOCK_TTL), "邀请码无效或正在使用");
|
||||
|
||||
GaoUserInviteCache cache = null;
|
||||
Logger logger = new Logger(Logger.Module.GAO, Logger.Level.WARN, "GAO_USER_INVITE_REGISTER");
|
||||
try {
|
||||
cache = requireValidInvite(code);
|
||||
logger.setContent(buildLogContent(cache));
|
||||
requireActiveStore(cache.getStoreId());
|
||||
requireValidRole(cache.getRoleId(), cache.getStoreId());
|
||||
TimiException.requiredNull(userService.getByName(data.getName()), "existed user name");
|
||||
TimiException.requiredNull(userService.getByPhoneNo(data.getPhoneNo()), "existed phone number");
|
||||
if (!redisInvite.destroy(getInviteKey(code))) {
|
||||
throw invalidInvite();
|
||||
}
|
||||
|
||||
User user = new User();
|
||||
user.setName(data.getName());
|
||||
user.setPhoneNo(data.getPhoneNo());
|
||||
user.setPassword(data.getPassword());
|
||||
|
||||
GaoUser gaoUser = new GaoUser();
|
||||
gaoUser.setStoreId(cache.getStoreId());
|
||||
gaoUser.setUser(user);
|
||||
gaoUserService.create(gaoUser);
|
||||
|
||||
UserRole userRole = new UserRole();
|
||||
userRole.setId(UUID.randomUUID().toString());
|
||||
userRole.setUserId(user.getId());
|
||||
userRole.setRoleId(cache.getRoleId());
|
||||
userRole.setCreatedAt(Time.now());
|
||||
userRoleService.create(userRole);
|
||||
|
||||
logger.setLevel(Logger.Level.INFO);
|
||||
logger.setUserId(user.getId());
|
||||
logger.setResult(user.getId());
|
||||
return user.getId();
|
||||
} catch (TimiException e) {
|
||||
logger.setException(e.getMessage());
|
||||
throw e;
|
||||
} catch (Exception e) {
|
||||
logger.setLevel(Logger.Level.ERROR);
|
||||
logger.setException(TimiJava.serializeThrowable(e));
|
||||
log.error("GAO 用户邀请注册失败", e);
|
||||
throw new TimiException(TimiCode.ERROR, "邀请注册失败", e);
|
||||
} finally {
|
||||
loggerService.create(logger);
|
||||
redisLocker.releaseLock(lockKey);
|
||||
}
|
||||
}
|
||||
|
||||
private String saveInvite(GaoUserInviteCache cache) {
|
||||
TimiException.requiredTrue(redisLocker.lock(CREATE_CODE_LOCK_KEY, 1, CODE_LOCK_TTL), "服务繁忙,请稍后重试");
|
||||
try {
|
||||
for (int attempt = 0; attempt < 3; attempt++) {
|
||||
String code = randomCode();
|
||||
if (!redisInvite.has(getInviteKey(code))) {
|
||||
redisInvite.set(getInviteKey(code), cache, INVITE_TTL);
|
||||
return code;
|
||||
}
|
||||
}
|
||||
throw new TimiException(TimiCode.ERROR_SERVICE_BUSY, "邀请码生成失败");
|
||||
} finally {
|
||||
redisLocker.releaseLock(CREATE_CODE_LOCK_KEY);
|
||||
}
|
||||
}
|
||||
|
||||
private String randomCode() {
|
||||
StringBuilder code = new StringBuilder(CODE_LENGTH);
|
||||
for (int i = 0; i < CODE_LENGTH; i++) {
|
||||
code.append(CODE_CHARACTERS.charAt(SECURE_RANDOM.nextInt(CODE_CHARACTERS.length())));
|
||||
}
|
||||
return code.toString();
|
||||
}
|
||||
|
||||
private GaoUserInviteCache requireValidInvite(String code) {
|
||||
TimiException.required(code, "not found code");
|
||||
GaoUserInviteCache cache = redisInvite.get(getInviteKey(code));
|
||||
if (cache == null || cache.getExpireAt() == null || cache.getExpireAt() <= Time.now()) {
|
||||
throw invalidInvite();
|
||||
}
|
||||
return cache;
|
||||
}
|
||||
|
||||
private GaoStore requireActiveStore(String storeId) {
|
||||
GaoStore store = gaoStoreService.get(storeId);
|
||||
if (store == null || !store.isActivated()) {
|
||||
throw invalidInvite();
|
||||
}
|
||||
return store;
|
||||
}
|
||||
|
||||
private Role requireInvitableRole(String inviterUserId, String roleId, String storeId) {
|
||||
Role role = requireValidRole(roleId, storeId);
|
||||
List<String> directRoleIdList = userRoleService.listRoleByUserId(ModuleCode.GAO, inviterUserId)
|
||||
.stream()
|
||||
.map(Role::getId)
|
||||
.toList();
|
||||
boolean descendant = authorizationScopeService.listManageableRole(inviterUserId, ModuleCode.GAO)
|
||||
.stream()
|
||||
.anyMatch(item -> role.getId().equals(item.getId()))
|
||||
&& !directRoleIdList.contains(role.getId());
|
||||
if (!descendant) {
|
||||
throw new TimiException(TimiCode.PERMISSION_ERROR, "角色不在可邀请范围内");
|
||||
}
|
||||
return role;
|
||||
}
|
||||
|
||||
private Role requireValidRole(String roleId, String storeId) {
|
||||
Role role = roleService.get(roleId);
|
||||
if (role == null || role.getModuleCode() != ModuleCode.GAO || !isRoleUsableForStore(role, storeId)) {
|
||||
throw invalidInvite();
|
||||
}
|
||||
return role;
|
||||
}
|
||||
|
||||
private boolean isRoleUsableForStore(Role role, String storeId) {
|
||||
return role.getOwnerType() == null
|
||||
|| role.getOwnerType() == AuthOwnerType.MODULE && (TimiJava.isEmpty(role.getOwnerId()) || ModuleCode.GAO.name().equals(role.getOwnerId()))
|
||||
|| role.getOwnerType() == AuthOwnerType.STORE && storeId.equals(role.getOwnerId());
|
||||
}
|
||||
|
||||
private void checkStoreScope(String userId, String storeId) {
|
||||
if (authorizationScopeService.isSystemAdmin(userId) || roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
|
||||
return;
|
||||
}
|
||||
GaoStore userStore = gaoStoreService.getByUserId(userId);
|
||||
TimiException.requiredTrue(userStore != null && storeId.equals(userStore.getId()), "无权操作其他门店");
|
||||
}
|
||||
|
||||
private String buildLogContent(GaoUserInviteCache cache) {
|
||||
return "inviterUserId=%s;storeId=%s;roleId=%s;scene=%s".formatted(cache.getInviterUserId(), cache.getStoreId(), cache.getRoleId(), cache.getScene());
|
||||
}
|
||||
|
||||
private void checkCodeRateLimit(String code) {
|
||||
checkRateLimit("GAO:USER:INVITE:LIMIT:CODE:" + Digest.sha256(code), CODE_RATE_LIMIT, REGISTER_RATE_LIMIT_TTL);
|
||||
}
|
||||
|
||||
private void checkRegisterValueRateLimit(String type, String value) {
|
||||
checkRateLimit("GAO:USER:INVITE:LIMIT:" + type + ":" + Digest.sha256(value), REGISTER_VALUE_RATE_LIMIT, REGISTER_RATE_LIMIT_TTL);
|
||||
}
|
||||
|
||||
private void checkRateLimit(String key, int limit, long ttl) {
|
||||
String lockKey = key + ":LOCK";
|
||||
TimiException.requiredTrue(redisLocker.lock(lockKey, 1, Time.S * 5), "服务繁忙,请稍后重试");
|
||||
try {
|
||||
Integer count = redisRateLimit.get(key);
|
||||
if (count != null && limit <= count) {
|
||||
throw new TimiException(TimiCode.REQUEST_BAD, "request_rate_limit");
|
||||
}
|
||||
redisRateLimit.set(key, count == null ? 1 : count + 1, ttl);
|
||||
} finally {
|
||||
redisLocker.releaseLock(lockKey);
|
||||
}
|
||||
}
|
||||
|
||||
private String getInviteKey(String code) {
|
||||
return INVITE_KEY_PREFIX + code;
|
||||
}
|
||||
|
||||
private String getConsumeLockKey(String code) {
|
||||
return CONSUME_LOCK_KEY_PREFIX + code;
|
||||
}
|
||||
|
||||
private TimiException invalidInvite() {
|
||||
return new TimiException(TimiCode.ARG_BAD, "邀请码无效或已过期");
|
||||
}
|
||||
}
|
||||
+5
-5
@@ -1,6 +1,5 @@
|
||||
package com.imyeyu.api.modules.gao.service.implement;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoStore;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoUser;
|
||||
@@ -30,7 +29,6 @@ import org.springframework.transaction.annotation.Transactional;
|
||||
@RequiredArgsConstructor
|
||||
public class GaoUserServiceImplement extends AbstractEntityService<GaoUser, String> implements GaoUserService {
|
||||
|
||||
private final ObjectMapper jackson;
|
||||
private final UserService userService;
|
||||
private final LoggerService loggerService;
|
||||
private final GaoStoreService gaoStoreService;
|
||||
@@ -52,7 +50,8 @@ public class GaoUserServiceImplement extends AbstractEntityService<GaoUser, Stri
|
||||
|
||||
Logger logger = new Logger(Logger.Module.GAO, "GAO_USER_CREATE");
|
||||
try {
|
||||
logger.setContent(jackson.writeValueAsString(gaoUser));
|
||||
logger.setContent("storeId=%s;userName=%s;phoneNo=%s".formatted(
|
||||
gaoUser.getStoreId(), gaoUser.getUser().getName(), gaoUser.getUser().getPhoneNo()));
|
||||
|
||||
GaoStore store = gaoStoreService.get(gaoUser.getStoreId());
|
||||
TimiException.required(store, "not found store");
|
||||
@@ -88,7 +87,8 @@ public class GaoUserServiceImplement extends AbstractEntityService<GaoUser, Stri
|
||||
|
||||
Logger logger = new Logger(Logger.Module.GAO, "GAO_USER_UPDATE");
|
||||
try {
|
||||
logger.setContent(jackson.writeValueAsString(gaoUser));
|
||||
logger.setContent("gaoUserId=%s;enabled=%s;remark=%s".formatted(
|
||||
gaoUser.getId(), gaoUser.getEnabled(), gaoUser.getRemark()));
|
||||
|
||||
GaoUser dbGaoUser = super.get(gaoUser.getId());
|
||||
TimiException.required(dbGaoUser, "not found gao user");
|
||||
@@ -122,7 +122,7 @@ public class GaoUserServiceImplement extends AbstractEntityService<GaoUser, Stri
|
||||
|
||||
Logger logger = new Logger(Logger.Module.GAO, "GAO_USER_TRANSFER_STORE");
|
||||
try {
|
||||
logger.setContent(jackson.writeValueAsString(gaoUser));
|
||||
logger.setContent("gaoUserId=%s;storeId=%s".formatted(gaoUser.getId(), gaoUser.getStoreId()));
|
||||
|
||||
GaoStore store = gaoStoreService.get(gaoUser.getStoreId());
|
||||
TimiException.required(store, "not found store");
|
||||
|
||||
@@ -29,6 +29,9 @@ public class GaoCustomerEventRankView {
|
||||
/// 最近连续登记天数
|
||||
private Long recentContinuousEventDays;
|
||||
|
||||
/// 登记数值合计
|
||||
private Long totalNumberValue;
|
||||
|
||||
/// 最后登记时间
|
||||
private Long latestRegisteredAt;
|
||||
}
|
||||
|
||||
@@ -41,6 +41,8 @@ public class GaoEventRecordRankPage extends BasePage {
|
||||
/// 按累计登记次数
|
||||
TOTAL_COUNT,
|
||||
/// 按最近连续登记天数
|
||||
CONTINUOUS_DAYS
|
||||
CONTINUOUS_DAYS,
|
||||
/// 按登记数值合计
|
||||
TOTAL_NUMBER_VALUE
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
package com.imyeyu.api.modules.gao.vo;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import lombok.Data;
|
||||
|
||||
/// GAO 用户邀请创建请求
|
||||
///
|
||||
/// @author Codex
|
||||
/// @since 2026-08-13
|
||||
@Data
|
||||
public class GaoUserInviteCreateRequest {
|
||||
|
||||
/// 门店管理场景的目标门店 ID,店长场景不使用
|
||||
private String storeId;
|
||||
|
||||
/// 目标角色 ID
|
||||
@NotBlank
|
||||
private String roleId;
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package com.imyeyu.api.modules.gao.vo;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
|
||||
/// GAO 用户邀请创建响应
|
||||
///
|
||||
/// @author Codex
|
||||
/// @since 2026-08-13
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
public class GaoUserInviteCreateResponse {
|
||||
|
||||
/// 邀请 code
|
||||
private String code;
|
||||
|
||||
/// 邀请过期时间,毫秒时间戳
|
||||
private Long expireAt;
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
package com.imyeyu.api.modules.gao.vo;
|
||||
|
||||
import com.imyeyu.api.modules.user.validation.UserPassword;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.Pattern;
|
||||
import jakarta.validation.constraints.Size;
|
||||
import lombok.Data;
|
||||
|
||||
/// GAO 用户邀请注册数据
|
||||
///
|
||||
/// @author Codex
|
||||
/// @since 2026-08-13
|
||||
@Data
|
||||
public class GaoUserInviteRegisterData {
|
||||
|
||||
/// 邀请 code
|
||||
@NotBlank
|
||||
@Pattern(regexp = "[23456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{10}")
|
||||
private String code;
|
||||
|
||||
/// 手机号
|
||||
@NotBlank
|
||||
@Pattern(regexp = "^1\\d{10}$")
|
||||
private String phoneNo;
|
||||
|
||||
/// 用户名
|
||||
@NotBlank
|
||||
@Size(max = 191)
|
||||
private String name;
|
||||
|
||||
/// 明文密码
|
||||
@UserPassword
|
||||
private String password;
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package com.imyeyu.api.modules.gao.vo;
|
||||
|
||||
import com.imyeyu.spring.bean.CaptchaData;
|
||||
import jakarta.validation.Valid;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
|
||||
/// GAO 用户邀请注册请求
|
||||
///
|
||||
/// @author Codex
|
||||
/// @since 2026-08-13
|
||||
public class GaoUserInviteRegisterRequest extends CaptchaData<GaoUserInviteRegisterData> {
|
||||
|
||||
/// 级联校验注册数据
|
||||
@Override
|
||||
@NotNull
|
||||
@Valid
|
||||
public GaoUserInviteRegisterData getData() {
|
||||
return super.getData();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package com.imyeyu.api.modules.gao.vo;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.Pattern;
|
||||
import lombok.Data;
|
||||
|
||||
/// GAO 用户邀请校验请求
|
||||
///
|
||||
/// @author Codex
|
||||
/// @since 2026-08-13
|
||||
@Data
|
||||
public class GaoUserInviteValidateRequest {
|
||||
|
||||
/// 邀请 code
|
||||
@NotBlank
|
||||
@Pattern(regexp = "[23456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{10}")
|
||||
private String code;
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package com.imyeyu.api.modules.gao.vo;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
|
||||
/// GAO 用户邀请校验响应
|
||||
///
|
||||
/// @author Codex
|
||||
/// @since 2026-08-13
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
public class GaoUserInviteValidateResponse {
|
||||
|
||||
/// true 为邀请码可用
|
||||
private boolean valid;
|
||||
|
||||
/// 邀请过期时间,毫秒时间戳
|
||||
private Long expireAt;
|
||||
}
|
||||
+6
-10
@@ -18,6 +18,7 @@ import com.imyeyu.java.bean.timi.TimiException;
|
||||
import com.imyeyu.spring.TimiSpring;
|
||||
import com.imyeyu.spring.util.Redis;
|
||||
import com.imyeyu.utils.Digest;
|
||||
import com.imyeyu.utils.Regex;
|
||||
import com.imyeyu.utils.Time;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -38,7 +39,6 @@ import java.util.concurrent.ThreadLocalRandom;
|
||||
@RequiredArgsConstructor(onConstructor_ = {@Lazy})
|
||||
public class UserLoginServiceImplement implements UserLoginService, TimiJava {
|
||||
|
||||
private static final String REGEX_PHONE_NO = "^1\\d{10}$";
|
||||
private static final String USER_TOKEN_KEY_PREFIX = "USER:TOKEN:";
|
||||
private static final String PHONE_VERIFY_KEY_PREFIX = "USER:PHONE:VERIFY:";
|
||||
private static final long PHONE_VERIFY_CODE_TTL = Time.M * 5;
|
||||
@@ -61,7 +61,7 @@ public class UserLoginServiceImplement implements UserLoginService, TimiJava {
|
||||
User dbUser = userService.get(req.getUser());
|
||||
if (dbUser == null && req.getUser().contains("@")) {
|
||||
dbUser = userService.getByVerifiedEmail(req.getUser());
|
||||
} else if (dbUser == null && isPhoneNo(req.getUser())) {
|
||||
} else if (dbUser == null && Regex.isMatch(Regex.MOBILE_PHONE, req.getUser())) {
|
||||
dbUser = userService.getByVerifiedPhoneNo(req.getUser());
|
||||
} else if (dbUser == null) {
|
||||
dbUser = userService.getByName(req.getUser());
|
||||
@@ -143,8 +143,8 @@ public class UserLoginServiceImplement implements UserLoginService, TimiJava {
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
@Override
|
||||
public void sendPhoneVerifyCode(String phoneNo) {
|
||||
TimiException.requiredTrue(isPhoneNo(phoneNo), "invalid phone number");
|
||||
User verifiedUser = userService.getByVerifiedPhoneNo(phoneNo);
|
||||
TimiException.requiredTrue(Regex.isMatch(Regex.MOBILE_PHONE, phoneNo), "invalid phone number");
|
||||
User verifiedUser = userService.getByPhoneNo(phoneNo);
|
||||
User loginUser = getRequireLoginUser();
|
||||
TimiException.requiredTrue(verifiedUser == null || verifiedUser.getId().equals(loginUser.getId()), "existed phone number");
|
||||
|
||||
@@ -156,11 +156,11 @@ public class UserLoginServiceImplement implements UserLoginService, TimiJava {
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
@Override
|
||||
public void verifyPhoneNo(String phoneNo, String verifyCode) {
|
||||
TimiException.requiredTrue(isPhoneNo(phoneNo), "invalid phone number");
|
||||
TimiException.requiredTrue(Regex.isMatch(Regex.MOBILE_PHONE, phoneNo), "invalid phone number");
|
||||
TimiException.required(verifyCode, "not found verify code");
|
||||
|
||||
User user = getRequireLoginUser();
|
||||
User verifiedUser = userService.getByVerifiedPhoneNo(phoneNo);
|
||||
User verifiedUser = userService.getByPhoneNo(phoneNo);
|
||||
TimiException.requiredTrue(verifiedUser == null || verifiedUser.getId().equals(user.getId()), "existed phone number");
|
||||
|
||||
String cacheCode = redisUserPhoneVerify.get(getPhoneVerifyKey(phoneNo));
|
||||
@@ -188,10 +188,6 @@ public class UserLoginServiceImplement implements UserLoginService, TimiJava {
|
||||
userService.delete(user.getId());
|
||||
}
|
||||
|
||||
private boolean isPhoneNo(String value) {
|
||||
return TimiJava.isNotEmpty(value) && value.matches(REGEX_PHONE_NO);
|
||||
}
|
||||
|
||||
private String getPhoneVerifyKey(String phoneNo) {
|
||||
return "%s%s".formatted(PHONE_VERIFY_KEY_PREFIX, phoneNo);
|
||||
}
|
||||
|
||||
+2
-2
@@ -57,7 +57,7 @@ public class UserServiceImplement extends AbstractEntityService<User, String> im
|
||||
{
|
||||
if (TimiJava.isNotEmpty(user.getPhoneNo())) {
|
||||
TimiException.requiredTrue(user.isValidPhone(), "invalid phone");
|
||||
User byPhoneNo = getByVerifiedPhoneNo(user.getPhoneNo());
|
||||
User byPhoneNo = getByPhoneNo(user.getPhoneNo());
|
||||
TimiException.requiredNull(byPhoneNo, "existed phone number");
|
||||
}
|
||||
}
|
||||
@@ -94,7 +94,7 @@ public class UserServiceImplement extends AbstractEntityService<User, String> im
|
||||
if (TimiJava.isNotEmpty(phoneNo)) {
|
||||
TimiException.requiredTrue(user.isValidPhone(), "invalid phone");
|
||||
if (!phoneNo.equals(dbUser.getPhoneNo())) {
|
||||
User byPhoneNo = getByVerifiedPhoneNo(phoneNo);
|
||||
User byPhoneNo = getByPhoneNo(phoneNo);
|
||||
TimiException.requiredTrue(byPhoneNo == null || byPhoneNo.getId().equals(dbUser.getId()), "existed phone number");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
ALTER TABLE `gao_event`
|
||||
ADD COLUMN `value_type` VARCHAR(16) NOT NULL DEFAULT 'NONE' COMMENT '数值类型,NONE 不携带数值,NUMBER 携带整数数值' AFTER `description`,
|
||||
ADD COLUMN `value_unit` VARCHAR(16) NULL COMMENT '数值单位,CENT 金额分,COUNT 次数' AFTER `value_type`,
|
||||
ADD COLUMN `require_value` BOOLEAN NOT NULL DEFAULT FALSE COMMENT 'true 为登记时必须提交 numberValue' AFTER `value_unit`;
|
||||
|
||||
ALTER TABLE `gao_event_record`
|
||||
ADD COLUMN `point_value` BIGINT NULL COMMENT '本次登记提交的积分值' AFTER `operator_user_id`,
|
||||
ADD COLUMN `earned_point_value` BIGINT NOT NULL DEFAULT 0 COMMENT '本次登记通过积分规则获得的积分总和' AFTER `point_value`,
|
||||
ADD COLUMN `number_value` BIGINT NULL COMMENT '本次登记提交的整数业务数值' AFTER `earned_point_value`,
|
||||
ADD KEY `idx_gao_event_record_value_sum` (`store_id`, `customer_id`, `event_id`, `deleted_at`, `registered_at`);
|
||||
@@ -26,6 +26,39 @@
|
||||
AND `deleted_at` IS NULL
|
||||
</select>
|
||||
|
||||
<select id="countByEventIdAndNumberValue" resultType="java.lang.Long">
|
||||
SELECT
|
||||
COUNT(1)
|
||||
FROM `gao_event_record`
|
||||
WHERE
|
||||
`event_id` = #{eventId}
|
||||
AND `number_value` IS NOT NULL
|
||||
AND `deleted_at` IS NULL
|
||||
</select>
|
||||
|
||||
<select id="sumNumberValue" resultType="java.lang.Long">
|
||||
SELECT
|
||||
COALESCE(SUM(`number_value`), 0)
|
||||
FROM `gao_event_record`
|
||||
WHERE
|
||||
`store_id` = #{storeId}
|
||||
AND `customer_id` = #{customerId}
|
||||
AND `event_id` = #{eventId}
|
||||
AND `registered_at` >= #{beginAt}
|
||||
AND `registered_at` < #{endAt}
|
||||
AND `deleted_at` IS NULL
|
||||
</select>
|
||||
|
||||
<update id="updateEarnedPointValue">
|
||||
UPDATE `gao_event_record`
|
||||
SET
|
||||
`earned_point_value` = #{earnedPointValue},
|
||||
`updated_at` = ROUND(UNIX_TIMESTAMP(CURRENT_TIMESTAMP(3)) * 1000)
|
||||
WHERE
|
||||
`id` = #{id}
|
||||
AND `deleted_at` IS NULL
|
||||
</update>
|
||||
|
||||
<select id="countByStoreIdAndRegisteredDateValue" resultType="java.lang.Long">
|
||||
SELECT
|
||||
COUNT(1)
|
||||
@@ -97,6 +130,14 @@
|
||||
ORDER BY r.`registered_at` DESC, r.`created_at` DESC
|
||||
LIMIT #{offset}, #{limit}
|
||||
</select>
|
||||
<select id="sumNumberValueByRange" resultType="java.lang.Long">
|
||||
SELECT
|
||||
COALESCE(SUM(r.`number_value`), 0)
|
||||
<include refid="rangeFrom"/>
|
||||
WHERE
|
||||
<include refid="rangeWhere"/>
|
||||
AND r.`number_value` IS NOT NULL
|
||||
</select>
|
||||
|
||||
<sql id="rankWhere">
|
||||
r.`deleted_at` IS NULL
|
||||
@@ -119,6 +160,9 @@
|
||||
#{eventId}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="rankType != null and rankType.name() == 'TOTAL_NUMBER_VALUE'">
|
||||
AND r.`number_value` IS NOT NULL
|
||||
</if>
|
||||
</sql>
|
||||
<select id="countRankByRange" resultType="long">
|
||||
SELECT
|
||||
@@ -129,134 +173,154 @@
|
||||
<include refid="rankWhere"/>
|
||||
</select>
|
||||
<select id="selectRankByRange" resultType="com.imyeyu.api.modules.gao.vo.GaoCustomerEventRankView">
|
||||
WITH RECURSIVE `daily_stat` AS (
|
||||
SELECT
|
||||
r.`customer_id` AS `customerId`,
|
||||
r.`registered_date_value` AS `registeredDateValue`,
|
||||
COUNT(1) AS `dailyCount`,
|
||||
MAX(r.`registered_at`) AS `latestRegisteredAt`
|
||||
FROM `gao_event_record` r
|
||||
LEFT JOIN `gao_customer` c ON r.`customer_id` = c.`id`
|
||||
WHERE
|
||||
<include refid="rankWhere"/>
|
||||
GROUP BY
|
||||
r.`customer_id`,
|
||||
r.`registered_date_value`
|
||||
),
|
||||
`range_bound` AS (
|
||||
SELECT
|
||||
LEAST(
|
||||
STR_TO_DATE(CAST(MIN(`registeredDateValue`) AS CHAR), '%Y%m%d'),
|
||||
STR_TO_DATE(CAST(#{todayDateValue} AS CHAR), '%Y%m%d')
|
||||
) AS `beginDate`,
|
||||
STR_TO_DATE(CAST(#{todayDateValue} AS CHAR), '%Y%m%d') AS `endDate`
|
||||
FROM `daily_stat`
|
||||
),
|
||||
`calendar` AS (
|
||||
SELECT
|
||||
CAST(DATE_FORMAT(`beginDate`, '%Y%m%d') AS UNSIGNED) AS `dateValue`,
|
||||
`beginDate` AS `dateDate`
|
||||
FROM `range_bound`
|
||||
WHERE `beginDate` IS NOT NULL
|
||||
UNION ALL
|
||||
SELECT
|
||||
CAST(DATE_FORMAT(DATE_ADD(c.`dateDate`, INTERVAL 1 DAY), '%Y%m%d') AS UNSIGNED) AS `dateValue`,
|
||||
DATE_ADD(c.`dateDate`, INTERVAL 1 DAY) AS `dateDate`
|
||||
FROM `calendar` c
|
||||
JOIN `range_bound` b ON c.`dateDate` < b.`endDate`
|
||||
),
|
||||
`open_calendar` AS (
|
||||
SELECT
|
||||
c.`dateValue`,
|
||||
ROW_NUMBER() OVER (ORDER BY c.`dateDate`) AS `openIndex`
|
||||
FROM `calendar` c
|
||||
LEFT JOIN `gao_store_business_day` b ON b.`store_id` = #{storeId}
|
||||
AND b.`date_value` = c.`dateValue`
|
||||
AND b.`deleted_at` IS NULL
|
||||
WHERE COALESCE(b.`status`, 'OPEN') != 'CLOSED'
|
||||
),
|
||||
`rank_stat` AS (
|
||||
SELECT
|
||||
`customerId`,
|
||||
COUNT(1) AS `totalEventDays`,
|
||||
SUM(`dailyCount`) AS `totalEventCount`,
|
||||
MAX(`latestRegisteredAt`) AS `latestRegisteredAt`
|
||||
FROM `daily_stat`
|
||||
GROUP BY `customerId`
|
||||
),
|
||||
`continuous_ordered` AS (
|
||||
SELECT
|
||||
d.`customerId`,
|
||||
o.`openIndex`,
|
||||
ROW_NUMBER() OVER (PARTITION BY d.`customerId` ORDER BY o.`openIndex` DESC) AS `dayIndex`
|
||||
FROM `daily_stat` d
|
||||
JOIN `open_calendar` o ON d.`registeredDateValue` = o.`dateValue`
|
||||
),
|
||||
`anchor_date` AS (
|
||||
SELECT
|
||||
MAX(`openIndex`) AS `anchorOpenIndex`
|
||||
FROM `open_calendar`
|
||||
),
|
||||
`continuous_stat` AS (
|
||||
SELECT
|
||||
o.`customerId`,
|
||||
CASE
|
||||
WHEN COUNT(1) < 2 THEN 0
|
||||
ELSE COUNT(1)
|
||||
END AS `recentContinuousEventDays`
|
||||
FROM `continuous_ordered` o
|
||||
JOIN `anchor_date` a
|
||||
WHERE
|
||||
o.`openIndex` + o.`dayIndex` = a.`anchorOpenIndex` + 1
|
||||
<if test="eventIdList == null or eventIdList.size() != 1">
|
||||
AND 1 = 0
|
||||
</if>
|
||||
GROUP BY o.`customerId`
|
||||
),
|
||||
`ranked` AS (
|
||||
SELECT
|
||||
ROW_NUMBER() OVER (
|
||||
ORDER BY
|
||||
<choose>
|
||||
<when test="rankType != null and rankType.name() == 'TOTAL_COUNT'">
|
||||
r.`totalEventCount` DESC,
|
||||
r.`totalEventDays` DESC,
|
||||
r.`latestRegisteredAt` DESC,
|
||||
r.`customerId`
|
||||
</when>
|
||||
<when test="rankType != null and rankType.name() == 'CONTINUOUS_DAYS'">
|
||||
COALESCE(c.`recentContinuousEventDays`, 0) DESC,
|
||||
r.`totalEventDays` DESC,
|
||||
r.`totalEventCount` DESC,
|
||||
r.`latestRegisteredAt` DESC,
|
||||
r.`customerId`
|
||||
</when>
|
||||
<otherwise>
|
||||
r.`totalEventDays` DESC,
|
||||
r.`totalEventCount` DESC,
|
||||
r.`latestRegisteredAt` DESC,
|
||||
r.`customerId`
|
||||
</otherwise>
|
||||
</choose>
|
||||
) AS `rank`,
|
||||
r.`customerId`,
|
||||
r.`totalEventDays`,
|
||||
r.`totalEventCount`,
|
||||
COALESCE(c.`recentContinuousEventDays`, 0) AS `recentContinuousEventDays`,
|
||||
r.`latestRegisteredAt`
|
||||
FROM `rank_stat` r
|
||||
LEFT JOIN `continuous_stat` c ON r.`customerId` = c.`customerId`
|
||||
)
|
||||
SELECT
|
||||
`rank`,
|
||||
`customerId`,
|
||||
`totalEventDays`,
|
||||
`totalEventCount`,
|
||||
`recentContinuousEventDays`,
|
||||
`latestRegisteredAt`
|
||||
FROM `ranked`
|
||||
ORDER BY `rank`
|
||||
LIMIT #{offset}, #{limit}
|
||||
<choose>
|
||||
<when test="rankType == null or rankType.name() == 'TOTAL_DAYS'">
|
||||
SELECT
|
||||
ROW_NUMBER() OVER (
|
||||
ORDER BY COUNT(DISTINCT r.`registered_date_value`) DESC, r.`customer_id`
|
||||
) AS `rank`,
|
||||
r.`customer_id` AS `customerId`,
|
||||
COUNT(DISTINCT r.`registered_date_value`) AS `totalEventDays`,
|
||||
NULL AS `totalEventCount`,
|
||||
NULL AS `recentContinuousEventDays`,
|
||||
NULL AS `totalNumberValue`,
|
||||
NULL AS `latestRegisteredAt`
|
||||
FROM `gao_event_record` r
|
||||
LEFT JOIN `gao_customer` c ON r.`customer_id` = c.`id`
|
||||
WHERE
|
||||
<include refid="rankWhere"/>
|
||||
GROUP BY r.`customer_id`
|
||||
ORDER BY `rank`
|
||||
LIMIT #{offset}, #{limit}
|
||||
</when>
|
||||
<when test="rankType.name() == 'TOTAL_COUNT'">
|
||||
SELECT
|
||||
ROW_NUMBER() OVER (
|
||||
ORDER BY COUNT(1) DESC, r.`customer_id`
|
||||
) AS `rank`,
|
||||
r.`customer_id` AS `customerId`,
|
||||
NULL AS `totalEventDays`,
|
||||
COUNT(1) AS `totalEventCount`,
|
||||
NULL AS `recentContinuousEventDays`,
|
||||
NULL AS `totalNumberValue`,
|
||||
NULL AS `latestRegisteredAt`
|
||||
FROM `gao_event_record` r
|
||||
LEFT JOIN `gao_customer` c ON r.`customer_id` = c.`id`
|
||||
WHERE
|
||||
<include refid="rankWhere"/>
|
||||
GROUP BY r.`customer_id`
|
||||
ORDER BY `rank`
|
||||
LIMIT #{offset}, #{limit}
|
||||
</when>
|
||||
<when test="rankType.name() == 'TOTAL_NUMBER_VALUE'">
|
||||
SELECT
|
||||
ROW_NUMBER() OVER (
|
||||
ORDER BY SUM(r.`number_value`) DESC, r.`customer_id`
|
||||
) AS `rank`,
|
||||
r.`customer_id` AS `customerId`,
|
||||
NULL AS `totalEventDays`,
|
||||
NULL AS `totalEventCount`,
|
||||
NULL AS `recentContinuousEventDays`,
|
||||
SUM(r.`number_value`) AS `totalNumberValue`,
|
||||
NULL AS `latestRegisteredAt`
|
||||
FROM `gao_event_record` r
|
||||
LEFT JOIN `gao_customer` c ON r.`customer_id` = c.`id`
|
||||
WHERE
|
||||
<include refid="rankWhere"/>
|
||||
GROUP BY r.`customer_id`
|
||||
ORDER BY `rank`
|
||||
LIMIT #{offset}, #{limit}
|
||||
</when>
|
||||
<otherwise>
|
||||
WITH RECURSIVE `daily_stat` AS (
|
||||
SELECT
|
||||
r.`customer_id` AS `customerId`,
|
||||
r.`registered_date_value` AS `registeredDateValue`
|
||||
FROM `gao_event_record` r
|
||||
LEFT JOIN `gao_customer` c ON r.`customer_id` = c.`id`
|
||||
WHERE
|
||||
<include refid="rankWhere"/>
|
||||
GROUP BY
|
||||
r.`customer_id`,
|
||||
r.`registered_date_value`
|
||||
),
|
||||
`range_bound` AS (
|
||||
SELECT
|
||||
LEAST(
|
||||
STR_TO_DATE(CAST(MIN(`registeredDateValue`) AS CHAR), '%Y%m%d'),
|
||||
STR_TO_DATE(CAST(#{todayDateValue} AS CHAR), '%Y%m%d')
|
||||
) AS `beginDate`,
|
||||
STR_TO_DATE(CAST(#{todayDateValue} AS CHAR), '%Y%m%d') AS `endDate`
|
||||
FROM `daily_stat`
|
||||
),
|
||||
`calendar` AS (
|
||||
SELECT
|
||||
CAST(DATE_FORMAT(`beginDate`, '%Y%m%d') AS UNSIGNED) AS `dateValue`,
|
||||
`beginDate` AS `dateDate`
|
||||
FROM `range_bound`
|
||||
WHERE `beginDate` IS NOT NULL
|
||||
UNION ALL
|
||||
SELECT
|
||||
CAST(DATE_FORMAT(DATE_ADD(c.`dateDate`, INTERVAL 1 DAY), '%Y%m%d') AS UNSIGNED) AS `dateValue`,
|
||||
DATE_ADD(c.`dateDate`, INTERVAL 1 DAY) AS `dateDate`
|
||||
FROM `calendar` c
|
||||
JOIN `range_bound` b ON c.`dateDate` < b.`endDate`
|
||||
),
|
||||
`open_calendar` AS (
|
||||
SELECT
|
||||
c.`dateValue`,
|
||||
ROW_NUMBER() OVER (ORDER BY c.`dateDate`) AS `openIndex`
|
||||
FROM `calendar` c
|
||||
LEFT JOIN `gao_store_business_day` b ON b.`store_id` = #{storeId}
|
||||
AND b.`date_value` = c.`dateValue`
|
||||
AND b.`deleted_at` IS NULL
|
||||
WHERE COALESCE(b.`status`, 'OPEN') != 'CLOSED'
|
||||
),
|
||||
`continuous_ordered` AS (
|
||||
SELECT
|
||||
d.`customerId`,
|
||||
o.`openIndex`,
|
||||
ROW_NUMBER() OVER (PARTITION BY d.`customerId` ORDER BY o.`openIndex` DESC) AS `dayIndex`
|
||||
FROM `daily_stat` d
|
||||
JOIN `open_calendar` o ON d.`registeredDateValue` = o.`dateValue`
|
||||
),
|
||||
`anchor_date` AS (
|
||||
SELECT
|
||||
MAX(`openIndex`) AS `anchorOpenIndex`
|
||||
FROM `open_calendar`
|
||||
),
|
||||
`continuous_stat` AS (
|
||||
SELECT
|
||||
o.`customerId`,
|
||||
CASE
|
||||
WHEN COUNT(1) < 2 THEN 0
|
||||
ELSE COUNT(1)
|
||||
END AS `recentContinuousEventDays`
|
||||
FROM `continuous_ordered` o
|
||||
JOIN `anchor_date` a
|
||||
WHERE
|
||||
o.`openIndex` + o.`dayIndex` = a.`anchorOpenIndex` + 1
|
||||
<if test="eventIdList == null or eventIdList.size() != 1">
|
||||
AND 1 = 0
|
||||
</if>
|
||||
GROUP BY o.`customerId`
|
||||
)
|
||||
SELECT
|
||||
ROW_NUMBER() OVER (
|
||||
ORDER BY COALESCE(c.`recentContinuousEventDays`, 0) DESC, r.`customerId`
|
||||
) AS `rank`,
|
||||
r.`customerId`,
|
||||
NULL AS `totalEventDays`,
|
||||
NULL AS `totalEventCount`,
|
||||
COALESCE(c.`recentContinuousEventDays`, 0) AS `recentContinuousEventDays`,
|
||||
NULL AS `totalNumberValue`,
|
||||
NULL AS `latestRegisteredAt`
|
||||
FROM (SELECT DISTINCT `customerId` FROM `daily_stat`) r
|
||||
LEFT JOIN `continuous_stat` c ON r.`customerId` = c.`customerId`
|
||||
ORDER BY `rank`
|
||||
LIMIT #{offset}, #{limit}
|
||||
</otherwise>
|
||||
</choose>
|
||||
</select>
|
||||
|
||||
<sql id="storeChartRangeWhere">
|
||||
|
||||
@@ -10,6 +10,6 @@
|
||||
AND (`begin_at` IS NULL OR `begin_at` <= #{now})
|
||||
AND (`end_at` IS NULL OR #{now} <= `end_at`)
|
||||
AND `deleted_at` IS NULL
|
||||
ORDER BY `priority` ASC, `created_at` ASC, `id` ASC
|
||||
ORDER BY `priority`, `created_at`, `id`
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
Reference in New Issue
Block a user