优化计费逻辑

bms-back/sql/price/order_bill_query_menu.sql

@@ -0,0 +1,87 @@
+-- Move order source back under system monitor, add read-only order bill query under billing center
+SET NAMES utf8mb4;
+
+SET @monitorParent := (
+  SELECT menu_id FROM sys_menu
+   WHERE menu_type = 'M' AND (path = 'monitor' OR menu_name = '系统监控')
+   ORDER BY menu_id
+   LIMIT 1
+);
+
+UPDATE sys_menu
+   SET parent_id = @monitorParent,
+       menu_name = '订单数据源',
+       order_num = 9,
+       path = 'orderSource',
+       component = 'monitor/orderSource/index',
+       route_name = 'OrderSource',
+       visible = '0',
+       status = '0',
+       update_by = 'admin',
+       update_time = sysdate()
+ WHERE @monitorParent IS NOT NULL
+   AND menu_type = 'C'
+   AND (menu_id = 2325 OR perms = 'monitor:orderSource:list');
+
+SET @billParent := (
+  SELECT parent_id FROM sys_menu
+   WHERE menu_type = 'C' AND component = 'price/billing/bill'
+   ORDER BY menu_id
+   LIMIT 1
+);
+
+SET @orderBillMenuExists := (
+  SELECT COUNT(*) FROM sys_menu WHERE menu_id = 2340 OR perms = 'price:orderBill:list'
+);
+
+UPDATE sys_menu
+   SET order_num = order_num + 1
+ WHERE @billParent IS NOT NULL
+   AND @orderBillMenuExists = 0
+   AND parent_id = @billParent
+   AND menu_type = 'C';
+
+INSERT INTO sys_menu (
+  menu_id, menu_name, parent_id, order_num, path, component, query, route_name,
+  is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark
+)
+SELECT 2340, '订单列表查询', @billParent, 1,
+       'orderBill', 'price/orderBill/index', '', 'OrderBillQuery',
+       1, 0, 'C', '0', '0', 'price:orderBill:list', 'list', 'admin', sysdate(),
+       '查询 prc_order_bill 全部订单，只读'
+  FROM DUAL
+ WHERE @billParent IS NOT NULL
+   AND NOT EXISTS (SELECT 1 FROM sys_menu WHERE menu_id = 2340 OR perms = 'price:orderBill:list');
+
+INSERT INTO sys_menu (
+  menu_id, menu_name, parent_id, order_num, path, component,
+  is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time
+)
+SELECT 2341, '查询', 2340, 1, '', NULL,
+       1, 0, 'F', '0', '0', 'price:orderBill:list', '#', 'admin', sysdate()
+  FROM DUAL
+ WHERE NOT EXISTS (SELECT 1 FROM sys_menu WHERE menu_id = 2341);
+
+INSERT INTO sys_role_menu (role_id, menu_id)
+SELECT 1, m.menu_id
+  FROM (SELECT 2340 AS menu_id UNION SELECT 2341) m
+ WHERE NOT EXISTS (
+   SELECT 1 FROM sys_role_menu rm WHERE rm.role_id = 1 AND rm.menu_id = m.menu_id
+ );
+
+INSERT INTO sys_role_menu (role_id, menu_id)
+SELECT DISTINCT rm.role_id, 2340
+  FROM sys_role_menu rm
+  JOIN sys_menu src ON src.menu_id = rm.menu_id
+ WHERE src.menu_type = 'C' AND src.component = 'price/billing/bill'
+   AND NOT EXISTS (
+     SELECT 1 FROM sys_role_menu x WHERE x.role_id = rm.role_id AND x.menu_id = 2340
+   );
+
+INSERT INTO sys_role_menu (role_id, menu_id)
+SELECT DISTINCT rm.role_id, 2341
+  FROM sys_role_menu rm
+ WHERE rm.menu_id = 2340
+   AND NOT EXISTS (
+     SELECT 1 FROM sys_role_menu x WHERE x.role_id = rm.role_id AND x.menu_id = 2341
+   );

bms-back/sql/price/order_bill_rebill_menu.sql

@@ -0,0 +1,25 @@
+-- Order list query: rebill button, same upstream sync as order data source
+SET NAMES utf8mb4;
+
+INSERT INTO sys_menu (
+  menu_id, menu_name, parent_id, order_num, path, component,
+  is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark
+)
+SELECT 2342, '重新计费', 2340, 2, '', NULL,
+       1, 0, 'F', '0', '0', 'price:orderBill:rebill', '#', 'admin', sysdate(),
+       '订单列表按单号或选中行重走上游计费'
+  FROM DUAL
+ WHERE NOT EXISTS (SELECT 1 FROM sys_menu WHERE menu_id = 2342 OR perms = 'price:orderBill:rebill');
+
+INSERT INTO sys_role_menu (role_id, menu_id)
+SELECT 1, 2342
+  FROM DUAL
+ WHERE NOT EXISTS (SELECT 1 FROM sys_role_menu WHERE role_id = 1 AND menu_id = 2342);
+
+INSERT INTO sys_role_menu (role_id, menu_id)
+SELECT DISTINCT rm.role_id, 2342
+  FROM sys_role_menu rm
+ WHERE rm.menu_id = 2340
+   AND NOT EXISTS (
+     SELECT 1 FROM sys_role_menu x WHERE x.role_id = rm.role_id AND x.menu_id = 2342
+   );

bms-back/sql/price/prc_order_bill_fail_snapshot_alter.sql

@@ -0,0 +1,52 @@
+-- idempotent: order bill fail snapshot + income refund_status
+SET @db = DATABASE();
+
+SET @sql = (
+  SELECT IF(COUNT(*) = 0,
+    'ALTER TABLE prc_order_bill ADD COLUMN error_message varchar(1000) NULL COMMENT \'失败原因\' AFTER billing_fail_status',
+    'SELECT 1')
+  FROM information_schema.COLUMNS
+  WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'prc_order_bill' AND COLUMN_NAME = 'error_message'
+);
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @sql = (
+  SELECT IF(COUNT(*) = 0,
+    'ALTER TABLE prc_order_bill ADD COLUMN order_status int NULL COMMENT \'上游订单状态\' AFTER order_time',
+    'SELECT 1')
+  FROM information_schema.COLUMNS
+  WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'prc_order_bill' AND COLUMN_NAME = 'order_status'
+);
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @sql = (
+  SELECT IF(COUNT(*) = 0,
+    'ALTER TABLE prc_order_bill ADD COLUMN bl_pickup tinyint NULL COMMENT \'是否收货：0否/1是\' AFTER order_status',
+    'SELECT 1')
+  FROM information_schema.COLUMNS
+  WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'prc_order_bill' AND COLUMN_NAME = 'bl_pickup'
+);
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @sql = (
+  SELECT IF(COUNT(*) = 0,
+    'ALTER TABLE prc_order_bill ADD COLUMN pickup_date datetime NULL COMMENT \'收货时间\' AFTER bl_pickup',
+    'SELECT 1')
+  FROM information_schema.COLUMNS
+  WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'prc_order_bill' AND COLUMN_NAME = 'pickup_date'
+);
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @sql = (
+  SELECT IF(COUNT(*) = 0,
+    'ALTER TABLE prc_income_bill ADD COLUMN refund_status varchar(20) NOT NULL DEFAULT \'NONE\' COMMENT \'是否退货：NONE未退货/REFUNDED已退货\' AFTER income_total',
+    'SELECT 1')
+  FROM information_schema.COLUMNS
+  WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'prc_income_bill' AND COLUMN_NAME = 'refund_status'
+);
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+ALTER TABLE prc_order_bill
+  MODIFY COLUMN product_code varchar(20) NULL COMMENT '产品代码',
+  MODIFY COLUMN weight decimal(10,3) NULL COMMENT '计费重量KG',
+  MODIFY COLUMN billing_fail_status tinyint NOT NULL DEFAULT 0 COMMENT '计费失败状态：0成功/1未匹配产品/2未匹配国家/3未匹配重量段/4未绑定套餐/5无生效套餐版本/6已生成应收账单/7产品档案缺失/8未命中价格/9分区无价格/10邮编必填/11邮编未匹配分区/12上游订单不存在/13上游订单号为空/14上游客户为空/15上游产品为空/16上游重量无效/17计费时间为空/18退费订单无法解析/19客户代码为空/20客户已停用/21运费为空/22未知失败。仅0/1/2/3写入应收主表，仅0写入应收费用';