点选挂牌委托单据查询（摘牌大厅）接口增加匿名功能

controllers/szdz/szdz.go

@@ -77,7 +77,7 @@ func QueryRecieptOrder(c *gin.Context) {
 		Select(`GOODS.GOODSID, GOODS.GOODSCODE, GOODS.GOODSNAME, 
 				TRADE_ORDERDETAIL.BUYORSELL, to_char(TRADE_ORDERDETAIL.ORDERID) as ORDERID, TRADE_ORDERDETAIL.TRADEDATE, TRADE_ORDERDETAIL.ORDERPRICE, 
 				TRADE_ORDERDETAIL.ORDERQTY - TRADE_ORDERDETAIL.TRADEQTY - TRADE_ORDERDETAIL.CANCELQTY as ENABLEQTY, 
-				substr(USERACCOUNT.ACCOUNTNAME,0,1)||'****' as ACCOUNTNAME`).
+				(case when USERACCOUNT.ISANONYMOUS = 0 then to_char(USERACCOUNT.ACCOUNTNAME) else '*****' end) ACCOUNTNAME`).
 		Where("TRADE_ORDERDETAIL.ORDERSTATUS in (3,7,12) and GOODS.GOODSID = ?", req.GoodsID)
 	if len(req.AccountName) > 0 {
 		s = s.And("USERACCOUNT.ACCOUNTNAME = ?", req.AccountName)

controllers/user/user.go

@@ -139,6 +139,47 @@ func GetUserAuthStatus(c *gin.Context) {
 	appG.Response(http.StatusOK, e.SUCCESS, isAuth)
 }
 
+// GetUserAccountReq 获取用户账号信息请求参数
+type GetUserAccountReq struct {
+	UserID int `form:"userID" binding:"required"` // 用户ID
+}
+
+// GetUserAccount 获取用户账号信息
+// @Summary 获取用户账号信息
+// @Produce json
+// @Security ApiKeyAuth
+// @Param userID query int true "用户ID"
+// @Success 200 {object} models.Useraccount
+// @Failure 500 {object} app.Response
+// @Router /User/GetUserAccount [get]
+// @Tags 用户信息
+func GetUserAccount(c *gin.Context) {
+	appG := app.Gin{C: c}
+
+	// 获取请求参数
+	var req GetUserAccountReq
+	if err := appG.C.ShouldBindQuery(&req); err != nil {
+		logger.GetLogger().Errorf("GetUserAccount failed: %s", err.Error())
+		appG.Response(http.StatusBadRequest, e.INVALID_PARAMS, nil)
+		return
+	}
+
+	var (
+		userAccount *models.Useraccount
+		err         error
+	)
+	if userAccount, err = models.GetUserAccount(req.UserID); err != nil {
+		// 查询失败
+		logger.GetLogger().Errorf("GetUserAccount failed: %s", err.Error())
+		appG.Response(http.StatusBadRequest, e.ERROR_QUERY_FAIL, nil)
+		return
+	}
+
+	// 查询成功
+	logger.GetLogger().Debugln("GetUserAccount successed: %v", userAccount)
+	appG.Response(http.StatusOK, e.SUCCESS, userAccount)
+}
+
 // QueryUserFavoriteGoodsesReq 获取用户商品收藏信息请求参数
 type QueryUserFavoriteGoodsesReq struct {
 	UserID int `form:"userID" binding:"required"`

docs/docs.go

@@ -2525,6 +2525,45 @@ var doc = `{
                 }
             }
         },
+        "/User/GetUserAccount": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "用户信息"
+                ],
+                "summary": "获取用户账号信息",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "用户ID",
+                        "name": "userID",
+                        "in": "query",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/models.Useraccount"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/User/GetUserAuthStatus": {
             "get": {
                 "security": [
@@ -6117,6 +6156,118 @@ var doc = `{
                 }
             }
         },
+        "models.Useraccount": {
+            "type": "object",
+            "required": [
+                "userid"
+            ],
+            "properties": {
+                "accountname": {
+                    "description": "账户名称(机构名称)",
+                    "type": "string"
+                },
+                "accountstatus": {
+                    "description": "账户状态 -  1:待激活 2:待审核 3:待复审 4:正常 5:审核拒绝 6:注销",
+                    "type": "integer"
+                },
+                "auditremark": {
+                    "description": "审核备注",
+                    "type": "string"
+                },
+                "audittime": {
+                    "description": "审核时间",
+                    "type": "string"
+                },
+                "audituserid": {
+                    "description": "审核人",
+                    "type": "integer"
+                },
+                "broker": {
+                    "description": "所属经纪人ID",
+                    "type": "integer"
+                },
+                "canceltime": {
+                    "description": "销户时间",
+                    "type": "string"
+                },
+                "canceluserid": {
+                    "description": "销户人",
+                    "type": "integer"
+                },
+                "createtime": {
+                    "description": "创建时间",
+                    "type": "string"
+                },
+                "creatorid": {
+                    "description": "创建人",
+                    "type": "integer"
+                },
+                "hasauth": {
+                    "description": "是否已实名认证 - 0:未认证 1:已认证 2:已提交(待审核) 3:已拒绝",
+                    "type": "integer"
+                },
+                "isanonymous": {
+                    "description": "是否匿名下单 - 0:否 1:是",
+                    "type": "integer"
+                },
+                "maxinvestornum": {
+                    "description": "最大用户数(经纪会员下投资者个数)",
+                    "type": "integer"
+                },
+                "memberuserid": {
+                    "description": "所属会员ID",
+                    "type": "integer"
+                },
+                "modifierid": {
+                    "description": "修改人",
+                    "type": "integer"
+                },
+                "modifyremark": {
+                    "description": "变更备注",
+                    "type": "string"
+                },
+                "modifystatus": {
+                    "description": "变更状态 1 未变更 2 变更中 3 变更待审核 4 变更待复核(投资者)",
+                    "type": "integer"
+                },
+                "modifytime": {
+                    "description": "修改时间",
+                    "type": "string"
+                },
+                "parentuserid": {
+                    "description": "所属机构ID",
+                    "type": "integer"
+                },
+                "reckonaccountid": {
+                    "description": "默认结算资金账号ID(机构分润使用) 作废",
+                    "type": "integer"
+                },
+                "refercount": {
+                    "description": "推荐总人数",
+                    "type": "integer"
+                },
+                "refereeuserid": {
+                    "description": "推荐人ID",
+                    "type": "integer"
+                },
+                "refernum": {
+                    "description": "推荐码",
+                    "type": "string"
+                },
+                "subarealevelpath": {
+                    "description": "子机构层级路径(逗号分隔,首尾加逗号)",
+                    "type": "string"
+                },
+                "userid": {
+                    "description": "用户ID",
+                    "type": "integer"
+                },
+                "usertype": {
+                    "description": "账户类型 -  1:交易所 2:机构 3:会员子机构 4:经纪人 5:投资者 6:客户",
+                    "type": "integer"
+                }
+            }
+        },
         "models.Userfavoritegoods": {
             "type": "object",
             "required": [

docs/swagger.json

@@ -2509,6 +2509,45 @@
                 }
             }
         },
+        "/User/GetUserAccount": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "用户信息"
+                ],
+                "summary": "获取用户账号信息",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "用户ID",
+                        "name": "userID",
+                        "in": "query",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/models.Useraccount"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/User/GetUserAuthStatus": {
             "get": {
                 "security": [
@@ -6101,6 +6140,118 @@
                 }
             }
         },
+        "models.Useraccount": {
+            "type": "object",
+            "required": [
+                "userid"
+            ],
+            "properties": {
+                "accountname": {
+                    "description": "账户名称(机构名称)",
+                    "type": "string"
+                },
+                "accountstatus": {
+                    "description": "账户状态 -  1:待激活 2:待审核 3:待复审 4:正常 5:审核拒绝 6:注销",
+                    "type": "integer"
+                },
+                "auditremark": {
+                    "description": "审核备注",
+                    "type": "string"
+                },
+                "audittime": {
+                    "description": "审核时间",
+                    "type": "string"
+                },
+                "audituserid": {
+                    "description": "审核人",
+                    "type": "integer"
+                },
+                "broker": {
+                    "description": "所属经纪人ID",
+                    "type": "integer"
+                },
+                "canceltime": {
+                    "description": "销户时间",
+                    "type": "string"
+                },
+                "canceluserid": {
+                    "description": "销户人",
+                    "type": "integer"
+                },
+                "createtime": {
+                    "description": "创建时间",
+                    "type": "string"
+                },
+                "creatorid": {
+                    "description": "创建人",
+                    "type": "integer"
+                },
+                "hasauth": {
+                    "description": "是否已实名认证 - 0:未认证 1:已认证 2:已提交(待审核) 3:已拒绝",
+                    "type": "integer"
+                },
+                "isanonymous": {
+                    "description": "是否匿名下单 - 0:否 1:是",
+                    "type": "integer"
+                },
+                "maxinvestornum": {
+                    "description": "最大用户数(经纪会员下投资者个数)",
+                    "type": "integer"
+                },
+                "memberuserid": {
+                    "description": "所属会员ID",
+                    "type": "integer"
+                },
+                "modifierid": {
+                    "description": "修改人",
+                    "type": "integer"
+                },
+                "modifyremark": {
+                    "description": "变更备注",
+                    "type": "string"
+                },
+                "modifystatus": {
+                    "description": "变更状态 1 未变更 2 变更中 3 变更待审核 4 变更待复核(投资者)",
+                    "type": "integer"
+                },
+                "modifytime": {
+                    "description": "修改时间",
+                    "type": "string"
+                },
+                "parentuserid": {
+                    "description": "所属机构ID",
+                    "type": "integer"
+                },
+                "reckonaccountid": {
+                    "description": "默认结算资金账号ID(机构分润使用) 作废",
+                    "type": "integer"
+                },
+                "refercount": {
+                    "description": "推荐总人数",
+                    "type": "integer"
+                },
+                "refereeuserid": {
+                    "description": "推荐人ID",
+                    "type": "integer"
+                },
+                "refernum": {
+                    "description": "推荐码",
+                    "type": "string"
+                },
+                "subarealevelpath": {
+                    "description": "子机构层级路径(逗号分隔,首尾加逗号)",
+                    "type": "string"
+                },
+                "userid": {
+                    "description": "用户ID",
+                    "type": "integer"
+                },
+                "usertype": {
+                    "description": "账户类型 -  1:交易所 2:机构 3:会员子机构 4:经纪人 5:投资者 6:客户",
+                    "type": "integer"
+                }
+            }
+        },
         "models.Userfavoritegoods": {
             "type": "object",
             "required": [

docs/swagger.yaml

@@ -2489,6 +2489,89 @@ definitions:
     required:
     - autoid
     type: object
+  models.Useraccount:
+    properties:
+      accountname:
+        description: 账户名称(机构名称)
+        type: string
+      accountstatus:
+        description: 账户状态 -  1:待激活 2:待审核 3:待复审 4:正常 5:审核拒绝 6:注销
+        type: integer
+      auditremark:
+        description: 审核备注
+        type: string
+      audittime:
+        description: 审核时间
+        type: string
+      audituserid:
+        description: 审核人
+        type: integer
+      broker:
+        description: 所属经纪人ID
+        type: integer
+      canceltime:
+        description: 销户时间
+        type: string
+      canceluserid:
+        description: 销户人
+        type: integer
+      createtime:
+        description: 创建时间
+        type: string
+      creatorid:
+        description: 创建人
+        type: integer
+      hasauth:
+        description: 是否已实名认证 - 0:未认证 1:已认证 2:已提交(待审核) 3:已拒绝
+        type: integer
+      isanonymous:
+        description: 是否匿名下单 - 0:否 1:是
+        type: integer
+      maxinvestornum:
+        description: 最大用户数(经纪会员下投资者个数)
+        type: integer
+      memberuserid:
+        description: 所属会员ID
+        type: integer
+      modifierid:
+        description: 修改人
+        type: integer
+      modifyremark:
+        description: 变更备注
+        type: string
+      modifystatus:
+        description: 变更状态 1 未变更 2 变更中 3 变更待审核 4 变更待复核(投资者)
+        type: integer
+      modifytime:
+        description: 修改时间
+        type: string
+      parentuserid:
+        description: 所属机构ID
+        type: integer
+      reckonaccountid:
+        description: 默认结算资金账号ID(机构分润使用) 作废
+        type: integer
+      refercount:
+        description: 推荐总人数
+        type: integer
+      refereeuserid:
+        description: 推荐人ID
+        type: integer
+      refernum:
+        description: 推荐码
+        type: string
+      subarealevelpath:
+        description: 子机构层级路径(逗号分隔,首尾加逗号)
+        type: string
+      userid:
+        description: 用户ID
+        type: integer
+      usertype:
+        description: 账户类型 -  1:交易所 2:机构 3:会员子机构 4:经纪人 5:投资者 6:客户
+        type: integer
+    required:
+    - userid
+    type: object
   models.Userfavoritegoods:
     properties:
       goodsid:
@@ -5680,6 +5763,30 @@ paths:
       summary: 获取登录ID
       tags:
       - 用户信息
+  /User/GetUserAccount:
+    get:
+      parameters:
+      - description: 用户ID
+        in: query
+        name: userID
+        required: true
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/models.Useraccount'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/app.Response'
+      security:
+      - ApiKeyAuth: []
+      summary: 获取用户账号信息
+      tags:
+      - 用户信息
   /User/GetUserAuthStatus:
     get:
       parameters:

models/account.go

@@ -168,6 +168,7 @@ type Useraccount struct {
 	Hasauth          int32     `json:"hasauth"  xorm:"'HASAUTH'"`                   // 是否已实名认证 - 0:未认证 1:已认证 2:已提交(待审核) 3:已拒绝
 	Refercount       int32     `json:"refercount"  xorm:"'REFERCOUNT'"`             // 推荐总人数
 	Refernum         string    `json:"refernum"  xorm:"'REFERNUM'"`                 // 推荐码
+	Isanonymous      int32     `json:"isanonymous"  xorm:"'ISANONYMOUS'"`           // 是否匿名下单 - 0:否 1:是
 }
 
 // TableName is USERACCOUNT
@@ -400,15 +401,18 @@ func GetLoginAccountByMobile(mobile string) (*Loginaccount, error) {
 // GetUserAccount 获取用户账户信息
 func GetUserAccount(userID int) (*Useraccount, error) {
 	engine := db.GetEngine()
-	var userAccount *Useraccount
+	var userAccount Useraccount
 
-	_, err := engine.Where("USERID = ?", userID).Get(userAccount)
+	has, err := engine.Where("USERID = ?", userID).Get(&userAccount)
 	if err != nil {
 		// 查询失败
 		return nil, err
 	}
+	if !has {
+		return nil, nil
+	}
 
-	return userAccount, nil
+	return &userAccount, nil
 }
 
 // GetUserInfo 获取用户信息

routers/router.go

@@ -71,7 +71,8 @@ func InitRouter() *gin.Engine {
 		userR.Use(token.Auth()).GET("/QueryMessageBoard", user.QueryMessageBoard)
 		// 添加用户留言板信息
 		userR.Use(token.Auth()).POST("/AddMessageBoard", user.AddMessageBoard)
-
+		// 获取用户账号信息
+		userR.Use(token.Auth()).GET("/GetUserAccount", user.GetUserAccount)
 	}
 	// ************************ 资金账户 ************************
 	taAccountR := apiR.Group("TaAccount")