第 4 阶段：订单、交接与账务--ok

backend/internal/modules/order/repository.go

@@ -5,10 +5,11 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"errors"
-	"fmt"
+	"strconv"
 	"time"
 
 	"hfb_sys/backend/internal/model"
+	"hfb_sys/backend/internal/modules/wallet"
 
 	"gorm.io/datatypes"
 	"gorm.io/gorm"
@@ -74,6 +75,21 @@ func (r *Repository) Create(renterID uint64, req CreateRequest) (*OrderDTO, erro
 		if err := tx.Create(&order).Error; err != nil {
 			return err
 		}
+		orderID := order.ID
+		if err := wallet.AppendEntries(tx,
+			wallet.Entry{
+				UserID:      renterID,
+				OrderID:     &orderID,
+				Direction:   "in",
+				Amount:      order.RentAmount + order.DepositAmount,
+				BalanceType: "frozen",
+				BizType:     "order_lock",
+				BizNo:       order.OrderNo,
+				Remark:      "开发态模拟冻结租金和押金",
+			},
+		); err != nil {
+			return err
+		}
 		listing.Status = "rented"
 		account.Status = "rented"
 		if err := tx.Save(&listing).Error; err != nil {
@@ -113,6 +129,21 @@ func (r *Repository) Cancel(userID uint64, orderID uint64) error {
 
 		order.Status = "cancelled"
 		order.HandoffStatus = "cancelled"
+		orderID := order.ID
+		if err := wallet.AppendEntries(tx,
+			wallet.Entry{
+				UserID:      order.RenterID,
+				OrderID:     &orderID,
+				Direction:   "out",
+				Amount:      order.RentAmount + order.DepositAmount,
+				BalanceType: "frozen",
+				BizType:     "order_cancel",
+				BizNo:       order.OrderNo,
+				Remark:      "取消订单释放模拟冻结金额",
+			},
+		); err != nil {
+			return err
+		}
 		listing.Status = "published"
 		account.Status = "published"
 		if err := tx.Save(&order).Error; err != nil {
@@ -204,6 +235,123 @@ func (r *Repository) HandoffRecords(userID uint64, orderID uint64) ([]HandoffRec
 	return items, nil
 }
 
+func (r *Repository) SubmitReturn(userID uint64, orderID uint64, req SubmitReturnRequest) (*HandoffRecordDTO, error) {
+	var recordID uint64
+	err := r.db.Transaction(func(tx *gorm.DB) error {
+		var order model.RentalOrder
+		if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&order, orderID).Error; err != nil {
+			return err
+		}
+		if order.RenterID != userID {
+			return ErrPermissionDenied
+		}
+		if order.Status != "renting" || order.HandoffStatus != "received" {
+			return ErrOrderCannotReturn
+		}
+		now := time.Now()
+		record := model.HandoffRecord{
+			OrderID:    order.ID,
+			FromUserID: order.RenterID,
+			ToUserID:   order.OwnerID,
+			Type:       "renter_return",
+			Content:    req.Content,
+		}
+		if err := tx.Create(&record).Error; err != nil {
+			return err
+		}
+		order.Status = "pending_return_confirm"
+		order.HandoffStatus = "pending_owner_return_confirm"
+		order.RentEndAt = &now
+		if err := tx.Save(&order).Error; err != nil {
+			return err
+		}
+		recordID = record.ID
+		return nil
+	})
+	if err != nil {
+		return nil, err
+	}
+	return r.findHandoffRecord(recordID)
+}
+
+func (r *Repository) ConfirmReturn(userID uint64, orderID uint64) error {
+	return r.db.Transaction(func(tx *gorm.DB) error {
+		var order model.RentalOrder
+		if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&order, orderID).Error; err != nil {
+			return err
+		}
+		if order.OwnerID != userID {
+			return ErrPermissionDenied
+		}
+		if order.Status != "pending_return_confirm" || order.HandoffStatus != "pending_owner_return_confirm" {
+			return ErrOrderCannotComplete
+		}
+		now := time.Now()
+		if err := tx.Model(&model.HandoffRecord{}).
+			Where("order_id = ? AND type = ?", order.ID, "renter_return").
+			Update("confirmed_by_owner_at", now).Error; err != nil {
+			return err
+		}
+		var listing model.RentalListing
+		if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&listing, order.ListingID).Error; err != nil {
+			return err
+		}
+		var account model.GameAccount
+		if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&account, order.AccountID).Error; err != nil {
+			return err
+		}
+		order.Status = "completed"
+		order.HandoffStatus = "returned"
+		order.SettlementStatus = "settled"
+		order.SettledAt = &now
+		order.OwnerSettledAt = &now
+		orderID := order.ID
+		if err := wallet.AppendEntries(tx,
+			wallet.Entry{
+				UserID:      order.RenterID,
+				OrderID:     &orderID,
+				Direction:   "out",
+				Amount:      order.RentAmount + order.DepositAmount,
+				BalanceType: "frozen",
+				BizType:     "order_settle",
+				BizNo:       order.OrderNo,
+				Remark:      "订单完成释放模拟冻结金额",
+			},
+			wallet.Entry{
+				UserID:      order.OwnerID,
+				OrderID:     &orderID,
+				Direction:   "in",
+				Amount:      order.RentAmount,
+				BalanceType: "available",
+				BizType:     "owner_income",
+				BizNo:       order.OrderNo,
+				Remark:      "订单完成模拟结算租金",
+			},
+			wallet.Entry{
+				UserID:      order.RenterID,
+				OrderID:     &orderID,
+				Direction:   "in",
+				Amount:      order.DepositAmount,
+				BalanceType: "available",
+				BizType:     "deposit_release",
+				BizNo:       order.OrderNo,
+				Remark:      "订单完成模拟退回押金",
+			},
+		); err != nil {
+			return err
+		}
+		listing.Status = "published"
+		account.Status = "published"
+		if err := tx.Save(&order).Error; err != nil {
+			return err
+		}
+		if err := tx.Save(&listing).Error; err != nil {
+			return err
+		}
+		return tx.Save(&account).Error
+	})
+}
+
 func (r *Repository) ListForUser(userID uint64) ([]OrderDTO, error) {
 	var rows []orderRow
 	err := r.baseQuery().
@@ -316,7 +464,7 @@ func newOrderNo() (string, error) {
 	if _, err := rand.Read(buf); err != nil {
 		return "", err
 	}
-	return fmt.Sprintf("RO%d%s", time.Now().UnixNano(), hex.EncodeToString(buf)), nil
+	return "RO" + strconv.FormatInt(time.Now().UnixNano(), 10) + hex.EncodeToString(buf), nil
 }
 
 func IsNotFound(err error) bool {