增加“查询我的摘牌”、“查询我的询价-求购”和“查询我的询价-出售”接口

controllers/guangzuan/wrposition.go

@@ -13,14 +13,14 @@ import (
 // @Security ApiKeyAuth
 // @Security LoginID
 // @Security Group
-// @Param    page            query    int    false "页码"
-// @Param    pagesize        query    int    false "每页条数"
+// @Param    page        query    int false "页码"
+// @Param    pagesize    query    int false "每页条数"
 // @Param    wruserid        query    int    true  "登录用户ID"
 // @Param    zsallproperties query    string false "商品(查询字段-模糊查询)"
 // @Param    zscategory      query    int    false "钻石分类枚举ID"
 // @Param    warehouseid     query    int    false "仓库ID"
 // @Success  200             {array}  models.MyWRPosition
-// @Failure  500             {object} app.Response
+// @Failure  500         {object} app.Response
 // @Router   /Guangzuan/QueryMyWRPosition [get]
 // @Tags     广钻
 func QueryMyWRPosition(c *gin.Context) {
@@ -36,15 +36,15 @@ func QueryMyWRPosition(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Security LoginID
 // @Security Group
-// @Param    userid          query    int    true  "用户ID"
-// @Param    page            query    int    false "页码"
-// @Param    pagesize        query    int    false "每页条数"
+// @Param    userid      query    int true  "用户ID"
+// @Param    page        query    int false "页码"
+// @Param    pagesize    query    int false "每页条数"
 // @Param    zsallproperties query    string false "商品(查询字段-模糊查询)"
 // @Param    zscategory      query    int    false "钻石分类枚举ID"
 // @Param    wrtradeorderid  query    int    false "委托单号"
 // @Param    ishis           query    bool   false "是否历史查询"
 // @Success  200             {array}  models.MyBuyOrder
-// @Failure  500             {object} app.Response
+// @Failure  500         {object} app.Response
 // @Router   /Guangzuan/QueryMyBuyOrder [get]
 // @Tags     广钻
 func QueryMyBuyOrder(c *gin.Context) {
@@ -60,7 +60,7 @@ func QueryMyBuyOrder(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Security LoginID
 // @Security Group
-// @Param    userid          query    int    true  "用户ID"
+// @Param    userid      query    int true  "用户ID"
 // @Param    page            query    int    false "页码"
 // @Param    pagesize        query    int    false "每页条数"
 // @Param    zsallproperties query    string false "商品(查询字段-模糊查询)"
@@ -77,3 +77,71 @@ func QueryMySellOrder(c *gin.Context) {
 	a.DoBindReq(&m)
 	a.DoGetDataByPage(&m)
 }
+
+// QueryMyDeListing
+// @Summary  查询我的摘牌
+// @Produce  json
+// @Security ApiKeyAuth
+// @Security LoginID
+// @Security Group
+// @Param    userid          query    int    true  "用户ID"
+// @Param    page            query    int    false "页码"
+// @Param    pagesize        query    int    false "每页条数"
+// @Param    zsallproperties query    string false "商品(查询字段-模糊查询)"
+// @Param    zscategory      query    int    false "钻石分类枚举ID"
+// @Param    wrtradedetailid query    int    false "成交单号"
+// @Param    buyorsell       query    int    false "方向，0-全部(可不传) 1-购买 2-出售"
+// @Param    begindate       query    string false "开始交易日(yyyymmdd)"
+// @Param    enddate         query    string false "结束交易日(yyyymmdd)"
+// @Success  200             {array}  models.MyDeListing
+// @Failure  500             {object} app.Response
+// @Router   /Guangzuan/QueryMyDeListing [get]
+// @Tags     广钻
+func QueryMyDeListing(c *gin.Context) {
+	a := app.GinUtils{Gin: app.Gin{C: c}}
+	m := models.MyDeListing{}
+	a.DoBindReq(&m)
+	a.DoGetDataByPage(&m)
+}
+
+// QueryMyBargainApply
+// @Summary  查询我的询价-求购
+// @Produce  json
+// @Security ApiKeyAuth
+// @Security LoginID
+// @Security Group
+// @Param    userid          query    int    true  "用户ID"
+// @Param    page            query    int    false "页码"
+// @Param    pagesize        query    int    false "每页条数"
+// @Param    applystatus query    int false "申请状态(不传查全部) - 1:待确认 2:已确认 3:已拒绝 4:已撤销 5:系统撤销 6:处理失败 7:确认中"
+// @Success  200         {array}  models.MyBargainApply
+// @Failure  500             {object} app.Response
+// @Router   /Guangzuan/QueryMyBargainApply [get]
+// @Tags     广钻
+func QueryMyBargainApply(c *gin.Context) {
+	a := app.GinUtils{Gin: app.Gin{C: c}}
+	m := models.MyBargainApply{}
+	a.DoBindReq(&m)
+	a.DoGetDataByPage(&m)
+}
+
+// QueryMyDelistingApply
+// @Summary  查询我的询价-出售
+// @Produce  json
+// @Security ApiKeyAuth
+// @Security LoginID
+// @Security Group
+// @Param    userid          query    int    true  "用户ID"
+// @Param    page            query    int    false "页码"
+// @Param    pagesize        query    int    false "每页条数"
+// @Param    applystatus query    int false "申请状态(不传查全部) - 1:待确认 2:已确认 3:已拒绝 4:已撤销 5:系统撤销 6:处理失败 7:确认中"
+// @Success  200         {array}  models.MyDelistingApply
+// @Failure  500             {object} app.Response
+// @Router   /Guangzuan/QueryMyDelistingApply [get]
+// @Tags     广钻
+func QueryMyDelistingApply(c *gin.Context) {
+	a := app.GinUtils{Gin: app.Gin{C: c}}
+	m := models.MyDelistingApply{}
+	a.DoBindReq(&m)
+	a.DoGetDataByPage(&m)
+}

models/guangzuan.go

@@ -438,8 +438,9 @@ func (r *SellOrder) buildSql() string {
 
 	sqlId.AndEx("q.ZSCATEGORY", r.ZSCATEGORY, r.ZSCATEGORY > 0)
 	sqlId.AndLike("q.ZSALLPROPERTIES", r.ZSALLPROPERTIES)
-	sqlId.AndEx("q.WRTRADEORDERID", r.WRTRADEORDERID, r.WRTRADEORDERID > 0)
+	sqlId.AndEx("t.WRTRADEORDERID", r.WRTRADEORDERID, r.WRTRADEORDERID > 0)
 	sqlId.AndLike("q.SELLUSERNAME", r.SELLUSERNAME)
+	sqlId.OrderByDesc("t.WRTRADEORDERID")
 	sqlId.Page(r.Page, r.PageSize)
 	return sqlId.String()
 }
@@ -585,10 +586,11 @@ func (r *MyBuyOrder) buildSql() string {
 	INNER JOIN View_GZ_BuyOrderDetail_Query q ON t.wrtradeorderid = q.wrtradeorderid
 	WHERE t.marketid=67201 AND t.BuyOrSell = 0 AND t.WRTradeOrderStatus IN (3,7)
 	`
-	sqlId.And("q.USERID", r.USERID)
+	sqlId.And("t.USERID", r.USERID)
 	sqlId.AndEx("q.ZSCATEGORY", r.ZSCATEGORY, r.ZSCATEGORY > 0)
 	sqlId.AndLike("q.ZSALLPROPERTIES", r.ZSALLPROPERTIES)
-	sqlId.AndEx("q.WRTRADEORDERID", r.WRTRADEORDERID, r.WRTRADEORDERID > 0)
+	sqlId.AndEx("t.WRTRADEORDERID", r.WRTRADEORDERID, r.WRTRADEORDERID > 0)
+	sqlId.OrderByDesc("t.WRTRADEORDERID")
 	sqlId.Page(r.Page, r.PageSize)
 	return sqlId.String()
 }
@@ -601,10 +603,11 @@ func (r *MyBuyOrder) buildSql_His() string {
 	INNER JOIN View_GZ_BuyOrderDetail_Query q ON t.wrtradeorderid = q.wrtradeorderid
 	WHERE t.isvaliddata =1 AND t.marketid=67201 AND t.BuyOrSell = 0 AND t.WRTradeOrderStatus IN (3,7)
 	`
-	sqlId.And("q.USERID", r.USERID)
+	sqlId.And("t.USERID", r.USERID)
 	sqlId.AndEx("q.ZSCATEGORY", r.ZSCATEGORY, r.ZSCATEGORY > 0)
 	sqlId.AndLike("q.ZSALLPROPERTIES", r.ZSALLPROPERTIES)
-	sqlId.AndEx("q.WRTRADEORDERID", r.WRTRADEORDERID, r.WRTRADEORDERID > 0)
+	sqlId.AndEx("t.WRTRADEORDERID", r.WRTRADEORDERID, r.WRTRADEORDERID > 0)
+	sqlId.OrderByDesc("t.WRTRADEORDERID")
 	sqlId.Page(r.Page, r.PageSize)
 	return sqlId.String()
 }
@@ -709,10 +712,11 @@ func (r *MySellOrder) buildSql() string {
 	WHERE t.marketid=67201 AND t.BuyOrSell = 1 AND t.WRTradeOrderStatus IN (3,7) 
 	`
 
-	sqlId.And("t.USERID", r.USERID)
+	sqlId.And("q.USERID", r.USERID)
 	sqlId.AndEx("q.ZSCATEGORY", r.ZSCATEGORY, r.ZSCATEGORY > 0)
 	sqlId.AndLike("q.ZSALLPROPERTIES", r.ZSALLPROPERTIES)
-	sqlId.AndEx("q.WRTRADEORDERID", r.WRTRADEORDERID, r.WRTRADEORDERID > 0)
+	sqlId.AndEx("t.WRTRADEORDERID", r.WRTRADEORDERID, r.WRTRADEORDERID > 0)
+	sqlId.OrderByDesc("t.WRTRADEORDERID")
 	sqlId.Page(r.Page, r.PageSize)
 	return sqlId.String()
 }
@@ -729,10 +733,11 @@ func (r *MySellOrder) buildSql_His() string {
 	WHERE t.isvaliddata =1 AND t.marketid=67201 AND t.BuyOrSell = 1 AND t.WRTradeOrderStatus IN (3,7) 
 	`
 
-	sqlId.And("t.USERID", r.USERID)
+	sqlId.And("q.USERID", r.USERID)
 	sqlId.AndEx("q.ZSCATEGORY", r.ZSCATEGORY, r.ZSCATEGORY > 0)
 	sqlId.AndLike("q.ZSALLPROPERTIES", r.ZSALLPROPERTIES)
-	sqlId.AndEx("q.WRTRADEORDERID", r.WRTRADEORDERID, r.WRTRADEORDERID > 0)
+	sqlId.AndEx("t.WRTRADEORDERID", r.WRTRADEORDERID, r.WRTRADEORDERID > 0)
+	sqlId.OrderByDesc("t.WRTRADEORDERID")
 	sqlId.Page(r.Page, r.PageSize)
 	return sqlId.String()
 }
@@ -753,3 +758,229 @@ func (r *MySellOrder) GetDataByPage() (interface{}, error, int, int, int) {
 	}
 	return sData, err, r.Page, r.PageSize, total
 }
+
+// MyDeListing 我的摘牌
+type MyDeListing struct {
+	ZSALLPROPERTIES   string `json:"-" xorm:"ZSALLPROPERTIES" form:"zsallproperties"`       // 商品(查询字段-模糊查询)
+	SELLUSERNAME      string `json:"-" xorm:"SELLUSERNAME"`                                 // 卖方
+	BUYUSERNAME       string `json:"-" xorm:"BUYUSERNAME"`                                  // 买方
+	USERID            int64  `json:"userid" xorm:"USERID" form:"userid" binding:"required"` // 用户ID
+	ZSCATEGORY        int32  `json:"zscategory" xorm:"ZSCATEGORY" form:"zscategory"`        // 钻石分类 - 枚举”ZSCategory“
+	ZSCATEGORYDISPLAY string `json:"zscategorydisplay" xorm:"ZSCATEGORYDISPLAY"`            //
+	ZSCURRENCYTYPE    int32  `json:"zscurrencytype" xorm:"ZSCURRENCYTYPE"`                  // 货币类型 - 枚举“ZSCurrencyType”
+	GOODSNO           string `json:"goodsno" xorm:"GOODSNO"`                                // 商品编号
+
+	WRTRADEDETAILID   int64     `json:"wrtradedetailid" xorm:"WRTRADEDETAILID" form:"wrtradedetailid"` // 仓单贸易成交单ID(321+Unix秒时间戳(10位)+xxxxxx)
+	TRADEDATE         string    `json:"tradedate" xorm:"TRADEDATE"`                                    // 交易日(yyyyMMdd)
+	MARKETID          int32     `json:"marketid" xorm:"MARKETID"`                                      // 市场ID
+	WRFACTORTYPEID    int64     `json:"wrfactortypeid" xorm:"WRFACTORTYPEID"`                          // 仓单要素类型ID
+	DELIVERYGOODSID   int32     `json:"deliverygoodsid" xorm:"DELIVERYGOODSID"`                        // 现货品种ID
+	WRSTANDARDID      int32     `json:"wrstandardid" xorm:"WRSTANDARDID"`                              // 现货商品ID
+	BUYUSERID         int64     `json:"buyuserid" xorm:"BUYUSERID"`                                    // 买方用户ID
+	BUYACCOUNTID      int64     `json:"buyaccountid" xorm:"BUYACCOUNTID"`                              // 买方账号ID
+	SELLUSERID        int64     `json:"selluserid" xorm:"SELLUSERID"`                                  // 卖方用户ID
+	SELLACCOUNTID     int64     `json:"sellaccountid" xorm:"SELLACCOUNTID"`                            // 卖方账号ID
+	TRADETIME         time.Time `json:"tradetime" xorm:"TRADETIME"`                                    // 成交时间
+	TRADEPRICE        float64   `json:"tradeprice" xorm:"TRADEPRICE"`                                  // 成交价格
+	TRADEQTY          int64     `json:"tradeqty" xorm:"TRADEQTY"`                                      // 成交数量
+	TRADEAMOUNT       float64   `json:"tradeamount" xorm:"TRADEAMOUNT"`                                // 成交金额
+	PERFORMANCEPLANID int64     `json:"performanceplanid" xorm:"PERFORMANCEPLANID"`                    // 履约计划ID/合同ID
+	EXCHANGERATE      float64   `json:"exchangerate" xorm:"EXCHANGERATE"`                              // 汇率
+	BUYCHARGEVALUE    float64   `json:"buychargevalue" xorm:"BUYCHARGEVALUE"`                          // 买方手续费
+	SELLCHARGEVALUE   float64   `json:"sellchargevalue" xorm:"SELLCHARGEVALUE"`                        // 卖方手续费
+	ORITRADEAMOUNT    float64   `json:"oritradeamount" xorm:"ORITRADEAMOUNT"`                          // 成交金额[商品币种]
+
+	MATCHUSERNAME string `json:"matchusername"` // 对手方
+
+	BuyOrSell int64  `json:"buyorsell" form:"buyorsell"` // 方向 - 0:全部 1:买 2:卖
+	BeginDate string `json:"-" form:"begindate"`         // 开始交易日
+	EndDate   string `json:"-" form:"enddate"`           // 结束交易日
+
+	PageEx `xorm:"extends"` // 页码信息
+}
+
+func (r *MyDeListing) calc() {
+	// 设置对手方
+	if r.USERID == r.BUYUSERID {
+		r.MATCHUSERNAME = r.SELLUSERNAME
+		r.BuyOrSell = 1
+	} else if r.USERID == r.SELLUSERID {
+		r.MATCHUSERNAME = r.BUYUSERNAME
+		r.BuyOrSell = 2
+	}
+}
+
+func (r *MyDeListing) buildSql() string {
+	var sqlId utils.SQLVal = `
+	SELECT 
+		ua1.accountname BUYUSERNAME, 
+		q.SELLUSERNAME,
+		q.USERID,
+		q.ZSCATEGORY,
+		q.ZSCATEGORYDISPLAY,
+		q.ZSCURRENCYTYPE,
+		q.GOODSNO,
+		t.* 
+	FROM WRTrade_TradeQuote t
+	INNER JOIN View_GZ_WRStandard_Ex_Query q ON t.wrstandardid = q.wrstandardid
+	LEFT JOIN UserAccount ua1 ON t.BuyUserID = ua1.userid
+	WHERE t.marketid=67201
+	`
+
+	sqlId.AndEx("q.ZSCATEGORY", r.ZSCATEGORY, r.ZSCATEGORY > 0)
+	sqlId.AndLike("q.ZSALLPROPERTIES", r.ZSALLPROPERTIES)
+	sqlId.AndEx("t.WRTRADEDETAILID", r.WRTRADEDETAILID, r.WRTRADEDETAILID > 0)
+	switch r.BuyOrSell {
+	case 0:
+		// 全部
+		sqlId.JoinFormat(" AND (t.BUYUSERID=%v OR t.SELLUSERID=%v)", r.USERID, r.USERID)
+	case 1:
+		// 买
+		sqlId.And("t.BUYUSERID", r.USERID)
+	case 2:
+		// 卖
+		sqlId.And("t.SELLUSERID", r.USERID)
+	}
+	if r.BeginDate != "" && r.EndDate != "" {
+		sqlId.JoinFormat(" AND (t.TRADEDATE >= '%v' AND t.TRADEDATE <= '%v')", r.BeginDate, r.EndDate)
+	}
+	sqlId.OrderByDesc("t.WRTRADEDETAILID")
+
+	sqlId.Page(r.Page, r.PageSize)
+	return sqlId.String()
+}
+
+func (r *MyDeListing) GetDataByPage() (interface{}, error, int, int, int) {
+	sData := make([]MyDeListing, 0)
+	err := db.GetEngine().SQL(r.buildSql()).Find(&sData)
+	total := 0
+	for i := range sData {
+		sData[i].calc()
+		total = sData[i].Total
+	}
+	return sData, err, r.Page, r.PageSize, total
+}
+
+// MyBargainApply 我的询价-求购
+type MyBargainApply struct {
+	WRBARGAINID    int64     `json:"wrbargainid" xorm:"WRBARGAINID"`                        // [询价单号]议价申请单ID(327+Unix秒时间戳(10位)+xxxxxx)
+	WRTRADEORDERID int64     `json:"wrtradeorderid" xorm:"WRTRADEORDERID"`                  // 关联委托单ID
+	TRADEDATE      string    `json:"tradedate" xorm:"TRADEDATE"`                            // 交易日(yyyyMMdd)
+	MARKETID       int64     `json:"marketid" xorm:"MARKETID"`                              // 市场ID
+	USERID         int64     `json:"userid" xorm:"USERID" form:"userid" binding:"required"` // 摘牌人用户ID
+	ACCOUNTID      int64     `json:"accountid" xorm:"ACCOUNTID"`                            // 摘牌资金账号
+	BUYORSELL      int32     `json:"buyorsell" xorm:"BUYORSELL"`                            // 买卖 - 0:买 1:卖
+	APPLYQTY       int64     `json:"applyqty" xorm:"APPLYQTY"`                              // 摘牌数量
+	APPLYPRICE     string    `json:"applyprice" xorm:"APPLYPRICE"`                          // 申请价格
+	APPLYSTATUS    int32     `json:"applystatus" xorm:"APPLYSTATUS" form:"applystatus"`     // 申请状态 - 1:待确认 2:已确认 3:已拒绝 4:已撤销 5:系统撤销 6:处理失败 7:确认中
+	HANDLESTATUS   int32     `json:"handlestatus" xorm:"HANDLESTATUS"`                      // 处理状态
+	APPLYTIME      time.Time `json:"applytime" xorm:"APPLYTIME"`                            // 申请时间
+	APPLYREMARK    string    `json:"applyremark" xorm:"APPLYREMARK"`                        // 申请备注
+	CONFIRMQTY     int64     `json:"confirmqty" xorm:"CONFIRMQTY"`                          // 可接受数量(拒绝时填写)-作废
+	CONFIRMPRICE   float64   `json:"confirmprice" xorm:"CONFIRMPRICE"`                      // 可接受价格(拒绝时填写)-作废
+	CONFIRMUSERID  int64     `json:"confirmuserid" xorm:"CONFIRMUSERID"`                    // 确认人
+	CONFIRMTIME    time.Time `json:"confirmtime" xorm:"CONFIRMTIME"`                        // 确认时间
+	CONFIRMREMARK  string    `json:"confirmremark" xorm:"CONFIRMREMARK"`                    // 确认备注
+	REFPRICE       string    `json:"refprice" xorm:"REFPRICE"`                              // 参考价格
+	RETCODE        int32     `json:"retcode" xorm:"RETCODE"`                                // 委托返回代码
+	MATCHUSERID    int64     `json:"matchuserid" xorm:"MATCHUSERID"`                        // 挂牌方用户ID
+	MATCHACCOUNTID int64     `json:"matchaccountid" xorm:"MATCHACCOUNTID"`                  // 挂牌方资金账号
+	LADINGBILLID   int64     `json:"ladingbillid" xorm:"LADINGBILLID"`                      // 摘牌方提单ID [卖]
+	SUBNUM         int32     `json:"subnum" xorm:"SUBNUM"`                                  // 摘牌方提单子单号 [卖]
+
+	SELLUSERNAME string `json:"sellusername" xorm:"SELLUSERNAME"` // 卖方
+
+	PageEx `xorm:"extends"` // 页码信息
+}
+
+func (r *MyBargainApply) calc() {
+
+}
+
+func (r *MyBargainApply) buildSql() string {
+	var sqlId utils.SQLVal = `
+	SELECT 
+		ua.accountname SELLUSERNAME,
+		t.*,
+	FROM WRTrade_BargainApply t
+	LEFT JOIN UserAccount ua ON t.MATCHUSERID = ua.userid
+	WHERE t.marketid=67201
+	`
+
+	sqlId.And("t.USERID", r.USERID)
+	sqlId.AndEx("t.APPLYSTATUS", r.APPLYSTATUS, r.APPLYSTATUS > 0)
+	sqlId.OrderByDesc("t.WRBARGAINID")
+
+	sqlId.Page(r.Page, r.PageSize)
+	return sqlId.String()
+}
+
+func (r *MyBargainApply) GetDataByPage() (interface{}, error, int, int, int) {
+	sData := make([]MyBargainApply, 0)
+	err := db.GetEngine().SQL(r.buildSql()).Find(&sData)
+	total := 0
+	for i := range sData {
+		sData[i].calc()
+		total = sData[i].Total
+	}
+	return sData, err, r.Page, r.PageSize, total
+}
+
+// MyDelistingApply 我的询价-出售
+type MyDelistingApply struct {
+	SELLDELISTINGAPPLYID int64     `json:"selldelistingapplyid" xorm:"SELLDELISTINGAPPLYID"`              // [询价单号]卖摘牌申请ID(916+Unix秒时间戳(10位)+xxxxxx)
+	BUYWRTRADEORDERID    int64     `json:"buywrtradeorderid" xorm:"BUYWRTRADEORDERID"`                    // 买委托单ID
+	BUYUSERID            int64     `json:"buyuserid" xorm:"BUYUSERID"`                                    // 买方用户ID
+	SELLUSERID           int64     `json:"selluserid" xorm:"SELLUSERID" form:"userid" binding:"required"` // 卖方用户ID
+	SELLACCOUNTID        int64     `json:"sellaccountid" xorm:"SELLACCOUNTID"`                            // 卖方账户ID
+	WRSTANDARDID         int64     `json:"wrstandardid" xorm:"WRSTANDARDID"`                              // 现货商品ID
+	WRFACTORTYPEID       int64     `json:"wrfactortypeid" xorm:"WRFACTORTYPEID"`                          // 仓单要素类型ID
+	APPLYQTY             float64   `json:"applyqty" xorm:"APPLYQTY"`                                      // 申请数量
+	APPLYPRICE           float64   `json:"applyprice" xorm:"APPLYPRICE"`                                  // 申请价格
+	APPLYSTATUS          int32     `json:"applystatus" xorm:"APPLYSTATUS" form:"applystatus"`             // 申请状态 - 1:待确认 2:已确认 3:已拒绝 4:已撤销 5:系统撤销 6:处理失败 7:确认中
+	APPLYREMARK          string    `json:"applyremark" xorm:"APPLYREMARK"`                                // 申请备注
+	APPLYTIME            time.Time `json:"applytime" xorm:"APPLYTIME"`                                    // 申请时间
+	AUDITREMARK          string    `json:"auditremark" xorm:"AUDITREMARK"`                                // 确认备注
+	SELLTRADEORDERID     int64     `json:"selltradeorderid" xorm:"SELLTRADEORDERID"`                      // 卖方委托ID（买方确认成交后更新）
+	AUDITTIME            time.Time `json:"audittime" xorm:"AUDITTIME"`                                    // 确认时间
+	LADINGBILLID         int64     `json:"ladingbillid" xorm:"LADINGBILLID"`                              // 卖方提单ID
+	SUBNUM               int32     `json:"subnum" xorm:"SUBNUM"`                                          // 卖方提单子单号
+	MARKETID             int32     `json:"marketid" xorm:"MARKETID"`                                      // 市场ID
+
+	BUYUSERNAME string `json:"buyusername" xorm:"BUYUSERNAME"` // 买方
+
+	PageEx `xorm:"extends"` // 页码信息
+}
+
+func (r *MyDelistingApply) calc() {
+
+}
+
+func (r *MyDelistingApply) buildSql() string {
+	var sqlId utils.SQLVal = `
+	SELECT 
+		ua.accountname BUYUSERNAME,
+		t.*,
+	FROM GZ_SellDelistingApply t
+	LEFT JOIN UserAccount ua ON t.BUYUSERID = ua.userid
+	WHERE t.marketid=67201
+	`
+
+	sqlId.And("t.SELLUSERID", r.SELLUSERID)
+	sqlId.AndEx("t.APPLYSTATUS", r.APPLYSTATUS, r.APPLYSTATUS > 0)
+	sqlId.OrderByDesc("t.SELLDELISTINGAPPLYID")
+
+	sqlId.Page(r.Page, r.PageSize)
+	return sqlId.String()
+}
+
+func (r *MyDelistingApply) GetDataByPage() (interface{}, error, int, int, int) {
+	sData := make([]MyDelistingApply, 0)
+	err := db.GetEngine().SQL(r.buildSql()).Find(&sData)
+	total := 0
+	for i := range sData {
+		sData[i].calc()
+		total = sData[i].Total
+	}
+	return sData, err, r.Page, r.PageSize, total
+}

res/swag.txt

@@ -1 +1 @@
-swag i --exclude .\controllers\qhj\,.\controllers\hsby\
+swag i --exclude .\controllers\qhj\,.\controllers\qhjPCWeb\,.\controllers\hsby\

routers/router.go

@@ -659,6 +659,9 @@ func InitRouter() *gin.Engine {
 		guangzuanR.GET("QueryBuyOrder", guangzuan.QueryBuyOrder)
 		guangzuanR.GET("QuerySellOrder", guangzuan.QuerySellOrder)
 		guangzuanR.POST("QueryDiamond", guangzuan.QueryDiamond)
+		guangzuanR.GET("QueryMyDeListing", guangzuan.QueryMyDeListing)
+		guangzuanR.GET("QueryMyBargainApply", guangzuan.QueryMyBargainApply)
+		guangzuanR.GET("QueryMyDelistingApply", guangzuan.QueryMyDelistingApply)
 	}
 
 	return r

utils/sqlUtils.go

@@ -143,9 +143,9 @@ func (r *SQLVal) Page(pageNum int, pageSize int) {
 	}
 	cntBegin := (pageNum-1)*pageSize + 1
 	cntEnd := pageNum * pageSize
-	strPage := "select * from (" +
-		"select rownum cnt, count(*) over () total, a.* from (%v) a" +
-		") where cnt >= %v and cnt <= %v"
+	strPage := `select * from ( 
+		select rownum cnt, count(*) over () total, a.* from (%v) a 
+		) where cnt >= %v and cnt <= %v`
 	strPage = fmt.Sprintf(strPage, r.String(), cntBegin, cntEnd)
 	*r = SQLVal(strPage)
 }