任务 #93903

config/config.xml

@@ -13,11 +13,11 @@
     <DbAddress value="192.168.31.117"/>
     <DbName value="orcl"/>
     <DbPort value="1521"/>
-    <DbUser value="mtp2_test183"/>
+    <DbUser value="mtp2_test114"/>
     <DbPwd value="muchinfo"/>
   </DbSetting>
   <RedisSetting>
-    <Address value="192.168.31.183"/>
+    <Address value="192.168.31.114"/>
     <Port value="5007"/>
     <Timeout value="3"/>
     <ConnNum value="1"/>
@@ -25,11 +25,11 @@
     <Pwd value=""/>
   </RedisSetting>
   <MqSetting>
-    <Url value="amqp://guest:guest@192.168.31.183:5020/test"/>
+    <Url value="amqp://guest:guest@192.168.31.114:5020/test"/>
     <Exchange value="entry"/>
   </MqSetting>
   <MongoDBSetting>
-    <HostName value="192.168.31.183"/>
+    <HostName value="192.168.31.114"/>
     <Port value="5025"/>
     <DBName value="HistoryQuote"/>
     <Username value="quote_test01"/>
@@ -38,8 +38,8 @@
   <MySQLSetting>
     <Host value="192.168.30.140"/>
     <Port value="3306"/>
-    <DBName value="historyquote_test183"/>
-    <Username value="quote_test183"/>
+    <DBName value="historyquote_test114"/>
+    <Username value="quote_test114"/>
     <Password value="123456"/>
   </MySQLSetting>
 </Configuration>

models/ermcpOrder.go

@@ -311,6 +311,9 @@ type QueryHedgeOrderDetailRsp struct {
 	Goodsname string `json:"goodsname"` // 商品名称
 
 	Exchangefullname string `json:"exchangefullname"  xorm:"'EXCHANGEFULLNAME'"` // 外部交易所全称
+
+	OrderLoginCode  string `json:"orderlogincode" xorm:"ORDERLOGINCODE"`   // 委托人
+	CancelLoginCode string `json:"cancellogincode" xorm:"CANCELLOGINCODE"` // 撤单人
 }
 
 // GetHedgeInnerOrderDetails 获取指定资金账号的通道交易内部委托单信息
@@ -377,14 +380,21 @@ func GetHedgeInnerOrderDetails(accountID int) ([]QueryHedgeOrderDetailRsp, error
 		Goodscode        string `xorm:"GOODSCODE"`
 		Goodsname        string `xorm:"GOODSNAME"`
 		Exchangefullname string `xorm:"'EXCHANGEFULLNAME'"`
+
+		OrderLoginCode  string `json:"orderlogincode" xorm:"ORDERLOGINCODE"`   // 委托人
+		CancelLoginCode string `json:"cancellogincode" xorm:"CANCELLOGINCODE"` // 撤单人
 	}
 
 	hedgeInnerOrderDetails := make([]orderDetail, 0)
 	if err := db.GetEngine().Table("HEDGE_INNERORDERDETAIL T").
-		Select("to_char(T.ORDERID) ORDERIDSTR, G.GOODSCODE, G.GOODSNAME, T.*, EX.EXCHANGEFULLNAME").
+		Select(`to_char(T.ORDERID) ORDERIDSTR, G.GOODSCODE, G.GOODSNAME, T.*, EX.EXCHANGEFULLNAME, 
+				L1.LOGINCODE ORDERLOGINCODE, L2.LOGINCODE CANCELLOGINCODE`).
 		Join("LEFT", "GOODS G", "G.GOODSID = T.GOODSID").
 		Join("LEFT", "GOODSGROUP GG", "GG.GOODSGROUPID = G.GOODSGROUPID").
 		Join("LEFT", "EXTERNALEXCHANGE EX", "GG.EXEXCHANGEID = EX.AUTOID").
+		Join("LEFT", "LOGINACCOUNT L1", "L1.LOGINID = T.OPERATORID").
+		Join("LEFT", "HEDGE_INNERORDERCANCEL H", "H.RELATEDORDERID = T.ORDERID").
+		Join("LEFT", "LOGINACCOUNT L2", "L2.LOGINID = H.OPERATORID").
 		Where("T.ACCOUNTID = ?", accountID).Desc("T.ORDERTIME").
 		Find(&hedgeInnerOrderDetails); err != nil {
 		return nil, err
@@ -420,6 +430,8 @@ func GetHedgeInnerOrderDetails(accountID int) ([]QueryHedgeOrderDetailRsp, error
 			Goodscode:               v.Goodscode,
 			Goodsname:               v.Goodsname,
 			Exchangefullname:        v.Exchangefullname,
+			OrderLoginCode:          v.OrderLoginCode,
+			CancelLoginCode:         v.CancelLoginCode,
 		})
 	}
 
@@ -490,14 +502,21 @@ func GetHisHedgeInnerOrderDetails(accountID int, startDate, endDate string) ([]Q
 		Goodscode        string `xorm:"GOODSCODE"`
 		Goodsname        string `xorm:"GOODSNAME"`
 		Exchangefullname string `xorm:"'EXCHANGEFULLNAME'"`
+
+		OrderLoginCode  string `json:"orderlogincode" xorm:"ORDERLOGINCODE"`   // 委托人
+		CancelLoginCode string `json:"cancellogincode" xorm:"CANCELLOGINCODE"` // 撤单人
 	}
 
 	hedgeInnerOrderDetails := make([]orderDetail, 0)
 	session := db.GetEngine().Table("HIS_HEDGE_INNERORDERDETAIL T").
-		Select("to_char(T.ORDERID) ORDERIDSTR, G.GOODSCODE, G.GOODSNAME, T.*, EX.EXCHANGEFULLNAME").
+		Select(`to_char(T.ORDERID) ORDERIDSTR, G.GOODSCODE, G.GOODSNAME, T.*, EX.EXCHANGEFULLNAME, 
+				L1.LOGINCODE ORDERLOGINCODE, L2.LOGINCODE CANCELLOGINCODE`).
 		Join("LEFT", "GOODS G", "G.GOODSID = T.GOODSID").
 		Join("LEFT", "GOODSGROUP GG", "GG.GOODSGROUPID = G.GOODSGROUPID").
 		Join("LEFT", "EXTERNALEXCHANGE EX", "GG.EXEXCHANGEID = EX.AUTOID").
+		Join("LEFT", "LOGINACCOUNT L1", "L1.LOGINID = T.OPERATORID").
+		Join("LEFT", "HIS_HEDGE_INNERORDERCANCEL H", "H.RELATEDORDERID = T.ORDERID").
+		Join("LEFT", "LOGINACCOUNT L2", "L2.LOGINID = H.OPERATORID").
 		Where("T.ISVALIDDATA = 1 and T.ACCOUNTID = ?", accountID).Desc("T.ORDERTIME")
 	if len(startDate) > 0 {
 		session = session.And(fmt.Sprintf("to_date(T.HISTRADEDATE,'yyyyMMdd') >= to_date('%s','yyyy-MM-dd')", startDate))
@@ -539,6 +558,8 @@ func GetHisHedgeInnerOrderDetails(accountID int, startDate, endDate string) ([]Q
 			Goodscode:               v.Goodscode,
 			Goodsname:               v.Goodsname,
 			Exchangefullname:        v.Exchangefullname,
+			OrderLoginCode:          v.OrderLoginCode,
+			CancelLoginCode:         v.CancelLoginCode,
 		})
 	}
 
@@ -588,14 +609,21 @@ func GetHedgeOutOrderDetails(accountID int) ([]QueryHedgeOrderDetailRsp, error)
 		Goodscode        string `xorm:"GOODSCODE"`
 		Goodsname        string `xorm:"GOODSNAME"`
 		Exchangefullname string `xorm:"'EXCHANGEFULLNAME'"`
+
+		OrderLoginCode  string `json:"orderlogincode" xorm:"ORDERLOGINCODE"`   // 委托人
+		CancelLoginCode string `json:"cancellogincode" xorm:"CANCELLOGINCODE"` // 撤单人
 	}
 
 	hedgeOutOrderDetails := make([]orderDetail, 0)
 	if err := db.GetEngine().Table("HEDGE_OUTORDERDETAIL T").
-		Select("to_char(T.OUTORDERID) ORDERIDSTR, G.GOODSCODE, G.GOODSNAME, T.*, EX.EXCHANGEFULLNAME").
+		Select(`to_char(T.OUTORDERID) ORDERIDSTR, G.GOODSCODE, G.GOODSNAME, T.*, EX.EXCHANGEFULLNAME, 
+				L1.LOGINCODE ORDERLOGINCODE, L2.LOGINCODE CANCELLOGINCODE`).
 		Join("LEFT", "GOODS G", "G.GOODSID = T.HEDGEGOODSID").
 		Join("LEFT", "GOODSGROUP GG", "GG.GOODSGROUPID = G.GOODSGROUPID").
 		Join("LEFT", "EXTERNALEXCHANGE EX", "GG.EXEXCHANGEID = EX.AUTOID").
+		Join("LEFT", "LOGINACCOUNT L1", "L1.LOGINID = T.OPERATORID").
+		Join("LEFT", "HEDGE_OUTORDERCANCEL H", "H.RELATEDOUTORDERID = T.OUTORDERID").
+		Join("LEFT", "LOGINACCOUNT L2", "L2.LOGINID = H.OPERATORID").
 		Where("T.ACCOUNTID = ?", accountID).Desc("T.OUTORDERID").
 		Find(&hedgeOutOrderDetails); err != nil {
 		return nil, err
@@ -643,6 +671,8 @@ func GetHedgeOutOrderDetails(accountID int) ([]QueryHedgeOrderDetailRsp, error)
 			Goodscode:               v.Goodscode,
 			Goodsname:               v.Goodsname,
 			Exchangefullname:        v.Exchangefullname,
+			OrderLoginCode:          v.OrderLoginCode,
+			CancelLoginCode:         v.CancelLoginCode,
 		})
 	}
 
@@ -692,14 +722,21 @@ func GetHisHedgeOutOrderDetails(accountID int, startDate, endDate string) ([]Que
 		Goodscode        string `xorm:"GOODSCODE"`
 		Goodsname        string `xorm:"GOODSNAME"`
 		Exchangefullname string `xorm:"'EXCHANGEFULLNAME'"`
+
+		OrderLoginCode  string `json:"orderlogincode" xorm:"ORDERLOGINCODE"`   // 委托人
+		CancelLoginCode string `json:"cancellogincode" xorm:"CANCELLOGINCODE"` // 撤单人
 	}
 
 	hedgeOutOrderDetails := make([]orderDetail, 0)
 	session := db.GetEngine().Table("HIS_HEDGE_OUTORDERDETAIL T").
-		Select("to_char(T.OUTORDERID) ORDERIDSTR, G.GOODSCODE, G.GOODSNAME, T.*, EX.EXCHANGEFULLNAME").
+		Select(`to_char(T.OUTORDERID) ORDERIDSTR, G.GOODSCODE, G.GOODSNAME, T.*, EX.EXCHANGEFULLNAME, 
+				L1.LOGINCODE ORDERLOGINCODE, L2.LOGINCODE CANCELLOGINCODE`).
 		Join("LEFT", "GOODS G", "G.GOODSID = T.HEDGEGOODSID").
 		Join("LEFT", "GOODSGROUP GG", "GG.GOODSGROUPID = G.GOODSGROUPID").
 		Join("LEFT", "EXTERNALEXCHANGE EX", "GG.EXEXCHANGEID = EX.AUTOID").
+		Join("LEFT", "LOGINACCOUNT L1", "L1.LOGINID = T.OPERATORID").
+		Join("LEFT", "HIS_HEDGE_OUTORDERCANCEL H", "H.RELATEDOUTORDERID = T.OUTORDERID").
+		Join("LEFT", "LOGINACCOUNT L2", "L2.LOGINID = H.OPERATORID").
 		Where("T.ISVALIDDATA = 1 and T.ACCOUNTID = ?", accountID).Desc("T.OUTORDERID")
 	if len(startDate) > 0 {
 		session = session.And(fmt.Sprintf("to_date(T.HISTRADEDATE,'yyyyMMdd') >= to_date('%s','yyyy-MM-dd')", startDate))
@@ -753,6 +790,8 @@ func GetHisHedgeOutOrderDetails(accountID int, startDate, endDate string) ([]Que
 			Goodscode:               v.Goodscode,
 			Goodsname:               v.Goodsname,
 			Exchangefullname:        v.Exchangefullname,
+			OrderLoginCode:          v.OrderLoginCode,
+			CancelLoginCode:         v.CancelLoginCode,
 		})
 	}
 
@@ -785,6 +824,8 @@ type QueryHedgeTradeDetailRsp struct {
 	Goodsname string `json:"goodsname"` // 商品名称
 
 	Exchangefullname string `json:"exchangefullname"` // 外部交易所全称
+
+	OrderLoginCode string `json:"orderlogincode" xorm:"ORDERLOGINCODE"` // 委托人
 }
 
 // GetHedgeInnerTradeDetails 获取通道交易内部成交单信息
@@ -837,14 +878,19 @@ func GetHedgeInnerTradeDetails(accountID, goodsID, buyOrSell int) ([]QueryHedgeT
 		Goodscode        string `xorm:"GOODSCODE"`
 		Goodsname        string `xorm:"GOODSNAME"`
 		Exchangefullname string `xorm:"'EXCHANGEFULLNAME'"`
+
+		OrderLoginCode string `json:"orderlogincode" xorm:"ORDERLOGINCODE"` // 委托人
 	}
 
 	tradeDetails := make([]tradeDetail, 0)
 	session := db.GetEngine().Table("HEDGE_INNERTRADEDETAIL T").
-		Select("to_char(T.TRADEID) TRADEIDSTR, to_char(T.ORDERID) ORDERIDSTR, G.GOODSCODE, G.GOODSNAME, T.*, EX.EXCHANGEFULLNAME").
+		Select(`to_char(T.TRADEID) TRADEIDSTR, to_char(T.ORDERID) ORDERIDSTR, G.GOODSCODE, G.GOODSNAME, T.*, EX.EXCHANGEFULLNAME, 
+				L1.LOGINCODE ORDERLOGINCODE`).
 		Join("LEFT", "GOODS G", "G.GOODSID = T.GOODSID").
 		Join("LEFT", "GOODSGROUP GG", "GG.GOODSGROUPID = G.GOODSGROUPID").
 		Join("LEFT", "EXTERNALEXCHANGE EX", "GG.EXEXCHANGEID = EX.AUTOID").
+		Join("LEFT", "HEDGE_INNERORDERDETAIL TT", "TT.ORDERID = T.ORDERID").
+		Join("LEFT", "LOGINACCOUNT L1", "L1.LOGINID = TT.OPERATORID").
 		Where("T.ACCOUNTID = ?", accountID)
 	if goodsID != 0 {
 		session = session.And("T.GOODSID = ?", goodsID)
@@ -882,6 +928,7 @@ func GetHedgeInnerTradeDetails(accountID, goodsID, buyOrSell int) ([]QueryHedgeT
 			Goodscode:        v.Goodscode,
 			Goodsname:        v.Goodsname,
 			Exchangefullname: v.Exchangefullname,
+			OrderLoginCode:   v.OrderLoginCode,
 		})
 	}
 
@@ -938,14 +985,19 @@ func GetHisHedgeInnerTradeDetails(accountID, goodsID, buyOrSell int, startDate,
 		Goodscode        string `xorm:"GOODSCODE"`
 		Goodsname        string `xorm:"GOODSNAME"`
 		Exchangefullname string `xorm:"'EXCHANGEFULLNAME'"`
+
+		OrderLoginCode string `json:"orderlogincode" xorm:"ORDERLOGINCODE"` // 委托人
 	}
 
 	tradeDetails := make([]tradeDetail, 0)
 	session := db.GetEngine().Table("HIS_HEDGE_INNERTRADEDETAIL T").
-		Select("to_char(T.TRADEID) TRADEIDSTR, to_char(T.ORDERID) ORDERIDSTR, G.GOODSCODE, G.GOODSNAME, T.*, EX.EXCHANGEFULLNAME").
+		Select(`to_char(T.TRADEID) TRADEIDSTR, to_char(T.ORDERID) ORDERIDSTR, G.GOODSCODE, G.GOODSNAME, T.*, EX.EXCHANGEFULLNAME, 
+				L1.LOGINCODE ORDERLOGINCODE`).
 		Join("LEFT", "GOODS G", "G.GOODSID = T.GOODSID").
 		Join("LEFT", "GOODSGROUP GG", "GG.GOODSGROUPID = G.GOODSGROUPID").
 		Join("LEFT", "EXTERNALEXCHANGE EX", "GG.EXEXCHANGEID = EX.AUTOID").
+		Join("LEFT", "HIS_HEDGE_INNERORDERDETAIL TT", "TT.ORDERID = T.ORDERID").
+		Join("LEFT", "LOGINACCOUNT L1", "L1.LOGINID = TT.OPERATORID").
 		Where("T.ISVALIDDATA = 1 and T.ACCOUNTID = ?", accountID)
 	if goodsID != 0 {
 		session = session.And("T.GOODSID = ?", goodsID)
@@ -989,6 +1041,7 @@ func GetHisHedgeInnerTradeDetails(accountID, goodsID, buyOrSell int, startDate,
 			Goodscode:        v.Goodscode,
 			Goodsname:        v.Goodsname,
 			Exchangefullname: v.Exchangefullname,
+			OrderLoginCode:   v.OrderLoginCode,
 		})
 	}
 
@@ -1026,14 +1079,20 @@ func GetHedgeOutTradeDetails(accountID, goodsID, buyOrSell int) ([]QueryHedgeTra
 		Exchangefullname string `xorm:"'EXCHANGEFULLNAME'"`
 
 		Tradeamount float64 `xorm:"TRADEAMOUNT"` // 成交金额
+
+		OrderLoginCode string `json:"orderlogincode" xorm:"ORDERLOGINCODE"` // 委托人
 	}
 
 	tradeDetails := make([]tradeDetail, 0)
 	session := db.GetEngine().Table("HEDGE_OUTTRADEDETAIL T").
-		Select("to_char(T.OUTTRADEID) OUTTRADEIDSTR, to_char(T.RELATEDOUTORDERID) RELATEDOUTORDERIDSTR, G.GOODSCODE, G.GOODSNAME, T.*, EX.EXCHANGEFULLNAME, (T.TRADEPRICE * T.TRADEQTY * G.AGREEUNIT) TRADEAMOUNT").
+		Select(`to_char(T.OUTTRADEID) OUTTRADEIDSTR, to_char(T.RELATEDOUTORDERID) RELATEDOUTORDERIDSTR, G.GOODSCODE, G.GOODSNAME, T.*, EX.EXCHANGEFULLNAME, 
+				(T.TRADEPRICE * T.TRADEQTY * G.AGREEUNIT) TRADEAMOUNT, 
+				L1.LOGINCODE ORDERLOGINCODE`).
 		Join("LEFT", "GOODS G", "G.GOODSID = T.HEDGEGOODSID").
 		Join("LEFT", "GOODSGROUP GG", "GG.GOODSGROUPID = G.GOODSGROUPID").
 		Join("LEFT", "EXTERNALEXCHANGE EX", "GG.EXEXCHANGEID = EX.AUTOID").
+		Join("LEFT", "HEDGE_OUTORDERDETAIL TT", "TT.OUTORDERID = T.RELATEDOUTORDERID").
+		Join("LEFT", "LOGINACCOUNT L1", "L1.LOGINID = TT.OPERATORID").
 		Where("T.ACCOUNTID = ?", accountID)
 	if goodsID != 0 {
 		session = session.And("T.HEDGEGOODSID = ?", goodsID)
@@ -1071,6 +1130,7 @@ func GetHedgeOutTradeDetails(accountID, goodsID, buyOrSell int) ([]QueryHedgeTra
 			Goodscode:        v.Goodscode,
 			Goodsname:        v.Goodsname,
 			Exchangefullname: v.Exchangefullname,
+			OrderLoginCode:   v.OrderLoginCode,
 		})
 	}
 
@@ -1108,15 +1168,21 @@ func GetHisHedgeOutTradeDetails(accountID, goodsID, buyOrSell int, startDate, en
 		Exchangefullname string `xorm:"'EXCHANGEFULLNAME'"`
 
 		Tradeamount float64 `xorm:"TRADEAMOUNT"` // 成交金额
+
+		OrderLoginCode string `json:"orderlogincode" xorm:"ORDERLOGINCODE"` // 委托人
 	}
 
 	tradeDetails := make([]tradeDetail, 0)
 	session := db.GetEngine().Table("HIS_HEDGE_OUTTRADEDETAIL T").
-		Select("to_char(T.OUTTRADEID) OUTTRADEIDSTR, to_char(T.RELATEDOUTORDERID) RELATEDOUTORDERIDSTR, G.GOODSCODE, G.GOODSNAME, T.*, EX.EXCHANGEFULLNAME, (T.TRADEPRICE * T.TRADEQTY * G.AGREEUNIT) TRADEAMOUNT").
+		Select(`to_char(T.OUTTRADEID) OUTTRADEIDSTR, to_char(T.RELATEDOUTORDERID) RELATEDOUTORDERIDSTR, G.GOODSCODE, G.GOODSNAME, T.*, EX.EXCHANGEFULLNAME, 
+				(T.TRADEPRICE * T.TRADEQTY * G.AGREEUNIT) TRADEAMOUNT, 
+				L1.LOGINCODE ORDERLOGINCODE`).
 		Join("LEFT", "GOODS G", "G.GOODSID = T.HEDGEGOODSID").
 		Join("LEFT", "GOODSGROUP GG", "GG.GOODSGROUPID = G.GOODSGROUPID").
 		Join("LEFT", "EXTERNALEXCHANGE EX", "GG.EXEXCHANGEID = EX.AUTOID").
-		Where("T.ACCOUNTID = ?", accountID)
+		Join("LEFT", "HIS_HEDGE_OUTORDERDETAIL TT", "TT.OUTORDERID = T.RELATEDOUTORDERID").
+		Join("LEFT", "LOGINACCOUNT L1", "L1.LOGINID = TT.OPERATORID").
+		Where("T.ISVALIDDATA = 1 and T.ACCOUNTID = ?", accountID)
 	if goodsID != 0 {
 		session = session.And("T.HEDGEGOODSID = ?", goodsID)
 	}
@@ -1159,6 +1225,7 @@ func GetHisHedgeOutTradeDetails(accountID, goodsID, buyOrSell int, startDate, en
 			Goodscode:        v.Goodscode,
 			Goodsname:        v.Goodsname,
 			Exchangefullname: v.Exchangefullname,
+			OrderLoginCode:   v.OrderLoginCode,
 		})
 	}