作者 陈志颖

refactor:增加合伙人姓名搜索

1 appname = partner 1 appname = partner
2 runmode = "${RUN_MODE||dev}" 2 runmode = "${RUN_MODE||dev}"
3 -httpport = "${HTTP_PORT||8080}" 3 +httpport = "${HTTP_PORT||8082}"
4 4
5 #开启监控 5 #开启监控
6 EnableAdmin = false 6 EnableAdmin = false
@@ -4,7 +4,7 @@ import "os" @@ -4,7 +4,7 @@ import "os"
4 4
5 var REDIS_HOST = "127.0.0.1" 5 var REDIS_HOST = "127.0.0.1"
6 var REDIS_PORT = "6379" 6 var REDIS_PORT = "6379"
7 -var REDIS_AUTH = "123456" 7 +var REDIS_AUTH = ""
8 8
9 func init() { 9 func init() {
10 if os.Getenv("REDIS_HOST") != "" { 10 if os.Getenv("REDIS_HOST") != "" {
@@ -96,6 +96,9 @@ func (dao *PartnerInfoDao) Partners(partnerIds []int64, queryOptions map[string] @@ -96,6 +96,9 @@ func (dao *PartnerInfoDao) Partners(partnerIds []int64, queryOptions map[string]
96 if endTime, ok := queryOptions["endTime"]; ok { 96 if endTime, ok := queryOptions["endTime"]; ok {
97 filterPartners.WriteString(fmt.Sprintf(" and cooperate_time<to_timestamp(%v)", endTime)) 97 filterPartners.WriteString(fmt.Sprintf(" and cooperate_time<to_timestamp(%v)", endTime))
98 } 98 }
  99 + if keyword, ok := queryOptions["keyword"]; ok {
  100 + filterPartners.WriteString(fmt.Sprintf(" and partner_name LIKE %v", keyword))
  101 + }
99 102
100 sql.WriteString(fmt.Sprintf(` 103 sql.WriteString(fmt.Sprintf(`
101 SELECT A.*,B.total,B.amount,COALESCE(B.bonus,0) bonus,B.bonus_expense 104 SELECT A.*,B.total,B.amount,COALESCE(B.bonus,0) bonus,B.bonus_expense
@@ -15,4 +15,6 @@ type PartnersRequest struct { @@ -15,4 +15,6 @@ type PartnersRequest struct {
15 JoinWays []JoinWays `json:"joinWays"` 15 JoinWays []JoinWays `json:"joinWays"`
16 // 分红排序(0.从多到少 1.从少到多) 16 // 分红排序(0.从多到少 1.从少到多)
17 SortBy int `json:"sortBy"` 17 SortBy int `json:"sortBy"`
  18 + // 合伙人姓名
  19 + Keyword string `json:"keyword"`
18 } 20 }