增加查询我的奖励接口

controllers/qhj/qryQhj.go

@@ -482,3 +482,21 @@ func QueryTeamOrder(c *gin.Context) {
 	a.DoBindReq(&m)
 	a.DoGetDataByPage(&m)
 }
+
+// QueryBrokerRewardLog
+// @Summary 查询奖励流水(我的奖励)
+// @Produce json
+// @Security ApiKeyAuth
+// @Param userid query int true "用户ID"
+// @Param begindate query string false "开始交易日(yyyymmdd)"
+// @Param enddate query string false "结束交易日(yyyymmdd)"
+// @Success 200 {array} models.QhjBrokerRewardLog
+// @Failure 500 {object} app.Response
+// @Router /Qhj/QueryBrokerRewardLog [get]
+// @Tags 大连千海金
+func QueryBrokerRewardLog(c *gin.Context) {
+	a := app.GinUtils{Gin: app.Gin{C: c}}
+	m := models.QhjBrokerRewardLog{}
+	a.DoBindReq(&m)
+	a.DoGetDataI(&m)
+}

docs/docs.go

@@ -7230,6 +7230,60 @@ var doc = `{
                 }
             }
         },
+        "/Qhj/QueryBrokerRewardLog": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "大连千海金"
+                ],
+                "summary": "查询奖励流水(我的奖励)",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "用户ID",
+                        "name": "userid",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "开始交易日(yyyymmdd)",
+                        "name": "begindate",
+                        "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "结束交易日(yyyymmdd)",
+                        "name": "enddate",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.QhjBrokerRewardLog"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/Qhj/QueryContract": {
             "get": {
                 "security": [
@@ -23690,6 +23744,87 @@ var doc = `{
                 }
             }
         },
+        "models.QhjBrokerRewardLog": {
+            "type": "object",
+            "properties": {
+                "accountid": {
+                    "description": "资金账号ID",
+                    "type": "integer"
+                },
+                "createtime": {
+                    "description": "创建时间(时间)",
+                    "type": "string"
+                },
+                "handlestatus": {
+                    "description": "处理状态",
+                    "type": "integer"
+                },
+                "logid": {
+                    "description": "奖励流水ID(912+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)",
+                    "type": "string"
+                },
+                "marketid": {
+                    "description": "市场ID",
+                    "type": "integer"
+                },
+                "mmaccountid": {
+                    "description": "做市商资金账号ID",
+                    "type": "string"
+                },
+                "mmuserid": {
+                    "description": "做市商用户ID",
+                    "type": "string"
+                },
+                "rewardamount": {
+                    "description": "奖励金额",
+                    "type": "number"
+                },
+                "rewardmodel": {
+                    "description": "消费奖励方式 - 1:比率 2:固定",
+                    "type": "integer"
+                },
+                "rewardtype": {
+                    "description": "奖励类型 - 1:推广 2:消费1级 3:消费2级",
+                    "type": "integer"
+                },
+                "rewardvalue": {
+                    "description": "配置奖励值",
+                    "type": "number"
+                },
+                "srcamount": {
+                    "description": "成交金额 [消费奖励] (金额)",
+                    "type": "number"
+                },
+                "srcgoodsid": {
+                    "description": "来源商品ID [消费奖励]",
+                    "type": "string"
+                },
+                "srctime": {
+                    "description": "来源时间 (成交时间) [消费奖励]",
+                    "type": "string"
+                },
+                "srctradeid": {
+                    "description": "来源成交单ID [消费奖励] - 排除提货成交",
+                    "type": "string"
+                },
+                "srcuserid": {
+                    "description": "来源用户ID(推广账户)",
+                    "type": "string"
+                },
+                "srcusername": {
+                    "description": "推广账户名称",
+                    "type": "string"
+                },
+                "tradedate": {
+                    "description": "交易日(yyyyMMdd)",
+                    "type": "string"
+                },
+                "userid": {
+                    "description": "经纪人用户ID",
+                    "type": "integer"
+                }
+            }
+        },
         "models.QhjContract": {
             "type": "object",
             "properties": {

docs/swagger.json

@@ -7214,6 +7214,60 @@
                 }
             }
         },
+        "/Qhj/QueryBrokerRewardLog": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "大连千海金"
+                ],
+                "summary": "查询奖励流水(我的奖励)",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "用户ID",
+                        "name": "userid",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "开始交易日(yyyymmdd)",
+                        "name": "begindate",
+                        "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "结束交易日(yyyymmdd)",
+                        "name": "enddate",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.QhjBrokerRewardLog"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/Qhj/QueryContract": {
             "get": {
                 "security": [
@@ -23674,6 +23728,87 @@
                 }
             }
         },
+        "models.QhjBrokerRewardLog": {
+            "type": "object",
+            "properties": {
+                "accountid": {
+                    "description": "资金账号ID",
+                    "type": "integer"
+                },
+                "createtime": {
+                    "description": "创建时间(时间)",
+                    "type": "string"
+                },
+                "handlestatus": {
+                    "description": "处理状态",
+                    "type": "integer"
+                },
+                "logid": {
+                    "description": "奖励流水ID(912+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)",
+                    "type": "string"
+                },
+                "marketid": {
+                    "description": "市场ID",
+                    "type": "integer"
+                },
+                "mmaccountid": {
+                    "description": "做市商资金账号ID",
+                    "type": "string"
+                },
+                "mmuserid": {
+                    "description": "做市商用户ID",
+                    "type": "string"
+                },
+                "rewardamount": {
+                    "description": "奖励金额",
+                    "type": "number"
+                },
+                "rewardmodel": {
+                    "description": "消费奖励方式 - 1:比率 2:固定",
+                    "type": "integer"
+                },
+                "rewardtype": {
+                    "description": "奖励类型 - 1:推广 2:消费1级 3:消费2级",
+                    "type": "integer"
+                },
+                "rewardvalue": {
+                    "description": "配置奖励值",
+                    "type": "number"
+                },
+                "srcamount": {
+                    "description": "成交金额 [消费奖励] (金额)",
+                    "type": "number"
+                },
+                "srcgoodsid": {
+                    "description": "来源商品ID [消费奖励]",
+                    "type": "string"
+                },
+                "srctime": {
+                    "description": "来源时间 (成交时间) [消费奖励]",
+                    "type": "string"
+                },
+                "srctradeid": {
+                    "description": "来源成交单ID [消费奖励] - 排除提货成交",
+                    "type": "string"
+                },
+                "srcuserid": {
+                    "description": "来源用户ID(推广账户)",
+                    "type": "string"
+                },
+                "srcusername": {
+                    "description": "推广账户名称",
+                    "type": "string"
+                },
+                "tradedate": {
+                    "description": "交易日(yyyyMMdd)",
+                    "type": "string"
+                },
+                "userid": {
+                    "description": "经纪人用户ID",
+                    "type": "integer"
+                }
+            }
+        },
         "models.QhjContract": {
             "type": "object",
             "properties": {

docs/swagger.yaml

@@ -9730,6 +9730,66 @@ definitions:
         description: 状态 - 0:正常 1:注销
         type: integer
     type: object
+  models.QhjBrokerRewardLog:
+    properties:
+      accountid:
+        description: 资金账号ID
+        type: integer
+      createtime:
+        description: 创建时间(时间)
+        type: string
+      handlestatus:
+        description: 处理状态
+        type: integer
+      logid:
+        description: 奖励流水ID(912+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
+        type: string
+      marketid:
+        description: 市场ID
+        type: integer
+      mmaccountid:
+        description: 做市商资金账号ID
+        type: string
+      mmuserid:
+        description: 做市商用户ID
+        type: string
+      rewardamount:
+        description: 奖励金额
+        type: number
+      rewardmodel:
+        description: 消费奖励方式 - 1:比率 2:固定
+        type: integer
+      rewardtype:
+        description: 奖励类型 - 1:推广 2:消费1级 3:消费2级
+        type: integer
+      rewardvalue:
+        description: 配置奖励值
+        type: number
+      srcamount:
+        description: 成交金额 [消费奖励] (金额)
+        type: number
+      srcgoodsid:
+        description: 来源商品ID [消费奖励]
+        type: string
+      srctime:
+        description: 来源时间 (成交时间) [消费奖励]
+        type: string
+      srctradeid:
+        description: 来源成交单ID [消费奖励] - 排除提货成交
+        type: string
+      srcuserid:
+        description: 来源用户ID(推广账户)
+        type: string
+      srcusername:
+        description: 推广账户名称
+        type: string
+      tradedate:
+        description: 交易日(yyyyMMdd)
+        type: string
+      userid:
+        description: 经纪人用户ID
+        type: integer
+    type: object
   models.QhjContract:
     properties:
       contractconfirmtime:
@@ -19429,6 +19489,40 @@ paths:
       summary: 查询开户行
       tags:
       - 大连千海金
+  /Qhj/QueryBrokerRewardLog:
+    get:
+      parameters:
+      - description: 用户ID
+        in: query
+        name: userid
+        required: true
+        type: integer
+      - description: 开始交易日(yyyymmdd)
+        in: query
+        name: begindate
+        type: string
+      - description: 结束交易日(yyyymmdd)
+        in: query
+        name: enddate
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            items:
+              $ref: '#/definitions/models.QhjBrokerRewardLog'
+            type: array
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/app.Response'
+      security:
+      - ApiKeyAuth: []
+      summary: 查询奖励流水(我的奖励)
+      tags:
+      - 大连千海金
   /Qhj/QueryContract:
     get:
       parameters:

models/qhj.go

@@ -2058,3 +2058,77 @@ func (r *QhjTeamOrder) GetDataByPage() (interface{}, error, int, int, int) {
 	}
 	return sData, err, r.Page, r.PageSize, total
 }
+
+// QhjBrokerRewardLog 我的奖励
+type QhjBrokerRewardLog struct {
+	LOGID        string  `json:"logid"  xorm:"LOGID" form:"logid"`                      // 奖励流水ID(912+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
+	REWARDTYPE   int32   `json:"rewardtype"  xorm:"REWARDTYPE" form:"rewardtype"`       // 奖励类型 - 1:推广 2:消费1级 3:消费2级
+	USERID       int64   `json:"userid"  xorm:"USERID" form:"userid"`                   // 经纪人用户ID
+	REWARDAMOUNT float64 `json:"rewardamount"  xorm:"REWARDAMOUNT" form:"rewardamount"` // 奖励金额
+	SRCUSERID    string  `json:"srcuserid"  xorm:"SRCUSERID" form:"srcuserid"`          // 来源用户ID(推广账户)
+	SRCTRADEID   string  `json:"srctradeid"  xorm:"SRCTRADEID" form:"srctradeid"`       // 来源成交单ID [消费奖励] - 排除提货成交
+	SRCGOODSID   string  `json:"srcgoodsid"  xorm:"SRCGOODSID" form:"srcgoodsid"`       // 来源商品ID [消费奖励]
+	SRCAMOUNT    float64 `json:"srcamount"  xorm:"SRCAMOUNT" form:"srcamount"`          // 成交金额 [消费奖励] (金额)
+	SRCTIME      string  `json:"srctime"  xorm:"SRCTIME" form:"srctime"`                // 来源时间 (成交时间) [消费奖励]
+	REWARDMODEL  int32   `json:"rewardmodel"  xorm:"REWARDMODEL" form:"rewardmodel"`    // 消费奖励方式 - 1:比率 2:固定
+	REWARDVALUE  float64 `json:"rewardvalue"  xorm:"REWARDVALUE" form:"rewardvalue"`    // 配置奖励值
+	TRADEDATE    string  `json:"tradedate"  xorm:"TRADEDATE" form:"tradedate"`          // 交易日(yyyyMMdd)
+	MARKETID     int32   `json:"marketid"  xorm:"MARKETID" form:"marketid"`             // 市场ID
+	CREATETIME   string  `json:"createtime"  xorm:"CREATETIME" form:"createtime"`       // 创建时间(时间)
+	ACCOUNTID    int64   `json:"accountid"  xorm:"ACCOUNTID" form:"accountid"`          // 资金账号ID
+	MMUSERID     string  `json:"mmuserid"  xorm:"MMUSERID" form:"mmuserid"`             // 做市商用户ID
+	MMACCOUNTID  string  `json:"mmaccountid"  xorm:"MMACCOUNTID" form:"mmaccountid"`    // 做市商资金账号ID
+	HANDLESTATUS int32   `json:"handlestatus"  xorm:"HANDLESTATUS" form:"handlestatus"` // 处理状态
+	SRCUSERNAME  string  `json:"srcusername"  xorm:"'SRCUSERNAME'"`                     // 推广账户名称
+
+	BeginDate string `json:"-" form:"begindate"` // 开始交易日
+	EndDate   string `json:"-" form:"enddate"`   // 结束交易日
+}
+
+func (r *QhjBrokerRewardLog) calc() {
+
+}
+
+func (r *QhjBrokerRewardLog) buildSql() string {
+	var sqlId utils.SQLVal = "SELECT t.LOGID," +
+		"       t.REWARDTYPE," +
+		"       t.USERID," +
+		"       t.REWARDAMOUNT," +
+		"       t.SRCUSERID," +
+		"       to_char(t.SRCTRADEID) SRCTRADEID," +
+		"       t.SRCGOODSID," +
+		"       t.SRCAMOUNT," +
+		"       to_char(t.SRCTIME, 'yyyy-mm-dd hh24:mi:ss') SRCTIME," +
+		"       t.REWARDMODEL," +
+		"       t.REWARDVALUE," +
+		"       t.TRADEDATE," +
+		"       t.MARKETID," +
+		"       to_char(t.CREATETIME, 'yyyy-mm-dd hh24:mi:ss') CREATETIME," +
+		"       t.ACCOUNTID," +
+		"       t.MMUSERID," +
+		"       t.MMACCOUNTID," +
+		"       t.HANDLESTATUS," +
+		"       u.accountname SRCUSERNAME" +
+		"  FROM BROKERREWARDLOG t" +
+		"  LEFT JOIN USERACCOUNT u on t.srcuserid=u.userid" +
+		" WHERE 1 = 1"
+	sqlId.AndEx("t.USERID", r.USERID, r.USERID > 0)
+	if r.BeginDate != "" {
+		sqlId.JoinFormat(" and to_char(t.CREATETIME, 'yyyymmdd') >= '%v'", r.BeginDate)
+	}
+	if r.EndDate != "" {
+		sqlId.JoinFormat(" and to_char(t.CREATETIME, 'yyyymmdd') <= '%v'", r.EndDate)
+	}
+
+	return sqlId.String()
+}
+
+// GetDataEx 获取我的奖励
+func (r *QhjBrokerRewardLog) GetDataEx() (interface{}, error) {
+	sData := make([]QhjBrokerRewardLog, 0)
+	err := db.GetEngine().SQL(r.buildSql()).Find(&sData)
+	for i := range sData {
+		sData[i].calc()
+	}
+	return sData, err
+}

routers/router.go

@@ -476,6 +476,7 @@ func InitRouter() *gin.Engine {
 		qhjR.GET("QueryAreaFinanceConfig", qhj.QueryAreaFinanceConfig)
 		qhjR.GET("QueryMyTeam", qhj.QueryMyTeam)
 		qhjR.GET("QueryMyTeamOrder", qhj.QueryTeamOrder)
+		qhjR.GET("QueryBrokerRewardLog", qhj.QueryBrokerRewardLog)
 	}
 
 	// *************************千海金(PCWeb)*****************************