Merge branch 'master' of http://192.168.5.5:10010/r/aps/crm

liujiandao

2023-11-13 b3a47cb555076c25c64d83dd455a472509291245

 model/serviceFeeManage.go

@@ -28,6 +28,7 @@
      OrderBy     string
      PageNum     int
      PageSize    int
      MemberIds   []int
   }
)

@@ -53,6 +54,11 @@
   if slf.ClientId != 0 {
      db.Where("client_id = ?", slf.ClientId)
   }

   if len(slf.MemberIds) > 0 {
      db.Where("service_fee_manage.member_id in ?", slf.MemberIds)
   }

   switch slf.QueryClass {
   case constvar.ServiceFeeQueryClassExpireLessThen60Days:
      db = db.Where("latest_date > ? and latest_date < ?", time.Now(), time.Now().AddDate(0, 0, 60))
@@ -120,6 +126,11 @@
   return slf
}

func (slf *ServiceFeeManageSearch) SetMemberIds(ids []int) *ServiceFeeManageSearch {
   slf.MemberIds = ids
   return slf
}

func (slf *ServiceFeeManageSearch) SetKeywordType(keyword constvar.ServiceFeeKeywordType) *ServiceFeeManageSearch {
   slf.KeywordType = keyword
   return slf