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
41a80f9794
✨ 设置应收账单默认日期范围
2026-11-11 14:31:08 +08:00
8cb2d03062
🐛 修复应收账单二维码位置
2026-11-11 14:23:25 +08:00
4ceb0bc830
Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS into test
2026-11-11 13:52:35 +08:00
f7384c88f6
优化代码注释为简体中文
2026-11-11 13:52:28 +08:00
beba9e9caa
🐛 校验账单价格后确认提成比例
2026-11-11 13:45:34 +08:00
b7d0674fda
优化代码注释为简体中文
2026-11-11 13:35:53 +08:00
0545de88b4
新增订单计费失败原因的价格周期字段，并优化前端展示，支持查看价格周期详情。
2026-11-11 13:12:32 +08:00
fb41b2a86c
Merge branch 'test'
2026-11-11 11:32:25 +08:00
2430e344a0
Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS into test
2026-11-11 11:30:22 +08:00
5db27e00ba
修改计费失败原因
2026-11-11 11:30:17 +08:00
a06962d1dd
⚡ 优化应收账单毛利查询
2026-11-11 11:27:54 +08:00
5f679b5a6e
修改订单列表重新计费
2026-11-11 10:49:45 +08:00
02763f092e
修改打单套餐功能
2026-11-11 10:12:11 +08:00
b6718f9361
调整命名2
2026-11-11 09:54:09 +08:00
a58de9bb7e
修改计费逻辑仅 billing_fail_status = 0 才写 prc_income_bill
2026-11-11 09:49:59 +08:00
a211f06663
修改定时任务时间
2026-11-11 09:29:47 +08:00
41cefd5fd5
调整命名
2026-11-11 00:18:12 +08:00
fe30b8576b
Merge branch 'master' of https://git.lionquexpress.com/wuweihua/BMS
2026-11-10 19:02:52 +08:00
65fcb6895a
修改计费bug
2026-11-10 19:02:47 +08:00
d4f5bb8a4c
Merge branch 'test'
2026-11-10 18:11:49 +08:00
fca999c384
修改比较逻辑
2026-11-10 18:10:10 +08:00
e71103af58
Merge branch 'test'
2026-11-10 18:04:49 +08:00
2e5ab2bfc1
✅ 跳过依赖本机价卡文件的测试
2026-11-10 18:04:19 +08:00
79cc524c03
Merge branch 'test'
...
# Conflicts:
# bms-back/bms-admin/src/main/java/com/bms/web/controller/price/SrvBillAirController.java
# bms-back/bms-system/src/main/java/com/bms/price/airbill/domain/SrvBillAirFee.java
# bms-back/bms-system/src/main/java/com/bms/price/airbill/domain/SrvBillAirFeeLog.java
# bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcOrderBillMapper.java
# bms-back/bms-system/src/main/java/com/bms/price/mapper/SrvBillAirFeeMapper.java
# bms-back/bms-system/src/main/java/com/bms/price/service/ISrvBillAirFeeService.java
# bms-back/bms-system/src/main/java/com/bms/price/service/impl/SrvBillAirFeeServiceImpl.java
# bms-back/bms-system/src/main/resources/mapper/price/SrvBillAirFeeMapper.xml
# bms-back/sql/price/air_bill_menu.sql
# bms-front/src/api/price/airBill.js
# bms-front/src/views/price/billing/airBill.vue
# bms-front/src/views/price/billing/components/AirBillFeeDialog.vue
# bms-front/src/views/price/billing/components/BillDetail.vue
2026-11-10 17:46:55 +08:00
3e5ef25153
✨ 完善应收账单毛利分析与提成展示
2026-11-10 17:37:17 +08:00
wuweihua