gdxz/hospital-admin-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增 已完成待入账金额\今日预计收入

Browse Source
This commit is contained in:
admin
2023-11-02 09:12:12 +08:00
parent 873b3b1676
commit 8cf0a1e8ab
5 changed files with 207 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/dto/DoctorAccount.go
+18 -14
View File
@@ -7,17 +7,19 @@ import (
)
type DoctorAccountDto struct {
AccountId string `json:"account_id"` // 账户id
DoctorId string `json:"doctor_id"` // 医生id
TotalAmount float64 `json:"total_amount"` // 总金额（已结束订单的总金额）
BalanceAccount float64 `json:"balance_account"` // 账户余额
AppliedWithdrawalAmount float64 `json:"applied_withdrawal_amount"` // 提现金额
ActualWithdrawalAmount float64 `json:"actual_withdrawal_amount"` // 实际提现金额
IncomeTax float64 `json:"income_tax"`
CreatedAt model.LocalTime `json:"created_at"` // 创建时间
UpdatedAt model.LocalTime `json:"updated_at"` // 修改时间
DoctorName string `json:"doctor_name"` // 医生姓名
DoctorMobileMask string `json:"doctor_mobile_mask"` // 医生手机号（掩码）
AccountId string `json:"account_id"` // 账户id
DoctorId string `json:"doctor_id"` // 医生id
TotalAmount float64 `json:"total_amount"` // 总金额（已结束订单的总金额）
BalanceAccount float64 `json:"balance_account"` // 账户余额
AppliedWithdrawalAmount float64 `json:"applied_withdrawal_amount"` // 提现金额
ActualWithdrawalAmount float64 `json:"actual_withdrawal_amount"` // 实际提现金额
IncomeTax float64 `json:"income_tax"`
CreatedAt model.LocalTime `json:"created_at"` // 创建时间
UpdatedAt model.LocalTime `json:"updated_at"` // 修改时间
DoctorName string `json:"doctor_name"` // 医生姓名
DoctorMobileMask string `json:"doctor_mobile_mask"` // 医生手机号（掩码）
CompletedWaitEntryAmount float64 `json:"completed_wait_entry_amount"` // 已完成待入账金额
EstimateIncome float64 `json:"estimate_income"` // 今日预计收入
}
func GetDoctorAccountDto(m *model.DoctorAccount) *DoctorAccountDto {
@@ -34,13 +36,13 @@ func GetDoctorAccountDto(m *model.DoctorAccount) *DoctorAccountDto {
}
}
func GetDoctorAccountListDto(m []*model.DoctorAccount) []DoctorAccountDto {
func GetDoctorAccountListDto(m []*model.DoctorAccount) []*DoctorAccountDto {
// 处理返回值
responses := make([]DoctorAccountDto, len(m))
responses := make([]*DoctorAccountDto, len(m))
if len(m) > 0 {
for i, v := range m {
response := DoctorAccountDto{
response := &DoctorAccountDto{
AccountId: fmt.Sprintf("%d", v.AccountId),
DoctorId: fmt.Sprintf("%d", v.DoctorId),
TotalAmount: v.TotalAmount,
@@ -62,6 +64,8 @@ func GetDoctorAccountListDto(m []*model.DoctorAccount) []DoctorAccountDto {
}
}
// 加载医生已完成待入账金额
// 将转换后的结构体添加到新切片中
responses[i] = response
}