Compare commits

..

No commits in common. "261e4b826728d9f5551b7c5e11992593ee34caa3" and "f6e50fb04eb7dec3badd9174c6a716513c402f6e" have entirely different histories.

2 changed files with 3 additions and 12 deletions

View File

@ -1833,9 +1833,6 @@ 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 {

View File

@ -35,15 +35,9 @@ 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.Pay1659662936.MchId
mchCertificateSerialNumber = config.C.Wechat.Pay1659662936.MchCertificateSerialNumber
v3ApiSecret = config.C.Wechat.Pay1659662936.V3ApiSecret
mchId = config.C.Wechat.Pay1636644248.MchId
mchCertificateSerialNumber = config.C.Wechat.Pay1636644248.MchCertificateSerialNumber
v3ApiSecret = config.C.Wechat.Pay1636644248.V3ApiSecret
} else if orderType == 4 {
// 服务包
mchId = config.C.Wechat.Pay1659662936.MchId