1.增加查品牌/年份接口

2.增加查固定广告配置接口

controllers/wrTrade2/qryWrTrade.go

@@ -793,3 +793,33 @@ func QueryWrDraftUserInfo(c *gin.Context) {
 	a.DoBindReq(&m)
 	a.DoGetDataI(&m)
 }
+
+// QueryWrBrandAndYears
+// @Summary 查询品牌和年份
+// @Produce json
+// @Security ApiKeyAuth
+// @Success 200 {array} models.WrBrandAndYears
+// @Failure 500 {object} app.Response
+// @Router /WrTrade2/QueryWrBrandAndYears [get]
+// @Tags 仓单贸易v2
+func QueryWrBrandAndYears(c *gin.Context) {
+	a := app.GinUtils{Gin: app.Gin{C: c}}
+	m := models.WrBrandAndYears{}
+	a.DoBindReq(&m)
+	a.DoGetDataI(&m)
+}
+
+// QueryWrClientAdSpaceConfig
+// @Summary 查询固定广告配置
+// @Produce json
+// @Security ApiKeyAuth
+// @Success 200 {array} models.WrClientAdSpaceConfig
+// @Failure 500 {object} app.Response
+// @Router /WrTrade2/QueryWrClientAdSpaceConfig [get]
+// @Tags 仓单贸易v2
+func QueryWrClientAdSpaceConfig(c *gin.Context) {
+	a := app.GinUtils{Gin: app.Gin{C: c}}
+	m := models.WrClientAdSpaceConfig{}
+	a.DoBindReq(&m)
+	a.DoGetDataI(&m)
+}

docs/docs.go

@@ -12866,6 +12866,39 @@ var doc = `{
                 }
             }
         },
+        "/WrTrade2/QueryWrBrandAndYears": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "仓单贸易v2"
+                ],
+                "summary": "查询品牌和年份",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.WrBrandAndYears"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/WrTrade2/QueryWrBsGoodsInfo": {
             "get": {
                 "security": [
@@ -12950,6 +12983,39 @@ var doc = `{
                 }
             }
         },
+        "/WrTrade2/QueryWrClientAdSpaceConfig": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "仓单贸易v2"
+                ],
+                "summary": "查询固定广告配置",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.WrClientAdSpaceConfig"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/WrTrade2/QueryWrDeliveryAvalidHoldLB": {
             "get": {
                 "security": [
@@ -19624,6 +19690,27 @@ var doc = `{
                 }
             }
         },
+        "models.DgFactoryItem": {
+            "type": "object",
+            "properties": {
+                "dgfactoryitemid": {
+                    "description": "选择项ID(SEQ_DGFACTORYITEM)",
+                    "type": "integer"
+                },
+                "dgfactoryitemtypeid": {
+                    "description": "要素项类型",
+                    "type": "integer"
+                },
+                "dgfactoryitemvalue": {
+                    "description": "要素项值(类型为仓库时填写仓库名称)",
+                    "type": "string"
+                },
+                "orderindex": {
+                    "description": "顺序",
+                    "type": "integer"
+                }
+            }
+        },
         "models.Division": {
             "type": "object",
             "required": [
@@ -34316,6 +34403,25 @@ var doc = `{
                 }
             }
         },
+        "models.WrBrandAndYears": {
+            "type": "object",
+            "properties": {
+                "brandlst": {
+                    "description": "品牌列表",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/models.DgFactoryItem"
+                    }
+                },
+                "yearslst": {
+                    "description": "年份列表",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/models.DgFactoryItem"
+                    }
+                }
+            }
+        },
         "models.WrBsGoodsInfo": {
             "type": "object",
             "properties": {
@@ -34388,6 +34494,59 @@ var doc = `{
                 }
             }
         },
+        "models.WrClientAdSpaceConfig": {
+            "type": "object",
+            "properties": {
+                "adspaceid": {
+                    "description": "广告位ID",
+                    "type": "integer"
+                },
+                "adspacename": {
+                    "description": "广告位名称",
+                    "type": "string"
+                },
+                "adspacetype": {
+                    "description": "广告位类型 - 1:固定广告位",
+                    "type": "integer"
+                },
+                "areauserid": {
+                    "description": "所属机构ID",
+                    "type": "integer"
+                },
+                "createdate": {
+                    "description": "创建时间",
+                    "type": "string"
+                },
+                "imagepath": {
+                    "description": "图片",
+                    "type": "string"
+                },
+                "modifierid": {
+                    "description": "操作人",
+                    "type": "integer"
+                },
+                "recsize": {
+                    "description": "推荐尺寸",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "标题",
+                    "type": "string"
+                },
+                "updatedate": {
+                    "description": "更新时间",
+                    "type": "string"
+                },
+                "urlcontent": {
+                    "description": "链接(地址\\商品ID\\功能菜单Key\\appid)",
+                    "type": "string"
+                },
+                "urltype": {
+                    "description": "链接类型 - 0:无 1:直接地址 2:商品ID 3:图片详情 4:App功能 5:微信小程序",
+                    "type": "integer"
+                }
+            }
+        },
         "models.WrDeliveryAvalidHoldLB": {
             "type": "object",
             "properties": {

docs/swagger.json

@@ -12851,6 +12851,39 @@
                 }
             }
         },
+        "/WrTrade2/QueryWrBrandAndYears": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "仓单贸易v2"
+                ],
+                "summary": "查询品牌和年份",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.WrBrandAndYears"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/WrTrade2/QueryWrBsGoodsInfo": {
             "get": {
                 "security": [
@@ -12935,6 +12968,39 @@
                 }
             }
         },
+        "/WrTrade2/QueryWrClientAdSpaceConfig": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "仓单贸易v2"
+                ],
+                "summary": "查询固定广告配置",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.WrClientAdSpaceConfig"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/WrTrade2/QueryWrDeliveryAvalidHoldLB": {
             "get": {
                 "security": [
@@ -19609,6 +19675,27 @@
                 }
             }
         },
+        "models.DgFactoryItem": {
+            "type": "object",
+            "properties": {
+                "dgfactoryitemid": {
+                    "description": "选择项ID(SEQ_DGFACTORYITEM)",
+                    "type": "integer"
+                },
+                "dgfactoryitemtypeid": {
+                    "description": "要素项类型",
+                    "type": "integer"
+                },
+                "dgfactoryitemvalue": {
+                    "description": "要素项值(类型为仓库时填写仓库名称)",
+                    "type": "string"
+                },
+                "orderindex": {
+                    "description": "顺序",
+                    "type": "integer"
+                }
+            }
+        },
         "models.Division": {
             "type": "object",
             "required": [
@@ -34301,6 +34388,25 @@
                 }
             }
         },
+        "models.WrBrandAndYears": {
+            "type": "object",
+            "properties": {
+                "brandlst": {
+                    "description": "品牌列表",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/models.DgFactoryItem"
+                    }
+                },
+                "yearslst": {
+                    "description": "年份列表",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/models.DgFactoryItem"
+                    }
+                }
+            }
+        },
         "models.WrBsGoodsInfo": {
             "type": "object",
             "properties": {
@@ -34373,6 +34479,59 @@
                 }
             }
         },
+        "models.WrClientAdSpaceConfig": {
+            "type": "object",
+            "properties": {
+                "adspaceid": {
+                    "description": "广告位ID",
+                    "type": "integer"
+                },
+                "adspacename": {
+                    "description": "广告位名称",
+                    "type": "string"
+                },
+                "adspacetype": {
+                    "description": "广告位类型 - 1:固定广告位",
+                    "type": "integer"
+                },
+                "areauserid": {
+                    "description": "所属机构ID",
+                    "type": "integer"
+                },
+                "createdate": {
+                    "description": "创建时间",
+                    "type": "string"
+                },
+                "imagepath": {
+                    "description": "图片",
+                    "type": "string"
+                },
+                "modifierid": {
+                    "description": "操作人",
+                    "type": "integer"
+                },
+                "recsize": {
+                    "description": "推荐尺寸",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "标题",
+                    "type": "string"
+                },
+                "updatedate": {
+                    "description": "更新时间",
+                    "type": "string"
+                },
+                "urlcontent": {
+                    "description": "链接(地址\\商品ID\\功能菜单Key\\appid)",
+                    "type": "string"
+                },
+                "urltype": {
+                    "description": "链接类型 - 0:无 1:直接地址 2:商品ID 3:图片详情 4:App功能 5:微信小程序",
+                    "type": "integer"
+                }
+            }
+        },
         "models.WrDeliveryAvalidHoldLB": {
             "type": "object",
             "properties": {

docs/swagger.yaml

@@ -3867,6 +3867,21 @@ definitions:
     - adsort
     - adtype
     type: object
+  models.DgFactoryItem:
+    properties:
+      dgfactoryitemid:
+        description: 选择项ID(SEQ_DGFACTORYITEM)
+        type: integer
+      dgfactoryitemtypeid:
+        description: 要素项类型
+        type: integer
+      dgfactoryitemvalue:
+        description: 要素项值(类型为仓库时填写仓库名称)
+        type: string
+      orderindex:
+        description: 顺序
+        type: integer
+    type: object
   models.Division:
     properties:
       autoid:
@@ -14833,6 +14848,19 @@ definitions:
         description: 交易日yyyymm
         type: string
     type: object
+  models.WrBrandAndYears:
+    properties:
+      brandlst:
+        description: 品牌列表
+        items:
+          $ref: '#/definitions/models.DgFactoryItem'
+        type: array
+      yearslst:
+        description: 年份列表
+        items:
+          $ref: '#/definitions/models.DgFactoryItem'
+        type: array
+    type: object
   models.WrBsGoodsInfo:
     properties:
       buyorsell:
@@ -14885,6 +14913,45 @@ definitions:
         description: 交易日(yyyyMMdd)
         type: string
     type: object
+  models.WrClientAdSpaceConfig:
+    properties:
+      adspaceid:
+        description: 广告位ID
+        type: integer
+      adspacename:
+        description: 广告位名称
+        type: string
+      adspacetype:
+        description: 广告位类型 - 1:固定广告位
+        type: integer
+      areauserid:
+        description: 所属机构ID
+        type: integer
+      createdate:
+        description: 创建时间
+        type: string
+      imagepath:
+        description: 图片
+        type: string
+      modifierid:
+        description: 操作人
+        type: integer
+      recsize:
+        description: 推荐尺寸
+        type: string
+      title:
+        description: 标题
+        type: string
+      updatedate:
+        description: 更新时间
+        type: string
+      urlcontent:
+        description: 链接(地址\商品ID\功能菜单Key\appid)
+        type: string
+      urltype:
+        description: 链接类型 - 0:无 1:直接地址 2:商品ID 3:图片详情 4:App功能 5:微信小程序
+        type: integer
+    type: object
   models.WrDeliveryAvalidHoldLB:
     properties:
       accountid:
@@ -27839,6 +27906,26 @@ paths:
       summary: 查询成交价(历史走势)
       tags:
       - 仓单贸易v2
+  /WrTrade2/QueryWrBrandAndYears:
+    get:
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            items:
+              $ref: '#/definitions/models.WrBrandAndYears'
+            type: array
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/app.Response'
+      security:
+      - ApiKeyAuth: []
+      summary: 查询品牌和年份
+      tags:
+      - 仓单贸易v2
   /WrTrade2/QueryWrBsGoodsInfo:
     get:
       description: 合约交易/买卖大厅/详情
@@ -27891,6 +27978,26 @@ paths:
       summary: 查询仓单回购明细
       tags:
       - 仓单贸易v2
+  /WrTrade2/QueryWrClientAdSpaceConfig:
+    get:
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            items:
+              $ref: '#/definitions/models.WrClientAdSpaceConfig'
+            type: array
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/app.Response'
+      security:
+      - ApiKeyAuth: []
+      summary: 查询固定广告配置
+      tags:
+      - 仓单贸易v2
   /WrTrade2/QueryWrDeliveryAvalidHoldLB:
     get:
       parameters:

models/wrTrade2.go

@@ -405,7 +405,7 @@ type Wr2FactorType struct {
 	WRTYPENAME string `json:"wrtypename" xorm:"'WRTYPENAME'"` // 商品
 }
 
-// Calc
+// Calc 计算
 func (r *Wr2FactorType) Calc() {
 	if r.WRTYPENAME == "" {
 		if len(r.WRFACTORTYPENAME) > 0 {
@@ -1191,7 +1191,7 @@ func (r *WrSpecialMatchOrder) buildSql() string {
 	return sqlId.String()
 }
 
-// GetDataEx 获取指定对手委托
+// GetDataByPage 获取指定对手委托
 func (r *WrSpecialMatchOrder) GetDataByPage() (interface{}, error, int, int, int) {
 	sData := make([]WrSpecialMatchOrder, 0)
 	err := db.GetEngine().SQL(r.buildSql()).Find(&sData)
@@ -1290,7 +1290,7 @@ func (r *WrFactorTypeInfo) buildItemList(lst []WrFactorTypeInfo) []WrTypeItem {
 	return lstItem
 }
 
-// WrFactorTypeInfoEx
+//WrFactorTypeInfoEx 类型id
 type WrFactorTypeInfoEx struct {
 	WRFACTORTYPEID string `json:"wrfactortypeid"  xorm:"'WRFACTORTYPEID'" form:"wrfactortypeid"`
 }
@@ -1389,7 +1389,7 @@ func (r *WrGoodsPerformanceStep) buildSql() string {
 	}
 }
 
-// GetDataEx 获取商品履约步骤
+// GetData 获取商品履约步骤
 func (r *WrGoodsPerformanceStep) GetData() ([]WrGoodsPerformanceStep, error) {
 	sData := make([]WrGoodsPerformanceStep, 0)
 	err := db.GetEngine().SQL(r.buildSql()).Find(&sData)
@@ -3186,7 +3186,7 @@ func (r *WrBsGoodsInfo) GetDataEx() (interface{}, error) {
 	return sData, nil
 }
 
-// WRTRADE_ORDERDETAIL 合约交易买卖大厅
+// WrTradeOrderDetail 合约交易买卖大厅
 type WrTradeOrderDetail struct {
 	ORDERID    string   `json:"orderid"  xorm:"'ORDERID'"`                      // 委托单号
 	GOODSID    int32    `json:"goodsid"  xorm:"'GOODSID'" form:"goodsid"`       // 商品id
@@ -3230,7 +3230,7 @@ func (r *WrTradeOrderDetail) buildSql() string {
 	return sqlId.String()
 }
 
-// GetDataEx 获取合约交易买卖大厅
+// GetDataByPage 获取合约交易买卖大厅
 func (r *WrTradeOrderDetail) GetDataByPage() (interface{}, error, int, int, int) {
 	sData := make([]WrTradeOrderDetail, 0)
 	err := db.GetEngine().SQL(r.buildSql()).Find(&sData)
@@ -3275,7 +3275,7 @@ func (r *WrAverageTradePrice) buildSql() string {
 	return sqlId.String()
 }
 
-// GetDataEx 获取成交均价(历史走势)
+// GetDataByPage 获取成交均价(历史走势)
 func (r *WrAverageTradePrice) GetDataByPage() (interface{}, error, int, int, int) {
 	sData := make([]WrAverageTradePrice, 0)
 	err := db.GetEngine().SQL(r.buildSql()).Find(&sData)
@@ -4789,3 +4789,109 @@ func (r *WrDraftUserInfo) GetDataEx() (interface{}, error) {
 	}
 	return sData, err
 }
+
+// DgFactoryItem 查询品牌和年份
+type DgFactoryItem struct {
+	DGFACTORYITEMID     int64  `json:"dgfactoryitemid"  xorm:"DGFACTORYITEMID"`         // 选择项ID(SEQ_DGFACTORYITEM)
+	DGFACTORYITEMTYPEID int64  `json:"dgfactoryitemtypeid"  xorm:"DGFACTORYITEMTYPEID"` // 要素项类型
+	DGFACTORYITEMVALUE  string `json:"dgfactoryitemvalue"  xorm:"DGFACTORYITEMVALUE"`   // 要素项值(类型为仓库时填写仓库名称)
+	ORDERINDEX          int32  `json:"orderindex"  xorm:"ORDERINDEX"`                   // 顺序
+}
+
+func (r *DgFactoryItem) buildSql() string {
+	var sqlId utils.SQLVal = `
+select t.*
+  from DGFactoryItem t
+ where t.dgfactoryitemtypeid = %v
+   and t.deliverygoodsid = 0
+   and t.isvalid = 1
+ order by t.orderindex
+`
+	sqlId.FormatParam(r.DGFACTORYITEMTYPEID)
+	return sqlId.String()
+}
+
+// GetDataEx 获取查询品牌和年份
+func (r *DgFactoryItem) GetDataEx() ([]DgFactoryItem, error) {
+	sData := make([]DgFactoryItem, 0)
+	err := db.GetEngine().SQL(r.buildSql()).Find(&sData)
+	return sData, err
+}
+
+// WrBrandAndYears 查询品牌和年份
+type WrBrandAndYears struct {
+	BrandLst []DgFactoryItem `json:"brandlst"` // 品牌列表
+	YearsLst []DgFactoryItem `json:"yearslst"` // 年份列表
+}
+
+// GetDataEx 获取查询品牌和年份
+func (r *WrBrandAndYears) GetDataEx() (interface{}, error) {
+	sData := make([]WrBrandAndYears, 0)
+	v := DgFactoryItem{DGFACTORYITEMTYPEID: 100}
+	brand, err := v.GetDataEx()
+	if err != nil {
+		return nil, err
+	}
+	v.DGFACTORYITEMTYPEID = 101
+	years, err2 := v.GetDataEx()
+	if err2 != nil {
+		return nil, err
+	}
+	d := WrBrandAndYears{
+		BrandLst: brand,
+		YearsLst: years,
+	}
+	sData = append(sData, d)
+	return sData, nil
+}
+
+// WrClientAdSpaceConfig 查询固定广告配置
+type WrClientAdSpaceConfig struct {
+	ADSPACEID   int32  `json:"adspaceid"  xorm:"ADSPACEID"`     // 广告位ID
+	ADSPACETYPE int32  `json:"adspacetype"  xorm:"ADSPACETYPE"` // 广告位类型 - 1:固定广告位
+	ADSPACENAME string `json:"adspacename"  xorm:"ADSPACENAME"` // 广告位名称
+	RECSIZE     string `json:"recsize"  xorm:"RECSIZE"`         // 推荐尺寸
+	IMAGEPATH   string `json:"imagepath"  xorm:"IMAGEPATH"`     // 图片
+	TITLE       string `json:"title"  xorm:"TITLE"`             // 标题
+	URLTYPE     int32  `json:"urltype"  xorm:"URLTYPE"`         // 链接类型 - 0:无 1:直接地址 2:商品ID 3:图片详情 4:App功能 5:微信小程序
+	URLCONTENT  string `json:"urlcontent"  xorm:"URLCONTENT"`   // 链接(地址\商品ID\功能菜单Key\appid)
+	CREATEDATE  string `json:"createdate"  xorm:"CREATEDATE"`   // 创建时间
+	UPDATEDATE  string `json:"updatedate"  xorm:"UPDATEDATE"`   // 更新时间
+	MODIFIERID  int64  `json:"modifierid"  xorm:"MODIFIERID"`   // 操作人
+	AREAUSERID  int64  `json:"areauserid"  xorm:"AREAUSERID"`   // 所属机构ID
+}
+
+func (r *WrClientAdSpaceConfig) calc() {
+
+}
+
+func (r *WrClientAdSpaceConfig) buildSql() string {
+	var sqlId utils.SQLVal = `
+SELECT t.ADSPACEID,
+       t.ADSPACETYPE,
+       t.ADSPACENAME,
+       t.RECSIZE,
+       t.IMAGEPATH,
+       t.TITLE,
+       t.URLTYPE,
+       t.URLCONTENT,
+       to_char(t.CREATEDATE, 'yyyy-mm-dd hh24:mi:ss') CREATEDATE,
+       to_char(t.UPDATEDATE, 'yyyy-mm-dd hh24:mi:ss') UPDATEDATE,
+       t.MODIFIERID,
+       t.AREAUSERID
+  FROM CLIENT_ADSPACECONFIG t
+ WHERE t.adspacetype=1 
+ order by t.updatedate desc
+`
+	return sqlId.String()
+}
+
+// GetDataEx 获取查询固定广告配置
+func (r *WrClientAdSpaceConfig) GetDataEx() (interface{}, error) {
+	sData := make([]WrClientAdSpaceConfig, 0)
+	err := db.GetEngine().SQL(r.buildSql()).Find(&sData)
+	for i := range sData {
+		sData[i].calc()
+	}
+	return sData, err
+}

routers/router.go

@@ -584,6 +584,8 @@ func InitRouter() *gin.Engine {
 		wrTrade2R.GET("QueryWrReckonSpotGoodsTradeSum", wrTrade2.QueryWrReckonSpotGoodsTradeSum)
 		wrTrade2R.GET("QueryWrSearchUser", wrTrade2.QueryWrSearchUser)
 		wrTrade2R.GET("QueryWrDraftUserInfo", wrTrade2.QueryWrDraftUserInfo)
+		wrTrade2R.GET("QueryWrBrandAndYears", wrTrade2.QueryWrBrandAndYears)
+		wrTrade2R.GET("QueryWrClientAdSpaceConfig", wrTrade2.QueryWrClientAdSpaceConfig)
 	}
 
 	// **************************天津麦顿*************************