minghui/mh_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.优化电源线绩效接口assistant_list，出参增加字段count;门店查询改成有效门店并跟PC端排序规则保持一致。

Browse Source
This commit is contained in:
chenlin 2024-08-19 14:46:29 +08:00
parent 8a62ad0ee5
commit d467e3b978
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
controller/cb_goods_stock.go
View File

@ -497,7 +497,7 @@ func AssistantMemberPromotionList(c *gin.Context) {
return return
} }
list, totalPage, err := req.List() list, totalPage, count, err := req.List()
if err != nil { if err != nil {
logger.Error("list err:", err) logger.Error("list err:", err)
RespJson(c, status.InternalServerError, nil) RespJson(c, status.InternalServerError, nil)
@ -508,6 +508,7 @@ func AssistantMemberPromotionList(c *gin.Context) {
"list": list, "list": list,
"total_page": totalPage, "total_page": totalPage,
"page_num": req.PageNum, "page_num": req.PageNum,
"count": count,
} }
RespOK(c, ret) RespOK(c, ret)
return return

4
model/autogenerated_user.go
View File

@ -3623,6 +3623,10 @@ func (qs InviteMemberReportQuerySet) OrderDescByID() InviteMemberReportQuerySet
return qs.w(qs.db.Order("id DESC")) return qs.w(qs.db.Order("id DESC"))
} }
func (qs InviteMemberReportQuerySet) OrderDescByDateAndAscByStoreId() InviteMemberReportQuerySet {
return qs.w(qs.db.Order("STR_TO_DATE(date, '%Y-%m-%d') DESC, store_id ASC"))
}
// OrderDescByPlatinumCount is an autogenerated method // OrderDescByPlatinumCount is an autogenerated method
// nolint: dupl // nolint: dupl
func (qs InviteMemberReportQuerySet) OrderDescByPlatinumCount() InviteMemberReportQuerySet { func (qs InviteMemberReportQuerySet) OrderDescByPlatinumCount() InviteMemberReportQuerySet {

23
model/game_card.go
View File

@ -1740,7 +1740,7 @@ type AssistantMemberPromotionReq struct {
Assistant *User `json:"assistant"` Assistant *User `json:"assistant"`
} }
func (m *AssistantMemberPromotionReq) List() ([]InviteMemberReport, int, error) { func (m *AssistantMemberPromotionReq) List() ([]InviteMemberReport, int, int, error) {
var reports []InviteMemberReport var reports []InviteMemberReport
m.PageNum -= 1 m.PageNum -= 1
@ -1751,7 +1751,14 @@ func (m *AssistantMemberPromotionReq) List() ([]InviteMemberReport, int, error)
m.PageSize = 10 m.PageSize = 10
} }
m.StoreId = uint32(m.Assistant.StoreId) //m.StoreId = uint32(m.Assistant.StoreId)
effectiveStoreInfo, err := GetUserEffectiveStore(m.Assistant.Uid)
if err != nil {
logger.Error("err:", err)
return reports, 0, 0, err
}
m.StoreId = uint32(effectiveStoreInfo.StoreID)
qs := NewInviteMemberReportQuerySet(DB).CooperativeBusinessIdEq(m.Assistant.CooperativeBusinessId). qs := NewInviteMemberReportQuerySet(DB).CooperativeBusinessIdEq(m.Assistant.CooperativeBusinessId).
StoreIdEq(m.StoreId) StoreIdEq(m.StoreId)
@ -1761,17 +1768,19 @@ func (m *AssistantMemberPromotionReq) List() ([]InviteMemberReport, int, error)
count, err := qs.Count() count, err := qs.Count()
if err != nil { if err != nil {
logger.Error("err:", err) logger.Error("err:", err)
return reports, 0, err return reports, 0, 0, err
} }
totalPage := int(count)/m.PageSize + 1 //totalPage := int(count)/m.PageSize + 1
err = qs.OrderDescByID().Offset(m.PageNum * m.PageSize).Limit(m.PageSize).All(&reports) totalPage := (int(count) + m.PageSize - 1) / m.PageSize
err = qs.OrderDescByDateAndAscByStoreId().Offset(m.PageNum * m.PageSize).Limit(m.PageSize).All(&reports)
if err != nil && err != RecordNotFound { if err != nil && err != RecordNotFound {
logger.Error("err:", err) logger.Error("err:", err)
return reports, totalPage, err return reports, totalPage, 0, err
} }
reports = InviteMemberReportListSetUser(reports) reports = InviteMemberReportListSetUser(reports)
return reports, totalPage, nil return reports, totalPage, count, nil
} }
func uint32ToUint64(slice []uint32) []uint64 { func uint32ToUint64(slice []uint32) []uint64 {