Selaa lähdekoodia

查仓单委托、成交、提货接口增加bannerpicurl 字段

zou.yingbin 3 vuotta sitten
vanhempi
commit
90e4e73c7c
5 muutettua tiedostoa jossa 40 lisäystä ja 1 poistoa
  1. 1 1
      controllers/user/user.go
  2. 12 0
      docs/docs.go
  3. 12 0
      docs/swagger.json
  4. 9 0
      docs/swagger.yaml
  5. 6 0
      models/wrTrade2.go

+ 1 - 1
controllers/user/user.go

@@ -369,7 +369,7 @@ func LoginQuery(c *gin.Context) {
 	}
 
 	// 查询成功
-	logger.GetLogger().Debugln("LoginQuery successed: %v", rsp)
+	logger.GetLogger().Debugln("LoginQuery successed")
 	appG.Response(http.StatusOK, e.SUCCESS, rsp)
 }
 

+ 12 - 0
docs/docs.go

@@ -35438,6 +35438,10 @@ var doc = `{
                     "description": "挂牌金额 = 委托数量 * 固定价或升贴水",
                     "type": "number"
                 },
+                "bannerpicurl": {
+                    "description": "Banner图",
+                    "type": "string"
+                },
                 "begindate": {
                     "description": "开始交易日(yyyymmdd)",
                     "type": "string"
@@ -35825,6 +35829,10 @@ var doc = `{
                     "description": "申请类型 - 1:预约入库 2:预约出库 3:入库注册 4:出库注销",
                     "type": "integer"
                 },
+                "bannerpicurl": {
+                    "description": "Banner图",
+                    "type": "string"
+                },
                 "begindate": {
                     "description": "开始交易日(yyyymmdd)",
                     "type": "string"
@@ -37363,6 +37371,10 @@ var doc = `{
                     "description": "资金账号",
                     "type": "integer"
                 },
+                "bannerpicurl": {
+                    "description": "Banner图",
+                    "type": "string"
+                },
                 "begindate": {
                     "description": "开始交易日(yyyymmdd)",
                     "type": "string"

+ 12 - 0
docs/swagger.json

@@ -35423,6 +35423,10 @@
                     "description": "挂牌金额 = 委托数量 * 固定价或升贴水",
                     "type": "number"
                 },
+                "bannerpicurl": {
+                    "description": "Banner图",
+                    "type": "string"
+                },
                 "begindate": {
                     "description": "开始交易日(yyyymmdd)",
                     "type": "string"
@@ -35810,6 +35814,10 @@
                     "description": "申请类型 - 1:预约入库 2:预约出库 3:入库注册 4:出库注销",
                     "type": "integer"
                 },
+                "bannerpicurl": {
+                    "description": "Banner图",
+                    "type": "string"
+                },
                 "begindate": {
                     "description": "开始交易日(yyyymmdd)",
                     "type": "string"
@@ -37348,6 +37356,10 @@
                     "description": "资金账号",
                     "type": "integer"
                 },
+                "bannerpicurl": {
+                    "description": "Banner图",
+                    "type": "string"
+                },
                 "begindate": {
                     "description": "开始交易日(yyyymmdd)",
                     "type": "string"

+ 9 - 0
docs/swagger.yaml

@@ -15738,6 +15738,9 @@ definitions:
       amount:
         description: 挂牌金额 = 委托数量 * 固定价或升贴水
         type: number
+      bannerpicurl:
+        description: Banner图
+        type: string
       begindate:
         description: 开始交易日(yyyymmdd)
         type: string
@@ -16028,6 +16031,9 @@ definitions:
       applytype:
         description: 申请类型 - 1:预约入库 2:预约出库 3:入库注册 4:出库注销
         type: integer
+      bannerpicurl:
+        description: Banner图
+        type: string
       begindate:
         description: 开始交易日(yyyymmdd)
         type: string
@@ -17176,6 +17182,9 @@ definitions:
       accountid:
         description: 资金账号
         type: integer
+      bannerpicurl:
+        description: Banner图
+        type: string
       begindate:
         description: 开始交易日(yyyymmdd)
         type: string

+ 6 - 0
models/wrTrade2.go

@@ -665,6 +665,7 @@ type WrOrderDetail struct {
 	PERFORMANCETEMPLATEID int64    `json:"performancetemplateid"  xorm:"'PERFORMANCETEMPLATEID'"` // 履约模板id
 	LADINGBILLID          string   `json:"ladingbillid"  xorm:"LADINGBILLID" form:"ladingbillid"` // 提单ID(208+Unix秒时间戳(10位)+xxxxxx)
 	SUBNUM                int32    `json:"-"  xorm:"SUBNUM" form:"subnum"`                        // 提单子单号
+	BANNERPICURL          string   `json:"bannerpicurl"  xorm:"BANNERPICURL"`                     // Banner图
 
 	Wr2FactorType `xorm:"extends"`
 	PageEx        `xorm:"extends"`
@@ -722,6 +723,7 @@ with tmp as
          g.deliverygoodsname,
          w.wrstandardcode,
          w.wrstandardname,
+         w.bannerpicurl,
          h.warehousecode,
          h.warehousename,
          e.enumdicname,
@@ -940,6 +942,7 @@ type WrTradeDetail struct {
 	ACCOUNTID       int64   `json:"accountid"  xorm:"ACCOUNTID"`                        // 资金账号
 	MATCHACCOUNTID  int64   `json:"matchaccountid"  xorm:"MATCHACCOUNTID"`              // 对手账号
 	MATCHUSERNAME   string  `json:"matchusername"  xorm:"'MATCHUSERNAME'"`              // 对手方
+	BANNERPICURL    string  `json:"bannerpicurl"  xorm:"BANNERPICURL"`                  // Banner图
 	Wr2FactorType   `xorm:"extends"`
 	PageEx          `xorm:"extends"`
 
@@ -962,6 +965,7 @@ func (r *WrTradeDetail) buildSql() string {
 		"         g.deliverygoodsname," +
 		"         w.wrstandardcode," +
 		"         w.wrstandardname," +
+		"         w.bannerpicurl," +
 		"         h.warehousecode," +
 		"         h.warehousename," +
 		"         e.enumdicname," +
@@ -2857,6 +2861,7 @@ type WrOutInApply struct {
 	QTY            int64  `json:"qty"  xorm:"'QTY'"`                       // 数量
 	EXPRESSNUM     string `json:"expressnum"  xorm:"'EXPRESSNUM'"`         // 物流单号
 	EXPRESSCOMPANY string `json:"expresscompany"  xorm:"'EXPRESSCOMPANY'"` // 物流公司
+	BANNERPICURL   string `json:"bannerpicurl"  xorm:"BANNERPICURL"`       // Banner图
 	Wr2FactorType  `xorm:"extends"`
 
 	BEGINDATE string `json:"begindate" form:"begindate"` // 开始交易日(yyyymmdd)
@@ -2877,6 +2882,7 @@ func (r *WrOutInApply) buildSql() string {
 		"         g.deliverygoodsname," +
 		"         w.wrstandardcode," +
 		"         w.wrstandardname," +
+		"         w.bannerpicurl," +
 		"         w.minivalue," +
 		"         h.warehousecode," +
 		"         h.warehousename," +