Commit Graph

54 Commits

Author SHA1 Message Date
wuweihua 58d7ec90b0 提高订单源的查询速度 2026-10-19 17:44:19 +08:00
caojia 383ef55e00 ✨ 完善核销用户记录和毛利报表导出日志 2026-10-19 16:43:14 +08:00
wuweihua 5bb9000e8e 修改套餐报错 2026-10-19 15:34:04 +08:00
wuweihua df1a2fd731 修改订单搜索 2026-10-19 15:19:06 +08:00
wuweihua 374c8b8bbb 增加套餐绑定用户功能 2026-10-19 11:59:44 +08:00
wuweihua a19d97d111 修改优化 2026-10-18 15:32:48 +08:00
wuweihua 60d4614695 重构产品价和红线价功能 2026-10-18 14:16:27 +08:00
wuweihua db6f5e882a 优化计费逻辑 2026-10-17 01:37:33 +08:00
wuweihua 52f714c760 回滚代码 2026-10-16 20:28:49 +08:00
wuweihua 9ff89e36ee 增加收货时间 2026-10-16 18:01:46 +08:00
wuweihua 6a07786e75 增加字段 2026-10-16 17:46:50 +08:00
wuweihua db396458c5 增加订单主表 2026-10-16 17:27:11 +08:00
wuweihua b3f79ffc4c Merge branch 'master' of https://git.lionquexpress.com/wuweihua/BMS 2026-10-16 11:27:48 +08:00
wuweihua 2431a5caac 增加筛选 2026-10-16 11:27:44 +08:00
luojiaquan 132688b9cf 同步计费优化 2026-10-16 10:59:59 +08:00
luojiaquan 02481b102c 优化订单列表,多单号查询,支持几万单号查询 2026-10-16 09:22:13 +08:00
wuweihua 7db0796c2f 套餐详情增加查看附件功能 2026-10-15 16:37:57 +08:00
caojia c704021f2f ✨ 完善毛利分析筛选与导出日志 2026-10-15 14:37:18 +08:00
caojia e4438d6f01 ✨ 应收账单保存计费失败状态并导出说明及黄色标注 2026-10-14 17:50:03 +08:00
caojia 0087aa3712 ✨ 新增毛利分析报表及提成设置 2026-10-14 16:57:44 +08:00
wuweihua c0c9c798b3 增加订单失败状态 2026-10-14 16:50:11 +08:00
luojiaquan 2d7bd678f3 订单列表优化 2026-10-14 14:20:13 +08:00
wuweihua 825663be01 增加收货重 2026-10-13 17:47:22 +08:00
wuweihua d6a6ec4d53 修改计费重 2026-10-13 17:12:32 +08:00
wuweihua 5c48717da2 增加查看哪些产品没有 2026-10-13 15:48:02 +08:00
wuweihua 52816ad618 增加代码检测,和映射 2026-10-13 13:39:15 +08:00
wuweihua 26bdd3ba87 增加查询上游的菜单 2026-10-13 09:29:26 +08:00
wuweihua 3456a0bf7f 增加计费时间的搜索 2026-10-12 16:41:39 +08:00
caojia 3ef6ea78a9 🐛 修正应收账单收货时间来源为订单扩展表 2026-10-12 11:19:42 +08:00
wuweihua d08485d738 增加软删除 2026-10-12 09:52:24 +08:00
caojia adc2160c91 ✨ 应收账单快照保存产品价和红线价 2026-10-10 16:44:56 +08:00
wuweihua eeaea52c17 增加删除功能 2026-10-10 13:52:28 +08:00
wuweihua f1f6ddd368 Enhance surcharge management by adding support for price type filtering in SurchargeController and related services. Introduce new methods for handling redline product codes in mappers and services. Update front-end API to accommodate price type parameters in surcharge queries. Modify database schema to include redline product and country tables for improved surcharge calculations. 2026-10-09 17:30:29 +08:00
wuweihua 380577f691 Refactor surcharge management by replacing PrcPriceSetVersionSurcharge with PrcSurchargeRel, introducing price type handling (PRODUCT, SALES, REDLINE) and updating related services, mappers, and front-end components. Enhance validation and error messaging for price type and detail ID requirements. Update database schema to support new relationships and constraints. 2026-10-09 17:20:10 +08:00
wuweihua 533d360cdc Implement product Excel file import functionality, including new service methods for handling Excel attachments. Update the ProductController to list imported Excel files by product code. Enhance BmsProduct and related entities to store references to the imported Excel files. Update front-end components to support displaying and managing Excel file attachments for products. 2026-10-09 16:46:52 +08:00
wuweihua 853187ad58 Enhance product import validation by adding checks for duplicate country and weight band entries. Update related error messages in properties file. Introduce new method to delete auto fees while retaining manual entries during rebill operations. Update front-end components to manage build mode changes and ensure proper handling of product lists during price set creation. 2026-10-09 15:51:21 +08:00
wuweihua 5b4cbaffd6 Implement batch fee management features in BillingController, including preview, submission, and task retrieval. Update related services and mappers to support batch processing. Add necessary error messages in properties file and enhance front-end API for batch operations. 2026-10-09 10:28:29 +08:00
wuweihua c95a9861cc Refactor billing options retrieval to include data permissions and add effective date handling for product imports 2026-10-09 09:27:28 +08:00
wuweihua 6e301ecee7 Enhance price set import functionality with preview options and update handling. Added new endpoints for previewing product library pulls and Excel imports, along with support for update-only imports. Updated internationalization messages for import success and error scenarios. 2026-09-30 16:15:44 +08:00
luojiaquan ea23fb0e55 Reapply "更新价格计算逻辑,添加套餐价格匹配和计费相关的国际化消息,优化数据库查询和删除操作"
This reverts commit ca37337386.
2026-09-30 10:40:24 +08:00
luojiaquan ca37337386 Revert "更新价格计算逻辑,添加套餐价格匹配和计费相关的国际化消息,优化数据库查询和删除操作"
This reverts commit 4f5959a2f9.
2026-09-30 10:17:56 +08:00
wuweihua 4f5959a2f9 更新价格计算逻辑,添加套餐价格匹配和计费相关的国际化消息,优化数据库查询和删除操作 2026-09-29 23:52:37 +08:00
wuweihua 52d0a13d83 修改产品套餐 2026-09-29 23:07:38 +08:00
wuweihua 38f371742a 修改产品导入 2026-09-29 20:50:01 +08:00
wuweihua 2d002e7291 增加修改客户重新同步功能 2026-09-29 11:58:01 +08:00
wuweihua ff57be1116 优化导入逻辑 2026-09-29 10:32:59 +08:00
wuweihua d08758aa35 修改计费文档,加上客户代码 2026-09-29 09:20:59 +08:00
wuweihua b8e1f8cd40 统一将 bms_region 替换为 region,更新相关注释和文档以反映这一变化。 2026-09-29 08:57:41 +08:00
wuweihua 0ad90f6183 修改产品功能 2026-09-28 21:43:39 +08:00
wuweihua b247bc2fd2 导入批量修改价格明细 2026-09-28 18:01:26 +08:00