处理资金流水查询BUG

controllers/taaccount/taaccount.go

@@ -114,15 +114,15 @@ type QueryAmountLogReq struct {
 type QueryAmountLogRsp struct {
 	models.Taaccountlog `xorm:"extends"`
 
-	MarketName      string `json:"marketname"  xorm:"'MARKETNAME'"`        // 市场名称
-	TradeMode       uint32 `json:"trademode"  xorm:"'TRADEMODE'"`          // 交易模式
-	GoodsCode       string `json:"goodscode"  xorm:"'GOODSCODE'"`          // 商品代码
-	GoodsName       string `json:"goodsname"  xorm:"'GOODSNAME'"`          // 商品名称
-	AGoodsCode      string `json:"agoodscode"  xorm:"'AGOODSCODE'"`        // 竞拍商品代码
-	AGoodsName      string `json:"agoodsname"  xorm:"'GOODSNAME'"`         // 竞拍商品名称
-	DGoodsCode      string `json:"dgoodscode"  xorm:"'DGOODSCODE'"`        // 交割商品代码
-	DGoodsName      string `json:"dgoodsname"  xorm:"'DGOODSNAME'"`        // 交割商品名称
-	OperateTypeName string `json:"OPERATETYPENAME" xorm:"OPERATETYPENAME"` // 资金操作类型名称
+	MarketName      string `json:"marketname"  xorm:"'MARKETNAME'"` // 市场名称
+	TradeMode       uint32 `json:"trademode"  xorm:"'TRADEMODE'"`   // 交易模式
+	GoodsCode       string `json:"goodscode"  xorm:"'GOODSCODE'"`   // 商品代码
+	GoodsName       string `json:"goodsname"  xorm:"'GOODSNAME'"`   // 商品名称
+	AGoodsCode      string `json:"agoodscode"  xorm:"'AGOODSCODE'"` // 竞拍商品代码
+	AGoodsName      string `json:"agoodsname"  xorm:"'GOODSNAME'"`  // 竞拍商品名称
+	DGoodsCode      string `json:"dgoodscode"  xorm:"'DGOODSCODE'"` // 交割商品代码
+	DGoodsName      string `json:"dgoodsname"  xorm:"'DGOODSNAME'"` // 交割商品名称
+	OperateTypeName string `json:"-" xorm:"OPERATETYPENAME"`        // 资金操作类型名称
 }
 
 // QueryAmountLog 资金流水查询（当前）
@@ -153,7 +153,7 @@ func QueryAmountLog(c *gin.Context) {
 	datas := make([]QueryAmountLogRsp, 0)
 	engine := db.GetEngine()
 	s := engine.Table("TAACCOUNTLOG").
-		Join("INNER", "ENUMDICITEM", "ENUMDICITEM.ENUMITEMSTATUS = 1 and ENUMDICITEM.ENUMDICID = 39 and ENUMDICITEM.ENUMITEMNAME = TAACCOUNTLOG.OPERATETYPE").
+		Join("LEFT", "ENUMDICITEM", "ENUMDICITEM.ENUMITEMSTATUS = 1 and ENUMDICITEM.ENUMDICID = 39 and ENUMDICITEM.ENUMITEMNAME = TAACCOUNTLOG.OPERATETYPE").
 		Join("LEFT", "MARKET", "MARKET.MARKETID = TAACCOUNTLOG.MARKETID").
 		Join("LEFT", "GOODS", "GOODS.GOODSID = TAACCOUNTLOG.GOODSID").
 		Join("LEFT", "AUCTION_ORDERINFO", "AUCTION_ORDERINFO.GOODSID = TAACCOUNTLOG.GOODSID").
@@ -216,15 +216,15 @@ type QueryHisAmountLogReq struct {
 type QueryHisAmountLogRsp struct {
 	models.Histaaccountlog `xorm:"extends"`
 
-	MarketName      string `json:"marketname"  xorm:"'MARKETNAME'"`        // 市场名称
-	TradeMode       uint32 `json:"trademode"  xorm:"'TRADEMODE'"`          // 交易模式
-	GoodsCode       string `json:"goodscode"  xorm:"'GOODSCODE'"`          // 商品代码
-	GoodsName       string `json:"goodsname"  xorm:"'GOODSNAME'"`          // 商品名称
-	AGoodsCode      string `json:"agoodscode"  xorm:"'AGOODSCODE'"`        // 竞拍商品代码
-	AGoodsName      string `json:"agoodsname"  xorm:"'GOODSNAME'"`         // 竞拍商品名称
-	DGoodsCode      string `json:"dgoodscode"  xorm:"'DGOODSCODE'"`        // 交割商品代码
-	DGoodsName      string `json:"dgoodsname"  xorm:"'DGOODSNAME'"`        // 交割商品名称
-	OperateTypeName string `json:"OPERATETYPENAME" xorm:"OPERATETYPENAME"` // 资金操作类型名称
+	MarketName      string `json:"marketname"  xorm:"'MARKETNAME'"` // 市场名称
+	TradeMode       uint32 `json:"trademode"  xorm:"'TRADEMODE'"`   // 交易模式
+	GoodsCode       string `json:"goodscode"  xorm:"'GOODSCODE'"`   // 商品代码
+	GoodsName       string `json:"goodsname"  xorm:"'GOODSNAME'"`   // 商品名称
+	AGoodsCode      string `json:"agoodscode"  xorm:"'AGOODSCODE'"` // 竞拍商品代码
+	AGoodsName      string `json:"agoodsname"  xorm:"'GOODSNAME'"`  // 竞拍商品名称
+	DGoodsCode      string `json:"dgoodscode"  xorm:"'DGOODSCODE'"` // 交割商品代码
+	DGoodsName      string `json:"dgoodsname"  xorm:"'DGOODSNAME'"` // 交割商品名称
+	OperateTypeName string `json:"-" xorm:"OPERATETYPENAME"`        // 资金操作类型名称
 }
 
 // QueryHisAmountLog 资金流水查询（历史）
@@ -257,7 +257,7 @@ func QueryHisAmountLog(c *gin.Context) {
 	datas := make([]QueryHisAmountLogRsp, 0)
 	engine := db.GetEngine()
 	s := engine.Table("HIS_TAACCOUNTLOG").
-		Join("INNER", "ENUMDICITEM", "ENUMDICITEM.ENUMITEMSTATUS = 1 and ENUMDICITEM.ENUMDICID = 39 and ENUMDICITEM.ENUMITEMNAME = HIS_TAACCOUNTLOG.OPERATETYPE").
+		Join("LEFT", "ENUMDICITEM", "ENUMDICITEM.ENUMITEMSTATUS = 1 and ENUMDICITEM.ENUMDICID = 39 and ENUMDICITEM.ENUMITEMNAME = HIS_TAACCOUNTLOG.OPERATETYPE").
 		Join("LEFT", "MARKET", "MARKET.MARKETID = HIS_TAACCOUNTLOG.MARKETID").
 		Join("LEFT", "GOODS", "GOODS.GOODSID = HIS_TAACCOUNTLOG.GOODSID").
 		Join("LEFT", "HIS_AUCTION_ORDERINFO", "HIS_AUCTION_ORDERINFO.GOODSID = HIS_TAACCOUNTLOG.GOODSID and HIS_AUCTION_ORDERINFO.ISVALIDDATA = 1").

docs/docs.go

@@ -48164,10 +48164,6 @@ const docTemplate = `{
                 "operatetype"
             ],
             "properties": {
-                "OPERATETYPENAME": {
-                    "description": "资金操作类型名称",
-                    "type": "string"
-                },
                 "accountid": {
                     "description": "资金账户ID",
                     "type": "integer"
@@ -48276,10 +48272,6 @@ const docTemplate = `{
                 "operatetype"
             ],
             "properties": {
-                "OPERATETYPENAME": {
-                    "description": "资金操作类型名称",
-                    "type": "string"
-                },
                 "accountid": {
                     "description": "资金账户ID",
                     "type": "integer"

docs/swagger.json

@@ -48155,10 +48155,6 @@
                 "operatetype"
             ],
             "properties": {
-                "OPERATETYPENAME": {
-                    "description": "资金操作类型名称",
-                    "type": "string"
-                },
                 "accountid": {
                     "description": "资金账户ID",
                     "type": "integer"
@@ -48267,10 +48263,6 @@
                 "operatetype"
             ],
             "properties": {
-                "OPERATETYPENAME": {
-                    "description": "资金操作类型名称",
-                    "type": "string"
-                },
                 "accountid": {
                     "description": "资金账户ID",
                     "type": "integer"

docs/swagger.yaml

@@ -23167,9 +23167,6 @@ definitions:
     type: object
   taaccount.QueryAmountLogRsp:
     properties:
-      OPERATETYPENAME:
-        description: 资金操作类型名称
-        type: string
       accountid:
         description: 资金账户ID
         type: integer
@@ -23260,9 +23257,6 @@ definitions:
     type: object
   taaccount.QueryHisAmountLogRsp:
     properties:
-      OPERATETYPENAME:
-        description: 资金操作类型名称
-        type: string
       accountid:
         description: 资金账户ID
         type: integer