Merge remote-tracking branch 'origin/master'

app/e/code.go

@@ -118,6 +118,7 @@ const (
 	ERR_ALIPAY_ORDER_ERR    = 500012
 	ERR_PAY_ERR             = 500013
 	ERR_IS_BIND_THIRDOTHER  = 500014
+	ERR_INIT_RABBITMQ       = 500016
 )
 
 var MsgFlags = map[int]string{
@@ -233,4 +234,5 @@ var MsgFlags = map[int]string{
 	ERR_SEARCH_ERR:          "暂无该分类商品",
 	ERR_LEVEL_REACH_TOP:     "已经是最高等级",
 	ERR_USER_CHECK_ERR:      "校验失败",
+	ERR_INIT_RABBITMQ:       "连接mq失败",
 }

app/hdl/comm/hdl_comm.go

@@ -298,3 +298,33 @@ func GetSTSVoucher(c *gin.Context) {
 	return
 
 }
+
+type GetAdminInfoResp struct {
+	AdmId                int    `json:"adm_id"`                 // 管理员id
+	Username             string `json:"username"`               // 用户名
+	State                int    `json:"state"`                  // 状态(1:正常 2:冻结)
+	IsSuperAdministrator int    `json:"is_super_administrator"` // 是否为超级管理员(0:否 1:是)
+	Memo                 string `json:"memo"`                   // 备注信息
+}
+
+// GetAdminInfo
+// @Summary      通用请求-获取管理员信息
+// @Tags         通用请求
+// @Description  获取管理员信息
+// @Accept       json
+// @Produce      json
+// @param Authorization header string true "验证参数Bearer和token空格拼接"
+// @Success      200   {object}  GetAdminInfoResp  	"管理员信息"
+// @Failure      400   {object}   md.Response              	"具体错误"
+// @Router       /api/comm/adminInfo [POST]
+func GetAdminInfo(c *gin.Context) {
+	admin := svc.GetUser(c)
+	resp := GetAdminInfoResp{
+		AdmId:                admin.AdmId,
+		Username:             admin.Username,
+		State:                admin.State,
+		IsSuperAdministrator: admin.IsSuperAdministrator,
+		Memo:                 admin.Memo,
+	}
+	e.OutSuc(c, resp, nil)
+}

app/hdl/financial_center/hdl_withdraw.go

@@ -8,9 +8,14 @@ import (
 	"applet/app/utils"
 	"code.fnuoos.com/EggPlanet/egg_models.git/src/implement"
 	"code.fnuoos.com/EggPlanet/egg_models.git/src/model"
+	"code.fnuoos.com/EggPlanet/egg_system_rules.git/enum"
+	md3 "code.fnuoos.com/EggPlanet/egg_system_rules.git/md"
+	"code.fnuoos.com/EggPlanet/egg_system_rules.git/rule"
 	md2 "code.fnuoos.com/EggPlanet/egg_system_rules.git/rule/egg_energy/md"
+	"code.fnuoos.com/go_rely_warehouse/zyos_go_mq.git/rabbit"
 	"errors"
 	"github.com/gin-gonic/gin"
+	"github.com/jinzhu/copier"
 	"strings"
 	"time"
 )
@@ -317,6 +322,7 @@ func GetWithdrawApplyList(c *gin.Context) {
 
 	for i, apply := range *applies {
 		list[i] = md.GetWithdrawApplyListNode{
+			WithdrawApplyId:  apply.WithdrawApplyId,
 			UserID:           apply.UserID,
 			Nickname:         apply.Nickname,
 			ParentID:         apply.ParentID,
@@ -384,6 +390,20 @@ func GetWithdrawApplyList(c *gin.Context) {
 	}
 
 	resp := md.GetWithdrawApplyListResp{
+		ReasonList: []map[string]interface{}{
+			{
+				"value": enum.FinWithdrawApplyReasonForNotRule,
+				"name":  enum.FinWithdrawApplyReasonForNotRule.String(),
+			},
+			{
+				"value": enum.FinWithdrawApplyReasonForAccountAbnormal,
+				"name":  enum.FinWithdrawApplyReasonForAccountAbnormal.String(),
+			},
+			{
+				"value": enum.FinWithdrawApplyReasonForFundAbnormal,
+				"name":  enum.FinWithdrawApplyReasonForFundAbnormal.String(),
+			},
+		},
 		LevelsList:        levelsList,
 		TagsList:          tagsList,
 		PendingAmount:     utils.Float64ToStr(pendingAmount),
@@ -399,3 +419,104 @@ func GetWithdrawApplyList(c *gin.Context) {
 	}
 	e.OutSuc(c, resp, nil)
 }
+
+// WithdrawApplyAudit
+// @Summary      财务中心-提现-审核
+// @Tags         提现
+// @Description  提现审核
+// @Accept       json
+// @Produce      json
+// @param Authorization header string true "验证参数Bearer和token空格拼接"
+// @Param    req    body	md.WithdrawApplyAuditReq 	false  "筛选条件"
+// @Success      200   {string}  	 "success"
+// @Failure      400   {object}   md.Response              	"具体错误"
+// @Router       /api/financialCenter/withdraw/applyList [POST]
+func WithdrawApplyAudit(c *gin.Context) {
+	var req *md.WithdrawApplyAuditReq
+	if err1 := c.ShouldBindJSON(&req); err1 != nil {
+		e.OutErr(c, e.ERR_INVALID_ARGS, err1.Error())
+		return
+	}
+
+	//1、查找对应提现申请单
+	finWithdrawApplyDb := implement.NewFinWithdrawApplyDb(db.Db)
+	finWithdrawApply, err := finWithdrawApplyDb.FinWithdrawApplyGet(req.WithdrawApplyId)
+	if err != nil {
+		e.OutErr(c, e.ERR_DB_ORM, err.Error())
+		return
+	}
+	if finWithdrawApply == nil {
+		e.OutErr(c, e.ERR_NOT_FAN, "提现记录不存在")
+		return
+	}
+
+	//2、判断审核状态
+	if req.AuditState == 1 {
+		//通过(推mq、修改提现单成功)
+		finWithdrawApply.State = int(enum.FinWithdrawApplyStateForIng)
+		updateAffected, err1 := finWithdrawApplyDb.UpdateFinWithdrawApply(finWithdrawApply, "state")
+		if err1 != nil {
+			e.OutErr(c, e.ERR_DB_ORM, err1.Error())
+			return
+		}
+		if updateAffected <= 0 {
+			e.OutErr(c, e.ERR_DB_ORM, "更新提现单状态失败")
+			return
+		}
+
+		ch, err1 := rabbit.Cfg.Pool.GetChannel()
+		if err1 != nil {
+			e.OutErr(c, e.ERR_INIT_RABBITMQ, err1.Error())
+			return
+		}
+		defer ch.Release()
+		var data md2.EggFinWithdrawApplyData
+		err = copier.Copy(&data, &finWithdrawApply)
+		if err != nil {
+			e.OutErr(c, e.ERR, err.Error())
+			return
+		}
+
+		ch.Publish(md2.EggAppExchange, utils.SerializeStr(data), md2.EggFinWithdrawApply)
+	} else {
+		//拒绝(退余额、修改提现单失败)
+		session := db.Db.NewSession()
+		defer session.Close()
+		session.Begin()
+
+		finWithdrawApply.State = int(enum.FinWithdrawApplyStateForBad)
+		updateAffected, err1 := finWithdrawApplyDb.UpdateFinWithdrawApplyBySession(session, finWithdrawApply, "state")
+		if err1 != nil {
+			e.OutErr(c, e.ERR_DB_ORM, err1.Error())
+			return
+		}
+		if updateAffected <= 0 {
+			e.OutErr(c, e.ERR_DB_ORM, "更新提现单状态失败")
+			return
+		}
+
+		dealUserWalletReq := md3.DealUserWalletReq{
+			Direction: "sub",
+			Kind:      int(enum.UserWithdrawBad),
+			Title:     enum.UserWithdrawBad.String(),
+			Uid:       finWithdrawApply.Uid,
+			Amount:    utils.StrToFloat64(finWithdrawApply.Amount),
+		}
+
+		err = rule.DealUserWallet(session, dealUserWalletReq)
+		if err != nil {
+			session.Rollback()
+			e.OutErr(c, e.ERR, err.Error())
+			return
+		}
+
+		err = session.Commit()
+		if err != nil {
+			_ = session.Rollback()
+			e.OutErr(c, e.ERR_DB_ORM, err)
+			return
+		}
+	}
+
+	e.OutSuc(c, "success", nil)
+}

app/hdl/institutional_management/egg_energy/hdl_egg_point.go

@@ -21,7 +21,7 @@ import (
 // @param req    body	md.UserEggIndexReq 	true  "请求参数"
 // @Success      200   {object}  md.UserEggIndexResp	"成功返回"
 // @Failure      400   {object}   md.Response              	"具体错误"
-// @Router       /api/institutionalManagement/eggEnergy/eggPoint/statisticsUserEggIndex [POST]
+// @Router       /api/institutionalManagement/eggEnergy/eggPoint/userEggIndex [POST]
 func UserEggIndex(c *gin.Context) {
 	var req *md.UserEggIndexReq
 	if err1 := c.ShouldBindJSON(&req); err1 != nil {

app/md/financial_center/md_withdraw.go

@@ -69,27 +69,34 @@ type GetWithdrawApplyListReq struct {
 	Page            int    `json:"page"`             // 页数
 	Limit           int    `json:"limit"`            //页面大小
 }
+type WithdrawApplyAuditReq struct {
+	WithdrawApplyId int64 `json:"withdraw_apply_id" binding:"required"` // 提现申请id
+	AuditState      int   `json:"audit_state" binding:"required"`       // 审核状态(1:同意  2:拒绝)
+	Reason          int   `json:"reason" binding:"required"`            // 审核失败（驳回理由）
+}
 
 type WithdrawApplyInfo struct {
-	UserID        int64  `xorm:"usera.id"`                 // 会员 ID
-	Nickname      string `xorm:"usera.nickname"`           // 用户名称
-	ParentID      int64  `xorm:"parent_id"`                // 推荐人ID
-	AliPayName    string `xorm:"alipay.user_name"`         // 支付宝昵称
-	AliPayAccount string `xorm:"alipay.user_id"`           // 支付宝账号
-	WxPayName     string `xorm:"wx.user_name"`             // 微信昵称
-	WxPayAccount  string `xorm:"wx.user_id"`               // 微信账号
-	WithdrawType  int    `xorm:"withdraw_kind"`            // 提现方式(1:支付宝 2:微信)
-	InviteCode    string `xorm:"usera.system_invite_code"` // 邀请码
-	Amount        string `xorm:"apply.amount"`             // 提现金额
-	RealAmount    string `xorm:"apply.real_amount"`        // 实际到账金额
-	SysFee        string `xorm:"apply.fee"`                // 手续费
-	State         int    `xorm:"apply.state"`              // 状态 0申请中,1通过,2完成,3失败,4处理中（队列）
-	ApplyAt       string `xorm:"apply.create_at"`          // 申请时间
-	PayAt         string `xorm:"apply.update_at"`          // 到账时间
-	Memo          string `xorm:"apply.memo"`               // 备注
+	WithdrawApplyId int64  `xorm:"apply.id"`                 // 提现申请id
+	UserID          int64  `xorm:"usera.id"`                 // 会员 ID
+	Nickname        string `xorm:"usera.nickname"`           // 用户名称
+	ParentID        int64  `xorm:"parent_id"`                // 推荐人ID
+	AliPayName      string `xorm:"alipay.user_name"`         // 支付宝昵称
+	AliPayAccount   string `xorm:"alipay.user_id"`           // 支付宝账号
+	WxPayName       string `xorm:"wx.user_name"`             // 微信昵称
+	WxPayAccount    string `xorm:"wx.user_id"`               // 微信账号
+	WithdrawType    int    `xorm:"withdraw_kind"`            // 提现方式(1:支付宝 2:微信)
+	InviteCode      string `xorm:"usera.system_invite_code"` // 邀请码
+	Amount          string `xorm:"apply.amount"`             // 提现金额
+	RealAmount      string `xorm:"apply.real_amount"`        // 实际到账金额
+	SysFee          string `xorm:"apply.fee"`                // 手续费
+	State           int    `xorm:"apply.state"`              // 状态 0申请中,1通过,2完成,3失败,4处理中（队列）
+	ApplyAt         string `xorm:"apply.create_at"`          // 申请时间
+	PayAt           string `xorm:"apply.update_at"`          // 到账时间
+	Memo            string `xorm:"apply.memo"`               // 备注
 }
 
 type GetWithdrawApplyListResp struct {
+	ReasonList        []map[string]interface{}   `json:"reason_list"`        // 审核失败（驳回理由）
 	LevelsList        []map[string]interface{}   `json:"levels_list"`        // 等级列表
 	TagsList          []map[string]interface{}   `json:"tags_list"`          // 标签列表
 	PendingAmount     string                     `json:"pending_amount"`     // 处理中金额
@@ -101,6 +108,7 @@ type GetWithdrawApplyListResp struct {
 }
 
 type GetWithdrawApplyListNode struct {
+	WithdrawApplyId  int64     `json:"withdraw_apply_id"`  // 提现申请id
 	UserID           int64     `json:"user_id"`            // 会员 ID
 	Nickname         string    `json:"nickname"`           // 用户名称
 	ParentID         int64     `xorm:"parent_id"`          // 推荐人ID

app/md/institutional_management/egg_energy/md_egg_point.go

@@ -13,24 +13,22 @@ type UserEggIndexReq struct {
 }
 
 type StatisticsEggPointResp struct {
-	Year                                                      string                   `json:"year" example:"年份"`
-	Week                                                      string                   `json:"week" example:"周份"`
-	YearAndWeekList                                           map[string][]string      `json:"year_list"`                                                          //年份&&周份列表
-	StatisticsUserEggScoreValueRange                          []map[string]string      `json:"statistics_user_egg_score_value_range"`                              //统计用户蛋蛋分范围
-	StatisticsUserEggKindProportion                           []map[string]interface{} `json:"statistics_user_egg_kind_proportion"`                                //统计用户蛋蛋分"评比类型"占比
-	StatisticsUserEggEcpmRange                                []map[string]string      `json:"statistics_user_egg_ecpm_range"`                                     //统计用户"ecpm"范围
-	StatisticsUserEggInviteUserNumsRange                      []map[string]string      `json:"statistics_user_egg_invite_user_nums_range"`                         //统计用户"拉新人数"范围
-	StatisticsUserEggTeamActivityNumsRange                    []map[string]string      `json:"statistics_user_egg_team_activity_nums_range"`                       //统计用户"团队活跃次数"范围
-	StatisticsUserEggSignInNumsRange                          []map[string]string      `json:"statistics_user_egg_sign_in_nums_range"`                             //统计用户"签到次数"范围
-	StatisticsUserEggSendRedPackageNumsRange                  []map[string]string      `json:"statistics_user_egg_send_red_package_nums_range"`                    //统计用户"发红包次数"范围
-	StatisticsUserEggEggEnergyExchangeAccountBalanceRange     []map[string]string      `json:"statistics_user_egg_egg_energy_exchange_account_balance_range"`      //统计用户"蛋蛋能量兑换余额数量"范围
-	StatisticsUserEggAccountBalanceExchangeEggEnergyNumsRange []map[string]string      `json:"statistics_user_egg_account_balance_exchange_egg_energy_nums_range"` //统计用户"余额兑换蛋蛋能量数量"范围
-	StatisticsUserEggSendCircleOfFriendNumsRange              []map[string]string      `json:"statistics_user_egg_send_circle_of_friend_nums_range"`               //统计用户"发朋友圈次数"范围
-	StatisticsUserEggForumCommentsNumsRange                   []map[string]string      `json:"statistics_user_egg_forum_comments_nums_range"`                      //统计用户"论坛评论次数"范围
-	StatisticsUserEggCollegeLearningNumsRange                 []map[string]string      `json:"statistics_user_egg_college_learning_nums_range"`                    //统计用户"学院学习次数"范围
-	StatisticsUserEggViolateNumsRange                         []map[string]string      `json:"statistics_user_egg_violate_nums_range"`                             //统计用户"违规次数"范围
-	StatisticsUserEggBrowseInterfaceNumsRange                 []map[string]string      `json:"statistics_user_egg_browse_interface_nums_range"`                    //统计用户"浏览界面次数"范围
-	StatisticsUserEggPersonAddActivityValueRange              []map[string]string      `json:"statistics_user_egg_person_add_activity_value_range"`                //统计用户"个人活跃积分增量值"范围
+	Year                                                      string              `json:"year" example:"年份"`
+	Week                                                      string              `json:"week" example:"周份"`
+	YearAndWeekList                                           map[string][]string `json:"year_list"`                                                          //年份&&周份列表
+	StatisticsUserEggEcpmRange                                []map[string]string `json:"statistics_user_egg_ecpm_range"`                                     //统计用户"ecpm"范围
+	StatisticsUserEggInviteUserNumsRange                      []map[string]string `json:"statistics_user_egg_invite_user_nums_range"`                         //统计用户"拉新人数"范围
+	StatisticsUserEggTeamActivityNumsRange                    []map[string]string `json:"statistics_user_egg_team_activity_nums_range"`                       //统计用户"团队活跃次数"范围
+	StatisticsUserEggSignInNumsRange                          []map[string]string `json:"statistics_user_egg_sign_in_nums_range"`                             //统计用户"签到次数"范围
+	StatisticsUserEggSendRedPackageNumsRange                  []map[string]string `json:"statistics_user_egg_send_red_package_nums_range"`                    //统计用户"发红包次数"范围
+	StatisticsUserEggEggEnergyExchangeAccountBalanceRange     []map[string]string `json:"statistics_user_egg_egg_energy_exchange_account_balance_range"`      //统计用户"蛋蛋能量兑换余额数量"范围
+	StatisticsUserEggAccountBalanceExchangeEggEnergyNumsRange []map[string]string `json:"statistics_user_egg_account_balance_exchange_egg_energy_nums_range"` //统计用户"余额兑换蛋蛋能量数量"范围
+	StatisticsUserEggSendCircleOfFriendNumsRange              []map[string]string `json:"statistics_user_egg_send_circle_of_friend_nums_range"`               //统计用户"发朋友圈次数"范围
+	StatisticsUserEggForumCommentsNumsRange                   []map[string]string `json:"statistics_user_egg_forum_comments_nums_range"`                      //统计用户"论坛评论次数"范围
+	StatisticsUserEggCollegeLearningNumsRange                 []map[string]string `json:"statistics_user_egg_college_learning_nums_range"`                    //统计用户"学院学习次数"范围
+	StatisticsUserEggViolateNumsRange                         []map[string]string `json:"statistics_user_egg_violate_nums_range"`                             //统计用户"违规次数"范围
+	StatisticsUserEggBrowseInterfaceNumsRange                 []map[string]string `json:"statistics_user_egg_browse_interface_nums_range"`                    //统计用户"浏览界面次数"范围
+	StatisticsUserEggPersonAddActivityValueRange              []map[string]string `json:"statistics_user_egg_person_add_activity_value_range"`                //统计用户"个人活跃积分增量值"范围
 }
 
 type UserEggIndexResp struct {

app/router/router.go

@@ -335,6 +335,7 @@ func rFinancialCenter(r *gin.RouterGroup) {
 		rWithdraw.GET("/setting", financial_center.GetWithdrawSetting)
 		rWithdraw.POST("/updateWithdrawSetting", financial_center.UpdateWithdrawSetting)
 		rWithdraw.POST("/applyList", financial_center.GetWithdrawApplyList)
+		rWithdraw.POST("/audit", financial_center.WithdrawApplyAudit)
 	}
 }
 
@@ -360,7 +361,8 @@ func rFriendCircleSettings(r *gin.RouterGroup) {
 }
 
 func rComm(r *gin.RouterGroup) {
-	r.POST("/getMenuList", comm.MenuList) // 获取菜单栏列表
-	r.POST("/getOssUrl", comm.GetOssUrl)  // 获取阿里云上传PutObject所需的签名URL
-	r.GET("/getSTSVoucher", comm.GetSTSVoucher)
+	r.POST("/getMenuList", comm.MenuList)       // 获取菜单栏列表
+	r.POST("/getOssUrl", comm.GetOssUrl)        // 获取阿里云上传PutObject所需的签名URL
+	r.GET("/getSTSVoucher", comm.GetSTSVoucher) // 获取 STS 凭证
+	r.GET("/adminInfo", comm.GetAdminInfo)
 }

docs/docs.go

@@ -1295,6 +1295,44 @@ const docTemplate = `{
                 }
             }
         },
+        "/api/comm/adminInfo": {
+            "post": {
+                "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": {
+                            "$ref": "#/definitions/comm.GetAdminInfoResp"
+                        }
+                    },
+                    "400": {
+                        "description": "具体错误",
+                        "schema": {
+                            "$ref": "#/definitions/md.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/api/comm/getOssUrl": {
             "post": {
                 "description": "上传许可链接(获取)",
@@ -1421,7 +1459,7 @@ const docTemplate = `{
         },
         "/api/financialCenter/withdraw/applyList": {
             "post": {
-                "description": "提现申请列表(获取)",
+                "description": "提现审核",
                 "consumes": [
                     "application/json"
                 ],
@@ -1431,7 +1469,7 @@ const docTemplate = `{
                 "tags": [
                     "提现"
                 ],
-                "summary": "财务中心-提现-提现申请列表(获取)",
+                "summary": "财务中心-提现-审核",
                 "parameters": [
                     {
                         "type": "string",
@@ -1445,15 +1483,15 @@ const docTemplate = `{
                         "name": "req",
                         "in": "body",
                         "schema": {
-                            "$ref": "#/definitions/md.GetWithdrawApplyListReq"
+                            "$ref": "#/definitions/md.WithdrawApplyAuditReq"
                         }
                     }
                 ],
                 "responses": {
                     "200": {
-                        "description": "具体数据",
+                        "description": "success",
                         "schema": {
-                            "$ref": "#/definitions/md.GetWithdrawApplyListResp"
+                            "type": "string"
                         }
                     },
                     "400": {
@@ -3222,6 +3260,53 @@ const docTemplate = `{
                 }
             }
         },
+        "/api/institutionalManagement/eggEnergy/eggPoint/userEggIndex": {
+            "post": {
+                "description": "蛋蛋分管理(着陆页数据)",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "蛋蛋能量"
+                ],
+                "summary": "制度中心-蛋蛋能量-蛋蛋分管理(着陆页数据)",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "验证参数Bearer和token空格拼接",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    },
+                    {
+                        "description": "请求参数",
+                        "name": "req",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/md.UserEggIndexReq"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "成功返回",
+                        "schema": {
+                            "$ref": "#/definitions/md.UserEggIndexResp"
+                        }
+                    },
+                    "400": {
+                        "description": "具体错误",
+                        "schema": {
+                            "$ref": "#/definitions/md.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/api/institutionalManagement/eggEnergy/getBasic": {
             "get": {
                 "description": "基础设置(获取)",
@@ -7402,6 +7487,31 @@ const docTemplate = `{
                 }
             }
         },
+        "comm.GetAdminInfoResp": {
+            "type": "object",
+            "properties": {
+                "adm_id": {
+                    "description": "管理员id",
+                    "type": "integer"
+                },
+                "is_super_administrator": {
+                    "description": "是否为超级管理员(0:否 1:是)",
+                    "type": "integer"
+                },
+                "memo": {
+                    "description": "备注信息",
+                    "type": "string"
+                },
+                "state": {
+                    "description": "状态(1:正常 2:冻结)",
+                    "type": "integer"
+                },
+                "username": {
+                    "description": "用户名",
+                    "type": "string"
+                }
+            }
+        },
         "comm.GetSTSVoucherResp": {
             "type": "object",
             "properties": {
@@ -10107,6 +10217,10 @@ const docTemplate = `{
                     "description": "微信昵称",
                     "type": "string"
                 },
+                "withdraw_apply_id": {
+                    "description": "提现申请id",
+                    "type": "integer"
+                },
                 "withdraw_type": {
                     "description": "转账平台(1:支付宝 2:微信)",
                     "type": "integer"
@@ -10231,6 +10345,14 @@ const docTemplate = `{
                     "description": "处理中金额",
                     "type": "string"
                 },
+                "reason_list": {
+                    "description": "审核失败（驳回理由）",
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "additionalProperties": true
+                    }
+                },
                 "tags_list": {
                     "description": "标签列表",
                     "type": "array",
@@ -11412,12 +11534,12 @@ const docTemplate = `{
         "md.ReleaseDynamicReq": {
             "type": "object",
             "properties": {
-                "content": {
-                    "description": "文本内容",
+                "[]image": {
+                    "description": "图片",
                     "type": "string"
                 },
-                "image": {
-                    "description": "图片 uri",
+                "content": {
+                    "description": "文本内容",
                     "type": "string"
                 },
                 "is_praise": {
@@ -11717,14 +11839,6 @@ const docTemplate = `{
                         }
                     }
                 },
-                "statistics_user_egg_kind_proportion": {
-                    "description": "统计用户蛋蛋分\"评比类型\"占比",
-                    "type": "array",
-                    "items": {
-                        "type": "object",
-                        "additionalProperties": true
-                    }
-                },
                 "statistics_user_egg_person_add_activity_value_range": {
                     "description": "统计用户\"个人活跃积分增量值\"范围",
                     "type": "array",
@@ -11735,16 +11849,6 @@ const docTemplate = `{
                         }
                     }
                 },
-                "statistics_user_egg_score_value_range": {
-                    "description": "统计用户蛋蛋分范围",
-                    "type": "array",
-                    "items": {
-                        "type": "object",
-                        "additionalProperties": {
-                            "type": "string"
-                        }
-                    }
-                },
                 "statistics_user_egg_send_circle_of_friend_nums_range": {
                     "description": "统计用户\"发朋友圈次数\"范围",
                     "type": "array",
@@ -11954,6 +12058,9 @@ const docTemplate = `{
         },
         "md.UpdateDynamicReq": {
             "type": "object",
+            "required": [
+                "index_id"
+            ],
             "properties": {
                 "index_id": {
                     "description": "动态id",
@@ -13266,6 +13373,9 @@ const docTemplate = `{
         "md.UserRealName": {
             "type": "object",
             "properties": {
+                "create_time": {
+                    "type": "string"
+                },
                 "id": {
                     "type": "string"
                 },
@@ -13544,6 +13654,28 @@ const docTemplate = `{
                 }
             }
         },
+        "md.WithdrawApplyAuditReq": {
+            "type": "object",
+            "required": [
+                "audit_state",
+                "reason",
+                "withdraw_apply_id"
+            ],
+            "properties": {
+                "audit_state": {
+                    "description": "审核状态(1:同意  2:拒绝)",
+                    "type": "integer"
+                },
+                "reason": {
+                    "description": "审核失败（驳回理由）",
+                    "type": "integer"
+                },
+                "withdraw_apply_id": {
+                    "description": "提现申请id",
+                    "type": "integer"
+                }
+            }
+        },
         "md.WithdrawFeeSetStruct": {
             "type": "object",
             "properties": {

docs/swagger.json

@@ -1288,6 +1288,44 @@
                 }
             }
         },
+        "/api/comm/adminInfo": {
+            "post": {
+                "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": {
+                            "$ref": "#/definitions/comm.GetAdminInfoResp"
+                        }
+                    },
+                    "400": {
+                        "description": "具体错误",
+                        "schema": {
+                            "$ref": "#/definitions/md.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/api/comm/getOssUrl": {
             "post": {
                 "description": "上传许可链接(获取)",
@@ -1414,7 +1452,7 @@
         },
         "/api/financialCenter/withdraw/applyList": {
             "post": {
-                "description": "提现申请列表(获取)",
+                "description": "提现审核",
                 "consumes": [
                     "application/json"
                 ],
@@ -1424,7 +1462,7 @@
                 "tags": [
                     "提现"
                 ],
-                "summary": "财务中心-提现-提现申请列表(获取)",
+                "summary": "财务中心-提现-审核",
                 "parameters": [
                     {
                         "type": "string",
@@ -1438,15 +1476,15 @@
                         "name": "req",
                         "in": "body",
                         "schema": {
-                            "$ref": "#/definitions/md.GetWithdrawApplyListReq"
+                            "$ref": "#/definitions/md.WithdrawApplyAuditReq"
                         }
                     }
                 ],
                 "responses": {
                     "200": {
-                        "description": "具体数据",
+                        "description": "success",
                         "schema": {
-                            "$ref": "#/definitions/md.GetWithdrawApplyListResp"
+                            "type": "string"
                         }
                     },
                     "400": {
@@ -3215,6 +3253,53 @@
                 }
             }
         },
+        "/api/institutionalManagement/eggEnergy/eggPoint/userEggIndex": {
+            "post": {
+                "description": "蛋蛋分管理(着陆页数据)",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "蛋蛋能量"
+                ],
+                "summary": "制度中心-蛋蛋能量-蛋蛋分管理(着陆页数据)",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "验证参数Bearer和token空格拼接",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    },
+                    {
+                        "description": "请求参数",
+                        "name": "req",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/md.UserEggIndexReq"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "成功返回",
+                        "schema": {
+                            "$ref": "#/definitions/md.UserEggIndexResp"
+                        }
+                    },
+                    "400": {
+                        "description": "具体错误",
+                        "schema": {
+                            "$ref": "#/definitions/md.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/api/institutionalManagement/eggEnergy/getBasic": {
             "get": {
                 "description": "基础设置(获取)",
@@ -7395,6 +7480,31 @@
                 }
             }
         },
+        "comm.GetAdminInfoResp": {
+            "type": "object",
+            "properties": {
+                "adm_id": {
+                    "description": "管理员id",
+                    "type": "integer"
+                },
+                "is_super_administrator": {
+                    "description": "是否为超级管理员(0:否 1:是)",
+                    "type": "integer"
+                },
+                "memo": {
+                    "description": "备注信息",
+                    "type": "string"
+                },
+                "state": {
+                    "description": "状态(1:正常 2:冻结)",
+                    "type": "integer"
+                },
+                "username": {
+                    "description": "用户名",
+                    "type": "string"
+                }
+            }
+        },
         "comm.GetSTSVoucherResp": {
             "type": "object",
             "properties": {
@@ -10100,6 +10210,10 @@
                     "description": "微信昵称",
                     "type": "string"
                 },
+                "withdraw_apply_id": {
+                    "description": "提现申请id",
+                    "type": "integer"
+                },
                 "withdraw_type": {
                     "description": "转账平台(1:支付宝 2:微信)",
                     "type": "integer"
@@ -10224,6 +10338,14 @@
                     "description": "处理中金额",
                     "type": "string"
                 },
+                "reason_list": {
+                    "description": "审核失败（驳回理由）",
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "additionalProperties": true
+                    }
+                },
                 "tags_list": {
                     "description": "标签列表",
                     "type": "array",
@@ -11405,12 +11527,12 @@
         "md.ReleaseDynamicReq": {
             "type": "object",
             "properties": {
-                "content": {
-                    "description": "文本内容",
+                "[]image": {
+                    "description": "图片",
                     "type": "string"
                 },
-                "image": {
-                    "description": "图片 uri",
+                "content": {
+                    "description": "文本内容",
                     "type": "string"
                 },
                 "is_praise": {
@@ -11710,14 +11832,6 @@
                         }
                     }
                 },
-                "statistics_user_egg_kind_proportion": {
-                    "description": "统计用户蛋蛋分\"评比类型\"占比",
-                    "type": "array",
-                    "items": {
-                        "type": "object",
-                        "additionalProperties": true
-                    }
-                },
                 "statistics_user_egg_person_add_activity_value_range": {
                     "description": "统计用户\"个人活跃积分增量值\"范围",
                     "type": "array",
@@ -11728,16 +11842,6 @@
                         }
                     }
                 },
-                "statistics_user_egg_score_value_range": {
-                    "description": "统计用户蛋蛋分范围",
-                    "type": "array",
-                    "items": {
-                        "type": "object",
-                        "additionalProperties": {
-                            "type": "string"
-                        }
-                    }
-                },
                 "statistics_user_egg_send_circle_of_friend_nums_range": {
                     "description": "统计用户\"发朋友圈次数\"范围",
                     "type": "array",
@@ -11947,6 +12051,9 @@
         },
         "md.UpdateDynamicReq": {
             "type": "object",
+            "required": [
+                "index_id"
+            ],
             "properties": {
                 "index_id": {
                     "description": "动态id",
@@ -13259,6 +13366,9 @@
         "md.UserRealName": {
             "type": "object",
             "properties": {
+                "create_time": {
+                    "type": "string"
+                },
                 "id": {
                     "type": "string"
                 },
@@ -13537,6 +13647,28 @@
                 }
             }
         },
+        "md.WithdrawApplyAuditReq": {
+            "type": "object",
+            "required": [
+                "audit_state",
+                "reason",
+                "withdraw_apply_id"
+            ],
+            "properties": {
+                "audit_state": {
+                    "description": "审核状态(1:同意  2:拒绝)",
+                    "type": "integer"
+                },
+                "reason": {
+                    "description": "审核失败（驳回理由）",
+                    "type": "integer"
+                },
+                "withdraw_apply_id": {
+                    "description": "提现申请id",
+                    "type": "integer"
+                }
+            }
+        },
         "md.WithdrawFeeSetStruct": {
             "type": "object",
             "properties": {

docs/swagger.yaml

@@ -259,6 +259,24 @@ definitions:
           > Alibaba Cloud STS does not impose limits on the length of STS tokens. We strongly recommend that you do not specify a maximum length for STS tokens.
         type: string
     type: object
+  comm.GetAdminInfoResp:
+    properties:
+      adm_id:
+        description: 管理员id
+        type: integer
+      is_super_administrator:
+        description: 是否为超级管理员(0:否 1:是)
+        type: integer
+      memo:
+        description: 备注信息
+        type: string
+      state:
+        description: 状态(1:正常 2:冻结)
+        type: integer
+      username:
+        description: 用户名
+        type: string
+    type: object
   comm.GetSTSVoucherResp:
     properties:
       bucket:
@@ -2122,6 +2140,9 @@ definitions:
       wechat_pay_name:
         description: 微信昵称
         type: string
+      withdraw_apply_id:
+        description: 提现申请id
+        type: integer
       withdraw_type:
         description: 转账平台(1:支付宝 2:微信)
         type: integer
@@ -2211,6 +2232,12 @@ definitions:
       pending_amount:
         description: 处理中金额
         type: string
+      reason_list:
+        description: 审核失败（驳回理由）
+        items:
+          additionalProperties: true
+          type: object
+        type: array
       tags_list:
         description: 标签列表
         items:
@@ -3041,12 +3068,12 @@ definitions:
     type: object
   md.ReleaseDynamicReq:
     properties:
+      '[]image':
+        description: 图片
+        type: string
       content:
         description: 文本内容
         type: string
-      image:
-        description: 图片 uri
-        type: string
       is_praise:
         description: 是否被表扬(1:是 2:否)
         type: integer
@@ -3254,12 +3281,6 @@ definitions:
             type: string
           type: object
         type: array
-      statistics_user_egg_kind_proportion:
-        description: 统计用户蛋蛋分"评比类型"占比
-        items:
-          additionalProperties: true
-          type: object
-        type: array
       statistics_user_egg_person_add_activity_value_range:
         description: 统计用户"个人活跃积分增量值"范围
         items:
@@ -3267,13 +3288,6 @@ definitions:
             type: string
           type: object
         type: array
-      statistics_user_egg_score_value_range:
-        description: 统计用户蛋蛋分范围
-        items:
-          additionalProperties:
-            type: string
-          type: object
-        type: array
       statistics_user_egg_send_circle_of_friend_nums_range:
         description: 统计用户"发朋友圈次数"范围
         items:
@@ -3434,6 +3448,8 @@ definitions:
       state:
         description: 状态(1:正常 2:隐藏)
         type: integer
+    required:
+    - index_id
     type: object
   md.UpdateEggEnergyBasicReq:
     properties:
@@ -4326,6 +4342,8 @@ definitions:
     type: object
   md.UserRealName:
     properties:
+      create_time:
+        type: string
       id:
         type: string
       id_no:
@@ -4518,6 +4536,22 @@ definitions:
         example: 货币类型名称
         type: string
     type: object
+  md.WithdrawApplyAuditReq:
+    properties:
+      audit_state:
+        description: 审核状态(1:同意  2:拒绝)
+        type: integer
+      reason:
+        description: 审核失败（驳回理由）
+        type: integer
+      withdraw_apply_id:
+        description: 提现申请id
+        type: integer
+    required:
+    - audit_state
+    - reason
+    - withdraw_apply_id
+    type: object
   md.WithdrawFeeSetStruct:
     properties:
       duration:
@@ -5470,6 +5504,31 @@ paths:
       summary: 云打包-图片配置
       tags:
       - 云打包
+  /api/comm/adminInfo:
+    post:
+      consumes:
+      - application/json
+      description: 获取管理员信息
+      parameters:
+      - description: 验证参数Bearer和token空格拼接
+        in: header
+        name: Authorization
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 管理员信息
+          schema:
+            $ref: '#/definitions/comm.GetAdminInfoResp'
+        "400":
+          description: 具体错误
+          schema:
+            $ref: '#/definitions/md.Response'
+      summary: 通用请求-获取管理员信息
+      tags:
+      - 通用请求
   /api/comm/getOssUrl:
     post:
       consumes:
@@ -5556,7 +5615,7 @@ paths:
     post:
       consumes:
       - application/json
-      description: 提现申请列表(获取)
+      description: 提现审核
       parameters:
       - description: 验证参数Bearer和token空格拼接
         in: header
@@ -5567,19 +5626,19 @@ paths:
         in: body
         name: req
         schema:
-          $ref: '#/definitions/md.GetWithdrawApplyListReq'
+          $ref: '#/definitions/md.WithdrawApplyAuditReq'
       produces:
       - application/json
       responses:
         "200":
-          description: 具体数据
+          description: success
           schema:
-            $ref: '#/definitions/md.GetWithdrawApplyListResp'
+            type: string
         "400":
           description: 具体错误
           schema:
             $ref: '#/definitions/md.Response'
-      summary: 财务中心-提现-提现申请列表(获取)
+      summary: 财务中心-提现-审核
       tags:
       - 提现
   /api/financialCenter/withdraw/setting:
@@ -6743,6 +6802,37 @@ paths:
       summary: 制度中心-蛋蛋能量-蛋蛋分管理(用户数据列表)
       tags:
       - 蛋蛋能量
+  /api/institutionalManagement/eggEnergy/eggPoint/userEggIndex:
+    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.UserEggIndexReq'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 成功返回
+          schema:
+            $ref: '#/definitions/md.UserEggIndexResp'
+        "400":
+          description: 具体错误
+          schema:
+            $ref: '#/definitions/md.Response'
+      summary: 制度中心-蛋蛋能量-蛋蛋分管理(着陆页数据)
+      tags:
+      - 蛋蛋能量
   /api/institutionalManagement/eggEnergy/getBasic:
     get:
       consumes:

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
@@ -17,6 +17,7 @@ require (
 	github.com/go-playground/validator/v10 v10.20.0
 	github.com/go-redis/redis v6.15.9+incompatible
 	github.com/gomodule/redigo v2.0.0+incompatible
+	github.com/jinzhu/copier v0.4.0
 	github.com/makiuchi-d/gozxing v0.0.0-20210324052758-57132e828831
 	github.com/qiniu/api.v7/v7 v7.8.2
 	github.com/robfig/cron/v3 v3.0.1
@@ -32,7 +33,7 @@ require (
 )
 
 require (
-	code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241203104348-2e593fa11d5d
+	code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241204091019-14b93d36ac8e
 	code.fnuoos.com/EggPlanet/egg_system_rules.git v0.0.4-0.20241203080408-75cfef2c6334
 	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