From c7b298c3d2bd922df7514f8a5ca37a0c7f6e5686 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期五, 29 三月 2024 20:00:52 +0800
Subject: [PATCH] 收货数量修改
---
api/v1/test/product.go | 55 ++++++++++++++++++++++++++++---------------------------
1 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/api/v1/test/product.go b/api/v1/test/product.go
index 20bd865..cca3717 100644
--- a/api/v1/test/product.go
+++ b/api/v1/test/product.go
@@ -159,49 +159,50 @@
// @accept application/json
// @Produce application/json
// @Param data query testReq.ProductSearch true "鍒嗛〉鑾峰彇Product鍒楄〃"
+// @Param Authorization header string true "token"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"鑾峰彇鎴愬姛"}"
// @Router /p/getProductList [get]
func (pApi *ProductApi) GetProductList(c *gin.Context) {
- var pageInfo testReq.ProductSearch
- err := c.ShouldBindQuery(&pageInfo)
+ var params testReq.ProductSearch
+ err := c.ShouldBindQuery(¶ms)
if err != nil {
response.FailWithMessage(err.Error(), c)
return
}
- list, total, err := pService.GetProductInfoList(pageInfo)
+ list, total, err := pService.GetProductInfoList(params)
if err != nil {
global.GVA_LOG.Error("鑾峰彇澶辫触!", zap.Error(err))
response.FailWithMessage("鑾峰彇澶辫触", c)
return
}
- productList := make([]testResp.Product, 0, len(list))
-
- for _, item := range list {
- productList = append(productList, testResp.Product{
- Name: item.Name,
- Number: item.Number,
- SupplierId: item.SupplierId,
- Unit: item.Unit,
- PurchasePrice: item.PurchasePrice,
- DeliveryTime: item.DeliveryTime,
- ShippingDuration: item.ShippingDuration,
- Specifications: item.Specifications,
- ModelNumber: item.ModelNumber,
- ProductType: "",
- MinimumStock: item.MinimumStock,
- MaximumStock: item.MaximumStock,
- Remark: "",
- SupplierName: item.Supplier.Name,
- CategoryName: item.CategoryName,
- })
- }
+ //productList := make([]testResp.Product, 0, len(list))
+ //
+ //for _, item := range list {
+ // productList = append(productList, testResp.Product{
+ // Name: item.Name,
+ // Number: item.Number,
+ // SupplierId: item.SupplierId,
+ // Unit: item.Unit,
+ // PurchasePrice: item.PurchasePrice,
+ // DeliveryTime: item.DeliveryTime,
+ // ShippingDuration: item.ShippingDuration,
+ // Specifications: item.Specifications,
+ // ModelNumber: item.ModelNumber,
+ // ProductType: "",
+ // MinimumStock: item.MinimumStock,
+ // MaximumStock: item.MaximumStock,
+ // Remark: "",
+ // SupplierName: item.Supplier.Name,
+ // CategoryName: item.CategoryName,
+ // })
+ //}
response.OkWithDetailed(response.PageResult{
List: list,
Total: total,
- Page: pageInfo.Page,
- PageSize: pageInfo.PageSize,
+ Page: params.Page,
+ PageSize: params.PageSize,
}, "鑾峰彇鎴愬姛", c)
}
@@ -256,7 +257,7 @@
Number: item.ID,
Unit: item.Unit,
Specifications: item.Specs,
- ModelNumber: string(item.Model),
+ ModelNumber: item.Type,
MinimumStock: item.MinInventory.IntPart(),
MaximumStock: item.MaxInventory.IntPart(),
Remark: "",
--
Gitblit v1.8.0