From 6a69c304c65f71df98a9972a7e28a19b9d2ff8ac Mon Sep 17 00:00:00 2001 From: shenjiachi Date: Wed, 11 Dec 2024 21:14:57 +0800 Subject: [PATCH] update --- .../egg_energy/hdl_user_coin.go | 4 ++-- .../public_platoon/hdl_basic.go | 21 +++++++++++++++++++ app/router/router.go | 1 + go.mod | 2 +- 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/app/hdl/institutional_management/egg_energy/hdl_user_coin.go b/app/hdl/institutional_management/egg_energy/hdl_user_coin.go index fa9b3ac..cf91109 100644 --- a/app/hdl/institutional_management/egg_energy/hdl_user_coin.go +++ b/app/hdl/institutional_management/egg_energy/hdl_user_coin.go @@ -68,7 +68,7 @@ func GetEggEnergyUserCoinList(c *gin.Context) { e.OutErr(c, e.ERR_DB_ORM, err3.Error()) return } - activePointsWalletList := make([]md.ActivePointsWalletNode, len(wallets)) + activePointsWalletList := make([]md.ActivePointsWalletNode, 0, len(wallets)) userDb := implement.NewUserDb(db.Db) userIDs := make([]int64, len(wallets)) for i, wallet := range wallets { @@ -236,7 +236,7 @@ func GetEggPointsUserCoinList(c *gin.Context) { e.OutErr(c, e.ERR_DB_ORM, err3.Error()) return } - activePointsWalletList := make([]md.ActivePointsWalletNode, len(wallets)) + activePointsWalletList := make([]md.ActivePointsWalletNode, 0, len(wallets)) userDb := implement.NewUserDb(db.Db) userIDs := make([]int64, len(wallets)) for i, wallet := range wallets { diff --git a/app/hdl/institutional_management/public_platoon/hdl_basic.go b/app/hdl/institutional_management/public_platoon/hdl_basic.go index 16280f8..db2b6ad 100644 --- a/app/hdl/institutional_management/public_platoon/hdl_basic.go +++ b/app/hdl/institutional_management/public_platoon/hdl_basic.go @@ -800,6 +800,27 @@ func AddCommunityDividendsWithUser(c *gin.Context) { e.OutSuc(c, id, nil) } +// DelCommunityDividendsWithUser +// @Summary 制度中心-公排管理-社区长列表(删除) +// @Tags 公排管理 +// @Description 社区长列表(删除) +// @param Authorization header string true "验证参数Bearer和token空格拼接" +// @Accept json +// @Produce json +// @Success 200 {int} "删除数据数量" +// @Failure 400 {object} md.Response "具体错误" +// @Router /api/institutionalManagement/publicPlatoon/communityDividends/communityDividendsWithUserDel/{$id} [DELETE] +func DelCommunityDividendsWithUser(c *gin.Context) { + id := c.Param("id") + dividendsWithUserDb := implement.NewEggEnergyCommunityDividendsWithUserDb(db.Db) + affected, err := dividendsWithUserDb.EggEnergyCommunityDividendsWithUserDel(id) + if err != nil { + e.OutErr(c, e.ERR_DB_ORM, err.Error()) + return + } + e.OutSuc(c, affected, nil) +} + // UserDailyActivityAnalysis // @Summary 制度中心-公排管理-日活分析 // @Tags 公排管理 diff --git a/app/router/router.go b/app/router/router.go index b19bfd3..3c6e225 100644 --- a/app/router/router.go +++ b/app/router/router.go @@ -235,6 +235,7 @@ func rInstitutionalManagement(r *gin.RouterGroup) { //制度管理 rCommunityDividends.POST("/communityDividendsAdd", public_platoon.AddCommunityDividends) rCommunityDividends.POST("/communityDividendsWithUserList", public_platoon.ListCommunityDividendsWithUser) rCommunityDividends.POST("/communityDividendsWithUserAdd", public_platoon.AddCommunityDividendsWithUser) + rCommunityDividends.DELETE("/communityDividendsWithUserDel/:id", public_platoon.DelCommunityDividendsWithUser) } rUserDailyActivityAnalysis := rPublicPlatoon.Group("/userDailyActivityAnalysis") { diff --git a/go.mod b/go.mod index 006096b..10bb33f 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module applet go 1.19 -// replace code.fnuoos.com/EggPlanet/egg_models.git => E:/company/Egg/egg_models + replace code.fnuoos.com/EggPlanet/egg_models.git => E:/company/Egg/egg_models //replace code.fnuoos.com/EggPlanet/egg_system_rules.git => E:/company/Egg/egg_system_rules