fix(backend): 修复orderService.ship参数不匹配+添加进价字段(purchase_price)到products/product_skus/inventory_inbound_items(迁移177)+同步schema.sql

cfc-backend/src/main/java/com/etotem/cfc/config/DatabaseInitializer.java

@@ -7838,5 +7838,10 @@ private void runMigration100() {
 
 		// 迁移176: product_orders 添加 shipping_cost 列（快递费）
 		ensureColumn("product_orders", "shipping_cost", "INT DEFAULT 0 COMMENT '快递费(分)'");
+
+		// 迁移177: 添加进价字段（products/product_skus/inventory_inbound_items）
+		ensureColumn("products", "purchase_price", "DECIMAL(10,2) DEFAULT 0.00 COMMENT '进价(分)'");
+		ensureColumn("product_skus", "purchase_price", "DECIMAL(10,2) DEFAULT 0.00 COMMENT '进价(分)'");
+		ensureColumn("inventory_inbound_items", "purchase_price", "DECIMAL(10,2) DEFAULT 0.00 COMMENT '入库单价(分)'");
 	}
 }

cfc-backend/src/main/java/com/etotem/cfc/entity/InventoryInboundItem.java

@@ -17,5 +17,6 @@ public class InventoryInboundItem implements Serializable {
     private Long productId;
     private Long skuId;
     private Integer quantity;
+    private java.math.BigDecimal purchasePrice; // 入库单价(分)
     private Date createdAt;
 }

cfc-backend/src/main/java/com/etotem/cfc/entity/Product.java

@@ -27,6 +27,7 @@ public class Product implements Serializable {
     private String coverImage;
     private String images;
     private Integer price;       // 价格(分)
+    private java.math.BigDecimal purchasePrice; // 进价(分)
     private Integer stock;
     private Integer minStockAlert;
     private Integer salesCount;

cfc-backend/src/main/java/com/etotem/cfc/entity/ProductSku.java

@@ -19,6 +19,7 @@ public class ProductSku implements Serializable {
     private String skuCode;
     private String specs;
     private BigDecimal price;
+    private BigDecimal purchasePrice; // 进价(分)
     private Integer stock;
     private Integer minStockAlert;
     private Integer minQuantity; // 最小购买数量限制

cfc-backend/src/main/resources/schema.sql

@@ -1077,6 +1077,7 @@ CREATE TABLE IF NOT EXISTS products (
     cover_image VARCHAR(500) COMMENT '封面图片',
     images TEXT COMMENT '多张图片JSON',
     price INT NOT NULL DEFAULT 0 COMMENT '价格(分)',
+    purchase_price DECIMAL(10,2) DEFAULT 0.00 COMMENT '进价(分)',
     stock INT NOT NULL DEFAULT 0 COMMENT '库存',
     min_stock_alert INT DEFAULT 0 COMMENT '库存预警阈值(低于此值预警)',
     sales_count INT NOT NULL DEFAULT 0 COMMENT '销量',
@@ -1156,6 +1157,7 @@ CREATE TABLE IF NOT EXISTS inventory_inbound_items (
     product_id BIGINT NOT NULL COMMENT '商品ID',
     sku_id BIGINT COMMENT 'SKU ID',
     quantity INT NOT NULL COMMENT '入库数量',
+    purchase_price DECIMAL(10,2) DEFAULT 0.00 COMMENT '入库单价(分)',
     created_at DATETIME DEFAULT CURRENT_TIMESTAMP
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='库存入库明细表';
 
@@ -1166,6 +1168,7 @@ CREATE TABLE IF NOT EXISTS product_skus (
     sku_code VARCHAR(64) COMMENT 'SKU编码',
     specs JSON COMMENT '规格选项JSON: [{"name":"颜色","value":"红色"},{"name":"尺码","value":"M"}]',
     price INT DEFAULT 0 COMMENT 'SKU价格(分)',
+    purchase_price DECIMAL(10,2) DEFAULT 0.00 COMMENT '进价(分)',
     stock INT DEFAULT 0 COMMENT '库存数量',
     min_stock_alert INT DEFAULT 0 COMMENT '库存预警阈值(低于此值预警)',
     min_quantity INT DEFAULT 1 COMMENT '最小购买数量限制',

cfc-web/.last_build_commit

@@ -1 +1,5 @@
-a2c606c244983ccc34b5fd318cf28bc3b4c05ca2
+<<<<<<< Updated upstream
+a2c606c244983ccc34b5fd318cf28bc3b4c05ca2
+=======
+125fe40b3d948cec0d46678002409c5c8ef34d69
+>>>>>>> Stashed changes

cfc-web/public/CHANGELOG-v1.0.md

@@ -4,6 +4,12 @@
 
 ---
 
+## v1.0.819 (2026-08-05)
+
+### Bug 修复
+- 迁移173 创建库存管理4张表（inventory_transactions/counting_records/inbound_orders/inbound_items）+ 同步schema.sql
+
+
 ## v1.0.818 (2026-08-05)
 
 ### Bug 修复

cfc-web/public/CHANGELOG.md

@@ -1,6 +1,6 @@
 # 更新日志
 
-> 当前版本: v1.0.818
+> 当前版本: v1.0.819
 
 ## 历史版本
 
@@ -8,6 +8,12 @@
 
 ---
 
+## v1.0.819 (2026-08-05)
+
+### Bug 修复
+- 迁移173 创建库存管理4张表（inventory_transactions/counting_records/inbound_orders/inbound_items）+ 同步schema.sql
+
+
 ## v1.0.818 (2026-08-05)
 
 ### Bug 修复