修改BUG

docs/docs.go

@@ -30786,10 +30786,6 @@ const docTemplate = `{
                     "description": "买方手续费",
                     "type": "number"
                 },
-                "buyorsell": {
-                    "description": "方向 - 0:买 1:卖",
-                    "type": "integer"
-                },
                 "buyuserid": {
                     "description": "买方用户ID",
                     "type": "integer"
@@ -31003,7 +30999,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "goodsno": {
-                    "description": "-- view_GZ_WRStandard_Ex_Query --",
+                    "description": "商品编号",
                     "type": "string"
                 },
                 "ladingbillid": {
@@ -31054,7 +31050,6 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "zsallproperties": {
-                    "description": "-- VIEW_GZ_BUYORDERDETAIL_QUERY",
                     "type": "string"
                 },
                 "zscategorydisplay": {

docs/swagger.json

@@ -30777,10 +30777,6 @@
                     "description": "买方手续费",
                     "type": "number"
                 },
-                "buyorsell": {
-                    "description": "方向 - 0:买 1:卖",
-                    "type": "integer"
-                },
                 "buyuserid": {
                     "description": "买方用户ID",
                     "type": "integer"
@@ -30994,7 +30990,7 @@
                     "type": "string"
                 },
                 "goodsno": {
-                    "description": "-- view_GZ_WRStandard_Ex_Query --",
+                    "description": "商品编号",
                     "type": "string"
                 },
                 "ladingbillid": {
@@ -31045,7 +31041,6 @@
                     "type": "integer"
                 },
                 "zsallproperties": {
-                    "description": "-- VIEW_GZ_BUYORDERDETAIL_QUERY",
                     "type": "string"
                 },
                 "zscategorydisplay": {

docs/swagger.yaml

@@ -11027,9 +11027,6 @@ definitions:
       buychargevalue:
         description: 买方手续费
         type: number
-      buyorsell:
-        description: 方向 - 0:买 1:卖
-        type: integer
       buyuserid:
         description: 买方用户ID
         type: integer
@@ -11183,7 +11180,7 @@ definitions:
         description: 买委托单ID
         type: string
       goodsno:
-        description: -- view_GZ_WRStandard_Ex_Query --
+        description: 商品编号
         type: string
       ladingbillid:
         description: 卖方提单ID
@@ -11221,7 +11218,6 @@ definitions:
         description: 现货商品ID
         type: integer
       zsallproperties:
-        description: -- VIEW_GZ_BUYORDERDETAIL_QUERY
         type: string
       zscategorydisplay:
         type: string

models/guangzuan.go

@@ -1342,9 +1342,9 @@ type MyDeListing struct {
 
 	MATCHUSERNAME string `json:"matchusername" form:"matchusername"` // 对手方
 
-	BuyOrSell int64  `json:"buyorsell" form:"buyorsell"` // 方向 - 0:买 1:卖
-	BeginDate string `json:"-" form:"begindate"`         // 开始交易日
-	EndDate   string `json:"-" form:"enddate"`           // 结束交易日
+	BuyOrSell int64  `json:"-" form:"buyorsell"` // 方向 - 0:买 1:卖
+	BeginDate string `json:"-" form:"begindate"` // 开始交易日
+	EndDate   string `json:"-" form:"enddate"`   // 结束交易日
 
 	PageEx `xorm:"extends"` // 页码信息
 }
@@ -1352,11 +1352,10 @@ type MyDeListing struct {
 func (r *MyDeListing) calc() {
 	// 设置对手方
 	if r.USERID == r.BUYUSERID {
-		r.MATCHUSERNAME = r.SELLUSERNAME
-		r.BuyOrSell = 0
-	} else if r.USERID == r.SELLUSERID {
 		r.MATCHUSERNAME = r.BUYUSERNAME
-		r.BuyOrSell = 1
+	}
+	if r.USERID == r.SELLUSERID {
+		r.MATCHUSERNAME = r.SELLUSERNAME
 	}
 }
 
@@ -1579,7 +1578,6 @@ func (r *MyBargainApply) GetDataByPage() (interface{}, error, int, int, int) {
 
 // MyDelistingApply 我的询价-出售
 type MyDelistingApply struct {
-	// -- VIEW_GZ_BUYORDERDETAIL_QUERY
 	ZSALLPROPERTIES           string `json:"zsallproperties" xorm:"ZSALLPROPERTIES"`                     //
 	ZSTABLEDISPLAY            string `json:"zstabledisplay" xorm:"ZSTABLEDISPLAY"`                       //
 	BUYUSERNAME               string `json:"buyusername" xorm:"BUYUSERNAME"`                             //
@@ -1600,7 +1598,6 @@ type MyDelistingApply struct {
 	ZSCZCOLOR3TYPEDISPLAY     string `json:"zsczcolor3typedisplay" xorm:"ZSCZCOLOR3TYPEDISPLAY"`         //
 	WAREHOUSEINFOSDISPLAY     string `json:"warehouseinfosdisplay" xorm:"WAREHOUSEINFOSDISPLAY"`         //
 
-	// -- view_GZ_WRStandard_Ex_Query --
 	GOODSNO string  `json:"goodsno" xorm:"GOODSNO"` // 商品编号
 	PRICE   float64 `json:"price" xorm:"PRICE"`     // 价格
 	WEIGHT  float64 `json:"weight" xorm:"WEIGHT"`   // 克拉重量
@@ -2177,3 +2174,16 @@ func (r *MyFavorite) GetDataByPage() (interface{}, error, int, int, int) {
 	}
 	return sData, err, r.Page, r.PageSize, total
 }
+
+// Gzrapaportprice Rapaport最新报价表(广钻)
+type Gzrapaportprice struct {
+	ZSSHAPE     int32     `json:"zsshape" xorm:"ZSSHAPE"`         // 形状 - 1:BR(圆形)  2:PS(异形)
+	ZSSIZESTART float64   `json:"zssizestart" xorm:"ZSSIZESTART"` // 尺寸1
+	ZSSIZEEND   float64   `json:"zssizeend" xorm:"ZSSIZEEND"`     // 尺寸2
+	ZSCOLOR     string    `json:"zscolor" xorm:"ZSCOLOR"`         // 颜色(D-M)
+	ZSCLARITY   string    `json:"zsclarity" xorm:"ZSCLARITY"`     // 净度
+	QUOTEDATE   time.Time `json:"quotedate" xorm:"QUOTEDATE"`     // 报价日期(yyyyMMdd)
+	ZSPRICE     float64   `json:"zsprice" xorm:"ZSPRICE"`         // 价格(美元)
+	CREATETIME  time.Time `json:"createtime" xorm:"CREATETIME"`   // 创建时间
+	ORDERINDEX  int64     `json:"orderindex" xorm:"ORDERINDEX"`   // 顺序
+}