diff --git a/api/service/export.go b/api/service/export.go index e927ddf..c70155a 100644 --- a/api/service/export.go +++ b/api/service/export.go @@ -51,7 +51,6 @@ type DoctorWithdrawalOrderData struct { PayTime time.Time // 支付时间 InquiryNo string // 系统订单编号 EscrowTradeNo string // 第三方支付流水号 - InquiryStatus string // 问诊订单状态(1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消) AmountTotal float64 // 订单金额 CouponAmountTotal float64 // 优惠卷金额 PaymentAmountTotal float64 // 实际付款金额 @@ -517,7 +516,6 @@ func (r *ExportService) DoctorWithdrawalOrder(doctorWithdrawalOrders []*model.Do {Value: "支付时间", CellType: "date", NumberFmt: "yyyy-mm-dd hh:mm:ss", ColWidth: 30}, {Value: "系统订单编号", CellType: "string", NumberFmt: "", ColWidth: 30}, {Value: "第三方支付流水号", CellType: "string", NumberFmt: "", ColWidth: 30}, - {Value: "订单状态", CellType: "string", NumberFmt: "", ColWidth: 18}, {Value: "订单金额", CellType: "float", NumberFmt: "0.0000", ColWidth: 18}, {Value: "优惠卷金额", CellType: "float", NumberFmt: "0.0000", ColWidth: 18}, {Value: "付款金额", CellType: "float", NumberFmt: "0.0000", ColWidth: 18}, @@ -540,7 +538,6 @@ func (r *ExportService) DoctorWithdrawalOrder(doctorWithdrawalOrders []*model.Do payChannel := "未知" inquiryNo := "未知" escrowTradeNo := "未知" - inquiryStatus := "未知" var amountTotal float64 var couponAmountTotal float64 var paymentAmountTotal float64 @@ -566,9 +563,6 @@ func (r *ExportService) DoctorWithdrawalOrder(doctorWithdrawalOrders []*model.Do inquiryNo = v.Order.OrderInquiry.InquiryNo escrowTradeNo = v.Order.OrderInquiry.EscrowTradeNo - // 问诊订单状态 - inquiryStatus = utils.InquiryStatusToString(v.Order.OrderInquiry.InquiryStatus) - amountTotal = v.Order.OrderInquiry.AmountTotal couponAmountTotal = v.Order.OrderInquiry.CouponAmountTotal paymentAmountTotal = v.Order.OrderInquiry.PaymentAmountTotal @@ -594,7 +588,6 @@ func (r *ExportService) DoctorWithdrawalOrder(doctorWithdrawalOrders []*model.Do PayTime: payTime, InquiryNo: inquiryNo, EscrowTradeNo: escrowTradeNo, - InquiryStatus: inquiryStatus, AmountTotal: amountTotal, CouponAmountTotal: couponAmountTotal, PaymentAmountTotal: paymentAmountTotal,