From f6f6845692df6dec524073e35a084eca09744580 Mon Sep 17 00:00:00 2001 From: haomingming Date: Tue, 8 Sep 2026 13:57:44 +0800 Subject: [PATCH] 2 --- api/service/product.go | 6 ++++-- extend/prescription/prescription.go | 7 ++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/api/service/product.go b/api/service/product.go index 69e2133..192ee9d 100644 --- a/api/service/product.go +++ b/api/service/product.go @@ -28,7 +28,8 @@ func (r *ProductService) GetProductPlatform(productPlatformId int64) (g *dto.Pro var quantity int ReportPreRequest := prescription.GetProdStockRequest{ - DrugCode: productPlatform.ProductPharmacyCode, + PharmacyCode: productPlatform.PharmacyCode, + DrugCode: productPlatform.ProductPharmacyCode, } result, err := ReportPreRequest.GetProdStock() @@ -188,7 +189,8 @@ func (r *ProductService) AddProduct(userId string, req requests.AddProduct) (boo // 获取商品库存 ReportPreRequest := prescription.GetProdStockRequest{ - DrugCode: product.ProductPharmacyCode, + PharmacyCode: product.PharmacyCode, + DrugCode: product.ProductPharmacyCode, } result, err := ReportPreRequest.GetProdStock() diff --git a/extend/prescription/prescription.go b/extend/prescription/prescription.go index 415bc91..5bf6201 100644 --- a/extend/prescription/prescription.go +++ b/extend/prescription/prescription.go @@ -409,7 +409,9 @@ func (r ReportPreRequest) ReportPre() (bool, error) { // GetProdStock 获取商品库存 func (r GetProdStockRequest) GetProdStock() (*GetProdStockDataResponse, error) { - r.PharmacyCode = config.C.Pre.PrePlatPharmacyCode + if r.PharmacyCode == "" { + r.PharmacyCode = config.C.Pre.PrePlatPharmacyCode + } jsonData, err := json.Marshal(r) if err != nil { utils.LogJsonErr("获取商品库存-序列化请求参数失败", err) @@ -483,5 +485,8 @@ func (r GetProdStockRequest) GetProdStock() (*GetProdStockDataResponse, error) { } utils.LogJsonInfo("获取商品库存-成功", response.Data) + if len(response.Data) == 0 { + return &GetProdStockDataResponse{Quantity: "0"}, nil + } return &response.Data[0], nil }