irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity
342 Commits 1 Branch 0 Tags
3df12672724b8fc3ad174c63bbba1c02beda8886
Commit Graph

342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
irving
3df1267272 adjust api test mysql version 2025-11-07 23:04:27 -05:00
irving
5c3fa1e33f adjust api test docker mysql version
Some checks failed
Build and Push Backend / docker (push) Failing after 5s
Details
2025-11-07 22:49:25 -05:00
irving
15f058617a remove unused file
Some checks failed
Build and Push Backend / docker (push) Failing after 5s
Details
2025-11-07 22:39:14 -05:00
irving
29ff0a2637 feat: add flyway cli wrapper and staging restore 2025-11-07 22:38:47 -05:00
irving
d7d7c64c01 fix: exclude cancelled orders from performance stats
Some checks failed
Build and Push Backend / docker (push) Failing after 4s
Details
2025-11-07 00:29:58 -05:00
irving
cc59f859af update db to use unicode8
Some checks failed
Build and Push Backend / docker (push) Failing after 5s
Details
2025-11-06 23:54:10 -05:00
irving
6e21143a46 add flyway conf for cli to use easily 2025-11-06 00:02:14 -05:00
irving
d6402d60b2 chore: update V14 migration and add application-local-staging.yml
Some checks failed
Build and Push Backend / docker (push) Failing after 5s
Details 
- Updated play-admin migration: V14__add_clerk_level_order_number.sql
- Added play-admin/src/main/resources/application-local-staging.yml
 2025-11-05 23:12:58 -05:00
irving
749a99dd01 chore: 更新构建脚本 build-docker.sh
Some checks failed
Build and Push Backend / docker (push) Failing after 5s
Details
2025-11-04 22:31:13 -05:00
irving
024ee7ebda fix: 调整店员相关代码以通过测试 2025-11-04 22:16:42 -05:00
irving
98bbf219f3 fix deploy script 2025-11-04 22:08:00 -05:00
irving
2857f2057d chore: 更新部署脚本 deploy-docker.sh
Some checks failed
Build and Push Backend / docker (push) Failing after 5s
Details
2025-11-04 22:04:23 -05:00
irving
0b7e86cfa3 chore: commit all changes (2025-11-04) 2025-11-04 22:00:31 -05:00
irving
a8cdb27e8e 新增店员等级排序功能
Some checks failed
Build and Push Backend / docker (push) Failing after 6s
Details 
- 添加数据库迁移脚本，为 play_clerk_level_info 表新增 order_number 字段
- 更新测试数据种子，设置默认等级的排序号
- 新增店员用户API测试，验证按等级排序号和在线状态的排序逻辑
 2025-11-04 21:20:42 -05:00
irving
d961e62cc2 合并 fix-lable 分支：优化订单通知消息标签
Some checks failed
Build and Push Backend / docker (push) Failing after 5s
Details
2025-11-03 22:54:13 -05:00
irving
da2902c61c 重构：优化订单通知消息标签，支持动态显示订单类型 
- 新增 OrderMessageLabelResolver 用于解析订单场景标签
- 修改微信公众号下单通知，根据下单类型(随机单/指定单/打赏/礼物)显示对应标签
- 更新 WxCustomMpService 接口，传递 placeType 和 rewardType 参数
- 完善相关单元测试和 Mock 配置
 2025-11-03 22:51:48 -05:00
hucs-dev
f39fc4f040 feat: 🎁店员等级新增排序字段 2025-11-04 10:49:05 +08:00
irving
83112b406a 修复订单下单错误和余额扣款校验问题
Some checks failed
Build and Push Backend / docker (push) Failing after 5s
Details
2025-11-03 10:02:03 -05:00
irving
fe36332ef3 fuck double datasource
Some checks failed
Build and Push Backend / docker (push) Failing after 5s
Details
2025-11-03 00:02:02 -05:00
irving
7443c33d7a fix order placement error
Some checks failed
Build and Push Backend / docker (push) Failing after 6s
Details
2025-11-02 21:51:08 -05:00
irving
c463179e83 fix(order): 前置余额扣减并统一金额精度处理，补充余额校验与单测 
- 抽取 validateSufficientBalance，统一使用 normalizeMoney 校验与比较，提升健壮性\n- AbstractOrderPlacementStrategy：在创建订单前根据 shouldDeduct 进行余额校验与扣减，使用上下文 orderId 记录流水，避免不一致\n- deductCustomerBalance：使用 amountToDeduct 变量并先归一化后运算，修正可能的精度问题\n- 调整/补充测试用例：扣减失败不插入订单、不保存用户信息；更新 selectById 调用次数校验
 2025-11-02 16:03:59 -05:00
irving
79b516d81c test: 添加微信端优惠券、订单评价、订单管理和提现的API测试
Some checks failed
Build and Push Backend / docker (push) Failing after 5s
Details 
新增四个API集成测试类：
- WxCouponControllerApiTest: 测试优惠券领取、查询、使用限制和白名单逻辑
- WxCustomOrderEvaluationApiTest: 测试订单评价创建和查询功能
- WxOrderInfoControllerApiTest: 测试随机订单接单、续单申请和隐私字段处理
- WxWithdrawControllerApiTest: 测试收益余额查询、提现申请和收益明细过滤

提高微信端核心业务流程的测试覆盖率
 2025-11-02 10:32:16 -05:00
irving
7b9f1fd8c2 feat(clerk): 店员审核流程优化与问题修复
Some checks failed
Build and Push Backend / docker (push) Failing after 5s
Details
2025-11-01 23:55:56 -04:00
irving
d01c8a4c6a feat(wechat): 抽象通知发送器并完善自定义下单相关接口测试 2025-11-01 23:55:51 -04:00
irving
9f83103189 feat(order): 完善订单生命周期与投诉处理；补充单元测试 2025-11-01 23:55:47 -04:00
irving
60b4b0bd49 feat(shop): 优化商品与优惠券逻辑；修复礼品相关映射；补充接口测试 2025-11-01 23:55:41 -04:00
irving
0faa7f2988 test(apitest): 完善接口测试数据播种逻辑 2025-11-01 23:55:28 -04:00
irving
cf25e6b116 fix: 全局异常处理完善，统一返回格式与错误码 2025-11-01 23:55:24 -04:00
irving
2706bfb3b6 perf(common): 优化线程池参数与请求日志，降低噪音并提升可观测性 2025-11-01 23:55:21 -04:00
irving
2a820f113d chore(config): 更新 apitest 环境配置 2025-11-01 23:55:16 -04:00
irving
e6ad24e015 chore(docker): 调整 docker-compose 配置，优化本地依赖服务 2025-11-01 23:55:13 -04:00
irving
4f4b2f9027 docs: 更新 README，补充使用说明 2025-11-01 23:55:07 -04:00
irving
c7684e3199 Merge branch 'api-test-1'
Some checks failed
Build and Push Backend / docker (push) Failing after 5s
Details 
API test first run
 2025-11-01 15:18:03 -04:00
irving
04b9960e35 API-test-in-progress 2025-11-01 15:16:45 -04:00
irving
b1fd515fb3 feat(order): 新增管理端完成订单能力（店员端触发）
Some checks failed
Build and Push Backend / docker (push) Failing after 6s
Details 
- OrderConstant 新增角色 GROUP_LEADER、触发源 WX_CLERK_MGMT；补充映射
- IPlayOrderInfoService 新增 completeOrderByManagement 方法
- PlayOrderInfoServiceImpl：校验权限（仅运营/组长，组长仅限本组）；ACCEPTED 自动切换为 IN_PROGRESS 后完成；抽取 completeOrderInternal；完善 GROUP_LEADER 的 Actor/Source 映射
- WxClerkController 新增 POST /wx/clerk/order/complete 接口，支持备注参数
- 新增请求体 PlayOrderCompleteVo
- 新增单测 PlayOrderInfoServiceImplTest 覆盖核心流程与边界
 2025-11-01 15:07:59 -04:00
irving
16ea9b9d48 fix(order): guard nulls and compare enums safely in clerk order details; add privacy masking for RANDOM pending; apply spotless (2025-11-01) 2025-11-01 14:05:30 -04:00
irving
427ad4b08a allow admin to by pass clerk list filtering
Some checks failed
Build and Push Backend / docker (push) Failing after 5s
Details
2025-11-01 13:28:19 -04:00
irving
f3480b6ba0 feat(apitest): 新增 API 测试环境与安全配置 
- 新增 apitest 专用 MySQL 配置与 Docker 编排（docker/apitest-mysql.yml、docker/apitest-mysql/）

- 增加 ApiTestSecurityConfig / ApiTestSecurityProperties 与 ApiTestAuthenticationFilter

- 新增 application-apitest.yml 与相关测试目录（play-admin/src/test/java/com/starry/admin/api/）

- 调整根 pom 与 play-admin/pom 依赖，优化 SpringSecurityConfig 以兼容 apitest
 2025-11-01 10:33:54 -04:00
irving
fb2bd510b1 fix 管理员看不到订单
Some checks failed
Build and Push Backend / docker (push) Failing after 6s
Details
2025-10-31 23:59:52 -04:00
irving
b6f89045ab Merge branch 'fired-clerk-fix'
Some checks failed
Build and Push Backend / docker (push) Failing after 5s
Details 
修复离职店员可以接单问题
 2025-10-31 22:53:00 -04:00
irving
754af2f540 fix: 修复离职店员登录与权限校验，优化订单与微信流程，新增店员状态与角色枚举 
ClerkUserLoginAspect: 修复登录拦截，禁止离职/禁用店员继续访问

IPlayClerkUserInfoService/Impl: 调整权限校验与查询逻辑

PlayOrderInfoServiceImpl: 订单创建/生命周期兼容店员状态

WxOauthController/WxCustomController/WxOauthService/WxCustomMpService: 完善 OAuth 与消息处理流程

新增枚举: ClerkRoleStatus、ListingStatus、OnboardingStatus
 2025-10-31 22:49:09 -04:00
irving
8f89955405 fix: fix performance salary calculation
Some checks failed
Build and Push Backend / docker (push) Failing after 6s
Details
2025-10-31 21:31:56 -04:00
irving
e7ccadaea0 refactor: 盲盒功能代码优化和完善 
修复和改进:
- 修复字段映射：blind_box_gift_id -> blind_box_id
- 移除不必要的 @Version 乐观锁字段
- 优化 Mapper 方法：统一使用 listActiveEntries，简化查询逻辑
- 新增客户端接口：盲盒购买、奖励查询和兑现
- 增强权限校验：奖励兑现时验证客户身份
- 完善单元测试：增加客户身份验证测试用例
- 代码格式化：调整 import 顺序，优化代码结构

客户端 API:
- GET /wx/blind-box/config/list - 查询可用盲盒列表
- POST /wx/blind-box/order/purchase - 购买盲盒
- GET /wx/blind-box/reward/list - 查询我的盲盒奖励
- POST /wx/blind-box/reward/{id}/dispatch - 兑现盲盒奖励

其他优化:
- 增强 SQL 查询安全性，添加 deleted 字段过滤
- 优化店员提成计算逻辑
- 改进参数可选性（levelId 参数改为可选）
 2025-10-31 02:48:03 -04:00
irving
422e781c60 feat: 实现盲盒功能模块 
新增功能:
- 盲盒配置管理：支持盲盒的创建、编辑、上下架
- 盲盒奖池管理：支持奖池配置、Excel导入、权重抽奖、库存管理
- 盲盒购买流程：客户购买盲盒并抽取奖励
- 奖励兑现流程：客户可将盲盒奖励兑现为实际礼物订单
- 店员提成：奖励兑现时自动增加店员礼物提成

核心实现:
- BlindBoxService: 抽奖核心逻辑，支持权重算法和库存扣减
- BlindBoxDispatchService: 奖励兑现订单创建
- BlindBoxInventoryService: 奖池库存管理
- BlindBoxPoolAdminService: 奖池配置管理，支持批量导入

API接口:
- /play/blind-box/config: 盲盒配置CRUD
- /play/blind-box/pool: 奖池配置管理和导入
- /wx/blind-box: 客户端盲盒购买和奖励查询

数据库变更:
- blind_box_config: 盲盒配置表
- blind_box_pool: 盲盒奖池表
- blind_box_reward: 盲盒奖励记录表
- play_order_info: 新增 payment_source 和 source_reward_id 字段

其他改进:
- 订单模块支持盲盒支付来源，区分余额扣款和奖励抵扣
- 优惠券校验：盲盒相关订单不支持使用优惠券
- 完善单元测试覆盖
 2025-10-31 02:46:51 -04:00
irving
c9439e1021 test: 补充优惠券库存相关单测
Some checks failed
Build and Push Backend / docker (push) Failing after 6s
Details
2025-10-31 00:10:40 -04:00
irving
db6132d7e3 feat: 优化优惠券发放与库存校验流程 2025-10-31 00:10:24 -04:00
irving
48bdc9af33 重构收益与优惠券逻辑：统一使用 orderAmount，新增优惠券状态校验与过滤 
- IPlayOrderInfoService/PlayOrderInfoServiceImpl/ClerkRevenueCalculator 将参数 finalAmount 更名为 orderAmount，避免语义混淆
- 预计收益计算兼容 null 与 0，防止 NPE 并明确边界
- 结算/回填：EarningsServiceImpl、EarningsBackfillServiceImpl 改为使用 orderMoney 兜底；0 金额允许，负数跳过
- 新增枚举：CouponOnlineState、CouponValidityPeriodType 用于券上下架与有效期判定
- IPlayCouponInfoService/Impl 增加 getCouponDetailRestrictionReason，支持已使用/过期/下架等状态校验
- WxCouponController 列表与下单查询增加状态/有效期/库存/白名单过滤逻辑
- OrderLifecycleServiceImpl 下单时校验优惠券状态，预计收益入参从 finalAmount 调整为 orderMoney
- 完善单元测试：订单生命周期、优惠券过滤、收益生成与回填等覆盖
 2025-10-30 22:07:37 -04:00
irving
e29c5db276 重构订单下单逻辑，引入策略模式和命令模式 
- 为OrderTriggerSource枚举添加详细注释说明
- 将IOrderLifecycleService接口的initiateOrder方法重构为placeOrder
- 新增OrderPlacementCommand、OrderPlacementResult、OrderAmountBreakdown等DTO
- 实现订单下单策略模式，支持不同类型订单的差异化处理
- 优化金额计算逻辑，完善优惠券折扣计算
- 改进余额扣减逻辑，增强异常处理
- 更新相关控制器使用新的下单接口
- 完善单元测试覆盖，确保代码质量
 2025-10-30 21:12:37 -04:00
irving
67692ff79f clean up
Some checks failed
Build and Push Backend / docker (push) Failing after 5s
Details
2025-10-28 23:39:50 -04:00
irving
7db9318a7b feat: 完善订单生命周期幂等与日志追踪 2025-10-28 23:24:33 -04:00