loser/dongfeng-pay
1
1
Fork 0
mirror of https://github.com/kongyuebin1/dongfeng-pay.git synced 2025-10-16 10:08:00 +08:00
Code Issues Projects Releases Wiki Activity

重构了boss系统，添加了逻辑

Browse Source
This commit is contained in:
kongyuebin
2021-11-11 10:30:43 +08:00
parent 4967a137ec
commit 7cd2e963ad
62 changed files with 663 additions and 3902 deletions
Download Patch File Download Diff File Expand all files Collapse all files

903
boss/controllers/addController.go
View File

File diff suppressed because it is too large Load Diff

15
boss/controllers/baseController.go
View File

@@ -1,6 +1,9 @@
package controllers
import beego "github.com/beego/beego/v2/server/web"
import (
"boss/datas"
beego "github.com/beego/beego/v2/server/web"
)
type BaseController struct {
beego.Controller
@@ -8,20 +11,20 @@ type BaseController struct {
func (c *BaseController) GenerateJSON(dataJSON interface{}) {
c.Data["json"] = dataJSON
c.ServeJSON()
_ = c.ServeJSON()
}
func (c *BaseController) Prepare() {
userID, ok := c.GetSession("userID").(string)
if !ok || userID == "" {
//用户没有登录，或者登录到期了，则跳转登录主页面
dataJSON := new(BaseDataJSON)
dataJSON := new(datas.BaseDataJSON)
dataJSON.Code = 404
dataJSON.Msg = "登录已经过期!"
c.Data["json"] = dataJSON
c.ServeJSON()
_ = c.ServeJSON()
} else {
//重新赋值给session
c.SetSession("userID", userID)
_ = c.SetSession("userID", userID)
}
}
}

224
boss/controllers/datas.go
View File

@@ -1,224 +0,0 @@
package controllers
import "boss/models"
type BaseDataJSON struct {
Msg string
Code int
}
type KeyDataJSON struct {
Msg string
Code int
Key string
}
type MenuDataJSON struct {
StartIndex int
DisplayCount int
CurrentPage int
TotalPage int
Code int
Msg string
MenuList []models.MenuInfo
}
type SecondMenuDataJSON struct {
StartIndex int
DisplayCount int
CurrentPage int
TotalPage int
Code int
Msg string
SecondMenuList []models.SecondMenuInfo
}
type PowerItemDataJSON struct {
StartIndex int
DisplayCount int
CurrentPage int
TotalPage int
Code int
Msg string
PowerItemList []models.PowerInfo
}
type RoleInfoDataJSON struct {
StartIndex int
DisplayCount int
CurrentPage int
TotalPage int
Code int
Msg string
RoleInfoList []models.RoleInfo
}
type DeployTreeJSON struct {
Msg string
Code int
Key string
AllFirstMenu []models.MenuInfo
ShowFirstMenuUid map[string]bool
AllSecondMenu []models.SecondMenuInfo
ShowSecondMenuUid map[string]bool
AllPower []models.PowerInfo
ShowPowerUid map[string]bool
}
type OperatorDataJSON struct {
Msg string
Code int
StartIndex int
DisplayCount int
CurrentPage int
TotalPage int
OperatorList []models.UserInfo
}
type EditOperatorDataJSON struct {
Code int
Msg string
OperatorList []models.UserInfo
RoleList []models.RoleInfo
}
type BankCardDataJSON struct {
Msg string
Code int
StartIndex int
DisplayCount int
CurrentPage int
TotalPage int
BankCardInfoList []models.BankCardInfo
}
type RoadDataJSON struct {
Msg string
Code int
StartIndex int
DisplayCount int
CurrentPage int
TotalPage int
RoadInfoList []models.RoadInfo
RoadPool models.RoadPoolInfo
}
type RoadPoolDataJSON struct {
Msg string
Code int
StartIndex int
DisplayCount int
CurrentPage int
TotalPage int
RoadPoolInfoList []models.RoadPoolInfo
}
type MerchantDataJSON struct {
Msg string
Code int
StartIndex int
DisplayCount int
CurrentPage int
TotalPage int
MerchantList []models.MerchantInfo
}
type MerchantDeployDataJSON struct {
Code int
Msg string
MerchantDeploy models.MerchantDeployInfo
}
type AccountDataJSON struct {
Msg string
Code int
StartIndex int
DisplayCount int
CurrentPage int
TotalPage int
AccountList []models.AccountInfo
}
type AccountHistoryDataJSON struct {
Msg string
Code int
StartIndex int
DisplayCount int
CurrentPage int
TotalPage int
AccountHistoryList []models.AccountHistoryInfo
}
type AgentDataJSON struct {
Msg string
Code int
StartIndex int
DisplayCount int
CurrentPage int
TotalPage int
AgentList []models.AgentInfo
}
type ProductDataJSON struct {
Msg string
Code int
ProductMap map[string]string
}
type OrderDataJSON struct {
Msg string
Code int
StartIndex int
DisplayCount int
CurrentPage int
TotalPage int
OrderList []models.OrderInfo
AllAmount float64
SuccessRate string
NotifyUrl string
}
type ListDataJSON struct {
Msg string
Code int
StartIndex int
DisplayCount int
CurrentPage int
TotalPage int
List []models.OrderProfitInfo
AllAmount float64
SupplierProfit float64
AgentProfit float64
PlatformProfit float64
}
type PayForDataJSON struct {
Msg string
Code int
StartIndex int
DisplayCount int
CurrentPage int
TotalPage int
PayForList []models.PayforInfo
}
type BalanceDataJSON struct {
Msg string
Code int
Balance float64
}
type NotifyBankOrderIdListJSON struct {
Msg string
Code int
NotifyIdList []string
}
type ProfitListJSON struct {
TotalAmount float64
PlatformTotalProfit float64
AgentTotalProfit float64
Msg string
Code int
ProfitList []models.PlatformProfit
}

286
boss/controllers/deleteController.go
View File

@@ -10,195 +10,73 @@
package controllers
import (
"boss/models"
"boss/utils"
"github.com/beego/beego/v2/core/logs"
"sort"
"boss/service"
"strings"
)
type Deletecontroller struct {
type DeleteController struct {
BaseController
}
func (c *Deletecontroller) Finish() {
remainderFirstMenuUid := make([]string, 0)
remainderFirstMenu := make([]string, 0)
remainderSecondMenuUid := make([]string, 0)
remainderSecondMenu := make([]string, 0)
remainderPowerId := make([]string, 0)
remainderPower := make([]string, 0)
allRoleInfo := models.GetRole()
//如果有删除任何的东西，需要重新赋值权限
for _, r := range allRoleInfo {
for _, showFirstUid := range strings.Split(r.ShowFirstUid, "||") {
if models.FirstMenuUidIsExists(showFirstUid) {
remainderFirstMenuUid = append(remainderFirstMenuUid, showFirstUid)
menuInfo := models.GetMenuInfoByMenuUid(showFirstUid)
remainderFirstMenu = append(remainderFirstMenu, menuInfo.FirstMenu)
}
}
for _, showSecondUid := range strings.Split(r.ShowSecondUid, "||") {
if models.SecondMenuUidIsExists(showSecondUid) {
remainderSecondMenuUid = append(remainderSecondMenuUid, showSecondUid)
secondMenuInfo := models.GetSecondMenuInfoBySecondMenuUid(showSecondUid)
remainderSecondMenu = append(remainderSecondMenu, secondMenuInfo.SecondMenu)
}
}
for _, showPowerId := range strings.Split(r.ShowPowerUid, "||") {
if models.PowerUidExists(showPowerId) {
remainderPowerId = append(remainderPowerId, showPowerId)
powerInfo := models.GetPowerById(showPowerId)
remainderPower = append(remainderPower, powerInfo.PowerItem)
}
}
r.ShowFirstUid = strings.Join(remainderFirstMenuUid, "||")
r.ShowFirstMenu = strings.Join(remainderFirstMenu, "||")
r.ShowSecondUid = strings.Join(remainderSecondMenuUid, "||")
r.ShowSecondMenu = strings.Join(remainderSecondMenu, "||")
r.ShowPowerUid = strings.Join(remainderPowerId, "||")
r.ShowPower = strings.Join(remainderPower, "||")
r.UpdateTime = utils.GetBasicDateTime()
models.UpdateRoleInfo(r)
}
func (c *DeleteController) Finish() {
se := new(service.DeleteService)
se.Finish()
}
func (c *Deletecontroller) DeleteMenu() {
func (c *DeleteController) DeleteMenu() {
menuUid := c.GetString("menuUid")
menuInfo := models.GetMenuInfoByMenuUid(menuUid)
dataJSON := new(BaseDataJSON)
if menuInfo.MenuUid == "" {
dataJSON.Msg = "不存在该菜单"
dataJSON.Code = -1
} else {
logs.Info(c.GetSession("userID").(string) + "，执行了删除一级菜单操作")
models.DeleteMenuInfo(menuUid)
//删除该一级目下下的所有二级目录
models.DeleteSecondMenuByFirstMenuUid(menuUid)
SortFirstMenuOrder()
dataJSON.Code = 200
}
se := new(service.DeleteService)
dataJSON := se.DeleteMenu(menuUid, c.GetSession("userID").(string))
c.Data["json"] = dataJSON
c.ServeJSONP()
_ = c.ServeJSONP()
}
/*
* 对一级菜单重新进行排序
*/
func SortFirstMenuOrder() {
menuInfoList := models.GetMenuAll()
sort.Sort(models.MenuInfoSlice(menuInfoList))
for i := 0; i < len(menuInfoList); i++ {
m := menuInfoList[i]
m.UpdateTime = utils.GetBasicDateTime()
m.MenuOrder = i + 1
models.UpdateMenuInfo(m)
//对应的二级菜单也应该重新分配顺序号
SortSecondMenuOrder(m)
}
}
/*
* 对二级菜单分配顺序号
*/
func SortSecondMenuOrder(firstMenuInfo models.MenuInfo) {
secondMenuInfoList := models.GetSecondMenuListByFirstMenuUid(firstMenuInfo.MenuUid)
for _, sm := range secondMenuInfoList {
sm.FirstMenuOrder = firstMenuInfo.MenuOrder
sm.UpdateTime = utils.GetBasicDateTime()
models.UpdateSecondMenu(sm)
//删除下下一级的所有权限项
models.DeletePowerBySecondUid(sm.SecondMenuUid)
}
}
func (c *Deletecontroller) DeleteSecondMenu() {
func (c *DeleteController) DeleteSecondMenu() {
secondMenuUid := strings.TrimSpace(c.GetString("secondMenuUid"))
secondMenuInfo := models.GetSecondMenuInfoBySecondMenuUid(secondMenuUid)
dataJSON := new(BaseDataJSON)
if secondMenuUid == "" || secondMenuInfo.SecondMenuUid == "" {
dataJSON.Code = -1
dataJSON.Msg = "该二级菜单不存在"
} else {
if models.DeleteSecondMenuBySecondMenuUid(secondMenuUid) {
dataJSON.Code = 200
ml := models.GetSecondMenuLenByFirstMenuUid(secondMenuInfo.FirstMenuUid)
//删除该二级页面下的所有权限项
models.DeletePowerBySecondUid(secondMenuUid)
if ml == 0 {
//如果该二级类目已经被全部删除，那么对应的一级类目也应当删除
models.DeleteMenuInfo(secondMenuInfo.FirstMenuUid)
SortFirstMenuOrder()
} else {
secondMenuInfoList := models.GetSecondMenuListByFirstMenuUid(secondMenuInfo.FirstMenuUid)
sort.Sort(models.SecondMenuSlice(secondMenuInfoList))
for i := 0; i < len(secondMenuInfoList); i++ {
m := secondMenuInfoList[i]
models.UpdateSecondMenuOrderBySecondUid(m.SecondMenuUid, i+1)
}
}
} else {
dataJSON.Code = -1
dataJSON.Msg = "删除失败"
}
}
se := new(service.DeleteService)
dataJSON := se.DeleteSecondMenu(secondMenuUid)
c.Data["json"] = dataJSON
c.ServeJSON()
_ = c.ServeJSON()
}
/*
* 删除权限项
*/
func (c *Deletecontroller) DeletePowerItem() {
func (c *DeleteController) DeletePowerItem() {
powerID := strings.TrimSpace(c.GetString("powerID"))
models.DeletePowerItemByPowerID(powerID)
dataJSON := new(BaseDataJSON)
dataJSON.Code = 200
se := new(service.DeleteService)
dataJSON := se.DeletePowerItem(powerID)
c.GenerateJSON(dataJSON)
}
/*
* 删除角色
*/
func (c *Deletecontroller) DeleteRole() {
func (c *DeleteController) DeleteRole() {
roleUid := strings.TrimSpace(c.GetString("roleUid"))
dataJSON := new(BaseDataJSON)
if models.DeleteRoleByRoleUid(roleUid) {
dataJSON.Code = 200
} else {
dataJSON.Code = -1
}
se := new(service.DeleteService)
dataJSON := se.DeleteRole(roleUid)
c.GenerateJSON(dataJSON)
}
/*
* 删除操作员
*/
func (c *Deletecontroller) DeleteOperator() {
func (c *DeleteController) DeleteOperator() {
userId := strings.TrimSpace(c.GetString("userId"))
dataJSON := new(BaseDataJSON)
if models.DeleteUserByUserId(userId) {
dataJSON.Code = 200
} else {
dataJSON.Code = -1
}
se := new(service.DeleteService)
dataJSON := se.DeleteOperator(userId)
c.GenerateJSON(dataJSON)
}
func (c *Deletecontroller) DeleteBankCardRecord() {
func (c *DeleteController) DeleteBankCardRecord() {
uid := strings.TrimSpace(c.GetString("uid"))
se := new(service.DeleteService)
dataJSON := new(BankCardDataJSON)
dataJSON.Code = -1
if models.DeleteBankCardByUid(uid) {
dataJSON.Code = 200
}
dataJSON := se.DeleteBankCardRecord(uid)
c.GenerateJSON(dataJSON)
}
@@ -206,135 +84,65 @@ func (c *Deletecontroller) DeleteBankCardRecord() {
/*
* 删除通道操作
*/
func (c *Deletecontroller) DeleteRoad() {
func (c *DeleteController) DeleteRoad() {
roadUid := strings.TrimSpace(c.GetString("roadUid"))
dataJSON := new(BaseDataJSON)
dataJSON.Code = -1
se := new(service.DeleteService)
dataJSON := se.DeleteRoad(roadUid)
if models.DeleteRoadByRoadUid(roadUid) {
dataJSON.Code = 200
}
params := make(map[string]string)
roadPoolInfoList := models.GetAllRollPool(params)
//将轮询池中的对应的通道删除
for _, roadPoolInfo := range roadPoolInfoList {
var uids []string
roadInfoList := strings.Split(roadPoolInfo.RoadUidPool, "||")
for _, uid := range roadInfoList {
if uid != roadUid {
uids = append(uids, uid)
}
}
roadPoolInfo.RoadUidPool = strings.Join(uids, "||")
roadPoolInfo.UpdateTime = utils.GetBasicDateTime()
models.UpdateRoadPool(roadPoolInfo)
}
c.GenerateJSON(dataJSON)
}
/*
* 删除通道池
*/
func (c *Deletecontroller) DeleteRoadPool() {
func (c *DeleteController) DeleteRoadPool() {
roadPoolCode := strings.TrimSpace(c.GetString("roadPoolCode"))
dataJSON := new(BaseDataJSON)
dataJSON.Code = -1
se := new(service.DeleteService)
dataJSON := se.DeleteRoadPool(roadPoolCode)
if models.DeleteRoadPoolByCode(roadPoolCode) {
dataJSON.Code = 200
} else {
dataJSON.Msg = "删除通道池失败"
}
c.GenerateJSON(dataJSON)
}
/*
* 删除商户
*/
func (c *Deletecontroller) DeleteMerchant() {
func (c *DeleteController) DeleteMerchant() {
merchantUid := strings.TrimSpace(c.GetString("merchantUid"))
keyDataJSON := new(KeyDataJSON)
if merchantUid == "" {
keyDataJSON.Code = -1
c.GenerateJSON(keyDataJSON)
return
}
se := new(service.DeleteService)
keyDataJSON := se.DeleteMerchant(merchantUid)
if models.DeleteMerchantByUid(merchantUid) {
keyDataJSON.Code = 200
} else {
keyDataJSON.Code = -1
}
c.GenerateJSON(keyDataJSON)
}
/*
* 删除账户
*/
func (c *Deletecontroller) DeleteAccount() {
func (c *DeleteController) DeleteAccount() {
accountUid := strings.TrimSpace(c.GetString("accountUid"))
dataJSON := new(BaseDataJSON)
models.IsExistByMerchantUid(accountUid)
if models.IsExistByMerchantUid(accountUid) || models.IsExistByAgentUid(accountUid) {
dataJSON.Code = -1
dataJSON.Msg = "用户还存在，不能删除"
} else {
if models.DeleteAccountByUid(accountUid) {
dataJSON.Code = 200
dataJSON.Msg = "删除账户成功"
} else {
dataJSON.Code = -1
dataJSON.Msg = "删除账户失败"
}
}
se := new(service.DeleteService)
dataJSON := se.DeleteAccount(accountUid)
c.GenerateJSON(dataJSON)
}
func (c *Deletecontroller) DeleteAgent() {
func (c *DeleteController) DeleteAgent() {
agentUid := strings.TrimSpace(c.GetString("agentUid"))
keyDataJSON := new(KeyDataJSON)
//判断是否有商户还绑定了该代理
if models.IsExistMerchantByAgentUid(agentUid) {
keyDataJSON.Code = -1
keyDataJSON.Msg = "已有商户绑定改代理，不能删除"
} else {
if models.DeleteAgentByAgentUid(agentUid) {
keyDataJSON.Code = 200
} else {
keyDataJSON.Code = -1
keyDataJSON.Msg = "删除失败"
}
}
se := new(service.DeleteService)
keyDataJSON := se.DeleteAgent(agentUid)
c.GenerateJSON(keyDataJSON)
}
func (c *Deletecontroller) DeleteAgentRelation() {
func (c *DeleteController) DeleteAgentRelation() {
merchantUid := strings.TrimSpace(c.GetString("merchantUid"))
merchantInfo := models.GetMerchantByUid(merchantUid)
se := new(service.DeleteService)
keyDataJSON := new(KeyDataJSON)
keyDataJSON.Code = 200
keyDataJSON := se.DeleteAgentRelation(merchantUid)
if merchantInfo.MerchantUid == "" {
keyDataJSON.Code = -1
keyDataJSON.Msg = "不存在这样的商户"
} else {
merchantInfo.UpdateTime = utils.GetBasicDateTime()
merchantInfo.BelongAgentUid = ""
merchantInfo.BelongAgentName = ""
if !models.UpdateMerchant(merchantInfo) {
keyDataJSON.Code = -1
keyDataJSON.Msg = "更新商户失败"
}
}
c.GenerateJSON(merchantInfo)
c.GenerateJSON(keyDataJSON)
}

26
boss/controllers/filterController.go
View File

@@ -11,29 +11,11 @@ package controllers
import (
"fmt"
beego "github.com/beego/beego/v2/server/web"
"github.com/beego/beego/v2/server/web/context"
"strings"
"github.com/beego/beego/v2/server/web"
)
type FilterController struct {
beego.Controller
}
var FilterLogin = func(ctx *context.Context) {
userID, ok := ctx.Input.Session("userID").(string)
if !ok || userID == "" {
if !strings.Contains(ctx.Request.RequestURI, "/login.html") &&
!strings.Contains(ctx.Request.RequestURI, "/getVerifyImg") &&
!strings.Contains(ctx.Request.RequestURI, "/favicon.ico") &&
!ctx.Input.IsAjax() {
ctx.Redirect(302, "/login.html")
}
} else {
if strings.Contains(ctx.Request.RequestURI, "/login.html") {
ctx.Redirect(302, "/")
}
}
web.Controller
}
//jsonp请求过来的函数
@@ -48,9 +30,9 @@ func (c *FilterController) Filter() {
dataJSON.Code = 404
} else {
dataJSON.Code = 200
c.SetSession("userID", userID)
_ = c.SetSession("userID", userID)
}
fmt.Println(dataJSON)
c.Data["json"] = dataJSON
c.ServeJSON()
_ = c.ServeJSON()
}

285
boss/controllers/getController.go
View File

@@ -11,8 +11,16 @@ package controllers
import (
"boss/common"
"boss/models"
controller "boss/supplier"
"boss/datas"
"boss/models/accounts"
"boss/models/agent"
"boss/models/merchant"
"boss/models/notify"
"boss/models/order"
"boss/models/payfor"
"boss/models/road"
"boss/models/system"
"boss/models/user"
"fmt"
"sort"
"strconv"
@@ -70,24 +78,24 @@ func (c *GetController) GetMenu() {
params := make(map[string]string)
params["first_menu__icontains"] = firstMenuSearch
c.GetCutPage(models.GetMenuLenByMap(params))
c.GetCutPage(system.GetMenuLenByMap(params))
menuDataJSON := new(MenuDataJSON)
menuDataJSON := new(datas.MenuDataJSON)
menuDataJSON.DisplayCount = c.DisplayCount
menuDataJSON.CurrentPage = c.CurrentPage
menuDataJSON.TotalPage = c.TotalPage
if c.Offset < 0 {
menuDataJSON.Code = -1
menuDataJSON.MenuList = make([]models.MenuInfo, 0)
menuDataJSON.MenuList = make([]system.MenuInfo, 0)
c.GenerateJSON(menuDataJSON)
return
}
menuInfoList := models.GetMenuOffsetByMap(params, c.DisplayCount, c.Offset)
sort.Sort(models.MenuInfoSlice(menuInfoList))
menuInfoList := system.GetMenuOffsetByMap(params, c.DisplayCount, c.Offset)
sort.Sort(system.MenuInfoSlice(menuInfoList))
for i, m := range menuInfoList {
secondMenuInfoList := models.GetSecondMenuListByFirstMenuUid(m.MenuUid)
secondMenuInfoList := system.GetSecondMenuListByFirstMenuUid(m.MenuUid)
smenus := ""
for j := 0; j < len(secondMenuInfoList); j++ {
smenus += secondMenuInfoList[j].SecondMenu
@@ -110,15 +118,15 @@ func (c *GetController) GetMenu() {
}
func (c *GetController) GetFirstMenu() {
menuDataJSON := new(MenuDataJSON)
menuList := models.GetMenuAll()
menuDataJSON := new(datas.MenuDataJSON)
menuList := system.GetMenuAll()
if len(menuList) == 0 {
menuDataJSON.Code = -1
} else {
menuDataJSON.Code = 200
}
sort.Sort(models.MenuInfoSlice(menuList))
sort.Sort(system.MenuInfoSlice(menuList))
menuDataJSON.MenuList = menuList
c.GenerateJSON(menuDataJSON)
}
@@ -134,11 +142,11 @@ func (c *GetController) GetSecondMenu() {
params := make(map[string]string)
params["first_menu__icontains"] = firstMenuSearch
params["second_menu__icontains"] = secondMenuSearch
l := models.GetSecondMenuLenByMap(params)
l := system.GetSecondMenuLenByMap(params)
c.GetCutPage(l)
secondMenuDataJSON := new(SecondMenuDataJSON)
secondMenuDataJSON := new(datas.SecondMenuDataJSON)
secondMenuDataJSON.DisplayCount = c.DisplayCount
secondMenuDataJSON.Code = 200
@@ -146,13 +154,13 @@ func (c *GetController) GetSecondMenu() {
secondMenuDataJSON.TotalPage = c.TotalPage
if c.Offset < 0 {
secondMenuDataJSON.SecondMenuList = make([]models.SecondMenuInfo, 0)
secondMenuDataJSON.SecondMenuList = make([]system.SecondMenuInfo, 0)
c.GenerateJSON(secondMenuDataJSON)
return
}
secondMenuList := models.GetSecondMenuByMap(params, c.DisplayCount, c.Offset)
sort.Sort(models.SecondMenuSlice(secondMenuList))
secondMenuList := system.GetSecondMenuByMap(params, c.DisplayCount, c.Offset)
sort.Sort(system.SecondMenuSlice(secondMenuList))
secondMenuDataJSON.SecondMenuList = secondMenuList
secondMenuDataJSON.StartIndex = c.Offset
@@ -166,9 +174,9 @@ func (c *GetController) GetSecondMenu() {
func (c *GetController) GetSecondMenus() {
firstMenuUid := strings.TrimSpace(c.GetString("firMenuUid"))
secondMenuDataJSON := new(SecondMenuDataJSON)
secondMenuDataJSON := new(datas.SecondMenuDataJSON)
secondMenuList := models.GetSecondMenuListByFirstMenuUid(firstMenuUid)
secondMenuList := system.GetSecondMenuListByFirstMenuUid(firstMenuUid)
secondMenuDataJSON.Code = 200
secondMenuDataJSON.SecondMenuList = secondMenuList
@@ -178,18 +186,18 @@ func (c *GetController) GetSecondMenus() {
func (c *GetController) GetOneMenu() {
menuUid := c.GetString("menuUid")
dataJSON := new(MenuDataJSON)
menuInfo := models.GetMenuInfoByMenuUid(menuUid)
dataJSON := new(datas.MenuDataJSON)
menuInfo := system.GetMenuInfoByMenuUid(menuUid)
if menuInfo.MenuUid == "" {
dataJSON.Code = -1
dataJSON.Msg = "该菜单项不存在"
} else {
dataJSON.MenuList = make([]models.MenuInfo, 0)
dataJSON.MenuList = make([]system.MenuInfo, 0)
dataJSON.MenuList = append(dataJSON.MenuList, menuInfo)
dataJSON.Code = 200
}
c.Data["json"] = dataJSON
c.ServeJSONP()
_ = c.ServeJSONP()
}
func (c *GetController) GetPowerItem() {
@@ -200,25 +208,25 @@ func (c *GetController) GetPowerItem() {
params["power_uid__icontains"] = powerID
params["power_item_icontains"] = powerItem
l := models.GetPowerItemLenByMap(params)
l := system.GetPowerItemLenByMap(params)
c.GetCutPage(l)
powerItemDataJSON := new(PowerItemDataJSON)
powerItemDataJSON := new(datas.PowerItemDataJSON)
powerItemDataJSON.DisplayCount = c.DisplayCount
powerItemDataJSON.Code = 200
powerItemDataJSON.CurrentPage = c.CurrentPage
powerItemDataJSON.TotalPage = c.TotalPage
if c.Offset < 0 {
powerItemDataJSON.PowerItemList = make([]models.PowerInfo, 0)
powerItemDataJSON.PowerItemList = make([]system.PowerInfo, 0)
c.GenerateJSON(powerItemDataJSON)
return
}
powerItemDataJSON.StartIndex = c.Offset
powerItemList := models.GetPowerItemByMap(params, c.DisplayCount, c.Offset)
sort.Sort(models.PowerInfoSlice(powerItemList))
powerItemList := system.GetPowerItemByMap(params, c.DisplayCount, c.Offset)
sort.Sort(system.PowerInfoSlice(powerItemList))
powerItemDataJSON.PowerItemList = powerItemList
c.GenerateJSON(powerItemDataJSON)
@@ -230,29 +238,29 @@ func (c *GetController) GetRole() {
params := make(map[string]string)
params["role_name__icontains"] = roleName
l := models.GetRoleLenByMap(params)
l := system.GetRoleLenByMap(params)
c.GetCutPage(l)
roleInfoDataJSON := new(RoleInfoDataJSON)
roleInfoDataJSON := new(datas.RoleInfoDataJSON)
roleInfoDataJSON.DisplayCount = c.DisplayCount
roleInfoDataJSON.Code = 200
roleInfoDataJSON.CurrentPage = c.CurrentPage
roleInfoDataJSON.TotalPage = c.TotalPage
if c.Offset < 0 {
roleInfoDataJSON.RoleInfoList = make([]models.RoleInfo, 0)
roleInfoDataJSON.RoleInfoList = make([]system.RoleInfo, 0)
c.GenerateJSON(roleInfoDataJSON)
return
}
roleInfoDataJSON.StartIndex = c.Offset
roleInfoDataJSON.RoleInfoList = models.GetRoleByMap(params, c.DisplayCount, c.Offset)
roleInfoDataJSON.RoleInfoList = system.GetRoleByMap(params, c.DisplayCount, c.Offset)
c.GenerateJSON(roleInfoDataJSON)
}
func (c *GetController) GetAllRole() {
roleInfoDataJSON := new(RoleInfoDataJSON)
roleInfoList := models.GetRole()
roleInfoDataJSON := new(datas.RoleInfoDataJSON)
roleInfoList := system.GetRole()
fmt.Println(roleInfoList)
if len(roleInfoList) == 0 {
roleInfoDataJSON.Code = -1
@@ -265,15 +273,15 @@ func (c *GetController) GetAllRole() {
func (c *GetController) GetDeployTree() {
roleUid := strings.TrimSpace(c.GetString("roleUid"))
roleInfo := models.GetRoleByRoleUid(roleUid)
roleInfo := system.GetRoleByRoleUid(roleUid)
allFirstMenu := models.GetMenuAll()
sort.Sort(models.MenuInfoSlice(allFirstMenu))
allSecondMenu := models.GetSecondMenuList()
sort.Sort(models.SecondMenuSlice(allSecondMenu))
allPower := models.GetPower()
allFirstMenu := system.GetMenuAll()
sort.Sort(system.MenuInfoSlice(allFirstMenu))
allSecondMenu := system.GetSecondMenuList()
sort.Sort(system.SecondMenuSlice(allSecondMenu))
allPower := system.GetPower()
deployTreeJSON := new(DeployTreeJSON)
deployTreeJSON := new(datas.DeployTreeJSON)
deployTreeJSON.Code = 200
deployTreeJSON.AllFirstMenu = allFirstMenu
deployTreeJSON.AllSecondMenu = allSecondMenu
@@ -303,32 +311,32 @@ func (c *GetController) GetOperator() {
params := make(map[string]string)
params["user_id__icontains"] = operatorName
l := models.GetOperatorLenByMap(params)
l := user.GetOperatorLenByMap(params)
c.GetCutPage(l)
operatorDataJSON := new(OperatorDataJSON)
operatorDataJSON := new(datas.OperatorDataJSON)
operatorDataJSON.DisplayCount = c.DisplayCount
operatorDataJSON.Code = 200
operatorDataJSON.CurrentPage = c.CurrentPage
operatorDataJSON.TotalPage = c.TotalPage
if c.Offset < 0 {
operatorDataJSON.OperatorList = make([]models.UserInfo, 0)
operatorDataJSON.OperatorList = make([]user.UserInfo, 0)
c.GenerateJSON(operatorDataJSON)
return
}
operatorDataJSON.StartIndex = c.Offset
operatorDataJSON.OperatorList = models.GetOperatorByMap(params, c.DisplayCount, c.Offset)
operatorDataJSON.OperatorList = user.GetOperatorByMap(params, c.DisplayCount, c.Offset)
c.GenerateJSON(operatorDataJSON)
}
func (c *GetController) GetOneOperator() {
userId := strings.TrimSpace(c.GetString("userId"))
userInfo := models.GetUserInfoByUserID(userId)
userInfo := user.GetUserInfoByUserID(userId)
operatorDataJSON := new(OperatorDataJSON)
operatorDataJSON.OperatorList = make([]models.UserInfo, 0)
operatorDataJSON := new(datas.OperatorDataJSON)
operatorDataJSON.OperatorList = make([]user.UserInfo, 0)
operatorDataJSON.OperatorList = append(operatorDataJSON.OperatorList, userInfo)
operatorDataJSON.Code = 200
@@ -339,11 +347,11 @@ func (c *GetController) GetOneOperator() {
func (c *GetController) GetEditOperator() {
userId := strings.TrimSpace(c.GetString("userId"))
editOperatorDataJSON := new(EditOperatorDataJSON)
userInfo := models.GetUserInfoByUserID(userId)
editOperatorDataJSON := new(datas.EditOperatorDataJSON)
userInfo := user.GetUserInfoByUserID(userId)
fmt.Println(userInfo)
editOperatorDataJSON.OperatorList = append(editOperatorDataJSON.OperatorList, userInfo)
editOperatorDataJSON.RoleList = models.GetRole()
editOperatorDataJSON.RoleList = system.GetRole()
editOperatorDataJSON.Code = 200
c.GenerateJSON(editOperatorDataJSON)
@@ -354,31 +362,31 @@ func (c *GetController) GetBankCard() {
params := make(map[string]string)
params["account_name__icontains"] = accountNameSearch
l := models.GetBankCardLenByMap(params)
l := system.GetBankCardLenByMap(params)
c.GetCutPage(l)
bankCardDataJSON := new(BankCardDataJSON)
bankCardDataJSON := new(datas.BankCardDataJSON)
bankCardDataJSON.DisplayCount = c.DisplayCount
bankCardDataJSON.Code = 200
bankCardDataJSON.CurrentPage = c.CurrentPage
bankCardDataJSON.TotalPage = c.TotalPage
if c.Offset < 0 {
bankCardDataJSON.BankCardInfoList = make([]models.BankCardInfo, 0)
bankCardDataJSON.BankCardInfoList = make([]system.BankCardInfo, 0)
c.GenerateJSON(bankCardDataJSON)
return
}
bankCardDataJSON.StartIndex = c.Offset
bankCardDataJSON.BankCardInfoList = models.GetBankCardByMap(params, c.DisplayCount, c.Offset)
bankCardDataJSON.BankCardInfoList = system.GetBankCardByMap(params, c.DisplayCount, c.Offset)
c.GenerateJSON(bankCardDataJSON)
}
func (c *GetController) GetOneBankCard() {
uid := strings.TrimSpace(c.GetString("uid"))
bankCardInfo := models.GetBankCardByUid(uid)
bankCardInfo := system.GetBankCardByUid(uid)
bankCardDataJSON := new(BankCardDataJSON)
bankCardDataJSON := new(datas.BankCardDataJSON)
bankCardDataJSON.Code = -1
if bankCardInfo.Uid != "" {
@@ -405,24 +413,24 @@ func (c *GetController) GetRoad() {
params["road_uid"] = roadUid
params["pay_type"] = payType
l := models.GetRoadLenByMap(params)
l := road.GetRoadLenByMap(params)
c.GetCutPage(l)
roadDataJSON := new(RoadDataJSON)
roadDataJSON := new(datas.RoadDataJSON)
roadDataJSON.DisplayCount = c.DisplayCount
roadDataJSON.Code = 200
roadDataJSON.CurrentPage = c.CurrentPage
roadDataJSON.TotalPage = c.TotalPage
if c.Offset < 0 {
roadDataJSON.RoadInfoList = make([]models.RoadInfo, 0)
roadDataJSON.RoadInfoList = make([]road.RoadInfo, 0)
c.GenerateJSON(roadDataJSON)
return
}
roadDataJSON.StartIndex = c.Offset
roadDataJSON.RoadInfoList = models.GetRoadInfoByMap(params, c.DisplayCount, c.Offset)
roadDataJSON.RoadPool = models.GetRoadPoolByRoadPoolCode(roadPoolCode)
roadDataJSON.RoadInfoList = road.GetRoadInfoByMap(params, c.DisplayCount, c.Offset)
roadDataJSON.RoadPool = road.GetRoadPoolByRoadPoolCode(roadPoolCode)
c.GenerateJSON(roadDataJSON)
}
@@ -431,8 +439,8 @@ func (c *GetController) GetAllRoad() {
params := make(map[string]string)
params["road_name__icontains"] = roadName
roadDataJSON := new(RoadDataJSON)
roadInfoList := models.GetAllRoad(params)
roadDataJSON := new(datas.RoadDataJSON)
roadInfoList := road.GetAllRoad(params)
roadDataJSON.Code = 200
roadDataJSON.RoadInfoList = roadInfoList
@@ -445,15 +453,15 @@ func (c *GetController) GetAllRoad() {
func (c *GetController) GetOneRoad() {
roadUid := strings.TrimSpace(c.GetString("roadUid"))
roadInfo := models.GetRoadInfoByRoadUid(roadUid)
roadDataJSON := new(RoadDataJSON)
roadInfo := road.GetRoadInfoByRoadUid(roadUid)
roadDataJSON := new(datas.RoadDataJSON)
roadDataJSON.Code = -1
if roadInfo.RoadUid != "" {
roadDataJSON.RoadInfoList = append(roadDataJSON.RoadInfoList, roadInfo)
roadDataJSON.Code = 200
} else {
roadDataJSON.RoadInfoList = make([]models.RoadInfo, 0)
roadDataJSON.RoadInfoList = make([]road.RoadInfo, 0)
}
c.GenerateJSON(roadDataJSON)
@@ -467,23 +475,23 @@ func (c *GetController) GetRoadPool() {
params["road_pool_name__icontains"] = roadPoolName
params["road_pool_code__icontains"] = roadPoolCode
l := models.GetRoadPoolLenByMap(params)
l := road.GetRoadPoolLenByMap(params)
c.GetCutPage(l)
roadPoolDataJSON := new(RoadPoolDataJSON)
roadPoolDataJSON := new(datas.RoadPoolDataJSON)
roadPoolDataJSON.DisplayCount = c.DisplayCount
roadPoolDataJSON.Code = 200
roadPoolDataJSON.CurrentPage = c.CurrentPage
roadPoolDataJSON.TotalPage = c.TotalPage
if c.Offset < 0 {
roadPoolDataJSON.RoadPoolInfoList = make([]models.RoadPoolInfo, 0)
roadPoolDataJSON.RoadPoolInfoList = make([]road.RoadPoolInfo, 0)
c.GenerateJSON(roadPoolDataJSON)
return
}
roadPoolDataJSON.StartIndex = c.Offset
roadPoolDataJSON.RoadPoolInfoList = models.GetRoadPoolByMap(params, c.DisplayCount, c.Offset)
roadPoolDataJSON.RoadPoolInfoList = road.GetRoadPoolByMap(params, c.DisplayCount, c.Offset)
c.GenerateJSON(roadPoolDataJSON)
}
@@ -492,9 +500,9 @@ func (c *GetController) GetAllRollPool() {
params := make(map[string]string)
params["road_pool_name__icontains"] = rollPoolName
roadPoolDataJSON := new(RoadPoolDataJSON)
roadPoolDataJSON := new(datas.RoadPoolDataJSON)
roadPoolDataJSON.Code = 200
roadPoolDataJSON.RoadPoolInfoList = models.GetAllRollPool(params)
roadPoolDataJSON.RoadPoolInfoList = road.GetAllRollPool(params)
c.GenerateJSON(roadPoolDataJSON)
}
@@ -506,36 +514,36 @@ func (c *GetController) GetMerchant() {
params["merchant_name__icontains"] = merchantName
params["merchant_uid__icontains"] = merchantNo
l := models.GetMerchantLenByMap(params)
l := merchant.GetMerchantLenByMap(params)
c.GetCutPage(l)
merchantDataJSON := new(MerchantDataJSON)
merchantDataJSON := new(datas.MerchantDataJSON)
merchantDataJSON.DisplayCount = c.DisplayCount
merchantDataJSON.Code = 200
merchantDataJSON.CurrentPage = c.CurrentPage
merchantDataJSON.TotalPage = c.TotalPage
if c.Offset < 0 {
merchantDataJSON.MerchantList = make([]models.MerchantInfo, 0)
merchantDataJSON.MerchantList = make([]merchant.MerchantInfo, 0)
c.GenerateJSON(merchantDataJSON)
return
}
merchantDataJSON.StartIndex = c.Offset
merchantDataJSON.MerchantList = models.GetMerchantListByMap(params, c.DisplayCount, c.Offset)
merchantDataJSON.MerchantList = merchant.GetMerchantListByMap(params, c.DisplayCount, c.Offset)
c.GenerateJSON(merchantDataJSON)
}
func (c *GetController) GetAllMerchant() {
merchantDataJSON := new(MerchantDataJSON)
merchantDataJSON := new(datas.MerchantDataJSON)
merchantDataJSON.Code = 200
merchantDataJSON.MerchantList = models.GetAllMerchant()
merchantDataJSON.MerchantList = merchant.GetAllMerchant()
c.GenerateJSON(merchantDataJSON)
}
func (c *GetController) GetOneMerchant() {
merchantUid := strings.TrimSpace(c.GetString("merchantUid"))
merchantDataJSON := new(MerchantDataJSON)
merchantDataJSON := new(datas.MerchantDataJSON)
if merchantUid == "" {
merchantDataJSON.Code = -1
@@ -543,7 +551,7 @@ func (c *GetController) GetOneMerchant() {
return
}
merchantInfo := models.GetMerchantByUid(merchantUid)
merchantInfo := merchant.GetMerchantByUid(merchantUid)
merchantDataJSON.Code = 200
merchantDataJSON.MerchantList = append(merchantDataJSON.MerchantList, merchantInfo)
@@ -554,9 +562,9 @@ func (c *GetController) GetOneMerchantDeploy() {
merchantNo := strings.TrimSpace(c.GetString("merchantNo"))
payType := strings.TrimSpace(c.GetString("payType"))
merchantDeployDataJSON := new(MerchantDeployDataJSON)
merchantDeployDataJSON := new(datas.MerchantDeployDataJSON)
merchantDeployInfo := models.GetMerchantDeployByUidAndPayType(merchantNo, payType)
merchantDeployInfo := merchant.GetMerchantDeployByUidAndPayType(merchantNo, payType)
if merchantDeployInfo.Status == "active" {
merchantDeployDataJSON.Code = 200
@@ -570,10 +578,10 @@ func (c *GetController) GetOneMerchantDeploy() {
}
func (c *GetController) GetAllAccount() {
accountDataJSON := new(AccountDataJSON)
accountDataJSON := new(datas.AccountDataJSON)
accountDataJSON.Code = 200
accountDataJSON.AccountList = models.GetAllAccount()
accountDataJSON.AccountList = accounts.GetAllAccount()
c.GenerateJSON(accountDataJSON)
}
@@ -586,23 +594,23 @@ func (c *GetController) GetAccount() {
params["account_name__icontains"] = accountName
params["account_uid_icontains"] = accountUid
l := models.GetAccountLenByMap(params)
l := accounts.GetAccountLenByMap(params)
c.GetCutPage(l)
accountDataJSON := new(AccountDataJSON)
accountDataJSON := new(datas.AccountDataJSON)
accountDataJSON.DisplayCount = c.DisplayCount
accountDataJSON.Code = 200
accountDataJSON.CurrentPage = c.CurrentPage
accountDataJSON.TotalPage = c.TotalPage
if c.Offset < 0 {
accountDataJSON.AccountList = make([]models.AccountInfo, 0)
accountDataJSON.AccountList = make([]accounts.AccountInfo, 0)
c.GenerateJSON(accountDataJSON)
return
}
accountDataJSON.StartIndex = c.Offset
accountDataJSON.AccountList = models.GetAccountByMap(params, c.DisplayCount, c.Offset)
accountDataJSON.AccountList = accounts.GetAccountByMap(params, c.DisplayCount, c.Offset)
c.GenerateJSON(accountDataJSON)
}
@@ -610,9 +618,9 @@ func (c *GetController) GetOneAccount() {
//从http的body中获取accountUid字段，并且这个字段是string类型
accountUid := strings.TrimSpace(c.GetString("accountUid"))
//new一个accountDataJSON结构体对象，用来做jsonp返回
accountDataJSON := new(AccountDataJSON)
accountDataJSON := new(datas.AccountDataJSON)
//用accountuid作为过滤字段，从数据库中读取一条信息
accountInfo := models.GetAccountByUid(accountUid)
accountInfo := accounts.GetAccountByUid(accountUid)
//code初始值为200
accountDataJSON.Code = 200
//将从数据库读出来的数据插入到accountList数组中
@@ -645,23 +653,23 @@ func (c *GetController) GetAccountHistory() {
params["create_time__gte"] = startTime
params["create_time__lte"] = endTime
l := models.GetAccountHistoryLenByMap(params)
l := accounts.GetAccountHistoryLenByMap(params)
c.GetCutPage(l)
accountHistoryDataJSON := new(AccountHistoryDataJSON)
accountHistoryDataJSON := new(datas.AccountHistoryDataJSON)
accountHistoryDataJSON.DisplayCount = c.DisplayCount
accountHistoryDataJSON.Code = 200
accountHistoryDataJSON.CurrentPage = c.CurrentPage
accountHistoryDataJSON.TotalPage = c.TotalPage
if c.Offset < 0 {
accountHistoryDataJSON.AccountHistoryList = make([]models.AccountHistoryInfo, 0)
accountHistoryDataJSON.AccountHistoryList = make([]accounts.AccountHistoryInfo, 0)
c.GenerateJSON(accountHistoryDataJSON)
return
}
accountHistoryDataJSON.StartIndex = c.Offset
accountHistoryDataJSON.AccountHistoryList = models.GetAccountHistoryByMap(params, c.DisplayCount, c.Offset)
accountHistoryDataJSON.AccountHistoryList = accounts.GetAccountHistoryByMap(params, c.DisplayCount, c.Offset)
c.GenerateJSON(accountHistoryDataJSON)
}
@@ -670,23 +678,23 @@ func (c *GetController) GetAgent() {
params := make(map[string]string)
params["agnet_name__icontains"] = agentName
l := models.GetAgentInfoLenByMap(params)
l := agent.GetAgentInfoLenByMap(params)
c.GetCutPage(l)
agentDataJSON := new(AgentDataJSON)
agentDataJSON := new(datas.AgentDataJSON)
agentDataJSON.DisplayCount = c.DisplayCount
agentDataJSON.Code = 200
agentDataJSON.CurrentPage = c.CurrentPage
agentDataJSON.TotalPage = c.TotalPage
if c.Offset < 0 {
agentDataJSON.AgentList = make([]models.AgentInfo, 0)
agentDataJSON.AgentList = make([]agent.AgentInfo, 0)
c.GenerateJSON(agentDataJSON)
return
}
agentDataJSON.StartIndex = c.Offset
agentDataJSON.AgentList = models.GetAgentInfoByMap(params, c.DisplayCount, c.Offset)
agentDataJSON.AgentList = agent.GetAgentInfoByMap(params, c.DisplayCount, c.Offset)
c.GenerateJSON(agentDataJSON)
}
@@ -695,16 +703,16 @@ func (c *GetController) GetAllAgent() {
params := make(map[string]string)
params["agent_name__icontains"] = agentName
agentDataJSON := new(AgentDataJSON)
agentDataJSON := new(datas.AgentDataJSON)
agentDataJSON.Code = 200
agentDataJSON.AgentList = models.GetAllAgentByMap(params)
agentDataJSON.AgentList = agent.GetAllAgentByMap(params)
c.GenerateJSON(agentDataJSON)
}
func (c *GetController) GetProduct() {
supplierCode2Name := common.GetSupplierMap()
productDataJSON := new(ProductDataJSON)
productDataJSON := new(datas.ProductDataJSON)
productDataJSON.Code = 200
productDataJSON.ProductMap = supplierCode2Name
c.GenerateJSON(productDataJSON)
@@ -718,19 +726,19 @@ func (c *GetController) GetAgentToMerchant() {
params["belong_agent_uid"] = agentUid
params["merchant_uid"] = merchantUid
l := models.GetMerchantLenByParams(params)
l := merchant.GetMerchantLenByParams(params)
c.GetCutPage(l)
merchantDataJSON := new(MerchantDataJSON)
merchantDataJSON := new(datas.MerchantDataJSON)
merchantDataJSON.DisplayCount = c.DisplayCount
merchantDataJSON.Code = 200
merchantDataJSON.CurrentPage = c.CurrentPage
merchantDataJSON.TotalPage = c.TotalPage
if c.Offset < 0 {
merchantDataJSON.MerchantList = make([]models.MerchantInfo, 0)
merchantDataJSON.MerchantList = make([]merchant.MerchantInfo, 0)
} else {
merchantDataJSON.MerchantList = models.GetMerchantByParams(params, c.DisplayCount, c.Offset)
merchantDataJSON.MerchantList = merchant.GetMerchantByParams(params, c.DisplayCount, c.Offset)
}
c.GenerateJSON(merchantDataJSON)
@@ -768,36 +776,37 @@ func (c *GetController) GetOrder() {
params["refund"] = "yes"
}
l := models.GetOrderLenByMap(params)
l := order.GetOrderLenByMap(params)
c.GetCutPage(l)
orderDataJSON := new(OrderDataJSON)
orderDataJSON := new(datas.OrderDataJSON)
orderDataJSON.DisplayCount = c.DisplayCount
orderDataJSON.Code = 200
orderDataJSON.CurrentPage = c.CurrentPage
orderDataJSON.TotalPage = c.TotalPage
if c.Offset < 0 {
orderDataJSON.OrderList = make([]models.OrderInfo, 0)
orderDataJSON.OrderList = make([]order.OrderInfo, 0)
c.GenerateJSON(orderDataJSON)
return
}
orderDataJSON.StartIndex = c.Offset
orderDataJSON.OrderList = models.GetOrderByMap(params, c.DisplayCount, c.Offset)
orderDataJSON.SuccessRate = models.GetSuccessRateByMap(params)
orderDataJSON.AllAmount = models.GetAllAmountByMap(params)
orderDataJSON.OrderList = order.GetOrderByMap(params, c.DisplayCount, c.Offset)
orderDataJSON.SuccessRate = order.GetSuccessRateByMap(params)
params["status"] = common.SUCCESS
orderDataJSON.AllAmount = order.GetAllAmountByMap(params)
c.GenerateJSON(orderDataJSON)
}
func (c *GetController) GetOneOrder() {
bankOrderId := strings.TrimSpace(c.GetString("bankOrderId"))
orderDataJSON := new(OrderDataJSON)
orderInfo := models.GetOneOrder(bankOrderId)
orderDataJSON := new(datas.OrderDataJSON)
orderInfo := order.GetOneOrder(bankOrderId)
orderDataJSON.Code = 200
orderDataJSON.OrderList = append(orderDataJSON.OrderList, orderInfo)
notifyInfo := models.GetNotifyInfoByBankOrderId(bankOrderId)
notifyInfo := notify.GetNotifyInfoByBankOrderId(bankOrderId)
if notifyInfo.Url == "" || len(notifyInfo.Url) == 0 {
orderDataJSON.NotifyUrl = orderInfo.NotifyUrl
} else {
@@ -826,23 +835,23 @@ func (c *GetController) GetOrderProfit() {
params["pay_product_code"] = supplierUid
params["pay_type_code"] = payWayCode
l := models.GetOrderProfitLenByMap(params)
l := order.GetOrderProfitLenByMap(params)
c.GetCutPage(l)
listDataJSON := new(ListDataJSON)
listDataJSON := new(datas.ListDataJSON)
listDataJSON.DisplayCount = c.DisplayCount
listDataJSON.Code = 200
listDataJSON.CurrentPage = c.CurrentPage
listDataJSON.TotalPage = c.TotalPage
if c.Offset < 0 {
listDataJSON.List = make([]models.OrderProfitInfo, 0)
listDataJSON.List = make([]order.OrderProfitInfo, 0)
c.GenerateJSON(listDataJSON)
return
}
listDataJSON.StartIndex = c.Offset
listDataJSON.List = models.GetOrderProfitByMap(params, c.DisplayCount, c.Offset)
listDataJSON.List = order.GetOrderProfitByMap(params, c.DisplayCount, c.Offset)
supplierAll := 0.0
platformAll := 0.0
agentAll := 0.0
@@ -878,23 +887,23 @@ func (c *GetController) GetPayFor() {
params["bank_order_id"] = bankOrderId
params["status"] = status
l := models.GetPayForLenByMap(params)
l := payfor.GetPayForLenByMap(params)
c.GetCutPage(l)
listDataJSON := new(PayForDataJSON)
listDataJSON := new(datas.PayForDataJSON)
listDataJSON.DisplayCount = c.DisplayCount
listDataJSON.Code = 200
listDataJSON.CurrentPage = c.CurrentPage
listDataJSON.TotalPage = c.TotalPage
if c.Offset < 0 {
listDataJSON.PayForList = make([]models.PayforInfo, 0)
listDataJSON.PayForList = make([]payfor.PayforInfo, 0)
c.GenerateJSON(listDataJSON)
return
}
listDataJSON.StartIndex = c.Offset
listDataJSON.PayForList = models.GetPayForByMap(params, c.DisplayCount, c.Offset)
listDataJSON.PayForList = payfor.GetPayForByMap(params, c.DisplayCount, c.Offset)
for index, p := range listDataJSON.PayForList {
if p.MerchantName == "" {
listDataJSON.PayForList[index].MerchantName = "任意下发"
@@ -912,9 +921,9 @@ func (c *GetController) GetPayFor() {
func (c *GetController) GetOnePayFor() {
bankOrderId := strings.TrimSpace(c.GetString("bankOrderId"))
payForInfo := models.GetPayForByBankOrderId(bankOrderId)
payForInfo := payfor.GetPayForByBankOrderId(bankOrderId)
listDataJSON := new(PayForDataJSON)
listDataJSON := new(datas.PayForDataJSON)
listDataJSON.Code = 200
listDataJSON.PayForList = append(listDataJSON.PayForList, payForInfo)
@@ -922,27 +931,29 @@ func (c *GetController) GetOnePayFor() {
}
func (c *GetController) GetBalance() {
roadName := strings.TrimSpace(c.GetString("roadName"))
roadUid := strings.TrimSpace(c.GetString("roadUid"))
/*roadName := strings.TrimSpace(c.GetString("roadName"))
roadUid := strings.TrimSpace(c.GetString("roadUid"))*/
var roadInfo models.RoadInfo
/*var roadInfo road.RoadInfo
if roadUid != "" {
roadInfo = models.GetRoadInfoByRoadUid(roadUid)
roadInfo = road.GetRoadInfoByRoadUid(roadUid)
} else {
roadInfo = models.GetRoadInfoByName(roadName)
}
roadInfo = road.GetRoadInfoByName(roadName)
}*/
balanceDataJSON := new(BalanceDataJSON)
balanceDataJSON := new(datas.BalanceDataJSON)
balanceDataJSON.Code = 200
supplier := controller.GetPaySupplierByCode(roadInfo.ProductUid)
/*supplier := controller.GetPaySupplierByCode(roadInfo.ProductUid)
if supplier == nil {
balanceDataJSON.Code = -1
balanceDataJSON.Balance = -1.00
} else {
balance := supplier.BalanceQuery(roadInfo)
balanceDataJSON.Balance = balance
}
}*/
// TODO 从gateway获取账户余额
balanceDataJSON.Balance = 1
c.GenerateJSON(balanceDataJSON)
}
@@ -959,9 +970,9 @@ func (c *GetController) GetNotifyBankOrderIdList() {
params["merchant_uid"] = merchantUid
params["type"] = notifyType
bankOrderIdListJSON := new(NotifyBankOrderIdListJSON)
bankOrderIdListJSON := new(datas.NotifyBankOrderIdListJSON)
bankOrderIdListJSON.Code = 200
bankOrderIdListJSON.NotifyIdList = models.GetNotifyBankOrderIdListByParams(params)
bankOrderIdListJSON.NotifyIdList = notify.GetNotifyBankOrderIdListByParams(params)
c.GenerateJSON(bankOrderIdListJSON)
}
@@ -984,9 +995,9 @@ func (c *GetController) GetProfit() {
params["create_time__gte"] = startTime
params["create_time__lte"] = endTime
profitListJSON := new(ProfitListJSON)
profitListJSON := new(datas.ProfitListJSON)
profitListJSON.Code = 200
profitListJSON.ProfitList = models.GetPlatformProfitByMap(params)
profitListJSON.ProfitList = order.GetPlatformProfitByMap(params)
profitListJSON.TotalAmount = 0.00
profitListJSON.PlatformTotalProfit = 0.00

33
boss/controllers/loginController.go
View File

@@ -2,7 +2,8 @@ package controllers
import (
"boss/common"
"boss/models"
"boss/datas"
"boss/models/user"
"boss/utils"
"github.com/beego/beego/v2/adapter/validation"
"github.com/beego/beego/v2/core/logs"
@@ -23,7 +24,7 @@ func (c *LoginController) Login() {
passWD := c.GetString("passwd")
code := c.GetString("Code")
dataJSON := new(KeyDataJSON)
dataJSON := new(datas.KeyDataJSON)
valid := validation.Validation{}
@@ -38,7 +39,7 @@ func (c *LoginController) Login() {
dataJSON.Msg = "验证码不正确！"
}
userInfo := models.GetUserInfoByUserID(userID)
userInfo := user.GetUserInfoByUserID(userID)
if userInfo.UserId == "" {
dataJSON.Key = "userID"
@@ -54,8 +55,8 @@ func (c *LoginController) Login() {
} else if code != codeInterface.(string) {
dataJSON.Key = "code"
dataJSON.Msg = "验证码不正确！"
} else if userInfo.Status == "unactive" {
dataJSON.Key = "unactive"
} else if userInfo.Status == common.UNACTIVE {
dataJSON.Key = common.UNACTIVE
dataJSON.Msg = "用户已被冻结！"
} else if userInfo.Status == "del" {
dataJSON.Key = "del"
@@ -65,16 +66,16 @@ func (c *LoginController) Login() {
go func() {
userInfo.Ip = c.Ctx.Input.IP()
models.UpdateUserInfoIP(userInfo)
user.UpdateUserInfoIP(userInfo)
}()
if dataJSON.Key == "" {
c.SetSession("userID", userID)
c.DelSession("verifyCode")
_ = c.SetSession("userID", userID)
_ = c.DelSession("verifyCode")
}
c.Data["json"] = dataJSON
c.ServeJSON()
_ = c.ServeJSON()
}
/*
@@ -82,13 +83,13 @@ func (c *LoginController) Login() {
*/
func (c *LoginController) Logout() {
dataJSON := new(BaseDataJSON)
dataJSON := new(datas.BaseDataJSON)
c.DelSession("userID")
_ = c.DelSession("userID")
dataJSON.Code = 200
c.Data["json"] = dataJSON
c.ServeJSON()
_ = c.ServeJSON()
}
/*
@@ -99,8 +100,12 @@ func (c *LoginController) GetVerifyImg() {
if Image == nil || len(verifyCode) != common.VERIFY_CODE_LEN {
logs.Error("获取验证码图片失败！")
} else {
c.SetSession("verifyCode", verifyCode)
_ = c.SetSession("verifyCode", verifyCode)
}
logs.Info("验证码：", verifyCode)
Image.WriteTo(c.Ctx.ResponseWriter)
if Image == nil {
logs.Error("生成验证码失败！")
} else {
_, _ = Image.WriteTo(c.Ctx.ResponseWriter)
}
}

2
boss/controllers/pageController.go
View File

@@ -10,7 +10,6 @@
package controllers
import (
"fmt"
beego "github.com/beego/beego/v2/server/web"
)
@@ -19,7 +18,6 @@ type PageController struct {
}
func (c *PageController) Index() {
fmt.Println("dlfjldkjfldjfljljljlj")
c.TplName = "index.html"
}

76
boss/controllers/queryController.go
View File

@@ -10,60 +10,24 @@
package controllers
import (
"boss/common"
"boss/models"
controller "boss/supplier"
"fmt"
"github.com/beego/beego/v2/core/logs"
beego "github.com/beego/beego/v2/server/web"
"boss/service"
"github.com/beego/beego/v2/server/web"
"strings"
)
type SupplierQuery struct {
beego.Controller
}
func OrderQuery(bankOrderId string) string {
orderInfo := models.GetOrderByBankOrderId(bankOrderId)
if orderInfo.BankOrderId == "" || len(orderInfo.BankOrderId) == 0 {
logs.Error("不存在这样的订单，订单查询结束")
return "不存在这样的订单"
}
if orderInfo.Status != "" && orderInfo.Status != "wait" {
logs.Error(fmt.Sprintf("该订单=%s，已经处理完毕，", bankOrderId))
return "该订单已经处理完毕"
}
supplierCode := orderInfo.PayProductCode
supplier := controller.GetPaySupplierByCode(supplierCode)
flag := supplier.PayQuery(orderInfo)
if flag {
return "查询完毕，返回正确结果"
} else {
return "订单还在处理中"
}
web.Controller
}
func (c *SupplierQuery) SupplierOrderQuery() {
bankOrderId := strings.TrimSpace(c.GetString("bankOrderId"))
exist := models.BankOrderIdIsEixst(bankOrderId)
keyDataJSON := new(KeyDataJSON)
if !exist {
keyDataJSON.Msg = "该订单不存在"
}
se := new(service.QueryService)
keyDataJSON := se.SupplierOrderQuery(bankOrderId)
msg := OrderQuery(bankOrderId)
keyDataJSON.Msg = msg
c.Data["json"] = keyDataJSON
c.ServeJSON()
_ = c.ServeJSON()
}
/*
@@ -72,31 +36,9 @@ func (c *SupplierQuery) SupplierOrderQuery() {
func (c *SupplierQuery) SupplierPayForQuery() {
bankOrderId := strings.TrimSpace(c.GetString("bankOrderId"))
keyDataJSON := new(KeyDataJSON)
keyDataJSON.Code = 200
if bankOrderId == "" {
keyDataJSON.Code = -1
keyDataJSON.Msg = "不存在这样的代付订单"
} else {
payFor := models.GetPayForByBankOrderId(bankOrderId)
if payFor.RoadUid == "" {
keyDataJSON.Msg = "该代付订单没有对应的通道uid"
} else {
roadInfo := models.GetRoadInfoByRoadUid(payFor.RoadUid)
supplier := controller.GetPaySupplierByCode(roadInfo.ProductUid)
result, msg := supplier.PayForQuery(payFor)
keyDataJSON.Msg = msg
if result == common.PAYFOR_SUCCESS {
controller.PayForSuccess(payFor)
} else if result == common.PAYFOR_FAIL {
controller.PayForFail(payFor)
} else {
logs.Info("银行处理中")
}
}
}
se := new(service.QueryService)
keyDataJSON := se.SupplierPayForQuery(bankOrderId)
c.Data["json"] = keyDataJSON
c.ServeJSON()
_ = c.ServeJSON()
}

75
boss/controllers/sendNotifyMerchant.go
View File

@@ -1,75 +0,0 @@
/***************************************************
** @Desc : This file for ...
** @Time : 2019/12/8 22:15
** @Author : yuebin
** @File : send_notify_merchant
** @Last Modified by : yuebin
** @Last Modified time: 2019/12/8 22:15
** @Software: GoLand
****************************************************/
package controllers
import (
"boss/common"
"boss/models"
"fmt"
"github.com/beego/beego/v2/client/httplib"
"github.com/beego/beego/v2/core/logs"
beego "github.com/beego/beego/v2/server/web"
"strings"
)
type SendNotify struct {
beego.Controller
}
func (c *SendNotify) SendNotifyToMerchant() {
bankOrderId := strings.TrimSpace(c.GetString("bankOrderId"))
keyDataJSON := new(KeyDataJSON)
keyDataJSON.Code = -1
orderInfo := models.GetOrderByBankOrderId(bankOrderId)
if orderInfo.Status == common.WAIT {
keyDataJSON.Msg = "该订单不是成功状态，不能回调"
} else {
notifyInfo := models.GetNotifyInfoByBankOrderId(bankOrderId)
notifyUrl := notifyInfo.Url
logs.Info(fmt.Sprintf("boss管理后台手动触发订单回调，url=%s", notifyUrl))
req := httplib.Post(notifyUrl)
response, err := req.String()
if err != nil {
logs.Error("回调发送失败，fail：", err)
keyDataJSON.Msg = fmt.Sprintf("该订单回调发送失败，订单回调，fail：%s", err)
} else {
if !strings.Contains(strings.ToLower(response), "success") {
keyDataJSON.Msg = fmt.Sprintf("该订单回调发送成功，但是未返回success字段， 商户返回内容=%s", response)
} else {
keyDataJSON.Code = 200
keyDataJSON.Msg = fmt.Sprintf("该订单回调发送成功")
}
}
}
c.Data["json"] = keyDataJSON
c.ServeJSON()
}
func (c *SendNotify) SelfSendNotify() {
bankOrderId := strings.TrimSpace(c.GetString("bankOrderId"))
notifyInfo := models.GetNotifyInfoByBankOrderId(bankOrderId)
keyDataJSON := new(KeyDataJSON)
keyDataJSON.Code = 200
req := httplib.Post(notifyInfo.Url)
response, err := req.String()
if err != nil {
keyDataJSON.Msg = fmt.Sprintf("订单 bankOrderId=%s，已经发送回调出错：%s", bankOrderId, err)
} else {
keyDataJSON.Msg = fmt.Sprintf("订单 bankOrderId=%s，已经发送回调，商户返回内容：%s", bankOrderId, response)
}
c.Data["json"] = keyDataJSON
c.ServeJSON()
}

38
boss/controllers/sendNotifyMerchantController.go Normal file
View File

@@ -0,0 +1,38 @@
/***************************************************
** @Desc : This file for ...
** @Time : 2019/12/8 22:15
** @Author : yuebin
** @File : send_notify_merchant
** @Last Modified by : yuebin
** @Last Modified time: 2019/12/8 22:15
** @Software: GoLand
****************************************************/
package controllers
import (
"boss/service"
"github.com/beego/beego/v2/server/web"
"strings"
)
type SendNotify struct {
web.Controller
}
func (c *SendNotify) SendNotifyToMerchant() {
bankOrderId := strings.TrimSpace(c.GetString("bankOrderId"))
se := new(service.SendNotifyMerchantService)
keyDataJSON := se.SendNotifyToMerchant(bankOrderId)
c.Data["json"] = keyDataJSON
_ = c.ServeJSON()
}
func (c *SendNotify) SelfSendNotify() {
bankOrderId := strings.TrimSpace(c.GetString("bankOrderId"))
se := new(service.SendNotifyMerchantService)
keyDataJSON := se.SelfSendNotify(bankOrderId)
c.Data["json"] = keyDataJSON
_ = c.ServeJSON()
}

439
boss/controllers/updateController.go
View File

@@ -10,14 +10,11 @@
package controllers
import (
"boss/common"
"boss/models"
controller "boss/supplier"
"boss/datas"
"boss/models/user"
"boss/service"
"boss/utils"
"fmt"
"github.com/beego/beego/v2/adapter/validation"
"github.com/beego/beego/v2/core/logs"
"strconv"
"strings"
)
@@ -35,13 +32,13 @@ func (c *UpdateController) UpdatePassword() {
userID, ok := c.GetSession("userID").(string)
dataJSON := new(KeyDataJSON)
dataJSON := new(datas.KeyDataJSON)
dataJSON.Code = -1
if !ok || userID == "" {
dataJSON.Code = 404
dataJSON.Msg = "请重新登录!"
} else {
userInfo := models.GetUserInfoByUserID(userID)
userInfo := user.GetUserInfoByUserID(userID)
valid := validation.Validation{}
if userInfo.Passwd != utils.GetMD5Upper(oldPassword) {
dataJSON.Key = ".old-error"
@@ -62,10 +59,10 @@ func (c *UpdateController) UpdatePassword() {
dataJSON.Code = 200
dataJSON.Msg = "密码修改成功!"
//删除原先的session状态
c.DelSession("userID")
_ = c.DelSession("userID")
//更新数据库的密码
userInfo.Passwd = utils.GetMD5Upper(newPassword)
models.UpdateUserInfoPassword(userInfo)
user.UpdateUserInfoPassword(userInfo)
}
}
c.GenerateJSON(dataJSON)
@@ -76,62 +73,16 @@ func (c *UpdateController) UpdatePassword() {
*/
func (c *UpdateController) UpMenu() {
menuUid := c.GetString("menuUid")
menuInfo := models.GetMenuInfoByMenuUid(menuUid)
dataJSON := new(BaseDataJSON)
if menuInfo.MenuUid == "" {
dataJSON.Msg = "更改排列顺序失败"
dataJSON.Code = -1
} else {
exist := models.MenuOrderIsExists(menuInfo.MenuOrder - 1)
if !exist {
dataJSON.Msg = "已经是最高的顺序"
dataJSON.Code = -1
} else {
//如果他前面有菜单，那么交换他们的menuOrder
preMenuInfo := models.GetMenuInfoByMenuOrder(menuInfo.MenuOrder - 1)
menuInfo.MenuOrder = menuInfo.MenuOrder - 1
preMenuInfo.MenuOrder = preMenuInfo.MenuOrder + 1
preMenuInfo.UpdateTime = utils.GetBasicDateTime()
menuInfo.UpdateTime = utils.GetBasicDateTime()
//更新菜单表
models.UpdateMenuInfo(preMenuInfo)
models.UpdateMenuInfo(menuInfo)
//更新二级菜单表
SortSecondMenuOrder(preMenuInfo)
SortSecondMenuOrder(menuInfo)
dataJSON.Code = 200
}
}
se := new(service.UpdateService)
dataJSON := se.UpMenu(menuUid)
c.GenerateJSON(dataJSON)
}
func (c *UpdateController) DownMenu() {
menuUid := c.GetString("menuUid")
menuInfo := models.GetMenuInfoByMenuUid(menuUid)
dataJSON := new(BaseDataJSON)
if menuInfo.MenuUid == "" {
dataJSON.Msg = "更改排列顺序失败"
dataJSON.Code = -1
} else {
exist := models.MenuOrderIsExists(menuInfo.MenuOrder + 1)
if !exist {
dataJSON.Msg = "已经是最高的顺序"
dataJSON.Code = -1
} else {
//如果他前面有菜单，那么交换他们的menuOrder
lastMenuInfo := models.GetMenuInfoByMenuOrder(menuInfo.MenuOrder + 1)
menuInfo.MenuOrder = menuInfo.MenuOrder + 1
lastMenuInfo.MenuOrder = lastMenuInfo.MenuOrder - 1
lastMenuInfo.UpdateTime = utils.GetBasicDateTime()
menuInfo.UpdateTime = utils.GetBasicDateTime()
//更新菜单表
models.UpdateMenuInfo(lastMenuInfo)
models.UpdateMenuInfo(menuInfo)
//更新二级菜单表
SortSecondMenuOrder(lastMenuInfo)
SortSecondMenuOrder(menuInfo)
dataJSON.Code = 200
}
}
se := new(service.UpdateService)
dataJSON := se.DownMenu(menuUid)
c.GenerateJSON(dataJSON)
}
@@ -140,22 +91,9 @@ func (c *UpdateController) DownMenu() {
*/
func (c *UpdateController) UpSecondMenu() {
secondMenuUid := c.GetString("secondMenuUid")
secondMenuInfo := models.GetSecondMenuInfoBySecondMenuUid(secondMenuUid)
dataJSON := new(BaseDataJSON)
if secondMenuInfo.MenuOrder == 1 {
dataJSON.Code = -1
} else {
preSecondMenuInfo := models.GetSecondMenuInfoByMenuOrder(secondMenuInfo.MenuOrder-1, secondMenuInfo.FirstMenuUid)
preSecondMenuInfo.MenuOrder = preSecondMenuInfo.MenuOrder + 1
preSecondMenuInfo.UpdateTime = utils.GetBasicDateTime()
secondMenuInfo.MenuOrder = secondMenuInfo.MenuOrder - 1
secondMenuInfo.UpdateTime = utils.GetBasicDateTime()
//更新二级菜单项
models.UpdateSecondMenu(preSecondMenuInfo)
models.UpdateSecondMenu(secondMenuInfo)
se := new(service.UpdateService)
dataJSON := se.UpSecondMenu(secondMenuUid)
dataJSON.Code = 200
}
c.GenerateJSON(dataJSON)
}
@@ -164,41 +102,15 @@ func (c *UpdateController) UpSecondMenu() {
*/
func (c *UpdateController) DownSecondMenu() {
secondMenuUid := c.GetString("secondMenuUid")
secondMenuInfo := models.GetSecondMenuInfoBySecondMenuUid(secondMenuUid)
dataJSON := new(BaseDataJSON)
l := models.GetSecondMenuLenByFirstMenuUid(secondMenuInfo.FirstMenuUid)
if l == secondMenuInfo.MenuOrder {
dataJSON.Code = -1
} else {
lastSecondMenu := models.GetSecondMenuInfoByMenuOrder(secondMenuInfo.MenuOrder+1, secondMenuInfo.FirstMenuUid)
lastSecondMenu.MenuOrder = lastSecondMenu.MenuOrder - 1
lastSecondMenu.UpdateTime = utils.GetBasicDateTime()
secondMenuInfo.MenuOrder = secondMenuInfo.MenuOrder + 1
secondMenuInfo.UpdateTime = utils.GetBasicDateTime()
models.UpdateSecondMenu(lastSecondMenu)
models.UpdateSecondMenu(secondMenuInfo)
dataJSON.Code = 200
}
se := new(service.UpdateService)
dataJSON := se.DownSecondMenu(secondMenuUid)
c.GenerateJSON(dataJSON)
}
func (c *UpdateController) FreezeOperator() {
userId := strings.TrimSpace(c.GetString("operatorName"))
dataJSON := new(BaseDataJSON)
if models.UpdateStauts("unactive", userId) {
dataJSON.Code = 200
dataJSON.Msg = "冻结成功"
} else {
dataJSON.Code = -1
dataJSON.Msg = "冻结失败"
}
se := new(service.UpdateService)
dataJSON := se.FreezeOperator(userId)
c.GenerateJSON(dataJSON)
}
@@ -206,15 +118,9 @@ func (c *UpdateController) FreezeOperator() {
func (c *UpdateController) UnfreezeOperator() {
userId := strings.TrimSpace(c.GetString("operatorName"))
dataJSON := new(BaseDataJSON)
se := new(service.UpdateService)
dataJSON := se.UnfreezeOperator(userId)
if models.UpdateStauts("active", userId) {
dataJSON.Code = 200
dataJSON.Msg = "解冻成功"
} else {
dataJSON.Code = -1
dataJSON.Msg = "解冻失败"
}
c.GenerateJSON(dataJSON)
}
@@ -226,39 +132,8 @@ func (c *UpdateController) EditOperator() {
nick := strings.TrimSpace(c.GetString("nick"))
remark := strings.TrimSpace(c.GetString("remark"))
keyDataJSON := new(KeyDataJSON)
if (len(password) > 0 || len(changePassword) > 0) && password != changePassword {
keyDataJSON.Code = -1
keyDataJSON.Key = ".veritfy-operator-password-error"
keyDataJSON.Msg = "*2次密码输入不一致"
c.GenerateJSON(keyDataJSON)
}
if role == "" || role == "none" {
keyDataJSON.Code = -1
keyDataJSON.Key = ".change-operator-role-error"
keyDataJSON.Msg = "*角色不能为空"
c.GenerateJSON(keyDataJSON)
}
userInfo := models.GetUserInfoByUserID(userId)
if userInfo.UserId == "" {
keyDataJSON.Code = -2
keyDataJSON.Msg = "该用户不存在"
} else {
userInfo.UpdateTime = utils.GetBasicDateTime()
userInfo.Remark = remark
roleInfo := models.GetRoleByRoleUid(role)
userInfo.RoleName = roleInfo.RoleName
userInfo.Role = role
if len(password) > 0 && len(changePassword) > 0 && password == changePassword {
userInfo.Passwd = utils.GetMD5Upper(password)
}
userInfo.Nick = nick
models.UpdateUserInfo(userInfo)
keyDataJSON.Code = 200
}
se := new(service.UpdateService)
keyDataJSON := se.EditOperator(password, changePassword, role, userId, nick, remark)
c.GenerateJSON(keyDataJSON)
}
@@ -269,20 +144,9 @@ func (c *UpdateController) EditOperator() {
func (c *UpdateController) UpdateRoadStatus() {
roadUid := strings.TrimSpace(c.GetString("roadUid"))
dataJSON := new(BaseDataJSON)
dataJSON.Code = 200
se := new(service.UpdateService)
dataJSON := se.UpdateRoadStatus(roadUid)
roadInfo := models.GetRoadInfoByRoadUid(roadUid)
if roadInfo.Status == "active" {
roadInfo.Status = "unactive"
} else {
roadInfo.Status = "active"
}
if models.UpdateRoadInfo(roadInfo) {
dataJSON.Code = 200
} else {
dataJSON.Code = -1
}
c.GenerateJSON(dataJSON)
}
@@ -291,33 +155,9 @@ func (c *UpdateController) UpdateRoadStatus() {
*/
func (c *UpdateController) UpdateMerchantStatus() {
merchantUid := strings.TrimSpace(c.GetString("merchantUid"))
keyDataJSON := new(KeyDataJSON)
if merchantUid == "" {
keyDataJSON.Code = -1
c.GenerateJSON(keyDataJSON)
return
}
se := new(service.UpdateService)
keyDataJSON := se.UpdateMerchantStatus(merchantUid)
merchantInfo := models.GetMerchantByUid(merchantUid)
if merchantInfo.MerchantUid == "" {
keyDataJSON.Code = -1
c.GenerateJSON(keyDataJSON)
return
}
if merchantInfo.Status == "active" {
merchantInfo.Status = "unactive"
} else {
merchantInfo.Status = "active"
}
merchantInfo.UpdateTime = utils.GetBasicDateTime()
if models.UpdateMerchant(merchantInfo) {
keyDataJSON.Code = 200
} else {
keyDataJSON.Code = -1
}
c.GenerateJSON(keyDataJSON)
}
@@ -327,22 +167,9 @@ func (c *UpdateController) UpdateMerchantStatus() {
func (c *UpdateController) UpdateAccountStatus() {
accountUid := strings.TrimSpace(c.GetString("accountUid"))
accountInfo := models.GetAccountByUid(accountUid)
if accountInfo.Status == "active" {
accountInfo.Status = "unactive"
} else {
accountInfo.Status = "active"
}
accountInfo.UpdateTime = utils.GetBasicDateTime()
se := new(service.UpdateService)
dataJSON := se.UpdateAccountStatus(accountUid)
dataJSON := new(BaseDataJSON)
if models.UpdateAccount(accountInfo) {
dataJSON.Code = 200
dataJSON.Msg = "更新账户状态成功"
} else {
dataJSON.Code = -1
dataJSON.Msg = "更新账户状态失败"
}
c.GenerateJSON(dataJSON)
}
func (c *UpdateController) OperatorAccount() {
@@ -350,59 +177,16 @@ func (c *UpdateController) OperatorAccount() {
accountOperator := strings.TrimSpace(c.GetString("accountOperator"))
amount := strings.TrimSpace(c.GetString("amount"))
accountDataJSON := new(AccountDataJSON)
switch accountOperator {
case common.PLUS_AMOUNT:
case common.SUB_AMOUNT:
case common.FREEZE_AMOUNT:
case common.UNFREEZE_AMOUNT:
default:
accountDataJSON.Code = -1
}
a, err := strconv.ParseFloat(amount, 64)
if err != nil {
accountDataJSON.Msg = "处理金额输入有误"
}
if accountDataJSON.Code == -1 {
c.GenerateJSON(accountDataJSON)
return
}
msg, flag := models.OperatorAccount(accountUid, accountOperator, a)
if flag {
accountDataJSON.Code = 200
accountDataJSON.Msg = "处理成功，请检查对应账户信息"
accountDataJSON.AccountList = append(accountDataJSON.AccountList, models.GetAccountByUid(accountUid))
} else {
accountDataJSON.Code = -1
accountDataJSON.Msg = msg
}
se := new(service.UpdateService)
accountDataJSON := se.OperatorAccount(accountOperator, amount, accountUid)
c.GenerateJSON(accountDataJSON)
}
func (c *UpdateController) UpdateAgentStatus() {
agentUid := strings.TrimSpace(c.GetString("agentUid"))
agentInfo := models.GetAgentInfoByAgentUid(agentUid)
keyDataJSON := new(KeyDataJSON)
if agentInfo.AgentUid == "" {
keyDataJSON.Code = -1
c.GenerateJSON(keyDataJSON)
}
if agentInfo.Status == "active" {
agentInfo.Status = "unactive"
} else {
agentInfo.Status = "active"
}
agentInfo.UpdateTime = utils.GetBasicDateTime()
if models.UpdateAgentInfo(agentInfo) {
keyDataJSON.Code = 200
} else {
keyDataJSON.Code = -1
}
c.GenerateJSON(keyDataJSON)
se := new(service.UpdateService)
c.GenerateJSON(se.UpdateAgentStatus(agentUid))
}
func (c *UpdateController) ResetAgentPassword() {
@@ -410,32 +194,9 @@ func (c *UpdateController) ResetAgentPassword() {
newPassword := strings.TrimSpace(c.GetString("newPassword"))
newVertifyPassword := strings.TrimSpace(c.GetString("newVertifyPassword"))
keyDataJSON := new(KeyDataJSON)
keyDataJSON.Code = 200
if agentUid == "" {
keyDataJSON.Code = -2
} else if newPassword == "" {
keyDataJSON.Code = -1
keyDataJSON.Key = "#agent-login-password-error-reset"
keyDataJSON.Msg = " *新密码不能为空"
} else if newVertifyPassword != newPassword {
keyDataJSON.Code = -1
keyDataJSON.Key = "#agent-vertify-password-error-reset"
keyDataJSON.Msg = " *两次密码输入不一致"
}
se := new(service.UpdateService)
if keyDataJSON.Code != 200 {
c.GenerateJSON(keyDataJSON)
return
}
agentInfo := models.GetAgentInfoByAgentUid(agentUid)
agentInfo.UpdateTime = utils.GetBasicDateTime()
agentInfo.AgentPassword = utils.GetMD5Upper(newPassword)
if !models.UpdateAgentInfo(agentInfo) {
keyDataJSON.Code = -1
}
c.GenerateJSON(keyDataJSON)
c.GenerateJSON(se.ResetAgentPassword(agentUid, newPassword, newVertifyPassword))
}
/*
@@ -447,41 +208,9 @@ func (c *UpdateController) ChoosePayForRoad() {
remark := strings.TrimSpace(c.GetString("remark"))
confirmType := strings.TrimSpace(c.GetString("confirmType"))
keyDataJSON := new(KeyDataJSON)
keyDataJSON.Code = 200
se := new(service.UpdateService)
if confirmType == common.PAYFOR_ROAD && roadName == "" {
keyDataJSON.Msg = "打款通道不能为空"
keyDataJSON.Code = -1
c.GenerateJSON(keyDataJSON)
return
}
payForInfo := models.GetPayForByBankOrderId(bankOrderId)
roadInfo := models.GetRoadInfoByName(roadName)
if payForInfo.Status != common.PAYFOR_COMFRIM {
keyDataJSON.Msg = "结算状态错误，请刷新后确认"
} else {
payForInfo.UpdateTime = utils.GetBasicDateTime()
payForInfo.GiveType = confirmType
if confirmType == common.PAYFOR_REFUSE {
//拒绝打款
payForInfo.Status = common.PAYFOR_FAIL
} else {
payForInfo.Status = common.PAYFOR_SOLVING
}
payForInfo.RoadUid = roadInfo.RoadUid
payForInfo.RoadName = roadInfo.RoadName
payForInfo.Remark = remark
if !models.ForUpdatePayFor(payForInfo) {
keyDataJSON.Code = -1
keyDataJSON.Msg = "更新代付记录失败"
}
}
c.GenerateJSON(keyDataJSON)
c.GenerateJSON(se.ChoosePayForRoad(confirmType, roadName, bankOrderId, remark))
}
/*
@@ -491,102 +220,16 @@ func (c *UpdateController) ResultPayFor() {
resultType := strings.TrimSpace(c.GetString("resultType"))
bankOrderId := strings.TrimSpace(c.GetString("bankOrderId"))
keyDataJSON := new(KeyDataJSON)
keyDataJSON.Code = 200
se := new(service.UpdateService)
if resultType == "" || bankOrderId == "" {
keyDataJSON.Code = -1
keyDataJSON.Msg = "提交的数据有误"
c.GenerateJSON(keyDataJSON)
return
}
payFor := models.GetPayForByBankOrderId(bankOrderId)
if payFor.Type == common.SELF_HELP {
//如果是管理员在后台提现，不用做任何的商户减款,只需要更新代付订单状态
payFor.UpdateTime = utils.GetBasicDateTime()
payFor.Status = resultType
if !models.ForUpdatePayFor(payFor) {
keyDataJSON.Code = -1
keyDataJSON.Msg = "系统处理失败"
}
c.GenerateJSON(keyDataJSON)
return
}
if payFor.Status == common.PAYFOR_FAIL || payFor.Status == common.PAYFOR_SUCCESS {
logs.Error(fmt.Sprintf("该代付订单=%s，状态有误....", bankOrderId))
keyDataJSON.Code = -1
keyDataJSON.Msg = "订单状态有误，请刷新重新判断"
c.GenerateJSON(keyDataJSON)
return
}
if resultType == common.PAYFOR_FAIL {
//处理代付失败的逻辑，减去相应的代付冻结金额
if !controller.PayForFail(payFor) {
logs.Error(fmt.Sprintf("商户uid=%s,处理代付失败逻辑出错", payFor.MerchantUid))
keyDataJSON.Msg = "代付失败逻辑，处理失败"
keyDataJSON.Code = -1
}
} else if resultType == common.PAYFOR_SUCCESS {
//代付成功，减去相应的代付冻结金额，并且余额减掉，可用金额减掉
if !controller.PayForSuccess(payFor) {
logs.Error(fmt.Sprintf("商户uid=%s,处理代付成功逻辑出错", payFor.MerchantUid))
keyDataJSON.Msg = "代付成功逻辑，处理失败"
keyDataJSON.Code = -1
}
}
if keyDataJSON.Code == 200 {
keyDataJSON.Msg = "处理成功"
}
c.GenerateJSON(keyDataJSON)
c.GenerateJSON(se.ResultPayFor(resultType, bankOrderId))
}
func (c *UpdateController) UpdateOrderStatus() {
bankOrderId := strings.TrimSpace(c.GetString("bankOrderId"))
solveType := strings.TrimSpace(c.GetString("solveType"))
keyDataJSON := new(KeyDataJSON)
orderInfo := models.GetOrderByBankOrderId(bankOrderId)
if orderInfo.BankOrderId == "" {
logs.Error("该订单不存在,bankOrderId=", bankOrderId)
keyDataJSON.Code = -1
} else {
paySolve := new(controller.PaySolveController)
flag := false
switch solveType {
case common.SUCCESS:
flag = paySolve.SolvePaySuccess(bankOrderId, orderInfo.FactAmount, common.SUCCESS)
case common.FAIL:
flag = paySolve.SolvePayFail(orderInfo, common.FAIL)
case common.FREEZE_AMOUNT:
//将这笔订单进行冻结
flag = paySolve.SolveOrderFreeze(bankOrderId)
case common.UNFREEZE_AMOUNT:
//将这笔订单金额解冻
flag = paySolve.SolveOrderUnfreeze(bankOrderId)
case common.REFUND:
if orderInfo.Status == common.SUCCESS {
flag = paySolve.SolveRefund(bankOrderId)
}
case common.ORDERROLL:
if orderInfo.Status == common.SUCCESS {
flag = paySolve.SolveOrderRoll(bankOrderId)
}
default:
logs.Error("不存在这样的处理类型")
}
if flag {
keyDataJSON.Code = 200
} else {
keyDataJSON.Code = -1
}
}
se := new(service.UpdateService)
c.GenerateJSON(keyDataJSON)
c.GenerateJSON(se.UpdateOrderStatus(bankOrderId, solveType))
}