diff --git a/api/service/export.go b/api/service/export.go index b5f7d56..eccc6bb 100644 --- a/api/service/export.go +++ b/api/service/export.go @@ -1833,6 +1833,9 @@ func (r *ExportService) OrderPrescription(d []*model.OrderPrescription) (string, if v.OrderInquiry !=nil && v.OrderInquiry.UserDoctor != nil { // 医生姓名 data.DoctorName = v.OrderInquiry.UserDoctor.UserName + }else if(v.UserDoctor !=nil){ + // 医生姓名 + data.DoctorName = v.UserDoctor.UserName } if v.UserPharmacist != nil { diff --git a/extend/weChat/weChatPay.go b/extend/weChat/weChatPay.go index 0a3ea0b..ebc3976 100644 --- a/extend/weChat/weChatPay.go +++ b/extend/weChat/weChatPay.go @@ -35,9 +35,15 @@ func (r RefundRequest) Refund(orderType int) (*refunddomestic.Refund, error) { } else if orderType == 2 || orderType == 3 { // 药品/检测 - mchId = config.C.Wechat.Pay1636644248.MchId - mchCertificateSerialNumber = config.C.Wechat.Pay1636644248.MchCertificateSerialNumber - v3ApiSecret = config.C.Wechat.Pay1636644248.V3ApiSecret + + // mchId = config.C.Wechat.Pay1636644248.MchId + // mchCertificateSerialNumber = config.C.Wechat.Pay1636644248.MchCertificateSerialNumber + // v3ApiSecret = config.C.Wechat.Pay1636644248.V3ApiSecret + + // 之前为北京欣欣账户,现改为成都欣欣账户 + mchId = config.C.Wechat.Pay1659662936.MchId + mchCertificateSerialNumber = config.C.Wechat.Pay1659662936.MchCertificateSerialNumber + v3ApiSecret = config.C.Wechat.Pay1659662936.V3ApiSecret } else if orderType == 4 { // 服务包 mchId = config.C.Wechat.Pay1659662936.MchId