fix(test): shops 测试表补加 logo_url 列

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
feat(shop): 门店 logo 上传 + 侧边栏品牌替换
2026-05-24 20:15:39 +08:00 · 2026-05-24 20:03:43 +08:00 · 2026-05-24 15:45:39 +08:00 · 2026-05-24 15:12:59 +08:00 · 2026-05-24 15:03:21 +08:00 · 2026-05-24 14:50:34 +08:00
26 changed files with 1084 additions and 471 deletions
@@ -0,0 +1,47 @@
+name: Debug DB
+
+on:
+  workflow_dispatch:
+
+jobs:
+  debug:
+    runs-on: mac
+    steps:
+      - name: Setup SSH
+        run: |
+          mkdir -p ~/.ssh
+          printf '%s' "${{ secrets.EC2_SSH_KEY }}" > ~/.ssh/ec2_deploy.pem
+          chmod 600 ~/.ssh/ec2_deploy.pem
+          ssh-keyscan -H ${{ secrets.EC2_HOST }} >> ~/.ssh/known_hosts
+
+      - name: Query DB
+        env:
+          EC2_HOST: ${{ secrets.EC2_HOST }}
+          EC2_USER: ${{ secrets.EC2_USER }}
+          DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
+        run: |
+          ssh -i ~/.ssh/ec2_deploy.pem ${EC2_USER}@${EC2_HOST} bash << EOF
+            echo "=== Docker containers ==="
+            docker ps --format "{{.Names}}\t{{.Status}}"
+
+            echo ""
+            echo "=== Databases ==="
+            docker exec jiu_mysql mysql -uroot -p${DB_PASSWORD} -e "SHOW DATABASES;" 2>/dev/null \
+              || echo "jiu_mysql container not found or DB_PASSWORD wrong"
+
+            echo ""
+            echo "=== Tables in jiu_db ==="
+            docker exec jiu_mysql mysql -uroot -p${DB_PASSWORD} jiu_db -e "SHOW TABLES;" 2>/dev/null
+
+            echo ""
+            echo "=== shops ==="
+            docker exec jiu_mysql mysql -uroot -p${DB_PASSWORD} jiu_db -e "SELECT id, name, code FROM shops;" 2>/dev/null
+
+            echo ""
+            echo "=== users ==="
+            docker exec jiu_mysql mysql -uroot -p${DB_PASSWORD} jiu_db -e "SELECT id, shop_id, username, role, is_active FROM users;" 2>/dev/null
+          EOF
+
+      - name: Cleanup SSH key
+        if: always()
+        run: rm -f ~/.ssh/ec2_deploy.pem
@@ -36,6 +36,13 @@ jobs:
          FORGEJO_URL: ${{ secrets.FORGEJO_URL }}
        run: |
          tar -czf web.tar.gz -C client/build web
+          tar -czf configs.tar.gz \
+            deploy/nginx-jiu.conf \
+            deploy/jiu.service \
+            deploy/production.env.template \
+            deploy/setup-ec2.sh \
+            deploy/docker-compose.yml \
+            deploy/docker-compose.jiu.yml
          VERSION="v$(date +%Y%m%d.%H%M)"
          COMMIT="${{ gitea.sha }}"
          COMMIT_MSG=$(git log -1 --pretty="%s" HEAD)
@@ -53,6 +60,8 @@ jobs:
            -H "Authorization: token ${FORGEJO_TOKEN}" -F "attachment=@backend/jiu-server"
          curl -sf -X POST "${FORGEJO_URL}/api/v1/repos/${{ gitea.repository }}/releases/${RELEASE_ID}/assets" \
            -H "Authorization: token ${FORGEJO_TOKEN}" -F "attachment=@web.tar.gz"
+          curl -sf -X POST "${FORGEJO_URL}/api/v1/repos/${{ gitea.repository }}/releases/${RELEASE_ID}/assets" \
+            -H "Authorization: token ${FORGEJO_TOKEN}" -F "attachment=@configs.tar.gz"
          echo "Release ${VERSION} created"

      - name: Setup SSH
@@ -72,6 +81,8 @@ jobs:
            client/build/web/ ${EC2_USER}@${EC2_HOST}:/tmp/jiu-web-new/
          rsync -avz --delete -e "ssh -i ~/.ssh/ec2_deploy.pem" \
            web/ ${EC2_USER}@${EC2_HOST}:/tmp/jiu-marketing-new/
+          scp -O -i ~/.ssh/ec2_deploy.pem deploy/nginx-jiu.conf \
+            ${EC2_USER}@${EC2_HOST}:/tmp/nginx-jiu.conf
          ssh -i ~/.ssh/ec2_deploy.pem ${EC2_USER}@${EC2_HOST} << 'ENDSSH'
            sudo systemctl stop jiu
            cp /tmp/jiu-server /opt/jiu/backend/jiu-server
@@ -87,7 +98,8 @@ jobs:
            mkdir -p /opt/jiu/marketing
            rsync -a --delete /tmp/jiu-marketing-new/ /opt/jiu/marketing/
            rm -rf /tmp/jiu-marketing-new
-            sudo nginx -s reload
+            sudo cp /tmp/nginx-jiu.conf /etc/nginx/conf.d/jiu.conf
+            sudo nginx -t && sudo nginx -s reload
          ENDSSH

      - name: Cleanup SSH key
@@ -0,0 +1,73 @@
+name: Reset DB
+
+on:
+  workflow_dispatch:
+    inputs:
+      shops:
+        description: '写入的门店（逗号分隔，如 S001,S002,S003）'
+        required: true
+        default: 'S001,S002,S003'
+
+jobs:
+  reset:
+    runs-on: mac
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup SSH
+        run: |
+          mkdir -p ~/.ssh
+          printf '%s' "${{ secrets.EC2_SSH_KEY }}" > ~/.ssh/ec2_deploy.pem
+          chmod 600 ~/.ssh/ec2_deploy.pem
+          ssh-keyscan -H ${{ secrets.EC2_HOST }} >> ~/.ssh/known_hosts
+
+      - name: Reset database & reseed
+        env:
+          EC2_HOST: ${{ secrets.EC2_HOST }}
+          EC2_USER: ${{ secrets.EC2_USER }}
+          DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
+          SHOPS: ${{ github.event.inputs.shops }}
+        run: |
+          # 1. 清库重建
+          ssh -i ~/.ssh/ec2_deploy.pem ${EC2_USER}@${EC2_HOST} \
+            "docker exec jiu_mysql mysql -uroot -p${DB_PASSWORD} -e 'DROP DATABASE IF EXISTS jiu_db; CREATE DATABASE jiu_db CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;'"
+          echo "✓ Database reset"
+
+          # 2. 重启 jiu-server，AutoMigrate 重建表结构
+          ssh -i ~/.ssh/ec2_deploy.pem ${EC2_USER}@${EC2_HOST} \
+            "sudo systemctl restart jiu"
+          echo "✓ jiu-server restarted, waiting for AutoMigrate..."
+
+          # 3. 等待健康检查通过
+          for i in $(seq 1 30); do
+            ssh -i ~/.ssh/ec2_deploy.pem ${EC2_USER}@${EC2_HOST} \
+              "curl -sf http://localhost:8080/health" && break
+            sleep 2
+          done
+          echo "✓ Health check passed"
+
+          # 4. 写入 seed 数据（第一个 shop 全量，后续跳过 TRUNCATE 行避免互相清空）
+          FIRST=true
+          for SHOP in $(echo "$SHOPS" | tr ',' ' '); do
+            FILE="backend/seeds/${SHOP}.sql"
+            if [ ! -f "$FILE" ]; then
+              echo "⚠️  $FILE not found, skipping"
+              continue
+            fi
+            echo "→ Seeding $SHOP ..."
+            if [ "$FIRST" = "true" ]; then
+              ssh -i ~/.ssh/ec2_deploy.pem ${EC2_USER}@${EC2_HOST} \
+                "docker exec -i jiu_mysql mysql -uroot -p${DB_PASSWORD} --default-character-set=utf8mb4 jiu_db" \
+                < "$FILE"
+              FIRST=false
+            else
+              grep -v "^TRUNCATE" "$FILE" | \
+                ssh -i ~/.ssh/ec2_deploy.pem ${EC2_USER}@${EC2_HOST} \
+                "docker exec -i jiu_mysql mysql -uroot -p${DB_PASSWORD} --default-character-set=utf8mb4 jiu_db"
+            fi
+            echo "✓ $SHOP done"
+          done
+
+      - name: Cleanup SSH key
+        if: always()
+        run: rm -f ~/.ssh/ec2_deploy.pem
@@ -0,0 +1,66 @@
+name: Seed DB
+
+on:
+  workflow_dispatch:
+    inputs:
+      shops:
+        description: '要写入的门店（逗号分隔，如 S001,S002,S003）'
+        required: true
+        default: 'S001,S002,S003'
+      clear:
+        description: '写入前先清空各门店数据（true/false）'
+        required: false
+        default: 'false'
+
+jobs:
+  seed:
+    runs-on: mac
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup SSH
+        run: |
+          mkdir -p ~/.ssh
+          printf '%s' "${{ secrets.EC2_SSH_KEY }}" > ~/.ssh/ec2_deploy.pem
+          chmod 600 ~/.ssh/ec2_deploy.pem
+          ssh-keyscan -H ${{ secrets.EC2_HOST }} >> ~/.ssh/known_hosts
+
+      - name: Seed databases
+        env:
+          EC2_HOST: ${{ secrets.EC2_HOST }}
+          EC2_USER: ${{ secrets.EC2_USER }}
+          DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
+          SHOPS: ${{ github.event.inputs.shops }}
+          CLEAR: ${{ github.event.inputs.clear }}
+        run: |
+          # 第一步：若需要清空，先把所有门店都清掉再写入
+          # 避免 S001(id=1 硬编码) 因 S002 占用 id=1 而被 INSERT IGNORE 跳过
+          if [ "$CLEAR" = "true" ]; then
+            echo "=== 清空阶段 ==="
+            for SHOP in $(echo "$SHOPS" | tr ',' ' '); do
+              echo "  清空 ${SHOP}..."
+              printf "SET @shop_code='%s';\n" "$SHOP" | cat - backend/seeds/clear_shop.sql | \
+                ssh -i ~/.ssh/ec2_deploy.pem ${EC2_USER}@${EC2_HOST} \
+                  "docker exec -i jiu_mysql mysql -uroot -p${DB_PASSWORD} --default-character-set=utf8mb4 jiu_db"
+            done
+            echo "✓ 清空完成"
+          fi
+
+          # 第二步：依次写入所有门店
+          echo "=== 写入阶段 ==="
+          for SHOP in $(echo "$SHOPS" | tr ',' ' '); do
+            FILE="backend/seeds/${SHOP}.sql"
+            if [ ! -f "$FILE" ]; then
+              echo "⚠️  $FILE not found, skipping"
+              continue
+            fi
+            echo "→ Seeding $SHOP ..."
+            ssh -i ~/.ssh/ec2_deploy.pem ${EC2_USER}@${EC2_HOST} \
+              "docker exec -i jiu_mysql mysql -uroot -p${DB_PASSWORD} --default-character-set=utf8mb4 jiu_db" \
+              < "$FILE"
+            echo "✓ $SHOP done"
+          done
+
+      - name: Cleanup SSH key
+        if: always()
+        run: rm -f ~/.ssh/ec2_deploy.pem
@@ -1,36 +0,0 @@
-name: DB Backup
-
-on:
-  schedule:
-    - cron: '0 18 * * *'  # UTC 18:00 = 北京时间 02:00
-  workflow_dispatch:
-
-jobs:
-  backup:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Setup SSH
-        run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.EC2_SSH_KEY }}" > ~/.ssh/ec2.pem
-          chmod 600 ~/.ssh/ec2.pem
-          ssh-keyscan -H ${{ secrets.EC2_HOST }} >> ~/.ssh/known_hosts
-
-      - name: Dump MySQL to NAS
-        env:
-          EC2_HOST: ${{ secrets.EC2_HOST }}
-          EC2_USER: ${{ secrets.EC2_USER }}
-          DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
-        run: |
-          BACKUP_DIR=/volume1/backups/jiu-db
-          mkdir -p $BACKUP_DIR
-          FILENAME="jiu_db_$(date +%Y%m%d_%H%M%S).sql.gz"
-          ssh -i ~/.ssh/ec2.pem ${EC2_USER}@${EC2_HOST} \
-            "docker exec jiu_mysql mysqldump -uroot -p${DB_PASSWORD} jiu_db" \
-            | gzip > ${BACKUP_DIR}/${FILENAME}
-          find $BACKUP_DIR -name "*.sql.gz" -mtime +30 -delete
-          echo "Saved: ${BACKUP_DIR}/${FILENAME}"
-
-      - name: Cleanup SSH key
-        if: always()
-        run: rm -f ~/.ssh/ec2.pem
@@ -1,29 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches-ignore: [main]
-  pull_request:
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-go@v5
-        with:
-          go-version-file: backend/go.mod
-          cache-dependency-path: backend/go.sum
-
-      - name: Go tests
-        working-directory: backend
-        run: go test ./...
-
-      - uses: subosito/flutter-action@v2
-        with:
-          cache: true
-
-      - name: Flutter tests
-        working-directory: client
-        run: flutter test
@@ -1,70 +0,0 @@
-name: Deploy
-
-on:
-  push:
-    branches: [main]
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-go@v5
-        with:
-          go-version-file: backend/go.mod
-          cache-dependency-path: backend/go.sum
-
-      - name: Go tests
-        working-directory: backend
-        run: go test ./...
-
-      - uses: subosito/flutter-action@v2
-        with:
-          cache: true
-
-      - name: Flutter tests
-        working-directory: client
-        run: flutter test
-
-      - name: Build backend (linux/amd64)
-        working-directory: backend
-        run: GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o jiu-server .
-
-      - name: Build Flutter Web
-        working-directory: client
-        run: flutter build web --release --dart-define=BASE_URL=https://jiu.51yanmei.com --dart-define=PUBLIC_URL=https://jiu.51yanmei.com
-
-      - name: Setup SSH
-        run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.EC2_SSH_KEY }}" > ~/.ssh/ec2.pem
-          chmod 600 ~/.ssh/ec2.pem
-          ssh-keyscan -H ${{ secrets.EC2_HOST }} >> ~/.ssh/known_hosts
-
-      - name: Deploy to EC2
-        env:
-          EC2_HOST: ${{ secrets.EC2_HOST }}
-          EC2_USER: ${{ secrets.EC2_USER }}
-        run: |
-          scp -i ~/.ssh/ec2.pem backend/jiu-server ${EC2_USER}@${EC2_HOST}:/tmp/jiu-server
-          rsync -avz --delete -e "ssh -i ~/.ssh/ec2.pem" \
-            client/build/web/ ${EC2_USER}@${EC2_HOST}:/tmp/jiu-web-new/
-          ssh -i ~/.ssh/ec2.pem ${EC2_USER}@${EC2_HOST} << 'ENDSSH'
-            sudo systemctl stop jiu
-            cp /tmp/jiu-server /opt/jiu/backend/jiu-server
-            chmod +x /opt/jiu/backend/jiu-server
-            sudo systemctl start jiu
-            for i in $(seq 1 30); do
-              curl -sf http://localhost:8080/health && break
-              sleep 2
-            done
-            rm -rf /opt/jiu/web-old
-            mv /opt/jiu/web /opt/jiu/web-old 2>/dev/null || true
-            mv /tmp/jiu-web-new /opt/jiu/web
-            sudo nginx -s reload
-          ENDSSH
-
-      - name: Cleanup SSH key
-        if: always()
-        run: rm -f ~/.ssh/ec2.pem
@@ -132,21 +132,21 @@ func main() {
 	hash := mustHash("password123")
 	admin := upsert(db, &model.User{}, "shop_id = ? AND username = ?", shop.ID, "admin", func() any {
 		return &model.User{
-			TenantBase: model.TenantBase{ShopID: shop.ID},
+			ShopID: shop.ID,
 			Username: "admin", PasswordHash: hash, RealName: "张三（管理员）",
 			Phone: "13800000001", Role: "admin", IsActive: true,
 		}
 	}).(model.User)
 	operator := upsert(db, &model.User{}, "shop_id = ? AND username = ?", shop.ID, "operator", func() any {
 		return &model.User{
-			TenantBase: model.TenantBase{ShopID: shop.ID},
+			ShopID: shop.ID,
 			Username: "operator", PasswordHash: hash, RealName: "李四（操作员）",
 			Phone: "13800000002", Role: "operator", IsActive: true,
 		}
 	}).(model.User)
 	upsert(db, &model.User{}, "shop_id = ? AND username = ?", shop.ID, "test", func() any {
 		return &model.User{
-			TenantBase: model.TenantBase{ShopID: shop.ID},
+			ShopID: shop.ID,
 			Username: "test", PasswordHash: hash, RealName: "王五（只读）",
 			Phone: "13800000003", Role: "readonly", IsActive: true,
 		}
@@ -3,6 +3,7 @@ package handler
 import (
 	"fmt"
 	"io"
+	"log"
 	"net/http"
 	"os"
 	"strconv"
@@ -512,66 +513,126 @@ func (h *ImportHandler) ImportInventory(c *gin.Context) {
 	}

 	type importResult struct {
+		total    int
 		imported int
 		updated  int
-		skipped  int
 		errors   []string
 	}
 	var res importResult

-	// 仓库缓存，只查找不创建
-	warehouseCache := map[string]*uint64{}
+	// 预加载仓库（1 次查询）
+	var warehouses []model.Warehouse
+	h.db.Where("shop_id = ? AND deleted_at IS NULL", shopID).Find(&warehouses)
+	warehouseByName := make(map[string]uint64, len(warehouses))
+	for _, wh := range warehouses {
+		warehouseByName[wh.Name] = wh.ID
+	}
 	findWarehouse := func(name string) *uint64 {
 		if name == "" {
 			return nil
 		}
-		if idPtr, ok := warehouseCache[name]; ok {
-			return idPtr
+		if id, ok := warehouseByName[name]; ok {
+			return &id
 		}
-		var wh model.Warehouse
-		if h.db.Where("shop_id = ? AND name = ? AND deleted_at IS NULL", shopID, name).First(&wh).Error != nil {
-			warehouseCache[name] = nil
-			return nil
+		return nil
+	}
+
+	// 预加载商品（1 次查询）
+	var allProducts []model.Product
+	h.db.Where("shop_id = ? AND deleted_at IS NULL", shopID).Find(&allProducts)
+	productByCode := make(map[string]*model.Product, len(allProducts))
+	productByNSS := make(map[string]*model.Product, len(allProducts))
+	for i := range allProducts {
+		p := &allProducts[i]
+		if p.Code != "" {
+			productByCode[p.Code] = p
 		}
-		id := wh.ID
-		warehouseCache[name] = &id
-		return &id
+		productByNSS[p.Name+"|"+p.Series+"|"+p.Spec] = p
+	}
+
+	// 预加载已有导入库存（1 次查询）
+	// 同时建两套索引：编号索引 + 名称|系列|规格索引，供后续双路查找
+	var allInvs []model.Inventory
+	h.db.Where("shop_id = ? AND stock_in_item_id IS NULL AND deleted_at IS NULL", shopID).Find(&allInvs)
+	invByCode := make(map[string]*model.Inventory, len(allInvs)) // key: productCode|warehouseID
+	invByNSS := make(map[string]*model.Inventory, len(allInvs))  // key: name|series|spec|warehouseID
+	for i := range allInvs {
+		inv := &allInvs[i]
+		whID := uint64(0)
+		if inv.WarehouseID != nil {
+			whID = *inv.WarehouseID
+		}
+		if inv.ProductCode != "" {
+			invByCode[fmt.Sprintf("%s|%d", inv.ProductCode, whID)] = inv
+		}
+		nssKey := fmt.Sprintf("%s|%s|%s|%d", inv.ProductName, inv.Series, inv.Spec, whID)
+		invByNSS[nssKey] = inv
+	}
+	lookupInv := func(productCode, name, series, spec string, whID uint64) *model.Inventory {
+		if productCode != "" {
+			if inv, ok := invByCode[fmt.Sprintf("%s|%d", productCode, whID)]; ok {
+				return inv
+			}
+		}
+		return invByNSS[fmt.Sprintf("%s|%s|%s|%d", name, series, spec, whID)]
 	}

 	// Dynamic column detection from header row
+	colProductCode, colProductName, colSeries, colSpec, colUnit := 0, 1, 2, 3, 4
 	colQty, colPrice, colProductionDate, colBatchNo, colWarehouse, colSupplier, colRemark := 5, 6, 8, 9, 11, 13, 15
 	if len(rows) > 0 {
+		log.Printf("[import-inv] header row (%d cols): %v", len(rows[0]), rows[0])
 		for j, h := range rows[0] {
 			switch strings.TrimSpace(h) {
-			case "库存数量", "数量":
+			case "商品编号", "商品编码", "编号", "编码", "商品条码":
+				colProductCode = j
+			case "商品名称", "品名", "名称", "货品名称":
+				colProductName = j
+			case "系列", "品牌系列":
+				colSeries = j
+			case "规格", "规格型号":
+				colSpec = j
+			case "单位":
+				colUnit = j
+			case "库存数量", "数量", "库存":
 				colQty = j
-			case "单价":
+			case "单价", "进价", "采购单价":
 				colPrice = j
-			case "生产日期":
+			case "生产日期", "生产年月":
 				colProductionDate = j
 			case "批次", "批次号":
 				colBatchNo = j
-			case "所在仓库", "仓库":
+			case "所在仓库", "仓库", "库位":
 				colWarehouse = j
-			case "供应商":
+			case "供应商", "供应商名称":
 				colSupplier = j
 			case "备注":
 				colRemark = j
 			}
 		}
 	}
+	log.Printf("[import-inv] total rows=%d, colProductName=%d, colProductCode=%d, colQty=%d",
+		len(rows), colProductName, colProductCode, colQty)
+
+	// 如果没有匹配到任何列头，返回诊断信息
+	detectedHeader := strings.Join(rows[0], " | ")
+
+	var logsToCreate []model.InventoryLog

 	for i, row := range rows[1:] {
-		productName := cell(row, 1)
+		productName := cell(row, colProductName)
+		if i < 5 {
+			log.Printf("[import-inv] row[%d] len=%d | productName=%q productCode=%q qty=%q",
+				i+2, len(row), productName, cell(row, colProductCode), cell(row, colQty))
+		}
 		if productName == "" {
-			res.skipped++
-			continue
+			continue // 空行（文件末尾填充行），不计入 total
 		}

-		productCode := cell(row, 0)
-		series := cell(row, 2)
-		spec := cell(row, 3)
-		unit := cell(row, 4)
+		productCode := cell(row, colProductCode)
+		series := cell(row, colSeries)
+		spec := cell(row, colSpec)
+		unit := cell(row, colUnit)
 		qtyStr := cell(row, colQty)
 		priceStr := cell(row, colPrice)
 		productionDateStr := cell(row, colProductionDate)
@@ -586,20 +647,32 @@ func (h *ImportHandler) ImportInventory(c *gin.Context) {
 		}
 		price, _ := strconv.ParseFloat(priceStr, 64)

-		// 只查找商品，不强制创建
-		var prod model.Product
-		if h.db.Where("shop_id = ? AND deleted_at IS NULL AND (code = ? OR (name = ? AND series = ? AND spec = ?))",
-			shopID, productCode, productName, series, spec).First(&prod).Error != nil {
-			// 若找不到则创建
+		res.total++ // 有商品名称的行才计入总数
+
+		// 从缓存查商品，找不到才创建
+		var prod *model.Product
+		if productCode != "" {
+			prod = productByCode[productCode]
+		}
+		if prod == nil {
+			prod = productByNSS[productName+"|"+series+"|"+spec]
+		}
+		if prod == nil {
 			newProd, createErr := findOrCreateProductFn(h.db, shopID, productCode, productName, series, spec)
 			if createErr != nil {
 				res.errors = append(res.errors, fmt.Sprintf("行%d: 商品创建失败: %s", i+2, createErr.Error()))
 				continue
 			}
-			prod = newProd
+			allProducts = append(allProducts, newProd)
+			prod = &allProducts[len(allProducts)-1]
+			if prod.Code != "" {
+				productByCode[prod.Code] = prod
+			}
+			productByNSS[prod.Name+"|"+prod.Series+"|"+prod.Spec] = prod
 		}
 		if unit != "" && prod.Unit == "" {
-			h.db.Model(&prod).Update("unit", unit)
+			h.db.Model(prod).Update("unit", unit)
+			prod.Unit = unit
 		}

 		// 解析生产日期
@@ -609,7 +682,6 @@ func (h *ImportHandler) ImportInventory(c *gin.Context) {
 			productionDate = &d
 		}

-		// 查找仓库（只查，不创建）
 		whIDPtr := findWarehouse(warehouseName)

 		var unitPricePtr *float64
@@ -617,30 +689,24 @@ func (h *ImportHandler) ImportInventory(c *gin.Context) {
 			unitPricePtr = &price
 		}

-		productIDCopy := prod.ID
-
-		// Upsert：按商品编号 + 仓库查找已有导入记录，存在则更新，不存在则新建
-		var existing model.Inventory
-		q := h.db.Where("shop_id = ? AND product_code = ? AND stock_in_item_id IS NULL AND deleted_at IS NULL",
-			shopID, prod.Code)
+		whIDVal := uint64(0)
 		if whIDPtr != nil {
-			q = q.Where("warehouse_id = ?", *whIDPtr)
-		} else {
-			q = q.Where("warehouse_id IS NULL")
+			whIDVal = *whIDPtr
 		}
-		found := q.First(&existing).Error == nil

-		if found {
+		existing := lookupInv(productCode, prod.Name, prod.Series, prod.Spec, whIDVal)
+
+		if existing != nil {
 			updates := map[string]interface{}{
-				"quantity":        qty,
-				"product_name":    prod.Name,
-				"series":          prod.Series,
-				"spec":            prod.Spec,
-				"unit":            prod.Unit,
-				"warehouse_name":  warehouseName,
-				"supplier_name":   supplierName,
-				"remark":          remark,
-				"deleted_at":      nil,
+				"quantity":       qty,
+				"product_name":   prod.Name,
+				"series":         prod.Series,
+				"spec":           prod.Spec,
+				"unit":           prod.Unit,
+				"warehouse_name": warehouseName,
+				"supplier_name":  supplierName,
+				"remark":         remark,
+				"deleted_at":     nil,
 			}
 			if unitPricePtr != nil {
 				updates["unit_price"] = *unitPricePtr
@@ -651,11 +717,18 @@ func (h *ImportHandler) ImportInventory(c *gin.Context) {
 			if batchNo != "" {
 				updates["batch_no"] = batchNo
 			}
-			if err := h.db.Model(&existing).Updates(updates).Error; err != nil {
+			if err := h.db.Model(existing).Updates(updates).Error; err != nil {
 				res.errors = append(res.errors, fmt.Sprintf("行%d: 库存更新失败: %s", i+2, err.Error()))
 				continue
 			}
+			logsToCreate = append(logsToCreate, model.InventoryLog{
+				ShopID: shopID, WarehouseID: whIDVal, ProductID: prod.ID,
+				Direction: "in", Quantity: qty, QtyBefore: existing.Quantity, QtyAfter: qty,
+				RefType: "import", RefID: 0,
+			})
+			res.updated++
 		} else {
+			productIDCopy := prod.ID
 			inv := model.Inventory{
 				ShopID:         shopID,
 				WarehouseID:    whIDPtr,
@@ -678,38 +751,38 @@ func (h *ImportHandler) ImportInventory(c *gin.Context) {
 				res.errors = append(res.errors, fmt.Sprintf("行%d: 库存写入失败: %s", i+2, err.Error()))
 				continue
 			}
-		}
-
-		// 写流水
-		warehouseID := uint64(0)
-		if whIDPtr != nil {
-			warehouseID = *whIDPtr
-		}
-		qtyBefore := 0.0
-		if found {
-			qtyBefore = existing.Quantity
-			res.updated++
-		} else {
+			// 写入两套缓存，防止同文件后续行重复插入
+			if inv.ProductCode != "" {
+				invByCode[fmt.Sprintf("%s|%d", inv.ProductCode, whIDVal)] = &inv
+			}
+			invByNSS[fmt.Sprintf("%s|%s|%s|%d", inv.ProductName, inv.Series, inv.Spec, whIDVal)] = &inv
+			logsToCreate = append(logsToCreate, model.InventoryLog{
+				ShopID: shopID, WarehouseID: whIDVal, ProductID: prod.ID,
+				Direction: "in", Quantity: qty, QtyBefore: 0, QtyAfter: qty,
+				RefType: "import", RefID: 0,
+			})
 			res.imported++
 		}
-		log := model.InventoryLog{
-			ShopID:      shopID,
-			WarehouseID: warehouseID,
-			ProductID:   prod.ID,
-			Direction:   "in",
-			Quantity:    qty,
-			QtyBefore:   qtyBefore,
-			QtyAfter:    qty,
-			RefType:     "import",
-			RefID:       0,
-		}
-		h.db.Create(&log)
 	}

+	// 批量写流水
+	if len(logsToCreate) > 0 {
+		h.db.CreateInBatches(&logsToCreate, 100)
+	}
+
+	// total=0 说明列格式不匹配，没有解析到任何有效行
+	if res.total == 0 {
+		res.errors = append(res.errors,
+			fmt.Sprintf("未解析到任何有效行，可能列格式不匹配。识别到的表头：%s", detectedHeader))
+	}
+
+	log.Printf("[import-inv] RESULT: total=%d imported=%d updated=%d errors=%d",
+		res.total, res.imported, res.updated, len(res.errors))
+
 	c.JSON(http.StatusOK, gin.H{
+		"total":    res.total,
 		"imported": res.imported,
 		"updated":  res.updated,
-		"skipped":  res.skipped,
 		"errors":   res.errors,
 	})
 }
@@ -1,11 +1,19 @@
 package handler

 import (
+	"fmt"
+	"image"
+	_ "image/jpeg"
+	_ "image/png"
 	"net/http"
+	"os"
+	"path/filepath"

+	"github.com/disintegration/imaging"
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"

+	"github.com/wangjia/jiu/backend/config"
 	"github.com/wangjia/jiu/backend/internal/middleware"
 	"github.com/wangjia/jiu/backend/internal/model"
 )
@@ -38,6 +46,7 @@ func (h *ShopHandler) UpdateInfo(c *gin.Context) {
 		Address     string `json:"address"`
 		Phone       string `json:"phone"`
 		ManagerName string `json:"manager_name"`
+		LogoURL     string `json:"logo_url"`
 	}
 	if err := c.ShouldBindJSON(&req); err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
@@ -50,6 +59,9 @@ func (h *ShopHandler) UpdateInfo(c *gin.Context) {
 		"phone":        req.Phone,
 		"manager_name": req.ManagerName,
 	}
+	if req.LogoURL != "" {
+		updates["logo_url"] = req.LogoURL
+	}
 	if err := h.db.Model(&model.Shop{}).Where("id = ?", shopID).Updates(updates).Error; err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
@@ -59,3 +71,48 @@ func (h *ShopHandler) UpdateInfo(c *gin.Context) {
 	h.db.First(&shop, shopID)
 	c.JSON(http.StatusOK, shop)
 }
+
+// UploadLogo POST /api/v1/shop/logo  (admin only)
+func (h *ShopHandler) UploadLogo(c *gin.Context) {
+	shopID := middleware.GetShopID(c)
+
+	if err := c.Request.ParseMultipartForm(2 << 20); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "文件超过 2MB 限制"})
+		return
+	}
+	file, _, err := c.Request.FormFile("file")
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "请上传文件（field: file）"})
+		return
+	}
+	defer file.Close()
+
+	img, _, err := image.Decode(file)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "仅支持 JPEG/PNG 图片"})
+		return
+	}
+
+	// 裁剪为正方形后缩放到 256×256
+	resized := imaging.Fill(img, 256, 256, imaging.Center, imaging.Lanczos)
+
+	subdir := filepath.Join(config.C.Storage.UploadDir, "shops", fmt.Sprintf("%d", shopID))
+	if err := os.MkdirAll(subdir, 0755); err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "存储目录创建失败"})
+		return
+	}
+	fullPath := filepath.Join(subdir, "logo.jpg")
+
+	if err := imaging.Save(resized, fullPath, imaging.JPEGQuality(90)); err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "图片保存失败"})
+		return
+	}
+
+	logoURL := fmt.Sprintf("/images/shops/%d/logo.jpg", shopID)
+	if err := h.db.Model(&model.Shop{}).Where("id = ?", shopID).Update("logo_url", logoURL).Error; err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, gin.H{"logo_url": logoURL})
+}
@@ -52,7 +52,7 @@ func (h *UserHandler) Create(c *gin.Context) {
 		role = "operator"
 	}
 	u := model.User{
-		TenantBase:   model.TenantBase{ShopID: shopID},
+		ShopID:       shopID,
 		Username:     req.Username,
 		PasswordHash: string(hash),
 		RealName:     req.RealName,
@@ -8,6 +8,7 @@ type Shop struct {
 	Phone           string `gorm:"size:30" json:"phone"`
 	BusinessHours   string `gorm:"size:100" json:"business_hours"`
 	ManagerName     string `gorm:"size:50" json:"manager_name"`
+	LogoURL         string `gorm:"column:logo_url;size:500" json:"logo_url"`
 	BusinessLicense string `gorm:"size:500" json:"business_license"`
 	ShopPhotos      JSON   `gorm:"type:json" json:"shop_photos,omitempty"`
 	CustomFields    JSON   `gorm:"type:json" json:"custom_fields,omitempty"`
@@ -1,7 +1,8 @@
 package model

 type User struct {
-	TenantBase
+	Base
+	ShopID       uint64 `gorm:"not null;index;uniqueIndex:uk_shop_username" json:"shop_id"`
 	Username     string `gorm:"size:50;uniqueIndex:uk_shop_username" json:"username"`
 	PasswordHash string `gorm:"size:255" json:"-"`
 	RealName     string `gorm:"size:50" json:"real_name"`
@@ -165,6 +165,7 @@ func Setup(r *gin.Engine, db *gorm.DB) {
 		{
 			shop.GET("/info", shopH.GetInfo)
 			shop.PUT("/info", middleware.AdminOnly(), shopH.UpdateInfo)
+			shop.POST("/logo", middleware.AdminOnly(), shopH.UploadLogo)
 		}

 		// 编号规则
@@ -17,6 +17,7 @@ CREATE TABLE IF NOT EXISTS `shops` (
  `address`          VARCHAR(255)    DEFAULT NULL,
  `phone`            VARCHAR(30)     DEFAULT NULL,
  `manager_name`     VARCHAR(50)     DEFAULT NULL COMMENT '负责人',
+  `logo_url`         VARCHAR(500)    DEFAULT ''   COMMENT '门店 logo URL',
  `business_license` VARCHAR(500)    DEFAULT NULL COMMENT '营业执照照片URL',
  `shop_photos`      JSON            DEFAULT NULL COMMENT '门店照片URL数组',
  `custom_fields`    JSON            DEFAULT NULL COMMENT '扩展字段',
@@ -2,39 +2,15 @@
 -- 测试门店 S001 种子数据
 -- 用法: sh scripts/dev.sh seed S001
 -- 前置条件: 数据库表结构已创建（启动一次后端即可）
-- 说明: 每次执行会清空并重新写入所有业务数据
+-- 说明: 仅写入数据，不清空。加 --clear 参数先清空再写入
 -- =============================================================

 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;

-- ── 清空（子表先清）────────────────────────────────────────
-TRUNCATE TABLE inventory_check_items;
-TRUNCATE TABLE inventory_checks;
-TRUNCATE TABLE inventory_logs;
-TRUNCATE TABLE inventories;
-TRUNCATE TABLE stock_out_items;
-TRUNCATE TABLE stock_out_orders;
-TRUNCATE TABLE stock_in_items;
-TRUNCATE TABLE stock_in_orders;
-TRUNCATE TABLE finance_records;
-TRUNCATE TABLE number_rules;
-TRUNCATE TABLE product_images;
-TRUNCATE TABLE partners;
-TRUNCATE TABLE warehouses;
-TRUNCATE TABLE products;
-TRUNCATE TABLE product_spec_options;
-TRUNCATE TABLE product_series_options;
-TRUNCATE TABLE product_name_options;
-TRUNCATE TABLE product_categories;
-TRUNCATE TABLE users;
-TRUNCATE TABLE shops;
-
-SET FOREIGN_KEY_CHECKS = 1;
-
 -- ── 门店 ────────────────────────────────────────────────────
 -- id=1
-INSERT INTO shops (id, name, code, address, phone, manager_name, created_at, updated_at)
+INSERT IGNORE INTO shops (id, name, code, address, phone, manager_name, created_at, updated_at)
 VALUES (1, '盛世名酿酒行', 'S001', '北京市朝阳区建国路88号华贸中心B座101室', '010-65882266', '张建国', NOW(), NOW());

 -- ── 用户（密码均为 password123）────────────────────────────
@@ -42,26 +18,26 @@ VALUES (1, '盛世名酿酒行', 'S001', '北京市朝阳区建国路88号华贸
 SET @pwd = '$2a$10$BNHhJoKHryCCEyKqM.11TeLOnSCV8rNtOqvKHUqaczETXLtH/YE1m';

 -- id=1 admin, id=2 operator, id=3 readonly
-INSERT INTO users (id, shop_id, username, password_hash, real_name, phone, role, is_active, created_at, updated_at) VALUES
+INSERT IGNORE INTO users (id, shop_id, username, password_hash, real_name, phone, role, is_active, created_at, updated_at) VALUES
 (1, 1, 'admin',    @pwd, '张三（管理员）', '13800000001', 'admin',    1, NOW(), NOW()),
 (2, 1, 'operator', @pwd, '李四（操作员）', '13800000002', 'operator', 1, NOW(), NOW()),
 (3, 1, 'test',     @pwd, '王五（只读）',   '13800000003', 'readonly', 1, NOW(), NOW());

 -- ── 仓库 ────────────────────────────────────────────────────
 -- id=1 主仓库, id=2 进口酒专库
-INSERT INTO warehouses (id, shop_id, name, location, is_default, created_at, updated_at) VALUES
+INSERT IGNORE INTO warehouses (id, shop_id, name, location, is_default, created_at, updated_at) VALUES
 (1, 1, '主仓库',     'A栋1层东侧',   1, NOW(), NOW()),
 (2, 1, '进口酒专库', 'B栋2层恒温区', 0, NOW(), NOW());

 -- ── 商品分类 ────────────────────────────────────────────────
 -- id=1 白酒, id=2 进口烈酒
-INSERT INTO product_categories (id, shop_id, name, sort_order, created_at, updated_at) VALUES
+INSERT IGNORE INTO product_categories (id, shop_id, name, sort_order, created_at, updated_at) VALUES
 (1, 1, '白酒',   1, NOW(), NOW()),
 (2, 1, '进口烈酒', 2, NOW(), NOW());

 -- ── 商品 ────────────────────────────────────────────────────
 -- id=1~6 白酒, id=7~8 进口烈酒
-INSERT INTO products (id, shop_id, public_id, code, barcode, name, series, spec, unit, category_id, brand,
+INSERT IGNORE INTO products (id, shop_id, public_id, code, barcode, name, series, spec, unit, category_id, brand,
                      purchase_price, sale_price, min_stock, remark, description, created_at, updated_at) VALUES
 (1, 1, 'a1b2c3d4-0001-0001-0001-000000000001', 'MT-001',  '6901234567890', '飞天茅台 53度',  '茅台',     '500ml/瓶', '瓶', 1, '贵州茅台',       2350, 2800, 10, '酱香型白酒，53度，飞天系列', '飞天茅台采用优质高粱、小麦，经传统酱香工艺精心酿制。酒体醇厚丰满，酱香突出，幽雅细腻，空杯留香持久。53度黄金度数，是馈赠佳品的首选。', NOW(), NOW()),
 (2, 1, 'a1b2c3d4-0001-0001-0001-000000000002', 'WLY-001', '6902345678901', '五粮液 52度',    '五粮液',   '500ml/瓶', '瓶', 1, '宜宾五粮液',     950,  1200, 6,  '浓香型白酒，52度，普五系列', '五粮液以高粱、大米、糯米、小麦、玉米五种粮食为原料，经地窖发酵精酿而成。香气悠久，味醇厚，入口甘美，入喉净爽，浓香典范。', NOW(), NOW()),
@@ -73,7 +49,7 @@ INSERT INTO products (id, shop_id, public_id, code, barcode, name, series, spec,
 (8, 1, 'a1b2c3d4-0001-0001-0001-000000000008', 'RTM-001', '3021691010008', '人头马 VSOP',    '人头马',   '700ml/瓶', '瓶', 2, 'Rémy Martin',    480,  680,  3,  '法国干邑，VSOP级别',         '人头马VSOP精选法国干邑地区Fine Champagne产区葡萄，经二次蒸馏后在法国橡木桶中陈年至少四年。口感丝滑，带有香草、杏干与蜂蜜的复杂香气，是干邑入门经典。', NOW(), NOW());

 -- ── 商品名称选项 ────────────────────────────────────────────
-INSERT INTO product_name_options (shop_id, code, name, created_at, updated_at) VALUES
+INSERT IGNORE INTO product_name_options (shop_id, code, name, created_at, updated_at) VALUES
 (1, 'NA001', '飞天茅台 53度', NOW(), NOW()),
 (1, 'NA002', '五粮液 52度',   NOW(), NOW()),
 (1, 'NA003', '洋河梦之蓝 M6', NOW(), NOW()),
@@ -84,7 +60,7 @@ INSERT INTO product_name_options (shop_id, code, name, created_at, updated_at) V
 (1, 'NA008', '人头马 VSOP',   NOW(), NOW());

 -- ── 商品系列选项 ────────────────────────────────────────────
-INSERT INTO product_series_options (shop_id, code, name, created_at, updated_at) VALUES
+INSERT IGNORE INTO product_series_options (shop_id, code, name, created_at, updated_at) VALUES
 (1, 'SE001', '茅台',     NOW(), NOW()),
 (1, 'SE002', '五粮液',   NOW(), NOW()),
 (1, 'SE003', '洋河',     NOW(), NOW()),
@@ -95,14 +71,14 @@ INSERT INTO product_series_options (shop_id, code, name, created_at, updated_at)
 (1, 'SE008', '人头马',   NOW(), NOW());

 -- ── 商品规格选项 ────────────────────────────────────────────
-INSERT INTO product_spec_options (shop_id, code, name, quantity, created_at, updated_at) VALUES
+INSERT IGNORE INTO product_spec_options (shop_id, code, name, quantity, created_at, updated_at) VALUES
 (1, 'GG001', '500ml/瓶', 1, NOW(), NOW()),
 (1, 'GG002', '750ml/瓶', 1, NOW(), NOW()),
 (1, 'GG003', '700ml/瓶', 1, NOW(), NOW());

 -- ── 往来单位 ────────────────────────────────────────────────
 -- id=1~4 供应商, id=5~7 客户
-INSERT INTO partners (id, shop_id, code, name, type, contact, phone, address, bank_account,
+INSERT IGNORE INTO partners (id, shop_id, code, name, type, contact, phone, address, bank_account,
                      credit_limit, balance, remark, created_at, updated_at) VALUES
 (1, 1, 'SUP001', '贵州茅台酒股份有限公司',   'supplier', '张经理', '0851-22222001', '贵州省仁怀市茅台镇',         '工商银行仁怀支行 6222 0000 0001 0001', 5000000, 0, '茅台系列直供，账期30天',     NOW(), NOW()),
 (2, 1, 'SUP002', '四川五粮液股份有限公司',   'supplier', '王总监', '0831-33333001', '四川省宜宾市翠屏区',         '建设银行宜宾支行 6227 0000 0001 0002', 3000000, 0, '五粮液系列授权经销',         NOW(), NOW()),
@@ -113,125 +89,125 @@ INSERT INTO partners (id, shop_id, code, name, type, contact, phone, address, ba
 (7, 1, 'CUS003', '广州白天鹅宾馆',           'customer', '吴采购', '020-81886001',  '广州市荔湾区沙面南街1号',     '招商银行广州荔湾支行 6225 0000 0002 0003', 300000, 0, '高端宾馆，月结30天',       NOW(), NOW());

 -- ── 编号规则 ────────────────────────────────────────────────
-INSERT INTO number_rules (id, shop_id, type, prefix, current_no, date_format, updated_at) VALUES
+INSERT IGNORE INTO number_rules (id, shop_id, type, prefix, current_no, date_format, updated_at) VALUES
 (1, 1, 'stock_in',        'RK', 5, 'YYYYMMDD', NOW()),
 (2, 1, 'stock_out',       'CK', 4, 'YYYYMMDD', NOW()),
 (3, 1, 'inventory_check', 'PD', 1, 'YYYYMMDD', NOW());

 -- ── 入库单 ──────────────────────────────────────────────────
 -- #1 已审核: 飞天茅台+五粮液，主仓库，茅台供应商 | 总额=339000
-INSERT INTO stock_in_orders (id, shop_id, order_no, type, warehouse_id, partner_id, operator_id,
+INSERT IGNORE INTO stock_in_orders (id, shop_id, order_no, type, warehouse_id, partner_id, operator_id,
    reviewer_id, status, order_date, total_amount, reviewed_at, remark, created_at, updated_at) VALUES
 (1, 1, 'RK20260401001', 'purchase', 1, 1, 1,
    1, 'approved', DATE_SUB(CURDATE(), INTERVAL 6 DAY), 339000,
    DATE_SUB(NOW(), INTERVAL 5 DAY), '茅台系列首批入库，含飞天茅台及五粮液', NOW(), NOW());

-INSERT INTO stock_in_items (id, order_id, shop_id, product_id, quantity, unit_price, total_price,
+INSERT IGNORE INTO stock_in_items (id, order_id, shop_id, product_id, quantity, unit_price, total_price,
    batch_no, remark, created_at, updated_at) VALUES
 (1, 1, 1, 1, 120, 2350, 282000, 'BATCH-MT-2024001',  '飞天茅台 2024年第一批次', NOW(), NOW()),
 (2, 1, 1, 2,  60,  950,  57000, 'BATCH-WLY-2024001', '五粮液普五 2024年批次',   NOW(), NOW());

 -- #2 已审核: 洋河+泸州+剑南春，主仓库，五粮液供应商 | 总额=51360
-INSERT INTO stock_in_orders (id, shop_id, order_no, type, warehouse_id, partner_id, operator_id,
+INSERT IGNORE INTO stock_in_orders (id, shop_id, order_no, type, warehouse_id, partner_id, operator_id,
    reviewer_id, status, order_date, total_amount, reviewed_at, remark, created_at, updated_at) VALUES
 (2, 1, 'RK20260403001', 'purchase', 1, 2, 2,
    1, 'approved', DATE_SUB(CURDATE(), INTERVAL 4 DAY), 51360,
    DATE_SUB(NOW(), INTERVAL 3 DAY), '浓香型白酒补货入库', NOW(), NOW());

-INSERT INTO stock_in_items (id, order_id, shop_id, product_id, quantity, unit_price, total_price,
+INSERT IGNORE INTO stock_in_items (id, order_id, shop_id, product_id, quantity, unit_price, total_price,
    batch_no, remark, created_at, updated_at) VALUES
 (3, 2, 1, 3, 48, 560, 26880, 'BATCH-YH-2024003',  '洋河梦之蓝 M6 3月批次',  NOW(), NOW()),
 (4, 2, 1, 4, 36, 420, 15120, 'BATCH-LZ-2024002',  '泸州老窖特曲 春季批次',  NOW(), NOW()),
 (5, 2, 1, 5, 24, 390,  9360, 'BATCH-JNC-2024001', '剑南春水晶剑 首批',      NOW(), NOW());

 -- #3 已审核: 拉菲+人头马，进口酒专库，郎酒供应商（代理进口）| 总额=108480
-INSERT INTO stock_in_orders (id, shop_id, order_no, type, warehouse_id, partner_id, operator_id,
+INSERT IGNORE INTO stock_in_orders (id, shop_id, order_no, type, warehouse_id, partner_id, operator_id,
    reviewer_id, status, order_date, total_amount, reviewed_at, remark, created_at, updated_at) VALUES
 (3, 1, 'RK20260404001', 'purchase', 2, 4, 2,
    1, 'approved', DATE_SUB(CURDATE(), INTERVAL 3 DAY), 108480,
    DATE_SUB(NOW(), INTERVAL 2 DAY), '进口烈酒专库入库，含拉菲及人头马', NOW(), NOW());

-INSERT INTO stock_in_items (id, order_id, shop_id, product_id, quantity, unit_price, total_price,
+INSERT IGNORE INTO stock_in_items (id, order_id, shop_id, product_id, quantity, unit_price, total_price,
    batch_no, remark, created_at, updated_at) VALUES
 (6, 3, 1, 7, 24, 3800,  91200, 'BATCH-LF-2018001',  '拉菲古堡2018，原箱',     NOW(), NOW()),
 (7, 3, 1, 8, 36,  480,  17280, 'BATCH-RTM-2024001', '人头马VSOP，2024年进口', NOW(), NOW());

 -- #4 待审核: 郎酒补货，主仓库 | 总额=19200
-INSERT INTO stock_in_orders (id, shop_id, order_no, type, warehouse_id, partner_id, operator_id,
+INSERT IGNORE INTO stock_in_orders (id, shop_id, order_no, type, warehouse_id, partner_id, operator_id,
    status, order_date, total_amount, remark, created_at, updated_at) VALUES
 (4, 1, 'RK20260406001', 'purchase', 1, 4, 2,
    'pending', DATE_SUB(CURDATE(), INTERVAL 1 DAY), 19200,
    '郎酒红花郎补货，待仓库管理员审核', NOW(), NOW());

-INSERT INTO stock_in_items (id, order_id, shop_id, product_id, quantity, unit_price, total_price,
+INSERT IGNORE INTO stock_in_items (id, order_id, shop_id, product_id, quantity, unit_price, total_price,
    batch_no, remark, created_at, updated_at) VALUES
 (8, 4, 1, 6, 60, 320, 19200, 'BATCH-LJ-2024002', '郎酒红花郎10 第二批次', NOW(), NOW());

 -- #5 草稿: 追加茅台，主仓库 | 总额=142800
-INSERT INTO stock_in_orders (id, shop_id, order_no, type, warehouse_id, partner_id, operator_id,
+INSERT IGNORE INTO stock_in_orders (id, shop_id, order_no, type, warehouse_id, partner_id, operator_id,
    status, order_date, total_amount, remark, created_at, updated_at) VALUES
 (5, 1, 'RK20260407001', 'purchase', 1, 1, 2,
    'draft', CURDATE(), 142800,
    '茅台追加订货，草稿中', NOW(), NOW());

-INSERT INTO stock_in_items (id, order_id, shop_id, product_id, quantity, unit_price, total_price,
+INSERT IGNORE INTO stock_in_items (id, order_id, shop_id, product_id, quantity, unit_price, total_price,
    batch_no, remark, created_at, updated_at) VALUES
 (9, 5, 1, 1, 60, 2380, 142800, 'BATCH-MT-2024002', '飞天茅台 第二批次', NOW(), NOW());

 -- ── 出库单 ──────────────────────────────────────────────────
 -- #1 已审核: 君悦大酒店，主仓库 | 总额=48960
-INSERT INTO stock_out_orders (id, shop_id, order_no, type, warehouse_id, partner_id, operator_id,
+INSERT IGNORE INTO stock_out_orders (id, shop_id, order_no, type, warehouse_id, partner_id, operator_id,
    reviewer_id, status, order_date, total_amount, reviewed_at, remark, created_at, updated_at) VALUES
 (1, 1, 'CK20260404001', 'sale', 1, 5, 2,
    1, 'approved', DATE_SUB(CURDATE(), INTERVAL 3 DAY), 48960,
    DATE_SUB(NOW(), INTERVAL 2 DAY), '北京君悦大酒店 4月份定期供货', NOW(), NOW());

-INSERT INTO stock_out_items (id, order_id, shop_id, product_id, quantity, unit_price, total_price,
+INSERT IGNORE INTO stock_out_items (id, order_id, shop_id, product_id, quantity, unit_price, total_price,
    remark, created_at, updated_at) VALUES
 (1, 1, 1, 1, 12, 2800, 33600, '飞天茅台 12瓶，整箱出库', NOW(), NOW()),
 (2, 1, 1, 2,  6, 1200,  7200, '五粮液普五 6瓶',          NOW(), NOW()),
 (3, 1, 1, 3, 12,  680,  8160, '洋河梦之蓝 M6 12瓶',      NOW(), NOW());

 -- #2 已审核: 外滩华尔道夫，进口酒专库 | 总额=39360
-INSERT INTO stock_out_orders (id, shop_id, order_no, type, warehouse_id, partner_id, operator_id,
+INSERT IGNORE INTO stock_out_orders (id, shop_id, order_no, type, warehouse_id, partner_id, operator_id,
    reviewer_id, status, order_date, total_amount, reviewed_at, remark, created_at, updated_at) VALUES
 (2, 1, 'CK20260405001', 'sale', 2, 6, 2,
    1, 'approved', DATE_SUB(CURDATE(), INTERVAL 2 DAY), 39360,
    DATE_SUB(NOW(), INTERVAL 1 DAY), '上海外滩华尔道夫 进口酒专属采购', NOW(), NOW());

-INSERT INTO stock_out_items (id, order_id, shop_id, product_id, quantity, unit_price, total_price,
+INSERT IGNORE INTO stock_out_items (id, order_id, shop_id, product_id, quantity, unit_price, total_price,
    remark, created_at, updated_at) VALUES
 (4, 2, 1, 7,  6, 5200, 31200, '拉菲古堡2018 6瓶',  NOW(), NOW()),
 (5, 2, 1, 8, 12,  680,  8160, '人头马VSOP 12瓶',   NOW(), NOW());

 -- #3 待审核: 广州白天鹅宾馆，主仓库 | 总额=23280
-INSERT INTO stock_out_orders (id, shop_id, order_no, type, warehouse_id, partner_id, operator_id,
+INSERT IGNORE INTO stock_out_orders (id, shop_id, order_no, type, warehouse_id, partner_id, operator_id,
    status, order_date, total_amount, remark, created_at, updated_at) VALUES
 (3, 1, 'CK20260406001', 'sale', 1, 7, 2,
    'pending', DATE_SUB(CURDATE(), INTERVAL 1 DAY), 23280,
    '广州白天鹅宾馆 月度供货申请', NOW(), NOW());

-INSERT INTO stock_out_items (id, order_id, shop_id, product_id, quantity, unit_price, total_price,
+INSERT IGNORE INTO stock_out_items (id, order_id, shop_id, product_id, quantity, unit_price, total_price,
    remark, created_at, updated_at) VALUES
 (6, 3, 1, 4, 24, 520, 12480, '泸州老窖特曲 24瓶',   NOW(), NOW()),
 (7, 3, 1, 5, 12, 480,  5760, '剑南春水晶剑 12瓶',   NOW(), NOW()),
 (8, 3, 1, 6, 12, 420,  5040, '郎酒红花郎10 12瓶',   NOW(), NOW());

 -- #4 草稿: 君悦追加，主仓库 | 总额=16800
-INSERT INTO stock_out_orders (id, shop_id, order_no, type, warehouse_id, partner_id, operator_id,
+INSERT IGNORE INTO stock_out_orders (id, shop_id, order_no, type, warehouse_id, partner_id, operator_id,
    status, order_date, total_amount, remark, created_at, updated_at) VALUES
 (4, 1, 'CK20260407001', 'sale', 1, 5, 2,
    'draft', CURDATE(), 16800,
    '北京君悦追加订单，草稿中', NOW(), NOW());

-INSERT INTO stock_out_items (id, order_id, shop_id, product_id, quantity, unit_price, total_price,
+INSERT IGNORE INTO stock_out_items (id, order_id, shop_id, product_id, quantity, unit_price, total_price,
    remark, created_at, updated_at) VALUES
 (9, 4, 1, 1, 6, 2800, 16800, '飞天茅台 追加 6瓶', NOW(), NOW());

 -- ── 库存（已审核单据计算后的实时库存）────────────────────
 -- wh1: 飞天茅台 120-12=108, 五粮液 60-6=54, 洋河 48-12=36, 泸州 36, 剑南春 24
 -- wh2: 拉菲 24-6=18, 人头马 36-12=24
-INSERT INTO inventories (id, shop_id, warehouse_id, product_id, quantity, updated_at) VALUES
+INSERT IGNORE INTO inventories (id, shop_id, warehouse_id, product_id, quantity, updated_at) VALUES
 (1, 1, 1, 1, 108, NOW()),
 (2, 1, 1, 2,  54, NOW()),
 (3, 1, 1, 3,  36, NOW()),
@@ -242,33 +218,33 @@ INSERT INTO inventories (id, shop_id, warehouse_id, product_id, quantity, update

 -- ── 库存流水 ────────────────────────────────────────────────
 -- 入库单 #1 (ref_id=1): 飞天茅台+五粮液 → wh1
-INSERT INTO inventory_logs (id, shop_id, warehouse_id, product_id, direction, quantity, qty_before, qty_after,
+INSERT IGNORE INTO inventory_logs (id, shop_id, warehouse_id, product_id, direction, quantity, qty_before, qty_after,
    ref_type, ref_id, operator_id, created_at) VALUES
 ( 1, 1, 1, 1, 'in', 120,   0, 120, 'stock_in', 1, 1, NOW()),
 ( 2, 1, 1, 2, 'in',  60,   0,  60, 'stock_in', 1, 1, NOW());

 -- 入库单 #2 (ref_id=2): 洋河+泸州+剑南春 → wh1
-INSERT INTO inventory_logs (id, shop_id, warehouse_id, product_id, direction, quantity, qty_before, qty_after,
+INSERT IGNORE INTO inventory_logs (id, shop_id, warehouse_id, product_id, direction, quantity, qty_before, qty_after,
    ref_type, ref_id, operator_id, created_at) VALUES
 ( 3, 1, 1, 3, 'in',  48,   0,  48, 'stock_in', 2, 1, NOW()),
 ( 4, 1, 1, 4, 'in',  36,   0,  36, 'stock_in', 2, 1, NOW()),
 ( 5, 1, 1, 5, 'in',  24,   0,  24, 'stock_in', 2, 1, NOW());

 -- 入库单 #3 (ref_id=3): 拉菲+人头马 → wh2
-INSERT INTO inventory_logs (id, shop_id, warehouse_id, product_id, direction, quantity, qty_before, qty_after,
+INSERT IGNORE INTO inventory_logs (id, shop_id, warehouse_id, product_id, direction, quantity, qty_before, qty_after,
    ref_type, ref_id, operator_id, created_at) VALUES
 ( 6, 1, 2, 7, 'in',  24,   0,  24, 'stock_in', 3, 1, NOW()),
 ( 7, 1, 2, 8, 'in',  36,   0,  36, 'stock_in', 3, 1, NOW());

 -- 出库单 #1 (ref_id=1): 飞天茅台+五粮液+洋河 ← wh1
-INSERT INTO inventory_logs (id, shop_id, warehouse_id, product_id, direction, quantity, qty_before, qty_after,
+INSERT IGNORE INTO inventory_logs (id, shop_id, warehouse_id, product_id, direction, quantity, qty_before, qty_after,
    ref_type, ref_id, operator_id, created_at) VALUES
 ( 8, 1, 1, 1, 'out',  12, 120, 108, 'stock_out', 1, 1, NOW()),
 ( 9, 1, 1, 2, 'out',   6,  60,  54, 'stock_out', 1, 1, NOW()),
 (10, 1, 1, 3, 'out',  12,  48,  36, 'stock_out', 1, 1, NOW());

 -- 出库单 #2 (ref_id=2): 拉菲+人头马 ← wh2
-INSERT INTO inventory_logs (id, shop_id, warehouse_id, product_id, direction, quantity, qty_before, qty_after,
+INSERT IGNORE INTO inventory_logs (id, shop_id, warehouse_id, product_id, direction, quantity, qty_before, qty_after,
    ref_type, ref_id, operator_id, created_at) VALUES
 (11, 1, 2, 7, 'out',   6,  24,  18, 'stock_out', 2, 1, NOW()),
 (12, 1, 2, 8, 'out',  12,  36,  24, 'stock_out', 2, 1, NOW());
@@ -278,7 +254,7 @@ INSERT INTO inventory_logs (id, shop_id, warehouse_id, product_id, direction, qu
 -- 收款：出库单 #1 已回款
 -- 应付账款：入库单 #1 (茅台 339000) + #2 (五粮液代理 51360) + #3 (郎酒 108480)
 -- 付款：入库单 #1 已付款
-INSERT INTO finance_records (id, shop_id, partner_id, type, amount, balance, ref_type, ref_id,
+INSERT IGNORE INTO finance_records (id, shop_id, partner_id, type, amount, balance, ref_type, ref_id,
    operator_id, record_date, remark, created_at, updated_at) VALUES
 (1, 1, 5, 'receivable', 48960,  48960, 'stock_out', 1, 1,
    DATE_SUB(CURDATE(), INTERVAL 6 DAY), '君悦大酒店4月供货应收款',      NOW(), NOW()),
@@ -294,3 +270,5 @@ INSERT INTO finance_records (id, shop_id, partner_id, type, amount, balance, ref
    DATE_SUB(CURDATE(), INTERVAL 3 DAY), '进口烈酒专库入库应付款',        NOW(), NOW()),
 (7, 1, 1, 'payment',   100000,      0, 'stock_in',  1, 1,
    DATE_SUB(CURDATE(), INTERVAL 3 DAY), '预付茅台货款10万，银行转账',    NOW(), NOW());
+
+SET FOREIGN_KEY_CHECKS = 1;
@@ -1,83 +1,71 @@
 -- =============================================================
 -- 测试门店 S002 种子数据（空库存版）
 -- 用法: sh scripts/dev.sh seed S002
-- 说明: 基础数据与 S001 相同，入库/出库/库存数据为空，模拟新门店初始状态
+-- 说明: 仅写入数据，不清空。加 --clear 参数先清空再写入
+-- 模拟新门店初始状态，无历史入库/出库/库存数据
 -- =============================================================

 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;

-- ── 清空（子表先清）────────────────────────────────────────
-TRUNCATE TABLE inventory_check_items;
-TRUNCATE TABLE inventory_checks;
-TRUNCATE TABLE inventory_logs;
-TRUNCATE TABLE inventories;
-TRUNCATE TABLE stock_out_items;
-TRUNCATE TABLE stock_out_orders;
-TRUNCATE TABLE stock_in_items;
-TRUNCATE TABLE stock_in_orders;
-TRUNCATE TABLE finance_records;
-TRUNCATE TABLE number_rules;
-TRUNCATE TABLE product_images;
-TRUNCATE TABLE partners;
-TRUNCATE TABLE warehouses;
-TRUNCATE TABLE products;
-TRUNCATE TABLE product_categories;
-TRUNCATE TABLE users;
-TRUNCATE TABLE shops;
-
-SET FOREIGN_KEY_CHECKS = 1;
-
 -- ── 门店 ────────────────────────────────────────────────────
-INSERT INTO shops (id, name, code, address, phone, manager_name, created_at, updated_at)
-VALUES (1, '醇香汇酒业', 'S002', '上海市静安区南京西路1288号恒隆广场L1-06', '021-52088899', '李文博', NOW(), NOW());
+INSERT IGNORE INTO shops (name, code, address, phone, manager_name, created_at, updated_at)
+VALUES ('醇香汇酒业', 'S002', '上海市静安区南京西路1288号恒隆广场L1-06', '021-52088899', '李文博', NOW(), NOW());
+
+SET @shop_id = (SELECT id FROM shops WHERE code = 'S002' LIMIT 1);

 -- ── 用户（密码均为 password123）────────────────────────────
 SET @pwd = '$2a$10$BNHhJoKHryCCEyKqM.11TeLOnSCV8rNtOqvKHUqaczETXLtH/YE1m';

-INSERT INTO users (id, shop_id, username, password_hash, real_name, phone, role, is_active, created_at, updated_at) VALUES
-(1, 1, 'admin',    @pwd, '张三（管理员）', '13800000001', 'admin',    1, NOW(), NOW()),
-(2, 1, 'operator', @pwd, '李四（操作员）', '13800000002', 'operator', 1, NOW(), NOW()),
-(3, 1, 'test',     @pwd, '王五（只读）',   '13800000003', 'readonly', 1, NOW(), NOW());
+INSERT INTO users (shop_id, username, password_hash, real_name, phone, role, is_active, created_at, updated_at)
+VALUES
+  (@shop_id, 'admin',    @pwd, '李文博（管理员）', '13900000001', 'admin',    1, NOW(), NOW()),
+  (@shop_id, 'operator', @pwd, '陈小红（操作员）', '13900000002', 'operator', 1, NOW(), NOW()),
+  (@shop_id, 'test',     @pwd, '王明（只读）',     '13900000003', 'readonly', 1, NOW(), NOW())
+ON DUPLICATE KEY UPDATE password_hash = @pwd, is_active = 1, updated_at = NOW();

 -- ── 仓库 ────────────────────────────────────────────────────
-INSERT INTO warehouses (id, shop_id, name, location, is_default, created_at, updated_at) VALUES
-(1, 1, '主仓库',     'A栋1层东侧',   1, NOW(), NOW()),
-(2, 1, '进口酒专库', 'B栋2层恒温区', 0, NOW(), NOW());
+INSERT IGNORE INTO warehouses (shop_id, name, location, is_default, created_at, updated_at) VALUES
+(@shop_id, '主仓库',     'A区1层',       1, NOW(), NOW()),
+(@shop_id, '进口酒专库', 'B区恒温展示区', 0, NOW(), NOW());

 -- ── 商品分类 ────────────────────────────────────────────────
-INSERT INTO product_categories (id, shop_id, name, sort_order, created_at, updated_at) VALUES
-(1, 1, '白酒',   1, NOW(), NOW()),
-(2, 1, '进口烈酒', 2, NOW(), NOW());
+INSERT IGNORE INTO product_categories (shop_id, name, sort_order, created_at, updated_at) VALUES
+(@shop_id, '白酒',   1, NOW(), NOW()),
+(@shop_id, '进口烈酒', 2, NOW(), NOW());

 -- ── 商品 ────────────────────────────────────────────────────
-INSERT INTO products (id, shop_id, public_id, code, barcode, name, series, spec, unit, category_id, brand,
+SET @cat_baijiu  = (SELECT id FROM product_categories WHERE shop_id = @shop_id AND name = '白酒'   LIMIT 1);
+SET @cat_import  = (SELECT id FROM product_categories WHERE shop_id = @shop_id AND name = '进口烈酒' LIMIT 1);
+
+INSERT IGNORE INTO products (shop_id, public_id, code, barcode, name, series, spec, unit, category_id, brand,
                      purchase_price, sale_price, min_stock, remark, created_at, updated_at) VALUES
-(1, 1, 'b2c3d4e5-0002-0002-0002-000000000001', 'MT-001',  '6901234567890', '飞天茅台 53度 500ml',   '茅台',   '500ml/瓶', '瓶', 1, '贵州茅台',       2350, 2800, 10, '酱香型白酒，53度，飞天系列',      NOW(), NOW()),
-(2, 1, 'b2c3d4e5-0002-0002-0002-000000000002', 'WLY-001', '6902345678901', '五粮液 52度 500ml',     '五粮液', '500ml/瓶', '瓶', 1, '宜宾五粮液',     950,  1200, 6,  '浓香型白酒，52度，普五系列',      NOW(), NOW()),
-(3, 1, 'b2c3d4e5-0002-0002-0002-000000000003', 'YH-001',  '6903456789012', '洋河梦之蓝 M6 500ml',  '洋河',   '500ml/瓶', '瓶', 1, '江苏洋河',       560,  680,  6,  '浓香型，绵柔苏酒代表',            NOW(), NOW()),
-(4, 1, 'b2c3d4e5-0002-0002-0002-000000000004', 'LZ-001',  '6904567890123', '泸州老窖 特曲 500ml',  '泸州老窖', '500ml/瓶', '瓶', 1, '泸州老窖',    420,  520,  6,  '浓香鼻祖，特曲系列',              NOW(), NOW()),
-(5, 1, 'b2c3d4e5-0002-0002-0002-000000000005', 'JNC-001', '6905678901234', '剑南春 水晶剑 500ml',  '剑南春', '500ml/瓶', '瓶', 1, '剑南春',         390,  480,  6,  '浓香型，绵竹名酒',                NOW(), NOW()),
-(6, 1, 'b2c3d4e5-0002-0002-0002-000000000006', 'LJ-001',  '6906789012345', '郎酒 红花郎10 500ml',  '郎酒',   '500ml/瓶', '瓶', 1, '古蔺郎酒',       320,  420,  6,  '酱香型，赤水河畔酿造',            NOW(), NOW()),
-(7, 1, 'b2c3d4e5-0002-0002-0002-000000000007', 'LF-001',  '3760093550058', '拉菲古堡 2018 750ml',  '波尔多', '750ml/瓶', '瓶', 2, 'Château Lafite', 3800, 5200, 3, '波尔多一级名庄，2018年份',        NOW(), NOW()),
-(8, 1, 'b2c3d4e5-0002-0002-0002-000000000008', 'RTM-001', '3021691010008', '人头马 VSOP 700ml',    '人头马', '700ml/瓶', '瓶', 2, 'Rémy Martin',    480,  680,  3, '法国干邑，VSOP级别',              NOW(), NOW());
+(@shop_id, 'b2c3d4e5-0002-0002-0002-000000000001', 'MT-001',  '6901234567890', '飞天茅台 53度',  '茅台',     '500ml/瓶', '瓶', @cat_baijiu, '贵州茅台',       2350, 2800, 10, '酱香型白酒，53度，飞天系列', NOW(), NOW()),
+(@shop_id, 'b2c3d4e5-0002-0002-0002-000000000002', 'WLY-001', '6902345678901', '五粮液 52度',    '五粮液',   '500ml/瓶', '瓶', @cat_baijiu, '宜宾五粮液',     950,  1200, 6,  '浓香型白酒，52度，普五系列', NOW(), NOW()),
+(@shop_id, 'b2c3d4e5-0002-0002-0002-000000000003', 'YH-001',  '6903456789012', '洋河梦之蓝 M6',  '洋河',     '500ml/瓶', '瓶', @cat_baijiu, '江苏洋河',       560,  680,  6,  '浓香型，绵柔苏酒代表',       NOW(), NOW()),
+(@shop_id, 'b2c3d4e5-0002-0002-0002-000000000004', 'LZ-001',  '6904567890123', '泸州老窖 特曲',  '泸州老窖', '500ml/瓶', '瓶', @cat_baijiu, '泸州老窖',       420,  520,  6,  '浓香鼻祖，特曲系列',         NOW(), NOW()),
+(@shop_id, 'b2c3d4e5-0002-0002-0002-000000000005', 'JNC-001', '6905678901234', '剑南春 水晶剑',  '剑南春',   '500ml/瓶', '瓶', @cat_baijiu, '剑南春',         390,  480,  6,  '浓香型，绵竹名酒',           NOW(), NOW()),
+(@shop_id, 'b2c3d4e5-0002-0002-0002-000000000006', 'LJ-001',  '6906789012345', '郎酒 红花郎10',  '郎酒',     '500ml/瓶', '瓶', @cat_baijiu, '古蔺郎酒',       320,  420,  6,  '酱香型，赤水河畔酿造',       NOW(), NOW()),
+(@shop_id, 'b2c3d4e5-0002-0002-0002-000000000007', 'LF-001',  '3760093550058', '拉菲古堡 2018',  '波尔多',   '750ml/瓶', '瓶', @cat_import, 'Château Lafite', 3800, 5200, 3,  '波尔多一级名庄，2018年份',   NOW(), NOW()),
+(@shop_id, 'b2c3d4e5-0002-0002-0002-000000000008', 'RTM-001', '3021691010008', '人头马 VSOP',    '人头马',   '700ml/瓶', '瓶', @cat_import, 'Rémy Martin',    480,  680,  3,  '法国干邑，VSOP级别',         NOW(), NOW());

 -- ── 往来单位 ────────────────────────────────────────────────
-INSERT INTO partners (id, shop_id, code, name, type, contact, phone, address, bank_account,
+INSERT IGNORE INTO partners (shop_id, code, name, type, contact, phone, address, bank_account,
                      credit_limit, balance, remark, created_at, updated_at) VALUES
-(1, 1, 'SUP001', '贵州茅台酒股份有限公司',   'supplier', '张经理', '0851-22222001', '贵州省仁怀市茅台镇',         '工商银行仁怀支行 6222 0000 0001 0001', 5000000, 0, '茅台系列直供，账期30天',     NOW(), NOW()),
-(2, 1, 'SUP002', '四川五粮液股份有限公司',   'supplier', '王总监', '0831-33333001', '四川省宜宾市翠屏区',         '建设银行宜宾支行 6227 0000 0001 0002', 3000000, 0, '五粮液系列授权经销',         NOW(), NOW()),
-(3, 1, 'SUP003', '江苏洋河酒厂股份有限公司', 'supplier', '赵主任', '0527-44444001', '江苏省宿迁市洋河新区',       '农业银行宿迁支行 6228 0000 0001 0003', 2000000, 0, '洋河梦之蓝系列直供',         NOW(), NOW()),
-(4, 1, 'SUP004', '四川郎酒股份有限公司',     'supplier', '刘经理', '0830-55555001', '四川省古蔺县二郎镇',         '中国银行古蔺支行 6013 0000 0001 0004', 1500000, 0, '郎酒红花郎系列',             NOW(), NOW()),
-(5, 1, 'CUS001', '北京君悦大酒店',           'customer', '李采购', '010-65888001',  '北京市朝阳区建国门外大街2号', '中信银行北京朝阳支行 6217 0000 0002 0001', 500000, 0, '五星级酒店，月结',         NOW(), NOW()),
-(6, 1, 'CUS002', '上海外滩华尔道夫酒店',     'customer', '陈主任', '021-62308001',  '上海市黄浦区中山东一路2号',   '浦发银行上海黄浦支行 6210 0000 0002 0002', 800000, 0, '豪华酒店，按季结算',       NOW(), NOW()),
-(7, 1, 'CUS003', '广州白天鹅宾馆',           'customer', '吴采购', '020-81886001',  '广州市荔湾区沙面南街1号',     '招商银行广州荔湾支行 6225 0000 0002 0003', 300000, 0, '高端宾馆，月结30天',       NOW(), NOW());
+(@shop_id, 'SUP001', '贵州茅台酒股份有限公司',   'supplier', '张经理', '0851-22222001', '贵州省仁怀市茅台镇',         '工商银行仁怀支行 6222 0000 0001 0001', 5000000, 0, '茅台系列直供，账期30天', NOW(), NOW()),
+(@shop_id, 'SUP002', '四川五粮液股份有限公司',   'supplier', '王总监', '0831-33333001', '四川省宜宾市翠屏区',         '建设银行宜宾支行 6227 0000 0001 0002', 3000000, 0, '五粮液系列授权经销',     NOW(), NOW()),
+(@shop_id, 'SUP003', '江苏洋河酒厂股份有限公司', 'supplier', '赵主任', '0527-44444001', '江苏省宿迁市洋河新区',       '农业银行宿迁支行 6228 0000 0001 0003', 2000000, 0, '洋河梦之蓝系列直供',     NOW(), NOW()),
+(@shop_id, 'SUP004', '四川郎酒股份有限公司',     'supplier', '刘经理', '0830-55555001', '四川省古蔺县二郎镇',         '中国银行古蔺支行 6013 0000 0001 0004', 1500000, 0, '郎酒红花郎系列',         NOW(), NOW()),
+(@shop_id, 'CUS001', '上海外滩五号餐厅',         'customer', '林采购', '021-63869001',  '上海市黄浦区外滩5号',         '浦发银行上海黄浦支行 6210 0000 0003 0001', 300000, 0, '高端餐厅，月结',         NOW(), NOW()),
+(@shop_id, 'CUS002', '苏州虎丘山庄度假酒店',     'customer', '周总', '0512-66888001',   '江苏省苏州市虎丘区虎丘路168号', '工商银行苏州支行 6222 0000 0003 0002', 200000, 0, '度假酒店，季结',         NOW(), NOW());

 -- ── 编号规则（序号从 0 开始，无历史单据）──────────────────
-INSERT INTO number_rules (id, shop_id, type, prefix, current_no, date_format, updated_at) VALUES
-(1, 1, 'stock_in',        'RK', 0, 'YYYYMMDD', NOW()),
-(2, 1, 'stock_out',       'CK', 0, 'YYYYMMDD', NOW()),
-(3, 1, 'inventory_check', 'PD', 0, 'YYYYMMDD', NOW());
+INSERT IGNORE INTO number_rules (shop_id, type, prefix, current_no, date_format, updated_at) VALUES
+(@shop_id, 'stock_in',        'RK', 0, 'YYYYMMDD', NOW()),
+(@shop_id, 'stock_out',       'CK', 0, 'YYYYMMDD', NOW()),
+(@shop_id, 'inventory_check', 'PD', 0, 'YYYYMMDD', NOW());

 -- ── 入库单/出库单/库存/流水/财务：均为空 ──────────────────
-- （模拟新门店初始状态，无历史数据）
+-- 模拟新门店初始状态，无历史数据
+
+SET FOREIGN_KEY_CHECKS = 1;
@@ -0,0 +1,32 @@
+-- clear_shop.sql — 清空指定门店的所有业务数据
+-- 用法（调用方负责传入 @shop_code 变量）:
+--   SET @shop_code = 'S001'; SOURCE clear_shop.sql;
+-- 或由脚本拼接:
+--   echo "SET @shop_code='S001';" | cat - clear_shop.sql | mysql ...
+
+SET @sid = (SELECT id FROM shops WHERE BINARY code = BINARY @shop_code LIMIT 1);
+
+SET FOREIGN_KEY_CHECKS = 0;
+
+DELETE FROM inventory_check_items WHERE shop_id = @sid;
+DELETE FROM inventory_checks       WHERE shop_id = @sid;
+DELETE FROM inventory_logs         WHERE shop_id = @sid;
+DELETE FROM inventories            WHERE shop_id = @sid;
+DELETE FROM stock_out_items        WHERE shop_id = @sid;
+DELETE FROM stock_out_orders       WHERE shop_id = @sid;
+DELETE FROM stock_in_items         WHERE shop_id = @sid;
+DELETE FROM stock_in_orders        WHERE shop_id = @sid;
+DELETE FROM finance_records        WHERE shop_id = @sid;
+DELETE FROM number_rules           WHERE shop_id = @sid;
+DELETE FROM product_images         WHERE shop_id = @sid;
+DELETE FROM partners               WHERE shop_id = @sid;
+DELETE FROM warehouses             WHERE shop_id = @sid;
+DELETE FROM product_spec_options   WHERE shop_id = @sid;
+DELETE FROM product_series_options WHERE shop_id = @sid;
+DELETE FROM product_name_options   WHERE shop_id = @sid;
+DELETE FROM products               WHERE shop_id = @sid;
+DELETE FROM product_categories     WHERE shop_id = @sid;
+DELETE FROM users                  WHERE shop_id = @sid;
+DELETE FROM shops                  WHERE id      = @sid;
+
+SET FOREIGN_KEY_CHECKS = 1;
@@ -56,6 +56,7 @@ func SetupTestDB() *gorm.DB {
 			address TEXT,
 			phone TEXT,
 			manager_name TEXT,
+			logo_url TEXT DEFAULT '',
 			business_license TEXT,
 			business_hours TEXT,
 			shop_photos TEXT,
@@ -349,10 +350,7 @@ func hashPassword(plain string) string {
 func CreateTestUser(db *gorm.DB, shopID uint64, username, password, role string) *model.User {
 	hash := hashPassword(password)
 	user := &model.User{
-		TenantBase: model.TenantBase{
-			Base:   model.Base{},
-			ShopID: shopID,
-		},
+		ShopID:       shopID,
 		Username:     username,
 		PasswordHash: hash,
 		RealName:     "Test User " + username,
@@ -5,6 +5,7 @@ class ShopInfo {
  final String address;
  final String phone;
  final String managerName;
+  final String logoUrl;

  const ShopInfo({
    required this.id,
@@ -13,6 +14,7 @@ class ShopInfo {
    required this.address,
    required this.phone,
    required this.managerName,
+    this.logoUrl = '',
  });

  factory ShopInfo.fromJson(Map<String, dynamic> json) => ShopInfo(
@@ -22,5 +24,6 @@ class ShopInfo {
        address: json['address'] as String? ?? '',
        phone: json['phone'] as String? ?? '',
        managerName: json['manager_name'] as String? ?? '',
+        logoUrl: json['logo_url'] as String? ?? '',
      );
 }
@@ -1,4 +1,5 @@
 import 'package:dio/dio.dart';
+import 'package:flutter/foundation.dart';
 import '../core/api/api_client.dart';
 import '../core/exceptions.dart';
 import '../models/shop.dart';
@@ -30,4 +31,19 @@ class ShopRepository {
      );
    }
  }
+
+  Future<String> uploadLogo(Uint8List bytes, String filename) async {
+    try {
+      final formData = FormData.fromMap({
+        'file': MultipartFile.fromBytes(bytes, filename: filename),
+      });
+      final resp = await _client.post('/shop/logo', data: formData);
+      return (resp.data as Map<String, dynamic>)['logo_url'] as String? ?? '';
+    } on DioException catch (e) {
+      throw AppException(
+        e.response?.data?['error'] as String? ?? 'Logo 上传失败',
+        statusCode: e.response?.statusCode,
+      );
+    }
+  }
 }
@@ -99,42 +99,97 @@ class _InventoryListScreenState extends ConsumerState<InventoryListScreen> {
    final file = result.files.first;
    final bytes = file.bytes;
    if (bytes == null) return;
+    if (!context.mounted) return;

    final token = ref.read(authStateProvider).user?.accessToken ?? '';
-    final dio = Dio(BaseOptions(baseUrl: AppConfig.apiBaseUrl));
+    final dio = Dio(BaseOptions(
+      baseUrl: AppConfig.apiBaseUrl,
+      sendTimeout: const Duration(seconds: 120),
+      receiveTimeout: const Duration(seconds: 300),
+    ));
    dio.options.headers['Authorization'] = 'Bearer $token';

-    if (!context.mounted) return;
-    ScaffoldMessenger.of(context).showSnackBar(
-      const SnackBar(content: Text('导入中，请稍候...'), duration: Duration(seconds: 60)),
+    final stateNotifier = ValueNotifier<_ImportState>(
+      const _ImportState(stage: _ImportStage.uploading, uploadPercent: 0),
    );

+    BuildContext? dialogCtx;
+    showDialog(
+      context: context,
+      barrierDismissible: false,
+      builder: (ctx) {
+        dialogCtx = ctx;
+        return PopScope(
+          canPop: false,
+          child: _ImportProgressDialog(stateNotifier: stateNotifier),
+        );
+      },
+    );
+
+    Timer? processingTimer;
+    bool uploadDone = false;
+    int elapsed = 0;
+
+    void closeDialog() {
+      processingTimer?.cancel();
+      if (dialogCtx != null && dialogCtx!.mounted) {
+        Navigator.of(dialogCtx!).pop();
+      }
+    }
+
    try {
      final formData = FormData.fromMap({
        'file': MultipartFile.fromBytes(bytes, filename: file.name),
      });
-      final resp = await dio.post('/import/inventory', data: formData);
-      final data = resp.data as Map<String, dynamic>;
-      final imported = data['imported'] ?? 0;
-      final skipped = data['skipped'] ?? 0;
-      final errors = (data['errors'] as List?)?.cast<String>() ?? [];

-      if (!context.mounted) return;
-      ScaffoldMessenger.of(context).hideCurrentSnackBar();
-      ScaffoldMessenger.of(context).showSnackBar(SnackBar(
-        content: Text('导入完成：$imported 条成功，$skipped 条跳过${errors.isNotEmpty ? '，${errors.length} 条失败' : ''}'),
-        backgroundColor: errors.isEmpty ? Colors.green : AppTheme.accent,
-        duration: const Duration(seconds: 4),
-      ));
-      ref.read(inventoryListProvider.notifier).reload();
+      final resp = await dio.post(
+        '/import/inventory',
+        data: formData,
+        onSendProgress: (sent, total) {
+          if (total <= 0) return;
+          if (sent >= total && !uploadDone) {
+            uploadDone = true;
+            elapsed = 0;
+            stateNotifier.value = const _ImportState(
+              stage: _ImportStage.processing, uploadPercent: 100, processingSeconds: 0,
+            );
+            processingTimer = Timer.periodic(const Duration(seconds: 1), (_) {
+              elapsed++;
+              stateNotifier.value = _ImportState(
+                stage: _ImportStage.processing, uploadPercent: 100, processingSeconds: elapsed,
+              );
+            });
+          } else if (!uploadDone) {
+            final pct = (sent / total * 100).round().clamp(0, 99);
+            stateNotifier.value = _ImportState(stage: _ImportStage.uploading, uploadPercent: pct);
+          }
+        },
+      );
+
+      processingTimer?.cancel();
+      final data = resp.data as Map<String, dynamic>;
+      stateNotifier.value = _ImportState(
+        stage: _ImportStage.done,
+        uploadPercent: 100,
+        total: data['total'] ?? 0,
+        imported: data['imported'] ?? 0,
+        updated: data['updated'] ?? 0,
+        errors: (data['errors'] as List?)?.cast<String>() ?? [],
+      );
+
+      final hasErrors = (data['errors'] as List?)?.isNotEmpty ?? false;
+      if (!hasErrors) {
+        await Future.delayed(const Duration(seconds: 2));
+        closeDialog();
+      }
+      if (context.mounted) ref.read(inventoryListProvider.notifier).reload();
    } on DioException catch (e) {
-      final msg = (e.response?.data is Map ? e.response!.data['error'] : null) ?? e.message ?? '未知错误';
-      if (!context.mounted) return;
-      ScaffoldMessenger.of(context).hideCurrentSnackBar();
-      ScaffoldMessenger.of(context).showSnackBar(SnackBar(
-        content: Text('导入失败：$msg'),
-        backgroundColor: AppTheme.danger,
-      ));
+      processingTimer?.cancel();
+      final msg = (e.response?.data is Map ? e.response!.data['error'] : null)
+          ?? e.message ?? '未知错误';
+      stateNotifier.value = _ImportState(
+        stage: _ImportStage.error, uploadPercent: 0, errorMsg: msg,
+      );
    }
  }

@@ -865,3 +920,163 @@ class _DirectionBadge extends StatelessWidget {
    );
  }
 }
+
+// ── 导入进度对话框 ──────────────────────────────────────────
+
+enum _ImportStage { uploading, processing, done, error }
+
+class _ImportState {
+  final _ImportStage stage;
+  final int uploadPercent;
+  final int processingSeconds;
+  final int total;
+  final int imported;
+  final int updated;
+  final List<String> errors;
+  final String? errorMsg;
+
+  const _ImportState({
+    required this.stage,
+    required this.uploadPercent,
+    this.processingSeconds = 0,
+    this.total = 0,
+    this.imported = 0,
+    this.updated = 0,
+    this.errors = const [],
+    this.errorMsg,
+  });
+}
+
+class _ImportProgressDialog extends StatelessWidget {
+  final ValueNotifier<_ImportState> stateNotifier;
+  const _ImportProgressDialog({required this.stateNotifier});
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: const Text('导入库存'),
+      content: ValueListenableBuilder<_ImportState>(
+        valueListenable: stateNotifier,
+        builder: (_, state, __) => SizedBox(
+          width: 320,
+          child: _buildContent(context, state),
+        ),
+      ),
+      actions: [
+        ValueListenableBuilder<_ImportState>(
+          valueListenable: stateNotifier,
+          builder: (ctx, state, __) {
+            if (state.stage == _ImportStage.done || state.stage == _ImportStage.error) {
+              return TextButton(
+                onPressed: () => Navigator.of(ctx).pop(),
+                child: const Text('关闭'),
+              );
+            }
+            return const SizedBox.shrink();
+          },
+        ),
+      ],
+    );
+  }
+
+  Widget _buildContent(BuildContext context, _ImportState state) {
+    switch (state.stage) {
+      case _ImportStage.uploading:
+        return Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            const Text('上传文件...', style: TextStyle(fontSize: 14)),
+            const SizedBox(height: 12),
+            LinearProgressIndicator(
+              value: state.uploadPercent / 100,
+              backgroundColor: Colors.grey[200],
+              valueColor: AlwaysStoppedAnimation<Color>(AppTheme.primary),
+            ),
+            const SizedBox(height: 6),
+            Text('${state.uploadPercent}%',
+                style: TextStyle(fontSize: 12, color: Colors.grey[600])),
+          ],
+        );
+
+      case _ImportStage.processing:
+        return Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(children: [
+              SizedBox(
+                width: 16, height: 16,
+                child: CircularProgressIndicator(
+                  strokeWidth: 2,
+                  valueColor: AlwaysStoppedAnimation<Color>(AppTheme.primary),
+                ),
+              ),
+              const SizedBox(width: 10),
+              Text(
+                '导入数据中...${state.processingSeconds > 0 ? "（${state.processingSeconds}秒）" : ""}',
+                style: const TextStyle(fontSize: 14),
+              ),
+            ]),
+            const SizedBox(height: 8),
+            LinearProgressIndicator(
+              backgroundColor: Colors.grey[200],
+              valueColor: AlwaysStoppedAnimation<Color>(AppTheme.primary),
+            ),
+          ],
+        );
+
+      case _ImportStage.done:
+        final allFailed = state.total == 0 && state.errors.isNotEmpty;
+        return Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(children: [
+              Icon(
+                allFailed ? Icons.warning_amber_rounded : Icons.check_circle,
+                color: allFailed ? AppTheme.danger : AppTheme.success,
+                size: 20,
+              ),
+              const SizedBox(width: 8),
+              Text(
+                allFailed ? '导入失败' : '导入完成',
+                style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w500),
+              ),
+            ]),
+            const SizedBox(height: 10),
+            Text('共 ${state.total} 行', style: const TextStyle(fontSize: 13)),
+            Text('成功插入：${state.imported} 行', style: const TextStyle(fontSize: 13)),
+            Text('重复更新：${state.updated} 行',
+                style: TextStyle(fontSize: 13, color: Colors.grey[600])),
+            if (state.errors.isNotEmpty)
+              Text('失败：${state.errors.length} 行',
+                  style: TextStyle(fontSize: 13, color: AppTheme.danger)),
+            if (state.errors.isNotEmpty) ...[
+              const SizedBox(height: 6),
+              ...state.errors.map((e) => Padding(
+                padding: const EdgeInsets.only(top: 4),
+                child: Text(e,
+                    style: TextStyle(fontSize: 12, color: AppTheme.danger)),
+              )),
+            ],
+          ],
+        );
+
+      case _ImportStage.error:
+        return Row(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Icon(Icons.error_outline, color: AppTheme.danger, size: 20),
+            const SizedBox(width: 8),
+            Expanded(
+              child: Text(
+                '导入失败：${state.errorMsg}',
+                style: TextStyle(fontSize: 13, color: AppTheme.danger),
+              ),
+            ),
+          ],
+        );
+    }
+  }
+}
@@ -1,3 +1,4 @@
+import 'dart:async';
 import '../../core/utils/dialog_util.dart';
 import 'package:dio/dio.dart';
 import 'package:file_picker/file_picker.dart';
@@ -126,14 +127,24 @@ class _SettingsScreenState extends ConsumerState<SettingsScreen> {
                child: Column(
                  crossAxisAlignment: CrossAxisAlignment.start,
                  children: [
-                    _ShopInfoRow(
-                        label: '门店编号',
-                        value: shop.code.isNotEmpty ? shop.code : '—'),
-                    const Divider(height: 16),
-                    _ShopInfoRow(
-                        label: '门店名称',
-                        value: shop.name.isNotEmpty ? shop.name : '—'),
-                    const Divider(height: 16),
+                    // Logo 预览行
+                    Row(
+                      children: [
+                        _ShopLogoPreview(logoUrl: shop.logoUrl, shopName: shop.name, size: 64),
+                        const SizedBox(width: 16),
+                        Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Text(shop.name.isNotEmpty ? shop.name : '—',
+                                style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w600)),
+                            const SizedBox(height: 4),
+                            Text(shop.code.isNotEmpty ? shop.code : '—',
+                                style: const TextStyle(fontSize: 13, color: AppTheme.textSecondary)),
+                          ],
+                        ),
+                      ],
+                    ),
+                    const Divider(height: 24),
                    _ShopInfoRow(
                        label: '门店地址',
                        value: shop.address.isNotEmpty ? shop.address : '—'),
@@ -1524,10 +1535,23 @@ class _ImportSlot {
  int total = 0;
  int imported = 0;
  int skipped = 0;
+  int updated = 0;
+  // 进度
+  int uploadPercent = 0;
+  bool isProcessing = false;
+  int processingSeconds = 0;

  _ImportSlot(this.title, this.endpoint, this.hint);

  bool get hasResult => success != null;
+
+  void resetProgress() {
+    uploadPercent = 0;
+    isProcessing = false;
+    processingSeconds = 0;
+    success = null;
+    error = null;
+  }
 }

 class _BatchImportWidget extends ConsumerStatefulWidget {
@@ -1657,14 +1681,15 @@ class _BatchImportWidgetState extends ConsumerState<_BatchImportWidget> {
    setState(() {
      _loading = true;
      for (final s in _slots) {
-        if (s.file != null) {
-          s.success = null;
-          s.error = null;
-        }
+        if (s.file != null) s.resetProgress();
      }
    });

-    final dio = Dio(BaseOptions(baseUrl: AppConfig.apiBaseUrl));
+    final dio = Dio(BaseOptions(
+      baseUrl: AppConfig.apiBaseUrl,
+      sendTimeout: const Duration(seconds: 120),
+      receiveTimeout: const Duration(seconds: 300),
+    ));
    dio.options.headers['Authorization'] = 'Bearer $token';

    for (final slot in _slots) {
@@ -1674,29 +1699,57 @@ class _BatchImportWidgetState extends ConsumerState<_BatchImportWidget> {
        if (mounted) setState(() { slot.success = false; slot.error = '无法读取文件'; });
        continue;
      }
+
+      Timer? processingTimer;
+      bool uploadDone = false;
+
      try {
        final formData = FormData.fromMap({
          'file': MultipartFile.fromBytes(bytes, filename: slot.file!.name),
        });
-        final resp = await dio.post(slot.endpoint, data: formData);
+        final resp = await dio.post(
+          slot.endpoint,
+          data: formData,
+          onSendProgress: (sent, total) {
+            if (total <= 0 || !mounted) return;
+            if (sent >= total && !uploadDone) {
+              uploadDone = true;
+              setState(() { slot.isProcessing = true; slot.processingSeconds = 0; });
+              processingTimer = Timer.periodic(const Duration(seconds: 1), (_) {
+                if (!mounted) return;
+                setState(() => slot.processingSeconds++);
+              });
+            } else if (!uploadDone) {
+              final pct = (sent / total * 100).round().clamp(0, 99);
+              if (mounted) setState(() => slot.uploadPercent = pct);
+            }
+          },
+        );
+        processingTimer?.cancel();
        final data = (resp.data is Map) ? resp.data as Map<String, dynamic> : <String, dynamic>{};
        if (mounted) setState(() {
          slot.success = true;
-          slot.total = (data['total'] ?? data['imported'] ?? 0) as int;
          slot.imported = (data['imported'] ?? 0) as int;
          slot.skipped = (data['skipped'] ?? 0) as int;
+          slot.updated = (data['updated'] ?? 0) as int;
+          slot.total = (data['total'] ?? slot.imported + slot.skipped + slot.updated) as int;
+          slot.isProcessing = false;
        });
      } on DioException catch (e) {
+        processingTimer?.cancel();
        final raw = e.response?.data;
        final msg = (raw is Map ? raw['error'] : null) ?? e.message ?? '未知错误';
        if (mounted) setState(() {
          slot.success = false;
          slot.error = msg.toString();
+          slot.isProcessing = false;
        });
      } catch (e) {
+        processingTimer?.cancel();
        if (mounted) setState(() {
          slot.success = false;
          slot.error = e.toString();
+          slot.isProcessing = false;
        });
      }
    }
@@ -2017,10 +2070,11 @@ class _BatchImportWidgetState extends ConsumerState<_BatchImportWidget> {
    Widget? statusWidget;
    if (slot.hasResult) {
      if (slot.success == true) {
+        final duplicate = slot.skipped + slot.updated;
        final parts = <String>[
          '共 ${slot.total} 条',
          '新增 ${slot.imported} 条',
-          if (slot.skipped > 0) '重复跳过 ${slot.skipped} 条',
+          if (duplicate > 0) '重复 $duplicate 条',
        ];
        statusWidget = Row(
          mainAxisSize: MainAxisSize.min,
@@ -2047,10 +2101,42 @@ class _BatchImportWidgetState extends ConsumerState<_BatchImportWidget> {
        );
      }
    } else if (_loading && slot.file != null) {
-      statusWidget = const SizedBox(
-        width: 14, height: 14,
-        child: CircularProgressIndicator(strokeWidth: 2),
-      );
+      if (slot.isProcessing) {
+        statusWidget = Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            SizedBox(
+              width: 12, height: 12,
+              child: CircularProgressIndicator(strokeWidth: 2, color: AppTheme.primary),
+            ),
+            const SizedBox(width: 6),
+            Text(
+              '导入数据${slot.processingSeconds > 0 ? "（${slot.processingSeconds}秒）" : ""}',
+              style: const TextStyle(fontSize: 13, color: AppTheme.textSecondary),
+            ),
+          ],
+        );
+      } else {
+        statusWidget = Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            SizedBox(
+              width: 80,
+              child: LinearProgressIndicator(
+                value: slot.uploadPercent / 100,
+                backgroundColor: Colors.grey[200],
+                valueColor: AlwaysStoppedAnimation<Color>(AppTheme.primary),
+                minHeight: 6,
+              ),
+            ),
+            const SizedBox(width: 6),
+            Text(
+              '上传 ${slot.uploadPercent}%',
+              style: const TextStyle(fontSize: 12, color: AppTheme.textSecondary),
+            ),
+          ],
+        );
+      }
    }

    return Padding(
@@ -2104,6 +2190,54 @@ class _BatchImportWidgetState extends ConsumerState<_BatchImportWidget> {
  }
 }

+// ── 门店 Logo 预览 ────────────────────────────────────────
+class _ShopLogoPreview extends StatelessWidget {
+  final String logoUrl;
+  final String shopName;
+  final double size;
+  const _ShopLogoPreview({required this.logoUrl, required this.shopName, this.size = 64});
+
+  @override
+  Widget build(BuildContext context) {
+    final radius = BorderRadius.circular(size * 0.19);
+    if (logoUrl.isNotEmpty) {
+      final fullUrl = logoUrl.startsWith('http') ? logoUrl : '${AppConfig.apiBaseUrl.replaceAll('/api/v1', '')}$logoUrl';
+      return ClipRRect(
+        borderRadius: radius,
+        child: Image.network(
+          fullUrl,
+          width: size,
+          height: size,
+          fit: BoxFit.cover,
+          errorBuilder: (_, __, ___) => _initial(radius),
+        ),
+      );
+    }
+    return _initial(radius);
+  }
+
+  Widget _initial(BorderRadius radius) {
+    final initial = shopName.isNotEmpty ? shopName.characters.first : '店';
+    return Container(
+      width: size,
+      height: size,
+      decoration: BoxDecoration(
+        color: const Color(0xFF0F3057),
+        borderRadius: radius,
+      ),
+      alignment: Alignment.center,
+      child: Text(
+        initial,
+        style: TextStyle(
+          color: Colors.white,
+          fontSize: size * 0.5,
+          fontWeight: FontWeight.w600,
+        ),
+      ),
+    );
+  }
+}
+
 // ── 酒行信息行 ────────────────────────────────────────────
 class _ShopInfoRow extends StatelessWidget {
  final String label;
@@ -2149,6 +2283,7 @@ class _ShopEditDialogState extends ConsumerState<_ShopEditDialog> {
  late final TextEditingController _phoneCtrl;
  late final TextEditingController _managerCtrl;
  bool _saving = false;
+  bool _uploadingLogo = false;

  @override
  void initState() {
@@ -2168,6 +2303,37 @@ class _ShopEditDialogState extends ConsumerState<_ShopEditDialog> {
    super.dispose();
  }

+  Future<void> _uploadLogo() async {
+    final result = await FilePicker.platform.pickFiles(
+      type: FileType.custom,
+      allowedExtensions: ['jpg', 'jpeg', 'png'],
+      withData: true,
+    );
+    if (result == null || result.files.isEmpty) return;
+    final file = result.files.first;
+    if (file.bytes == null) return;
+    setState(() => _uploadingLogo = true);
+    try {
+      await ref.read(shopRepositoryProvider).uploadLogo(file.bytes!, file.name);
+      ref.invalidate(shopInfoProvider);
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(const SnackBar(
+          content: Text('Logo 已更新'),
+          backgroundColor: AppTheme.success,
+        ));
+      }
+    } catch (e) {
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+          content: Text('上传失败：$e'),
+          backgroundColor: AppTheme.danger,
+        ));
+      }
+    } finally {
+      if (mounted) setState(() => _uploadingLogo = false);
+    }
+  }
+
  Future<void> _save() async {
    setState(() => _saving = true);
    try {
@@ -2206,6 +2372,25 @@ class _ShopEditDialogState extends ConsumerState<_ShopEditDialog> {
        child: Column(
          mainAxisSize: MainAxisSize.min,
          children: [
+            // Logo 上传行
+            Row(
+              children: [
+                _ShopLogoPreview(
+                  logoUrl: ref.watch(shopInfoProvider).valueOrNull?.logoUrl ?? widget.shop.logoUrl,
+                  shopName: _nameCtrl.text,
+                  size: 56,
+                ),
+                const SizedBox(width: 12),
+                OutlinedButton.icon(
+                  onPressed: _uploadingLogo ? null : _uploadLogo,
+                  icon: _uploadingLogo
+                      ? const SizedBox(width: 14, height: 14, child: CircularProgressIndicator(strokeWidth: 2))
+                      : const Icon(Icons.upload_outlined, size: 16),
+                  label: const Text('更换 Logo'),
+                ),
+              ],
+            ),
+            const SizedBox(height: 16),
            TextField(
              controller: _nameCtrl,
              decoration: const InputDecoration(labelText: '门店名称'),
@@ -5,8 +5,10 @@ import 'package:go_router/go_router.dart';
 import 'package:intl/intl.dart';
 import 'dart:async';
 import '../../core/auth/auth_state.dart';
+import '../../core/config/app_config.dart';
 import '../../core/theme/app_theme.dart';
 import '../../providers/connectivity_provider.dart';
+import '../../providers/shop_provider.dart';
 import '../../providers/update_provider.dart';

 class AppShell extends ConsumerStatefulWidget {
@@ -575,27 +577,31 @@ void _showShopPanel(BuildContext context, AuthUser u, {String version = 'v1.0.0'
    );
 }

-class _ShopButton extends StatelessWidget {
+class _ShopButton extends ConsumerWidget {
  final AuthUser? user;
  final String version;
  const _ShopButton({this.user, this.version = 'v1.0.0'});

  @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
+    final shopAsync = ref.watch(shopInfoProvider);
+    final shopName = shopAsync.valueOrNull?.name ?? user?.shopNo ?? '';
+    final logoUrl = shopAsync.valueOrNull?.logoUrl ?? '';
+
    return MouseRegion(
      cursor: SystemMouseCursors.click,
      child: GestureDetector(
        onTap: () {
          if (user != null) _showShopPanel(context, user!, version: version);
        },
-        child: const Row(
+        child: Row(
          mainAxisSize: MainAxisSize.min,
          children: [
-            _YanmeiMark(size: 28),
-            SizedBox(width: 10),
+            _ShopLogo(logoUrl: logoUrl, shopName: shopName, size: 28),
+            const SizedBox(width: 10),
            Text(
-              '岩美',
-              style: TextStyle(
+              shopName.isEmpty ? '—' : shopName,
+              style: const TextStyle(
                  color: Colors.white,
                  fontSize: 18,
                  fontWeight: FontWeight.w600,
@@ -608,70 +614,54 @@ class _ShopButton extends StatelessWidget {
  }
 }

-/// Brand mark widget — approximates the 岩美 logo SVG without flutter_svg.
-/// Dark blue rounded rect, white mountain/wave strokes, bordeaux dot.
-class _YanmeiMark extends StatelessWidget {
+/// 门店 Logo：有图片显示网络图片，无图片显示店名首字文字头像。
+class _ShopLogo extends StatelessWidget {
+  final String logoUrl;
+  final String shopName;
  final double size;
-  const _YanmeiMark({this.size = 32});
+  const _ShopLogo({required this.logoUrl, required this.shopName, this.size = 32});

  @override
  Widget build(BuildContext context) {
+    final radius = BorderRadius.circular(size * 0.19);
+    if (logoUrl.isNotEmpty) {
+      final fullUrl = logoUrl.startsWith('http') ? logoUrl : '${AppConfig.apiBaseUrl.replaceAll('/api/v1', '')}$logoUrl';
+      return ClipRRect(
+        borderRadius: radius,
+        child: Image.network(
+          fullUrl,
+          width: size,
+          height: size,
+          fit: BoxFit.cover,
+          errorBuilder: (_, __, ___) => _initial(radius),
+        ),
+      );
+    }
+    return _initial(radius);
+  }
+
+  Widget _initial(BorderRadius radius) {
+    final initial = shopName.isNotEmpty ? shopName.characters.first : '店';
    return Container(
      width: size,
      height: size,
      decoration: BoxDecoration(
        color: const Color(0xFF0F3057),
-        borderRadius: BorderRadius.circular(size * 0.19),
+        borderRadius: radius,
      ),
-      child: CustomPaint(
-        painter: _YanmeiMarkPainter(),
+      alignment: Alignment.center,
+      child: Text(
+        initial,
+        style: TextStyle(
+          color: Colors.white,
+          fontSize: size * 0.5,
+          fontWeight: FontWeight.w600,
+        ),
      ),
    );
  }
 }

-class _YanmeiMarkPainter extends CustomPainter {
-  @override
-  void paint(Canvas canvas, Size size) {
-    final w = size.width;
-    final h = size.height;
-    final paint = Paint()
-      ..color = Colors.white
-      ..strokeWidth = w * 0.055
-      ..style = PaintingStyle.stroke
-      ..strokeCap = StrokeCap.round
-      ..strokeJoin = StrokeJoin.round;
-
-    // Mountain/wave path: M14 38 L22 22 L32 32 L42 22 L50 38 (on 64px grid)
-    final path = Path();
-    path.moveTo(w * 0.219, h * 0.594);
-    path.lineTo(w * 0.344, h * 0.344);
-    path.lineTo(w * 0.500, h * 0.500);
-    path.lineTo(w * 0.656, h * 0.344);
-    path.lineTo(w * 0.781, h * 0.594);
-    canvas.drawPath(path, paint);
-
-    // Horizontal baseline: M12 46 L52 46 (on 64px grid)
-    canvas.drawLine(
-      Offset(w * 0.1875, h * 0.719),
-      Offset(w * 0.8125, h * 0.719),
-      paint,
-    );
-
-    // Bordeaux dot: circle cx=32 cy=52 r=2.4 (on 64px grid)
-    canvas.drawCircle(
-      Offset(w * 0.500, h * 0.859),
-      w * 0.042,
-      Paint()
-        ..color = const Color(0xFFC97B86)
-        ..style = PaintingStyle.fill,
-    );
-  }
-
-  @override
-  bool shouldRepaint(covariant CustomPainter oldDelegate) => false;
-}
-
 class _InfoRow extends StatelessWidget {
  final IconData icon;
  final String label;
@@ -7,6 +7,8 @@ server {
    ssl_protocols       TLSv1.2 TLSv1.3;
    ssl_ciphers         HIGH:!aNULL:!MD5;

+    client_max_body_size 20m;
+
    # 商品图片静态文件
    location ^~ /images/ {
        alias /opt/jiu/images/;
@@ -14,6 +16,14 @@ server {
        add_header Cache-Control "public, immutable";
    }

+    # 文件导入接口（超时更长）
+    location ~ ^/api/v1/import/ {
+        proxy_pass         http://127.0.0.1:8080;
+        proxy_set_header   Host $host;
+        proxy_set_header   X-Real-IP $remote_addr;
+        proxy_read_timeout 300s;
+    }
+
    # API 反向代理
    location ~ ^/(api|health|version) {
        proxy_pass         http://127.0.0.1:8080;
@@ -22,44 +32,23 @@ server {
        proxy_read_timeout 30s;
    }

-    # Flutter 管理端（/app/ 子路径）
+    # Flutter 管理端（仅 /app/ 前缀，不污染根路径）
    location /app/ {
        alias /opt/jiu/web/;
        index index.html;
        try_files $uri $uri/ /app/index.html;
    }

-    # Flutter 公开商品扫码页（/product/:id → Flutter app）
-    location /product/ {
-        alias /opt/jiu/web/;
-        try_files $uri /app/index.html;
-    }
-
-    # 营销站点 — 精确路径
-    location = / {
-        root /opt/jiu/marketing;
-        try_files /index.html =404;
-    }
-    location ~ ^/(docs|download)(\.html)?$ {
-        root /opt/jiu/marketing;
-        try_files /$1.html =404;
-    }
-    location /features/ {
-        root /opt/jiu/marketing;
-        try_files $uri $uri.html =404;
-    }
-
-    # 营销站点 — 扫码 HTML 页（保留旧链接兼容）
+    # 扫码页（/scan/<id> → scan.html，JS 从 URL 读取 id）
    location /scan/ {
        root /opt/jiu/marketing;
        try_files /scan.html =404;
    }

-    # 营销静态资源（CSS / SVG / 图片等）
-    location /assets/ {
+    # 营销站点兜底（根路径及所有其他路径）
+    location / {
        root /opt/jiu/marketing;
-        expires 7d;
-        add_header Cache-Control "public";
+        try_files $uri $uri.html $uri/index.html /index.html;
    }
 }

@@ -36,12 +36,22 @@ WEB_PID_FILE="$LOG_DIR/web.pid"
 mkdir -p "$LOG_DIR"

 # ── seed 命令 ────────────────────────────────────────────────
-# 用法: cmd_seed <shop_code>
-# 从 backend/config/config.yaml 读取 DSN，执行 backend/seeds/<shop>.sql
+# 用法: cmd_seed [--clear] <shop_code>
+# 从 docker-compose.yml 读取容器信息，执行 backend/seeds/<shop>.sql
+# --clear: 写入前先清空该门店所有数据
 cmd_seed() {
-  local shop="${1:-}"
+  local clear=false
+  local shop=""
+  while [ $# -gt 0 ]; do
+    case "$1" in
+      --clear) clear=true ;;
+      *) shop="$1" ;;
+    esac
+    shift
+  done
+
  if [ -z "$shop" ]; then
-    error "用法: sh scripts/dev.sh seed <shop_code>   示例: sh scripts/dev.sh seed H001"
+    error "用法: sh scripts/dev.sh seed [--clear] <shop_code>   示例: sh scripts/dev.sh seed S001"
    exit 1
  fi

@@ -64,6 +74,17 @@ cmd_seed() {
    exit 1
  fi

+  if [ "$clear" = "true" ]; then
+    local clear_file="$ROOT/backend/seeds/clear_shop.sql"
+    if [ ! -f "$clear_file" ]; then
+      error "清空脚本不存在: $clear_file"
+      exit 1
+    fi
+    info "清空 ${shop} 数据 → 容器 ${container} / ${db_name}"
+    { printf "SET @shop_code='%s';\n" "$shop"; cat "$clear_file"; } \
+      | docker exec -i "$container" mysql --default-character-set=utf8mb4 -uroot -p"$db_pass" "$db_name"
+  fi
+
  info "写入 ${shop} 种子数据 → 容器 ${container} / ${db_name}"
  docker exec -i "$container" mysql --default-character-set=utf8mb4 -uroot -p"$db_pass" "$db_name" < "$sql_file"
  success "✅ ${shop} 种子数据写入完成"
@@ -107,7 +128,8 @@ show_help() {
  echo "  --web-only             仅启动前端（Web）"
  echo ""
  echo "数据库命令："
-  echo "  seed <shop_code>       清空并写入指定门店测试数据（如 H001）"
+  echo "  seed <shop_code>       写入指定门店测试数据（如 S001）"
+  echo "  seed --clear <shop>    先清空再写入（单店）"
  echo "  reset                  删表重建（AutoMigrate）"
  echo "  clear                  清空所有业务数据"
  echo ""
@@ -135,7 +157,7 @@ case "$COMMAND" in
    esac
    ;;
  seed)
-    cmd_seed "${2:-}"
+    cmd_seed "${2:-}" "${3:-}"
    exit 0
    ;;
  reset)
Author	SHA1	Message	Date
wangjia	fbb4f90ebd	fix(test): shops 测试表补加 logo_url 列 Deploy / deploy (push) Successful in 1m15s Details Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-24 20:15:39 +08:00
wangjia	a05f9bd4ec	feat(shop): 门店 logo 上传 + 侧边栏品牌替换 Deploy / deploy (push) Failing after 8s Details - shops 表新增 logo_url 字段，AutoMigrate 自动建列 - 后端新增 POST /api/v1/shop/logo 接口（管理员），图片裁剪为 256×256 JPEG 存储 - UpdateInfo 支持传入 logo_url - 侧边栏「岩美」替换为门店真实名称 + 自定义 logo - 无 logo 时显示店名首字文字头像（深蓝底白字） - 设置页「酒行信息」展示 logo 预览，编辑弹窗新增「更换 Logo」上传按钮 - 修复库存导入计数逻辑：total/imported/updated/errors 四项分别统计 - 库存导入去重改为双路索引（编号 + 名称\|系列\|规格），避免 key 不一致误判新增 - settings 页导入结果统一显示「重复 X 条」，兼容 skipped 和 updated 两个字段 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-24 20:03:43 +08:00
wangjia	831dbc5959	fix(import): 库存列头动态识别 + 格式不匹配诊断信息 Deploy / deploy (push) Failing after 59s Details 商品名称/编号/系列/规格/单位列索引从固定 0-4 改为从表头动态识别，支持更多列名变体（品名/名称/货品名称/编码等）。全部跳过时在 errors 中返回识别到的表头，便于诊断列格式问题。 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-24 15:45:39 +08:00
wangjia	d5dc499c6b	fix(import): 修复导入 504 超时 + 添加上传进度显示 Deploy / deploy (push) Successful in 1m15s Details nginx: - 新增 /api/v1/import/ 专属 location，proxy_read_timeout 延长至 300s 后端: - ImportInventory 预加载商品/仓库/库存（3 次 bulk query 替代 N+1） - 批量写 inventory_log（CreateInBatches 替代逐行 Create）前端: - settings 导入行：显示"上传 XX%"进度条和"导入数据（Ns）"计时 - Dio 超时设置为 send=120s / receive=300s Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-24 15:12:59 +08:00
wangjia	5725e84971	fix(nginx): 增加上传文件大小限制至 20MB Deploy / deploy (push) Successful in 1m16s Details 默认 1MB 导致 Excel 文件上传返回 413。 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-24 15:03:21 +08:00
wangjia	86baaf3a1c	fix(model): users 唯一索引改为 (shop_id, username) 复合索引 Deploy / deploy (push) Successful in 1m13s Details 原来 uniqueIndex:uk_shop_username 只在 Username 字段上，导致用户名全局唯一。 S002/S003 的 admin 用户与 S001 冲突，INSERT 被静默跳过，无法登录。将 User 的 TenantBase 改为直接定义 ShopID，使其参与复合唯一索引。需要 Reset DB 使新索引生效。 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-24 14:50:34 +08:00
wangjia	fcf92675b1	fix(seeds): 修复 clear_shop.sql collation 冲突 Deploy / deploy (push) Successful in 1m13s Details 用 BINARY 比较绕过 utf8mb4_unicode_ci 与 utf8mb4_0900_ai_ci 的冲突。 shop code 均为纯 ASCII，BINARY 比较结果完全一致。 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-24 14:34:14 +08:00
wangjia	d81b2d1fac	fix(seed.yml): 两步走避免 S001 因 id 冲突被跳过 Deploy / deploy (push) Successful in 1m17s Details 清空和写入分两个独立循环：先清空所有门店，再依次写入。避免 S001(硬编码 id=1) 在 S002 尚未清除时被 INSERT IGNORE 跳过。 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-24 14:30:46 +08:00
wangjia	acf2b22201	fix(seeds): 修复多门店种子数据互不干扰 Deploy / deploy (push) Successful in 1m14s Details - S001.sql: 修复 INSERT IGNORE INTO 缺少空格的语法错误 - S002.sql: 重写为动态 @shop_id 模式，移除 TRUNCATE，改用 INSERT IGNORE INTO - clear_shop.sql: 新增按 @shop_code 清空单店数据的参数化脚本 - scripts/dev.sh: seed 命令支持 --clear 参数（先清空再写入） - seed.yml: 新增 clear 输入参数，支持按需清空后写入 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-24 13:52:47 +08:00
wangjia	8adb94a9a4	fix(deploy): 修复多 shop seed 互相 TRUNCATE 问题 + 补 utf8mb4 charset Deploy / deploy (push) Successful in 1m12s Details Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-24 13:41:34 +08:00
wangjia	a6e0edbc00	chore(deploy): 新增 debug-db workflow，查询线上数据库内容 Deploy / deploy (push) Successful in 1m14s Details Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-24 13:19:38 +08:00
wangjia	2b180be926	chore(deploy): 新增 reset-db workflow，清库重建表结构并写入 seed 数据 Deploy / deploy (push) Successful in 1m16s Details Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-24 12:58:34 +08:00
wangjia	1bf1f7563f	chore(deploy): 新增 seed workflow，支持手动触发写入门店测试数据 Deploy / deploy (push) Successful in 1m13s Details Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-24 12:51:08 +08:00
wangjia	988a941b41	chore(deploy): 简化 nginx 路由 + 自动部署 nginx config + 删除 .github workflows Deploy / deploy (push) Successful in 1m16s Details - nginx: /app/ → Flutter，/ 兜底 → 营销站，移除零散 location 块 - deploy.yml: 每次部署自动 scp nginx-jiu.conf 到服务器并 nginx -t reload - deploy.yml: Release 附件新增 configs.tar.gz（nginx/systemd/compose 配置） - 删除 .github/workflows/（已全部迁移到 .gitea/） Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-24 12:44:50 +08:00