From d467e3b9780ef183b34e0b8e1dfc20a797f1e22c Mon Sep 17 00:00:00 2001
From: chenlin <chenlin@deovo.net>
Date: Mon, 19 Aug 2024 14:46:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E7=94=B5=E6=BA=90=E7=BA=BF?=
 =?UTF-8?q?=E7=BB=A9=E6=95=88=E6=8E=A5=E5=8F=A3assistant=5Flist=EF=BC=8C?=
 =?UTF-8?q?=E5=87=BA=E5=8F=82=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5count;?=
 =?UTF-8?q?=E9=97=A8=E5=BA=97=E6=9F=A5=E8=AF=A2=E6=94=B9=E6=88=90=E6=9C=89?=
 =?UTF-8?q?=E6=95=88=E9=97=A8=E5=BA=97=E5=B9=B6=E8=B7=9FPC=E7=AB=AF?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99=E4=BF=9D=E6=8C=81=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controller/cb_goods_stock.go |  3 ++-
 model/autogenerated_user.go  |  4 ++++
 model/game_card.go           | 23 ++++++++++++++++-------
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/controller/cb_goods_stock.go b/controller/cb_goods_stock.go
index 34ae904..0c0c3f6 100644
--- a/controller/cb_goods_stock.go
+++ b/controller/cb_goods_stock.go
@@ -497,7 +497,7 @@ func AssistantMemberPromotionList(c *gin.Context) {
 		return
 	}
 
-	list, totalPage, err := req.List()
+	list, totalPage, count, err := req.List()
 	if err != nil {
 		logger.Error("list err:", err)
 		RespJson(c, status.InternalServerError, nil)
@@ -508,6 +508,7 @@ func AssistantMemberPromotionList(c *gin.Context) {
 		"list":       list,
 		"total_page": totalPage,
 		"page_num":   req.PageNum,
+		"count":      count,
 	}
 	RespOK(c, ret)
 	return
diff --git a/model/autogenerated_user.go b/model/autogenerated_user.go
index 8eeeeef..e632a19 100644
--- a/model/autogenerated_user.go
+++ b/model/autogenerated_user.go
@@ -3623,6 +3623,10 @@ func (qs InviteMemberReportQuerySet) OrderDescByID() InviteMemberReportQuerySet
 	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
 // nolint: dupl
 func (qs InviteMemberReportQuerySet) OrderDescByPlatinumCount() InviteMemberReportQuerySet {
diff --git a/model/game_card.go b/model/game_card.go
index 72126f0..8fda455 100644
--- a/model/game_card.go
+++ b/model/game_card.go
@@ -1740,7 +1740,7 @@ type AssistantMemberPromotionReq struct {
 	Assistant    *User  `json:"assistant"`
 }
 
-func (m *AssistantMemberPromotionReq) List() ([]InviteMemberReport, int, error) {
+func (m *AssistantMemberPromotionReq) List() ([]InviteMemberReport, int, int, error) {
 	var reports []InviteMemberReport
 
 	m.PageNum -= 1
@@ -1751,7 +1751,14 @@ func (m *AssistantMemberPromotionReq) List() ([]InviteMemberReport, int, error)
 		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).
 		StoreIdEq(m.StoreId)
@@ -1761,17 +1768,19 @@ func (m *AssistantMemberPromotionReq) List() ([]InviteMemberReport, int, error)
 	count, err := qs.Count()
 	if err != nil {
 		logger.Error("err:", err)
-		return reports, 0, err
+		return reports, 0, 0, err
 	}
-	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
+	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 {
 		logger.Error("err:", err)
-		return reports, totalPage, err
+		return reports, totalPage, 0, err
 	}
 
 	reports = InviteMemberReportListSetUser(reports)
-	return reports, totalPage, nil
+	return reports, totalPage, count, nil
 }
 
 func uint32ToUint64(slice []uint32) []uint64 {