update

app/hdl/institutional_management/public_platoon/hdl_basic.go

@@ -506,7 +506,7 @@ func GetFreePublishUser(c *gin.Context) {
 // @Accept       json
 // @Produce      json
 // @param Authorization header string true "验证参数Bearer和token空格拼接"
-// @Param    req    body    md.AddFreePublishUserReq  true  "页数和行数必填，uid选填"
+// @Param    req    body    md.AddFreePublishUserReq  true  "免罚用户ID"
 // @Success      200   {int}  	"插入数据 ID"
 // @Failure      400   {object}   md.Response              	"具体错误"
 // @Router       /api/institutionalManagement/publicPlatoon/publicPlatoonUserFreePunish/save [post]
@@ -556,6 +556,33 @@ func AddFreePublishUser(c *gin.Context) {
 	e.OutSuc(c, id, nil)
 }
 
+// DeleteFreePublishUser
+// @Summary      制度中心-公排管理-免罚用户(删除)
+// @Tags         公排管理
+// @Description  免罚用户(删除)
+// @Accept       json
+// @Produce      json
+// @param Authorization header string true "验证参数Bearer和token空格拼接"
+// @Param    req    body    md.DeleteFreePublishUserReq  true  "免罚用户ID"
+// @Success      200   {int}  	"删除数据数量"
+// @Failure      400   {object}   md.Response              	"具体错误"
+// @Router       /api/institutionalManagement/publicPlatoon/publicPlatoonUserFreePunish/delete [delete]
+func DeleteFreePublishUser(c *gin.Context) {
+	var req *md.DeleteFreePublishUserReq
+	if err1 := c.ShouldBindJSON(&req); err1 != nil {
+		e.OutErr(c, e.ERR_INVALID_ARGS, err1.Error())
+		return
+	}
+
+	freePunishWithUserDb := implement.NewPublicPlatoonFreePunishWithUserDb(db.Db)
+	affected, err := freePunishWithUserDb.PublicPlatoonFreePunishWithUserDeleteOneByUID(utils.StrToInt64(req.Uid))
+	if err != nil {
+		e.OutErr(c, e.ERR_DB_ORM, err.Error())
+		return
+	}
+	e.OutSuc(c, affected, nil)
+}
+
 // ListCommunityDividends
 // @Summary      制度中心-公排管理-社区分红(查询)
 // @Tags         公排管理

app/hdl/member_center/hdl_level__management.go

@@ -101,3 +101,41 @@ func UpdateLevel(c *gin.Context) {
 	}
 	e.OutSuc(c, affected, nil)
 }
+
+// DeleteLevel
+// @Summary      制度中心-会员中心-等级管理(删除)
+// @Tags         会员中心
+// @Description  等级管理(删除)
+// @Accept       json
+// @Produce      json
+// @param Authorization header string true "验证参数Bearer和token空格拼接"
+// @Param    req    body	 md.DeleteLevelReq 	true  "需要删除的等级 ID"
+// @Success      200   {int}     	"成功删除数据数量"
+// @Failure      400   {object}   md.Response              	"具体错误"
+// @Router       /api/memberCenter/levelManagement/deleteLevel [post]
+func DeleteLevel(c *gin.Context) {
+	var req *md.DeleteLevelReq
+	if err := c.ShouldBindJSON(&req); err != nil {
+		e.OutErr(c, e.ERR_INVALID_ARGS, err.Error())
+		return
+	}
+
+	session := db.Db.NewSession()
+	defer session.Close()
+	session.Begin()
+	levelDb := implement.NewUserLevelDb(db.Db)
+	affected, err := levelDb.UserLevelDeleteBySession(session, req.LevelID)
+	if err != nil {
+		e.OutErr(c, e.ERR_DB_ORM, err.Error())
+		return
+	}
+
+	sql := "UPDATE `user` SET level = 0 WHERE level = ?"
+	_, err = session.QueryString(sql, req.LevelID)
+	if err != nil {
+		e.OutErr(c, e.ERR_DB_ORM, err.Error())
+		return
+	}
+	session.Commit()
+	e.OutSuc(c, affected, nil)
+}

app/hdl/member_center/hdl_tag__management.go

@@ -8,6 +8,7 @@ import (
 	"code.fnuoos.com/EggPlanet/egg_models.git/src/implement"
 	"code.fnuoos.com/EggPlanet/egg_models.git/src/model"
 	"github.com/gin-gonic/gin"
+	"time"
 )
 
 // GetTagList
@@ -63,6 +64,41 @@ func GetTagList(c *gin.Context) {
 	e.OutSuc(c, resp, nil)
 }
 
+// AddTag
+// @Summary      制度中心-会员中心-标签管理(新增)
+// @Tags         会员中心
+// @Description  标签管理(新增)
+// @Accept       json
+// @Produce      json
+// @param Authorization header string true "验证参数Bearer和token空格拼接"
+// @Param    req    body	 md.AddTagReq 	true  "新增的标签信息"
+// @Success      200   {int}     	"新增的标签 ID"
+// @Failure      400   {object}   md.Response              	"具体错误"
+// @Router       /api/memberCenter/tagManagement/addTag [post]
+func AddTag(c *gin.Context) {
+	var req *md.AddTagReq
+	if err := c.ShouldBindJSON(&req); err != nil {
+		e.OutErr(c, e.ERR_INVALID_ARGS, err.Error())
+		return
+	}
+
+	tag := model.UserTag{
+		TagName:  req.Name,
+		Memo:     req.Memo,
+		CreateAt: time.Now().Format("2006-01-02 15:04:05"),
+	}
+	if req.IsPunish == "1" {
+		tag.IsPunish = 1
+	}
+	tagDb := implement.NewUserTagDb(db.Db)
+	tagID, err := tagDb.UserTagInsert(&tag)
+	if err != nil {
+		e.OutErr(c, e.ERR_DB_ORM, err.Error())
+		return
+	}
+	e.OutSuc(c, tagID, nil)
+}
+
 // UpdateTag
 // @Summary      制度中心-会员中心-标签管理(更新)
 // @Tags         会员中心

app/hdl/member_center/hdl_user_management.go

@@ -81,12 +81,10 @@ func UserManagementGetUserList(c *gin.Context) {
 	for i, user := range *users {
 		list[i] = md.UserManagementGetUserListNode{
 			ID:               user.Id,
-			Tag:              tagsMap[user.TagID],
 			Avatar:           user.Avatar,
 			Nickname:         user.Nickname,
 			Phone:            user.Phone,
 			IsRealName:       user.IsRealName,
-			LevelName:        levelsMap[user.Level],
 			InviteCode:       user.SystemInviteCode,
 			ParentID:         user.ParentUid,
 			ParentInviteCode: user.ParentSystemInviteCode,
@@ -94,6 +92,14 @@ func UserManagementGetUserList(c *gin.Context) {
 			RegisterTime:     user.CreateAt,
 			Memo:             user.Memo,
 		}
+		tag, ok := tagsMap[user.TagID]
+		if ok {
+			list[i].Tag = tag
+		}
+		level, ok := levelsMap[user.Level]
+		if ok {
+			list[i].LevelName = level
+		}
 	}
 
 	resp := md.UserManagementGetUserListResp{
@@ -283,15 +289,14 @@ func UserManagementGetOneBasic(c *gin.Context) {
 		TagsList:   tagsList,
 		LevelsList: levelsList,
 		BasicInfo: md.BasicInfoNode{
-			Avatar:    user.Avatar,
-			Sex:       user.Sex,
-			Nickname:  user.Nickname,
-			LevelName: levelsMap[user.Level],
-			Phone:     user.Phone,
-			UnionId:   user.UnionId,
-			Password:  user.Password,
-			State:     user.State,
-			Memo:      user.Memo,
+			Avatar:   user.Avatar,
+			Sex:      user.Sex,
+			Nickname: user.Nickname,
+			Phone:    user.Phone,
+			UnionId:  user.UnionId,
+			Password: user.Password,
+			State:    user.State,
+			Memo:     user.Memo,
 		},
 		OtherInfo: md.OtherNode{
 			LastLoginIp: user.LastLoginIp,
@@ -307,6 +312,10 @@ func UserManagementGetOneBasic(c *gin.Context) {
 		resp.BasicInfo.ParentName = parent.Nickname
 		resp.BasicInfo.ParentPhone = parent.Phone
 	}
+	level, ok := levelsMap[user.Level]
+	if ok {
+		resp.BasicInfo.LevelName = level
+	}
 
 	e.OutSuc(c, resp, nil)
 }
@@ -419,14 +428,21 @@ func UserManagementGetFans(c *gin.Context) {
 			ID:         user.Id,
 			Nickname:   user.Nickname,
 			Phone:      user.Phone,
-			LevelTotal: levelTotalMap[user.Id],
-			Amount:     walletMap[user.Id],
 			RegisterAt: user.CreateAt,
 		}
 		val, ok := incomeMap[user.Id]
 		if ok {
 			list[i].TotalIncome = val
 		}
+		levelTotal, ok := levelTotalMap[user.Id]
+		if ok {
+			list[i].LevelTotal = levelTotal
+		}
+		amount, ok := walletMap[user.Id]
+		if ok {
+			list[i].Amount = amount
+		}
+
 	}
 
 	resp := md.UserManagementGetFansResp{

app/md/institutional_management/member_center/md_level_management.go

@@ -22,3 +22,7 @@ type UpdateLevelReq struct {
 	Memo        string `json:"memo"`         // 备注
 	LevelWeight int    `json:"level_weight"` // 等级权重
 }
+
+type DeleteLevelReq struct {
+	LevelID string `json:"level_id"`
+}

app/md/institutional_management/member_center/md_tag_management.go

@@ -1,13 +1,11 @@
 package md
 
-import "time"
-
 type TagListNode struct {
-	TagID    string    `json:"tag_id"`    // 标签 ID
-	Name     string    `json:"name"`      // 名称
-	Count    string    `json:"count"`     // 标签人数
-	CreateAt time.Time `json:"create_at"` // 创建时间
-	Memo     string    `json:"memo"`      // 备注
+	TagID    string `json:"tag_id"`    // 标签 ID
+	Name     string `json:"name"`      // 名称
+	Count    string `json:"count"`     // 标签人数
+	CreateAt string `json:"create_at"` // 创建时间
+	Memo     string `json:"memo"`      // 备注
 }
 
 type GetTagListResp struct {
@@ -15,6 +13,12 @@ type GetTagListResp struct {
 	Paginate Paginate      `json:"paginate"`
 }
 
+type AddTagReq struct {
+	Name     string `json:"name,required"`      // 标签名称
+	Memo     string `json:"memo,required"`      // 备注
+	IsPunish string `json:"is_punish,required"` // 是否为处罚标签(0:否 1:是)
+}
+
 type UpdateTagReq struct {
 	TagID string `json:"tag_id,required"` // 标签 ID
 	Name  string `json:"name,required"`   // 标签名称

app/md/institutional_management/member_center/md_user_management.go

@@ -16,7 +16,7 @@ type UserManagementGetUserListReq struct {
 	Sex              int    `json:"sex"` // 性别
 	UnionId          string `json:"union_id" example:"微信号"`
 	Level            int    `json:"level"`           // 会员等级
-	RegisterType     int    `json:"register_type"`   // 注册类型(0.未知, 1.免验证码手机号注册，2.微信授权)
+	RegisterType     int    `json:"register_type"`   // 注册类型(1:APP注册、2:H5注册)
 	State            int    `json:"state"`           // 状态
 	Effective        int    `json:"effective"`       // 有效会员
 	IsRealName       int    `json:"is_real_name"`    // 是否实名 0.未实名,1.已实名

app/md/institutional_management/public_platoon/md_public_platoon.go

@@ -115,6 +115,10 @@ type AddFreePublishUserReq struct {
 	Uid int64 `json:"uid"`
 }
 
+type DeleteFreePublishUserReq struct {
+	Uid string `json:"uid"`
+}
+
 type ListCommunityDividendsReq struct {
 	Page      int    `json:"page,required"`  // 页数
 	Limit     int    `json:"limit,required"` // 每页大小

app/router/router.go

@@ -54,9 +54,9 @@ func Init() *gin.Engine {
 func route(r *gin.RouterGroup) {
 	r.GET("/test", hdl.Demo)
 	r.POST("/login", hdl.Login)
-	//r.Use(mw.Auth) // 以下接口需要JWT验证
+	r.Use(mw.Auth) // 以下接口需要JWT验证
 	rComm(r.Group("/comm"))
-	//r.Use(mw.CheckPermission) // 检测权限
+	r.Use(mw.CheckPermission) // 检测权限
 	rInstitutionalManagement(r.Group("/institutionalManagement"))
 	rMarketingApplications(r.Group("/marketingApplications"))
 	rMemberCenter(r.Group("/memberCenter"))
@@ -88,6 +88,7 @@ func rInstitutionalManagement(r *gin.RouterGroup) { //制度管理
 		{
 			rPublicPlatoonUserFreePunish.POST("/index", public_platoon.GetFreePublishUser)
 			rPublicPlatoonUserFreePunish.POST("/save", public_platoon.AddFreePublishUser)
+			rPublicPlatoonUserFreePunish.DELETE("/delete", public_platoon.DeleteFreePublishUser)
 		}
 		rCommunityDividends := rPublicPlatoon.Group("/communityDividends")
 		{
@@ -168,6 +169,7 @@ func rMemberCenter(r *gin.RouterGroup) { // 会员中心
 	rTagManagement := r.Group("/tagManagement")
 	{
 		rTagManagement.GET("/getTagList", member_center.GetTagList)
+		rTagManagement.POST("/addTag", member_center.AddTag)
 		rTagManagement.POST("/updateTag", member_center.UpdateTag)
 		rTagManagement.DELETE("/deleteTag", member_center.DeleteTag)
 	}
@@ -175,6 +177,7 @@ func rMemberCenter(r *gin.RouterGroup) { // 会员中心
 	{
 		rLevelManagement.GET("/getLevelList", member_center.GetLevelList)
 		rLevelManagement.POST("/updateLevel", member_center.UpdateLevel)
+		rLevelManagement.DELETE("/deleteLevel", member_center.DeleteLevel)
 	}
 }
 

docs/swagger.yaml

@@ -166,6 +166,81 @@ definitions:
         description: 金额
         type: string
     type: object
+  md.AddTagReq:
+    properties:
+      is_punish:
+        description: 是否为处罚标签(0:否 1:是)
+        type: string
+      memo:
+        description: 备注
+        type: string
+      name:
+        description: 标签名称
+        type: string
+    type: object
+  md.BalanceDetailNode:
+    properties:
+      after_amount:
+        description: 变更后余额
+        type: string
+      amount:
+        description: 变更数量
+        type: string
+      before_amount:
+        description: 变更前余额
+        type: string
+      create_at:
+        description: 创建时间
+        type: string
+      id:
+        description: 记录ID
+        type: integer
+      kind:
+        description: 类型 1:管理员操作增加余额 2:管理员操作扣除余额 3:蛋蛋能量兑换余额 4:余额兑换蛋蛋能量
+        type: string
+    type: object
+  md.BasicInfoNode:
+    properties:
+      avatar:
+        description: 头像
+        type: string
+      level_name:
+        description: 会员等级名称
+        type: string
+      memo:
+        description: 备注
+        type: string
+      nickname:
+        description: 用户名称
+        type: string
+      parent_name:
+        description: 推荐人名称
+        type: string
+      parent_phone:
+        description: 推荐人手机号
+        type: string
+      parent_uid:
+        description: 推荐人
+        type: integer
+      password:
+        description: 登录密码
+        type: string
+      phone:
+        description: 手机号
+        type: string
+      sex:
+        description: 性别
+        type: integer
+      state:
+        description: 账号状态 1正常,2冻结
+        type: integer
+      tag_name:
+        description: 标签名称
+        type: string
+      union_id:
+        description: 微信号
+        type: string
+    type: object
   md.DailyActivityAnalysisTopData:
     properties:
       activity_count:
@@ -213,6 +288,22 @@ definitions:
         example: 团队区域
         type: string
     type: object
+  md.DeleteFreePublishUserReq:
+    properties:
+      uid:
+        type: string
+    type: object
+  md.DeleteLevelReq:
+    properties:
+      level_id:
+        type: string
+    type: object
+  md.DeleteTagReq:
+    properties:
+      tag_id:
+        description: 标签 ID
+        type: string
+    type: object
   md.DestructionSettingStruct:
     properties:
       community_dividends:
@@ -384,6 +475,30 @@ definitions:
         description: 位置2，具体值取返回数据中的 system_id
         type: integer
     type: object
+  md.FansNode:
+    properties:
+      amount:
+        description: 可提现余额
+        type: string
+      id:
+        description: 用户ID
+        type: integer
+      level_total:
+        description: 所属代数
+        type: integer
+      nickname:
+        example: 用户昵称
+        type: string
+      phone:
+        example: 手机号
+        type: string
+      register_at:
+        description: 注册时间
+        type: string
+      total_income:
+        description: 累计收益
+        type: string
+    type: object
   md.FindSubUserRelationshipMapResp:
     properties:
       basic_setting:
@@ -808,6 +923,15 @@ definitions:
         description: 持有该类型用户数
         type: integer
     type: object
+  md.GetLevelListResp:
+    properties:
+      list:
+        items:
+          $ref: '#/definitions/md.LevelListNode'
+        type: array
+      paginate:
+        $ref: '#/definitions/applet_app_md_institutional_management_member_center.Paginate'
+    type: object
   md.GetPriceCurveResp:
     properties:
       x_data:
@@ -844,6 +968,15 @@ definitions:
         description: xx天未活跃，处罚滑落
         type: integer
     type: object
+  md.GetTagListResp:
+    properties:
+      list:
+        items:
+          $ref: '#/definitions/md.TagListNode'
+        type: array
+      paginate:
+        $ref: '#/definitions/applet_app_md_institutional_management_member_center.Paginate'
+    type: object
   md.GetVideoRewardResp:
     properties:
       ecmp:
@@ -853,6 +986,30 @@ definitions:
         description: 单价
         type: string
     type: object
+  md.LevelListNode:
+    properties:
+      count:
+        description: 等级人数
+        type: string
+      create_at:
+        description: 创建时间
+        type: string
+      is_use:
+        description: 是否开启(0.否, 1.是)
+        type: integer
+      level_id:
+        description: 等级 ID
+        type: integer
+      level_name:
+        description: 等级名称
+        type: string
+      level_weight:
+        description: 等级权重
+        type: integer
+      memo:
+        description: 备注
+        type: string
+    type: object
   md.ListCommunityDividendsReq:
     properties:
       end_at:
@@ -1137,6 +1294,18 @@ definitions:
         description: 奖励系数
         type: number
     type: object
+  md.OtherNode:
+    properties:
+      create_at:
+        description: 注册时间
+        type: string
+      last_login_at:
+        description: 最近登录时间
+        type: string
+      last_login_ip:
+        description: 最后登录 IP
+        type: string
+    type: object
   md.PlatformRevenueDataNode:
     properties:
       balance_amount:
@@ -1463,6 +1632,24 @@ definitions:
       uid:
         type: integer
     type: object
+  md.TagListNode:
+    properties:
+      count:
+        description: 标签人数
+        type: string
+      create_at:
+        description: 创建时间
+        type: string
+      memo:
+        description: 备注
+        type: string
+      name:
+        description: 名称
+        type: string
+      tag_id:
+        description: 标签 ID
+        type: string
+    type: object
   md.TeamRewardSettingStruct:
     properties:
       member_self_is_open_get_team_reward:
@@ -1552,6 +1739,23 @@ definitions:
           $ref: '#/definitions/md.VipEquitySettingNode'
         type: array
     type: object
+  md.UpdateLevelReq:
+    properties:
+      is_use:
+        description: 是否开启(0.否, 1.是)
+        type: integer
+      level_id:
+        type: string
+      level_name:
+        description: 等级名称
+        type: string
+      level_weight:
+        description: 等级权重
+        type: integer
+      memo:
+        description: 备注
+        type: string
+    type: object
   md.UpdatePublicPlatoonBasicReq:
     properties:
       is_open:
@@ -1576,6 +1780,18 @@ definitions:
         description: xx天未活跃，处罚滑落
         type: integer
     type: object
+  md.UpdateTagReq:
+    properties:
+      memo:
+        description: 备注
+        type: string
+      name:
+        description: 标签名称
+        type: string
+      tag_id:
+        description: 标签 ID
+        type: string
+    type: object
   md.UserDailyActivityAnalysisReq:
     properties:
       end_date:
@@ -1832,35 +2048,72 @@ definitions:
         description: 年份&&周份列表
         type: object
     type: object
+  md.UserManagementGetBalanceDetailResp:
+    properties:
+      list:
+        items:
+          $ref: '#/definitions/md.BalanceDetailNode'
+        type: array
+      paginate:
+        $ref: '#/definitions/applet_app_md_institutional_management_member_center.Paginate'
+    type: object
+  md.UserManagementGetFansResp:
+    properties:
+      list:
+        description: 用户数据
+        items:
+          $ref: '#/definitions/md.FansNode'
+        type: array
+      paginate:
+        allOf:
+        - $ref: '#/definitions/applet_app_md_institutional_management_member_center.Paginate'
+        description: 分页信息
+    type: object
+  md.UserManagementGetOneBasicResp:
+    properties:
+      basic_info:
+        allOf:
+        - $ref: '#/definitions/md.BasicInfoNode'
+        description: 基本信息
+      levels_list:
+        description: 等级列表
+        items:
+          additionalProperties: true
+          type: object
+        type: array
+      other_info:
+        allOf:
+        - $ref: '#/definitions/md.OtherNode'
+        description: 其他信息
+      tags_list:
+        description: 标签列表
+        items:
+          additionalProperties: true
+          type: object
+        type: array
+    type: object
   md.UserManagementGetUserListNode:
     properties:
       avatar:
-        type: string
-      create_at:
-        type: string
-      custom_invite_code:
+        description: 头像
         type: string
       id:
+        description: 会员 ID
         type: integer
       invite_code:
         example: 会员邀请码
         type: string
-      invite_total:
-        type: integer
       is_real_name:
-        type: integer
-      last_login_ip:
-        type: string
-      level:
+        description: 是否实名 0.未实名,1.已实名
         type: integer
       level_name:
         description: 会员等级
         type: string
       memo:
+        description: 备注
         type: string
       nickname:
-        type: string
-      open_id:
+        description: 昵称
         type: string
       parent_id:
         description: 推荐人 ID
@@ -1871,32 +2124,15 @@ definitions:
       parent_phone:
         example: 推荐人手机号
         type: string
-      parent_uid:
-        type: integer
-      passcode:
-        type: string
-      password:
-        type: string
       phone:
+        description: 手机号
         type: string
       register_time:
         description: 注册时间
         type: string
-      register_type:
-        type: integer
-      sex:
-        type: integer
-      state:
-        type: integer
-      system_invite_code:
-        type: string
       tag_name:
         description: 会员标签
         type: string
-      union_id:
-        type: string
-      update_at:
-        type: string
     type: object
   md.UserManagementGetUserListReq:
     properties:
@@ -1988,25 +2224,57 @@ definitions:
           type: object
         type: array
     type: object
+  md.UserManagementGetVirtualCoinDetailResp:
+    properties:
+      coin_list:
+        items:
+          additionalProperties: true
+          type: object
+        type: array
+      list:
+        items:
+          $ref: '#/definitions/md.VirtualCoinDetailNode'
+        type: array
+      paginate:
+        $ref: '#/definitions/applet_app_md_institutional_management_member_center.Paginate'
+    type: object
   md.UserManagementUpdateUserInfoReq:
     properties:
       avatar:
         description: 头像
         type: string
-      disable:
-        description: 是否禁用用户
-        type: boolean
       last_login_ip:
         description: 用户最后登录 IP
         type: string
+      level:
+        description: 会员等级 ID
+        type: string
       memo:
         example: 备注
         type: string
+      nickname:
+        description: 用户名
+        type: string
+      parent_uid:
+        description: 邀请人 ID
+        type: string
+      phone:
+        description: 手机号
+        type: string
+      sex:
+        description: 性别(0:未知 1:男 2:女)
+        type: string
+      state:
+        description: 账号状态 1正常,2冻结
+        type: string
       tag:
         description: 用户标签 ID
-        type: integer
+        type: string
       uid:
         type: integer
+      union_id:
+        description: 微信号
+        type: string
     type: object
   md.UserVirtualCoinFlow:
     properties:
@@ -2102,6 +2370,24 @@ definitions:
       update_at:
         type: string
     type: object
+  md.VirtualCoinDetailNode:
+    properties:
+      after_amount:
+        description: 变更后积分余额
+        type: string
+      amount:
+        description: 变更数量
+        type: string
+      create_at:
+        description: 创建时间
+        type: string
+      direction:
+        description: 类型 1.收入 2.支出
+        type: integer
+      uid:
+        description: 用户 ID
+        type: integer
+    type: object
   md.VirtualCoinListNode:
     properties:
       coin_id:
@@ -3199,42 +3485,42 @@ paths:
       summary: 制度中心-公排管理-公排基础设置(获取)
       tags:
       - 公排管理
-  /api/institutionalManagement/publicPlatoon/publicPlatoonUserFreePunish/index:
-    post:
+  /api/institutionalManagement/publicPlatoon/publicPlatoonUserFreePunish/delete:
+    delete:
       consumes:
       - application/json
-      description: 免罚用户(查询)
+      description: 免罚用户(删除)
       parameters:
       - description: 验证参数Bearer和token空格拼接
         in: header
         name: Authorization
         required: true
         type: string
-      - description: 页数和行数必填，uid选填
+      - description: 免罚用户ID
         in: body
         name: req
         required: true
         schema:
-          $ref: '#/definitions/md.GetFreePublishUserReq'
+          $ref: '#/definitions/md.DeleteFreePublishUserReq'
       produces:
       - application/json
       responses:
         "200":
-          description: 成功返回
+          description: 删除数据数量
           schema:
-            $ref: '#/definitions/md.GetFreePublishUserResp'
+            type: int
         "400":
           description: 具体错误
           schema:
             $ref: '#/definitions/md.Response'
-      summary: 制度中心-公排管理-免罚用户(查询)
+      summary: 制度中心-公排管理-免罚用户(删除)
       tags:
       - 公排管理
-  /api/institutionalManagement/publicPlatoon/publicPlatoonUserFreePunish/save:
+  /api/institutionalManagement/publicPlatoon/publicPlatoonUserFreePunish/index:
     post:
       consumes:
       - application/json
-      description: 免罚用户(新增)
+      description: 免罚用户(查询)
       parameters:
       - description: 验证参数Bearer和token空格拼接
         in: header
@@ -3242,6 +3528,37 @@ paths:
         required: true
         type: string
       - description: 页数和行数必填，uid选填
+        in: body
+        name: req
+        required: true
+        schema:
+          $ref: '#/definitions/md.GetFreePublishUserReq'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 成功返回
+          schema:
+            $ref: '#/definitions/md.GetFreePublishUserResp'
+        "400":
+          description: 具体错误
+          schema:
+            $ref: '#/definitions/md.Response'
+      summary: 制度中心-公排管理-免罚用户(查询)
+      tags:
+      - 公排管理
+  /api/institutionalManagement/publicPlatoon/publicPlatoonUserFreePunish/save:
+    post:
+      consumes:
+      - application/json
+      description: 免罚用户(新增)
+      parameters:
+      - description: 验证参数Bearer和token空格拼接
+        in: header
+        name: Authorization
+        required: true
+        type: string
+      - description: 免罚用户ID
         in: body
         name: req
         required: true
@@ -3533,6 +3850,316 @@ paths:
       summary: 制度中心-营销应用-新人红包设置(修改)
       tags:
       - 营销应用
+  /api/memberCenter/levelManagement/deleteLevel:
+    post:
+      consumes:
+      - application/json
+      description: 等级管理(删除)
+      parameters:
+      - description: 验证参数Bearer和token空格拼接
+        in: header
+        name: Authorization
+        required: true
+        type: string
+      - description: 需要删除的等级 ID
+        in: body
+        name: req
+        required: true
+        schema:
+          $ref: '#/definitions/md.DeleteLevelReq'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 成功删除数据数量
+          schema:
+            type: int
+        "400":
+          description: 具体错误
+          schema:
+            $ref: '#/definitions/md.Response'
+      summary: 制度中心-会员中心-等级管理(删除)
+      tags:
+      - 会员中心
+  /api/memberCenter/levelManagement/getLevelList:
+    get:
+      consumes:
+      - application/json
+      description: 标签管理(获取)
+      parameters:
+      - description: 验证参数Bearer和token空格拼接
+        in: header
+        name: Authorization
+        required: true
+        type: string
+      - description: 每页大小
+        in: query
+        name: limit
+        required: true
+        type: integer
+      - description: 页数
+        in: query
+        name: page
+        required: true
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 具体数据
+          schema:
+            $ref: '#/definitions/md.GetLevelListResp'
+        "400":
+          description: 具体错误
+          schema:
+            $ref: '#/definitions/md.Response'
+      summary: 制度中心-会员中心-等级管理(获取)
+      tags:
+      - 会员中心
+  /api/memberCenter/levelManagement/updateLevel:
+    post:
+      consumes:
+      - application/json
+      description: 等级管理(更新)
+      parameters:
+      - description: 验证参数Bearer和token空格拼接
+        in: header
+        name: Authorization
+        required: true
+        type: string
+      - description: 需要修改的等级信息
+        in: body
+        name: req
+        required: true
+        schema:
+          $ref: '#/definitions/md.UpdateLevelReq'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 成功修改数据条数
+          schema:
+            type: int
+        "400":
+          description: 具体错误
+          schema:
+            $ref: '#/definitions/md.Response'
+      summary: 制度中心-会员中心-等级管理(更新)
+      tags:
+      - 会员中心
+  /api/memberCenter/tagManagement/addTag:
+    post:
+      consumes:
+      - application/json
+      description: 标签管理(新增)
+      parameters:
+      - description: 验证参数Bearer和token空格拼接
+        in: header
+        name: Authorization
+        required: true
+        type: string
+      - description: 新增的标签信息
+        in: body
+        name: req
+        required: true
+        schema:
+          $ref: '#/definitions/md.AddTagReq'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 新增的标签 ID
+          schema:
+            type: int
+        "400":
+          description: 具体错误
+          schema:
+            $ref: '#/definitions/md.Response'
+      summary: 制度中心-会员中心-标签管理(新增)
+      tags:
+      - 会员中心
+  /api/memberCenter/tagManagement/deleteTag:
+    post:
+      consumes:
+      - application/json
+      description: 标签管理(删除)
+      parameters:
+      - description: 验证参数Bearer和token空格拼接
+        in: header
+        name: Authorization
+        required: true
+        type: string
+      - description: 需要删除的标签 ID
+        in: body
+        name: req
+        required: true
+        schema:
+          $ref: '#/definitions/md.DeleteTagReq'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 成功删除标签用户数
+          schema:
+            type: int
+        "400":
+          description: 具体错误
+          schema:
+            $ref: '#/definitions/md.Response'
+      summary: 制度中心-会员中心-标签管理(删除)
+      tags:
+      - 会员中心
+  /api/memberCenter/tagManagement/getTagList:
+    get:
+      consumes:
+      - application/json
+      description: 标签管理(获取)
+      parameters:
+      - description: 验证参数Bearer和token空格拼接
+        in: header
+        name: Authorization
+        required: true
+        type: string
+      - description: 每页大小
+        in: query
+        name: limit
+        required: true
+        type: integer
+      - description: 页数
+        in: query
+        name: page
+        required: true
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 具体数据
+          schema:
+            $ref: '#/definitions/md.GetTagListResp'
+        "400":
+          description: 具体错误
+          schema:
+            $ref: '#/definitions/md.Response'
+      summary: 制度中心-会员中心-标签管理(获取)
+      tags:
+      - 会员中心
+  /api/memberCenter/tagManagement/updateTag:
+    post:
+      consumes:
+      - application/json
+      description: 标签管理(更新)
+      parameters:
+      - description: 验证参数Bearer和token空格拼接
+        in: header
+        name: Authorization
+        required: true
+        type: string
+      - description: 需要修改的标签信息
+        in: body
+        name: req
+        required: true
+        schema:
+          $ref: '#/definitions/md.UpdateTagReq'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 成功修改数据条数
+          schema:
+            type: int
+        "400":
+          description: 具体错误
+          schema:
+            $ref: '#/definitions/md.Response'
+      summary: 制度中心-会员中心-标签管理(更新)
+      tags:
+      - 会员中心
+  /api/memberCenter/userManagement/balanceDetail:
+    get:
+      consumes:
+      - application/json
+      description: 会员明细(余额获取)
+      parameters:
+      - description: 验证参数Bearer和token空格拼接
+        in: header
+        name: Authorization
+        required: true
+        type: string
+      - description: 用户 ID
+        in: query
+        name: uid
+        required: true
+        type: string
+      - description: 每页大小
+        in: query
+        name: limit
+        required: true
+        type: string
+      - description: 页数
+        in: query
+        name: page
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 具体数据
+          schema:
+            $ref: '#/definitions/md.UserManagementGetBalanceDetailResp'
+        "400":
+          description: 具体错误
+          schema:
+            $ref: '#/definitions/md.Response'
+      summary: 制度中心-会员中心-用户管理-会员明细(余额获取)
+      tags:
+      - 会员中心
+  /api/memberCenter/userManagement/getFans:
+    get:
+      consumes:
+      - application/json
+      description: 会员明细粉丝情况(获取)
+      parameters:
+      - description: 验证参数Bearer和token空格拼接
+        in: header
+        name: Authorization
+        required: true
+        type: string
+      - description: 用户 ID
+        in: query
+        name: uid
+        required: true
+        type: string
+      - description: 粉丝类型(1.全部 2.直推 3.二代 4.二代以后)
+        in: query
+        name: type
+        required: true
+        type: string
+      - description: 每页大小
+        in: query
+        name: limit
+        required: true
+        type: string
+      - description: 页数
+        in: query
+        name: page
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 具体数据
+          schema:
+            $ref: '#/definitions/md.UserManagementGetFansResp'
+        "400":
+          description: 具体错误
+          schema:
+            $ref: '#/definitions/md.Response'
+      summary: 制度中心-会员中心-用户管理-会员明细粉丝情况(获取)
+      tags:
+      - 会员中心
   /api/memberCenter/userManagement/getUserList:
     post:
       consumes:
@@ -3561,7 +4188,52 @@ paths:
           description: 具体错误
           schema:
             $ref: '#/definitions/md.Response'
-      summary: 制度中心-会员中心-用户信息管理(获取)
+      summary: 制度中心-会员中心-用户管理-用户信息管理(获取)
+      tags:
+      - 会员中心
+  /api/memberCenter/userManagement/getVirtualCoinDetail:
+    get:
+      consumes:
+      - application/json
+      description: 会员明细(积分明细获取)
+      parameters:
+      - description: 验证参数Bearer和token空格拼接
+        in: header
+        name: Authorization
+        required: true
+        type: string
+      - description: 用户 ID
+        in: query
+        name: uid
+        required: true
+        type: string
+      - description: 货币 ID
+        in: query
+        name: coinId
+        required: true
+        type: string
+      - description: 每页大小
+        in: query
+        name: limit
+        required: true
+        type: string
+      - description: 页数
+        in: query
+        name: page
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 具体数据
+          schema:
+            $ref: '#/definitions/md.UserManagementGetVirtualCoinDetailResp'
+        "400":
+          description: 具体错误
+          schema:
+            $ref: '#/definitions/md.Response'
+      summary: 制度中心-会员中心-用户管理-会员明细(积分明细获取)
       tags:
       - 会员中心
   /api/memberCenter/userManagement/updateUserInfo:
@@ -3592,7 +4264,37 @@ paths:
           description: 具体错误
           schema:
             $ref: '#/definitions/md.Response'
-      summary: 制度中心-会员中心-用户信息管理(更新)
+      summary: 制度中心-会员中心-用户管理-用户信息管理(更新)
+      tags:
+      - 会员中心
+  /api/memberCenter/userManagement/userData:
+    get:
+      consumes:
+      - application/json
+      description: 会员明细概况(获取)
+      parameters:
+      - description: 验证参数Bearer和token空格拼接
+        in: header
+        name: Authorization
+        required: true
+        type: string
+      - description: 用户 ID
+        in: query
+        name: uid
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 会员明细概况具体数据
+          schema:
+            $ref: '#/definitions/md.UserManagementGetOneBasicResp'
+        "400":
+          description: 具体错误
+          schema:
+            $ref: '#/definitions/md.Response'
+      summary: 制度中心-会员中心-用户管理-会员明细概况(获取)
       tags:
       - 会员中心
 securityDefinitions:

go.mod

@@ -2,9 +2,9 @@ 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
+// replace code.fnuoos.com/EggPlanet/egg_system_rules.git => E:/company/Egg/egg_system_rules
 
 require (
 	github.com/boombuler/barcode v1.0.1
@@ -33,8 +33,8 @@ require (
 )
 
 require (
-	code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241119072710-bbf44c7edfcf
-	code.fnuoos.com/EggPlanet/egg_system_rules.git v0.0.4-0.20241119073336-d4afc68102da
+	code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241119094250-95864f7c9763
+	code.fnuoos.com/EggPlanet/egg_system_rules.git v0.0.4-0.20241119094006-9ba1ab4607e9
 	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
 	github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible