海商接口增加省市ID字段

config/config.xml

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

docs/docs.go

@@ -12889,6 +12889,14 @@ var doc = `{
                     "description": "报价小数位",
                     "type": "integer"
                 },
+                "desccityid": {
+                    "description": "目的地(市)",
+                    "type": "integer"
+                },
+                "descprovinceid": {
+                    "description": "目的地(省)",
+                    "type": "integer"
+                },
                 "enableqty": {
                     "description": "剩余数量",
                     "type": "integer"
@@ -13312,6 +13320,14 @@ var doc = `{
                     "description": "报价小数位",
                     "type": "integer"
                 },
+                "desccityid": {
+                    "description": "目的地(市)",
+                    "type": "integer"
+                },
+                "descprovinceid": {
+                    "description": "目的地(省)",
+                    "type": "integer"
+                },
                 "goodscode": {
                     "description": "商品代码(内部)",
                     "type": "string"

docs/swagger.json

@@ -12873,6 +12873,14 @@
                     "description": "报价小数位",
                     "type": "integer"
                 },
+                "desccityid": {
+                    "description": "目的地(市)",
+                    "type": "integer"
+                },
+                "descprovinceid": {
+                    "description": "目的地(省)",
+                    "type": "integer"
+                },
                 "enableqty": {
                     "description": "剩余数量",
                     "type": "integer"
@@ -13296,6 +13304,14 @@
                     "description": "报价小数位",
                     "type": "integer"
                 },
+                "desccityid": {
+                    "description": "目的地(市)",
+                    "type": "integer"
+                },
+                "descprovinceid": {
+                    "description": "目的地(省)",
+                    "type": "integer"
+                },
                 "goodscode": {
                     "description": "商品代码(内部)",
                     "type": "string"

docs/swagger.yaml

@@ -5159,6 +5159,12 @@ definitions:
       decimalplace:
         description: 报价小数位
         type: integer
+      desccityid:
+        description: 目的地(市)
+        type: integer
+      descprovinceid:
+        description: 目的地(省)
+        type: integer
       enableqty:
         description: 剩余数量
         type: integer
@@ -5481,6 +5487,12 @@ definitions:
       decimalplace:
         description: 报价小数位
         type: integer
+      desccityid:
+        description: 目的地(市)
+        type: integer
+      descprovinceid:
+        description: 目的地(省)
+        type: integer
       goodscode:
         description: 商品代码(内部)
         type: string

models/hsby.go

@@ -240,9 +240,11 @@ type HsbyTopGoods struct {
 	Quoteminunit int64   `json:"quoteminunit"  xorm:"'QUOTEMINUNIT'"`              // 行情最小变动单位 [整数，报价小数位一起使用]
 	Agreeunit    float64 `json:"agreeunit"  xorm:"'AGREEUNIT'"`                    // 合约单位
 
-	Hotindex  int32  `json:"hotindex"  xorm:"'HOTINDEX'"`   // 景点热度
-	Videourls string `json:"videourls"  xorm:"'VIDEOURLS'"` // 介绍视频[多张用逗号分隔]
-	Picurls   string `json:"picurls"  xorm:"'PICURLS'"`     // 介绍图片[多张用逗号分隔]
+	Hotindex       int32  `json:"hotindex"  xorm:"'HOTINDEX'"`             // 景点热度
+	Videourls      string `json:"videourls"  xorm:"'VIDEOURLS'"`           // 介绍视频[多张用逗号分隔]
+	Picurls        string `json:"picurls"  xorm:"'PICURLS'"`               // 介绍图片[多张用逗号分隔]
+	Descprovinceid int64  `json:"descprovinceid"  xorm:"'DESCPROVINCEID'"` // 目的地(省)
+	Desccityid     int64  `json:"desccityid"  xorm:"'DESCCITYID'"`         // 目的地(市)
 
 	Currency     string `json:"currency" xorm:"'CURRENCY'"`         // 货币
 	Currencysign string `json:"currencysign" xorm:"'CURRENCYSIGN'"` // 货币符号
@@ -268,7 +270,7 @@ func GetHsbyTopGoodses(marketIDs string, descProvinceID, descCityID int) ([]Hsby
 	// 与商城不一样的是，挂牌点选以商品表作为主表，同一商品可有多个委托单
 	session := engine.Table("GOODS").
 		Select(`GOODS.*, 
-				HSBY_GOODSEX.HOTINDEX, HSBY_GOODSEX.VIDEOURLS, HSBY_GOODSEX.PICURLS, 
+				HSBY_GOODSEX.HOTINDEX, HSBY_GOODSEX.VIDEOURLS, HSBY_GOODSEX.PICURLS, HSBY_GOODSEX.DESCPROVINCEID, HSBY_GOODSEX.DESCCITYID, 
 				ENUMDICITEM.ENUMDICNAME CURRENCY, ENUMDICITEM.PARAM2 CURRENCYSIGN, 
 				MARKET.TRADEMODE`).
 		Join("LEFT", "HSBY_GOODSEX", "HSBY_GOODSEX.GOODSID = GOODS.GOODSID").
@@ -802,8 +804,10 @@ type HsbyPreGoods struct {
 	Currency     string `json:"currency" xorm:"'CURRENCY'"`         // 货币
 	Currencysign string `json:"currencysign" xorm:"'CURRENCYSIGN'"` // 货币符号
 
-	Videourls string `json:"videourls"  xorm:"'VIDEOURLS'"` // 介绍视频[多张用逗号分隔]
-	Picurls   string `json:"picurls"  xorm:"'PICURLS'"`     // 介绍图片[多张用逗号分隔]
+	Videourls      string `json:"videourls"  xorm:"'VIDEOURLS'"`           // 介绍视频[多张用逗号分隔]
+	Picurls        string `json:"picurls"  xorm:"'PICURLS'"`               // 介绍图片[多张用逗号分隔]
+	Descprovinceid int64  `json:"descprovinceid"  xorm:"'DESCPROVINCEID'"` // 目的地(省)
+	Desccityid     int64  `json:"desccityid"  xorm:"'DESCCITYID'"`         // 目的地(市)
 
 	Trademode int32 `json:"trademode"  xorm:"'TRADEMODE'" binding:"required"` // 交易模式 - 10:做市 13:竞价 15:通道交易 16:挂牌点选 17:仓单贸易 18:期权 19:竞拍-降价式 20:竞拍-竞价式 21:竞拍-大宗式 22:受托竞价
 }
@@ -825,7 +829,7 @@ func GetHsbyPreGoodses(marketIDs string, descProvinceID, descCityID int) ([]Hsby
 				CPTRADE_PRESALEGOODSEX.RELATEDGOODSID, CPTRADE_PRESALEGOODSEX.PRESALEQTY, CPTRADE_PRESALEGOODSEX.REFPRICE, 
 				CPTRADE_PRESALEGOODSEX.PRESALEDQTY, (CPTRADE_PRESALEGOODSEX.PRESALEQTY - CPTRADE_PRESALEGOODSEX.PRESALEDQTY) ENABLEQTY, 
 				ENUMDICITEM.ENUMDICNAME CURRENCY, ENUMDICITEM.PARAM2 CURRENCYSIGN, 
-				HSBY_GOODSEX.VIDEOURLS, HSBY_GOODSEX.PICURLS, 
+				HSBY_GOODSEX.VIDEOURLS, HSBY_GOODSEX.PICURLS, HSBY_GOODSEX.DESCPROVINCEID, HSBY_GOODSEX.DESCCITYID, 
 				MARKET.TRADEMODE`).
 		Join("INNER", "CPTRADE_PRESALEGOODSEX", "CPTRADE_PRESALEGOODSEX.GOODSID = GOODS.GOODSID").
 		Join("LEFT", "ENUMDICITEM", "ENUMDICITEM.ENUMITEMNAME = GOODS.CURRENCYID and ENUMDICITEM.ENUMDICCODE = 'currency'").