fixed bug

controllers/guangzuan/tradeService.go

@@ -18,8 +18,8 @@ import (
 // @Security Group
 // @Param    userid   query    int    true  "用户ID"
 // @Param    executestatus query    int false "执行状态 - 1:未生效 2:进行中 3:已结束"
-// @Param    page     query    int    false "页码"
-// @Param    pagesize query    int    false "每页条数"
+// @Param    page          query    int false "页码"
+// @Param    pagesize      query    int false "每页条数"
 // @Success  200           {array}  models.GzcjjcorderM
 // @Failure  500     {object} app.Response
 // @Router   /Guangzuan/QueryGZCJJCOrder [get]
@@ -39,8 +39,8 @@ func QueryGZCJJCOrder(c *gin.Context) {
 // @Security Group
 // @Param    userid        query    int true  "用户ID"
 // @Param    orderid  query    string false "单据ID"
-// @Param    page          query    int false "页码"
-// @Param    pagesize      query    int false "每页条数"
+// @Param    page     query    int    false "页码"
+// @Param    pagesize query    int    false "每页条数"
 // @Success  200      {array}  models.GzcjjcorderdetailM
 // @Failure  500           {object} app.Response
 // @Router   /Guangzuan/QueryGZCJJCOrderDetail [get]

docs/docs.go

@@ -43069,7 +43069,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "sellname": {
-                    "description": "客户名称(企业名称)",
+                    "description": "[发售方]客户名称(企业名称)",
                     "type": "string"
                 },
                 "transferdepositratio": {

docs/swagger.json

@@ -43060,7 +43060,7 @@
                     "type": "number"
                 },
                 "sellname": {
-                    "description": "客户名称(企业名称)",
+                    "description": "[发售方]客户名称(企业名称)",
                     "type": "string"
                 },
                 "transferdepositratio": {

docs/swagger.yaml

@@ -16315,7 +16315,7 @@ definitions:
         description: 发售价\订货价(49)
         type: number
       sellname:
-        description: 客户名称(企业名称)
+        description: '[发售方]客户名称(企业名称)'
         type: string
       transferdepositratio:
         description: 转让定金比例(49)

models/presale.go

@@ -134,7 +134,7 @@ type PresaleDefault struct {
 	BANNERPICURL string `json:"bannerpicurl" xorm:"BANNERPICURL"` // Banner图(逗号分隔)(2:1)
 	PICTUREURLS  string `json:"pictureurls" xorm:"PICTUREURLS"`   // 详情图片(逗号分隔)(宽：1125)
 
-	CUSTOMERNAME string `json:"sellname" xorm:"CUSTOMERNAME"` // 客户名称(企业名称)
+	CUSTOMERNAME string `json:"sellname" xorm:"SELLNAME"` // [发售方]客户名称(企业名称)
 }
 
 func (r *PresaleDefault) calc() {
@@ -146,6 +146,7 @@ func (r *PresaleDefault) buildSql() string {
 	select 
        g.GOODSID,
        g.GOODSCODE,
+	   g.GOODSNAME,
        g.PRESALEPRICE,
        g.TRANSFERDEPOSITRATIO,
        cp.BANNERPICURL,