gdxz/hospital-admin-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
haomingming 2026-01-09 17:22:31 +08:00
commit 261e4b8267
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/service/export.go
View File

@ -1833,6 +1833,9 @@ func (r *ExportService) OrderPrescription(d []*model.OrderPrescription) (string,
if v.OrderInquiry !=nil && v.OrderInquiry.UserDoctor != nil { if v.OrderInquiry !=nil && v.OrderInquiry.UserDoctor != nil {
// 医生姓名 // 医生姓名
data.DoctorName = v.OrderInquiry.UserDoctor.UserName data.DoctorName = v.OrderInquiry.UserDoctor.UserName
}else if(v.UserDoctor !=nil){
// 医生姓名
data.DoctorName = v.UserDoctor.UserName
} }
if v.UserPharmacist != nil { if v.UserPharmacist != nil {

12
extend/weChat/weChatPay.go
View File

@ -35,9 +35,15 @@ func (r RefundRequest) Refund(orderType int) (*refunddomestic.Refund, error) {
} else if orderType == 2 || orderType == 3 { } else if orderType == 2 || orderType == 3 {
// 药品/检测 // 药品/检测
mchId = config.C.Wechat.Pay1636644248.MchId
mchCertificateSerialNumber = config.C.Wechat.Pay1636644248.MchCertificateSerialNumber // mchId = config.C.Wechat.Pay1636644248.MchId
v3ApiSecret = config.C.Wechat.Pay1636644248.V3ApiSecret // 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 { } else if orderType == 4 {
// 服务包 // 服务包
mchId = config.C.Wechat.Pay1659662936.MchId mchId = config.C.Wechat.Pay1659662936.MchId