Переглянути джерело

修改“获取二级市场(挂牌点选)商品信息详情”接口,增加“供应商”字段

zhou.xiaoning 5 роки тому
батько
коміт
defa3244ab
5 змінених файлів з 39 додано та 5 видалено
  1. 1 1
      controllers/hsby/hsby.go
  2. 5 1
      docs/docs.go
  3. 5 1
      docs/swagger.json
  4. 5 1
      docs/swagger.yaml
  5. 23 1
      models/hsby.go

+ 1 - 1
controllers/hsby/hsby.go

@@ -137,7 +137,7 @@ type QueryHsbyGoodsOrderDetailsReq struct {
 
 // QueryHsbyGoodsOrderDetails 查询二级市场(挂牌点选)商品对应的挂牌委托单信息
 // @Summary 查询二级市场(挂牌点选)商品对应的挂牌委托单信息
-// @Description 说明:查询结果已按委托价格和委托时间排序
+// @Description 说明:查询结果已按委托价格和委托时间排序; sellOrderDetails - 转让(卖出)单,buyOrderDetails - 求购(买入)单
 // @Produce json
 // @Security ApiKeyAuth
 // @Param goodsID query int true "商品ID"

+ 5 - 1
docs/docs.go

@@ -730,7 +730,7 @@ var doc = `{
                         "ApiKeyAuth": []
                     }
                 ],
-                "description": "说明:查询结果已按委托价格和委托时间排序",
+                "description": "说明:查询结果已按委托价格和委托时间排序; sellOrderDetails - 转让(卖出)单,buyOrderDetails - 求购(买入)单",
                 "produces": [
                     "application/json"
                 ],
@@ -3512,6 +3512,10 @@ var doc = `{
                     "description": "介绍图片[多张用逗号分隔]",
                     "type": "string"
                 },
+                "vendorname": {
+                    "description": "供应商名称",
+                    "type": "string"
+                },
                 "videourls": {
                     "description": "介绍视频[多张用逗号分隔]",
                     "type": "string"

+ 5 - 1
docs/swagger.json

@@ -714,7 +714,7 @@
                         "ApiKeyAuth": []
                     }
                 ],
-                "description": "说明:查询结果已按委托价格和委托时间排序",
+                "description": "说明:查询结果已按委托价格和委托时间排序; sellOrderDetails - 转让(卖出)单,buyOrderDetails - 求购(买入)单",
                 "produces": [
                     "application/json"
                 ],
@@ -3496,6 +3496,10 @@
                     "description": "介绍图片[多张用逗号分隔]",
                     "type": "string"
                 },
+                "vendorname": {
+                    "description": "供应商名称",
+                    "type": "string"
+                },
                 "videourls": {
                     "description": "介绍视频[多张用逗号分隔]",
                     "type": "string"

+ 5 - 1
docs/swagger.yaml

@@ -1258,6 +1258,9 @@ definitions:
       picurls:
         description: 介绍图片[多张用逗号分隔]
         type: string
+      vendorname:
+        description: 供应商名称
+        type: string
       videourls:
         description: 介绍视频[多张用逗号分隔]
         type: string
@@ -3439,7 +3442,8 @@ paths:
       - 风险管理
   /HSBY/QueryHsbyGoodsOrderDetails:
     get:
-      description: 说明:查询结果已按委托价格和委托时间排序
+      description: 说明:查询结果已按委托价格和委托时间排序; sellOrderDetails - 转让(卖出)单,buyOrderDetails
+        - 求购(买入)单
       parameters:
       - description: 商品ID
         in: query

+ 23 - 1
models/hsby.go

@@ -23,6 +23,24 @@ type Hsbygoodsex struct {
 	Picurls        string    `json:"picurls"  xorm:"'PICURLS'"`                    // 介绍图片[多张用逗号分隔]
 }
 
+// Hsbysupplierinfo 供应商表
+type Hsbysupplierinfo struct {
+	Vendorid    int32     `json:"vendorid"  xorm:"'VENDORID'" binding:"required"` // 供应商ID(SEQ_HSBY_SUPPLIERINFO)
+	Vendorname  string    `json:"vendorname"  xorm:"'VENDORNAME'"`                // 名称描述客服电话名称
+	Vendordesc  string    `json:"vendordesc"  xorm:"'VENDORDESC'"`                // 描述
+	Vendorphone string    `json:"vendorphone"  xorm:"'VENDORPHONE'"`              // 客服电话
+	Vendorattr  string    `json:"vendorattr"  xorm:"'VENDORATTR'"`                // 附件(多张,逗号分隔)
+	Createtime  time.Time `json:"createtime"  xorm:"'CREATETIME'"`                // 创建时间
+	Creatorid   int64     `json:"creatorid"  xorm:"'CREATORID'"`                  // 创建人
+	Modifierid  int64     `json:"modifierid"  xorm:"'MODIFIERID'"`                // 修改人
+	Modifytime  time.Time `json:"modifytime"  xorm:"'MODIFYTIME'"`                // 修改时间
+}
+
+// TableName is HSBY_SUPPLIERINFO
+func (Hsbysupplierinfo) TableName() string {
+	return "HSBY_SUPPLIERINFO"
+}
+
 // TableName is HSBY_GOODSEX
 func (Hsbygoodsex) TableName() string {
 	return "HSBY_GOODSEX"
@@ -126,6 +144,8 @@ type HsbyListingGoodsDetail struct {
 	Currency     string `json:"currency" xorm:"'CURRENCY'"`         // 货币
 	Currencysign string `json:"currencysign" xorm:"'CURRENCYSIGN'"` // 货币符号
 
+	Vendorname string `json:"vendorname"  xorm:"'VENDORNAME'"` // 供应商名称
+
 	Last float64 `json:"last" xorm:"-"` // 现价
 }
 
@@ -142,9 +162,11 @@ func GetHsbyListingGoodsDetail(goodsID int) (*HsbyListingGoodsDetail, error) {
 	session := engine.Table("GOODS").
 		Select(`GOODS.GOODSID, GOODS.GOODSCODE, GOODS.GOODSNAME, GOODS.DECIMALPLACE,
 				HSBY_GOODSEX.HOTINDEX, HSBY_GOODSEX.VIDEOURLS, HSBY_GOODSEX.PICURLS, HSBY_GOODSEX.DESCPROVINCEID, HSBY_GOODSEX.Desccityid, HSBY_GOODSEX.Goodsdesc,
-				ENUMDICITEM.ENUMDICNAME CURRENCY, ENUMDICITEM.PARAM2 CURRENCYSIGN`).
+				ENUMDICITEM.ENUMDICNAME CURRENCY, ENUMDICITEM.PARAM2 CURRENCYSIGN, 
+				HSBY_SUPPLIERINFO.VENDORNAME`).
 		Join("LEFT", "HSBY_GOODSEX", "HSBY_GOODSEX.GOODSID = GOODS.GOODSID").
 		Join("LEFT", "ENUMDICITEM", "ENUMDICITEM.ENUMITEMNAME = GOODS.CURRENCYID and ENUMDICITEM.ENUMDICCODE = 'currency'").
+		Join("LEFT", "HSBY_SUPPLIERINFO", "HSBY_SUPPLIERINFO.VENDORID = HSBY_GOODSEX.VENDORID").
 		Where("GOODS.GOODSID = ?", goodsID)
 	if err := session.Find(&details); err != nil {
 		return nil, err