Browse Source

查询我的收藏增加出参

zhou.xiaoning 3 years ago
parent
commit
e09a843722
4 changed files with 30 additions and 1 deletions
  1. 9 0
      docs/docs.go
  2. 9 0
      docs/swagger.json
  3. 7 0
      docs/swagger.yaml
  4. 5 1
      models/guangzuan.go

+ 9 - 0
docs/docs.go

@@ -32724,6 +32724,10 @@ const docTemplate = `{
                     "description": "市场ID",
                     "description": "市场ID",
                     "type": "integer"
                     "type": "integer"
                 },
                 },
+                "marketprice": {
+                    "description": "市场价",
+                    "type": "string"
+                },
                 "price": {
                 "price": {
                     "description": "价格",
                     "description": "价格",
                     "type": "number"
                     "type": "number"
@@ -32732,6 +32736,10 @@ const docTemplate = `{
                     "description": "克拉单价",
                     "description": "克拉单价",
                     "type": "string"
                     "type": "string"
                 },
                 },
+                "sellusername": {
+                    "description": "卖家",
+                    "type": "string"
+                },
                 "sizedisplay": {
                 "sizedisplay": {
                     "description": "尺寸",
                     "description": "尺寸",
                     "type": "string"
                     "type": "string"
@@ -32741,6 +32749,7 @@ const docTemplate = `{
                     "type": "integer"
                     "type": "integer"
                 },
                 },
                 "warehousenamedisplay": {
                 "warehousenamedisplay": {
+                    "description": "仓库名称",
                     "type": "string"
                     "type": "string"
                 },
                 },
                 "weight": {
                 "weight": {

+ 9 - 0
docs/swagger.json

@@ -32715,6 +32715,10 @@
                     "description": "市场ID",
                     "description": "市场ID",
                     "type": "integer"
                     "type": "integer"
                 },
                 },
+                "marketprice": {
+                    "description": "市场价",
+                    "type": "string"
+                },
                 "price": {
                 "price": {
                     "description": "价格",
                     "description": "价格",
                     "type": "number"
                     "type": "number"
@@ -32723,6 +32727,10 @@
                     "description": "克拉单价",
                     "description": "克拉单价",
                     "type": "string"
                     "type": "string"
                 },
                 },
+                "sellusername": {
+                    "description": "卖家",
+                    "type": "string"
+                },
                 "sizedisplay": {
                 "sizedisplay": {
                     "description": "尺寸",
                     "description": "尺寸",
                     "type": "string"
                     "type": "string"
@@ -32732,6 +32740,7 @@
                     "type": "integer"
                     "type": "integer"
                 },
                 },
                 "warehousenamedisplay": {
                 "warehousenamedisplay": {
+                    "description": "仓库名称",
                     "type": "string"
                     "type": "string"
                 },
                 },
                 "weight": {
                 "weight": {

+ 7 - 0
docs/swagger.yaml

@@ -11830,12 +11830,18 @@ definitions:
       marketid:
       marketid:
         description: 市场ID
         description: 市场ID
         type: integer
         type: integer
+      marketprice:
+        description: 市场价
+        type: string
       price:
       price:
         description: 价格
         description: 价格
         type: number
         type: number
       priceper:
       priceper:
         description: 克拉单价
         description: 克拉单价
         type: string
         type: string
+      sellusername:
+        description: 卖家
+        type: string
       sizedisplay:
       sizedisplay:
         description: 尺寸
         description: 尺寸
         type: string
         type: string
@@ -11843,6 +11849,7 @@ definitions:
         description: 用户ID
         description: 用户ID
         type: integer
         type: integer
       warehousenamedisplay:
       warehousenamedisplay:
+        description: 仓库名称
         type: string
         type: string
       weight:
       weight:
         description: 总重量(克拉重量) - 类型:1,2,3,4,5
         description: 总重量(克拉重量) - 类型:1,2,3,4,5

+ 5 - 1
models/guangzuan.go

@@ -2248,10 +2248,12 @@ type MyFavorite struct {
 	FAVORITESTATUS int32  `json:"favoritestatus" xorm:"FAVORITESTATUS"`                  // 收藏状态 - 1:正常 2:失效
 	FAVORITESTATUS int32  `json:"favoritestatus" xorm:"FAVORITESTATUS"`                  // 收藏状态 - 1:正常 2:失效
 	MARKETID       int32  `json:"marketid" xorm:"MARKETID"`                              // 市场ID
 	MARKETID       int32  `json:"marketid" xorm:"MARKETID"`                              // 市场ID
 
 
+	MARKETPRICE                string  `json:"marketprice" xorm:"MARKETPRICE"`                               // 市场价
+	SELLUSERNAME               string  `json:"sellusername" xorm:"SELLUSERNAME"`                             //  卖家
 	ZSCATEGORYDISPLAY          string  `json:"zscategorydisplay" xorm:"ZSCATEGORYDISPLAY"`                   //
 	ZSCATEGORYDISPLAY          string  `json:"zscategorydisplay" xorm:"ZSCATEGORYDISPLAY"`                   //
 	ZSCURRENCYTYPEDISPLAY      string  `json:"zscurrencytypedisplay" xorm:"ZSCURRENCYTYPEDISPLAY"`           //
 	ZSCURRENCYTYPEDISPLAY      string  `json:"zscurrencytypedisplay" xorm:"ZSCURRENCYTYPEDISPLAY"`           //
 	ZSCURRENCYTYPEDISPLAYUNIT  string  `json:"zscurrencytypedisplayunit" xorm:"ZSCURRENCYTYPEDISPLAYUNIT"`   //
 	ZSCURRENCYTYPEDISPLAYUNIT  string  `json:"zscurrencytypedisplayunit" xorm:"ZSCURRENCYTYPEDISPLAYUNIT"`   //
-	WAREHOUSENAMEDISPLAY       string  `json:"warehousenamedisplay" xorm:"WAREHOUSENAMEDISPLAY"`             //
+	WAREHOUSENAMEDISPLAY       string  `json:"warehousenamedisplay" xorm:"WAREHOUSENAMEDISPLAY"`             // 仓库名称
 	ZSSHAPETYPEDISPLAY         string  `json:"zsshapetypedisplay" xorm:"ZSSHAPETYPEDISPLAY"`                 //
 	ZSSHAPETYPEDISPLAY         string  `json:"zsshapetypedisplay" xorm:"ZSSHAPETYPEDISPLAY"`                 //
 	ZSCOLORTYPE1DISPLAY        string  `json:"zscolortype1display" xorm:"ZSCOLORTYPE1DISPLAY"`               //
 	ZSCOLORTYPE1DISPLAY        string  `json:"zscolortype1display" xorm:"ZSCOLORTYPE1DISPLAY"`               //
 	ZSCOLORTYPE2DISPLAY        string  `json:"zscolortype2display" xorm:"ZSCOLORTYPE2DISPLAY"`               //
 	ZSCOLORTYPE2DISPLAY        string  `json:"zscolortype2display" xorm:"ZSCOLORTYPE2DISPLAY"`               //
@@ -2329,6 +2331,8 @@ func (r *MyFavorite) buildSql() string {
 		q.WEIGHT,
 		q.WEIGHT,
 		q.WEIGHTAVG,
 		q.WEIGHTAVG,
 		q.ZSCATEGORY,
 		q.ZSCATEGORY,
+		q.MARKETPRICE,
+		q.SELLUSERNAME,
 		CASE WHEN
 		CASE WHEN
 			q.SIZE1 IS NOT NULL AND q.SIZE2 IS NOT NULL AND q.SIZE2 IS NOT NULL THEN q.SIZE1 || '*' || q.SIZE2 || '*' || q.SIZE3
 			q.SIZE1 IS NOT NULL AND q.SIZE2 IS NOT NULL AND q.SIZE2 IS NOT NULL THEN q.SIZE1 || '*' || q.SIZE2 || '*' || q.SIZE3
 			ELSE q.SIZE1
 			ELSE q.SIZE1