diff --git a/controller/top_up.go b/controller/top_up.go index 092d62a..60bd017 100644 --- a/controller/top_up.go +++ b/controller/top_up.go @@ -51,8 +51,10 @@ func listTopUps(c *fiber.Ctx) error { topUpLog.Error("查询符合条件的商户充值记录,查询失败", zap.Error(err)) return result.Error(fiber.StatusInternalServerError, "商户充值记录查询不成功") } - var topUpDetails []*vo.TopUpDetailQueryResponse + topUpLog.Debug("检查获取到的数据", zap.Any("topUps", topUps), zap.Int64("total", total)) + topUpDetails := make([]*vo.TopUpDetailQueryResponse, 0) copier.Copy(&topUpDetails, &topUps) + topUpLog.Debug("检查转换后的数据", zap.Any("topUpDetails", topUpDetails)) return result.Success( "已经获取到符合条件的商户充值记录", response.NewPagedResponse(page, total).ToMap(), diff --git a/vo/top_up.go b/vo/top_up.go index c1c8f39..5138de3 100644 --- a/vo/top_up.go +++ b/vo/top_up.go @@ -1,6 +1,10 @@ package vo -import "github.com/shopspring/decimal" +import ( + "electricity_bill_calc/types" + + "github.com/shopspring/decimal" +) type TopUpCreationForm struct { Tenement string `json:"tenement"` @@ -9,12 +13,12 @@ type TopUpCreationForm struct { } type TopUpDetailQueryResponse struct { - Id string `json:"id" copier:"topUpCode"` + Id string `json:"id" copier:"TopUpCode"` Tenement string `json:"tenement"` TenementName string `json:"tenementName"` Meter string `json:"meter"` MeterAddress string `json:"meterAddress"` - ToppedUpAt string `json:"toppedUpAt"` + ToppedUpAt types.DateTime `json:"toppedUpAt"` Amount decimal.Decimal `json:"amount"` PaymentType int16 `json:"paymentType"` SyncStatus int16 `json:"syncStatus" copier:"SyncStatus"`