增加接口“/Ferroalloy/QueryTHJListing 查询供求列表”

controllers/ferroalloy/quote.go

@@ -89,6 +89,24 @@ func QueryTHJWrstandard(c *gin.Context) {
 	a.DoGetDataByPage(&m)
 }
 
+// QueryTHJListing
+// @Summary  查询供求列表
+// @Produce  json
+// @Security ApiKeyAuth
+// @Param    wrstandardname query    string false "现货商品名称（模糊查询）"
+// @Param    page           query    int    false "页码"
+// @Param    pagesize       query    int    false "每页条数"
+// @Success  200            {array}  models.THJWrstandard
+// @Failure  500            {object} app.Response
+// @Router   /Ferroalloy/QueryTHJListing [get]
+// @Tags     铁合金
+func QueryTHJListing(c *gin.Context) {
+	a := app.GinUtils{Gin: app.Gin{C: c}}
+	m := models.THJWrstandard{GoodsType: 1}
+	a.DoBindReq(&m)
+	a.DoGetDataByPage(&m)
+}
+
 // QueryTHJWrstandardDetail
 // @Summary  查询采购详情
 // @Produce  json

models/ferroalloy.go

@@ -366,6 +366,8 @@ type THJWrstandard struct {
 	PROVIDERUSERID    int64     `json:"-" xorm:"PROVIDERUSERID"`                                    // 供应链提供商
 	PROVIDERACCOUNTID int64     `json:"-" xorm:"PROVIDERACCOUNTID"`                                 // 供应链提供商资金账户 ID
 
+	GoodsType int `json:"-" xorm:"-"` // 类型 0-产品介绍 1-供求列表
+
 	PageEx `xorm:"extends"` // 页码信息
 }
 
@@ -395,9 +397,33 @@ func (r *THJWrstandard) buildSql() string {
 	return sqlId.String()
 }
 
+func (r *THJWrstandard) buildSql2() string {
+	var sqlId utils.SQLVal = `
+	select 
+		wr.* 
+	from wrstandard wr 
+	where wr.wrstandardid in (select distinct t.wrstandardid from WRTrade_OrderDetail t where t.marketid=65201 and t.wrtradetype = 1 and t.wrtradeorderstatus in (3,7))
+	and %v
+	order by wr.wrstandardname
+	`
+	param := "1=1"
+	if r.WRSTANDARDNAME != "" {
+		param = fmt.Sprintf("wr.wrstandardname like '%%%v%%'", r.WRSTANDARDNAME)
+	}
+	sqlId.FormatParam(param)
+
+	sqlId.Page(r.Page, r.PageSize)
+	return sqlId.String()
+}
+
 func (r *THJWrstandard) GetDataByPage() (interface{}, error, int, int, int) {
+	sql := r.buildSql()
+	if r.GoodsType == 1 {
+		sql = r.buildSql2()
+	}
+
 	sData := make([]THJWrstandard, 0)
-	err := db.GetEngine().SQL(r.buildSql()).Find(&sData)
+	err := db.GetEngine().SQL(sql).Find(&sData)
 	total := 0
 	for i := range sData {
 		sData[i].calc()

routers/router.go

@@ -696,6 +696,7 @@ func InitRouter() *gin.Engine {
 		ferroalloyR.Use(token.Auth()).GET("QueryMyRefer", ferroalloy.QueryMyRefer)
 		ferroalloyR.Use(token.Auth()).GET("QueryUserScoreLog", ferroalloy.QueryUserScoreLog)
 		ferroalloyR.Use(token.Auth()).GET("QueryTHJWrstandard", ferroalloy.QueryTHJWrstandard)
+		ferroalloyR.Use(token.Auth()).GET("QueryTHJListing", ferroalloy.QueryTHJListing)
 		ferroalloyR.Use(token.Auth()).GET("QueryTHJWrstandardDetail", ferroalloy.QueryTHJWrstandardDetail)
 		ferroalloyR.Use(token.Auth()).GET("QueryTHJPurchaseTradeDetail", ferroalloy.QueryTHJPurchaseTradeDetail)
 		ferroalloyR.Use(token.Auth()).GET("QueryTHJScoreConfig", ferroalloy.QueryTHJScoreConfig)