修改导出

This commit is contained in:
wucongxing8150 2024-06-26 13:24:46 +08:00
parent 3a6d100dec
commit 6603fbe698

View File

@ -51,7 +51,6 @@ type DoctorWithdrawalOrderData struct {
PayTime time.Time // 支付时间 PayTime time.Time // 支付时间
InquiryNo string // 系统订单编号 InquiryNo string // 系统订单编号
EscrowTradeNo string // 第三方支付流水号 EscrowTradeNo string // 第三方支付流水号
InquiryStatus string // 问诊订单状态1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消)
AmountTotal float64 // 订单金额 AmountTotal float64 // 订单金额
CouponAmountTotal float64 // 优惠卷金额 CouponAmountTotal float64 // 优惠卷金额
PaymentAmountTotal 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: "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: 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}, {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 := "未知" payChannel := "未知"
inquiryNo := "未知" inquiryNo := "未知"
escrowTradeNo := "未知" escrowTradeNo := "未知"
inquiryStatus := "未知"
var amountTotal float64 var amountTotal float64
var couponAmountTotal float64 var couponAmountTotal float64
var paymentAmountTotal float64 var paymentAmountTotal float64
@ -566,9 +563,6 @@ func (r *ExportService) DoctorWithdrawalOrder(doctorWithdrawalOrders []*model.Do
inquiryNo = v.Order.OrderInquiry.InquiryNo inquiryNo = v.Order.OrderInquiry.InquiryNo
escrowTradeNo = v.Order.OrderInquiry.EscrowTradeNo escrowTradeNo = v.Order.OrderInquiry.EscrowTradeNo
// 问诊订单状态
inquiryStatus = utils.InquiryStatusToString(v.Order.OrderInquiry.InquiryStatus)
amountTotal = v.Order.OrderInquiry.AmountTotal amountTotal = v.Order.OrderInquiry.AmountTotal
couponAmountTotal = v.Order.OrderInquiry.CouponAmountTotal couponAmountTotal = v.Order.OrderInquiry.CouponAmountTotal
paymentAmountTotal = v.Order.OrderInquiry.PaymentAmountTotal paymentAmountTotal = v.Order.OrderInquiry.PaymentAmountTotal
@ -594,7 +588,6 @@ func (r *ExportService) DoctorWithdrawalOrder(doctorWithdrawalOrders []*model.Do
PayTime: payTime, PayTime: payTime,
InquiryNo: inquiryNo, InquiryNo: inquiryNo,
EscrowTradeNo: escrowTradeNo, EscrowTradeNo: escrowTradeNo,
InquiryStatus: inquiryStatus,
AmountTotal: amountTotal, AmountTotal: amountTotal,
CouponAmountTotal: couponAmountTotal, CouponAmountTotal: couponAmountTotal,
PaymentAmountTotal: paymentAmountTotal, PaymentAmountTotal: paymentAmountTotal,