Compare commits
18
Commits
v1.0.11
...
0aee11d824
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0aee11d824 | ||
|
|
e35cf3aa59 | ||
|
|
457e716b38 | ||
|
|
ab4a164680 | ||
|
|
9dfca25f8c | ||
|
|
e369a38e2e | ||
|
|
f1e10df6a7 | ||
|
|
fcf358a768 | ||
|
|
36e2a37af2 | ||
|
|
348f7396a1 | ||
|
|
619369104c | ||
|
|
c0b04fc554 | ||
|
|
5e5748b521 | ||
|
|
67d79f7527 | ||
|
|
ee530d2a8c | ||
|
|
5f36844279 | ||
|
|
5b9391a50a | ||
|
|
6bc73414d9 |
Generated
+1
-1
@@ -3,7 +3,7 @@
|
|||||||
<component name="SqlDialectMappings">
|
<component name="SqlDialectMappings">
|
||||||
<file url="file://$PROJECT_DIR$/src/main/resources/db/migration/timiserver/V1__init_schema.sql" dialect="MariaDB" />
|
<file url="file://$PROJECT_DIR$/src/main/resources/db/migration/timiserver/V1__init_schema.sql" dialect="MariaDB" />
|
||||||
<file url="file://$PROJECT_DIR$/src/main/resources/db/migration/timiserver/V2__init_system_data.sql" dialect="GenericSQL" />
|
<file url="file://$PROJECT_DIR$/src/main/resources/db/migration/timiserver/V2__init_system_data.sql" dialect="GenericSQL" />
|
||||||
<file url="file://$PROJECT_DIR$/src/main/resources/mapper/timi-server/GaoEventRecordMapper.xml" dialect="MariaDB" />
|
<file url="file://$PROJECT_DIR$/src/main/resources/mapper/timi-server/gao/GaoEventRecordMapper.xml" dialect="MariaDB" />
|
||||||
<file url="PROJECT" dialect="MariaDB" />
|
<file url="PROJECT" dialect="MariaDB" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
<groupId>com.imyeyu.timiserverapi</groupId>
|
<groupId>com.imyeyu.timiserverapi</groupId>
|
||||||
<artifactId>TimiServerAPI</artifactId>
|
<artifactId>TimiServerAPI</artifactId>
|
||||||
<version>1.0.11</version>
|
<version>1.0.14</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<name>TimiServerAPI</name>
|
<name>TimiServerAPI</name>
|
||||||
<description>imyeyu.com API</description>
|
<description>imyeyu.com API</description>
|
||||||
|
|||||||
@@ -39,6 +39,12 @@ public enum CorePermissionCode implements BuiltinPermissionCode {
|
|||||||
MULTILINGUAL_UPDATE("MULTILINGUAL:UPDATE", "多语言修改", false, true),
|
MULTILINGUAL_UPDATE("MULTILINGUAL:UPDATE", "多语言修改", false, true),
|
||||||
MULTILINGUAL_DELETE("MULTILINGUAL:DELETE", "多语言删除", false, true),
|
MULTILINGUAL_DELETE("MULTILINGUAL:DELETE", "多语言删除", false, true),
|
||||||
|
|
||||||
|
TAG_CREATE("TAG:CREATE", "标签创建", false, true),
|
||||||
|
TAG_READ("TAG:READ", "标签读取", false, true),
|
||||||
|
TAG_APPLY("TAG:APPLY", "标签应用", false, true),
|
||||||
|
TAG_UPDATE("TAG:UPDATE", "标签修改", false, true),
|
||||||
|
TAG_DELETE("TAG:DELETE", "标签删除", false, true),
|
||||||
|
|
||||||
USER_CREATE("USER:CREATE", "用户创建", false, true),
|
USER_CREATE("USER:CREATE", "用户创建", false, true),
|
||||||
USER_READ("USER:READ", "用户读取", false, true),
|
USER_READ("USER:READ", "用户读取", false, true),
|
||||||
USER_UPDATE("USER:UPDATE", "用户修改", false, true),
|
USER_UPDATE("USER:UPDATE", "用户修改", false, true),
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package com.imyeyu.api.config;
|
|||||||
|
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
import com.imyeyu.api.modules.common.entity.Multilingual;
|
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.bean.RedisConfigParams;
|
||||||
import com.imyeyu.spring.config.AbstractRedisConfig;
|
import com.imyeyu.spring.config.AbstractRedisConfig;
|
||||||
import com.imyeyu.spring.util.Redis;
|
import com.imyeyu.spring.util.Redis;
|
||||||
@@ -202,4 +203,10 @@ public class RedisConfig extends AbstractRedisConfig {
|
|||||||
public Redis<String, String> getClipboardRedisTemplate() {
|
public Redis<String, String> getClipboardRedisTemplate() {
|
||||||
return getRedis(database, RedisSerializers.STRING, RedisSerializers.STRING);
|
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));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ import com.imyeyu.api.annotation.EnableSettingInterceptor;
|
|||||||
import com.imyeyu.api.annotation.RequestRateLimitInterceptor;
|
import com.imyeyu.api.annotation.RequestRateLimitInterceptor;
|
||||||
import com.imyeyu.api.annotation.RequireCorePermissionInterceptor;
|
import com.imyeyu.api.annotation.RequireCorePermissionInterceptor;
|
||||||
import com.imyeyu.api.modules.gao.annotation.RequireGaoPermissionInterceptor;
|
import com.imyeyu.api.modules.gao.annotation.RequireGaoPermissionInterceptor;
|
||||||
import com.imyeyu.api.modules.gao.annotation.RequireGaoRoleInterceptor;
|
|
||||||
import com.imyeyu.api.modules.journal.util.JournalAPIInterceptor;
|
import com.imyeyu.api.modules.journal.util.JournalAPIInterceptor;
|
||||||
import com.imyeyu.api.modules.system.util.SystemAPIInterceptor;
|
import com.imyeyu.api.modules.system.util.SystemAPIInterceptor;
|
||||||
import com.imyeyu.spring.annotation.RequestBodyValueArgumentResolver;
|
import com.imyeyu.spring.annotation.RequestBodyValueArgumentResolver;
|
||||||
@@ -42,7 +41,6 @@ public class WebConfig implements WebMvcConfigurer {
|
|||||||
private final SystemAPIInterceptor systemAPIInterceptor;
|
private final SystemAPIInterceptor systemAPIInterceptor;
|
||||||
private final JournalAPIInterceptor journalAPIInterceptor;
|
private final JournalAPIInterceptor journalAPIInterceptor;
|
||||||
private final EnableSettingInterceptor enableSettingInterceptor;
|
private final EnableSettingInterceptor enableSettingInterceptor;
|
||||||
private final RequireGaoRoleInterceptor requireGaoRoleInterceptor;
|
|
||||||
private final RequestRateLimitInterceptor requestRateLimitInterceptor;
|
private final RequestRateLimitInterceptor requestRateLimitInterceptor;
|
||||||
private final RequireGaoPermissionInterceptor requireGaoPermissionInterceptor;
|
private final RequireGaoPermissionInterceptor requireGaoPermissionInterceptor;
|
||||||
private final RequireCorePermissionInterceptor requireCorePermissionInterceptor;
|
private final RequireCorePermissionInterceptor requireCorePermissionInterceptor;
|
||||||
@@ -58,7 +56,6 @@ public class WebConfig implements WebMvcConfigurer {
|
|||||||
registry.addInterceptor(journalAPIInterceptor).addPathPatterns(JournalAPIInterceptor.PATH);
|
registry.addInterceptor(journalAPIInterceptor).addPathPatterns(JournalAPIInterceptor.PATH);
|
||||||
registry.addInterceptor(enableSettingInterceptor).addPathPatterns("/**");
|
registry.addInterceptor(enableSettingInterceptor).addPathPatterns("/**");
|
||||||
registry.addInterceptor(requireCorePermissionInterceptor).addPathPatterns("/**");
|
registry.addInterceptor(requireCorePermissionInterceptor).addPathPatterns("/**");
|
||||||
registry.addInterceptor(requireGaoRoleInterceptor).addPathPatterns("/**");
|
|
||||||
registry.addInterceptor(requireGaoPermissionInterceptor).addPathPatterns("/**");
|
registry.addInterceptor(requireGaoPermissionInterceptor).addPathPatterns("/**");
|
||||||
registry.addInterceptor(requestRateLimitInterceptor).addPathPatterns("/**");
|
registry.addInterceptor(requestRateLimitInterceptor).addPathPatterns("/**");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,6 +32,8 @@ public enum SettingModule {
|
|||||||
|
|
||||||
TEMP_FILE(Setting.Module.TempFile.class),
|
TEMP_FILE(Setting.Module.TempFile.class),
|
||||||
|
|
||||||
|
USER(Setting.Module.User.class),
|
||||||
|
|
||||||
SYSTEM(Setting.Module.System.class),
|
SYSTEM(Setting.Module.System.class),
|
||||||
|
|
||||||
SYSTEM_STATUS(Setting.Module.SystemStatus.class);
|
SYSTEM_STATUS(Setting.Module.SystemStatus.class);
|
||||||
|
|||||||
@@ -0,0 +1,111 @@
|
|||||||
|
package com.imyeyu.api.modules.common.controller;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonView;
|
||||||
|
import com.imyeyu.api.modules.common.entity.Tag;
|
||||||
|
import com.imyeyu.api.modules.common.entity.TagApply;
|
||||||
|
import com.imyeyu.api.modules.common.service.TagService;
|
||||||
|
import com.imyeyu.spring.annotation.AOPLog;
|
||||||
|
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 lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/// 标签接口
|
||||||
|
///
|
||||||
|
/// @author 夜雨
|
||||||
|
/// @since 2026-08-12 15:09
|
||||||
|
@Slf4j
|
||||||
|
@RestController
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
@RequestMapping("/tag")
|
||||||
|
public class TagController {
|
||||||
|
|
||||||
|
private final TagService service;
|
||||||
|
|
||||||
|
/// 查询标签列表
|
||||||
|
///
|
||||||
|
/// @param page 分页参数
|
||||||
|
/// @return 标签分页
|
||||||
|
@RequestRateLimit
|
||||||
|
@JsonView(ResponseView.Public.class)
|
||||||
|
@PostMapping("/list")
|
||||||
|
public PageResult<Tag> list(@RequestBody Page<Tag> page) {
|
||||||
|
return service.page(page);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 查询标签详情
|
||||||
|
///
|
||||||
|
/// @param id 标签 ID
|
||||||
|
/// @return 标签详情
|
||||||
|
@RequestRateLimit
|
||||||
|
@JsonView(ResponseView.Public.class)
|
||||||
|
@PostMapping("/detail")
|
||||||
|
public Tag detail(@RequestParam String id) {
|
||||||
|
return service.get(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 创建标签
|
||||||
|
///
|
||||||
|
/// @param tag 标签
|
||||||
|
/// @return 标签
|
||||||
|
@AOPLog
|
||||||
|
@RequestRateLimit
|
||||||
|
@JsonView(ResponseView.Public.class)
|
||||||
|
@PostMapping("/create")
|
||||||
|
public Tag create(@RequestBody Tag tag) {
|
||||||
|
service.create(tag);
|
||||||
|
return tag;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 更新标签
|
||||||
|
///
|
||||||
|
/// @param tag 标签
|
||||||
|
@AOPLog
|
||||||
|
@RequestRateLimit
|
||||||
|
@PostMapping("/update")
|
||||||
|
public void update(@RequestBody Tag tag) {
|
||||||
|
service.update(tag);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 删除标签
|
||||||
|
///
|
||||||
|
/// @param id 标签 ID
|
||||||
|
@AOPLog
|
||||||
|
@RequestRateLimit
|
||||||
|
@PostMapping("/delete")
|
||||||
|
public void delete(@RequestParam String id) {
|
||||||
|
service.delete(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 按业务查询标签
|
||||||
|
///
|
||||||
|
/// @param bizType 业务类型
|
||||||
|
/// @param bizId 业务 ID
|
||||||
|
/// @return 标签列表
|
||||||
|
@RequestRateLimit
|
||||||
|
@JsonView(ResponseView.Public.class)
|
||||||
|
@GetMapping("/list/biz/id")
|
||||||
|
public List<Tag> listByBizType(@RequestParam TagApply.BizType bizType, @RequestParam String bizId) {
|
||||||
|
return service.listByBizType(bizType, bizId);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 差分保存业务标签
|
||||||
|
///
|
||||||
|
/// @param apply 标签请求
|
||||||
|
@AOPLog
|
||||||
|
@RequestRateLimit
|
||||||
|
@PostMapping("/apply")
|
||||||
|
public void apply(@RequestBody TagApply apply) {
|
||||||
|
service.apply(apply.getBizType(), apply.getBizId(), apply.getTagIdList());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,23 +1,43 @@
|
|||||||
package com.imyeyu.api.modules.common.entity;
|
package com.imyeyu.api.modules.common.entity;
|
||||||
|
|
||||||
|
import com.imyeyu.api.annotation.MultilingualField;
|
||||||
import com.imyeyu.spring.annotation.table.Transient;
|
import com.imyeyu.spring.annotation.table.Transient;
|
||||||
import com.imyeyu.spring.entity.UUIDEntity;
|
import com.imyeyu.spring.entity.UUIDEntity;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
|
|
||||||
/**
|
/// 标签
|
||||||
* @author 夜雨
|
///
|
||||||
* @since 2024-08-28 14:26
|
/// @author 夜雨
|
||||||
*/
|
/// @since 2024-08-28 14:26
|
||||||
@Data
|
@Data
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
public class Tag extends UUIDEntity {
|
public class Tag extends UUIDEntity {
|
||||||
|
|
||||||
protected String langKey;
|
///
|
||||||
|
///
|
||||||
|
/// @author 夜雨
|
||||||
|
/// @since 2026-08-12 16:49
|
||||||
|
public enum OwnerType {
|
||||||
|
|
||||||
|
GAO_STORE
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 归属类型
|
||||||
|
protected OwnerType ownerType;
|
||||||
|
|
||||||
|
/// 归属 ID
|
||||||
|
protected String ownerId;
|
||||||
|
|
||||||
|
/// 名称多语言 ID
|
||||||
|
protected String nameLangId;
|
||||||
|
|
||||||
|
/// 当前语言名称
|
||||||
@Transient
|
@Transient
|
||||||
protected String value;
|
@MultilingualField("nameLangId")
|
||||||
|
protected String name;
|
||||||
|
|
||||||
|
/// 中文名称
|
||||||
@Transient
|
@Transient
|
||||||
protected String zhCN;
|
protected String zhCN;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,12 @@
|
|||||||
package com.imyeyu.api.modules.common.entity;
|
package com.imyeyu.api.modules.common.entity;
|
||||||
|
|
||||||
|
import com.imyeyu.spring.annotation.table.Transient;
|
||||||
import com.imyeyu.spring.entity.UUIDEntity;
|
import com.imyeyu.spring.entity.UUIDEntity;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 标签应用
|
* 标签应用
|
||||||
*
|
*
|
||||||
@@ -14,12 +17,25 @@ import lombok.EqualsAndHashCode;
|
|||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
public class TagApply extends UUIDEntity {
|
public class TagApply extends UUIDEntity {
|
||||||
|
|
||||||
|
///
|
||||||
|
///
|
||||||
|
/// @author 夜雨
|
||||||
|
/// @since 2026-08-12 14:27
|
||||||
|
public enum BizType {
|
||||||
|
|
||||||
|
GAO_CUSTOMER
|
||||||
|
}
|
||||||
|
|
||||||
/** 业务类型 */
|
/** 业务类型 */
|
||||||
protected String bizType;
|
protected BizType bizType;
|
||||||
|
|
||||||
/** 业务 ID */
|
/** 业务 ID */
|
||||||
protected String bizId;
|
protected String bizId;
|
||||||
|
|
||||||
/** 标签 ID */
|
/** 标签 ID */
|
||||||
protected String tagId;
|
protected String tagId;
|
||||||
|
|
||||||
|
/// 标签 ID 列表
|
||||||
|
@Transient
|
||||||
|
private List<String> tagIdList;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
package com.imyeyu.api.modules.common.mapper;
|
||||||
|
|
||||||
|
import com.imyeyu.api.modules.common.entity.TagApply;
|
||||||
|
import com.imyeyu.spring.mapper.BaseMapper;
|
||||||
|
|
||||||
|
/// 标签应用 Mapper
|
||||||
|
///
|
||||||
|
/// @author 夜雨
|
||||||
|
/// @since 2026-08-12 15:05
|
||||||
|
public interface TagApplyMapper extends BaseMapper<TagApply, String> {
|
||||||
|
}
|
||||||
@@ -2,10 +2,18 @@ package com.imyeyu.api.modules.common.mapper;
|
|||||||
|
|
||||||
import com.imyeyu.api.modules.common.entity.Tag;
|
import com.imyeyu.api.modules.common.entity.Tag;
|
||||||
import com.imyeyu.spring.mapper.BaseMapper;
|
import com.imyeyu.spring.mapper.BaseMapper;
|
||||||
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author 夜雨
|
* @author 夜雨
|
||||||
* @since 2025-05-30 22:48
|
* @since 2025-05-30 22:48
|
||||||
*/
|
*/
|
||||||
public interface TagMapper extends BaseMapper<Tag, String> {
|
public interface TagMapper extends BaseMapper<Tag, String> {
|
||||||
|
|
||||||
|
List<Tag> selectByIdList(Collection<String> idList);
|
||||||
|
|
||||||
|
Tag selectByOwnerAndZhCN(@Param("ownerType") Tag.OwnerType ownerType, @Param("ownerId") String ownerId, @Param("zhCN") String zhCN);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
package com.imyeyu.api.modules.common.service;
|
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.bean.attachment.SettingSupport;
|
||||||
import com.imyeyu.api.modules.common.entity.Setting;
|
import com.imyeyu.api.modules.common.entity.Setting;
|
||||||
import com.imyeyu.java.TimiJava;
|
import com.imyeyu.java.TimiJava;
|
||||||
import com.imyeyu.spring.service.BaseService;
|
import com.imyeyu.spring.service.BaseService;
|
||||||
import com.imyeyu.utils.Text;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -19,7 +19,7 @@ public interface SettingService extends BaseService<Setting, String> {
|
|||||||
Setting getByCode(String bizType, String bizId, String code);
|
Setting getByCode(String bizType, String bizId, String code);
|
||||||
|
|
||||||
default Setting getSystem(Enum<?> bizType) {
|
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);
|
List<Setting> listByBizId(String bizType, String bizId);
|
||||||
|
|||||||
@@ -1,11 +1,31 @@
|
|||||||
package com.imyeyu.api.modules.common.service;
|
package com.imyeyu.api.modules.common.service;
|
||||||
|
|
||||||
import com.imyeyu.api.modules.common.entity.Tag;
|
import com.imyeyu.api.modules.common.entity.Tag;
|
||||||
|
import com.imyeyu.api.modules.common.entity.TagApply;
|
||||||
import com.imyeyu.spring.service.BaseService;
|
import com.imyeyu.spring.service.BaseService;
|
||||||
|
|
||||||
/**
|
import java.util.Collection;
|
||||||
* @author 夜雨
|
import java.util.List;
|
||||||
* @since 2025-05-30 22:46
|
|
||||||
*/
|
/// 标签服务
|
||||||
|
///
|
||||||
|
/// @author 夜雨
|
||||||
|
/// @since 2025-05-30 22:46
|
||||||
public interface TagService extends BaseService<Tag, String> {
|
public interface TagService extends BaseService<Tag, String> {
|
||||||
|
|
||||||
|
List<Tag> listByIdList(Collection<String> idList);
|
||||||
|
|
||||||
|
/// 按业务查询标签列表
|
||||||
|
///
|
||||||
|
/// @param bizType 业务类型
|
||||||
|
/// @param bizId 业务 ID
|
||||||
|
/// @return 标签列表
|
||||||
|
List<Tag> listByBizType(TagApply.BizType bizType, String bizId);
|
||||||
|
|
||||||
|
/// 差分保存业务标签
|
||||||
|
///
|
||||||
|
/// @param bizType 业务类型
|
||||||
|
/// @param bizId 业务 ID
|
||||||
|
/// @param tagIdList 标签 ID 列表
|
||||||
|
void apply(TagApply.BizType bizType, String bizId, List<String> tagIdList);
|
||||||
}
|
}
|
||||||
|
|||||||
+88
-4
@@ -1,27 +1,111 @@
|
|||||||
package com.imyeyu.api.modules.common.service.implement;
|
package com.imyeyu.api.modules.common.service.implement;
|
||||||
|
|
||||||
import com.imyeyu.api.modules.common.entity.Tag;
|
import com.imyeyu.api.modules.common.entity.Tag;
|
||||||
|
import com.imyeyu.api.modules.common.entity.TagApply;
|
||||||
|
import com.imyeyu.api.modules.common.mapper.TagApplyMapper;
|
||||||
import com.imyeyu.api.modules.common.mapper.TagMapper;
|
import com.imyeyu.api.modules.common.mapper.TagMapper;
|
||||||
|
import com.imyeyu.api.modules.common.service.MultilingualService;
|
||||||
import com.imyeyu.api.modules.common.service.TagService;
|
import com.imyeyu.api.modules.common.service.TagService;
|
||||||
|
import com.imyeyu.java.bean.timi.TimiException;
|
||||||
import com.imyeyu.spring.mapper.BaseMapper;
|
import com.imyeyu.spring.mapper.BaseMapper;
|
||||||
import com.imyeyu.spring.service.AbstractEntityService;
|
import com.imyeyu.spring.service.AbstractEntityService;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
/**
|
import java.util.Collection;
|
||||||
* @author 夜雨
|
import java.util.HashSet;
|
||||||
* @since 2025-05-30 22:47
|
import java.util.LinkedHashSet;
|
||||||
*/
|
import java.util.List;
|
||||||
|
|
||||||
|
/// 标签服务实现
|
||||||
|
///
|
||||||
|
/// @author 夜雨
|
||||||
|
/// @since 2025-05-30 22:47
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Service
|
@Service
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class TagServiceImplement extends AbstractEntityService<Tag, String> implements TagService {
|
public class TagServiceImplement extends AbstractEntityService<Tag, String> implements TagService {
|
||||||
|
|
||||||
private final TagMapper mapper;
|
private final TagMapper mapper;
|
||||||
|
private final TagApplyMapper applyMapper;
|
||||||
|
private final MultilingualService multilingualService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected BaseMapper<Tag, String> mapper() {
|
protected BaseMapper<Tag, String> mapper() {
|
||||||
return mapper;
|
return mapper;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void create(Tag tag) {
|
||||||
|
TimiException.required(tag, "not found tag");
|
||||||
|
TimiException.required(tag.getZhCN(), "not found tag.zhCN");
|
||||||
|
TimiException.required(tag.getOwnerType(), "not found ownerType");
|
||||||
|
TimiException.required(tag.getOwnerId(), "not found ownerId");
|
||||||
|
checkZhCNUniqueInOwner(tag, null);
|
||||||
|
tag.setNameLangId(multilingualService.create(tag.getZhCN()));
|
||||||
|
super.create(tag);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void update(Tag tag) {
|
||||||
|
TimiException.required(tag, "not found tag");
|
||||||
|
TimiException.required(tag.getId(), "not found tag.id");
|
||||||
|
Tag dbTag = get(tag.getId());
|
||||||
|
TimiException.required(dbTag, "not found tag");
|
||||||
|
tag.setOwnerType(dbTag.getOwnerType());
|
||||||
|
tag.setOwnerId(dbTag.getOwnerId());
|
||||||
|
if (tag.getZhCN() != null) {
|
||||||
|
if (tag.getNameLangId() == null) {
|
||||||
|
tag.setNameLangId(dbTag.getNameLangId());
|
||||||
|
}
|
||||||
|
checkZhCNUniqueInOwner(tag, tag.getId());
|
||||||
|
tag.setNameLangId(multilingualService.createIfDifferent(tag.getNameLangId(), tag.getZhCN()));
|
||||||
|
}
|
||||||
|
super.update(tag);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<Tag> listByIdList(Collection<String> idList) {
|
||||||
|
return mapper.selectByIdList(new HashSet<>(idList));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<Tag> listByBizType(TagApply.BizType bizType, String bizId) {
|
||||||
|
return listByIdList(listApply(bizType, bizId).stream().map(TagApply::getTagId).toList());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void apply(TagApply.BizType bizType, String bizId, List<String> tagIdList) {
|
||||||
|
LinkedHashSet<String> tagIdSet = new LinkedHashSet<>(tagIdList == null ? List.of() : tagIdList);
|
||||||
|
for (TagApply apply : listApply(bizType, bizId)) {
|
||||||
|
if (tagIdSet.remove(apply.getTagId())) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
applyMapper.delete(apply.getId());
|
||||||
|
}
|
||||||
|
List<Tag> tagList = listByIdList(tagIdSet);
|
||||||
|
for (Tag tag : tagList) {
|
||||||
|
TagApply apply = new TagApply();
|
||||||
|
apply.setBizType(bizType);
|
||||||
|
apply.setBizId(bizId);
|
||||||
|
apply.setTagId(tag.getId());
|
||||||
|
applyMapper.insert(apply);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<TagApply> listApply(TagApply.BizType bizType, String bizId) {
|
||||||
|
TimiException.required(bizType, "not found bizType");
|
||||||
|
TimiException.required(bizId, "not found bizId");
|
||||||
|
|
||||||
|
TagApply example = new TagApply();
|
||||||
|
example.setBizType(bizType);
|
||||||
|
example.setBizId(bizId);
|
||||||
|
return applyMapper.selectAllByExample(example);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkZhCNUniqueInOwner(Tag tag, String allowedId) {
|
||||||
|
Tag existed = mapper.selectByOwnerAndZhCN(tag.getOwnerType(), tag.getOwnerId(), tag.getZhCN());
|
||||||
|
TimiException.requiredTrue(existed == null || existed.getId().equals(allowedId), "该标签名称已存在");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,15 +0,0 @@
|
|||||||
package com.imyeyu.api.modules.common.vo.tag;
|
|
||||||
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author 夜雨
|
|
||||||
* @since 2025-05-30 22:58
|
|
||||||
*/
|
|
||||||
@Data
|
|
||||||
public class TagRequest {
|
|
||||||
|
|
||||||
private String bizId;
|
|
||||||
|
|
||||||
private String zhCN;
|
|
||||||
}
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
package com.imyeyu.api.modules.gao.annotation;
|
|
||||||
|
|
||||||
import com.imyeyu.api.bean.RoleMatchMode;
|
|
||||||
import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
|
|
||||||
|
|
||||||
import java.lang.annotation.ElementType;
|
|
||||||
import java.lang.annotation.Retention;
|
|
||||||
import java.lang.annotation.RetentionPolicy;
|
|
||||||
import java.lang.annotation.Target;
|
|
||||||
|
|
||||||
///
|
|
||||||
/// 要求 GAO 模块角色
|
|
||||||
///
|
|
||||||
/// @author Codex
|
|
||||||
/// @since 2026-07-26
|
|
||||||
@Target({ElementType.METHOD, ElementType.TYPE})
|
|
||||||
@Retention(RetentionPolicy.RUNTIME)
|
|
||||||
public @interface RequireGaoRole {
|
|
||||||
|
|
||||||
/// 所需角色
|
|
||||||
///
|
|
||||||
/// @return 角色列表
|
|
||||||
GaoRoleCode[] value();
|
|
||||||
|
|
||||||
/// 匹配模式
|
|
||||||
///
|
|
||||||
/// @return 匹配模式
|
|
||||||
RoleMatchMode mode() default RoleMatchMode.ALL;
|
|
||||||
}
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
package com.imyeyu.api.modules.gao.annotation;
|
|
||||||
|
|
||||||
import com.imyeyu.api.bean.ModuleCode;
|
|
||||||
import com.imyeyu.api.bean.RoleMatchMode;
|
|
||||||
import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
|
|
||||||
import com.imyeyu.api.modules.user.service.RoleChecker;
|
|
||||||
import com.imyeyu.java.TimiJava;
|
|
||||||
import jakarta.servlet.http.HttpServletRequest;
|
|
||||||
import jakarta.servlet.http.HttpServletResponse;
|
|
||||||
import org.springframework.lang.NonNull;
|
|
||||||
import org.springframework.core.annotation.AnnotatedElementUtils;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
import org.springframework.web.method.HandlerMethod;
|
|
||||||
import org.springframework.web.servlet.HandlerInterceptor;
|
|
||||||
|
|
||||||
///
|
|
||||||
/// GAO 角色注解处理器
|
|
||||||
///
|
|
||||||
/// @author Codex
|
|
||||||
/// @since 2026-07-27
|
|
||||||
@Component
|
|
||||||
public class RequireGaoRoleInterceptor implements HandlerInterceptor {
|
|
||||||
|
|
||||||
private final RoleChecker roleChecker;
|
|
||||||
|
|
||||||
public RequireGaoRoleInterceptor(RoleChecker roleChecker) {
|
|
||||||
this.roleChecker = roleChecker;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean preHandle(@NonNull HttpServletRequest req, @NonNull HttpServletResponse resp, @NonNull Object handler) {
|
|
||||||
if (!(handler instanceof HandlerMethod handlerMethod)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
RequireGaoRole annotation = handlerMethod.getMethodAnnotation(RequireGaoRole.class);
|
|
||||||
if (annotation == null) {
|
|
||||||
annotation = AnnotatedElementUtils.findMergedAnnotation(handlerMethod.getBeanType(), RequireGaoRole.class);
|
|
||||||
}
|
|
||||||
if (annotation == null || TimiJava.isEmpty(annotation.value())) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
String[] roleCodeList = java.util.Arrays.stream(annotation.value()).map(GaoRoleCode::name).toArray(String[]::new);
|
|
||||||
if (annotation.mode() == RoleMatchMode.ANY) {
|
|
||||||
roleChecker.checkAny(ModuleCode.GAO, roleCodeList);
|
|
||||||
} else {
|
|
||||||
roleChecker.checkAll(ModuleCode.GAO, roleCodeList);
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -84,7 +84,7 @@ public enum GaoPermissionCode implements BuiltinPermissionCode {
|
|||||||
@Getter
|
@Getter
|
||||||
final boolean grantToStoreManager;
|
final boolean grantToStoreManager;
|
||||||
|
|
||||||
/// `true` 为初始化时授权给全局管理员角色
|
/// `true` 为初始化时授权给门店管理角色
|
||||||
@Getter
|
@Getter
|
||||||
final boolean grantToGlobalManager;
|
final boolean grantToGlobalManager;
|
||||||
|
|
||||||
|
|||||||
@@ -12,8 +12,8 @@ import lombok.AllArgsConstructor;
|
|||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public enum GaoRoleCode implements BuiltinRoleCode {
|
public enum GaoRoleCode implements BuiltinRoleCode {
|
||||||
|
|
||||||
/// 全局管理员
|
/// 门店管理
|
||||||
GLOBAL_MANAGER("全局管理员", null),
|
GLOBAL_MANAGER("门店管理", null),
|
||||||
|
|
||||||
/// 店长
|
/// 店长
|
||||||
STORE_MANAGER("店长", GLOBAL_MANAGER.name());
|
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;
|
||||||
|
}
|
||||||
@@ -12,6 +12,7 @@ import com.imyeyu.api.modules.gao.service.GaoCustomerService;
|
|||||||
import com.imyeyu.api.modules.gao.service.GaoStoreService;
|
import com.imyeyu.api.modules.gao.service.GaoStoreService;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateView;
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateView;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
|
||||||
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerPage;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoCustomerTrendStateReq;
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerTrendStateReq;
|
||||||
import com.imyeyu.api.modules.user.service.RoleChecker;
|
import com.imyeyu.api.modules.user.service.RoleChecker;
|
||||||
import com.imyeyu.api.modules.user.service.UserLoginService;
|
import com.imyeyu.api.modules.user.service.UserLoginService;
|
||||||
@@ -60,8 +61,8 @@ public class GaoCustomerController {
|
|||||||
@RequireGaoPermission(GaoPermissionCode.CUSTOMER_READ)
|
@RequireGaoPermission(GaoPermissionCode.CUSTOMER_READ)
|
||||||
@PostMapping("/list")
|
@PostMapping("/list")
|
||||||
@JsonView(ResponseView.Public.class)
|
@JsonView(ResponseView.Public.class)
|
||||||
public PageResult<GaoCustomer> list(@RequestBody Page<GaoCustomer> page) {
|
public PageResult<GaoCustomer> list(@RequestBody GaoCustomerPage page) {
|
||||||
PageResult<GaoCustomer> result = service.page(page);
|
PageResult<GaoCustomer> result = service.pageByQuery(page);
|
||||||
|
|
||||||
List<String> idList = result.getList().stream().map(GaoCustomer::getId).distinct().toList();
|
List<String> idList = result.getList().stream().map(GaoCustomer::getId).distinct().toList();
|
||||||
Map<String, List<Attachment>> attachmentMap = attachmentService.mapByBizIdList(Attachment.BizType.GAO_CUSTOMER, idList);
|
Map<String, List<Attachment>> attachmentMap = attachmentService.mapByBizIdList(Attachment.BizType.GAO_CUSTOMER, idList);
|
||||||
|
|||||||
@@ -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.service.GaoStoreService;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoCustomerEventRankView;
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerEventRankView;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoEventRecordPage;
|
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.gao.vo.GaoEventRecordRankPage;
|
||||||
import com.imyeyu.api.modules.user.service.RoleChecker;
|
import com.imyeyu.api.modules.user.service.RoleChecker;
|
||||||
import com.imyeyu.api.modules.user.service.UserLoginService;
|
import com.imyeyu.api.modules.user.service.UserLoginService;
|
||||||
@@ -64,8 +65,12 @@ public class GaoEventRecordController {
|
|||||||
@RequireGaoPermission(GaoPermissionCode.EVENT_RECORD_READ)
|
@RequireGaoPermission(GaoPermissionCode.EVENT_RECORD_READ)
|
||||||
@PostMapping("/list")
|
@PostMapping("/list")
|
||||||
@JsonView(ResponseView.Public.class)
|
@JsonView(ResponseView.Public.class)
|
||||||
public PageResult<GaoEventRecord> list(@RequestBody GaoEventRecordPage page) {
|
public GaoEventRecordPageResult list(@RequestBody GaoEventRecordPage page) {
|
||||||
PageResult<GaoEventRecord> result = service.pageByRange(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();
|
List<String> customerIdList = result.getList().stream().map(GaoEventRecord::getCustomerId).toList();
|
||||||
Map<String, GaoEvent> eventMap = eventService.mapByIdList(result.getList().stream().map(GaoEventRecord::getEventId).toList());
|
Map<String, GaoEvent> eventMap = eventService.mapByIdList(result.getList().stream().map(GaoEventRecord::getEventId).toList());
|
||||||
@@ -80,6 +85,22 @@ public class GaoEventRecordController {
|
|||||||
return result;
|
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
|
@AOPLog
|
||||||
@RequestRateLimit
|
@RequestRateLimit
|
||||||
@RequireGaoPermission(GaoPermissionCode.EVENT_RECORD_READ)
|
@RequireGaoPermission(GaoPermissionCode.EVENT_RECORD_READ)
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
package com.imyeyu.api.modules.gao.controller;
|
package com.imyeyu.api.modules.gao.controller;
|
||||||
|
|
||||||
|
import com.imyeyu.api.annotation.RequireCorePermission;
|
||||||
|
import com.imyeyu.api.bean.CorePermissionCode;
|
||||||
import com.imyeyu.api.bean.ModuleCode;
|
import com.imyeyu.api.bean.ModuleCode;
|
||||||
import com.imyeyu.api.modules.gao.annotation.RequireGaoRole;
|
|
||||||
import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
|
|
||||||
import com.imyeyu.api.modules.user.entity.Role;
|
import com.imyeyu.api.modules.user.entity.Role;
|
||||||
import com.imyeyu.api.modules.user.service.AuthorizationScopeService;
|
import com.imyeyu.api.modules.user.service.AuthorizationScopeService;
|
||||||
import com.imyeyu.api.modules.user.service.UserLoginService;
|
import com.imyeyu.api.modules.user.service.UserLoginService;
|
||||||
@@ -20,7 +20,6 @@ import java.util.List;
|
|||||||
/// @author 夜雨
|
/// @author 夜雨
|
||||||
/// @since 2026-07-28 14:15
|
/// @since 2026-07-28 14:15
|
||||||
@RestController
|
@RestController
|
||||||
@RequireGaoRole(GaoRoleCode.STORE_MANAGER)
|
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@RequestMapping("/gao/role")
|
@RequestMapping("/gao/role")
|
||||||
public class GaoRoleController {
|
public class GaoRoleController {
|
||||||
@@ -30,6 +29,7 @@ public class GaoRoleController {
|
|||||||
|
|
||||||
@AOPLog
|
@AOPLog
|
||||||
@RequestRateLimit
|
@RequestRateLimit
|
||||||
|
@RequireCorePermission(CorePermissionCode.ROLE_READ)
|
||||||
@PostMapping("/available/list")
|
@PostMapping("/available/list")
|
||||||
public List<Role> availableList() {
|
public List<Role> availableList() {
|
||||||
return authorizationScopeService.listGrantableRole(userLoginService.getRequireLoginUserId(), ModuleCode.GAO);
|
return authorizationScopeService.listGrantableRole(userLoginService.getRequireLoginUserId(), ModuleCode.GAO);
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
package com.imyeyu.api.modules.gao.controller;
|
package com.imyeyu.api.modules.gao.controller;
|
||||||
|
|
||||||
import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
|
import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
|
||||||
import com.imyeyu.api.modules.gao.annotation.RequireGaoRole;
|
|
||||||
import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
|
import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
|
||||||
import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
|
|
||||||
import com.imyeyu.api.modules.gao.entity.GaoStoreBusinessDay;
|
import com.imyeyu.api.modules.gao.entity.GaoStoreBusinessDay;
|
||||||
import com.imyeyu.api.modules.gao.service.GaoStoreBusinessDayService;
|
import com.imyeyu.api.modules.gao.service.GaoStoreBusinessDayService;
|
||||||
import com.imyeyu.spring.annotation.AOPLog;
|
import com.imyeyu.spring.annotation.AOPLog;
|
||||||
|
|||||||
@@ -1,12 +1,13 @@
|
|||||||
package com.imyeyu.api.modules.gao.controller;
|
package com.imyeyu.api.modules.gao.controller;
|
||||||
|
|
||||||
|
import com.imyeyu.api.bean.ModuleCode;
|
||||||
import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
|
import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
|
||||||
import com.imyeyu.api.modules.gao.annotation.RequireGaoRole;
|
|
||||||
import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
|
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.GaoStore;
|
||||||
import com.imyeyu.api.modules.gao.service.GaoStoreService;
|
import com.imyeyu.api.modules.gao.service.GaoStoreService;
|
||||||
|
import com.imyeyu.api.modules.user.service.PermissionChecker;
|
||||||
import com.imyeyu.api.modules.user.service.UserLoginService;
|
import com.imyeyu.api.modules.user.service.UserLoginService;
|
||||||
|
import com.imyeyu.java.TimiJava;
|
||||||
import com.imyeyu.network.Network;
|
import com.imyeyu.network.Network;
|
||||||
import com.imyeyu.spring.TimiSpring;
|
import com.imyeyu.spring.TimiSpring;
|
||||||
import com.imyeyu.spring.annotation.AOPLog;
|
import com.imyeyu.spring.annotation.AOPLog;
|
||||||
@@ -37,9 +38,9 @@ public class GaoStoreController {
|
|||||||
|
|
||||||
private final GaoStoreService service;
|
private final GaoStoreService service;
|
||||||
private final UserLoginService userLoginService;
|
private final UserLoginService userLoginService;
|
||||||
|
private final PermissionChecker permissionChecker;
|
||||||
|
|
||||||
@AOPLog
|
@AOPLog
|
||||||
@RequireGaoRole(GaoRoleCode.GLOBAL_MANAGER)
|
|
||||||
@RequestRateLimit
|
@RequestRateLimit
|
||||||
@RequireGaoPermission(GaoPermissionCode.STORE_READ)
|
@RequireGaoPermission(GaoPermissionCode.STORE_READ)
|
||||||
@PostMapping("/list")
|
@PostMapping("/list")
|
||||||
@@ -48,7 +49,6 @@ public class GaoStoreController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@AOPLog
|
@AOPLog
|
||||||
@RequireGaoRole(GaoRoleCode.STORE_MANAGER)
|
|
||||||
@RequestRateLimit
|
@RequestRateLimit
|
||||||
@RequireGaoPermission(GaoPermissionCode.STORE_READ)
|
@RequireGaoPermission(GaoPermissionCode.STORE_READ)
|
||||||
@PostMapping("/detail")
|
@PostMapping("/detail")
|
||||||
@@ -66,16 +66,26 @@ public class GaoStoreController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@AOPLog
|
@AOPLog
|
||||||
@RequireGaoRole(GaoRoleCode.STORE_MANAGER)
|
|
||||||
@RequestRateLimit
|
@RequestRateLimit
|
||||||
@RequireGaoPermission(GaoPermissionCode.STORE_UPDATE)
|
@RequireGaoPermission(GaoPermissionCode.STORE_UPDATE)
|
||||||
@PostMapping("/update")
|
@PostMapping("/update")
|
||||||
public void update(@RequestBody GaoStore store) {
|
public void update(@RequestBody GaoStore store) {
|
||||||
service.update(store);
|
if (permissionChecker.hasAny(ModuleCode.GAO, GaoPermissionCode.STORE_CREATE.getValue())) {
|
||||||
|
// 门店管理
|
||||||
|
service.update(store);
|
||||||
|
} else {
|
||||||
|
// 店长
|
||||||
|
GaoStore dbStore = service.get(store.getId());
|
||||||
|
dbStore.setName(store.getName());
|
||||||
|
dbStore.setTelephone(store.getTelephone());
|
||||||
|
dbStore.setAddress(store.getAddress());
|
||||||
|
dbStore.setRemark(store.getRemark());
|
||||||
|
dbStore.setAutoClosedDay(TimiJava.defaultIfNull(store.getAutoClosedDay(), false));
|
||||||
|
service.update(dbStore);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@AOPLog
|
@AOPLog
|
||||||
@RequireGaoRole(GaoRoleCode.GLOBAL_MANAGER)
|
|
||||||
@RequestRateLimit
|
@RequestRateLimit
|
||||||
@RequireGaoPermission(GaoPermissionCode.STORE_DELETE)
|
@RequireGaoPermission(GaoPermissionCode.STORE_DELETE)
|
||||||
@PostMapping("/delete")
|
@PostMapping("/delete")
|
||||||
@@ -84,7 +94,6 @@ public class GaoStoreController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@AOPLog
|
@AOPLog
|
||||||
@RequireGaoRole(GaoRoleCode.GLOBAL_MANAGER)
|
|
||||||
@RequestRateLimit
|
@RequestRateLimit
|
||||||
@RequireGaoPermission(GaoPermissionCode.STORE_UPDATE)
|
@RequireGaoPermission(GaoPermissionCode.STORE_UPDATE)
|
||||||
@PostMapping("/sort")
|
@PostMapping("/sort")
|
||||||
|
|||||||
@@ -0,0 +1,139 @@
|
|||||||
|
package com.imyeyu.api.modules.gao.controller;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonView;
|
||||||
|
import com.imyeyu.api.annotation.RequireCorePermission;
|
||||||
|
import com.imyeyu.api.bean.CorePermissionCode;
|
||||||
|
import com.imyeyu.api.bean.ModuleCode;
|
||||||
|
import com.imyeyu.api.modules.common.entity.Tag;
|
||||||
|
import com.imyeyu.api.modules.common.entity.TagApply;
|
||||||
|
import com.imyeyu.api.modules.common.service.TagService;
|
||||||
|
import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
|
||||||
|
import com.imyeyu.api.modules.gao.service.GaoStoreService;
|
||||||
|
import com.imyeyu.api.modules.user.service.RoleChecker;
|
||||||
|
import com.imyeyu.java.TimiJava;
|
||||||
|
import com.imyeyu.java.bean.timi.TimiException;
|
||||||
|
import com.imyeyu.spring.annotation.AOPLog;
|
||||||
|
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 lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/// GAO 标签接口
|
||||||
|
///
|
||||||
|
/// @author Codex
|
||||||
|
/// @since 2026-08-13
|
||||||
|
@RestController
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
@RequestMapping("/gao/tag")
|
||||||
|
public class GaoTagController {
|
||||||
|
|
||||||
|
private final TagService service;
|
||||||
|
private final RoleChecker roleChecker;
|
||||||
|
private final GaoStoreService storeService;
|
||||||
|
|
||||||
|
/// 查询标签列表
|
||||||
|
///
|
||||||
|
/// @param page 分页参数
|
||||||
|
/// @return 标签分页
|
||||||
|
@JsonView(ResponseView.Public.class)
|
||||||
|
@RequestRateLimit
|
||||||
|
@RequireCorePermission(CorePermissionCode.TAG_READ)
|
||||||
|
@PostMapping("/list")
|
||||||
|
public PageResult<Tag> list(@RequestBody Page<Tag> page) {
|
||||||
|
TimiException.required(page, "未找到分页参数");
|
||||||
|
page.setEqualsExample(TimiJava.defaultIfNull(page.getEqualsExample(), new Tag()));
|
||||||
|
page.getEqualsExample().setOwnerType(Tag.OwnerType.GAO_STORE);
|
||||||
|
if (!roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
|
||||||
|
page.getEqualsExample().setOwnerId(storeService.getBelongIdByRequiredLoginUserId());
|
||||||
|
}
|
||||||
|
return service.page(page);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 查询标签详情
|
||||||
|
///
|
||||||
|
/// @param id 标签 ID
|
||||||
|
/// @return 标签详情
|
||||||
|
@JsonView(ResponseView.Public.class)
|
||||||
|
@RequestRateLimit
|
||||||
|
@RequireCorePermission(CorePermissionCode.TAG_READ)
|
||||||
|
@PostMapping("/detail")
|
||||||
|
public Tag detail(@RequestParam String id) {
|
||||||
|
return service.get(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 创建标签
|
||||||
|
///
|
||||||
|
/// @param tag 标签
|
||||||
|
/// @return 标签
|
||||||
|
@AOPLog
|
||||||
|
@JsonView(ResponseView.Public.class)
|
||||||
|
@RequestRateLimit
|
||||||
|
@RequireCorePermission(CorePermissionCode.TAG_CREATE)
|
||||||
|
@PostMapping("/create")
|
||||||
|
public Tag create(@RequestBody Tag tag) {
|
||||||
|
tag.setOwnerType(Tag.OwnerType.GAO_STORE);
|
||||||
|
if (!roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
|
||||||
|
tag.setOwnerId(storeService.getBelongIdByRequiredLoginUserId());
|
||||||
|
}
|
||||||
|
service.create(tag);
|
||||||
|
return tag;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 更新标签
|
||||||
|
///
|
||||||
|
/// @param tag 标签
|
||||||
|
@AOPLog
|
||||||
|
@RequestRateLimit
|
||||||
|
@RequireCorePermission(CorePermissionCode.TAG_UPDATE)
|
||||||
|
@PostMapping("/update")
|
||||||
|
public void update(@RequestBody Tag tag) {
|
||||||
|
Tag dbTag = service.get(tag.getId());
|
||||||
|
tag.setOwnerType(dbTag.getOwnerType());
|
||||||
|
tag.setOwnerId(dbTag.getOwnerId());
|
||||||
|
service.update(tag);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 删除标签
|
||||||
|
///
|
||||||
|
/// @param id 标签 ID
|
||||||
|
@AOPLog
|
||||||
|
@RequestRateLimit
|
||||||
|
@RequireCorePermission(CorePermissionCode.TAG_DELETE)
|
||||||
|
@PostMapping("/delete")
|
||||||
|
public void delete(@RequestParam String id) {
|
||||||
|
service.delete(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 按业务查询标签
|
||||||
|
///
|
||||||
|
/// @param bizType 业务类型
|
||||||
|
/// @param bizId 业务 ID
|
||||||
|
/// @return 标签列表
|
||||||
|
@JsonView(ResponseView.Public.class)
|
||||||
|
@RequestRateLimit
|
||||||
|
@RequireCorePermission(CorePermissionCode.TAG_READ)
|
||||||
|
@GetMapping("/list/biz/id")
|
||||||
|
public List<Tag> listByBizType(@RequestParam TagApply.BizType bizType, @RequestParam String bizId) {
|
||||||
|
return service.listByBizType(bizType, bizId);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 差分保存业务标签
|
||||||
|
///
|
||||||
|
/// @param apply 标签请求
|
||||||
|
@AOPLog
|
||||||
|
@RequestRateLimit
|
||||||
|
@RequireCorePermission(CorePermissionCode.TAG_APPLY)
|
||||||
|
@PostMapping("/apply")
|
||||||
|
public void apply(@RequestBody TagApply apply) {
|
||||||
|
service.apply(apply.getBizType(), apply.getBizId(), apply.getTagIdList());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,12 +5,18 @@ import com.imyeyu.api.bean.ModuleCode;
|
|||||||
import com.imyeyu.api.modules.common.entity.Attachment;
|
import com.imyeyu.api.modules.common.entity.Attachment;
|
||||||
import com.imyeyu.api.modules.common.service.AttachmentService;
|
import com.imyeyu.api.modules.common.service.AttachmentService;
|
||||||
import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
|
import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
|
||||||
import com.imyeyu.api.modules.gao.annotation.RequireGaoRole;
|
|
||||||
import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
|
import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
|
||||||
import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
|
import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
|
||||||
import com.imyeyu.api.modules.gao.entity.GaoUser;
|
import com.imyeyu.api.modules.gao.entity.GaoUser;
|
||||||
import com.imyeyu.api.modules.gao.service.GaoStoreService;
|
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.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.Role;
|
||||||
import com.imyeyu.api.modules.user.entity.User;
|
import com.imyeyu.api.modules.user.entity.User;
|
||||||
import com.imyeyu.api.modules.user.service.RoleChecker;
|
import com.imyeyu.api.modules.user.service.RoleChecker;
|
||||||
@@ -18,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.UserLoginService;
|
||||||
import com.imyeyu.api.modules.user.service.UserRoleService;
|
import com.imyeyu.api.modules.user.service.UserRoleService;
|
||||||
import com.imyeyu.api.modules.user.service.UserService;
|
import com.imyeyu.api.modules.user.service.UserService;
|
||||||
|
import com.imyeyu.api.modules.user.vo.LoginResponse;
|
||||||
import com.imyeyu.java.TimiJava;
|
import com.imyeyu.java.TimiJava;
|
||||||
import com.imyeyu.spring.annotation.AOPLog;
|
import com.imyeyu.spring.annotation.AOPLog;
|
||||||
|
import com.imyeyu.spring.annotation.CaptchaValid;
|
||||||
import com.imyeyu.spring.annotation.RequestRateLimit;
|
import com.imyeyu.spring.annotation.RequestRateLimit;
|
||||||
import com.imyeyu.spring.bean.Page;
|
import com.imyeyu.spring.bean.Page;
|
||||||
import com.imyeyu.spring.bean.PageResult;
|
import com.imyeyu.spring.bean.PageResult;
|
||||||
import com.imyeyu.spring.util.ResponseView;
|
import com.imyeyu.spring.util.ResponseView;
|
||||||
|
import jakarta.validation.Valid;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
@@ -33,6 +42,7 @@ import org.springframework.web.bind.annotation.RestController;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
/// GAO 用户接口
|
/// GAO 用户接口
|
||||||
///
|
///
|
||||||
@@ -47,11 +57,38 @@ public class GaoUserController {
|
|||||||
private final RoleService roleService;
|
private final RoleService roleService;
|
||||||
private final RoleChecker roleChecker;
|
private final RoleChecker roleChecker;
|
||||||
private final GaoUserService service;
|
private final GaoUserService service;
|
||||||
|
private final GaoUserInviteService inviteService;
|
||||||
private final UserRoleService userRoleService;
|
private final UserRoleService userRoleService;
|
||||||
private final GaoStoreService gaoStoreService;
|
private final GaoStoreService gaoStoreService;
|
||||||
private final UserLoginService userLoginService;
|
private final UserLoginService userLoginService;
|
||||||
private final AttachmentService attachmentService;
|
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
|
@AOPLog
|
||||||
@RequestRateLimit
|
@RequestRateLimit
|
||||||
@RequireGaoPermission(GaoPermissionCode.USER_READ)
|
@RequireGaoPermission(GaoPermissionCode.USER_READ)
|
||||||
@@ -117,7 +154,6 @@ public class GaoUserController {
|
|||||||
|
|
||||||
@AOPLog
|
@AOPLog
|
||||||
@RequestRateLimit
|
@RequestRateLimit
|
||||||
@RequireGaoRole(GaoRoleCode.GLOBAL_MANAGER)
|
|
||||||
@RequireGaoPermission(GaoPermissionCode.USER_UPDATE)
|
@RequireGaoPermission(GaoPermissionCode.USER_UPDATE)
|
||||||
@PostMapping("/transfer/store")
|
@PostMapping("/transfer/store")
|
||||||
@JsonView(ResponseView.Public.class)
|
@JsonView(ResponseView.Public.class)
|
||||||
@@ -139,6 +175,7 @@ public class GaoUserController {
|
|||||||
@RequireGaoPermission(GaoPermissionCode.USER_READ)
|
@RequireGaoPermission(GaoPermissionCode.USER_READ)
|
||||||
@PostMapping("/role/list")
|
@PostMapping("/role/list")
|
||||||
public List<Role> roleList() {
|
public List<Role> roleList() {
|
||||||
|
// TODO 此接口获取本模块所有角色,需要限制角色
|
||||||
return roleService.listByModuleCode(ModuleCode.GAO);
|
return roleService.listByModuleCode(ModuleCode.GAO);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,6 +38,26 @@ public class GaoEvent extends UUIDEntity {
|
|||||||
DELETED
|
DELETED
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 事件数值类型
|
||||||
|
public enum ValueType {
|
||||||
|
|
||||||
|
/// 不携带数值
|
||||||
|
NONE,
|
||||||
|
|
||||||
|
/// 携带整数数值
|
||||||
|
NUMBER
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 事件数值单位
|
||||||
|
public enum ValueUnit {
|
||||||
|
|
||||||
|
/// 金额分
|
||||||
|
CENT,
|
||||||
|
|
||||||
|
/// 次数
|
||||||
|
COUNT
|
||||||
|
}
|
||||||
|
|
||||||
/// 登记限制类型
|
/// 登记限制类型
|
||||||
///
|
///
|
||||||
/// @author 夜雨
|
/// @author 夜雨
|
||||||
@@ -70,6 +90,9 @@ public class GaoEvent extends UUIDEntity {
|
|||||||
final Long min;
|
final Long min;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 统计图表颜色
|
||||||
|
private String color;
|
||||||
|
|
||||||
/// 登记事件名称
|
/// 登记事件名称
|
||||||
private String name;
|
private String name;
|
||||||
|
|
||||||
@@ -79,8 +102,14 @@ public class GaoEvent extends UUIDEntity {
|
|||||||
/// 说明
|
/// 说明
|
||||||
private String description;
|
private String description;
|
||||||
|
|
||||||
/// 统计图表颜色
|
/// 数值类型
|
||||||
private String color;
|
private ValueType valueType;
|
||||||
|
|
||||||
|
/// 数值单位
|
||||||
|
private ValueUnit valueUnit;
|
||||||
|
|
||||||
|
/// true 为登记时必须提交 numberValue
|
||||||
|
private Boolean requireValue;
|
||||||
|
|
||||||
/// 状态
|
/// 状态
|
||||||
private Status status;
|
private Status status;
|
||||||
|
|||||||
@@ -40,6 +40,15 @@ public class GaoEventRecord extends UUIDEntity {
|
|||||||
/// 操作管理员用户 ID
|
/// 操作管理员用户 ID
|
||||||
private String operatorUserId;
|
private String operatorUserId;
|
||||||
|
|
||||||
|
/// 本次登记提交的积分值
|
||||||
|
private Long pointValue;
|
||||||
|
|
||||||
|
/// 本次登记通过积分规则获得的积分总和
|
||||||
|
private Long earnedPointValue;
|
||||||
|
|
||||||
|
/// 本次登记提交的整数业务数值
|
||||||
|
private Long numberValue;
|
||||||
|
|
||||||
/// 备注
|
/// 备注
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
@@ -52,10 +61,6 @@ public class GaoEventRecord extends UUIDEntity {
|
|||||||
/// 营业日递增序号
|
/// 营业日递增序号
|
||||||
private Long businessDayNo;
|
private Long businessDayNo;
|
||||||
|
|
||||||
/// 本次登记提交的积分值,只参与积分触发,不落库
|
|
||||||
@Transient
|
|
||||||
private Long pointValue;
|
|
||||||
|
|
||||||
@Transient
|
@Transient
|
||||||
private GaoCustomer customer;
|
private GaoCustomer customer;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.imyeyu.api.modules.gao.entity;
|
package com.imyeyu.api.modules.gao.entity;
|
||||||
|
|
||||||
import com.fasterxml.jackson.databind.JsonNode;
|
import com.fasterxml.jackson.databind.JsonNode;
|
||||||
|
import com.imyeyu.spring.annotation.table.Transient;
|
||||||
import com.imyeyu.spring.entity.UUIDEntity;
|
import com.imyeyu.spring.entity.UUIDEntity;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
@@ -83,4 +84,8 @@ public class GaoPointLedger extends UUIDEntity {
|
|||||||
|
|
||||||
/// 发生时间
|
/// 发生时间
|
||||||
private Long occurredAt;
|
private Long occurredAt;
|
||||||
|
|
||||||
|
/// 客户信息
|
||||||
|
@Transient
|
||||||
|
private GaoCustomer customer;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,7 +42,10 @@ public class GaoPointRule extends UUIDEntity {
|
|||||||
AFTER_COUNT_EVERY_TIME,
|
AFTER_COUNT_EVERY_TIME,
|
||||||
|
|
||||||
/// 使用登记接口提交的积分值触发
|
/// 使用登记接口提交的积分值触发
|
||||||
SOURCE_VALUE
|
SOURCE_VALUE,
|
||||||
|
|
||||||
|
/// 按来源事件数值累计分档触发
|
||||||
|
CUSTOMER_EVENT_VALUE_TIER
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 积分值模式
|
/// 积分值模式
|
||||||
@@ -52,7 +55,10 @@ public class GaoPointRule extends UUIDEntity {
|
|||||||
FIXED,
|
FIXED,
|
||||||
|
|
||||||
/// 使用登记接口提交的积分值
|
/// 使用登记接口提交的积分值
|
||||||
SOURCE_VALUE
|
SOURCE_VALUE,
|
||||||
|
|
||||||
|
/// 使用条件配置中的分档积分值
|
||||||
|
TIER
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 门店 ID
|
/// 门店 ID
|
||||||
|
|||||||
@@ -48,6 +48,9 @@ public class GaoStore extends UUIDEntity {
|
|||||||
/// 备注
|
/// 备注
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
|
/// true 为启用自动计算营业日休息日
|
||||||
|
private Boolean autoClosedDay;
|
||||||
|
|
||||||
/// 排序值
|
/// 排序值
|
||||||
private Integer sort;
|
private Integer sort;
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ public class GaoStoreBusinessDay extends UUIDEntity {
|
|||||||
///
|
///
|
||||||
/// @author Codex
|
/// @author Codex
|
||||||
/// @since 2026-08-06
|
/// @since 2026-08-06
|
||||||
public enum OpenStatus {
|
public enum Status {
|
||||||
|
|
||||||
/// 营业
|
/// 营业
|
||||||
OPEN,
|
OPEN,
|
||||||
@@ -34,7 +34,7 @@ public class GaoStoreBusinessDay extends UUIDEntity {
|
|||||||
private Integer dateValue;
|
private Integer dateValue;
|
||||||
|
|
||||||
/// 营业状态
|
/// 营业状态
|
||||||
private OpenStatus openStatus;
|
private Status status;
|
||||||
|
|
||||||
/// 营业日递增序号,仅营业日有值
|
/// 营业日递增序号,仅营业日有值
|
||||||
private Long businessDayNo;
|
private Long businessDayNo;
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package com.imyeyu.api.modules.gao.mapper;
|
|||||||
import com.imyeyu.api.modules.gao.entity.GaoCustomer;
|
import com.imyeyu.api.modules.gao.entity.GaoCustomer;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateView;
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateView;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
|
||||||
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerPage;
|
||||||
import com.imyeyu.spring.mapper.BaseMapper;
|
import com.imyeyu.spring.mapper.BaseMapper;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
@@ -35,4 +36,16 @@ public interface GaoCustomerMapper extends BaseMapper<GaoCustomer, String> {
|
|||||||
///
|
///
|
||||||
/// @return 性别统计列表
|
/// @return 性别统计列表
|
||||||
List<GaoCustomerGenderStatView> stateGender(@Param("storeId") String storeId);
|
List<GaoCustomerGenderStatView> stateGender(@Param("storeId") String storeId);
|
||||||
|
|
||||||
|
/// 查询客户总数
|
||||||
|
///
|
||||||
|
/// @param page 查询条件
|
||||||
|
/// @return 客户总数
|
||||||
|
long countByQuery(GaoCustomerPage page);
|
||||||
|
|
||||||
|
/// 分页查询客户
|
||||||
|
///
|
||||||
|
/// @param page 查询条件
|
||||||
|
/// @return 客户列表
|
||||||
|
List<GaoCustomer> selectByQuery(GaoCustomerPage page);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,6 +21,28 @@ public interface GaoEventRecordMapper extends BaseMapper<GaoEventRecord, String>
|
|||||||
|
|
||||||
Long count(String storeId, String customerId, String eventId, Long beginAt, Long endAt);
|
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
|
/// @param storeId 门店 ID
|
||||||
@@ -42,6 +64,12 @@ public interface GaoEventRecordMapper extends BaseMapper<GaoEventRecord, String>
|
|||||||
/// @return 登记事件记录列表
|
/// @return 登记事件记录列表
|
||||||
List<GaoEventRecord> selectByRange(GaoEventRecordPage page);
|
List<GaoEventRecord> selectByRange(GaoEventRecordPage page);
|
||||||
|
|
||||||
|
/// 按登记记录列表条件汇总数值
|
||||||
|
///
|
||||||
|
/// @param page 登记记录范围查询请求
|
||||||
|
/// @return 登记数值合计
|
||||||
|
Long sumNumberValueByRange(GaoEventRecordPage page);
|
||||||
|
|
||||||
/// 统计客户登记排行榜总数
|
/// 统计客户登记排行榜总数
|
||||||
///
|
///
|
||||||
/// @param page 排行榜分页请求
|
/// @param page 排行榜分页请求
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import com.imyeyu.api.modules.gao.entity.GaoStoreBusinessDay;
|
|||||||
import com.imyeyu.spring.mapper.BaseMapper;
|
import com.imyeyu.spring.mapper.BaseMapper;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
import org.apache.ibatis.annotations.Select;
|
import org.apache.ibatis.annotations.Select;
|
||||||
|
import org.apache.ibatis.annotations.Update;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -27,7 +28,7 @@ public interface GaoStoreBusinessDayMapper extends BaseMapper<GaoStoreBusinessDa
|
|||||||
/// @param storeId 门店 ID
|
/// @param storeId 门店 ID
|
||||||
/// @param dateValue 日期值,格式为 yyyyMMdd
|
/// @param dateValue 日期值,格式为 yyyyMMdd
|
||||||
/// @return 营业日序号
|
/// @return 营业日序号
|
||||||
@Select("SELECT MAX(`business_day_no`) FROM `gao_store_business_day` WHERE `store_id` = #{storeId} AND `date_value` < #{dateValue} AND `open_status` = 'OPEN' AND `deleted_at` IS NULL")
|
@Select("SELECT MAX(`business_day_no`) FROM `gao_store_business_day` WHERE `store_id` = #{storeId} AND `date_value` < #{dateValue} AND `status` = 'OPEN' AND `deleted_at` IS NULL")
|
||||||
Long selectLastBusinessDayNoBefore(@Param("storeId") String storeId, @Param("dateValue") Integer dateValue);
|
Long selectLastBusinessDayNoBefore(@Param("storeId") String storeId, @Param("dateValue") Integer dateValue);
|
||||||
|
|
||||||
/// 查询指定日期及之后的营业日
|
/// 查询指定日期及之后的营业日
|
||||||
@@ -35,9 +36,16 @@ public interface GaoStoreBusinessDayMapper extends BaseMapper<GaoStoreBusinessDa
|
|||||||
/// @param storeId 门店 ID
|
/// @param storeId 门店 ID
|
||||||
/// @param beginDateValue 开始日期值,格式为 yyyyMMdd
|
/// @param beginDateValue 开始日期值,格式为 yyyyMMdd
|
||||||
/// @return 营业日列表
|
/// @return 营业日列表
|
||||||
@Select("SELECT * FROM `gao_store_business_day` WHERE `store_id` = #{storeId} AND `date_value` >= #{beginDateValue} AND `open_status` = 'OPEN' AND `deleted_at` IS NULL ORDER BY `date_value` ASC")
|
@Select("SELECT * FROM `gao_store_business_day` WHERE `store_id` = #{storeId} AND `date_value` >= #{beginDateValue} AND `status` = 'OPEN' AND `deleted_at` IS NULL ORDER BY `date_value` ASC")
|
||||||
List<GaoStoreBusinessDay> selectOpenListFromDate(@Param("storeId") String storeId, @Param("beginDateValue") Integer beginDateValue);
|
List<GaoStoreBusinessDay> selectOpenListFromDate(@Param("storeId") String storeId, @Param("beginDateValue") Integer beginDateValue);
|
||||||
|
|
||||||
|
/// 清空指定日期及之后的营业日序号
|
||||||
|
///
|
||||||
|
/// @param storeId 门店 ID
|
||||||
|
/// @param beginDateValue 开始日期值,格式为 yyyyMMdd
|
||||||
|
@Update("UPDATE `gao_store_business_day` SET `business_day_no` = NULL, `updated_at` = ROUND(UNIX_TIMESTAMP(CURRENT_TIMESTAMP(3)) * 1000) WHERE `store_id` = #{storeId} AND `date_value` >= #{beginDateValue} AND `status` = 'OPEN' AND `deleted_at` IS NULL")
|
||||||
|
void clearBusinessDayNoFromDate(@Param("storeId") String storeId, @Param("beginDateValue") Integer beginDateValue);
|
||||||
|
|
||||||
/// 查询日期范围内的营业日
|
/// 查询日期范围内的营业日
|
||||||
///
|
///
|
||||||
/// @param storeId 门店 ID
|
/// @param storeId 门店 ID
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package com.imyeyu.api.modules.gao.mapper;
|
|||||||
import com.imyeyu.api.modules.gao.entity.GaoStore;
|
import com.imyeyu.api.modules.gao.entity.GaoStore;
|
||||||
import com.imyeyu.spring.mapper.BaseMapper;
|
import com.imyeyu.spring.mapper.BaseMapper;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
import org.apache.ibatis.annotations.Select;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -16,6 +17,12 @@ public interface GaoStoreMapper extends BaseMapper<GaoStore, String> {
|
|||||||
|
|
||||||
List<GaoStore> selectByIdList(@Param("idList") Collection<String> idList);
|
List<GaoStore> selectByIdList(@Param("idList") Collection<String> idList);
|
||||||
|
|
||||||
|
/// 查询启用自动计算营业日休息日的可用门店
|
||||||
|
///
|
||||||
|
/// @return 门店列表
|
||||||
|
@Select("SELECT * FROM `gao_store` WHERE `auto_closed_day` = TRUE AND `status` = 'ACTIVE' " + NOT_DELETE)
|
||||||
|
List<GaoStore> selectAllByAutoClosedDay();
|
||||||
|
|
||||||
/// 查询用户所属的可用门店
|
/// 查询用户所属的可用门店
|
||||||
///
|
///
|
||||||
/// @param userId 用户 ID
|
/// @param userId 用户 ID
|
||||||
|
|||||||
@@ -3,8 +3,10 @@ package com.imyeyu.api.modules.gao.service;
|
|||||||
import com.imyeyu.api.modules.gao.entity.GaoCustomer;
|
import com.imyeyu.api.modules.gao.entity.GaoCustomer;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateView;
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateView;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
|
||||||
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerPage;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoCustomerTrendStateReq;
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerTrendStateReq;
|
||||||
import com.imyeyu.spring.bean.Page;
|
import com.imyeyu.spring.bean.Page;
|
||||||
|
import com.imyeyu.spring.bean.PageResult;
|
||||||
import com.imyeyu.spring.service.BaseService;
|
import com.imyeyu.spring.service.BaseService;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@@ -19,6 +21,12 @@ import java.util.stream.Collectors;
|
|||||||
/// @since 2026-07-27 14:12
|
/// @since 2026-07-27 14:12
|
||||||
public interface GaoCustomerService extends BaseService<GaoCustomer, String> {
|
public interface GaoCustomerService extends BaseService<GaoCustomer, String> {
|
||||||
|
|
||||||
|
/// 按查询条件分页查询客户
|
||||||
|
///
|
||||||
|
/// @param page 查询条件
|
||||||
|
/// @return 客户分页
|
||||||
|
PageResult<GaoCustomer> pageByQuery(GaoCustomerPage page);
|
||||||
|
|
||||||
void updateWithAttachment(GaoCustomer customer);
|
void updateWithAttachment(GaoCustomer customer);
|
||||||
|
|
||||||
/// 按编码查询客户
|
/// 按编码查询客户
|
||||||
|
|||||||
@@ -32,6 +32,12 @@ public interface GaoEventRecordService extends BaseService<GaoEventRecord, Strin
|
|||||||
/// @return 登记事件记录列表
|
/// @return 登记事件记录列表
|
||||||
PageResult<GaoEventRecord> pageByRange(GaoEventRecordPage req);
|
PageResult<GaoEventRecord> pageByRange(GaoEventRecordPage req);
|
||||||
|
|
||||||
|
/// 按登记记录列表条件汇总数值
|
||||||
|
///
|
||||||
|
/// @param req 登记记录范围查询请求
|
||||||
|
/// @return 登记数值合计
|
||||||
|
Long sumNumberValueByRange(GaoEventRecordPage req);
|
||||||
|
|
||||||
/// 按时间范围查询客户登记排行榜
|
/// 按时间范围查询客户登记排行榜
|
||||||
///
|
///
|
||||||
/// @param page 范围查询请求,不传时间为全部时间
|
/// @param page 范围查询请求,不传时间为全部时间
|
||||||
|
|||||||
@@ -23,6 +23,12 @@ public interface GaoStoreBusinessDayService extends BaseService<GaoStoreBusiness
|
|||||||
/// @param beginDateValue 开始日期值,格式为 yyyyMMdd
|
/// @param beginDateValue 开始日期值,格式为 yyyyMMdd
|
||||||
void rebuildBusinessDayNo(String storeId, Integer beginDateValue);
|
void rebuildBusinessDayNo(String storeId, Integer beginDateValue);
|
||||||
|
|
||||||
|
/// 自动补记门店休息日
|
||||||
|
///
|
||||||
|
/// @param storeId 门店 ID
|
||||||
|
/// @param dateValue 日期值,格式为 yyyyMMdd
|
||||||
|
void autoCloseBusinessDay(String storeId, Integer dateValue);
|
||||||
|
|
||||||
/// 查询日期范围内的营业日
|
/// 查询日期范围内的营业日
|
||||||
///
|
///
|
||||||
/// @param storeId 门店 ID
|
/// @param storeId 门店 ID
|
||||||
|
|||||||
@@ -22,6 +22,8 @@ public interface GaoStoreService extends BaseService<GaoStore, String> {
|
|||||||
|
|
||||||
String getBelongIdByRequiredLoginUserId();
|
String getBelongIdByRequiredLoginUserId();
|
||||||
|
|
||||||
|
List<GaoStore> listByAutoClosedDay();
|
||||||
|
|
||||||
/// 导出门店列表
|
/// 导出门店列表
|
||||||
///
|
///
|
||||||
/// @param page 分页查询条件
|
/// @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);
|
||||||
|
}
|
||||||
+11
@@ -10,6 +10,7 @@ import com.imyeyu.api.modules.gao.service.GaoCustomerService;
|
|||||||
import com.imyeyu.api.modules.gao.util.CustomerXSSFBuilder;
|
import com.imyeyu.api.modules.gao.util.CustomerXSSFBuilder;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateView;
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateView;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
|
||||||
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerPage;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoCustomerTrendStateReq;
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerTrendStateReq;
|
||||||
import com.imyeyu.api.modules.system.entity.Logger;
|
import com.imyeyu.api.modules.system.entity.Logger;
|
||||||
import com.imyeyu.api.modules.system.service.LoggerService;
|
import com.imyeyu.api.modules.system.service.LoggerService;
|
||||||
@@ -18,6 +19,7 @@ import com.imyeyu.java.TimiJava;
|
|||||||
import com.imyeyu.java.bean.timi.TimiCode;
|
import com.imyeyu.java.bean.timi.TimiCode;
|
||||||
import com.imyeyu.java.bean.timi.TimiException;
|
import com.imyeyu.java.bean.timi.TimiException;
|
||||||
import com.imyeyu.spring.bean.Page;
|
import com.imyeyu.spring.bean.Page;
|
||||||
|
import com.imyeyu.spring.bean.PageResult;
|
||||||
import com.imyeyu.spring.mapper.BaseMapper;
|
import com.imyeyu.spring.mapper.BaseMapper;
|
||||||
import com.imyeyu.spring.service.AbstractEntityService;
|
import com.imyeyu.spring.service.AbstractEntityService;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
@@ -65,6 +67,15 @@ public class GaoCustomerServiceImplement extends AbstractEntityService<GaoCustom
|
|||||||
return mapper;
|
return mapper;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public PageResult<GaoCustomer> pageByQuery(GaoCustomerPage page) {
|
||||||
|
TimiException.required(page, "not found page");
|
||||||
|
PageResult<GaoCustomer> result = new PageResult<>();
|
||||||
|
result.setTotal(mapper.countByQuery(page));
|
||||||
|
result.setList(mapper.selectByQuery(page));
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||||
@Override
|
@Override
|
||||||
public void create(GaoCustomer customer) {
|
public void create(GaoCustomer customer) {
|
||||||
|
|||||||
+55
-15
@@ -87,7 +87,9 @@ public class GaoEventRecordServiceImplement extends AbstractEntityService<GaoEve
|
|||||||
String loginUserId = userLoginService.getRequireLoginUserId();
|
String loginUserId = userLoginService.getRequireLoginUserId();
|
||||||
Long registeredAt = TimiJava.defaultIfNull(record.getRegisteredAt(), Time.now());
|
Long registeredAt = TimiJava.defaultIfNull(record.getRegisteredAt(), Time.now());
|
||||||
GaoEvent event = eventService.get(record.getEventId());
|
GaoEvent event = eventService.get(record.getEventId());
|
||||||
|
TimiException.required(event, "not found event");
|
||||||
TimiException.required(event.getStoreId(), "not found event.storeId");
|
TimiException.required(event.getStoreId(), "not found event.storeId");
|
||||||
|
verifyRecordValue(event, record.getNumberValue());
|
||||||
// 检查权限
|
// 检查权限
|
||||||
checkEventPermission(event);
|
checkEventPermission(event);
|
||||||
int registeredDateValue = dateValue(registeredAt);
|
int registeredDateValue = dateValue(registeredAt);
|
||||||
@@ -119,6 +121,8 @@ public class GaoEventRecordServiceImplement extends AbstractEntityService<GaoEve
|
|||||||
dbRecord.setRegisteredDateValue(registeredDateValue);
|
dbRecord.setRegisteredDateValue(registeredDateValue);
|
||||||
dbRecord.setBusinessDayNo(businessDayNo);
|
dbRecord.setBusinessDayNo(businessDayNo);
|
||||||
dbRecord.setPointValue(record.getPointValue());
|
dbRecord.setPointValue(record.getPointValue());
|
||||||
|
dbRecord.setNumberValue(record.getNumberValue());
|
||||||
|
dbRecord.setEarnedPointValue(0L);
|
||||||
super.create(dbRecord);
|
super.create(dbRecord);
|
||||||
// 附件
|
// 附件
|
||||||
if (i == 0) {
|
if (i == 0) {
|
||||||
@@ -170,24 +174,17 @@ public class GaoEventRecordServiceImplement extends AbstractEntityService<GaoEve
|
|||||||
Logger logger = new Logger(Logger.Module.GAO, "GAO_EVENT_RECORD_UPDATE");
|
Logger logger = new Logger(Logger.Module.GAO, "GAO_EVENT_RECORD_UPDATE");
|
||||||
try {
|
try {
|
||||||
logger.setContent(jackson.writeValueAsString(record));
|
logger.setContent(jackson.writeValueAsString(record));
|
||||||
TimiException.required(record.getCustomerId(), "not found record.customerId");
|
GaoEventRecord dbRecord = get(record.getId());
|
||||||
TimiException.required(record.getEventId(), "not found record.eventId");
|
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(dbRecord.getEventId());
|
||||||
|
TimiException.required(event, "not found event");
|
||||||
GaoEvent event = eventService.get(record.getEventId());
|
|
||||||
TimiException.required(event.getStoreId(), "not found event.storeId");
|
TimiException.required(event.getStoreId(), "not found event.storeId");
|
||||||
checkEventPermission(event);
|
checkEventPermission(event);
|
||||||
checkEventCreatable(record.getCustomerId(), event, record.getRegisteredAt());
|
dbRecord.setRemark(record.getRemark());
|
||||||
GaoCustomer customer = customerService.get(record.getCustomerId());
|
super.update(dbRecord);
|
||||||
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);
|
|
||||||
attachmentService.updateByBizId(Attachment.BizType.GAO_EVENT_RECORD, record.getId(), record.getAttachmentList());
|
attachmentService.updateByBizId(Attachment.BizType.GAO_EVENT_RECORD, record.getId(), record.getAttachmentList());
|
||||||
logger.setLevel(Logger.Level.INFO);
|
logger.setLevel(Logger.Level.INFO);
|
||||||
logger.setResult(record.getId());
|
logger.setResult(record.getId());
|
||||||
@@ -269,6 +266,12 @@ public class GaoEventRecordServiceImplement extends AbstractEntityService<GaoEve
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Long sumNumberValueByRange(GaoEventRecordPage page) {
|
||||||
|
TimiException.required(page.getStoreId(), "not found page.storeId");
|
||||||
|
return mapper.sumNumberValueByRange(page);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public byte[] export(GaoEventRecordPage page) throws IOException {
|
public byte[] export(GaoEventRecordPage page) throws IOException {
|
||||||
TimiException.required(page.getStoreId(), "not found page.storeId");
|
TimiException.required(page.getStoreId(), "not found page.storeId");
|
||||||
@@ -279,12 +282,29 @@ public class GaoEventRecordServiceImplement extends AbstractEntityService<GaoEve
|
|||||||
@Override
|
@Override
|
||||||
public PageResult<GaoCustomerEventRankView> pageRankByRange(GaoEventRecordRankPage page) {
|
public PageResult<GaoCustomerEventRankView> pageRankByRange(GaoEventRecordRankPage page) {
|
||||||
TimiException.required(page.getStoreId(), "not found page.storeId");
|
TimiException.required(page.getStoreId(), "not found page.storeId");
|
||||||
|
validateRankPage(page);
|
||||||
|
if (page.getRankType() == GaoEventRecordRankPage.RankType.CONTINUOUS_DAYS) {
|
||||||
|
page.setTodayDateValue(dateValue(Time.now()));
|
||||||
|
}
|
||||||
PageResult<GaoCustomerEventRankView> result = new PageResult<>();
|
PageResult<GaoCustomerEventRankView> result = new PageResult<>();
|
||||||
result.setTotal(mapper.countRankByRange(page));
|
result.setTotal(mapper.countRankByRange(page));
|
||||||
result.setList(mapper.selectRankByRange(page));
|
result.setList(mapper.selectRankByRange(page));
|
||||||
return result;
|
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) {
|
private void checkEventPermission(GaoEvent event) {
|
||||||
List<String> roleCodeList = eventService.listRoleCode(event.getId());
|
List<String> roleCodeList = eventService.listRoleCode(event.getId());
|
||||||
TimiException.requiredTrue(roleCodeList != null && !roleCodeList.isEmpty(), "登记事件未配置可登记角色");
|
TimiException.requiredTrue(roleCodeList != null && !roleCodeList.isEmpty(), "登记事件未配置可登记角色");
|
||||||
@@ -342,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) {
|
private int dateValue(long time) {
|
||||||
LocalDate date = Instant.ofEpochMilli(time).atZone(ZoneId.systemDefault()).toLocalDate();
|
LocalDate date = Instant.ofEpochMilli(time).atZone(ZoneId.systemDefault()).toLocalDate();
|
||||||
return Integer.parseInt(DAY_FORMATTER.format(date));
|
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.GaoEvent;
|
||||||
import com.imyeyu.api.modules.gao.entity.GaoEventRoleRelation;
|
import com.imyeyu.api.modules.gao.entity.GaoEventRoleRelation;
|
||||||
import com.imyeyu.api.modules.gao.mapper.GaoEventMapper;
|
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.mapper.GaoEventRoleRelationMapper;
|
||||||
import com.imyeyu.api.modules.gao.service.GaoEventService;
|
import com.imyeyu.api.modules.gao.service.GaoEventService;
|
||||||
import com.imyeyu.api.modules.system.entity.Logger;
|
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 LoggerService loggerService;
|
||||||
|
|
||||||
private final GaoEventMapper mapper;
|
private final GaoEventMapper mapper;
|
||||||
|
private final GaoEventRecordMapper eventRecordMapper;
|
||||||
private final GaoEventRoleRelationMapper roleRelationMapper;
|
private final GaoEventRoleRelationMapper roleRelationMapper;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -64,6 +66,8 @@ public class GaoEventServiceImplement extends AbstractEntityService<GaoEvent, St
|
|||||||
logger.setContent(jackson.writeValueAsString(event));
|
logger.setContent(jackson.writeValueAsString(event));
|
||||||
|
|
||||||
event.setStatus(TimiJava.defaultIfNull(event.getStatus(), GaoEvent.Status.DRAFT));
|
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.setRequirePhoto(TimiJava.defaultIfNull(event.getRequirePhoto(), false));
|
||||||
event.setLimitType(TimiJava.defaultIfNull(event.getLimitType(), GaoEvent.LimitType.NONE));
|
event.setLimitType(TimiJava.defaultIfNull(event.getLimitType(), GaoEvent.LimitType.NONE));
|
||||||
event.setSort(TimiJava.defaultIfNull(event.getSort(), 0));
|
event.setSort(TimiJava.defaultIfNull(event.getSort(), 0));
|
||||||
@@ -94,17 +98,36 @@ public class GaoEventServiceImplement extends AbstractEntityService<GaoEvent, St
|
|||||||
try {
|
try {
|
||||||
logger.setContent(jackson.writeValueAsString(event));
|
logger.setContent(jackson.writeValueAsString(event));
|
||||||
GaoEvent dbEvent = get(event.getId());
|
GaoEvent dbEvent = get(event.getId());
|
||||||
|
TimiException.required(dbEvent, "not found event");
|
||||||
TimiException.requiredTrue(dbEvent.getStoreId().equals(event.getStoreId()), "event.storeId invalid");
|
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.setName(event.getName());
|
||||||
dbEvent.setDescription(event.getDescription());
|
dbEvent.setDescription(event.getDescription());
|
||||||
dbEvent.setColor(event.getColor());
|
dbEvent.setColor(event.getColor());
|
||||||
dbEvent.setStatus(event.getStatus());
|
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.setRequirePhoto(event.getRequirePhoto());
|
||||||
dbEvent.setLimitType(event.getLimitType());
|
dbEvent.setLimitType(event.getLimitType());
|
||||||
dbEvent.setLimitValue(event.getLimitValue());
|
dbEvent.setLimitValue(event.getLimitValue());
|
||||||
dbEvent.setBeginAt(event.getBeginAt());
|
dbEvent.setBeginAt(event.getBeginAt());
|
||||||
dbEvent.setEndAt(event.getEndAt());
|
dbEvent.setEndAt(event.getEndAt());
|
||||||
|
|
||||||
|
verifyValueDefinitionChange(dbEvent, oldValueType, oldValueUnit);
|
||||||
verifyEvent(dbEvent);
|
verifyEvent(dbEvent);
|
||||||
mapper.update(dbEvent);
|
mapper.update(dbEvent);
|
||||||
saveRoleRelation(event.getId(), event.getRoleCodeList());
|
saveRoleRelation(event.getId(), event.getRoleCodeList());
|
||||||
@@ -190,6 +213,13 @@ public class GaoEventServiceImplement extends AbstractEntityService<GaoEvent, St
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void verifyEvent(GaoEvent event) {
|
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) {
|
if (TimiJava.isNotEmpty(event.getLimitType()) && event.getLimitType() != GaoEvent.LimitType.NONE) {
|
||||||
TimiException.requiredTrue(event.getLimitType().getMin() < event.getLimitValue(), "约束值最低 %s".formatted(event.getLimitType().getMin()));
|
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) {
|
private void saveRoleRelation(String eventId, List<String> roleCodeList) {
|
||||||
List<GaoEventRoleRelation> dbRoleRelationList = roleRelationMapper.selectAllByEventIdList(List.of(eventId));
|
List<GaoEventRoleRelation> dbRoleRelationList = roleRelationMapper.selectAllByEventIdList(List.of(eventId));
|
||||||
Set<String> roleCodeSet = TimiJava.defaultIfEmpty(roleCodeList, List.<String>of()).stream().filter(TimiJava::isNotEmpty).collect(Collectors.toSet());
|
Set<String> roleCodeSet = TimiJava.defaultIfEmpty(roleCodeList, List.<String>of()).stream().filter(TimiJava::isNotEmpty).collect(Collectors.toSet());
|
||||||
|
|||||||
+91
-37
@@ -2,15 +2,21 @@ package com.imyeyu.api.modules.gao.service.implement;
|
|||||||
|
|
||||||
import com.fasterxml.jackson.databind.JsonNode;
|
import com.fasterxml.jackson.databind.JsonNode;
|
||||||
import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
|
import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
|
||||||
|
import com.imyeyu.api.modules.common.entity.Attachment;
|
||||||
|
import com.imyeyu.api.modules.common.service.AttachmentService;
|
||||||
|
import com.imyeyu.api.modules.gao.entity.GaoCustomer;
|
||||||
import com.imyeyu.api.modules.gao.entity.GaoPointAccount;
|
import com.imyeyu.api.modules.gao.entity.GaoPointAccount;
|
||||||
import com.imyeyu.api.modules.gao.entity.GaoPointLedger;
|
import com.imyeyu.api.modules.gao.entity.GaoPointLedger;
|
||||||
import com.imyeyu.api.modules.gao.entity.GaoPointRule;
|
import com.imyeyu.api.modules.gao.entity.GaoPointRule;
|
||||||
import com.imyeyu.api.modules.gao.entity.GaoEventRecord;
|
import com.imyeyu.api.modules.gao.entity.GaoEventRecord;
|
||||||
import com.imyeyu.api.modules.gao.mapper.GaoPointLedgerMapper;
|
import com.imyeyu.api.modules.gao.mapper.GaoPointLedgerMapper;
|
||||||
|
import com.imyeyu.api.modules.gao.service.GaoCustomerService;
|
||||||
import com.imyeyu.api.modules.gao.service.GaoPointAccountService;
|
import com.imyeyu.api.modules.gao.service.GaoPointAccountService;
|
||||||
import com.imyeyu.api.modules.gao.service.GaoPointLedgerService;
|
import com.imyeyu.api.modules.gao.service.GaoPointLedgerService;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoPointAdjustRequest;
|
import com.imyeyu.api.modules.gao.vo.GaoPointAdjustRequest;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoPointLedgerPage;
|
import com.imyeyu.api.modules.gao.vo.GaoPointLedgerPage;
|
||||||
|
import com.imyeyu.api.modules.system.entity.Logger;
|
||||||
|
import com.imyeyu.api.modules.system.service.LoggerService;
|
||||||
import com.imyeyu.api.modules.user.service.UserLoginService;
|
import com.imyeyu.api.modules.user.service.UserLoginService;
|
||||||
import com.imyeyu.java.TimiJava;
|
import com.imyeyu.java.TimiJava;
|
||||||
import com.imyeyu.java.bean.timi.TimiCode;
|
import com.imyeyu.java.bean.timi.TimiCode;
|
||||||
@@ -20,19 +26,27 @@ import com.imyeyu.spring.mapper.BaseMapper;
|
|||||||
import com.imyeyu.spring.service.AbstractEntityService;
|
import com.imyeyu.spring.service.AbstractEntityService;
|
||||||
import com.imyeyu.utils.Time;
|
import com.imyeyu.utils.Time;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
/// GAO 客户积分流水服务实现
|
/// GAO 客户积分流水服务实现
|
||||||
///
|
///
|
||||||
/// @author Codex
|
/// @author Codex
|
||||||
/// @since 2026-08-11
|
/// @since 2026-08-11
|
||||||
|
@Slf4j
|
||||||
@Service
|
@Service
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class GaoPointLedgerServiceImplement extends AbstractEntityService<GaoPointLedger, String> implements GaoPointLedgerService {
|
public class GaoPointLedgerServiceImplement extends AbstractEntityService<GaoPointLedger, String> implements GaoPointLedgerService {
|
||||||
|
|
||||||
private final GaoPointLedgerMapper mapper;
|
private final GaoPointLedgerMapper mapper;
|
||||||
private final GaoPointAccountService accountService;
|
private final GaoPointAccountService accountService;
|
||||||
|
private final GaoCustomerService customerService;
|
||||||
|
private final AttachmentService attachmentService;
|
||||||
|
private final LoggerService loggerService;
|
||||||
private final UserLoginService userLoginService;
|
private final UserLoginService userLoginService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -96,47 +110,87 @@ public class GaoPointLedgerServiceImplement extends AbstractEntityService<GaoPoi
|
|||||||
PageResult<GaoPointLedger> result = new PageResult<>();
|
PageResult<GaoPointLedger> result = new PageResult<>();
|
||||||
result.setTotal(mapper.countByQuery(page));
|
result.setTotal(mapper.countByQuery(page));
|
||||||
result.setList(mapper.selectByQuery(page));
|
result.setList(mapper.selectByQuery(page));
|
||||||
|
fillCustomer(result.getList());
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void fillCustomer(List<GaoPointLedger> ledgerList) {
|
||||||
|
List<String> customerIdList = ledgerList.stream().map(GaoPointLedger::getCustomerId).filter(TimiJava::isNotEmpty).distinct().toList();
|
||||||
|
if (customerIdList.isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Map<String, GaoCustomer> customerMap = customerService.mapByIdList(customerIdList);
|
||||||
|
Map<String, List<Attachment>> attachmentMap = attachmentService.mapByBizIdList(Attachment.BizType.GAO_CUSTOMER, customerIdList);
|
||||||
|
for (GaoPointLedger ledger : ledgerList) {
|
||||||
|
GaoCustomer customer = customerMap.get(ledger.getCustomerId());
|
||||||
|
if (customer == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
customer.setAttachmentList(attachmentMap.get(customer.getId()));
|
||||||
|
ledger.setCustomer(customer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private GaoPointLedger apply(String storeId, String customerId, GaoPointLedger.ChangeType changeType, long pointDelta, String ruleId, String eventId, String eventRecordId, JsonNode sourcePayload, String idempotencyKey, String remark, String operatorUserId, Long occurredAt) {
|
private GaoPointLedger apply(String storeId, String customerId, GaoPointLedger.ChangeType changeType, long pointDelta, String ruleId, String eventId, String eventRecordId, JsonNode sourcePayload, String idempotencyKey, String remark, String operatorUserId, Long occurredAt) {
|
||||||
GaoPointLedger existing = mapper.selectByIdempotencyKey(idempotencyKey);
|
Logger logger = new Logger(Logger.Module.GAO, "GAO_POINT_LEDGER_APPLY");
|
||||||
if (existing != null) {
|
logger.setContent("storeId=%s, customerId=%s, changeType=%s, pointDelta=%d, idempotencyKey=%s, remark=%s".formatted(storeId, customerId, changeType, pointDelta, idempotencyKey, remark));
|
||||||
return existing;
|
try {
|
||||||
|
GaoPointLedger existing = mapper.selectByIdempotencyKey(idempotencyKey);
|
||||||
|
if (existing != null) {
|
||||||
|
logger.setLevel(Logger.Level.INFO);
|
||||||
|
logger.setResult(existing.getId());
|
||||||
|
return existing;
|
||||||
|
}
|
||||||
|
|
||||||
|
GaoPointAccount account = accountService.getOrCreateForUpdate(storeId, customerId);
|
||||||
|
existing = mapper.selectByIdempotencyKey(idempotencyKey);
|
||||||
|
if (existing != null) {
|
||||||
|
logger.setLevel(Logger.Level.INFO);
|
||||||
|
logger.setResult(existing.getId());
|
||||||
|
return existing;
|
||||||
|
}
|
||||||
|
|
||||||
|
long balanceBefore = account.getBalance();
|
||||||
|
long balanceAfter = Math.addExact(balanceBefore, pointDelta);
|
||||||
|
long totalEarnedDelta = changeType == GaoPointLedger.ChangeType.EARN ? pointDelta : 0L;
|
||||||
|
long totalRevokedDelta = changeType == GaoPointLedger.ChangeType.REVOKE ? -pointDelta : 0L;
|
||||||
|
long totalAdjustedDelta = changeType == GaoPointLedger.ChangeType.ADJUST ? pointDelta : 0L;
|
||||||
|
|
||||||
|
GaoPointLedger ledger = new GaoPointLedger();
|
||||||
|
ledger.setAccountId(account.getId());
|
||||||
|
ledger.setStoreId(storeId);
|
||||||
|
ledger.setCustomerId(customerId);
|
||||||
|
ledger.setChangeType(changeType);
|
||||||
|
ledger.setDirection(0 < pointDelta ? GaoPointLedger.Direction.INCREASE : GaoPointLedger.Direction.DECREASE);
|
||||||
|
ledger.setPointDelta(pointDelta);
|
||||||
|
ledger.setBalanceBefore(balanceBefore);
|
||||||
|
ledger.setBalanceAfter(balanceAfter);
|
||||||
|
ledger.setRuleId(ruleId);
|
||||||
|
ledger.setEventId(eventId);
|
||||||
|
ledger.setEventRecordId(eventRecordId);
|
||||||
|
ledger.setSourcePayload(sourcePayload);
|
||||||
|
ledger.setIdempotencyKey(idempotencyKey);
|
||||||
|
ledger.setRemark(remark);
|
||||||
|
ledger.setOperatorUserId(operatorUserId);
|
||||||
|
ledger.setOccurredAt(occurredAt);
|
||||||
|
create(ledger);
|
||||||
|
int updated = accountService.updateBalance(account.getId(), pointDelta, totalEarnedDelta, totalRevokedDelta, totalAdjustedDelta);
|
||||||
|
TimiException.requiredTrue(0 < updated, "积分余额不足");
|
||||||
|
logger.setLevel(Logger.Level.INFO);
|
||||||
|
logger.setResult(ledger.getId());
|
||||||
|
return ledger;
|
||||||
|
} 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, "应用 GAO 积分流水失败", e);
|
||||||
|
} finally {
|
||||||
|
loggerService.create(logger);
|
||||||
}
|
}
|
||||||
|
|
||||||
GaoPointAccount account = accountService.getOrCreateForUpdate(storeId, customerId);
|
|
||||||
existing = mapper.selectByIdempotencyKey(idempotencyKey);
|
|
||||||
if (existing != null) {
|
|
||||||
return existing;
|
|
||||||
}
|
|
||||||
|
|
||||||
long balanceBefore = account.getBalance();
|
|
||||||
long balanceAfter = Math.addExact(balanceBefore, pointDelta);
|
|
||||||
long totalEarnedDelta = changeType == GaoPointLedger.ChangeType.EARN ? pointDelta : 0L;
|
|
||||||
long totalRevokedDelta = changeType == GaoPointLedger.ChangeType.REVOKE ? -pointDelta : 0L;
|
|
||||||
long totalAdjustedDelta = changeType == GaoPointLedger.ChangeType.ADJUST ? pointDelta : 0L;
|
|
||||||
|
|
||||||
GaoPointLedger ledger = new GaoPointLedger();
|
|
||||||
ledger.setAccountId(account.getId());
|
|
||||||
ledger.setStoreId(storeId);
|
|
||||||
ledger.setCustomerId(customerId);
|
|
||||||
ledger.setChangeType(changeType);
|
|
||||||
ledger.setDirection(0 < pointDelta ? GaoPointLedger.Direction.INCREASE : GaoPointLedger.Direction.DECREASE);
|
|
||||||
ledger.setPointDelta(pointDelta);
|
|
||||||
ledger.setBalanceBefore(balanceBefore);
|
|
||||||
ledger.setBalanceAfter(balanceAfter);
|
|
||||||
ledger.setRuleId(ruleId);
|
|
||||||
ledger.setEventId(eventId);
|
|
||||||
ledger.setEventRecordId(eventRecordId);
|
|
||||||
ledger.setSourcePayload(sourcePayload);
|
|
||||||
ledger.setIdempotencyKey(idempotencyKey);
|
|
||||||
ledger.setRemark(remark);
|
|
||||||
ledger.setOperatorUserId(operatorUserId);
|
|
||||||
ledger.setOccurredAt(occurredAt);
|
|
||||||
create(ledger);
|
|
||||||
int updated = accountService.updateBalance(account.getId(), pointDelta, totalEarnedDelta, totalRevokedDelta, totalAdjustedDelta);
|
|
||||||
TimiException.requiredTrue(0 < updated, "积分余额不足");
|
|
||||||
return ledger;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+66
@@ -25,6 +25,8 @@ import java.util.List;
|
|||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class GaoPointRuleServiceImplement extends AbstractEntityService<GaoPointRule, String> implements GaoPointRuleService {
|
public class GaoPointRuleServiceImplement extends AbstractEntityService<GaoPointRule, String> implements GaoPointRuleService {
|
||||||
|
|
||||||
|
private static final int MAX_TIER_COUNT = 100;
|
||||||
|
|
||||||
private final GaoPointRuleMapper mapper;
|
private final GaoPointRuleMapper mapper;
|
||||||
private final GaoEventService eventService;
|
private final GaoEventService eventService;
|
||||||
|
|
||||||
@@ -116,6 +118,13 @@ public class GaoPointRuleServiceImplement extends AbstractEntityService<GaoPoint
|
|||||||
return;
|
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.requiredTrue(rule.getPointMode() == GaoPointRule.PointMode.FIXED, "固定触发规则必须使用 FIXED 积分值模式");
|
||||||
TimiException.required(rule.getPointValue(), "not found rule.pointValue");
|
TimiException.required(rule.getPointValue(), "not found rule.pointValue");
|
||||||
TimiException.requiredTrue(0 < rule.getPointValue(), "rule.pointValue invalid");
|
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) {
|
private void verifySourceCondition(JsonNode conditionJson) {
|
||||||
JsonNode condition = conditionJson == null ? null : requireObjectCondition(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;
|
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.bean.ModuleCode;
|
||||||
import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
|
import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
|
||||||
import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
|
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.GaoCustomer;
|
||||||
import com.imyeyu.api.modules.gao.entity.GaoEventRecord;
|
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.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.GaoPointLedgerService;
|
||||||
import com.imyeyu.api.modules.gao.service.GaoPointRuleService;
|
import com.imyeyu.api.modules.gao.service.GaoPointRuleService;
|
||||||
import com.imyeyu.api.modules.gao.service.GaoPointTriggerService;
|
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.gao.vo.GaoPointAdjustRequest;
|
||||||
import com.imyeyu.api.modules.user.service.PermissionChecker;
|
import com.imyeyu.api.modules.user.service.PermissionChecker;
|
||||||
import com.imyeyu.api.modules.user.service.UserLoginService;
|
import com.imyeyu.api.modules.user.service.UserLoginService;
|
||||||
@@ -26,6 +26,9 @@ import lombok.RequiredArgsConstructor;
|
|||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
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.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@@ -51,26 +54,34 @@ public class GaoPointTriggerServiceImplement implements GaoPointTriggerService {
|
|||||||
@Override
|
@Override
|
||||||
public void onEventRecordCreated(GaoEventRecord record) {
|
public void onEventRecordCreated(GaoEventRecord record) {
|
||||||
TimiException.required(record, "not found event 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.getStoreId(), "not found record.storeId");
|
||||||
TimiException.required(record.getCustomerId(), "not found record.customerId");
|
TimiException.required(record.getCustomerId(), "not found record.customerId");
|
||||||
TimiException.required(record.getEventId(), "not found record.eventId");
|
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());
|
List<GaoPointRule> ruleList = ruleService.listActive(record.getStoreId(), record.getEventId(), Time.now());
|
||||||
Long count = null;
|
Long count = null;
|
||||||
|
long earnedPointValue = 0L;
|
||||||
for (GaoPointRule rule : ruleList) {
|
for (GaoPointRule rule : ruleList) {
|
||||||
Long pointDelta = resolvePointDelta(record, rule, count);
|
RuleResolution resolution = resolveRule(record, rule, count);
|
||||||
if (pointDelta == null) {
|
if (resolution == null) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (count == null) {
|
if (rule.getTriggerType() == GaoPointRule.TriggerType.FIRST_TIME || rule.getTriggerType() == GaoPointRule.TriggerType.AFTER_COUNT_EVERY_TIME) {
|
||||||
count = eventRecordMapper.count(record.getStoreId(), record.getCustomerId(), record.getEventId(), null, null);
|
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())) {
|
if (Boolean.TRUE.equals(rule.getExclusive())) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
record.setEarnedPointValue(earnedPointValue);
|
||||||
|
eventRecordMapper.updateEarnedPointValue(record.getId(), earnedPointValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||||
@@ -104,25 +115,26 @@ public class GaoPointTriggerServiceImplement implements GaoPointTriggerService {
|
|||||||
return ledgerService.adjust(request, userLoginService.getRequireLoginUserId());
|
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()) {
|
return switch (rule.getTriggerType()) {
|
||||||
case EVERY_TIME -> rule.getPointValue();
|
case EVERY_TIME -> new RuleResolution(rule.getPointValue(), null);
|
||||||
case FIRST_TIME -> {
|
case FIRST_TIME -> {
|
||||||
long currentCount = count == null ? count(record) : count;
|
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 -> {
|
case AFTER_COUNT_EVERY_TIME -> {
|
||||||
JsonNode condition = rule.getConditionJson();
|
JsonNode condition = rule.getConditionJson();
|
||||||
long threshold = condition.get("threshold").longValue();
|
long threshold = condition.get("threshold").longValue();
|
||||||
boolean includeCurrent = condition.get("includeCurrent") == null || condition.get("includeCurrent").isNull() || condition.get("includeCurrent").asBoolean();
|
boolean includeCurrent = condition.get("includeCurrent") == null || condition.get("includeCurrent").isNull() || condition.get("includeCurrent").asBoolean();
|
||||||
long currentCount = count == null ? count(record) : count;
|
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 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) {
|
if (record.getPointValue() == null) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -136,17 +148,49 @@ public class GaoPointTriggerServiceImplement implements GaoPointTriggerService {
|
|||||||
TimiException.requiredTrue(min == null || min.isNull() || min.longValue() <= pointValue, "pointValue 小于规则最小值");
|
TimiException.requiredTrue(min == null || min.isNull() || min.longValue() <= pointValue, "pointValue 小于规则最小值");
|
||||||
TimiException.requiredTrue(max == null || max.isNull() || pointValue <= max.longValue(), "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) {
|
private RuleResolution resolveTier(GaoEventRecord record, GaoPointRule rule) {
|
||||||
if (rule.getTriggerType() != GaoPointRule.TriggerType.SOURCE_VALUE) {
|
JsonNode condition = rule.getConditionJson();
|
||||||
return null;
|
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();
|
ObjectNode payload = jackson.createObjectNode();
|
||||||
payload.put("submittedPointValue", record.getPointValue());
|
payload.put("triggerType", GaoPointRule.TriggerType.CUSTOMER_EVENT_VALUE_TIER.name());
|
||||||
payload.put("validatedPointValue", pointDelta);
|
payload.put("sourceEventId", sourceEventId);
|
||||||
return payload;
|
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) {
|
private long count(GaoEventRecord record) {
|
||||||
@@ -156,4 +200,7 @@ public class GaoPointTriggerServiceImplement implements GaoPointTriggerService {
|
|||||||
private String revokeKey(GaoEventRecord record, GaoPointLedger originLedger) {
|
private String revokeKey(GaoEventRecord record, GaoPointLedger originLedger) {
|
||||||
return "GAO_EVENT_RECORD:%s:LEDGER:%s:REVOKE".formatted(record.getId(), originLedger.getId());
|
return "GAO_EVENT_RECORD:%s:LEDGER:%s:REVOKE".formatted(record.getId(), originLedger.getId());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private record RuleResolution(Long pointDelta, JsonNode sourcePayload) {
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+30
-11
@@ -37,7 +37,7 @@ public class GaoStoreBusinessDayServiceImplement extends AbstractEntityService<G
|
|||||||
public void create(GaoStoreBusinessDay businessDay) {
|
public void create(GaoStoreBusinessDay businessDay) {
|
||||||
prepareBusinessDay(businessDay);
|
prepareBusinessDay(businessDay);
|
||||||
super.create(businessDay);
|
super.create(businessDay);
|
||||||
if (businessDay.getOpenStatus() == GaoStoreBusinessDay.OpenStatus.OPEN) {
|
if (businessDay.getStatus() == GaoStoreBusinessDay.Status.OPEN) {
|
||||||
rebuildBusinessDayNo(businessDay.getStoreId(), businessDay.getDateValue());
|
rebuildBusinessDayNo(businessDay.getStoreId(), businessDay.getDateValue());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -51,7 +51,7 @@ public class GaoStoreBusinessDayServiceImplement extends AbstractEntityService<G
|
|||||||
TimiException.required(dbBusinessDay, "not found dbBusinessDay");
|
TimiException.required(dbBusinessDay, "not found dbBusinessDay");
|
||||||
TimiException.requiredTrue(dbBusinessDay.getStoreId().equals(businessDay.getStoreId()), "businessDay.storeId invalid");
|
TimiException.requiredTrue(dbBusinessDay.getStoreId().equals(businessDay.getStoreId()), "businessDay.storeId invalid");
|
||||||
TimiException.requiredTrue(dbBusinessDay.getDateValue().equals(businessDay.getDateValue()), "businessDay.dateValue invalid");
|
TimiException.requiredTrue(dbBusinessDay.getDateValue().equals(businessDay.getDateValue()), "businessDay.dateValue invalid");
|
||||||
if (businessDay.getOpenStatus() == GaoStoreBusinessDay.OpenStatus.CLOSED) {
|
if (businessDay.getStatus() == GaoStoreBusinessDay.Status.CLOSED) {
|
||||||
checkNoRecord(dbBusinessDay);
|
checkNoRecord(dbBusinessDay);
|
||||||
}
|
}
|
||||||
prepareBusinessDay(businessDay);
|
prepareBusinessDay(businessDay);
|
||||||
@@ -64,7 +64,7 @@ public class GaoStoreBusinessDayServiceImplement extends AbstractEntityService<G
|
|||||||
public void delete(String id) {
|
public void delete(String id) {
|
||||||
GaoStoreBusinessDay businessDay = get(id);
|
GaoStoreBusinessDay businessDay = get(id);
|
||||||
TimiException.required(businessDay, "not found businessDay");
|
TimiException.required(businessDay, "not found businessDay");
|
||||||
if (businessDay.getOpenStatus() == GaoStoreBusinessDay.OpenStatus.OPEN) {
|
if (businessDay.getStatus() == GaoStoreBusinessDay.Status.OPEN) {
|
||||||
checkNoRecord(businessDay);
|
checkNoRecord(businessDay);
|
||||||
}
|
}
|
||||||
super.delete(id);
|
super.delete(id);
|
||||||
@@ -78,14 +78,14 @@ public class GaoStoreBusinessDayServiceImplement extends AbstractEntityService<G
|
|||||||
TimiException.required(dateValue, "not found dateValue");
|
TimiException.required(dateValue, "not found dateValue");
|
||||||
GaoStoreBusinessDay businessDay = mapper.selectByStoreIdAndDateValue(storeId, dateValue);
|
GaoStoreBusinessDay businessDay = mapper.selectByStoreIdAndDateValue(storeId, dateValue);
|
||||||
if (businessDay != null) {
|
if (businessDay != null) {
|
||||||
TimiException.requiredTrue(businessDay.getOpenStatus() == GaoStoreBusinessDay.OpenStatus.OPEN, "门店当日休息,不能登记");
|
TimiException.requiredTrue(businessDay.getStatus() == GaoStoreBusinessDay.Status.OPEN, "门店当日休息,不能登记");
|
||||||
TimiException.required(businessDay.getBusinessDayNo(), "not found businessDay.businessDayNo");
|
TimiException.required(businessDay.getBusinessDayNo(), "not found businessDay.businessDayNo");
|
||||||
return businessDay;
|
return businessDay;
|
||||||
}
|
}
|
||||||
businessDay = new GaoStoreBusinessDay();
|
businessDay = new GaoStoreBusinessDay();
|
||||||
businessDay.setStoreId(storeId);
|
businessDay.setStoreId(storeId);
|
||||||
businessDay.setDateValue(dateValue);
|
businessDay.setDateValue(dateValue);
|
||||||
businessDay.setOpenStatus(GaoStoreBusinessDay.OpenStatus.OPEN);
|
businessDay.setStatus(GaoStoreBusinessDay.Status.OPEN);
|
||||||
super.create(businessDay);
|
super.create(businessDay);
|
||||||
rebuildBusinessDayNo(storeId, dateValue);
|
rebuildBusinessDayNo(storeId, dateValue);
|
||||||
return mapper.selectByStoreIdAndDateValue(storeId, dateValue);
|
return mapper.selectByStoreIdAndDateValue(storeId, dateValue);
|
||||||
@@ -97,16 +97,35 @@ public class GaoStoreBusinessDayServiceImplement extends AbstractEntityService<G
|
|||||||
TimiException.required(storeId, "not found storeId");
|
TimiException.required(storeId, "not found storeId");
|
||||||
TimiException.required(beginDateValue, "not found beginDateValue");
|
TimiException.required(beginDateValue, "not found beginDateValue");
|
||||||
long businessDayNo = TimiJava.defaultIfNull(mapper.selectLastBusinessDayNoBefore(storeId, beginDateValue), 0L);
|
long businessDayNo = TimiJava.defaultIfNull(mapper.selectLastBusinessDayNoBefore(storeId, beginDateValue), 0L);
|
||||||
|
mapper.clearBusinessDayNoFromDate(storeId, beginDateValue);
|
||||||
for (GaoStoreBusinessDay businessDay : mapper.selectOpenListFromDate(storeId, beginDateValue)) {
|
for (GaoStoreBusinessDay businessDay : mapper.selectOpenListFromDate(storeId, beginDateValue)) {
|
||||||
businessDayNo++;
|
businessDayNo++;
|
||||||
if (!Long.valueOf(businessDayNo).equals(businessDay.getBusinessDayNo())) {
|
businessDay.setBusinessDayNo(businessDayNo);
|
||||||
businessDay.setBusinessDayNo(businessDayNo);
|
mapper.update(businessDay);
|
||||||
mapper.update(businessDay);
|
|
||||||
}
|
|
||||||
eventRecordMapper.updateBusinessDayNoByStoreIdAndRegisteredDateValue(storeId, businessDay.getDateValue(), businessDayNo);
|
eventRecordMapper.updateBusinessDayNoByStoreIdAndRegisteredDateValue(storeId, businessDay.getDateValue(), businessDayNo);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||||
|
@Override
|
||||||
|
public void autoCloseBusinessDay(String storeId, Integer dateValue) {
|
||||||
|
TimiException.required(storeId, "not found storeId");
|
||||||
|
TimiException.required(dateValue, "not found dateValue");
|
||||||
|
if (mapper.selectByStoreIdAndDateValue(storeId, dateValue) != null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Long count = eventRecordMapper.countByStoreIdAndRegisteredDateValue(storeId, dateValue);
|
||||||
|
if (0 < TimiJava.defaultIfNull(count, 0L)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
GaoStoreBusinessDay businessDay = new GaoStoreBusinessDay();
|
||||||
|
businessDay.setStoreId(storeId);
|
||||||
|
businessDay.setDateValue(dateValue);
|
||||||
|
businessDay.setStatus(GaoStoreBusinessDay.Status.CLOSED);
|
||||||
|
businessDay.setReason("系统自动判定休息");
|
||||||
|
super.create(businessDay);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<GaoStoreBusinessDay> listByDateRange(String storeId, Integer beginDateValue, Integer endDateValue) {
|
public List<GaoStoreBusinessDay> listByDateRange(String storeId, Integer beginDateValue, Integer endDateValue) {
|
||||||
TimiException.required(storeId, "not found storeId");
|
TimiException.required(storeId, "not found storeId");
|
||||||
@@ -120,8 +139,8 @@ public class GaoStoreBusinessDayServiceImplement extends AbstractEntityService<G
|
|||||||
TimiException.required(businessDay, "not found businessDay");
|
TimiException.required(businessDay, "not found businessDay");
|
||||||
TimiException.required(businessDay.getStoreId(), "not found businessDay.storeId");
|
TimiException.required(businessDay.getStoreId(), "not found businessDay.storeId");
|
||||||
TimiException.required(businessDay.getDateValue(), "not found businessDay.dateValue");
|
TimiException.required(businessDay.getDateValue(), "not found businessDay.dateValue");
|
||||||
businessDay.setOpenStatus(TimiJava.defaultIfNull(businessDay.getOpenStatus(), GaoStoreBusinessDay.OpenStatus.OPEN));
|
businessDay.setStatus(TimiJava.defaultIfNull(businessDay.getStatus(), GaoStoreBusinessDay.Status.OPEN));
|
||||||
if (businessDay.getOpenStatus() == GaoStoreBusinessDay.OpenStatus.CLOSED) {
|
if (businessDay.getStatus() == GaoStoreBusinessDay.Status.CLOSED) {
|
||||||
businessDay.setBusinessDayNo(null);
|
businessDay.setBusinessDayNo(null);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
+37
-24
@@ -62,6 +62,7 @@ public class GaoStoreServiceImplement extends AbstractEntityService<GaoStore, St
|
|||||||
logger.setContent(jackson.writeValueAsString(store));
|
logger.setContent(jackson.writeValueAsString(store));
|
||||||
checkUnique(store);
|
checkUnique(store);
|
||||||
store.setStatus(TimiJava.defaultIfNull(store.getStatus(), GaoStore.Status.ACTIVE));
|
store.setStatus(TimiJava.defaultIfNull(store.getStatus(), GaoStore.Status.ACTIVE));
|
||||||
|
store.setAutoClosedDay(TimiJava.defaultIfNull(store.getAutoClosedDay(), false));
|
||||||
store.setSort(TimiJava.defaultIfNull(store.getSort(), 0));
|
store.setSort(TimiJava.defaultIfNull(store.getSort(), 0));
|
||||||
super.create(store);
|
super.create(store);
|
||||||
logger.setLevel(Logger.Level.INFO);
|
logger.setLevel(Logger.Level.INFO);
|
||||||
@@ -73,8 +74,8 @@ public class GaoStoreServiceImplement extends AbstractEntityService<GaoStore, St
|
|||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.setLevel(Logger.Level.ERROR);
|
logger.setLevel(Logger.Level.ERROR);
|
||||||
logger.setException(TimiJava.serializeThrowable(e));
|
logger.setException(TimiJava.serializeThrowable(e));
|
||||||
log.error("新增 GAO 门店失败", e);
|
log.error("create store error", e);
|
||||||
throw new TimiException(TimiCode.ERROR, "新增 GAO 门店失败", e);
|
throw new TimiException(TimiCode.ERROR, "新增门店失败", e);
|
||||||
} finally {
|
} finally {
|
||||||
loggerService.create(logger);
|
loggerService.create(logger);
|
||||||
}
|
}
|
||||||
@@ -92,15 +93,7 @@ public class GaoStoreServiceImplement extends AbstractEntityService<GaoStore, St
|
|||||||
try {
|
try {
|
||||||
logger.setContent(jackson.writeValueAsString(store));
|
logger.setContent(jackson.writeValueAsString(store));
|
||||||
checkUnique(store);
|
checkUnique(store);
|
||||||
GaoStore dbStore = get(store.getId());
|
super.update(store);
|
||||||
dbStore.setCode(store.getCode());
|
|
||||||
dbStore.setName(store.getName());
|
|
||||||
dbStore.setStatus(store.getStatus());
|
|
||||||
dbStore.setTelephone(store.getTelephone());
|
|
||||||
dbStore.setAddress(store.getAddress());
|
|
||||||
dbStore.setRemark(store.getRemark());
|
|
||||||
super.update(dbStore);
|
|
||||||
logger.setLevel(Logger.Level.INFO);
|
|
||||||
logger.setResult(store.getId());
|
logger.setResult(store.getId());
|
||||||
} catch (TimiException e) {
|
} catch (TimiException e) {
|
||||||
logger.setLevel(Logger.Level.WARN);
|
logger.setLevel(Logger.Level.WARN);
|
||||||
@@ -109,8 +102,8 @@ public class GaoStoreServiceImplement extends AbstractEntityService<GaoStore, St
|
|||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.setLevel(Logger.Level.ERROR);
|
logger.setLevel(Logger.Level.ERROR);
|
||||||
logger.setException(TimiJava.serializeThrowable(e));
|
logger.setException(TimiJava.serializeThrowable(e));
|
||||||
log.error("修改 GAO 门店失败", e);
|
log.error("update store error", e);
|
||||||
throw new TimiException(TimiCode.ERROR, "修改 GAO 门店失败", e);
|
throw new TimiException(TimiCode.ERROR, "修改门店失败", e);
|
||||||
} finally {
|
} finally {
|
||||||
loggerService.create(logger);
|
loggerService.create(logger);
|
||||||
}
|
}
|
||||||
@@ -135,8 +128,8 @@ public class GaoStoreServiceImplement extends AbstractEntityService<GaoStore, St
|
|||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.setLevel(Logger.Level.ERROR);
|
logger.setLevel(Logger.Level.ERROR);
|
||||||
logger.setException(TimiJava.serializeThrowable(e));
|
logger.setException(TimiJava.serializeThrowable(e));
|
||||||
log.error("删除 GAO 门店失败", e);
|
log.error("delete store error", e);
|
||||||
throw new TimiException(TimiCode.ERROR, "删除 GAO 门店失败", e);
|
throw new TimiException(TimiCode.ERROR, "删除门店失败", e);
|
||||||
} finally {
|
} finally {
|
||||||
loggerService.create(logger);
|
loggerService.create(logger);
|
||||||
}
|
}
|
||||||
@@ -153,6 +146,11 @@ public class GaoStoreServiceImplement extends AbstractEntityService<GaoStore, St
|
|||||||
return getByUserId(userLoginService.getRequireLoginUserId()).getId();
|
return getByUserId(userLoginService.getRequireLoginUserId()).getId();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<GaoStore> listByAutoClosedDay() {
|
||||||
|
return mapper.selectAllByAutoClosedDay();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public byte[] export(Page<GaoStore> page) throws IOException {
|
public byte[] export(Page<GaoStore> page) throws IOException {
|
||||||
page.setIndex(0);
|
page.setIndex(0);
|
||||||
@@ -167,16 +165,31 @@ public class GaoStoreServiceImplement extends AbstractEntityService<GaoStore, St
|
|||||||
if (TimiJava.isEmpty(idList)) {
|
if (TimiJava.isEmpty(idList)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Logger logger = new Logger(Logger.Module.GAO, "GAO_STORE_SORT");
|
||||||
List<GaoStore> storeList = mapper.selectByIdList(new LinkedHashSet<>(idList));
|
try {
|
||||||
Map<String, GaoStore> storeMap = storeList.stream().collect(Collectors.toMap(GaoStore::getId, Function.identity()));
|
logger.setContent(jackson.writeValueAsString(idList));
|
||||||
for (int i = 0; i < idList.size(); i++) {
|
List<GaoStore> storeList = mapper.selectByIdList(new LinkedHashSet<>(idList));
|
||||||
GaoStore store = storeMap.get(idList.get(i));
|
Map<String, GaoStore> storeMap = storeList.stream().collect(Collectors.toMap(GaoStore::getId, Function.identity()));
|
||||||
if (store == null) {
|
for (int i = 0; i < idList.size(); i++) {
|
||||||
continue;
|
GaoStore store = storeMap.get(idList.get(i));
|
||||||
|
if (store == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
store.setSort(i);
|
||||||
|
mapper.update(store);
|
||||||
}
|
}
|
||||||
store.setSort(i);
|
logger.setLevel(Logger.Level.INFO);
|
||||||
mapper.update(store);
|
} 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, "删除 GAO 门店失败", e);
|
||||||
|
} finally {
|
||||||
|
loggerService.create(logger);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+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;
|
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.config.dbsource.TimiServerDBConfig;
|
||||||
import com.imyeyu.api.modules.gao.entity.GaoStore;
|
import com.imyeyu.api.modules.gao.entity.GaoStore;
|
||||||
import com.imyeyu.api.modules.gao.entity.GaoUser;
|
import com.imyeyu.api.modules.gao.entity.GaoUser;
|
||||||
@@ -30,7 +29,6 @@ import org.springframework.transaction.annotation.Transactional;
|
|||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class GaoUserServiceImplement extends AbstractEntityService<GaoUser, String> implements GaoUserService {
|
public class GaoUserServiceImplement extends AbstractEntityService<GaoUser, String> implements GaoUserService {
|
||||||
|
|
||||||
private final ObjectMapper jackson;
|
|
||||||
private final UserService userService;
|
private final UserService userService;
|
||||||
private final LoggerService loggerService;
|
private final LoggerService loggerService;
|
||||||
private final GaoStoreService gaoStoreService;
|
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");
|
Logger logger = new Logger(Logger.Module.GAO, "GAO_USER_CREATE");
|
||||||
try {
|
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());
|
GaoStore store = gaoStoreService.get(gaoUser.getStoreId());
|
||||||
TimiException.required(store, "not found store");
|
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");
|
Logger logger = new Logger(Logger.Module.GAO, "GAO_USER_UPDATE");
|
||||||
try {
|
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());
|
GaoUser dbGaoUser = super.get(gaoUser.getId());
|
||||||
TimiException.required(dbGaoUser, "not found gao user");
|
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");
|
Logger logger = new Logger(Logger.Module.GAO, "GAO_USER_TRANSFER_STORE");
|
||||||
try {
|
try {
|
||||||
logger.setContent(jackson.writeValueAsString(gaoUser));
|
logger.setContent("gaoUserId=%s;storeId=%s".formatted(gaoUser.getId(), gaoUser.getStoreId()));
|
||||||
|
|
||||||
GaoStore store = gaoStoreService.get(gaoUser.getStoreId());
|
GaoStore store = gaoStoreService.get(gaoUser.getStoreId());
|
||||||
TimiException.required(store, "not found store");
|
TimiException.required(store, "not found store");
|
||||||
|
|||||||
@@ -0,0 +1,43 @@
|
|||||||
|
package com.imyeyu.api.modules.gao.task;
|
||||||
|
|
||||||
|
import com.imyeyu.api.modules.gao.entity.GaoStore;
|
||||||
|
import com.imyeyu.api.modules.gao.service.GaoStoreBusinessDayService;
|
||||||
|
import com.imyeyu.api.modules.gao.service.GaoStoreService;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.scheduling.annotation.Scheduled;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.time.LocalDate;
|
||||||
|
import java.time.format.DateTimeFormatter;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
///
|
||||||
|
/// GAO 门店营业日自动休息任务
|
||||||
|
///
|
||||||
|
/// @author Codex
|
||||||
|
/// @since 2026-08-12
|
||||||
|
@Slf4j
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class GaoStoreAutoCloseDayTask {
|
||||||
|
|
||||||
|
private static final DateTimeFormatter DAY_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMdd");
|
||||||
|
|
||||||
|
private final GaoStoreService storeService;
|
||||||
|
private final GaoStoreBusinessDayService businessDayService;
|
||||||
|
|
||||||
|
/// 每天零点后自动补记前一天无登记门店的休息日
|
||||||
|
@Scheduled(cron = "0 1 0 * * ?")
|
||||||
|
public void run() {
|
||||||
|
int dateValue = Integer.parseInt(DAY_FORMATTER.format(LocalDate.now().minusDays(1)));
|
||||||
|
List<GaoStore> storeList = storeService.listByAutoClosedDay();
|
||||||
|
for (GaoStore store : storeList) {
|
||||||
|
try {
|
||||||
|
businessDayService.autoCloseBusinessDay(store.getId(), dateValue);
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("自动补记 GAO 门店休息日失败: storeId[{}], dateValue[{}]", store.getId(), dateValue, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -35,7 +35,7 @@ public class StoreXSSFBuilder extends BaseXSSFBuilder<GaoStore> {
|
|||||||
appendRow(sheet, 0, titleStyle, "门店列表导出");
|
appendRow(sheet, 0, titleStyle, "门店列表导出");
|
||||||
appendRow(sheet, 1, null, "生成时间", Time.nowString());
|
appendRow(sheet, 1, null, "生成时间", Time.nowString());
|
||||||
appendRow(sheet, 2, null, "记录总数", String.valueOf(list.size()));
|
appendRow(sheet, 2, null, "记录总数", String.valueOf(list.size()));
|
||||||
appendRow(sheet, 3, headerStyle, "门店编码", "门店名称", "状态", "电话", "地址", "备注", "排序", "创建时间");
|
appendRow(sheet, 3, headerStyle, "门店编码", "门店名称", "状态", "电话", "地址", "备注", "自动计算休息日", "排序", "创建时间");
|
||||||
int rowIndex = 4;
|
int rowIndex = 4;
|
||||||
for (GaoStore store : list) {
|
for (GaoStore store : list) {
|
||||||
appendRow(sheet, rowIndex, null,
|
appendRow(sheet, rowIndex, null,
|
||||||
@@ -45,12 +45,13 @@ public class StoreXSSFBuilder extends BaseXSSFBuilder<GaoStore> {
|
|||||||
text(store.getTelephone()),
|
text(store.getTelephone()),
|
||||||
text(store.getAddress()),
|
text(store.getAddress()),
|
||||||
text(store.getRemark()),
|
text(store.getRemark()),
|
||||||
|
Boolean.TRUE.equals(store.getAutoClosedDay()) ? "是" : "否",
|
||||||
store.getSort() == null ? "" : String.valueOf(store.getSort()),
|
store.getSort() == null ? "" : String.valueOf(store.getSort()),
|
||||||
Time.toDateTime(store.getCreatedAt())
|
Time.toDateTime(store.getCreatedAt())
|
||||||
);
|
);
|
||||||
rowIndex++;
|
rowIndex++;
|
||||||
}
|
}
|
||||||
for (int index = 0; index < 8; index++) {
|
for (int index = 0; index < 9; index++) {
|
||||||
sheet.autoSizeColumn(index);
|
sheet.autoSizeColumn(index);
|
||||||
sheet.setColumnWidth(index, Math.clamp(sheet.getColumnWidth(index), 10 * 256, 36 * 256));
|
sheet.setColumnWidth(index, Math.clamp(sheet.getColumnWidth(index), 10 * 256, 36 * 256));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,6 +29,9 @@ public class GaoCustomerEventRankView {
|
|||||||
/// 最近连续登记天数
|
/// 最近连续登记天数
|
||||||
private Long recentContinuousEventDays;
|
private Long recentContinuousEventDays;
|
||||||
|
|
||||||
|
/// 登记数值合计
|
||||||
|
private Long totalNumberValue;
|
||||||
|
|
||||||
/// 最后登记时间
|
/// 最后登记时间
|
||||||
private Long latestRegisteredAt;
|
private Long latestRegisteredAt;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package com.imyeyu.api.modules.gao.vo;
|
||||||
|
|
||||||
|
import com.imyeyu.java.bean.BasePage;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/// GAO 客户分页查询请求
|
||||||
|
///
|
||||||
|
/// @author Codex
|
||||||
|
/// @since 2026-08-13
|
||||||
|
@Data
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
public class GaoCustomerPage extends BasePage {
|
||||||
|
|
||||||
|
/// 门店 ID
|
||||||
|
private String storeId;
|
||||||
|
|
||||||
|
/// 关键字,匹配编码、姓名、电话
|
||||||
|
private String keyword;
|
||||||
|
|
||||||
|
/// 标签 ID 列表,客户必须同时拥有列表内全部标签
|
||||||
|
private List<String> tagIdList;
|
||||||
|
}
|
||||||
@@ -23,9 +23,26 @@ public class GaoEventRecordRankPage extends BasePage {
|
|||||||
/// 登记事件 ID 列表,为空查询全部登记事件
|
/// 登记事件 ID 列表,为空查询全部登记事件
|
||||||
private List<String> eventIdList;
|
private List<String> eventIdList;
|
||||||
|
|
||||||
|
/// 排行类型
|
||||||
|
private RankType rankType;
|
||||||
|
|
||||||
/// 开始登记时间
|
/// 开始登记时间
|
||||||
private Long beginAt;
|
private Long beginAt;
|
||||||
|
|
||||||
/// 结束登记时间
|
/// 结束登记时间
|
||||||
private Long endAt;
|
private Long endAt;
|
||||||
|
|
||||||
|
/// 查询当天日期值,服务端内部填充,格式为 yyyyMMdd
|
||||||
|
private Integer todayDateValue;
|
||||||
|
|
||||||
|
public enum RankType {
|
||||||
|
/// 按累计登记天数
|
||||||
|
TOTAL_DAYS,
|
||||||
|
/// 按累计登记次数
|
||||||
|
TOTAL_COUNT,
|
||||||
|
/// 按最近连续登记天数
|
||||||
|
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;
|
||||||
|
}
|
||||||
@@ -143,7 +143,7 @@ public class FileController implements TimiJava, OS.FileSystem {
|
|||||||
public void read(HttpServletRequest req, HttpServletResponse resp) {
|
public void read(HttpServletRequest req, HttpServletResponse resp) {
|
||||||
try {
|
try {
|
||||||
String path = req.getServletPath().substring("/system/file/read".length());
|
String path = req.getServletPath().substring("/system/file/read".length());
|
||||||
path = "E:\\IDEAProject\\TimiServerAPI\\data\\file" + path;
|
path = "/root/bin/data/mnt" + path;
|
||||||
if (TimiJava.isEmpty(path)) {
|
if (TimiJava.isEmpty(path)) {
|
||||||
resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
|
resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
|
||||||
return;
|
return;
|
||||||
|
|||||||
+6
-10
@@ -18,6 +18,7 @@ import com.imyeyu.java.bean.timi.TimiException;
|
|||||||
import com.imyeyu.spring.TimiSpring;
|
import com.imyeyu.spring.TimiSpring;
|
||||||
import com.imyeyu.spring.util.Redis;
|
import com.imyeyu.spring.util.Redis;
|
||||||
import com.imyeyu.utils.Digest;
|
import com.imyeyu.utils.Digest;
|
||||||
|
import com.imyeyu.utils.Regex;
|
||||||
import com.imyeyu.utils.Time;
|
import com.imyeyu.utils.Time;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -38,7 +39,6 @@ import java.util.concurrent.ThreadLocalRandom;
|
|||||||
@RequiredArgsConstructor(onConstructor_ = {@Lazy})
|
@RequiredArgsConstructor(onConstructor_ = {@Lazy})
|
||||||
public class UserLoginServiceImplement implements UserLoginService, TimiJava {
|
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 USER_TOKEN_KEY_PREFIX = "USER:TOKEN:";
|
||||||
private static final String PHONE_VERIFY_KEY_PREFIX = "USER:PHONE:VERIFY:";
|
private static final String PHONE_VERIFY_KEY_PREFIX = "USER:PHONE:VERIFY:";
|
||||||
private static final long PHONE_VERIFY_CODE_TTL = Time.M * 5;
|
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());
|
User dbUser = userService.get(req.getUser());
|
||||||
if (dbUser == null && req.getUser().contains("@")) {
|
if (dbUser == null && req.getUser().contains("@")) {
|
||||||
dbUser = userService.getByVerifiedEmail(req.getUser());
|
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());
|
dbUser = userService.getByVerifiedPhoneNo(req.getUser());
|
||||||
} else if (dbUser == null) {
|
} else if (dbUser == null) {
|
||||||
dbUser = userService.getByName(req.getUser());
|
dbUser = userService.getByName(req.getUser());
|
||||||
@@ -143,8 +143,8 @@ public class UserLoginServiceImplement implements UserLoginService, TimiJava {
|
|||||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||||
@Override
|
@Override
|
||||||
public void sendPhoneVerifyCode(String phoneNo) {
|
public void sendPhoneVerifyCode(String phoneNo) {
|
||||||
TimiException.requiredTrue(isPhoneNo(phoneNo), "invalid phone number");
|
TimiException.requiredTrue(Regex.isMatch(Regex.MOBILE_PHONE, phoneNo), "invalid phone number");
|
||||||
User verifiedUser = userService.getByVerifiedPhoneNo(phoneNo);
|
User verifiedUser = userService.getByPhoneNo(phoneNo);
|
||||||
User loginUser = getRequireLoginUser();
|
User loginUser = getRequireLoginUser();
|
||||||
TimiException.requiredTrue(verifiedUser == null || verifiedUser.getId().equals(loginUser.getId()), "existed phone number");
|
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)
|
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||||
@Override
|
@Override
|
||||||
public void verifyPhoneNo(String phoneNo, String verifyCode) {
|
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");
|
TimiException.required(verifyCode, "not found verify code");
|
||||||
|
|
||||||
User user = getRequireLoginUser();
|
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");
|
TimiException.requiredTrue(verifiedUser == null || verifiedUser.getId().equals(user.getId()), "existed phone number");
|
||||||
|
|
||||||
String cacheCode = redisUserPhoneVerify.get(getPhoneVerifyKey(phoneNo));
|
String cacheCode = redisUserPhoneVerify.get(getPhoneVerifyKey(phoneNo));
|
||||||
@@ -188,10 +188,6 @@ public class UserLoginServiceImplement implements UserLoginService, TimiJava {
|
|||||||
userService.delete(user.getId());
|
userService.delete(user.getId());
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isPhoneNo(String value) {
|
|
||||||
return TimiJava.isNotEmpty(value) && value.matches(REGEX_PHONE_NO);
|
|
||||||
}
|
|
||||||
|
|
||||||
private String getPhoneVerifyKey(String phoneNo) {
|
private String getPhoneVerifyKey(String phoneNo) {
|
||||||
return "%s%s".formatted(PHONE_VERIFY_KEY_PREFIX, 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())) {
|
if (TimiJava.isNotEmpty(user.getPhoneNo())) {
|
||||||
TimiException.requiredTrue(user.isValidPhone(), "invalid phone");
|
TimiException.requiredTrue(user.isValidPhone(), "invalid phone");
|
||||||
User byPhoneNo = getByVerifiedPhoneNo(user.getPhoneNo());
|
User byPhoneNo = getByPhoneNo(user.getPhoneNo());
|
||||||
TimiException.requiredNull(byPhoneNo, "existed phone number");
|
TimiException.requiredNull(byPhoneNo, "existed phone number");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -94,7 +94,7 @@ public class UserServiceImplement extends AbstractEntityService<User, String> im
|
|||||||
if (TimiJava.isNotEmpty(phoneNo)) {
|
if (TimiJava.isNotEmpty(phoneNo)) {
|
||||||
TimiException.requiredTrue(user.isValidPhone(), "invalid phone");
|
TimiException.requiredTrue(user.isValidPhone(), "invalid phone");
|
||||||
if (!phoneNo.equals(dbUser.getPhoneNo())) {
|
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");
|
TimiException.requiredTrue(byPhoneNo == null || byPhoneNo.getId().equals(dbUser.getId()), "existed phone number");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
ALTER TABLE `gao_store`
|
||||||
|
ADD COLUMN `auto_closed_day` BOOLEAN NOT NULL DEFAULT FALSE COMMENT 'true 为启用自动计算休息日' AFTER `remark`;
|
||||||
|
ALTER TABLE `gao_store_business_day`
|
||||||
|
DROP KEY `uk_gao_store_business_day_active_no`,
|
||||||
|
DROP KEY `idx_gao_store_business_day_open_no`,
|
||||||
|
DROP COLUMN `active_business_day_no`;
|
||||||
|
ALTER TABLE `gao_store_business_day`
|
||||||
|
CHANGE COLUMN `open_status` `status` VARCHAR(32) NOT NULL COMMENT '营业状态';
|
||||||
|
ALTER TABLE `gao_store_business_day`
|
||||||
|
ADD COLUMN `active_business_day_no` BIGINT GENERATED ALWAYS AS (
|
||||||
|
CASE WHEN `deleted_at` IS NULL AND `status` = 'OPEN' THEN `business_day_no` ELSE NULL END
|
||||||
|
) STORED COMMENT '未删除营业日序号' INVISIBLE AFTER `business_day_no`,
|
||||||
|
ADD UNIQUE KEY `uk_gao_store_business_day_active_no` (`store_id`, `active_business_day_no`),
|
||||||
|
ADD KEY `idx_gao_store_business_day_status_no` (`store_id`, `status`, `business_day_no`);
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
-- 历史标签统一归入迁移时创建的默认门店。
|
||||||
|
SET @gao_default_store_id = '00000000-0000-0000-0000-000000000001';
|
||||||
|
|
||||||
|
ALTER TABLE `tag`
|
||||||
|
ADD COLUMN `owner_type` VARCHAR(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '归属类型' AFTER `id`,
|
||||||
|
ADD COLUMN `owner_id` VARCHAR(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '归属门店 ID' AFTER `owner_type`;
|
||||||
|
|
||||||
|
UPDATE `tag`
|
||||||
|
SET
|
||||||
|
`owner_type` = 'GAO_STORE',
|
||||||
|
`owner_id` = @gao_default_store_id
|
||||||
|
WHERE `owner_type` IS NULL
|
||||||
|
OR `owner_id` IS NULL;
|
||||||
|
|
||||||
|
ALTER TABLE `tag`
|
||||||
|
MODIFY COLUMN `owner_type` VARCHAR(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '归属类型',
|
||||||
|
MODIFY COLUMN `owner_id` VARCHAR(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '归属门店 ID',
|
||||||
|
ADD KEY `idx_tag_owner` (`owner_type`, `owner_id`, `deleted_at`);
|
||||||
@@ -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`);
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||||
|
<mapper namespace="com.imyeyu.api.modules.common.mapper.TagMapper">
|
||||||
|
<select id="selectByIdList" resultType="com.imyeyu.api.modules.common.entity.Tag">
|
||||||
|
SELECT
|
||||||
|
*
|
||||||
|
FROM `tag`
|
||||||
|
WHERE
|
||||||
|
TRUE
|
||||||
|
<if test="idList != null and !idList.isEmpty()">
|
||||||
|
AND `id` IN
|
||||||
|
<foreach collection="idList" item="id" separator="," open="(" close=")">
|
||||||
|
#{id}
|
||||||
|
</foreach>
|
||||||
|
</if>
|
||||||
|
<if test="idList == null or idList.isEmpty()">
|
||||||
|
AND FALSE
|
||||||
|
</if>
|
||||||
|
AND `deleted_at` IS NULL
|
||||||
|
</select>
|
||||||
|
<select id="selectByOwnerAndZhCN" resultType="com.imyeyu.api.modules.common.entity.Tag">
|
||||||
|
SELECT
|
||||||
|
`t`.*
|
||||||
|
FROM `tag` `t`
|
||||||
|
INNER JOIN `multilingual` `m`
|
||||||
|
ON `m`.`id` = `t`.`name_lang_id`
|
||||||
|
AND `m`.`deleted_at` IS NULL
|
||||||
|
WHERE
|
||||||
|
`t`.`owner_type` = #{ownerType}
|
||||||
|
AND `t`.`owner_id` = #{ownerId}
|
||||||
|
AND `m`.`zh_cn` = #{zhCN}
|
||||||
|
AND `t`.`deleted_at` IS NULL
|
||||||
|
LIMIT 1
|
||||||
|
</select>
|
||||||
|
</mapper>
|
||||||
+46
@@ -19,6 +19,52 @@
|
|||||||
AND `deleted_at` IS NULL
|
AND `deleted_at` IS NULL
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<sql id="queryWhere">
|
||||||
|
`c`.`deleted_at` IS NULL
|
||||||
|
<if test="storeId != null and storeId != ''">
|
||||||
|
AND `c`.`store_id` = #{storeId}
|
||||||
|
</if>
|
||||||
|
<if test="keyword != null and keyword != ''">
|
||||||
|
AND (
|
||||||
|
`c`.`code` LIKE CONCAT('%', #{keyword}, '%')
|
||||||
|
OR `c`.`name` LIKE CONCAT('%', #{keyword}, '%')
|
||||||
|
OR `c`.`telephone` LIKE CONCAT('%', #{keyword}, '%')
|
||||||
|
)
|
||||||
|
</if>
|
||||||
|
<if test="tagIdList != null and !tagIdList.isEmpty()">
|
||||||
|
<bind name="tagCount" value="tagIdList.size()"/>
|
||||||
|
AND `c`.`id` IN (
|
||||||
|
SELECT `ta`.`biz_id`
|
||||||
|
FROM `tag_apply` `ta`
|
||||||
|
WHERE
|
||||||
|
`ta`.`biz_type` = 'GAO_CUSTOMER'
|
||||||
|
AND `ta`.`tag_id` IN
|
||||||
|
<foreach collection="tagIdList" item="tagId" separator="," open="(" close=")">
|
||||||
|
#{tagId}
|
||||||
|
</foreach>
|
||||||
|
AND `ta`.`deleted_at` IS NULL
|
||||||
|
GROUP BY `ta`.`biz_id`
|
||||||
|
HAVING COUNT(DISTINCT `ta`.`tag_id`) = #{tagCount}
|
||||||
|
)
|
||||||
|
</if>
|
||||||
|
</sql>
|
||||||
|
|
||||||
|
<select id="countByQuery" resultType="long">
|
||||||
|
SELECT COUNT(1)
|
||||||
|
FROM `gao_customer` `c`
|
||||||
|
WHERE
|
||||||
|
<include refid="queryWhere"/>
|
||||||
|
</select>
|
||||||
|
|
||||||
|
<select id="selectByQuery" resultType="com.imyeyu.api.modules.gao.entity.GaoCustomer">
|
||||||
|
SELECT `c`.*
|
||||||
|
FROM `gao_customer` `c`
|
||||||
|
WHERE
|
||||||
|
<include refid="queryWhere"/>
|
||||||
|
ORDER BY `c`.`created_at` DESC, `c`.`id` DESC
|
||||||
|
LIMIT #{offset}, #{limit}
|
||||||
|
</select>
|
||||||
|
|
||||||
<select id="stateDailyNewCustomer" resultType="com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateView">
|
<select id="stateDailyNewCustomer" resultType="com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateView">
|
||||||
SELECT
|
SELECT
|
||||||
CAST(DATE_FORMAT(FROM_UNIXTIME(`created_at` / 1000), '%Y%m%d') AS UNSIGNED) AS `dateValue`,
|
CAST(DATE_FORMAT(FROM_UNIXTIME(`created_at` / 1000), '%Y%m%d') AS UNSIGNED) AS `dateValue`,
|
||||||
+192
-73
@@ -26,6 +26,39 @@
|
|||||||
AND `deleted_at` IS NULL
|
AND `deleted_at` IS NULL
|
||||||
</select>
|
</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 id="countByStoreIdAndRegisteredDateValue" resultType="java.lang.Long">
|
||||||
SELECT
|
SELECT
|
||||||
COUNT(1)
|
COUNT(1)
|
||||||
@@ -97,6 +130,14 @@
|
|||||||
ORDER BY r.`registered_at` DESC, r.`created_at` DESC
|
ORDER BY r.`registered_at` DESC, r.`created_at` DESC
|
||||||
LIMIT #{offset}, #{limit}
|
LIMIT #{offset}, #{limit}
|
||||||
</select>
|
</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">
|
<sql id="rankWhere">
|
||||||
r.`deleted_at` IS NULL
|
r.`deleted_at` IS NULL
|
||||||
@@ -119,6 +160,9 @@
|
|||||||
#{eventId}
|
#{eventId}
|
||||||
</foreach>
|
</foreach>
|
||||||
</if>
|
</if>
|
||||||
|
<if test="rankType != null and rankType.name() == 'TOTAL_NUMBER_VALUE'">
|
||||||
|
AND r.`number_value` IS NOT NULL
|
||||||
|
</if>
|
||||||
</sql>
|
</sql>
|
||||||
<select id="countRankByRange" resultType="long">
|
<select id="countRankByRange" resultType="long">
|
||||||
SELECT
|
SELECT
|
||||||
@@ -129,79 +173,154 @@
|
|||||||
<include refid="rankWhere"/>
|
<include refid="rankWhere"/>
|
||||||
</select>
|
</select>
|
||||||
<select id="selectRankByRange" resultType="com.imyeyu.api.modules.gao.vo.GaoCustomerEventRankView">
|
<select id="selectRankByRange" resultType="com.imyeyu.api.modules.gao.vo.GaoCustomerEventRankView">
|
||||||
WITH `daily_stat` AS (
|
<choose>
|
||||||
SELECT
|
<when test="rankType == null or rankType.name() == 'TOTAL_DAYS'">
|
||||||
r.`customer_id` AS `customerId`,
|
SELECT
|
||||||
r.`business_day_no` AS `businessDayNo`,
|
ROW_NUMBER() OVER (
|
||||||
COUNT(1) AS `dailyCount`,
|
ORDER BY COUNT(DISTINCT r.`registered_date_value`) DESC, r.`customer_id`
|
||||||
MAX(r.`registered_at`) AS `latestRegisteredAt`
|
) AS `rank`,
|
||||||
FROM `gao_event_record` r
|
r.`customer_id` AS `customerId`,
|
||||||
LEFT JOIN `gao_customer` c ON r.`customer_id` = c.`id`
|
COUNT(DISTINCT r.`registered_date_value`) AS `totalEventDays`,
|
||||||
WHERE
|
NULL AS `totalEventCount`,
|
||||||
<include refid="rankWhere"/>
|
NULL AS `recentContinuousEventDays`,
|
||||||
GROUP BY
|
NULL AS `totalNumberValue`,
|
||||||
r.`customer_id`,
|
NULL AS `latestRegisteredAt`
|
||||||
r.`business_day_no`
|
FROM `gao_event_record` r
|
||||||
),
|
LEFT JOIN `gao_customer` c ON r.`customer_id` = c.`id`
|
||||||
`rank_stat` AS (
|
WHERE
|
||||||
SELECT
|
<include refid="rankWhere"/>
|
||||||
`customerId`,
|
GROUP BY r.`customer_id`
|
||||||
COUNT(1) AS `totalEventDays`,
|
ORDER BY `rank`
|
||||||
SUM(`dailyCount`) AS `totalEventCount`,
|
LIMIT #{offset}, #{limit}
|
||||||
MAX(`latestRegisteredAt`) AS `latestRegisteredAt`
|
</when>
|
||||||
FROM `daily_stat`
|
<when test="rankType.name() == 'TOTAL_COUNT'">
|
||||||
GROUP BY `customerId`
|
SELECT
|
||||||
),
|
ROW_NUMBER() OVER (
|
||||||
`continuous_ordered` AS (
|
ORDER BY COUNT(1) DESC, r.`customer_id`
|
||||||
SELECT
|
) AS `rank`,
|
||||||
`customerId`,
|
r.`customer_id` AS `customerId`,
|
||||||
`businessDayNo`,
|
NULL AS `totalEventDays`,
|
||||||
ROW_NUMBER() OVER (PARTITION BY `customerId` ORDER BY `businessDayNo` DESC) AS `dayIndex`
|
COUNT(1) AS `totalEventCount`,
|
||||||
FROM `daily_stat`
|
NULL AS `recentContinuousEventDays`,
|
||||||
),
|
NULL AS `totalNumberValue`,
|
||||||
`latest_date` AS (
|
NULL AS `latestRegisteredAt`
|
||||||
SELECT
|
FROM `gao_event_record` r
|
||||||
`customerId`,
|
LEFT JOIN `gao_customer` c ON r.`customer_id` = c.`id`
|
||||||
MAX(`businessDayNo`) AS `latestBusinessDayNo`
|
WHERE
|
||||||
FROM `daily_stat`
|
<include refid="rankWhere"/>
|
||||||
GROUP BY `customerId`
|
GROUP BY r.`customer_id`
|
||||||
),
|
ORDER BY `rank`
|
||||||
`continuous_stat` AS (
|
LIMIT #{offset}, #{limit}
|
||||||
SELECT
|
</when>
|
||||||
o.`customerId`,
|
<when test="rankType.name() == 'TOTAL_NUMBER_VALUE'">
|
||||||
COUNT(1) AS `recentContinuousEventDays`
|
SELECT
|
||||||
FROM `continuous_ordered` o
|
ROW_NUMBER() OVER (
|
||||||
LEFT JOIN `latest_date` l ON o.`customerId` = l.`customerId`
|
ORDER BY SUM(r.`number_value`) DESC, r.`customer_id`
|
||||||
WHERE o.`businessDayNo` + o.`dayIndex` = l.`latestBusinessDayNo` + 1
|
) AS `rank`,
|
||||||
GROUP BY o.`customerId`
|
r.`customer_id` AS `customerId`,
|
||||||
),
|
NULL AS `totalEventDays`,
|
||||||
`ranked` AS (
|
NULL AS `totalEventCount`,
|
||||||
SELECT
|
NULL AS `recentContinuousEventDays`,
|
||||||
ROW_NUMBER() OVER (
|
SUM(r.`number_value`) AS `totalNumberValue`,
|
||||||
ORDER BY
|
NULL AS `latestRegisteredAt`
|
||||||
r.`totalEventDays` DESC,
|
FROM `gao_event_record` r
|
||||||
r.`totalEventCount` DESC,
|
LEFT JOIN `gao_customer` c ON r.`customer_id` = c.`id`
|
||||||
r.`latestRegisteredAt` DESC,
|
WHERE
|
||||||
r.`customerId`
|
<include refid="rankWhere"/>
|
||||||
) AS `rank`,
|
GROUP BY r.`customer_id`
|
||||||
r.`customerId`,
|
ORDER BY `rank`
|
||||||
r.`totalEventDays`,
|
LIMIT #{offset}, #{limit}
|
||||||
r.`totalEventCount`,
|
</when>
|
||||||
COALESCE(c.`recentContinuousEventDays`, 0) AS `recentContinuousEventDays`,
|
<otherwise>
|
||||||
r.`latestRegisteredAt`
|
WITH RECURSIVE `daily_stat` AS (
|
||||||
FROM `rank_stat` r
|
SELECT
|
||||||
LEFT JOIN `continuous_stat` c ON r.`customerId` = c.`customerId`
|
r.`customer_id` AS `customerId`,
|
||||||
)
|
r.`registered_date_value` AS `registeredDateValue`
|
||||||
SELECT
|
FROM `gao_event_record` r
|
||||||
`rank`,
|
LEFT JOIN `gao_customer` c ON r.`customer_id` = c.`id`
|
||||||
`customerId`,
|
WHERE
|
||||||
`totalEventDays`,
|
<include refid="rankWhere"/>
|
||||||
`totalEventCount`,
|
GROUP BY
|
||||||
`recentContinuousEventDays`,
|
r.`customer_id`,
|
||||||
`latestRegisteredAt`
|
r.`registered_date_value`
|
||||||
FROM `ranked`
|
),
|
||||||
ORDER BY `rank`
|
`range_bound` AS (
|
||||||
LIMIT #{offset}, #{limit}
|
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>
|
</select>
|
||||||
|
|
||||||
<sql id="storeChartRangeWhere">
|
<sql id="storeChartRangeWhere">
|
||||||
+1
-1
@@ -10,6 +10,6 @@
|
|||||||
AND (`begin_at` IS NULL OR `begin_at` <= #{now})
|
AND (`begin_at` IS NULL OR `begin_at` <= #{now})
|
||||||
AND (`end_at` IS NULL OR #{now} <= `end_at`)
|
AND (`end_at` IS NULL OR #{now} <= `end_at`)
|
||||||
AND `deleted_at` IS NULL
|
AND `deleted_at` IS NULL
|
||||||
ORDER BY `priority` ASC, `created_at` ASC, `id` ASC
|
ORDER BY `priority`, `created_at`, `id`
|
||||||
</select>
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
Reference in New Issue
Block a user