错误 #93159

config/config.xml

@@ -5,7 +5,7 @@
     <DebugMode value="1"/>
   </WebSetting>
   <LogSetting>
-    <LogPath value="/home/pub/mtp2.0/log/queryservice"/>
+    <LogPath value="./log"/>
     <LogLevel value="5"/>
   </LogSetting>
   <DbSetting>
@@ -13,11 +13,11 @@
     <DbAddress value="192.168.31.117"/>
     <DbName value="orcl"/>
     <DbPort value="1521"/>
-    <DbUser value="mtp2_test171"/>
+    <DbUser value="mtp2_test125"/>
     <DbPwd value="muchinfo"/>
   </DbSetting>
   <RedisSetting>
-    <Address value="192.168.31.171"/>
+    <Address value="192.168.30.125"/>
     <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.171:5020/test"/>
+    <Url value="amqp://guest:guest@192.168.30.125:5020/test"/>
     <Exchange value="entry"/>
   </MqSetting>
   <MongoDBSetting>
-    <HostName value="192.168.31.171"/>
+    <HostName value="192.168.30.125"/>
     <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_test171"/>
-    <Username value="root"/>
+    <DBName value="historyquote_test125"/>
+    <Username value="quote_test125"/>
     <Password value="123456"/>
   </MySQLSetting>
 </Configuration>

controllers/ermcp/qryOrder.go

@@ -1 +1,15 @@
 package ermcp
+
+import "github.com/gin-gonic/gin"
+
+type QueryErmcpTradePositionReq struct {
+	AccountID int `form:"accountID" binding:"required"`
+}
+
+type QueryErmcpTradePositionRsp struct {
+	Goodsname string `json:"goodsname"` // 商品名称
+}
+
+func QueryErmcpTradePosition(c *gin.Context) {
+
+}

controllers/quote/history.go

@@ -314,7 +314,7 @@ func QueryTSData(c *gin.Context) {
 	}
 	// fmt.Printf("开始时间：%s 结束时间：%s\n", queryTSDataRsp.StartTime.Format(timeFormat), queryTSDataRsp.EndTime.Format(timeFormat))
 
-	// 获取目标时间段的历史数据
+	// 获取目标时间段的历史数据（1分钟周期）
 	// 这里要注意：由于交易库和行情库由于GoodsCode大小写不一定对得上，所以在使用交易库的商品查询行情数据时间，都要使用OutGoodsCode字段
 	cycleDatas, err := models.GetHistoryCycleDatas(models.CycleTypeMinutes1, queryTSDataRsp.OutGoodsCode, &queryTSDataRsp.StartTime, &queryTSDataRsp.EndTime, 0, true)
 	if err != nil {
@@ -334,14 +334,14 @@ func QueryTSData(c *gin.Context) {
 				stt := time.Unix(int64(st), 0).Format("2006-01-02 15:04:05")
 				cycleDatas = append(cycleDatas, models.CycleData{
 					GC:    cycleDatas[0].GC,
-					Open:  cycleDatas[0].Open,
-					High:  cycleDatas[0].High,
-					Low:   cycleDatas[0].Low,
+					Open:  cycleDatas[0].Close,
+					High:  cycleDatas[0].Close,
+					Low:   cycleDatas[0].Close,
 					Close: cycleDatas[0].Close,
-					TV:    cycleDatas[0].TV,
-					TT:    cycleDatas[0].TT,
-					HV:    cycleDatas[0].HV,
-					SP:    cycleDatas[0].SP,
+					TV:    0,
+					TT:    0,
+					HV:    0,
+					SP:    0,
 					ST:    st,
 					SST:   stt,
 					FI:    true,
@@ -376,14 +376,14 @@ func QueryTSData(c *gin.Context) {
 				stt := time.Unix(int64(st), 0).Format("2006-01-02 15:04:05")
 				cycleDatas = append(cycleDatas, models.CycleData{
 					GC:    cycleDatas[index].GC,
-					Open:  cycleDatas[index].Open,
-					High:  cycleDatas[index].High,
-					Low:   cycleDatas[index].Low,
+					Open:  cycleDatas[index].Close,
+					High:  cycleDatas[index].Close,
+					Low:   cycleDatas[index].Close,
 					Close: cycleDatas[index].Close,
-					TV:    cycleDatas[index].TV,
-					TT:    cycleDatas[index].TT,
-					HV:    cycleDatas[index].HV,
-					SP:    cycleDatas[index].SP,
+					TV:    0,
+					TT:    0,
+					HV:    0,
+					SP:    0,
 					ST:    st,
 					SST:   stt,
 					FI:    true,
@@ -415,14 +415,14 @@ func QueryTSData(c *gin.Context) {
 						stt := time.Unix(int64(st), 0).Format("2006-01-02 15:04:05")
 						fillDatas = append(fillDatas, models.CycleData{
 							GC:    cycleDatas[i-1].GC,
-							Open:  cycleDatas[i-1].Open,
-							High:  cycleDatas[i-1].High,
-							Low:   cycleDatas[i-1].Low,
+							Open:  cycleDatas[i-1].Close,
+							High:  cycleDatas[i-1].Close,
+							Low:   cycleDatas[i-1].Close,
 							Close: cycleDatas[i-1].Close,
-							TV:    cycleDatas[i-1].TV,
-							TT:    cycleDatas[i-1].TT,
-							HV:    cycleDatas[i-1].HV,
-							SP:    cycleDatas[i-1].SP,
+							TV:    0,
+							TT:    0,
+							HV:    0,
+							SP:    0,
 							ST:    st,
 							SST:   stt,
 							FI:    true,

models/ermcpOrder.go

@@ -67,7 +67,7 @@ type Hedgeinnerorderdetail struct {
 	Updatetime              time.Time `json:"updatetime"  xorm:"'UPDATETIME'"`                           // 更新时间
 	Clientordertime         time.Time `json:"clientordertime"  xorm:"'CLIENTORDERTIME'"`                 // 客户端委托时间
 	Clientticket            string    `json:"clientticket"  xorm:"'CLIENTTICKET'"`                       // 客户端流水号
-	Uuid                    string    `json:"uuid"  xorm:"'UUID'"`                                       // 发起端唯一id
+	UUID                    string    `json:"uuid"  xorm:"'UUID'"`                                       // 发起端唯一id
 	Clienttype              int32     `json:"clienttype"  xorm:"'CLIENTTYPE'"`                           // 客户端类型 - 0:保留为未填终端类型 1:PC管理端 2:PC交易端 3:手机客户端_安卓 4:网页客户端 5:微信客户端 6:手机客户端_苹果 7:网上开户客户端 8:无效终端编号 9:报价终端(中江) 10;监控终端
 	Retcode                 int32     `json:"retcode"  xorm:"'RETCODE'"`                                 // 错误代码
 	Marginalgorithm         int32     `json:"marginalgorithm"  xorm:"'MARGINALGORITHM'"`                 // 保证金收取方式  1：比率  2：固定

models/hsby.go

@@ -1582,7 +1582,7 @@ func GetHsbyMarketGoodsesByVisitor(marketIDs string, categoryID int, goodsIDs st
 		Join("LEFT", "HSBY_GOODSEX GX", "GX.GOODSID = G.GOODSID").
 		Join("LEFT", "ENUMDICITEM E", "E.ENUMITEMNAME = G.CURRENCYID and E.ENUMDICCODE = 'currency'").
 		Join("LEFT", "MARKET M", "M.MARKETID = G.MARKETID").
-		Where(fmt.Sprintf("G.MARKETID in (%s)", marketIDs))
+		Where(fmt.Sprintf("G.GOODSSTATUS = 3 and G.MARKETID in (%s)", marketIDs))
 	if categoryID != 0 {
 		session = session.And("GX.CATEGORYID = ?", categoryID)
 	}

models/market.go

@@ -277,6 +277,7 @@ func FindQuoteSourceGroupRunSteps(goods Goods) ([]Quotesourcegrouprunstep, error
 	// 	Where("QUOTESOURCEGROUPRUNSTEP.SECTIONID <> 0 and MARKET.MARKETID = ?", market.Marketid).Find(&runSteps); err != nil {
 	// 	return nil, err
 	// }
+	// 这里要注意了：以后写SQL应该要先预估一下结果的数量，从而尽量优化
 	if err := engine.Table("QUOTESOURCEGROUPRUNSTEP T").
 		Join("INNER", "GOODSGROUP GG", "GG.QUOTESOURCEGROUPID = T.GROUPID").
 		Where("GG.GOODSGROUPID = ?", goods.Goodsgroupid).