wangjia/jiu
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 130 Wiki Activity

fix(backend): JWT config mapstructure tag 修复 + 模型从 hotel 重构为 shop

Browse Source 
- 修复 JWTConfig 缺少 mapstructure tag 导致 access_expire_min 解析为 0，
  token 签发即过期，所有 API 请求返回 401
- 全部 config struct 补齐 mapstructure tag（secret/dsn/hmac_secret 等）
- 模型层从 hotel/HotelID 统一重命名为 shop/ShopID
- 删除旧 migrations（001-004），新增 001_init 综合迁移文件
- 更新 schema.sql、testutil、handler/service/model 相关引用

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
wangjia
2026-04-07 22:20:12 +08:00
parent 37112d6599
commit 31ea370cea
50 changed files with 2675 additions and 951 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/handler/stock_in.go
+14 -14
View File
@@ -29,12 +29,12 @@ func NewStockInHandler(db *gorm.DB, svc *service.StockService) *StockInHandler {
// List GET /api/v1/stock-in/orders
func (h *StockInHandler) List(c *gin.Context) {
hotelID := middleware.GetHotelID(c)
shopID := middleware.GetShopID(c)
page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
pageSize, _ := strconv.Atoi(c.DefaultQuery("page_size", "20"))
query := h.db.Model(&model.StockInOrder{}).
Where("hotel_id = ? AND deleted_at IS NULL", hotelID)
Where("shop_id = ? AND deleted_at IS NULL", shopID)
if status := c.Query("status"); status != "" {
query = query.Where("status = ?", status)
@@ -59,10 +59,10 @@ func (h *StockInHandler) List(c *gin.Context) {
// Get GET /api/v1/stock-in/orders/:id
func (h *StockInHandler) Get(c *gin.Context) {
hotelID := middleware.GetHotelID(c)
shopID := middleware.GetShopID(c)
var order model.StockInOrder
if err := h.db.Preload("Items.Product").Preload("Warehouse").Preload("Partner").
Where("id = ? AND hotel_id = ? AND deleted_at IS NULL", c.Param("id"), hotelID).
Where("id = ? AND shop_id = ? AND deleted_at IS NULL", c.Param("id"), shopID).
First(&order).Error; err != nil {
c.JSON(http.StatusNotFound, gin.H{"error": "not found"})
return
@@ -72,7 +72,7 @@ func (h *StockInHandler) Get(c *gin.Context) {
// Create POST /api/v1/stock-in/orders
func (h *StockInHandler) Create(c *gin.Context) {
hotelID := middleware.GetHotelID(c)
shopID := middleware.GetShopID(c)
operatorID := middleware.GetUserID(c)
var req model.StockInOrder
@@ -81,12 +81,12 @@ func (h *StockInHandler) Create(c *gin.Context) {
return
}
req.HotelID = hotelID
req.ShopID = shopID
req.OperatorID = operatorID
req.Status = "draft"
// 生成单号
orderNo, err := h.stockSvc.GenerateOrderNo(hotelID, "stock_in")
orderNo, err := h.stockSvc.GenerateOrderNo(shopID, "stock_in")
if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
@@ -96,7 +96,7 @@ func (h *StockInHandler) Create(c *gin.Context) {
// 计算总金额
var total float64
for i := range req.Items {
req.Items[i].HotelID = hotelID
req.Items[i].ShopID = shopID
req.Items[i].TotalPrice = req.Items[i].Quantity * req.Items[i].UnitPrice
total += req.Items[i].TotalPrice
}
@@ -111,9 +111,9 @@ func (h *StockInHandler) Create(c *gin.Context) {
// Submit PUT /api/v1/stock-in/orders/:id/submit （草稿→待审核）
func (h *StockInHandler) Submit(c *gin.Context) {
hotelID := middleware.GetHotelID(c)
shopID := middleware.GetShopID(c)
result := h.db.Model(&model.StockInOrder{}).
Where("id = ? AND hotel_id = ? AND status = 'draft'", c.Param("id"), hotelID).
Where("id = ? AND shop_id = ? AND status = 'draft'", c.Param("id"), shopID).
Update("status", "pending")
if result.RowsAffected == 0 {
c.JSON(http.StatusBadRequest, gin.H{"error": "order not found or not in draft status"})
@@ -124,11 +124,11 @@ func (h *StockInHandler) Submit(c *gin.Context) {
// Approve PUT /api/v1/stock-in/orders/:id/approve
func (h *StockInHandler) Approve(c *gin.Context) {
hotelID := middleware.GetHotelID(c)
shopID := middleware.GetShopID(c)
reviewerID := middleware.GetUserID(c)
id, _ := strconv.ParseUint(c.Param("id"), 10, 64)
if err := h.stockSvc.ApproveStockIn(hotelID, id, reviewerID); err != nil {
if err := h.stockSvc.ApproveStockIn(shopID, id, reviewerID); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
}
@@ -137,12 +137,12 @@ func (h *StockInHandler) Approve(c *gin.Context) {
// Reject PUT /api/v1/stock-in/orders/:id/reject
func (h *StockInHandler) Reject(c *gin.Context) {
hotelID := middleware.GetHotelID(c)
shopID := middleware.GetShopID(c)
reviewerID := middleware.GetUserID(c)
now := timeNow()
result := h.db.Model(&model.StockInOrder{}).
Where("id = ? AND hotel_id = ? AND status = 'pending'", c.Param("id"), hotelID).
Where("id = ? AND shop_id = ? AND status = 'pending'", c.Param("id"), shopID).
Updates(map[string]interface{}{
"status": "rejected",
"reviewer_id": reviewerID,