feat: 补全客户端订单和资产 DTO _name 字段,修复代码格式
This commit is contained in:
@@ -323,11 +323,12 @@ func (s *Service) createPackageOrder(
|
||||
return &dto.ClientCreateOrderResponse{
|
||||
OrderType: "package",
|
||||
Order: &dto.ClientOrderInfo{
|
||||
OrderID: order.ID,
|
||||
OrderNo: order.OrderNo,
|
||||
TotalAmount: order.TotalAmount,
|
||||
PaymentStatus: order.PaymentStatus,
|
||||
CreatedAt: formatClientServiceTime(order.CreatedAt),
|
||||
OrderID: order.ID,
|
||||
OrderNo: order.OrderNo,
|
||||
TotalAmount: order.TotalAmount,
|
||||
PaymentStatus: order.PaymentStatus,
|
||||
PaymentStatusName: constants.GetOrderPaymentStatusName(order.PaymentStatus),
|
||||
CreatedAt: formatClientServiceTime(order.CreatedAt),
|
||||
},
|
||||
}, nil
|
||||
}
|
||||
@@ -394,13 +395,15 @@ func (s *Service) createForceRechargeOrder(
|
||||
s.markClientPurchaseCreated(ctx, redisKey, recharge.RechargeNo)
|
||||
*created = true
|
||||
|
||||
clientStatus := rechargeStatusToClientStatus(recharge.Status)
|
||||
return &dto.ClientCreateOrderResponse{
|
||||
OrderType: "recharge",
|
||||
Recharge: &dto.ClientRechargeInfo{
|
||||
RechargeID: recharge.ID,
|
||||
RechargeNo: recharge.RechargeNo,
|
||||
Amount: recharge.Amount,
|
||||
Status: rechargeStatusToClientStatus(recharge.Status),
|
||||
Status: clientStatus,
|
||||
StatusName: clientRechargeStatusName(clientStatus),
|
||||
AutoPurchaseStatus: recharge.AutoPurchaseStatus,
|
||||
},
|
||||
PayConfig: buildClientPayConfigFromResult(paymentResult),
|
||||
@@ -709,6 +712,17 @@ func rechargeStatusToClientStatus(status int) int {
|
||||
}
|
||||
}
|
||||
|
||||
func clientRechargeStatusName(clientStatus int) string {
|
||||
switch clientStatus {
|
||||
case 0:
|
||||
return "待支付"
|
||||
case 1:
|
||||
return "已支付"
|
||||
default:
|
||||
return "已关闭"
|
||||
}
|
||||
}
|
||||
|
||||
func formatClientServiceTime(t time.Time) string {
|
||||
if t.IsZero() {
|
||||
return ""
|
||||
@@ -789,12 +803,13 @@ func (s *Service) ListOrders(ctx context.Context, customerID uint, req *dto.Clie
|
||||
}
|
||||
|
||||
list = append(list, dto.ClientOrderListItem{
|
||||
OrderID: order.ID,
|
||||
OrderNo: order.OrderNo,
|
||||
TotalAmount: order.TotalAmount,
|
||||
PaymentStatus: order.PaymentStatus,
|
||||
CreatedAt: formatClientServiceTime(order.CreatedAt),
|
||||
PackageNames: packageNames,
|
||||
OrderID: order.ID,
|
||||
OrderNo: order.OrderNo,
|
||||
TotalAmount: order.TotalAmount,
|
||||
PaymentStatus: order.PaymentStatus,
|
||||
PaymentStatusName: constants.GetOrderPaymentStatusName(order.PaymentStatus),
|
||||
CreatedAt: formatClientServiceTime(order.CreatedAt),
|
||||
PackageNames: packageNames,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -835,15 +850,16 @@ func (s *Service) GetOrderDetail(ctx context.Context, customerID uint, orderID u
|
||||
}
|
||||
|
||||
return &dto.ClientOrderDetailResponse{
|
||||
OrderID: order.ID,
|
||||
OrderNo: order.OrderNo,
|
||||
TotalAmount: order.TotalAmount,
|
||||
PaymentStatus: order.PaymentStatus,
|
||||
PaymentMethod: order.PaymentMethod,
|
||||
CreatedAt: formatClientServiceTime(order.CreatedAt),
|
||||
PaidAt: formatClientServiceTimePtr(order.PaidAt),
|
||||
CompletedAt: nil,
|
||||
Packages: packages,
|
||||
OrderID: order.ID,
|
||||
OrderNo: order.OrderNo,
|
||||
TotalAmount: order.TotalAmount,
|
||||
PaymentStatus: order.PaymentStatus,
|
||||
PaymentStatusName: constants.GetOrderPaymentStatusName(order.PaymentStatus),
|
||||
PaymentMethod: order.PaymentMethod,
|
||||
CreatedAt: formatClientServiceTime(order.CreatedAt),
|
||||
PaidAt: formatClientServiceTimePtr(order.PaidAt),
|
||||
CompletedAt: nil,
|
||||
Packages: packages,
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user