1、“出售大厅”接口增加“价格”出参；

2、“我的出售”按需求增加钻石属性出参。

docs/docs.go

@@ -28427,6 +28427,9 @@ const docTemplate = `{
                     "description": "撤销时间",
                     "type": "string"
                 },
+                "cerno": {
+                    "type": "string"
+                },
                 "chargealgorithm": {
                     "description": "手续费收取方式 1：比率  2：固定",
                     "type": "integer"
@@ -28443,6 +28446,9 @@ const docTemplate = `{
                     "description": "客户端委托时间",
                     "type": "string"
                 },
+                "cpcertno": {
+                    "type": "string"
+                },
                 "exchangerate": {
                     "description": "汇率[67]",
                     "type": "number"
@@ -28471,10 +28477,19 @@ const docTemplate = `{
                     "description": "商品编号",
                     "type": "string"
                 },
+                "imagepath": {
+                    "type": "string"
+                },
                 "isspecified": {
                     "description": "是否指定对手 - 0:不指定 1:指定好友(贸易圈) 2:指定对手    -   [挂牌]",
                     "type": "integer"
                 },
+                "kppath": {
+                    "type": "string"
+                },
+                "kpweight": {
+                    "type": "string"
+                },
                 "marginalgorithm": {
                     "description": "保证金方式 - 1：比率  2：固定",
                     "type": "integer"
@@ -28487,6 +28502,9 @@ const docTemplate = `{
                     "description": "市场ID",
                     "type": "integer"
                 },
+                "marketprice": {
+                    "type": "string"
+                },
                 "orderamount": {
                     "description": "挂牌金额[账户] [67]= OrderQty * FixedPrice * ExchangeRate /100",
                     "type": "number"
@@ -28499,6 +28517,10 @@ const docTemplate = `{
                     "description": "履约计划模板ID",
                     "type": "integer"
                 },
+                "price": {
+                    "description": "价格",
+                    "type": "number"
+                },
                 "pricefactor": {
                     "description": "价格系数(浮动价时填写)    -   [挂牌]",
                     "type": "number"
@@ -28507,10 +28529,16 @@ const docTemplate = `{
                     "description": "升贴水(浮动价时填写)    -   [挂牌]",
                     "type": "number"
                 },
+                "priceper": {
+                    "type": "string"
+                },
                 "relatedwrtradeorderid": {
                     "description": "关联委托单号(摘牌委托关联挂牌委托单ID)",
                     "type": "integer"
                 },
+                "remark": {
+                    "type": "string"
+                },
                 "retcode": {
                     "description": "错误代码",
                     "type": "integer"
@@ -28519,6 +28547,21 @@ const docTemplate = `{
                     "description": "成交重量",
                     "type": "number"
                 },
+                "settingmaterial": {
+                    "type": "string"
+                },
+                "size1": {
+                    "type": "string"
+                },
+                "size2": {
+                    "type": "string"
+                },
+                "size3": {
+                    "type": "string"
+                },
+                "stonedesc": {
+                    "type": "string"
+                },
                 "totalqty": {
                     "description": "总重量",
                     "type": "number"
@@ -28559,6 +28602,9 @@ const docTemplate = `{
                     "description": "有效类型 - 1当日有效 2本周有效 3指定日期有效 4一直有效",
                     "type": "integer"
                 },
+                "warehousenamedisplay": {
+                    "type": "string"
+                },
                 "wrbargainid": {
                     "description": "议价申请单ID",
                     "type": "integer"
@@ -28567,6 +28613,9 @@ const docTemplate = `{
                     "description": "仓单要素类型ID/商品ID(77)",
                     "type": "integer"
                 },
+                "wrpath": {
+                    "type": "string"
+                },
                 "wrpricetype": {
                     "description": "价格方式 - 1:固定价 2-浮动价  -   [挂牌]",
                     "type": "integer"
@@ -28599,9 +28648,75 @@ const docTemplate = `{
                     "description": "钻石分类 - 描述",
                     "type": "string"
                 },
+                "zscerttypedisplay": {
+                    "type": "string"
+                },
+                "zsclaritytype1display": {
+                    "type": "string"
+                },
+                "zsclaritytype2display": {
+                    "type": "string"
+                },
+                "zscolortype1display": {
+                    "type": "string"
+                },
+                "zscolortype2display": {
+                    "type": "string"
+                },
+                "zscrystaltype": {
+                    "type": "string"
+                },
+                "zscrystaltypedisplay": {
+                    "type": "string"
+                },
                 "zscurrencytype": {
                     "description": "货币类型 - 枚举“ZSCurrencyType”",
                     "type": "integer"
+                },
+                "zscurrencytypedisplay": {
+                    "type": "string"
+                },
+                "zscurrencytypedisplayunit": {
+                    "type": "string"
+                },
+                "zscuttype1display": {
+                    "type": "string"
+                },
+                "zscuttype2display": {
+                    "type": "string"
+                },
+                "zsczcolor1typedisplay": {
+                    "type": "string"
+                },
+                "zsczcolor2typedisplay": {
+                    "type": "string"
+                },
+                "zsczcolor3typedisplay": {
+                    "type": "string"
+                },
+                "zsfluorescencetype1display": {
+                    "type": "string"
+                },
+                "zsfluorescencetype2display": {
+                    "type": "string"
+                },
+                "zspolishtype1display": {
+                    "type": "string"
+                },
+                "zspolishtype2display": {
+                    "type": "string"
+                },
+                "zsshapetypedisplay": {
+                    "type": "string"
+                },
+                "zsstyletypedisplay": {
+                    "type": "string"
+                },
+                "zssymmetrytype1display": {
+                    "type": "string"
+                },
+                "zssymmetrytype2display": {
+                    "type": "string"
                 }
             }
         },
@@ -29688,6 +29803,10 @@ const docTemplate = `{
                     "description": "履约计划模板ID",
                     "type": "integer"
                 },
+                "price": {
+                    "description": "价格",
+                    "type": "number"
+                },
                 "pricefactor": {
                     "description": "价格系数(浮动价时填写)    -   [挂牌]",
                     "type": "number"

docs/swagger.json

@@ -28418,6 +28418,9 @@
                     "description": "撤销时间",
                     "type": "string"
                 },
+                "cerno": {
+                    "type": "string"
+                },
                 "chargealgorithm": {
                     "description": "手续费收取方式 1：比率  2：固定",
                     "type": "integer"
@@ -28434,6 +28437,9 @@
                     "description": "客户端委托时间",
                     "type": "string"
                 },
+                "cpcertno": {
+                    "type": "string"
+                },
                 "exchangerate": {
                     "description": "汇率[67]",
                     "type": "number"
@@ -28462,10 +28468,19 @@
                     "description": "商品编号",
                     "type": "string"
                 },
+                "imagepath": {
+                    "type": "string"
+                },
                 "isspecified": {
                     "description": "是否指定对手 - 0:不指定 1:指定好友(贸易圈) 2:指定对手    -   [挂牌]",
                     "type": "integer"
                 },
+                "kppath": {
+                    "type": "string"
+                },
+                "kpweight": {
+                    "type": "string"
+                },
                 "marginalgorithm": {
                     "description": "保证金方式 - 1：比率  2：固定",
                     "type": "integer"
@@ -28478,6 +28493,9 @@
                     "description": "市场ID",
                     "type": "integer"
                 },
+                "marketprice": {
+                    "type": "string"
+                },
                 "orderamount": {
                     "description": "挂牌金额[账户] [67]= OrderQty * FixedPrice * ExchangeRate /100",
                     "type": "number"
@@ -28490,6 +28508,10 @@
                     "description": "履约计划模板ID",
                     "type": "integer"
                 },
+                "price": {
+                    "description": "价格",
+                    "type": "number"
+                },
                 "pricefactor": {
                     "description": "价格系数(浮动价时填写)    -   [挂牌]",
                     "type": "number"
@@ -28498,10 +28520,16 @@
                     "description": "升贴水(浮动价时填写)    -   [挂牌]",
                     "type": "number"
                 },
+                "priceper": {
+                    "type": "string"
+                },
                 "relatedwrtradeorderid": {
                     "description": "关联委托单号(摘牌委托关联挂牌委托单ID)",
                     "type": "integer"
                 },
+                "remark": {
+                    "type": "string"
+                },
                 "retcode": {
                     "description": "错误代码",
                     "type": "integer"
@@ -28510,6 +28538,21 @@
                     "description": "成交重量",
                     "type": "number"
                 },
+                "settingmaterial": {
+                    "type": "string"
+                },
+                "size1": {
+                    "type": "string"
+                },
+                "size2": {
+                    "type": "string"
+                },
+                "size3": {
+                    "type": "string"
+                },
+                "stonedesc": {
+                    "type": "string"
+                },
                 "totalqty": {
                     "description": "总重量",
                     "type": "number"
@@ -28550,6 +28593,9 @@
                     "description": "有效类型 - 1当日有效 2本周有效 3指定日期有效 4一直有效",
                     "type": "integer"
                 },
+                "warehousenamedisplay": {
+                    "type": "string"
+                },
                 "wrbargainid": {
                     "description": "议价申请单ID",
                     "type": "integer"
@@ -28558,6 +28604,9 @@
                     "description": "仓单要素类型ID/商品ID(77)",
                     "type": "integer"
                 },
+                "wrpath": {
+                    "type": "string"
+                },
                 "wrpricetype": {
                     "description": "价格方式 - 1:固定价 2-浮动价  -   [挂牌]",
                     "type": "integer"
@@ -28590,9 +28639,75 @@
                     "description": "钻石分类 - 描述",
                     "type": "string"
                 },
+                "zscerttypedisplay": {
+                    "type": "string"
+                },
+                "zsclaritytype1display": {
+                    "type": "string"
+                },
+                "zsclaritytype2display": {
+                    "type": "string"
+                },
+                "zscolortype1display": {
+                    "type": "string"
+                },
+                "zscolortype2display": {
+                    "type": "string"
+                },
+                "zscrystaltype": {
+                    "type": "string"
+                },
+                "zscrystaltypedisplay": {
+                    "type": "string"
+                },
                 "zscurrencytype": {
                     "description": "货币类型 - 枚举“ZSCurrencyType”",
                     "type": "integer"
+                },
+                "zscurrencytypedisplay": {
+                    "type": "string"
+                },
+                "zscurrencytypedisplayunit": {
+                    "type": "string"
+                },
+                "zscuttype1display": {
+                    "type": "string"
+                },
+                "zscuttype2display": {
+                    "type": "string"
+                },
+                "zsczcolor1typedisplay": {
+                    "type": "string"
+                },
+                "zsczcolor2typedisplay": {
+                    "type": "string"
+                },
+                "zsczcolor3typedisplay": {
+                    "type": "string"
+                },
+                "zsfluorescencetype1display": {
+                    "type": "string"
+                },
+                "zsfluorescencetype2display": {
+                    "type": "string"
+                },
+                "zspolishtype1display": {
+                    "type": "string"
+                },
+                "zspolishtype2display": {
+                    "type": "string"
+                },
+                "zsshapetypedisplay": {
+                    "type": "string"
+                },
+                "zsstyletypedisplay": {
+                    "type": "string"
+                },
+                "zssymmetrytype1display": {
+                    "type": "string"
+                },
+                "zssymmetrytype2display": {
+                    "type": "string"
                 }
             }
         },
@@ -29679,6 +29794,10 @@
                     "description": "履约计划模板ID",
                     "type": "integer"
                 },
+                "price": {
+                    "description": "价格",
+                    "type": "number"
+                },
                 "pricefactor": {
                     "description": "价格系数(浮动价时填写)    -   [挂牌]",
                     "type": "number"

docs/swagger.yaml

@@ -11268,6 +11268,8 @@ definitions:
       canceltime:
         description: 撤销时间
         type: string
+      cerno:
+        type: string
       chargealgorithm:
         description: 手续费收取方式 1：比率  2：固定
         type: integer
@@ -11280,6 +11282,8 @@ definitions:
       clientordertime:
         description: 客户端委托时间
         type: string
+      cpcertno:
+        type: string
       exchangerate:
         description: 汇率[67]
         type: number
@@ -11301,9 +11305,15 @@ definitions:
       goodsno:
         description: 商品编号
         type: string
+      imagepath:
+        type: string
       isspecified:
         description: 是否指定对手 - 0:不指定 1:指定好友(贸易圈) 2:指定对手    -   [挂牌]
         type: integer
+      kppath:
+        type: string
+      kpweight:
+        type: string
       marginalgorithm:
         description: 保证金方式 - 1：比率  2：固定
         type: integer
@@ -11313,6 +11323,8 @@ definitions:
       marketid:
         description: 市场ID
         type: integer
+      marketprice:
+        type: string
       orderamount:
         description: 挂牌金额[账户] [67]= OrderQty * FixedPrice * ExchangeRate /100
         type: number
@@ -11322,21 +11334,38 @@ definitions:
       performancetemplateid:
         description: 履约计划模板ID
         type: integer
+      price:
+        description: 价格
+        type: number
       pricefactor:
         description: 价格系数(浮动价时填写)    -   [挂牌]
         type: number
       pricemove:
         description: 升贴水(浮动价时填写)    -   [挂牌]
         type: number
+      priceper:
+        type: string
       relatedwrtradeorderid:
         description: 关联委托单号(摘牌委托关联挂牌委托单ID)
         type: integer
+      remark:
+        type: string
       retcode:
         description: 错误代码
         type: integer
       selledqty:
         description: 成交重量
         type: number
+      settingmaterial:
+        type: string
+      size1:
+        type: string
+      size2:
+        type: string
+      size3:
+        type: string
+      stonedesc:
+        type: string
       totalqty:
         description: 总重量
         type: number
@@ -11368,12 +11397,16 @@ definitions:
       validtype:
         description: 有效类型 - 1当日有效 2本周有效 3指定日期有效 4一直有效
         type: integer
+      warehousenamedisplay:
+        type: string
       wrbargainid:
         description: 议价申请单ID
         type: integer
       wrfactortypeid:
         description: 仓单要素类型ID/商品ID(77)
         type: integer
+      wrpath:
+        type: string
       wrpricetype:
         description: 价格方式 - 1:固定价 2-浮动价  -   [挂牌]
         type: integer
@@ -11398,9 +11431,53 @@ definitions:
       zscategorydisplay:
         description: 钻石分类 - 描述
         type: string
+      zscerttypedisplay:
+        type: string
+      zsclaritytype1display:
+        type: string
+      zsclaritytype2display:
+        type: string
+      zscolortype1display:
+        type: string
+      zscolortype2display:
+        type: string
+      zscrystaltype:
+        type: string
+      zscrystaltypedisplay:
+        type: string
       zscurrencytype:
         description: 货币类型 - 枚举“ZSCurrencyType”
         type: integer
+      zscurrencytypedisplay:
+        type: string
+      zscurrencytypedisplayunit:
+        type: string
+      zscuttype1display:
+        type: string
+      zscuttype2display:
+        type: string
+      zsczcolor1typedisplay:
+        type: string
+      zsczcolor2typedisplay:
+        type: string
+      zsczcolor3typedisplay:
+        type: string
+      zsfluorescencetype1display:
+        type: string
+      zsfluorescencetype2display:
+        type: string
+      zspolishtype1display:
+        type: string
+      zspolishtype2display:
+        type: string
+      zsshapetypedisplay:
+        type: string
+      zsstyletypedisplay:
+        type: string
+      zssymmetrytype1display:
+        type: string
+      zssymmetrytype2display:
+        type: string
     required:
     - userid
     type: object
@@ -12200,6 +12277,9 @@ definitions:
       performancetemplateid:
         description: 履约计划模板ID
         type: integer
+      price:
+        description: 价格
+        type: number
       pricefactor:
         description: 价格系数(浮动价时填写)    -   [挂牌]
         type: number

models/guangzuan.go

@@ -344,43 +344,44 @@ type SellOrder struct {
 	SELLUSERNAME      string `json:"sellusername" xorm:"SELLUSERNAME" form:"sellusername"` // 卖方(查询字段-模糊查询)
 	ZSCATEGORYDISPLAY string `json:"zscategorydisplay" xorm:"ZSCATEGORYDISPLAY"`           // 钻石分类 - 描述
 
-	ZSCURRENCYTYPEDISPLAY      string `json:"zscurrencytypedisplay" xorm:"ZSCURRENCYTYPEDISPLAY"`           //
-	ZSCURRENCYTYPEDISPLAYUNIT  string `json:"zscurrencytypedisplayunit" xorm:"ZSCURRENCYTYPEDISPLAYUNIT"`   //
-	WAREHOUSENAMEDISPLAY       string `json:"warehousenamedisplay" xorm:"WAREHOUSENAMEDISPLAY"`             //
-	ZSSHAPETYPEDISPLAY         string `json:"zsshapetypedisplay" xorm:"ZSSHAPETYPEDISPLAY"`                 //
-	ZSCOLORTYPE1DISPLAY        string `json:"zscolortype1display" xorm:"ZSCOLORTYPE1DISPLAY"`               //
-	ZSCOLORTYPE2DISPLAY        string `json:"zscolortype2display" xorm:"ZSCOLORTYPE2DISPLAY"`               //
-	ZSCLARITYTYPE1DISPLAY      string `json:"zsclaritytype1display" xorm:"ZSCLARITYTYPE1DISPLAY"`           //
-	ZSCLARITYTYPE2DISPLAY      string `json:"zsclaritytype2display" xorm:"ZSCLARITYTYPE2DISPLAY"`           //
-	ZSCUTTYPE1DISPLAY          string `json:"zscuttype1display" xorm:"ZSCUTTYPE1DISPLAY"`                   //
-	ZSCUTTYPE2DISPLAY          string `json:"zscuttype2display" xorm:"ZSCUTTYPE2DISPLAY"`                   //
-	ZSSYMMETRYTYPE1DISPLAY     string `json:"zssymmetrytype1display" xorm:"ZSSYMMETRYTYPE1DISPLAY"`         //
-	ZSSYMMETRYTYPE2DISPLAY     string `json:"zssymmetrytype2display" xorm:"ZSSYMMETRYTYPE2DISPLAY"`         //
-	ZSPOLISHTYPE1DISPLAY       string `json:"zspolishtype1display" xorm:"ZSPOLISHTYPE1DISPLAY"`             //
-	ZSPOLISHTYPE2DISPLAY       string `json:"zspolishtype2display" xorm:"ZSPOLISHTYPE2DISPLAY"`             //
-	ZSFLUORESCENCETYPE1DISPLAY string `json:"zsfluorescencetype1display" xorm:"ZSFLUORESCENCETYPE1DISPLAY"` //
-	ZSFLUORESCENCETYPE2DISPLAY string `json:"zsfluorescencetype2display" xorm:"ZSFLUORESCENCETYPE2DISPLAY"` //
-	ZSCERTTYPEDISPLAY          string `json:"zscerttypedisplay" xorm:"ZSCERTTYPEDISPLAY"`                   //
-	ZSCRYSTALTYPEDISPLAY       string `json:"zscrystaltypedisplay" xorm:"ZSCRYSTALTYPEDISPLAY"`             //
-	ZSSTYLETYPEDISPLAY         string `json:"zsstyletypedisplay" xorm:"ZSSTYLETYPEDISPLAY"`                 //
-	ZSCZCOLOR1TYPEDISPLAY      string `json:"zsczcolor1typedisplay" xorm:"ZSCZCOLOR1TYPEDISPLAY"`           //
-	ZSCZCOLOR2TYPEDISPLAY      string `json:"zsczcolor2typedisplay" xorm:"ZSCZCOLOR2TYPEDISPLAY"`           //
-	ZSCZCOLOR3TYPEDISPLAY      string `json:"zsczcolor3typedisplay" xorm:"ZSCZCOLOR3TYPEDISPLAY"`           //
-	MARKETPRICE                string `json:"marketprice" xorm:"MARKETPRICE"`                               //
-	IMAGEPATH                  string `json:"imagepath" xorm:"IMAGEPATH"`                                   //
-	WRPATH                     string `json:"wrpath" xorm:"WRPATH"`                                         //
-	REMARK                     string `json:"remark" xorm:"REMARK"`                                         //
-	PRICEPER                   string `json:"priceper" xorm:"PRICEPER"`                                     //
-	SIZE1                      string `json:"size1" xorm:"SIZE1"`                                           //
-	SIZE2                      string `json:"size2" xorm:"SIZE2"`                                           //
-	SIZE3                      string `json:"size3" xorm:"SIZE3"`                                           //
-	CERNO                      string `json:"cerno" xorm:"CERNO"`                                           //
-	ZSCRYSTALTYPE              string `json:"zscrystaltype" xorm:"ZSCRYSTALTYPE"`                           //
-	CPCERTNO                   string `json:"cpcertno" xorm:"CPCERTNO"`                                     //
-	KPWEIGHT                   string `json:"kpweight" xorm:"KPWEIGHT"`                                     //
-	KPPATH                     string `json:"kppath" xorm:"KPPATH"`                                         //
-	STONEDESC                  string `json:"stonedesc" xorm:"STONEDESC"`                                   //
-	SETTINGMATERIAL            string `json:"settingmaterial" xorm:"SETTINGMATERIAL"`                       //
+	ZSCURRENCYTYPEDISPLAY      string  `json:"zscurrencytypedisplay" xorm:"ZSCURRENCYTYPEDISPLAY"`           //
+	ZSCURRENCYTYPEDISPLAYUNIT  string  `json:"zscurrencytypedisplayunit" xorm:"ZSCURRENCYTYPEDISPLAYUNIT"`   //
+	WAREHOUSENAMEDISPLAY       string  `json:"warehousenamedisplay" xorm:"WAREHOUSENAMEDISPLAY"`             //
+	ZSSHAPETYPEDISPLAY         string  `json:"zsshapetypedisplay" xorm:"ZSSHAPETYPEDISPLAY"`                 //
+	ZSCOLORTYPE1DISPLAY        string  `json:"zscolortype1display" xorm:"ZSCOLORTYPE1DISPLAY"`               //
+	ZSCOLORTYPE2DISPLAY        string  `json:"zscolortype2display" xorm:"ZSCOLORTYPE2DISPLAY"`               //
+	ZSCLARITYTYPE1DISPLAY      string  `json:"zsclaritytype1display" xorm:"ZSCLARITYTYPE1DISPLAY"`           //
+	ZSCLARITYTYPE2DISPLAY      string  `json:"zsclaritytype2display" xorm:"ZSCLARITYTYPE2DISPLAY"`           //
+	ZSCUTTYPE1DISPLAY          string  `json:"zscuttype1display" xorm:"ZSCUTTYPE1DISPLAY"`                   //
+	ZSCUTTYPE2DISPLAY          string  `json:"zscuttype2display" xorm:"ZSCUTTYPE2DISPLAY"`                   //
+	ZSSYMMETRYTYPE1DISPLAY     string  `json:"zssymmetrytype1display" xorm:"ZSSYMMETRYTYPE1DISPLAY"`         //
+	ZSSYMMETRYTYPE2DISPLAY     string  `json:"zssymmetrytype2display" xorm:"ZSSYMMETRYTYPE2DISPLAY"`         //
+	ZSPOLISHTYPE1DISPLAY       string  `json:"zspolishtype1display" xorm:"ZSPOLISHTYPE1DISPLAY"`             //
+	ZSPOLISHTYPE2DISPLAY       string  `json:"zspolishtype2display" xorm:"ZSPOLISHTYPE2DISPLAY"`             //
+	ZSFLUORESCENCETYPE1DISPLAY string  `json:"zsfluorescencetype1display" xorm:"ZSFLUORESCENCETYPE1DISPLAY"` //
+	ZSFLUORESCENCETYPE2DISPLAY string  `json:"zsfluorescencetype2display" xorm:"ZSFLUORESCENCETYPE2DISPLAY"` //
+	ZSCERTTYPEDISPLAY          string  `json:"zscerttypedisplay" xorm:"ZSCERTTYPEDISPLAY"`                   //
+	ZSCRYSTALTYPEDISPLAY       string  `json:"zscrystaltypedisplay" xorm:"ZSCRYSTALTYPEDISPLAY"`             //
+	ZSSTYLETYPEDISPLAY         string  `json:"zsstyletypedisplay" xorm:"ZSSTYLETYPEDISPLAY"`                 //
+	ZSCZCOLOR1TYPEDISPLAY      string  `json:"zsczcolor1typedisplay" xorm:"ZSCZCOLOR1TYPEDISPLAY"`           //
+	ZSCZCOLOR2TYPEDISPLAY      string  `json:"zsczcolor2typedisplay" xorm:"ZSCZCOLOR2TYPEDISPLAY"`           //
+	ZSCZCOLOR3TYPEDISPLAY      string  `json:"zsczcolor3typedisplay" xorm:"ZSCZCOLOR3TYPEDISPLAY"`           //
+	MARKETPRICE                string  `json:"marketprice" xorm:"MARKETPRICE"`                               //
+	IMAGEPATH                  string  `json:"imagepath" xorm:"IMAGEPATH"`                                   //
+	WRPATH                     string  `json:"wrpath" xorm:"WRPATH"`                                         //
+	REMARK                     string  `json:"remark" xorm:"REMARK"`                                         //
+	PRICEPER                   string  `json:"priceper" xorm:"PRICEPER"`                                     //
+	SIZE1                      string  `json:"size1" xorm:"SIZE1"`                                           //
+	SIZE2                      string  `json:"size2" xorm:"SIZE2"`                                           //
+	SIZE3                      string  `json:"size3" xorm:"SIZE3"`                                           //
+	CERNO                      string  `json:"cerno" xorm:"CERNO"`                                           //
+	ZSCRYSTALTYPE              string  `json:"zscrystaltype" xorm:"ZSCRYSTALTYPE"`                           //
+	CPCERTNO                   string  `json:"cpcertno" xorm:"CPCERTNO"`                                     //
+	KPWEIGHT                   string  `json:"kpweight" xorm:"KPWEIGHT"`                                     //
+	KPPATH                     string  `json:"kppath" xorm:"KPPATH"`                                         //
+	STONEDESC                  string  `json:"stonedesc" xorm:"STONEDESC"`                                   //
+	SETTINGMATERIAL            string  `json:"settingmaterial" xorm:"SETTINGMATERIAL"`                       //
+	PRICE                      float64 `json:"price" xorm:"PRICE"`                                           // 价格
 
 	WRSTANDARDID   int64  `json:"wrstandardid" xorm:"WRSTANDARDID"`     // 现货商品ID
 	USERID         int64  `json:"userid" xorm:"USERID"`                 // 用户ID
@@ -531,6 +532,7 @@ func (r *SellOrder) buildSql() string {
 		q.KPPATH                    ,
 		q.STONEDESC                 ,
 		q.SETTINGMATERIAL           ,
+		q.PRICE,
 		to_char(t.ORDERTIME, 'yyyy-mm-dd hh24:mi:ss') ORDERTIME1,
 		to_char(t.WRTRADEORDERID) WRTRADEORDERID1,
 		t.WRTRADEORDERID       ,
@@ -904,6 +906,45 @@ type MySellOrder struct {
 	GOODSNO           string `json:"goodsno" xorm:"GOODSNO"`                                // 商品编号
 	ZSCATEGORYDISPLAY string `json:"zscategorydisplay" xorm:"ZSCATEGORYDISPLAY"`            // 钻石分类 - 描述
 
+	ZSCURRENCYTYPEDISPLAY      string  `json:"zscurrencytypedisplay" xorm:"ZSCURRENCYTYPEDISPLAY"`           //
+	ZSCURRENCYTYPEDISPLAYUNIT  string  `json:"zscurrencytypedisplayunit" xorm:"ZSCURRENCYTYPEDISPLAYUNIT"`   //
+	WAREHOUSENAMEDISPLAY       string  `json:"warehousenamedisplay" xorm:"WAREHOUSENAMEDISPLAY"`             //
+	ZSSHAPETYPEDISPLAY         string  `json:"zsshapetypedisplay" xorm:"ZSSHAPETYPEDISPLAY"`                 //
+	ZSCOLORTYPE1DISPLAY        string  `json:"zscolortype1display" xorm:"ZSCOLORTYPE1DISPLAY"`               //
+	ZSCOLORTYPE2DISPLAY        string  `json:"zscolortype2display" xorm:"ZSCOLORTYPE2DISPLAY"`               //
+	ZSCLARITYTYPE1DISPLAY      string  `json:"zsclaritytype1display" xorm:"ZSCLARITYTYPE1DISPLAY"`           //
+	ZSCLARITYTYPE2DISPLAY      string  `json:"zsclaritytype2display" xorm:"ZSCLARITYTYPE2DISPLAY"`           //
+	ZSCUTTYPE1DISPLAY          string  `json:"zscuttype1display" xorm:"ZSCUTTYPE1DISPLAY"`                   //
+	ZSCUTTYPE2DISPLAY          string  `json:"zscuttype2display" xorm:"ZSCUTTYPE2DISPLAY"`                   //
+	ZSSYMMETRYTYPE1DISPLAY     string  `json:"zssymmetrytype1display" xorm:"ZSSYMMETRYTYPE1DISPLAY"`         //
+	ZSSYMMETRYTYPE2DISPLAY     string  `json:"zssymmetrytype2display" xorm:"ZSSYMMETRYTYPE2DISPLAY"`         //
+	ZSPOLISHTYPE1DISPLAY       string  `json:"zspolishtype1display" xorm:"ZSPOLISHTYPE1DISPLAY"`             //
+	ZSPOLISHTYPE2DISPLAY       string  `json:"zspolishtype2display" xorm:"ZSPOLISHTYPE2DISPLAY"`             //
+	ZSFLUORESCENCETYPE1DISPLAY string  `json:"zsfluorescencetype1display" xorm:"ZSFLUORESCENCETYPE1DISPLAY"` //
+	ZSFLUORESCENCETYPE2DISPLAY string  `json:"zsfluorescencetype2display" xorm:"ZSFLUORESCENCETYPE2DISPLAY"` //
+	ZSCERTTYPEDISPLAY          string  `json:"zscerttypedisplay" xorm:"ZSCERTTYPEDISPLAY"`                   //
+	ZSCRYSTALTYPEDISPLAY       string  `json:"zscrystaltypedisplay" xorm:"ZSCRYSTALTYPEDISPLAY"`             //
+	ZSSTYLETYPEDISPLAY         string  `json:"zsstyletypedisplay" xorm:"ZSSTYLETYPEDISPLAY"`                 //
+	ZSCZCOLOR1TYPEDISPLAY      string  `json:"zsczcolor1typedisplay" xorm:"ZSCZCOLOR1TYPEDISPLAY"`           //
+	ZSCZCOLOR2TYPEDISPLAY      string  `json:"zsczcolor2typedisplay" xorm:"ZSCZCOLOR2TYPEDISPLAY"`           //
+	ZSCZCOLOR3TYPEDISPLAY      string  `json:"zsczcolor3typedisplay" xorm:"ZSCZCOLOR3TYPEDISPLAY"`           //
+	MARKETPRICE                string  `json:"marketprice" xorm:"MARKETPRICE"`                               //
+	IMAGEPATH                  string  `json:"imagepath" xorm:"IMAGEPATH"`                                   //
+	WRPATH                     string  `json:"wrpath" xorm:"WRPATH"`                                         //
+	REMARK                     string  `json:"remark" xorm:"REMARK"`                                         //
+	PRICEPER                   string  `json:"priceper" xorm:"PRICEPER"`                                     //
+	SIZE1                      string  `json:"size1" xorm:"SIZE1"`                                           //
+	SIZE2                      string  `json:"size2" xorm:"SIZE2"`                                           //
+	SIZE3                      string  `json:"size3" xorm:"SIZE3"`                                           //
+	CERNO                      string  `json:"cerno" xorm:"CERNO"`                                           //
+	ZSCRYSTALTYPE              string  `json:"zscrystaltype" xorm:"ZSCRYSTALTYPE"`                           //
+	CPCERTNO                   string  `json:"cpcertno" xorm:"CPCERTNO"`                                     //
+	KPWEIGHT                   string  `json:"kpweight" xorm:"KPWEIGHT"`                                     //
+	KPPATH                     string  `json:"kppath" xorm:"KPPATH"`                                         //
+	STONEDESC                  string  `json:"stonedesc" xorm:"STONEDESC"`                                   //
+	SETTINGMATERIAL            string  `json:"settingmaterial" xorm:"SETTINGMATERIAL"`                       //
+	PRICE                      float64 `json:"price" xorm:"PRICE"`                                           // 价格
+
 	WRTRADEORDERID        string    `json:"wrtradeorderid" xorm:"WRTRADEORDERID1" form:"wrtradeorderid"` // 仓单贸易委托单ID(320+Unix秒时间戳(10位)+xxxxxx)
 	TRADEDATE             string    `json:"tradedate" xorm:"TRADEDATE"`                                  // 交易日(yyyyMMdd)
 	WRTRADETYPE           int32     `json:"wrtradetype" xorm:"WRTRADETYPE"`                              // 仓单贸易类型 - 1:挂牌 2:摘牌 3:提货卖(文化中国) 4:提货买(文化中国)
@@ -976,10 +1017,96 @@ func (r *MySellOrder) buildSql() string {
 		q.ZSCATEGORY,
 		q.ZSCURRENCYTYPE,
 		q.GOODSNO, 
-		q.ZSCATEGORYDISPLAY,
+		q.ZSCURRENCYTYPEDISPLAY     ,
+		q.ZSCURRENCYTYPEDISPLAYUNIT ,
+		q.WAREHOUSENAMEDISPLAY      ,
+		q.ZSSHAPETYPEDISPLAY        ,
+		q.ZSCOLORTYPE1DISPLAY       ,
+		q.ZSCOLORTYPE2DISPLAY       ,
+		q.ZSCLARITYTYPE1DISPLAY     ,
+		q.ZSCLARITYTYPE2DISPLAY     ,
+		q.ZSCUTTYPE1DISPLAY         ,
+		q.ZSCUTTYPE2DISPLAY         ,
+		q.ZSSYMMETRYTYPE1DISPLAY    ,
+		q.ZSSYMMETRYTYPE2DISPLAY    ,
+		q.ZSPOLISHTYPE1DISPLAY      ,
+		q.ZSPOLISHTYPE2DISPLAY      ,
+		q.ZSFLUORESCENCETYPE1DISPLAY,
+		q.ZSFLUORESCENCETYPE2DISPLAY,
+		q.ZSCERTTYPEDISPLAY         ,
+		q.ZSCRYSTALTYPEDISPLAY      ,
+		q.ZSSTYLETYPEDISPLAY        ,
+		q.ZSCZCOLOR1TYPEDISPLAY     ,
+		q.ZSCZCOLOR2TYPEDISPLAY     ,
+		q.ZSCZCOLOR3TYPEDISPLAY     ,
+		q.MARKETPRICE               ,
+		q.IMAGEPATH                 ,
+		q.WRPATH                    ,
+		q.REMARK                    ,
+		q.PRICEPER                  ,
+		q.SIZE1                     ,
+		q.SIZE2                     ,
+		q.SIZE3                     ,
+		q.CERNO                     ,
+		q.ZSCRYSTALTYPE             ,
+		q.CPCERTNO                  ,
+		q.KPWEIGHT                  ,
+		q.KPPATH                    ,
+		q.STONEDESC                 ,
+		q.SETTINGMATERIAL           ,
 		to_char(t.ORDERTIME, 'yyyy-mm-dd hh24:mi:ss') ORDERTIME1,
 		to_char(t.WRTRADEORDERID) WRTRADEORDERID1,
-		t.* 
+		t.WRTRADEORDERID       ,
+		t.TRADEDATE            ,
+		t.WRTRADETYPE          ,
+		t.BUYORSELL            ,
+		t.RELATEDWRTRADEORDERID,
+		t.MARKETID             ,
+		t.ACCOUNTID            ,
+		t.WRFACTORTYPEID       ,
+		t.ORDERQTY             ,
+		t.TRADEQTY             ,
+		t.CANCELQTY            ,
+		t.WRPRICETYPE          ,
+		t.FIXEDPRICE           ,
+		t.ISSPECIFIED          ,
+		t.PRICEFACTOR          ,
+		t.PRICEMOVE            ,
+		t.FIRSTRATIO           ,
+		t.WRTRANSFERUSERID     ,
+		t.TRADEPRICE           ,
+		t.FREEZEFIRSTAMOUNT    ,
+		t.UNFREEZEFIRSTAMOUNT  ,
+		t.PERFORMANCETEMPLATEID,
+		t.VALIDTYPE            ,
+		t.VALIDTIME            ,
+		t.ORDERTIME            ,
+		t.CANCELTIME           ,
+		t.WRTRADEORDERSTATUS   ,
+		t.CLIENTTICKET         ,
+		t.ORDERSRC             ,
+		t.CLIENTTYPE           ,
+		t.UUID                 ,
+		t.CLIENTORDERTIME      ,
+		t.RETCODE              ,
+		t.OPERATORID           ,
+		t.PRICEDISPLAYMODE     ,
+		t.FREEZEMARGIN         ,
+		t.UNFREEZEMARGIN       ,
+		t.FREEZECHARGE         ,
+		t.UNFREEZECHARGE       ,
+		t.MARGINALGORITHM      ,
+		t.MARGINVALUE          ,
+		t.CHARGEALGORITHM      ,
+		t.CHARGEALGORITHMVALUE ,
+		t.CHARGEALGORITHMVALUE2,
+		t.CANBARGAIN           ,
+		t.WRBARGAINID          ,
+		t.ATTACHMENT1          ,
+		t.ATTACHMENT2          ,
+		t.APPLYID              ,
+		t.EXCHANGERATE         ,
+		t.ORDERAMOUNT 
 	FROM WRTrade_OrderDetail t
 	INNER JOIN View_GZ_WRStandard_Ex_Query q ON t.wrstandardid = q.wrstandardid
 	WHERE t.marketid=67201 AND t.BuyOrSell = 1 AND t.WRTradeOrderStatus IN (3,7) 
@@ -1004,10 +1131,96 @@ func (r *MySellOrder) buildSql_His() string {
 		q.ZSCATEGORY,
 		q.ZSCURRENCYTYPE,
 		q.GOODSNO, 
-		q.ZSCATEGORYDISPLAY,
+		q.ZSCURRENCYTYPEDISPLAY     ,
+		q.ZSCURRENCYTYPEDISPLAYUNIT ,
+		q.WAREHOUSENAMEDISPLAY      ,
+		q.ZSSHAPETYPEDISPLAY        ,
+		q.ZSCOLORTYPE1DISPLAY       ,
+		q.ZSCOLORTYPE2DISPLAY       ,
+		q.ZSCLARITYTYPE1DISPLAY     ,
+		q.ZSCLARITYTYPE2DISPLAY     ,
+		q.ZSCUTTYPE1DISPLAY         ,
+		q.ZSCUTTYPE2DISPLAY         ,
+		q.ZSSYMMETRYTYPE1DISPLAY    ,
+		q.ZSSYMMETRYTYPE2DISPLAY    ,
+		q.ZSPOLISHTYPE1DISPLAY      ,
+		q.ZSPOLISHTYPE2DISPLAY      ,
+		q.ZSFLUORESCENCETYPE1DISPLAY,
+		q.ZSFLUORESCENCETYPE2DISPLAY,
+		q.ZSCERTTYPEDISPLAY         ,
+		q.ZSCRYSTALTYPEDISPLAY      ,
+		q.ZSSTYLETYPEDISPLAY        ,
+		q.ZSCZCOLOR1TYPEDISPLAY     ,
+		q.ZSCZCOLOR2TYPEDISPLAY     ,
+		q.ZSCZCOLOR3TYPEDISPLAY     ,
+		q.MARKETPRICE               ,
+		q.IMAGEPATH                 ,
+		q.WRPATH                    ,
+		q.REMARK                    ,
+		q.PRICEPER                  ,
+		q.SIZE1                     ,
+		q.SIZE2                     ,
+		q.SIZE3                     ,
+		q.CERNO                     ,
+		q.ZSCRYSTALTYPE             ,
+		q.CPCERTNO                  ,
+		q.KPWEIGHT                  ,
+		q.KPPATH                    ,
+		q.STONEDESC                 ,
+		q.SETTINGMATERIAL           ,
 		to_char(t.ORDERTIME, 'yyyy-mm-dd hh24:mi:ss') ORDERTIME1,
 		to_char(t.WRTRADEORDERID) WRTRADEORDERID1,
-		t.* 
+		t.WRTRADEORDERID       ,
+		t.TRADEDATE            ,
+		t.WRTRADETYPE          ,
+		t.BUYORSELL            ,
+		t.RELATEDWRTRADEORDERID,
+		t.MARKETID             ,
+		t.ACCOUNTID            ,
+		t.WRFACTORTYPEID       ,
+		t.ORDERQTY             ,
+		t.TRADEQTY             ,
+		t.CANCELQTY            ,
+		t.WRPRICETYPE          ,
+		t.FIXEDPRICE           ,
+		t.ISSPECIFIED          ,
+		t.PRICEFACTOR          ,
+		t.PRICEMOVE            ,
+		t.FIRSTRATIO           ,
+		t.WRTRANSFERUSERID     ,
+		t.TRADEPRICE           ,
+		t.FREEZEFIRSTAMOUNT    ,
+		t.UNFREEZEFIRSTAMOUNT  ,
+		t.PERFORMANCETEMPLATEID,
+		t.VALIDTYPE            ,
+		t.VALIDTIME            ,
+		t.ORDERTIME            ,
+		t.CANCELTIME           ,
+		t.WRTRADEORDERSTATUS   ,
+		t.CLIENTTICKET         ,
+		t.ORDERSRC             ,
+		t.CLIENTTYPE           ,
+		t.UUID                 ,
+		t.CLIENTORDERTIME      ,
+		t.RETCODE              ,
+		t.OPERATORID           ,
+		t.PRICEDISPLAYMODE     ,
+		t.FREEZEMARGIN         ,
+		t.UNFREEZEMARGIN       ,
+		t.FREEZECHARGE         ,
+		t.UNFREEZECHARGE       ,
+		t.MARGINALGORITHM      ,
+		t.MARGINVALUE          ,
+		t.CHARGEALGORITHM      ,
+		t.CHARGEALGORITHMVALUE ,
+		t.CHARGEALGORITHMVALUE2,
+		t.CANBARGAIN           ,
+		t.WRBARGAINID          ,
+		t.ATTACHMENT1          ,
+		t.ATTACHMENT2          ,
+		t.APPLYID              ,
+		t.EXCHANGERATE         ,
+		t.ORDERAMOUNT 
 	FROM HIS_WRTrade_OrderDetail t
 	INNER JOIN View_GZ_WRStandard_Ex_Query q ON t.wrstandardid = q.wrstandardid
 	WHERE t.isvaliddata =1 AND t.marketid=67201 AND t.BuyOrSell = 1 AND t.WRTradeOrderStatus IN (3,7)