irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity
285 Commits 1 Branch 0 Tags
15e15bc01a03109bcf6d3977661ea095366f9d99
Commit Graph

285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
irving
15e15bc01a add logging for duplicated notifcation 2025-10-27 21:51:28 -04:00
huchuansai
80de65731f fix: 店员筛选for移动端 2025-10-27 18:12:54 +08:00
irving
6b2a1c2ba7 fix: correct order lifecycle refunds and add coverage
Some checks failed
Build and Push Backend / docker (push) Failing after 5s
Details
2025-10-27 00:12:07 -04:00
irving
f7461abc83 add notification
Some checks failed
Build and Push Backend / docker (push) Failing after 6s
Details
2025-10-26 15:08:37 -04:00
irving
38bc83d0f7 fix: 调整充值限额并规范日志目录 2025-10-26 14:55:13 -04:00
irving
5a116eedf6 fix: allow clerk apply without sms verification
Some checks failed
Build and Push Backend / docker (push) Failing after 5s
Details
2025-10-26 12:21:25 -04:00
irving
0356834b88 feat(gift): 修复赠礼事务并补充租户隔离
Some checks failed
Build and Push Backend / docker (push) Failing after 6s
Details
2025-10-26 01:30:02 -04:00
irving
15aea7d779 feat: 审核通过时支持指定店员分组
Some checks failed
Build and Push Backend / docker (push) Failing after 5s
Details
2025-10-25 22:45:31 -04:00
irving
03e9ceee5b 重构：订单接单逻辑使用常量枚举替代魔法字符串，微信通知改为异步发送
Some checks failed
Build and Push Backend / docker (push) Failing after 8s
Details 
- 新增 OrderConstant.OperatorType 枚举（顾客/店员/管理员）
- 新增 EXCLUDE_HISTORY 常量（排除历史订单标识）
- updateStateTo1 方法使用枚举常量替代硬编码字符串
- 微信通知改为异步发送，防止 API 失败阻塞订单处理
- 新增 sendOrderMessageAsync/sendOrderFinishMessageAsync/sendOrderCancelMessageAsync 方法
- 订单接单、完成、取消通知均使用异步方式，提高系统稳定性
 2025-10-25 15:33:35 -04:00
irving
8ece45da28 新增订单强制取消功能 
- 新增管理后台强制取消进行中订单接口
- 实现已接单/服务中订单强制取消业务逻辑
- 支持自定义退款金额，默认退回全额支付金额
- 新增订单强制取消请求VO类及参数校验
- 新增单元测试验证强制取消功能的正确性
- 更新服务接口定义及文档注释
 2025-10-25 12:15:26 -04:00
huchuansai
5b18f72ae8 fix: 随机单通知只发送给实åå在线用户 2025-10-22 17:32:26 +08:00
irving
7771b30366 修复：微信端评价列表自动过滤隐藏评价
Some checks failed
Build and Push Backend / docker (push) Failing after 8s
Details 
- 在微信店员评价查询接口中强制设置hidden=0
- 确保顾客端只能看到管理员未隐藏的评价
- 优化日志配置，减少SQL日志输出
 2025-10-21 22:41:32 -04:00
irving
ef88ec7134 feat: 店员昵称及性别修改纳入资料审核 2025-10-20 23:10:44 -04:00
irving
75913e007b small fix
Some checks failed
Build and Push Backend / docker (push) Failing after 6s
Details
2025-10-19 17:46:14 -04:00
irving
82b86ae86e feat: 引入店员资料审核状态枚举
Some checks failed
Build and Push Backend / docker (push) Failing after 8s
Details
2025-10-19 17:37:51 -04:00
irving
3e079850e6 fix: 店员申请查询支持精准筛选 2025-10-19 16:25:17 -04:00
irving
62001fbd5f clean and fmt 2025-10-18 21:36:09 -04:00
irving
6153e6e4f1 fix: 创建提现时不再校验收款码确认时效
Some checks failed
Build and Push Backend / docker (push) Failing after 4s
Details
2025-10-18 21:05:22 -04:00
irving
d681635394 adjust logic, avoide race condition 2025-10-18 21:05:22 -04:00
irving
b9779e7436 feat: 店员收益明细支持条件筛选并返回订单信息 2025-10-18 21:05:22 -04:00
huchuansai
07a86fbe66 fix: 用æ店员头像bug 2025-10-16 16:56:44 +08:00
irving
0725c94bbe 修复：防止提现创建中的竞态条件和重复收益
Some checks failed
Build and Push Backend / docker (push) Failing after 6s
Details 
- 在 earnings_line 表添加唯一约束 (tenant_id, order_id, clerk_id, earning_type, deleted)
- 重排提现创建流程：先预留收益行，成功后才创建提现请求
- 在收益行预留时添加状态验证，检测并发修改
- 使用临时提现ID进行预留，创建请求后替换为真实ID
- 添加唯一约束前先清理重复的收益记录（V10 迁移）

此修复解决了关键的竞态条件问题：并发提现可能创建没有资金支持的孤儿请求记录。
修复后确保快速失败行为 - 如果收益行已被占用，提现请求永远不会被创建。
 2025-10-13 22:45:53 -04:00
irving
5438a8e1f0 功能：新增收款码档案和收益补算功能 
- 新增店员收款码档案管理（上传二维码和确认收款码）
- 提现请求新增收款码快照用于审计追踪
- 新增收益补算服务用于历史订单数据补录
- 新增收益补算日志表用于审计追踪
- 优化收益创建逻辑，根据解冻时间设置正确的初始状态
- 更新提现流程，要求店员确认收款码后才能提现
- 新增数据库迁移脚本 V7-V9
 2025-10-13 22:13:51 -04:00
irving
8faa23e9c3 refactor(salary): completely refactor the salary logi
Some checks failed
Build and Push Backend / docker (push) Failing after 6s
Details 
fix: ignore empty clerk performance filters

fix: generate earnings for completed orders

fix: ensure reward orders create earnings

fix: add reward earnings to new order flow
 2025-10-11 13:28:30 -04:00
huchuansai
4dbb637fdc 合并代码 2025-10-09 09:39:56 +08:00
huchuansai
51a1ac8070 fix 2025-10-09 09:39:40 +08:00
irving
08c0e2f7b1 test: format CouponWhitelistTest imports to satisfy Spotless
Some checks failed
Build and Push Backend / docker (push) Failing after 5s
Details
2025-10-07 00:04:47 -04:00
irving
4591538303 Revert "chore: apply Spotless formatting" 
This reverts commit 6e829070e7.
 2025-10-07 00:04:27 -04:00
irving
044280bc89 feat(coupon): hide whitelist-only coupons from non-whitelisted users in wx queryAll 2025-10-07 00:00:11 -04:00
irving
6e829070e7 chore: apply Spotless formatting 2025-10-06 23:55:08 -04:00
irving
e6106ecb88 feat(coupon): add enum ClaimConditionType and whitelist support\n\n- Add CouponClaimConditionType enum (ALL/FILTER/WHITELIST)\n- Schema: add custom_whitelist JSON column (Flyway V2)\n- Entity/VO: add customWhitelist; claimConditionType now 0/1/2\n- Service: enforce whitelist when claimConditionType=2\n- Controller: validate whitelist when creating coupon\n- Fix imports per formatting 2025-10-06 23:52:20 -04:00
huchuansai
f64964a39a fix
Some checks failed
Build and Push Backend / docker (push) Failing after 8s
Details
2025-10-05 22:03:32 +08:00
huchuansai
4ee24aabea fix: 修复bug 2025-10-04 23:59:17 +08:00
irving
e9ab50ea0a keep fixing CI 5 2025-10-04 00:35:49 -04:00
irving
d64b27e42b keep fixing CI 4 2025-10-04 00:33:39 -04:00
irving
da8ebfca61 keep fixing CI 3 2025-10-04 00:32:40 -04:00
irving
7e07dfa816 keep fixing CI 2 2025-10-04 00:31:32 -04:00
irving
29aa005b87 keep fixing gitea 2025-10-04 00:28:32 -04:00
irving
a438d62fd9 CI 2025-10-04 00:04:39 -04:00
irving
c034651047 ci: run jon in container with Node + Docker cli 2025-10-04 00:03:01 -04:00
irving
6d19ffc9e8 retry workflow 2025-10-04 00:01:09 -04:00
irving
82ed75a95c workflow first try... 2025-10-03 23:55:14 -04:00
irving
043483a076 docker push不上去，尝试加入github action在服务器构建 2025-10-03 23:25:48 -04:00
huchuansai
29da6b906b fix 2025-09-29 17:58:07 +08:00
huchuansai
e6b71cd897 fix 2025-09-28 09:59:47 +08:00
huchuansai
190f77529a fix 2025-09-27 17:09:26 +08:00
huchuansai
b803e836eb fix: 去æå已经取消的订单隐藏微信号功能 2025-09-24 11:03:12 +08:00
huchuansai
e777adf6b0 feat: 订单催促 2025-09-24 10:49:50 +08:00
huchuansai
e391058b30 fix: code style 2025-09-18 10:06:21 +08:00
huchuansai
099546b0a7 fix: 解决订单状态问题 2025-09-18 10:05:24 +08:00