Quellcode durchsuchen

/Mine/QueryMineTradeGoodsDeliveryOfflines: 返回 商品名称国际化字段

deng.yinping vor 1 Jahr
Ursprung
Commit
8e1f4e0775
4 geänderte Dateien mit 43 neuen und 1 gelöschten Zeilen
  1. 12 0
      docs/docs.go
  2. 12 0
      docs/swagger.json
  3. 9 0
      docs/swagger.yaml
  4. 10 1
      models/mine.go

+ 12 - 0
docs/docs.go

@@ -44276,6 +44276,18 @@ const docTemplate = `{
                     "description": "商品名称",
                     "type": "string"
                 },
+                "goodsnameen": {
+                    "description": "期货合约名称(英文)",
+                    "type": "string"
+                },
+                "goodsnameth": {
+                    "description": "期货合约名称泰文)",
+                    "type": "string"
+                },
+                "goodsnametw": {
+                    "description": "期货合约名称(繁体)",
+                    "type": "string"
+                },
                 "goodsunit": {
                     "description": "单位",
                     "type": "string"

+ 12 - 0
docs/swagger.json

@@ -44267,6 +44267,18 @@
                     "description": "商品名称",
                     "type": "string"
                 },
+                "goodsnameen": {
+                    "description": "期货合约名称(英文)",
+                    "type": "string"
+                },
+                "goodsnameth": {
+                    "description": "期货合约名称泰文)",
+                    "type": "string"
+                },
+                "goodsnametw": {
+                    "description": "期货合约名称(繁体)",
+                    "type": "string"
+                },
                 "goodsunit": {
                     "description": "单位",
                     "type": "string"

+ 9 - 0
docs/swagger.yaml

@@ -15190,6 +15190,15 @@ definitions:
       goodsnamedisplay:
         description: 商品名称
         type: string
+      goodsnameen:
+        description: 期货合约名称(英文)
+        type: string
+      goodsnameth:
+        description: 期货合约名称泰文)
+        type: string
+      goodsnametw:
+        description: 期货合约名称(繁体)
+        type: string
       goodsunit:
         description: 单位
         type: string

+ 10 - 1
models/mine.go

@@ -992,6 +992,9 @@ type MineTradeGoodsDeliveryOffline struct {
 
 	CUSTOMERNAME string  `json:"matchusername" xorm:"MATCHUSERNAME"` // [交收对手方]客户名称(企业名称)
 	AGREEUNIT    float64 `json:"agreeunit" xorm:"AGREEUNIT"`         // 合约乘数
+	GOODSNAMETH  string  `json:"goodsnameth" xorm:"GOODSNAMETH"`     // 期货合约名称泰文)
+	GOODSNAMEEN  string  `json:"goodsnameen" xorm:"GOODSNAMEEN"`     // 期货合约名称(英文)
+	GOODSNAMETW  string  `json:"goodsnametw" xorm:"GOODSNAMETW"`     // 期货合约名称(繁体)
 
 	MarketIds string `form:"marketids"` // 过滤市场ID列表,格式 1,2,3
 
@@ -1035,13 +1038,19 @@ func (r *MineTradeGoodsDeliveryOffline) buildSql() string {
 	   to_char(t.tradeid) TRADEID,
 	   t.totalpricemove,
 	   t.totalshippingfee,
-	   t.totalotherfee
+	   t.totalotherfee,
+	   ge.goodsnameth,
+	   ge.goodsnameen,
+	   ge.goodsnametw
 	   
   from Trade_GoodsDeliveryOffLine t
 
   left join goods g
     on t.goodsid = g.goodsid
 
+  left join goodsex ge
+    on t.goodsid = ge.goodsid
+
   left join enumdicitem e1
     on e1.enumdiccode = 'buyOrSell'
    and t.buyorsell = e1.enumitemname