Parcourir la source

Merge remote-tracking branch 'origin/master'

master
huangjiajun il y a 1 semaine
Parent
révision
dfbb408396
7 fichiers modifiés avec 132 ajouts et 13 suppressions
  1. +2
    -2
      app/hdl/institutional_management/egg_energy/hdl_user_coin.go
  2. +21
    -0
      app/hdl/institutional_management/public_platoon/hdl_basic.go
  3. +1
    -0
      app/router/router.go
  4. +42
    -5
      docs/docs.go
  5. +39
    -3
      docs/swagger.json
  6. +26
    -2
      docs/swagger.yaml
  7. +1
    -1
      go.mod

+ 2
- 2
app/hdl/institutional_management/egg_energy/hdl_user_coin.go Voir le fichier

@@ -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 {


+ 21
- 0
app/hdl/institutional_management/public_platoon/hdl_basic.go Voir le fichier

@@ -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 公排管理


+ 1
- 0
app/router/router.go Voir le fichier

@@ -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")
{


+ 42
- 5
docs/docs.go Voir le fichier

@@ -1,5 +1,4 @@
// Code generated by swaggo/swag. DO NOT EDIT.

// Package docs Code generated by swaggo/swag. DO NOT EDIT
package docs

import "github.com/swaggo/swag"
@@ -1524,9 +1523,7 @@ const docTemplate = `{
"name": "req",
"in": "body",
"required": true,
"schema": {
"type": "object"
}
"schema": {}
}
],
"responses": {
@@ -4964,6 +4961,44 @@ const docTemplate = `{
}
}
},
"/api/institutionalManagement/publicPlatoon/communityDividends/communityDividendsWithUserDel/{$id}": {
"delete": {
"description": "社区长列表(删除)",
"consumes": [
"application/json"
],
"produces": [
"application/json"
],
"tags": [
"公排管理"
],
"summary": "制度中心-公排管理-社区长列表(删除)",
"parameters": [
{
"type": "string",
"description": "验证参数Bearer和token空格拼接",
"name": "Authorization",
"in": "header",
"required": true
}
],
"responses": {
"200": {
"description": "删除数据数量",
"schema": {
"type": "int"
}
},
"400": {
"description": "具体错误",
"schema": {
"$ref": "#/definitions/md.Response"
}
}
}
}
},
"/api/institutionalManagement/publicPlatoon/communityDividends/communityDividendsWithUserList": {
"post": {
"description": "社区长列表(查询)",
@@ -16574,6 +16609,8 @@ var SwaggerInfo = &swag.Spec{
Description: "管理后台接口文档",
InfoInstanceName: "swagger",
SwaggerTemplate: docTemplate,
LeftDelim: "{{",
RightDelim: "}}",
}

func init() {


+ 39
- 3
docs/swagger.json Voir le fichier

@@ -1516,9 +1516,7 @@
"name": "req",
"in": "body",
"required": true,
"schema": {
"type": "object"
}
"schema": {}
}
],
"responses": {
@@ -4956,6 +4954,44 @@
}
}
},
"/api/institutionalManagement/publicPlatoon/communityDividends/communityDividendsWithUserDel/{$id}": {
"delete": {
"description": "社区长列表(删除)",
"consumes": [
"application/json"
],
"produces": [
"application/json"
],
"tags": [
"公排管理"
],
"summary": "制度中心-公排管理-社区长列表(删除)",
"parameters": [
{
"type": "string",
"description": "验证参数Bearer和token空格拼接",
"name": "Authorization",
"in": "header",
"required": true
}
],
"responses": {
"200": {
"description": "删除数据数量",
"schema": {
"type": "int"
}
},
"400": {
"description": "具体错误",
"schema": {
"$ref": "#/definitions/md.Response"
}
}
}
}
},
"/api/institutionalManagement/publicPlatoon/communityDividends/communityDividendsWithUserList": {
"post": {
"description": "社区长列表(查询)",


+ 26
- 2
docs/swagger.yaml Voir le fichier

@@ -6276,8 +6276,7 @@ paths:
in: body
name: req
required: true
schema:
type: object
schema: {}
produces:
- application/json
responses:
@@ -8548,6 +8547,31 @@ paths:
summary: 制度中心-公排管理-社区长列表(新增)
tags:
- 公排管理
/api/institutionalManagement/publicPlatoon/communityDividends/communityDividendsWithUserDel/{$id}:
delete:
consumes:
- application/json
description: 社区长列表(删除)
parameters:
- description: 验证参数Bearer和token空格拼接
in: header
name: Authorization
required: true
type: string
produces:
- application/json
responses:
"200":
description: 删除数据数量
schema:
type: int
"400":
description: 具体错误
schema:
$ref: '#/definitions/md.Response'
summary: 制度中心-公排管理-社区长列表(删除)
tags:
- 公排管理
/api/institutionalManagement/publicPlatoon/communityDividends/communityDividendsWithUserList:
post:
consumes:


+ 1
- 1
go.mod Voir le fichier

@@ -33,7 +33,7 @@ require (
)

require (
code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241211091343-ac9cda7c7f7b
code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241211131723-5b61ee87000b
code.fnuoos.com/EggPlanet/egg_system_rules.git v0.0.4-0.20241205075006-9c0bf995c788
code.fnuoos.com/go_rely_warehouse/zyos_go_es.git v1.0.1-0.20241118083738-0f22da9ba0be
code.fnuoos.com/go_rely_warehouse/zyos_go_mq.git v0.0.5


||||||
x
 
000:0
Chargement…
Annuler
Enregistrer