feat: 按允许店铺筛选顺运宝同步 (#196)

admin/repository/syb.go

@@ -10,10 +10,86 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/go-sql-driver/mysql"
+
 	"cmautobuy/admin/model"
 	"cmautobuy/admin/spec"
 )
 
+var ErrSybAllowedShopExists = errors.New("顺运宝允许店铺已经存在")
+
+// ListSybAllowedShops 返回全部准入项；管理页需要同时看到已停用项。
+func ListSybAllowedShops(q Execer) ([]model.SybAllowedShop, error) {
+	rows, err := q.Query(`SELECT shop_id,shop_name,normalized_name,enabled,created_by_user_id,created_at,updated_at
+		FROM syb_allowed_shops ORDER BY enabled DESC,normalized_name`)
+	if err != nil {
+		return nil, fmt.Errorf("查询顺运宝允许店铺失败: %w", err)
+	}
+	defer rows.Close()
+	var result []model.SybAllowedShop
+	for rows.Next() {
+		var item model.SybAllowedShop
+		var enabled int
+		if err := rows.Scan(&item.ShopID, &item.ShopName, &item.NormalizedName, &enabled,
+			&item.CreatedByUserID, &item.CreatedAt, &item.UpdatedAt); err != nil {
+			return nil, fmt.Errorf("读取顺运宝允许店铺失败: %w", err)
+		}
+		item.Enabled = enabled == 1
+		result = append(result, item)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, fmt.Errorf("读取顺运宝允许店铺失败: %w", err)
+	}
+	return result, nil
+}
+
+func ListEnabledSybShopNames(q Execer) ([]string, error) {
+	rows, err := q.Query(`SELECT normalized_name FROM syb_allowed_shops WHERE enabled=1 ORDER BY normalized_name`)
+	if err != nil {
+		return nil, fmt.Errorf("查询启用的顺运宝店铺失败: %w", err)
+	}
+	defer rows.Close()
+	var names []string
+	for rows.Next() {
+		var name string
+		if err := rows.Scan(&name); err != nil {
+			return nil, fmt.Errorf("读取启用的顺运宝店铺失败: %w", err)
+		}
+		names = append(names, name)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, fmt.Errorf("读取启用的顺运宝店铺失败: %w", err)
+	}
+	return names, nil
+}
+
+func InsertSybAllowedShop(q Execer, item model.SybAllowedShop) error {
+	_, err := q.Exec(`INSERT INTO syb_allowed_shops
+		(shop_id,shop_name,normalized_name,enabled,created_by_user_id,created_at,updated_at)
+		VALUES(?,?,?,?,?,?,?)`, item.ShopID, item.ShopName, item.NormalizedName, item.Enabled,
+		item.CreatedByUserID, item.CreatedAt, item.UpdatedAt)
+	if err != nil {
+		var mysqlErr *mysql.MySQLError
+		if errors.As(err, &mysqlErr) && mysqlErr.Number == 1062 {
+			return ErrSybAllowedShopExists
+		}
+		return fmt.Errorf("新增顺运宝允许店铺失败: %w", err)
+	}
+	return nil
+}
+
+func SetSybAllowedShopEnabled(q Execer, shopID string, enabled bool, updatedAt string) (bool, error) {
+	result, err := q.Exec(`UPDATE syb_allowed_shops SET enabled=?,updated_at=? WHERE shop_id=?`, enabled, updatedAt, shopID)
+	if err != nil {
+		return false, fmt.Errorf("更新顺运宝允许店铺失败: %w", err)
+	}
+	affected, err := result.RowsAffected()
+	if err != nil {
+		return false, fmt.Errorf("确认顺运宝允许店铺更新结果失败: %w", err)
+	}
+	return affected == 1, nil
+}
+
 // ---------- 会话缓存 ----------
 
 // SaveSybSession 写入或更新顺运宝登录会话缓存（按用户名 upsert）。
@@ -139,11 +215,13 @@ func FinishSybSyncRun(q Execer, run model.SybSyncRun) error {
 	}
 	result, err := q.Exec(`
 		UPDATE syb_sync_runs
-		   SET status = ?, stock_count = ?, detail_count = ?, created_count = ?,
+		   SET status = ?, stock_count = ?, accepted_stock_count = ?, shop_skipped_count = ?,
+		       shop_filter_hash = ?, detail_count = ?, created_count = ?,
 		       updated_count = ?, skipped_count = ?, error_message = ?,
 		       cursor_advanced = ?, finished_at = ?
 		 WHERE run_id = ? AND status = 'running'`,
-		run.Status, run.StockCount, run.DetailCount, run.Created, run.Updated, run.Skipped,
+		run.Status, run.StockCount, run.AcceptedCount, run.ShopSkipped, nullableText(run.ShopFilterHash),
+		run.DetailCount, run.Created, run.Updated, run.Skipped,
 		nullableText(run.ErrorMessage), run.CursorAdvanced, run.FinishedAt, run.RunID)
 	if err != nil {
 		return fmt.Errorf("完成顺运宝同步记录失败: %w", err)
@@ -179,7 +257,8 @@ func InterruptRunningSybSyncRuns(q Execer, finishedAt string) (int, error) {
 func ListSybSyncRuns(q Execer, limit, offset int) ([]model.SybSyncRun, error) {
 	rows, err := q.Query(`
 		SELECT r.run_id, r.user_id, u.username, r.date_from, r.date_to, r.status,
-		       r.stock_count, r.detail_count, r.created_count, r.updated_count,
+		       r.stock_count, r.accepted_stock_count, r.shop_skipped_count, r.shop_filter_hash,
+		       r.detail_count, r.created_count, r.updated_count,
 		       r.skipped_count, r.error_message, r.cursor_advanced,
 		       r.started_at, r.finished_at
 		  FROM syb_sync_runs r
@@ -194,14 +273,16 @@ func ListSybSyncRuns(q Execer, limit, offset int) ([]model.SybSyncRun, error) {
 	var list []model.SybSyncRun
 	for rows.Next() {
 		var run model.SybSyncRun
-		var errorMessage, finishedAt sql.NullString
+		var errorMessage, finishedAt, shopFilterHash sql.NullString
 		var cursorAdvanced int
 		if err := rows.Scan(&run.RunID, &run.UserID, &run.Username, &run.DateFrom, &run.DateTo,
-			&run.Status, &run.StockCount, &run.DetailCount, &run.Created, &run.Updated,
+			&run.Status, &run.StockCount, &run.AcceptedCount, &run.ShopSkipped, &shopFilterHash,
+			&run.DetailCount, &run.Created, &run.Updated,
 			&run.Skipped, &errorMessage, &cursorAdvanced, &run.StartedAt, &finishedAt); err != nil {
 			return nil, fmt.Errorf("读取顺运宝同步记录失败: %w", err)
 		}
 		run.ErrorMessage = errorMessage.String
+		run.ShopFilterHash = shopFilterHash.String
 		run.CursorAdvanced = cursorAdvanced == 1
 		run.FinishedAt = finishedAt.String
 		list = append(list, run)