Compare commits

..

47 Commits

Author SHA1 Message Date
haomingming
0fb3681628 临时bug 上报处方平台修复 2026-01-04 10:30:59 +08:00
haomingming
1b33c1f241 临时bug 上报处方平台 2026-01-04 10:26:29 +08:00
haomingming
74b5610514 临时bug 上报处方 2026-01-04 10:06:02 +08:00
haomingming
b0c42eb5af Merge branch 'dev' 2025-12-22 14:00:36 +08:00
8229e13bfa Merge branch 'dev' 2025-09-10 10:52:49 +08:00
2edbd35d34 Merge branch 'dev' 2025-09-02 14:08:53 +08:00
0e31e6da8d Merge branch 'dev' 2025-05-15 16:28:32 +08:00
19afa0fc7c Merge branch 'dev' 2025-05-15 16:21:55 +08:00
fce37aaa1b Merge branch 'dev' 2025-04-15 09:18:15 +08:00
952d6300f8 Merge branch 'dev' 2024-12-16 10:35:24 +08:00
e7d500fb58 Merge branch 'dev' 2024-12-06 14:22:59 +08:00
77f298911d Merge branch 'dev' 2024-12-06 10:49:22 +08:00
a0eddcda73 Merge branch 'dev' 2024-12-06 09:30:18 +08:00
4e34962e21 Merge branch 'dev' 2024-11-08 08:46:03 +08:00
fadc95d092 增加了续约云证书过期时间 2024-11-04 15:55:11 +08:00
da3f8ef6b5 34444 2024-10-25 14:25:03 +08:00
be6f077f1b 333 2024-10-25 14:24:57 +08:00
4faa16a7cc 111 2024-10-25 13:41:37 +08:00
6d3968b1ac 权限状态码更改 2024-10-16 13:50:49 +08:00
ae2419e375 修改token判断 2024-10-14 13:17:28 +08:00
5584f92b1e Merge branch 'dev' 2024-09-10 09:27:42 +08:00
f4f691d37a Merge branch 'dev' 2024-08-06 09:54:22 +08:00
a28597d6e2 Merge branch 'dev' 2024-07-25 09:22:38 +08:00
29caf66739 Merge branch 'dev' 2024-07-08 17:38:54 +08:00
8d946cc6cf Merge branch 'dev' 2024-06-26 15:21:29 +08:00
b61304250e Merge branch 'dev' 2024-06-21 14:17:36 +08:00
17ed9396ce Merge branch 'dev' 2024-06-21 14:02:55 +08:00
7f76324919 Merge branch 'dev' 2024-06-21 13:33:44 +08:00
0c0ca9c02c Merge branch 'dev' 2024-06-21 13:31:23 +08:00
c1b58d4d97 Merge branch 'dev' 2024-06-21 11:43:00 +08:00
d9d0ab1df6 Merge branch 'dev' 2024-06-19 16:22:39 +08:00
89e2978a4d Merge branch 'dev' 2024-05-09 10:41:17 +08:00
dbd6a3966f Merge branch 'dev' 2024-04-07 14:45:49 +08:00
c622292252 Merge branch 'dev' 2024-04-01 11:10:56 +08:00
cc4783e2b7 Merge branch 'dev' 2024-03-29 17:30:20 +08:00
ee57219ea8 shijian 2024-03-26 17:29:48 +08:00
0e91b4c3a3 修改时间搜索 2024-03-25 17:31:56 +08:00
77c6ab6f44 修改密码接口改动 2024-03-04 13:59:19 +08:00
0f31485d8c 修改药品订单搜索 2024-03-04 11:19:35 +08:00
f11895c113 处方列表导出 2024-03-04 11:09:56 +08:00
882fcb9a55 到处药品订单增加药品名称 2024-03-04 11:09:48 +08:00
db2c47bfed 跨域回滚,药品订单回滚增加药品名称 2024-03-04 11:09:29 +08:00
f8ccf96e58 新增跨域 2024-03-04 11:09:19 +08:00
29c8e1b3d7 Merge branch 'dev' 2024-01-05 12:08:05 +08:00
01eda96f23 Merge branch 'dev' 2023-12-29 08:52:19 +08:00
d36b9217fd Merge branch 'dev' 2023-12-21 09:07:22 +08:00
f2a8f52395 去除药师在线状态 2023-12-21 08:41:53 +08:00
3 changed files with 4 additions and 1 deletions

View File

@ -4,6 +4,7 @@ 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"
@ -248,7 +249,7 @@ func (r *OrderService) ReportPreProduct(orderProductId, adminUserId int64) (bool
// 处理上传数据-基础数据 // 处理上传数据-基础数据
ReportPreRequest := prescription.ReportPreRequest{ ReportPreRequest := prescription.ReportPreRequest{
TerminalCode: "ZD-10003", TerminalCode: config.C.Pre.PrePlatTerminalCode,
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"), // 支付时间

View File

@ -110,6 +110,7 @@ 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:

View File

@ -5,4 +5,5 @@ 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"`
} }