99651b6758
Merge branch 'master' of D:\wuweihua\BMS with conflicts.
2026-11-15 00:23:04 +08:00
2342d34194
Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2026-11-15 00:22:34 +08:00
4de755ca60
移除UUID阴影同步中的应付相关表与同步逻辑
...
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-11-15 00:15:58 +08:00
bcd9c789cb
Merge branch 'master' of D:\wuweihua\BMS with conflicts.
2026-11-14 19:57:30 +08:00
bf7b46a231
Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2026-11-14 19:55:06 +08:00
358e5a46b9
新增UUID到新同步服务的失败处理逻辑和批次结果返回
2026-11-14 19:52:38 +08:00
6f78b813f3
Merge branch 'master' of D:\wuweihua\BMS with conflicts.
2026-11-14 19:29:38 +08:00
a71f0a164f
Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2026-11-14 19:28:58 +08:00
ee36c8c902
新增UUID到新同步运行器的Redis配置持久化功能
2026-11-14 19:27:49 +08:00
f7c7d9fe8b
Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2026-11-14 19:03:19 +08:00
7e699fb80e
调整UUID到新配置的线程数范围和注释说明
2026-11-14 19:00:26 +08:00
80d639d887
更新支付账单服务逻辑，调整源ID赋值方式；修改SQL映射中的源ID字段为费用ID；新增UUID到BIGINT迁移配置
2026-11-14 18:53:03 +08:00
87ae3e6674
回退 UUID 转 bigint 相关改动（已迁至 feature/uuid-to-bigint）
...
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-11-14 08:08:49 +08:00
359c3c18e4
修改费用ID类型为Long，更新相关逻辑和SQL映射
2026-11-14 01:22:12 +08:00
4f2f2db20f
更新UUID到BIGINT的迁移脚本，优化备份和回滚说明
2026-11-14 00:40:16 +08:00
0094e4aaff
Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS into test
...
# Conflicts:
# bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPayBillFee.java
# bms-back/bms-system/src/main/resources/mapper/price/PrcPayBillFeeMapper.xml
2026-11-14 00:32:55 +08:00
8b7c346ec4
修改计费订单ID类型为Long，优化相关逻辑
2026-11-14 00:23:47 +08:00
bde1d7d86e
应付计费邮编改造
2026-11-13 18:26:21 +08:00
87eab12d51
优化附加费计算规则，调整相关逻辑和注释
2026-11-13 15:25:10 +08:00
880b4751c5
Merge remote-tracking branch 'origin/test' into test
2026-11-13 11:57:40 +08:00
3a104d2d8c
应付配置的附加费配置完善
2026-11-13 11:57:19 +08:00
a024b45940
重构打单套餐相关逻辑，更新服务接口，优化保存和查询功能
2026-11-13 11:27:58 +08:00
6675808dfc
应付配置增加附加费配置，应付账单新增核销、对账、凭证、审核功能
2026-11-12 18:20:32 +08:00
2d5ffc4e06
Merge branch 'test'
2026-11-12 18:10:16 +08:00
1ba431540d
✨ 支持应收账单异步作废
2026-11-12 17:33:21 +08:00
f03aa7be6c
Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2026-11-12 17:12:21 +08:00
0d0613e810
⚡ 移除应收账单确认时的明细校验
2026-11-12 17:08:56 +08:00
47b95b6bfd
💄 调整应收合计查询按钮显示
2026-11-12 17:08:56 +08:00
e7fd7f9059
优化计费规则注释，新增三边规则处理逻辑
2026-11-12 17:00:04 +08:00
1ffaf424b1
Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS into test
2026-11-12 16:53:45 +08:00
8ca5af1ff0
新增打单产品明细保存接口，优化附加费管理逻辑
2026-11-12 16:53:40 +08:00
621128530a
⚡ 优化应收合计查询并补充导出汇总
2026-11-12 15:58:25 +08:00
73ce7f4eae
Merge branch 'test'
2026-11-12 15:05:39 +08:00
fb9a4e1b29
⚡ 优化应收账单预览排序
2026-11-12 15:00:58 +08:00
89aadf97db
✨ 扩展应收账单销售经理部门数据范围
2026-11-12 15:00:58 +08:00
90147ed4e3
新增附加费计费标识，优化附加费管理逻辑
2026-11-12 14:43:42 +08:00
cf336f7a67
新增按国家去重区块标题接口，优化计费列表请求方式
2026-11-12 13:45:09 +08:00
d2c75e0c51
修改计费逻辑
2026-11-12 11:07:13 +08:00
17ee9731e8
更新应用配置，新增工具迁移链接排除项
2026-11-12 09:56:37 +08:00
146d3469b6
✨ 支持应收账单导出通过 OSS 签名链接下载
2026-11-12 09:27:10 +08:00
b49600ab9f
Merge branch 'test'
...
# Conflicts:
# bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java
2026-11-11 17:57:33 +08:00
27715b3e13
✨ 将应收账单预览导出改为异步处理
2026-11-11 17:56:14 +08:00
b5299e4490
移除价卡导入按钮和相关组件
2026-11-11 17:48:02 +08:00
82164cb00c
修改计费重按钮为注释，更新重新计费按钮样式
2026-11-11 17:12:20 +08:00
34fa8e23c1
🐛 毛利分析增加查询条件校验
2026-11-11 17:00:49 +08:00
efd92b5663
新增提单管理和提单计费页面
2026-11-11 16:36:40 +08:00
7869205afc
新增数据迁移任务到定时任务白名单；优化默认收货时间范围逻辑
2026-11-11 15:34:11 +08:00
f82d9c667f
Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS into test
2026-11-11 14:50:58 +08:00
7e1041391a
新增打单产品渠道查询与替换功能
2026-11-11 14:50:34 +08:00
99cdfd86d3
✨ 展示TMS同步新增用户明细
2026-11-11 14:44:41 +08:00
wuweihua