From 68200e7e7ac1cfd021b8b37a92b7ab8eb11c759e Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期五, 03 十一月 2023 11:36:46 +0800
Subject: [PATCH] 上架规则列表搜索增加产品和产品类别
---
request/location_product.go | 6 ++++++
controllers/location_product.go | 10 +++++++++-
2 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/controllers/location_product.go b/controllers/location_product.go
index 5955d2c..6089724 100644
--- a/controllers/location_product.go
+++ b/controllers/location_product.go
@@ -97,7 +97,7 @@
// @Success 200 {object} util.Response "鎴愬姛"
// @Router /api-wms/v1/locationProduct/list [post]
func (slf LocationProductController) List(c *gin.Context) {
- var params request.PageInfo
+ var params request.QueryLocationProductConditon
if err := c.BindJSON(¶ms); err != nil {
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�:"+err.Error())
return
@@ -109,6 +109,14 @@
search := models.NewLocationProductSearch()
search.SetPage(params.Page, params.PageSize)
+
+ if params.ProductId != "" {
+ search = search.SetProductId(params.ProductId)
+ }
+
+ if params.ProductCategoryId != 0 {
+ search = search.SetProductCategoryId(params.ProductCategoryId)
+ }
list, total, err := search.SetPreload(true).SetOrder("created_at desc").FindByPage()
if err != nil {
util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error())
diff --git a/request/location_product.go b/request/location_product.go
index b0e3320..f5f71c5 100644
--- a/request/location_product.go
+++ b/request/location_product.go
@@ -18,3 +18,9 @@
AreaId int `json:"areaId"` //鍖哄煙id
RuleType constvar.RuleType `json:"ruleType"` //涓婃灦瑙勫垯绫诲瀷 1锛氫骇鍝佺被鍨嬶紱2锛氫骇鍝佺被鍒被鍨�
}
+
+type QueryLocationProductConditon struct {
+ PageInfo
+ ProductId string `json:"productId"` //浜у搧id
+ ProductCategoryId int `json:"productCategoryId"` //浜у搧绉嶇被id
+}
--
Gitblit v1.8.0