修改“委托单查询返回模型（合约市场）”接口

controllers/order/order.go

@@ -213,6 +213,9 @@ type QueryTradeOrderDetailRsp struct {
 	Orderstatus         int64     `json:"orderstatus"  xorm:"'ORDERSTATUS'"`                    // 委托状态 - 1： 委托请求 2：待冻结 3：委托成功 4： 委托失败 5：配对成功 6： 已撤销 7：部分成交 8：已成交 9：部成部撤 10：成交失败 11：已拒绝 12:经过摘牌(先摘后挂专用-先摘后挂已摘过) 13:冻结成功(通道交易专用) 14:通道已撤 15:通道部成部撤 16:成交失败违约(荷兰式竞拍专用)
 	Listingselecttype   int64     `json:"listingselecttype"  xorm:"'LISTINGSELECTTYPE'"`        // 挂牌点选类型 - 1:挂牌 2:摘牌 3:先摘后挂
 	Delistingtype       int64     `json:"delistingtype"  xorm:"'DELISTINGTYPE'"`                // 摘牌类型 - 1:价格最优 2:点选成交
+	Ordersrc            int64     `json:"ordersrc"  xorm:"'ORDERSRC'"`                          // 委托来源 -  1:客户端 2:管理端 3:风控服务 4:交割服务 5:交易服务 6:交易日结 7:商品强平 8:管理端商品退市强平 9:交易接口 10:交割服务商被动(受托竞价) 11:预埋触发
+	Clienttype          int64     `json:"clienttype"  xorm:"'CLIENTTYPE'"`                      // 客户端类型 - 0:保留为未填终端类型 1:PC管理端 2:PC交易端 3:手机客户端_安卓 4:网页客户端 5:微信客户端 6:手机客户端_苹果 7:网上开户客户端 8:无效终端编号 9:报价终端(中江)
+	Operatorid          int64     `json:"operatorid"  xorm:"'OPERATORID'"`                      // 登录账号(LoginID)
 
 	// 关联字段
 	GoodsCode  string `json:"goodscode" xorm:"GOODSCODE"`      // 商品代码

controllers/szdz/szdz.go

@@ -114,13 +114,20 @@ type QueryGoodsPickupReq struct {
 	TakeOrderStatus int    `form:"takeOrderStatus"`
 }
 
+// QueryGoodsPickupRsp  商品提货单查询返回模型
+type QueryGoodsPickupRsp struct {
+	models.Szdz3goodspickup `xorm:"extends"`
+	Goodscode               string `json:"goodscode"  xorm:"'GOODSCODE'"` // 商品代码
+	Goodsname               string `json:"goodsname"  xorm:"'GOODSNAME'"` // 商品名称
+}
+
 // QueryGoodsPickup 商品提货单查询
 // @Summary 商品提货单查询
 // @Produce json
 // @Security ApiKeyAuth
 // @Param accountID query string true "资金账户 - 格式：1,2,3"
 // @Param takeOrderStatus query int false "提货状态 - 1:待发货 2:已发货 3:已收货"
-// @Success 200 {object} models.Szdz3goodspickup
+// @Success 200 {object} QueryGoodsPickupRsp
 // @Failure 500 {object} app.Response
 // @Router /SZDZ/QueryGoodsPickup [get]
 // @Tags 尚志大宗
@@ -135,11 +142,13 @@ func QueryGoodsPickup(c *gin.Context) {
 		return
 	}
 
-	datas := make([]models.Szdz3goodspickup, 0)
+	datas := make([]QueryGoodsPickupRsp, 0)
 	engine := db.GetEngine()
-	s := engine.Where(fmt.Sprintf(`ACCOUNTID in (%s)`, req.AccountID))
+	s := engine.Join("INNER", "GOODS", "GOODS.GOODSID = SZDZ3_GOODSPICKUP.GOODSID").
+		Select("SZDZ3_GOODSPICKUP.*, GOODS.GOODSCODE, GOODS.GOODSNAME").
+		Where(fmt.Sprintf(`SZDZ3_GOODSPICKUP.ACCOUNTID in (%s)`, req.AccountID))
 	if req.TakeOrderStatus > 0 {
-		s = s.And("TAKEORDERSTATUS = ?", req.TakeOrderStatus)
+		s = s.And("SZDZ3_GOODSPICKUP.TAKEORDERSTATUS = ?", req.TakeOrderStatus)
 	}
 	if err := s.Find(&datas); err != nil {
 		// 查询失败

docs/docs.go

@@ -750,7 +750,7 @@ var doc = `{
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/models.Szdz3goodspickup"
+                            "$ref": "#/definitions/szdz.QueryGoodsPickupRsp"
                         }
                     },
                     "500": {
@@ -2498,94 +2498,6 @@ var doc = `{
                 }
             }
         },
-        "models.Szdz3goodspickup": {
-            "type": "object",
-            "required": [
-                "takeorderid"
-            ],
-            "properties": {
-                "accountid": {
-                    "description": "账户ID",
-                    "type": "integer"
-                },
-                "address": {
-                    "description": "提货人详细地址",
-                    "type": "string"
-                },
-                "auditer": {
-                    "description": "审核人",
-                    "type": "integer"
-                },
-                "audittime": {
-                    "description": "审核时间",
-                    "type": "string"
-                },
-                "cardnum": {
-                    "description": "提货人证件号码",
-                    "type": "string"
-                },
-                "cardtypeid": {
-                    "description": "提货人证件类型",
-                    "type": "integer"
-                },
-                "checkremark": {
-                    "description": "审核备注",
-                    "type": "string"
-                },
-                "goodsid": {
-                    "description": "商品ID",
-                    "type": "integer"
-                },
-                "handlestatus": {
-                    "description": "处理状态",
-                    "type": "integer"
-                },
-                "marketid": {
-                    "description": "市场ID",
-                    "type": "integer"
-                },
-                "phonenum": {
-                    "description": "提货人联系方式",
-                    "type": "string"
-                },
-                "qty": {
-                    "description": "提货数量",
-                    "type": "number"
-                },
-                "recivername": {
-                    "description": "提货人姓名",
-                    "type": "string"
-                },
-                "reqtime": {
-                    "description": "更新时间",
-                    "type": "string"
-                },
-                "takemode": {
-                    "description": "提货方式 - 2:自提 3:配送",
-                    "type": "integer"
-                },
-                "takeorderid": {
-                    "description": "提货单号(905+Unix秒时间戳(10位)+xxxxxx)",
-                    "type": "integer"
-                },
-                "takeorderstatus": {
-                    "description": "提货状态 - 1:待发货 2:已发货 3:已收货",
-                    "type": "integer"
-                },
-                "takeremark": {
-                    "description": "提货备注",
-                    "type": "string"
-                },
-                "tradedate": {
-                    "description": "交易日(yyyyMMdd)",
-                    "type": "string"
-                },
-                "userid": {
-                    "description": "用户ID",
-                    "type": "integer"
-                }
-            }
-        },
         "models.Tablecolumnconfig": {
             "type": "object",
             "required": [
@@ -2687,6 +2599,10 @@ var doc = `{
                     "description": "撤单数量",
                     "type": "integer"
                 },
+                "clienttype": {
+                    "description": "客户端类型 - 0:保留为未填终端类型 1:PC管理端 2:PC交易端 3:手机客户端_安卓 4:网页客户端 5:微信客户端 6:手机客户端_苹果 7:网上开户客户端 8:无效终端编号 9:报价终端(中江)",
+                    "type": "integer"
+                },
                 "closefreezecharge": {
                     "description": "平仓冻结手续费(先建后平操作,需要记录)",
                     "type": "number"
@@ -2763,6 +2679,10 @@ var doc = `{
                     "description": "操作类型 - 1:正常下单 2:斩仓 3:转单 4:结算撤单 5:系统卖出(适用于先平后建的卖出) 6:行情源报价 7:（结算)到期强平 8:（结算)协议转让 9:系统对冲单 10:（结算)到期无效 11:交割协议转让 12:交割协议平仓 13:交割成交(所有权) 14:管理端强行平仓 15:管理端协议转让",
                     "type": "integer"
                 },
+                "operatorid": {
+                    "description": "登录账号(LoginID)",
+                    "type": "integer"
+                },
                 "orderid": {
                     "description": "委托单字段",
                     "type": "integer"
@@ -2775,6 +2695,10 @@ var doc = `{
                     "description": "委托数量",
                     "type": "integer"
                 },
+                "ordersrc": {
+                    "description": "委托来源 -  1:客户端 2:管理端 3:风控服务 4:交割服务 5:交易服务 6:交易日结 7:商品强平 8:管理端商品退市强平 9:交易接口 10:交割服务商被动(受托竞价) 11:预埋触发",
+                    "type": "integer"
+                },
                 "orderstatus": {
                     "description": "委托状态 - 1： 委托请求 2：待冻结 3：委托成功 4： 委托失败 5：配对成功 6： 已撤销 7：部分成交 8：已成交 9：部成部撤 10：成交失败 11：已拒绝 12:经过摘牌(先摘后挂专用-先摘后挂已摘过) 13:冻结成功(通道交易专用) 14:通道已撤 15:通道部成部撤 16:成交失败违约(荷兰式竞拍专用)",
                     "type": "integer"
@@ -2934,6 +2858,102 @@ var doc = `{
                 }
             }
         },
+        "szdz.QueryGoodsPickupRsp": {
+            "type": "object",
+            "required": [
+                "takeorderid"
+            ],
+            "properties": {
+                "accountid": {
+                    "description": "账户ID",
+                    "type": "integer"
+                },
+                "address": {
+                    "description": "提货人详细地址",
+                    "type": "string"
+                },
+                "auditer": {
+                    "description": "审核人",
+                    "type": "integer"
+                },
+                "audittime": {
+                    "description": "审核时间",
+                    "type": "string"
+                },
+                "cardnum": {
+                    "description": "提货人证件号码",
+                    "type": "string"
+                },
+                "cardtypeid": {
+                    "description": "提货人证件类型",
+                    "type": "integer"
+                },
+                "checkremark": {
+                    "description": "审核备注",
+                    "type": "string"
+                },
+                "goodscode": {
+                    "description": "商品代码",
+                    "type": "string"
+                },
+                "goodsid": {
+                    "description": "商品ID",
+                    "type": "integer"
+                },
+                "goodsname": {
+                    "description": "商品名称",
+                    "type": "string"
+                },
+                "handlestatus": {
+                    "description": "处理状态",
+                    "type": "integer"
+                },
+                "marketid": {
+                    "description": "市场ID",
+                    "type": "integer"
+                },
+                "phonenum": {
+                    "description": "提货人联系方式",
+                    "type": "string"
+                },
+                "qty": {
+                    "description": "提货数量",
+                    "type": "number"
+                },
+                "recivername": {
+                    "description": "提货人姓名",
+                    "type": "string"
+                },
+                "reqtime": {
+                    "description": "更新时间",
+                    "type": "string"
+                },
+                "takemode": {
+                    "description": "提货方式 - 2:自提 3:配送",
+                    "type": "integer"
+                },
+                "takeorderid": {
+                    "description": "提货单号(905+Unix秒时间戳(10位)+xxxxxx)",
+                    "type": "integer"
+                },
+                "takeorderstatus": {
+                    "description": "提货状态 - 1:待发货 2:已发货 3:已收货",
+                    "type": "integer"
+                },
+                "takeremark": {
+                    "description": "提货备注",
+                    "type": "string"
+                },
+                "tradedate": {
+                    "description": "交易日(yyyyMMdd)",
+                    "type": "string"
+                },
+                "userid": {
+                    "description": "用户ID",
+                    "type": "integer"
+                }
+            }
+        },
         "szdz.QueryRecieptOrderRsp": {
             "type": "object",
             "properties": {

docs/swagger.json

@@ -734,7 +734,7 @@
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/models.Szdz3goodspickup"
+                            "$ref": "#/definitions/szdz.QueryGoodsPickupRsp"
                         }
                     },
                     "500": {
@@ -2482,94 +2482,6 @@
                 }
             }
         },
-        "models.Szdz3goodspickup": {
-            "type": "object",
-            "required": [
-                "takeorderid"
-            ],
-            "properties": {
-                "accountid": {
-                    "description": "账户ID",
-                    "type": "integer"
-                },
-                "address": {
-                    "description": "提货人详细地址",
-                    "type": "string"
-                },
-                "auditer": {
-                    "description": "审核人",
-                    "type": "integer"
-                },
-                "audittime": {
-                    "description": "审核时间",
-                    "type": "string"
-                },
-                "cardnum": {
-                    "description": "提货人证件号码",
-                    "type": "string"
-                },
-                "cardtypeid": {
-                    "description": "提货人证件类型",
-                    "type": "integer"
-                },
-                "checkremark": {
-                    "description": "审核备注",
-                    "type": "string"
-                },
-                "goodsid": {
-                    "description": "商品ID",
-                    "type": "integer"
-                },
-                "handlestatus": {
-                    "description": "处理状态",
-                    "type": "integer"
-                },
-                "marketid": {
-                    "description": "市场ID",
-                    "type": "integer"
-                },
-                "phonenum": {
-                    "description": "提货人联系方式",
-                    "type": "string"
-                },
-                "qty": {
-                    "description": "提货数量",
-                    "type": "number"
-                },
-                "recivername": {
-                    "description": "提货人姓名",
-                    "type": "string"
-                },
-                "reqtime": {
-                    "description": "更新时间",
-                    "type": "string"
-                },
-                "takemode": {
-                    "description": "提货方式 - 2:自提 3:配送",
-                    "type": "integer"
-                },
-                "takeorderid": {
-                    "description": "提货单号(905+Unix秒时间戳(10位)+xxxxxx)",
-                    "type": "integer"
-                },
-                "takeorderstatus": {
-                    "description": "提货状态 - 1:待发货 2:已发货 3:已收货",
-                    "type": "integer"
-                },
-                "takeremark": {
-                    "description": "提货备注",
-                    "type": "string"
-                },
-                "tradedate": {
-                    "description": "交易日(yyyyMMdd)",
-                    "type": "string"
-                },
-                "userid": {
-                    "description": "用户ID",
-                    "type": "integer"
-                }
-            }
-        },
         "models.Tablecolumnconfig": {
             "type": "object",
             "required": [
@@ -2671,6 +2583,10 @@
                     "description": "撤单数量",
                     "type": "integer"
                 },
+                "clienttype": {
+                    "description": "客户端类型 - 0:保留为未填终端类型 1:PC管理端 2:PC交易端 3:手机客户端_安卓 4:网页客户端 5:微信客户端 6:手机客户端_苹果 7:网上开户客户端 8:无效终端编号 9:报价终端(中江)",
+                    "type": "integer"
+                },
                 "closefreezecharge": {
                     "description": "平仓冻结手续费(先建后平操作,需要记录)",
                     "type": "number"
@@ -2747,6 +2663,10 @@
                     "description": "操作类型 - 1:正常下单 2:斩仓 3:转单 4:结算撤单 5:系统卖出(适用于先平后建的卖出) 6:行情源报价 7:（结算)到期强平 8:（结算)协议转让 9:系统对冲单 10:（结算)到期无效 11:交割协议转让 12:交割协议平仓 13:交割成交(所有权) 14:管理端强行平仓 15:管理端协议转让",
                     "type": "integer"
                 },
+                "operatorid": {
+                    "description": "登录账号(LoginID)",
+                    "type": "integer"
+                },
                 "orderid": {
                     "description": "委托单字段",
                     "type": "integer"
@@ -2759,6 +2679,10 @@
                     "description": "委托数量",
                     "type": "integer"
                 },
+                "ordersrc": {
+                    "description": "委托来源 -  1:客户端 2:管理端 3:风控服务 4:交割服务 5:交易服务 6:交易日结 7:商品强平 8:管理端商品退市强平 9:交易接口 10:交割服务商被动(受托竞价) 11:预埋触发",
+                    "type": "integer"
+                },
                 "orderstatus": {
                     "description": "委托状态 - 1： 委托请求 2：待冻结 3：委托成功 4： 委托失败 5：配对成功 6： 已撤销 7：部分成交 8：已成交 9：部成部撤 10：成交失败 11：已拒绝 12:经过摘牌(先摘后挂专用-先摘后挂已摘过) 13:冻结成功(通道交易专用) 14:通道已撤 15:通道部成部撤 16:成交失败违约(荷兰式竞拍专用)",
                     "type": "integer"
@@ -2918,6 +2842,102 @@
                 }
             }
         },
+        "szdz.QueryGoodsPickupRsp": {
+            "type": "object",
+            "required": [
+                "takeorderid"
+            ],
+            "properties": {
+                "accountid": {
+                    "description": "账户ID",
+                    "type": "integer"
+                },
+                "address": {
+                    "description": "提货人详细地址",
+                    "type": "string"
+                },
+                "auditer": {
+                    "description": "审核人",
+                    "type": "integer"
+                },
+                "audittime": {
+                    "description": "审核时间",
+                    "type": "string"
+                },
+                "cardnum": {
+                    "description": "提货人证件号码",
+                    "type": "string"
+                },
+                "cardtypeid": {
+                    "description": "提货人证件类型",
+                    "type": "integer"
+                },
+                "checkremark": {
+                    "description": "审核备注",
+                    "type": "string"
+                },
+                "goodscode": {
+                    "description": "商品代码",
+                    "type": "string"
+                },
+                "goodsid": {
+                    "description": "商品ID",
+                    "type": "integer"
+                },
+                "goodsname": {
+                    "description": "商品名称",
+                    "type": "string"
+                },
+                "handlestatus": {
+                    "description": "处理状态",
+                    "type": "integer"
+                },
+                "marketid": {
+                    "description": "市场ID",
+                    "type": "integer"
+                },
+                "phonenum": {
+                    "description": "提货人联系方式",
+                    "type": "string"
+                },
+                "qty": {
+                    "description": "提货数量",
+                    "type": "number"
+                },
+                "recivername": {
+                    "description": "提货人姓名",
+                    "type": "string"
+                },
+                "reqtime": {
+                    "description": "更新时间",
+                    "type": "string"
+                },
+                "takemode": {
+                    "description": "提货方式 - 2:自提 3:配送",
+                    "type": "integer"
+                },
+                "takeorderid": {
+                    "description": "提货单号(905+Unix秒时间戳(10位)+xxxxxx)",
+                    "type": "integer"
+                },
+                "takeorderstatus": {
+                    "description": "提货状态 - 1:待发货 2:已发货 3:已收货",
+                    "type": "integer"
+                },
+                "takeremark": {
+                    "description": "提货备注",
+                    "type": "string"
+                },
+                "tradedate": {
+                    "description": "交易日(yyyyMMdd)",
+                    "type": "string"
+                },
+                "userid": {
+                    "description": "用户ID",
+                    "type": "integer"
+                }
+            }
+        },
         "szdz.QueryRecieptOrderRsp": {
             "type": "object",
             "properties": {

docs/swagger.yaml

@@ -1179,71 +1179,6 @@ definitions:
     required:
     - spotcontractid
     type: object
-  models.Szdz3goodspickup:
-    properties:
-      accountid:
-        description: 账户ID
-        type: integer
-      address:
-        description: 提货人详细地址
-        type: string
-      auditer:
-        description: 审核人
-        type: integer
-      audittime:
-        description: 审核时间
-        type: string
-      cardnum:
-        description: 提货人证件号码
-        type: string
-      cardtypeid:
-        description: 提货人证件类型
-        type: integer
-      checkremark:
-        description: 审核备注
-        type: string
-      goodsid:
-        description: 商品ID
-        type: integer
-      handlestatus:
-        description: 处理状态
-        type: integer
-      marketid:
-        description: 市场ID
-        type: integer
-      phonenum:
-        description: 提货人联系方式
-        type: string
-      qty:
-        description: 提货数量
-        type: number
-      recivername:
-        description: 提货人姓名
-        type: string
-      reqtime:
-        description: 更新时间
-        type: string
-      takemode:
-        description: 提货方式 - 2:自提 3:配送
-        type: integer
-      takeorderid:
-        description: 提货单号(905+Unix秒时间戳(10位)+xxxxxx)
-        type: integer
-      takeorderstatus:
-        description: 提货状态 - 1:待发货 2:已发货 3:已收货
-        type: integer
-      takeremark:
-        description: 提货备注
-        type: string
-      tradedate:
-        description: 交易日(yyyyMMdd)
-        type: string
-      userid:
-        description: 用户ID
-        type: integer
-    required:
-    - takeorderid
-    type: object
   models.Tablecolumnconfig:
     properties:
       aligntype:
@@ -1308,6 +1243,9 @@ definitions:
       cancelqty:
         description: 撤单数量
         type: integer
+      clienttype:
+        description: 客户端类型 - 0:保留为未填终端类型 1:PC管理端 2:PC交易端 3:手机客户端_安卓 4:网页客户端 5:微信客户端 6:手机客户端_苹果 7:网上开户客户端 8:无效终端编号 9:报价终端(中江)
+        type: integer
       closefreezecharge:
         description: 平仓冻结手续费(先建后平操作,需要记录)
         type: number
@@ -1365,6 +1303,9 @@ definitions:
       operatetype:
         description: 操作类型 - 1:正常下单 2:斩仓 3:转单 4:结算撤单 5:系统卖出(适用于先平后建的卖出) 6:行情源报价 7:（结算)到期强平 8:（结算)协议转让 9:系统对冲单 10:（结算)到期无效 11:交割协议转让 12:交割协议平仓 13:交割成交(所有权) 14:管理端强行平仓 15:管理端协议转让
         type: integer
+      operatorid:
+        description: 登录账号(LoginID)
+        type: integer
       orderid:
         description: 委托单字段
         type: integer
@@ -1374,6 +1315,9 @@ definitions:
       orderqty:
         description: 委托数量
         type: integer
+      ordersrc:
+        description: 委托来源 -  1:客户端 2:管理端 3:风控服务 4:交割服务 5:交易服务 6:交易日结 7:商品强平 8:管理端商品退市强平 9:交易接口 10:交割服务商被动(受托竞价) 11:预埋触发
+        type: integer
       orderstatus:
         description: 委托状态 - 1： 委托请求 2：待冻结 3：委托成功 4： 委托失败 5：配对成功 6： 已撤销 7：部分成交 8：已成交 9：部成部撤 10：成交失败 11：已拒绝 12:经过摘牌(先摘后挂专用-先摘后挂已摘过) 13:冻结成功(通道交易专用) 14:通道已撤 15:通道部成部撤 16:成交失败违约(荷兰式竞拍专用)
         type: integer
@@ -1505,6 +1449,77 @@ definitions:
         description: 交易模式
         type: integer
     type: object
+  szdz.QueryGoodsPickupRsp:
+    properties:
+      accountid:
+        description: 账户ID
+        type: integer
+      address:
+        description: 提货人详细地址
+        type: string
+      auditer:
+        description: 审核人
+        type: integer
+      audittime:
+        description: 审核时间
+        type: string
+      cardnum:
+        description: 提货人证件号码
+        type: string
+      cardtypeid:
+        description: 提货人证件类型
+        type: integer
+      checkremark:
+        description: 审核备注
+        type: string
+      goodscode:
+        description: 商品代码
+        type: string
+      goodsid:
+        description: 商品ID
+        type: integer
+      goodsname:
+        description: 商品名称
+        type: string
+      handlestatus:
+        description: 处理状态
+        type: integer
+      marketid:
+        description: 市场ID
+        type: integer
+      phonenum:
+        description: 提货人联系方式
+        type: string
+      qty:
+        description: 提货数量
+        type: number
+      recivername:
+        description: 提货人姓名
+        type: string
+      reqtime:
+        description: 更新时间
+        type: string
+      takemode:
+        description: 提货方式 - 2:自提 3:配送
+        type: integer
+      takeorderid:
+        description: 提货单号(905+Unix秒时间戳(10位)+xxxxxx)
+        type: integer
+      takeorderstatus:
+        description: 提货状态 - 1:待发货 2:已发货 3:已收货
+        type: integer
+      takeremark:
+        description: 提货备注
+        type: string
+      tradedate:
+        description: 交易日(yyyyMMdd)
+        type: string
+      userid:
+        description: 用户ID
+        type: integer
+    required:
+    - takeorderid
+    type: object
   szdz.QueryRecieptOrderRsp:
     properties:
       accountName:
@@ -1993,7 +2008,7 @@ paths:
         "200":
           description: OK
           schema:
-            $ref: '#/definitions/models.Szdz3goodspickup'
+            $ref: '#/definitions/szdz.QueryGoodsPickupRsp'
         "500":
           description: Internal Server Error
           schema:

models/szdzModels.go

@@ -30,3 +30,36 @@ type Szdz3goodspickup struct {
 func (Szdz3goodspickup) TableName() string {
 	return "SZDZ3_GOODSPICKUP"
 }
+
+// Szdz3convertlog 交易系统转换流水表
+type Szdz3convertlog struct {
+	Logid          uint64    `json:"logid"  xorm:"'LOGID'" binding:"required"` // LogID(901+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
+	Tradedate      string    `json:"tradedate"  xorm:"'TRADEDATE'"`            // 交易日(yyyyMMdd)
+	Converttype    uint32    `json:"converttype"  xorm:"'CONVERTTYPE'"`        // 转换类型 - 1:金点赞转交易 2:金点拍转交易 3:交易转金点赞 4:交易转金点拍
+	Outergoodscode string    `json:"outergoodscode"  xorm:"'OUTERGOODSCODE'"`  // 外部商品代码[JD\PD]
+	Innergoodsid   uint64    `json:"innergoodsid"  xorm:"'INNERGOODSID'"`      // 内部商品ID
+	Outvalue       float64   `json:"outvalue"  xorm:"'OUTVALUE'"`              // 源值
+	Invalue        float64   `json:"invalue"  xorm:"'INVALUE'"`                // 目标值
+	Outratio       uint64    `json:"outratio"  xorm:"'OUTRATIO'"`              // 配置转出比值
+	Inratio        uint64    `json:"inratio"  xorm:"'INRATIO'"`                // 配置转入比值
+	Daymaxvalue    float64   `json:"daymaxvalue"  xorm:"'DAYMAXVALUE'"`        // 配置当日最大转入限制
+	Timemaxvalue   float64   `json:"timemaxvalue"  xorm:"'TIMEMAXVALUE'"`      // 配置单次最大转入限制
+	Timeminvalue   float64   `json:"timeminvalue"  xorm:"'TIMEMINVALUE'"`      // 配置单次最小数量限制
+	Userid         uint64    `json:"userid"  xorm:"'USERID'"`                  // 用户ID
+	Accountid      uint64    `json:"accountid"  xorm:"'ACCOUNTID'"`            // 资金账户ID
+	Createtime     time.Time `json:"createtime"  xorm:"'CREATETIME'"`          // 记账时间
+	Handlestatus   uint32    `json:"handlestatus"  xorm:"'HANDLESTATUS'"`      // 处理状态
+	Clientticket   string    `json:"clientticket"  xorm:"'CLIENTTICKET'"`      // 客户端流水号
+	Remark         string    `json:"remark"  xorm:"'REMARK'"`                  // 备注
+	Mobile         string    `json:"mobile"  xorm:"'MOBILE'"`                  // 手机号码(加密存储)
+	Sessionid      uint64    `json:"sessionid"  xorm:"'SESSIONID'"`            // 会话ID
+	Daymaxvalue2   float64   `json:"daymaxvalue2"  xorm:"'DAYMAXVALUE2'"`      // 配置当日最大转入限制(转入)
+	Timemaxvalue2  float64   `json:"timemaxvalue2"  xorm:"'TIMEMAXVALUE2'"`    // 配置单次最大转入限制(转入)
+	Timeminvalue2  float64   `json:"timeminvalue2"  xorm:"'TIMEMINVALUE2'"`    // 配置单次最小数量限制(转入)
+	Pddecimalplace uint32    `json:"pddecimalplace"  xorm:"'PDDECIMALPLACE'"`  // PD小数位
+}
+
+// TableName is SZDZ3_CONVERTLOG
+func (Szdz3convertlog) TableName() string {
+	return "SZDZ3_CONVERTLOG"
+}