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

Compare commits

base: gdxz:0fb3681628fc12477852f585c61b1517c138d0f6
Branches Tags
gdxz:dev
gdxz:master
..
compare: gdxz:49fc42221857c76f6d5778e525e8930da9950b2d
Branches Tags
gdxz:dev
gdxz:master

No commits in common. "0fb3681628fc12477852f585c61b1517c138d0f6" and "49fc42221857c76f6d5778e525e8930da9950b2d" have entirely different histories.
0fb3681628 ... 49fc422218

3 changed files with 1 additions and 4 deletions
Show Stats Expand all files Collapse all files

3
api/service/order.go
View File

@ -4,7 +4,6 @@ import (
"errors" "errors"
"fmt" "fmt"
"gorm.io/gorm" "gorm.io/gorm"
"hospital-admin-api/config"
"hospital-admin-api/api/dao" "hospital-admin-api/api/dao"
"hospital-admin-api/api/model" "hospital-admin-api/api/model"
"hospital-admin-api/extend/aliyun" "hospital-admin-api/extend/aliyun"
@ -249,7 +248,7 @@ func (r *OrderService) ReportPreProduct(orderProductId, adminUserId int64) (bool
// 处理上传数据-基础数据 // 处理上传数据-基础数据
ReportPreRequest := prescription.ReportPreRequest{ ReportPreRequest := prescription.ReportPreRequest{
TerminalCode: config.C.Pre.PrePlatTerminalCode, TerminalCode: "ZD-10003",
OrderNo: orderProduct.OrderProductNo, // 订单编号 OrderNo: orderProduct.OrderProductNo, // 订单编号
TransactNo: orderProduct.EscrowTradeNo, // 流水单号 TransactNo: orderProduct.EscrowTradeNo, // 流水单号
PayDate: time.Time(orderProduct.PayTime).Format("2006-01-02 15:04:05"), // 支付时间 PayDate: time.Time(orderProduct.PayTime).Format("2006-01-02 15:04:05"), // 支付时间

1
config.yaml
View File

@ -110,7 +110,6 @@ pre:
pre-plat-client-secret: 4sdjas2387sjdasjhdas289 pre-plat-client-secret: 4sdjas2387sjdasjhdas289
pre-plat-app-url: http://cf-thirdapi-test.yctang.net/api/thridapi/ pre-plat-app-url: http://cf-thirdapi-test.yctang.net/api/thridapi/
pre-plat-pharmacy-code: ZD-10198 pre-plat-pharmacy-code: ZD-10198
pre-plat-terminal-code: ZD-10199
# [rabbitMq] # [rabbitMq]
amqp: amqp:

1
config/pre.go
View File

@ -5,5 +5,4 @@ type Pre struct {
PrePlatClientSecret string `mapstructure:"pre-plat-client-secret" json:"pre-plat-client-secret" yaml:"pre-plat-client-secret"` PrePlatClientSecret string `mapstructure:"pre-plat-client-secret" json:"pre-plat-client-secret" yaml:"pre-plat-client-secret"`
PrePlatAppUrl string `mapstructure:"pre-plat-app-url" json:"pre-plat-app-url" yaml:"pre-plat-app-url"` PrePlatAppUrl string `mapstructure:"pre-plat-app-url" json:"pre-plat-app-url" yaml:"pre-plat-app-url"`
PrePlatPharmacyCode string `mapstructure:"pre-plat-pharmacy-code" json:"pre-plat-pharmacy-code" yaml:"pre-plat-pharmacy-code"` PrePlatPharmacyCode string `mapstructure:"pre-plat-pharmacy-code" json:"pre-plat-pharmacy-code" yaml:"pre-plat-pharmacy-code"`
PrePlatTerminalCode string `mapstructure:"pre-plat-terminal-code" json:"pre-plat-terminal-code" yaml:"pre-plat-terminal-code"`
} }