Commit Graph

64 Commits

Author SHA1 Message Date
wuweihua 2d5a2c4bab 修改计费重去掉客户 2026-10-20 18:48:46 +08:00
wuweihua 66d95a0da9 更改产品获取数据 2026-10-20 18:43:33 +08:00
wuweihua 45969a4d29 订单数据源增加订单对比功能 2026-10-20 13:55:55 +08:00
caojia 383ef55e00 ✨ 完善核销用户记录和毛利报表导出日志 2026-10-19 16:43:14 +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 db396458c5 增加订单主表 2026-10-16 17:27:11 +08:00
wuweihua 9824e05919 增加规则判断 2026-10-16 14:05:50 +08:00
wuweihua b54cb1b018 增加规则配置 2026-10-16 13:40:03 +08:00
luojiaquan 132688b9cf 同步计费优化 2026-10-16 10:59:59 +08:00
wuweihua 2689138b6a 修改套餐价格 2026-10-16 10:43:45 +08:00
wuweihua 7db0796c2f 套餐详情增加查看附件功能 2026-10-15 16:37:57 +08:00
wuweihua 071e7f0c55 增加产品价和红线价重计费功能 2026-10-15 16:09:05 +08:00
caojia c704021f2f ✨ 完善毛利分析筛选与导出日志 2026-10-15 14:37:18 +08:00
wuweihua 996d854492 修改错误日志 2026-10-14 17:02:01 +08:00
caojia 0087aa3712 ✨ 新增毛利分析报表及提成设置 2026-10-14 16:57:44 +08:00
wuweihua c0c9c798b3 增加订单失败状态 2026-10-14 16:50:11 +08:00
wuweihua c1c5c6579c 提速修改计费重 2026-10-14 15:32:34 +08:00
wuweihua 6a50b0f122 增加可修改计费重功能 2026-10-14 15:25:26 +08:00
wuweihua 825663be01 增加收货重 2026-10-13 17:47:22 +08:00
wuweihua d6a6ec4d53 修改计费重 2026-10-13 17:12:32 +08:00
wuweihua 52816ad618 增加代码检测,和映射 2026-10-13 13:39:15 +08:00
wuweihua 4d27887d4a 修改同步计费 2026-10-13 10:21:28 +08:00
wuweihua 3456a0bf7f 增加计费时间的搜索 2026-10-12 16:41:39 +08:00
wuweihua a115926e9f 修改计费逻辑 2026-10-12 14:44:20 +08:00
wuweihua b68cefd8d0 修改计费时间类型 2026-10-12 11:05:24 +08:00
wuweihua d08485d738 增加软删除 2026-10-12 09:52:24 +08:00
wuweihua 5aba8af49d 修改待生效也可以删除 2026-10-12 09:27:48 +08:00
wuweihua 830f219e52 修改应付总额显示 2026-10-10 15:51:15 +08:00
wuweihua eeaea52c17 增加删除功能 2026-10-10 13:52:28 +08:00
wuweihua fab2ec7d9c 修改套餐导入功能 2026-10-10 11:16:03 +08:00
wuweihua e73b85ed78 增加红线价计费 2026-10-09 17:45:49 +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
wuweihua 90cde8da4a 修改导入功能 2026-09-30 11:51:07 +08:00
wuweihua 998aac74c8 修改导入套餐 2026-09-30 11:30:34 +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