feat(finance): 增加线下结算实际操作人
This commit is contained in:
@@ -77,6 +77,7 @@ type OrderDTO struct {
|
||||
OfflineSettlementStatus string `json:"offline_settlement_status,omitempty"`
|
||||
OfflineSettlementAmountCent int64 `json:"offline_settlement_amount_cent"`
|
||||
OfflineSettlementRemark string `json:"offline_settlement_remark,omitempty"`
|
||||
ActualPayoutOperator string `json:"offline_settlement_actual_operator,omitempty"`
|
||||
OfflineSettledBy *uint64 `json:"offline_settled_by,omitempty"`
|
||||
OfflineSettledAt *time.Time `json:"offline_settled_at,omitempty"`
|
||||
RefundStatus string `json:"refund_status,omitempty"`
|
||||
@@ -216,7 +217,8 @@ type ForceHandoffRequest struct {
|
||||
}
|
||||
|
||||
type OfflineSettlementRequest struct {
|
||||
Remark string `json:"remark"`
|
||||
ActualOperator string `json:"actual_operator" binding:"required,max=64"`
|
||||
Remark string `json:"remark"`
|
||||
}
|
||||
|
||||
type AdminOrderQuery struct {
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"context"
|
||||
"errors"
|
||||
"io"
|
||||
"strings"
|
||||
|
||||
"hfb_sys/backend/internal/middleware"
|
||||
"hfb_sys/backend/pkg/response"
|
||||
@@ -177,7 +178,12 @@ func (h *Handler) AdminMarkOfflineSettlement(c *gin.Context) {
|
||||
}
|
||||
var req OfflineSettlementRequest
|
||||
if err := c.ShouldBindJSON(&req); err != nil && !errors.Is(err, io.EOF) {
|
||||
response.BadRequest(c, "线下结算备注格式不正确")
|
||||
response.BadRequest(c, "请选择出款实际操作人,并检查结算备注")
|
||||
return
|
||||
}
|
||||
req.ActualOperator = strings.TrimSpace(req.ActualOperator)
|
||||
if req.ActualOperator == "" {
|
||||
response.BadRequest(c, "请选择出款实际操作人")
|
||||
return
|
||||
}
|
||||
if err := h.service.AdminMarkOfflineSettlement(c.Request.Context(), adminID, id, req, auditMeta(c)); err != nil {
|
||||
|
||||
@@ -444,19 +444,24 @@ func (r *Repository) AdminMarkOfflineSettlement(ctx context.Context, adminID uin
|
||||
now := time.Now()
|
||||
order.OfflineSettlementStatus = offlineSettlementStatusSettled
|
||||
order.OfflineSettlementRemark = req.Remark
|
||||
order.ActualPayoutOperator = req.ActualOperator
|
||||
order.OfflineSettledBy = &adminID
|
||||
order.OfflineSettledAt = &now
|
||||
order.OwnerSettledAt = &now
|
||||
if err := appendOrderEvent(tx, order, "settlement", "offline_settlement_confirmed", processlog.ActorAdmin, adminID, processlog.ActorUser, &order.OwnerID, "确认已完成线下结算。", req.Remark, map[string]any{"offline_settlement_amount_cent": order.OfflineSettlementAmountCent}, before, nil); err != nil {
|
||||
if err := appendOrderEvent(tx, order, "settlement", "offline_settlement_confirmed", processlog.ActorAdmin, adminID, processlog.ActorUser, &order.OwnerID, "确认已完成线下结算。", req.Remark, map[string]any{
|
||||
"offline_settlement_amount_cent": order.OfflineSettlementAmountCent,
|
||||
"offline_settlement_actual_operator": order.ActualPayoutOperator,
|
||||
}, before, nil); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := appendAuditLog(tx, adminID, "order.offline_settlement", "order", order.ID, meta, map[string]any{
|
||||
"order_id": order.ID,
|
||||
"order_no": order.OrderNo,
|
||||
"before_offline_settlement_status": beforeStatus,
|
||||
"after_offline_settlement_status": order.OfflineSettlementStatus,
|
||||
"offline_settlement_amount_cent": order.OfflineSettlementAmountCent,
|
||||
"remark": req.Remark,
|
||||
"order_id": order.ID,
|
||||
"order_no": order.OrderNo,
|
||||
"before_offline_settlement_status": beforeStatus,
|
||||
"after_offline_settlement_status": order.OfflineSettlementStatus,
|
||||
"offline_settlement_amount_cent": order.OfflineSettlementAmountCent,
|
||||
"offline_settlement_actual_operator": order.ActualPayoutOperator,
|
||||
"remark": req.Remark,
|
||||
}); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -134,6 +134,7 @@ func (row orderRow) toAdminDTO() OrderDTO {
|
||||
OfflineSettlementStatus: effectiveOfflineSettlementStatus(row.RentalOrder),
|
||||
OfflineSettlementAmountCent: row.OfflineSettlementAmountCent,
|
||||
OfflineSettlementRemark: row.OfflineSettlementRemark,
|
||||
ActualPayoutOperator: row.ActualPayoutOperator,
|
||||
OfflineSettledBy: row.OfflineSettledBy,
|
||||
OfflineSettledAt: row.OfflineSettledAt,
|
||||
RefundStatus: row.RefundStatus,
|
||||
|
||||
@@ -14,8 +14,9 @@ const processBusinessOrder = "order"
|
||||
func orderState(order model.RentalOrder) map[string]any {
|
||||
return map[string]any{
|
||||
"order_status": order.Status, "handoff_status": order.HandoffStatus,
|
||||
"settlement_status": order.SettlementStatus,
|
||||
"offline_settlement_status": effectiveOfflineSettlementStatus(order),
|
||||
"settlement_status": order.SettlementStatus,
|
||||
"offline_settlement_status": effectiveOfflineSettlementStatus(order),
|
||||
"offline_settlement_actual_operator": order.ActualPayoutOperator,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1868,7 +1868,10 @@ func TestPlatformManagedOrderOfflineSettlementFlow(t *testing.T) {
|
||||
t.Fatal("admin dto should expose offline settlement action")
|
||||
}
|
||||
|
||||
if err := repo.AdminMarkOfflineSettlement(t.Context(), adminID, order.ID, OfflineSettlementRequest{Remark: "支付宝线下转账"}, AuditMeta{}); err != nil {
|
||||
if err := repo.AdminMarkOfflineSettlement(t.Context(), adminID, order.ID, OfflineSettlementRequest{
|
||||
ActualOperator: "出款小王",
|
||||
Remark: "支付宝线下转账",
|
||||
}, AuditMeta{}); err != nil {
|
||||
t.Fatalf("AdminMarkOfflineSettlement() error = %v", err)
|
||||
}
|
||||
if err := db.First(&saved, order.ID).Error; err != nil {
|
||||
@@ -1886,6 +1889,9 @@ func TestPlatformManagedOrderOfflineSettlementFlow(t *testing.T) {
|
||||
if saved.OfflineSettlementRemark != "支付宝线下转账" {
|
||||
t.Fatalf("offline settlement remark = %q", saved.OfflineSettlementRemark)
|
||||
}
|
||||
if saved.ActualPayoutOperator != "出款小王" {
|
||||
t.Fatalf("offline settlement actual operator = %q", saved.ActualPayoutOperator)
|
||||
}
|
||||
if err := db.Model(&model.WalletLedger{}).Where("user_id = ?", owner.ID).Count(&ownerLedgerCount).Error; err != nil {
|
||||
t.Fatalf("recount wallet ledger failed: %v", err)
|
||||
}
|
||||
@@ -1969,7 +1975,10 @@ func TestAdminMarkOfflineSettlementAllowsArbitratedPlatformOrder(t *testing.T) {
|
||||
if !canAdminMarkOfflineSettlement(order) {
|
||||
t.Fatal("arbitrated platform order should allow offline settlement")
|
||||
}
|
||||
if err := repo.AdminMarkOfflineSettlement(t.Context(), adminID, order.ID, OfflineSettlementRequest{Remark: "仲裁后线下转账"}, AuditMeta{}); err != nil {
|
||||
if err := repo.AdminMarkOfflineSettlement(t.Context(), adminID, order.ID, OfflineSettlementRequest{
|
||||
ActualOperator: "出款小李",
|
||||
Remark: "仲裁后线下转账",
|
||||
}, AuditMeta{}); err != nil {
|
||||
t.Fatalf("AdminMarkOfflineSettlement() error = %v", err)
|
||||
}
|
||||
|
||||
@@ -1983,6 +1992,9 @@ func TestAdminMarkOfflineSettlementAllowsArbitratedPlatformOrder(t *testing.T) {
|
||||
if saved.OfflineSettledBy == nil || *saved.OfflineSettledBy != adminID {
|
||||
t.Fatalf("offline settled by = %#v, want %d", saved.OfflineSettledBy, adminID)
|
||||
}
|
||||
if saved.ActualPayoutOperator != "出款小李" {
|
||||
t.Fatalf("offline settlement actual operator = %q", saved.ActualPayoutOperator)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPlatformManagedCheckoutIncludesConsumableAndDepositCompensation(t *testing.T) {
|
||||
|
||||
Reference in New Issue
Block a user