From ca0e56966a15192bcd5b1f9311ad02629b09360b Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Wed, 26 Jun 2024 11:12:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=8E=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/service/export.go | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/api/service/export.go b/api/service/export.go index 2e42ea6..e927ddf 100644 --- a/api/service/export.go +++ b/api/service/export.go @@ -546,40 +546,40 @@ func (r *ExportService) DoctorWithdrawalOrder(doctorWithdrawalOrders []*model.Do var paymentAmountTotal float64 var doctorAmount float64 var payTime time.Time - if v.OrderInquiry != nil { - patientName = v.OrderInquiry.PatientName + if v.Order.OrderInquiry != nil { + patientName = v.Order.OrderInquiry.PatientName // 患者性别 - patientSex = utils.SexToString(v.OrderInquiry.PatientSex) + patientSex = utils.SexToString(v.Order.OrderInquiry.PatientSex) // 患者年龄 - patientAge = fmt.Sprintf("%d", v.OrderInquiry.PatientAge) + patientAge = fmt.Sprintf("%d", v.Order.OrderInquiry.PatientAge) // 患者电话 - if v.OrderInquiry.User != nil { - patientMobile = v.OrderInquiry.User.Mobile + if v.Order.OrderInquiry.User != nil { + patientMobile = v.Order.OrderInquiry.User.Mobile } // 支付渠道 - payChannel = utils.PayChannelToString(v.OrderInquiry.InquiryPayChannel) + payChannel = utils.PayChannelToString(v.Order.OrderInquiry.InquiryPayChannel) - inquiryNo = v.OrderInquiry.InquiryNo - escrowTradeNo = v.OrderInquiry.EscrowTradeNo + inquiryNo = v.Order.OrderInquiry.InquiryNo + escrowTradeNo = v.Order.OrderInquiry.EscrowTradeNo // 问诊订单状态 - inquiryStatus = utils.InquiryStatusToString(v.OrderInquiry.InquiryStatus) + inquiryStatus = utils.InquiryStatusToString(v.Order.OrderInquiry.InquiryStatus) - amountTotal = v.OrderInquiry.AmountTotal - couponAmountTotal = v.OrderInquiry.CouponAmountTotal - paymentAmountTotal = v.OrderInquiry.PaymentAmountTotal + amountTotal = v.Order.OrderInquiry.AmountTotal + couponAmountTotal = v.Order.OrderInquiry.CouponAmountTotal + paymentAmountTotal = v.Order.OrderInquiry.PaymentAmountTotal // 医生收益 - doctorAmount, _ = decimal.NewFromFloat(v.OrderInquiry.AmountTotal).Mul(decimal.NewFromFloat(0.75)).Round(2).Float64() + doctorAmount, _ = decimal.NewFromFloat(v.Order.OrderInquiry.AmountTotal).Mul(decimal.NewFromFloat(0.75)).Round(2).Float64() // 时间处理 - if v.OrderInquiry.PayTime != (model.LocalTime{}) { - t := time.Time(v.OrderInquiry.PayTime) + if v.Order.OrderInquiry.PayTime != (model.LocalTime{}) { + t := time.Time(v.Order.OrderInquiry.PayTime) payTime = t } }