|
@@ -4,7 +4,6 @@ import ( |
|
@@ -4,7 +4,6 @@ import ( |
4
|
"crypto/sha1"
|
4
|
"crypto/sha1"
|
5
|
"errors"
|
5
|
"errors"
|
6
|
"fmt"
|
6
|
"fmt"
|
7
|
- "strconv"
|
|
|
8
|
"time"
|
7
|
"time"
|
9
|
|
8
|
|
10
|
"github.com/astaxie/beego/logs"
|
9
|
"github.com/astaxie/beego/logs"
|
|
@@ -230,7 +229,7 @@ func (c *PartnerInfoController) PartnerInfoSetState() { |
|
@@ -230,7 +229,7 @@ func (c *PartnerInfoController) PartnerInfoSetState() { |
230
|
//ListPartnerInfo 合伙人列表
|
229
|
//ListPartnerInfo 合伙人列表
|
231
|
func (c *PartnerInfoController) ListPartnerInfo() {
|
230
|
func (c *PartnerInfoController) ListPartnerInfo() {
|
232
|
type Parameter struct {
|
231
|
type Parameter struct {
|
233
|
- Partnertype string `json:"partnerType"`
|
232
|
+ Partnertype int `json:"partnerType"`
|
234
|
Area string `json:"area"`
|
233
|
Area string `json:"area"`
|
235
|
PartnerName string `json:"partnerName"`
|
234
|
PartnerName string `json:"partnerName"`
|
236
|
PageSize int `json:"pageSize"`
|
235
|
PageSize int `json:"pageSize"`
|
|
@@ -245,7 +244,7 @@ func (c *PartnerInfoController) ListPartnerInfo() { |
|
@@ -245,7 +244,7 @@ func (c *PartnerInfoController) ListPartnerInfo() { |
245
|
c.ResponseError(errors.New("json数据解析失败"))
|
244
|
c.ResponseError(errors.New("json数据解析失败"))
|
246
|
return
|
245
|
return
|
247
|
}
|
246
|
}
|
248
|
- partnertype, _ := strconv.Atoi(param.Partnertype)
|
247
|
+
|
249
|
if param.PageNumber == 0 {
|
248
|
if param.PageNumber == 0 {
|
250
|
param.PageNumber = 1
|
249
|
param.PageNumber = 1
|
251
|
}
|
250
|
}
|
|
@@ -253,7 +252,7 @@ func (c *PartnerInfoController) ListPartnerInfo() { |
|
@@ -253,7 +252,7 @@ func (c *PartnerInfoController) ListPartnerInfo() { |
253
|
param.PageSize = 20
|
252
|
param.PageSize = 20
|
254
|
}
|
253
|
}
|
255
|
query := partnerQuery.ListPartnerInfoQuery{
|
254
|
query := partnerQuery.ListPartnerInfoQuery{
|
256
|
- Partnertype: partnertype,
|
255
|
+ Partnertype: param.Partnertype,
|
257
|
PartnerName: param.PartnerName,
|
256
|
PartnerName: param.PartnerName,
|
258
|
RegionInfo: param.Area,
|
257
|
RegionInfo: param.Area,
|
259
|
Limit: param.PageSize,
|
258
|
Limit: param.PageSize,
|