|
|
@@ -344,6 +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"` //
|
|
|
+
|
|
|
WRSTANDARDID int64 `json:"wrstandardid" xorm:"WRSTANDARDID"` // 现货商品ID
|
|
|
USERID int64 `json:"userid" xorm:"USERID"` // 用户ID
|
|
|
ZSCATEGORY int32 `json:"zscategory" xorm:"ZSCATEGORY"` // 钻石分类 - 枚举”ZSCategory“
|
|
|
@@ -456,9 +494,96 @@ func (r *SellOrder) buildSql() string {
|
|
|
q.ZSCATEGORY,
|
|
|
q.ZSCURRENCYTYPE,
|
|
|
q.GOODSNO,
|
|
|
+ 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)
|
|
|
@@ -486,8 +611,96 @@ func (r *SellOrder) buildQueryDiamond() string {
|
|
|
q.ZSCATEGORY,
|
|
|
q.ZSCURRENCYTYPE,
|
|
|
q.GOODSNO,
|
|
|
- to_char(t.ORDERTIME, 'yyyy-mm-dd hh24:mi:ss') ORDERTIME,
|
|
|
- t.*
|
|
|
+ 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.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)
|
