diff --git a/conf/app.conf b/conf/app.conf index 3cedb24..74982fe 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -1,35 +1,35 @@ appname = jhboss httpport = 12306 runmode = dev -HTTPAddr = localhost +HTTPAddr = 0.0.0.0 sessionon = true -# sessionprovider = redis -# sessiongcmaxlifetime = 86400 -# sessioncookielifetime = 86400 -# sessionProviderConfig = 127.0.0.1:6379,100,astaxie +sessionprovider = redis +sessiongcmaxlifetime = 86400 +sessioncookielifetime = 86400 +sessionProviderConfig = redis:6379,100,astaxie [mysql] -dbhost = localhost +dbhost = mysql dbport = 3306 dbuser = root dbpasswd = 123456 -dbbase = juhe_pay +dbbase = kami [redis] -host = localhost +host = redis port = 6379 password = '' db = 10 [gateway] -host = http://localhost:12309/ +host = http://kami_gateway:12309/ [portal] -host = http://localhost:5173 +host = http://127.0.0.1:12400 [testExtraLink] ; 测试连接 -host = http://localhost:12305 +host = http://127.0.0.1:12305 [secret] key = thisis32bitlongpassphraseimusing diff --git a/Dockerfile b/deploy/Dockerfile similarity index 90% rename from Dockerfile rename to deploy/Dockerfile index ce8e9bf..0e2221a 100644 --- a/Dockerfile +++ b/deploy/Dockerfile @@ -4,7 +4,7 @@ FROM golang:1.22 AS builder ARG USE_PROXY WORKDIR /build -COPY ./ /build/ +COPY .. /build/ # 根据USE_PROXY参数设置环境变量 RUN if [ "$USE_PROXY" = "1" ]; then \ @@ -40,8 +40,9 @@ COPY --from=builder /build/main /app/ COPY --from=builder /build/conf/ /app/conf/ COPY --from=builder /build/views/ /app/views/ COPY --from=builder /build/static/ /app/static/ +COPY --from=builder /build/deploy/wait-for-it.sh /app/ # 启动服务 -CMD ["./main"] +CMD ["sh", "wait-for-it.sh", "mysql:3306" , "./main"] EXPOSE 12306 \ No newline at end of file diff --git a/deploy/docker-compose-local.yaml b/deploy/docker-compose-local.yaml new file mode 100644 index 0000000..2dc0735 --- /dev/null +++ b/deploy/docker-compose-local.yaml @@ -0,0 +1,19 @@ +services: + boss_kami: + build: + context: .. + dockerfile: ./deploy/Dockerfile + args: + - USE_PROXY=1 + container_name: kami_boss + image: kami_boss:latest + ports: + - "12306:12306" + networks: + - 1panel-network + labels: + createdBy: Developer + +networks: + 1panel-network: + external: true diff --git a/docker-compose.yaml b/deploy/docker-compose.yaml similarity index 87% rename from docker-compose.yaml rename to deploy/docker-compose.yaml index edee502..8a47752 100644 --- a/docker-compose.yaml +++ b/deploy/docker-compose.yaml @@ -1,6 +1,8 @@ services: kami_boss: build: + context: .. + dockerfile: ./deploy/Dockerfile args: - USE_PROXY=1 container_name: kami_boss diff --git a/deploy/wait-for-it.sh b/deploy/wait-for-it.sh new file mode 100644 index 0000000..306852e --- /dev/null +++ b/deploy/wait-for-it.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# $1 = host to connect to (e.g. localhost) +# $2 = port to connect to (e.g. 3306) +# $3 = timeout in seconds, after which the script will exit with status 1 (optional) +# Example usage: +# wait-for-it.sh localhost:3306 -- /usr/bin/python app.py +# +set -x +host="${1%:*}" +port="${1#*:}" +shift +# shellcheck disable=SC2124 +cmd="$@" +until nc -z "$host" "$port"; do + >&2 echo "Waiting for $host:$port to be available..." + sleep 1 +done +>&2 echo "$host:$port is available!" +exec "$cmd" \ No newline at end of file diff --git a/docker-compose-test.yaml b/docker-compose-test.yaml deleted file mode 100644 index b5b08da..0000000 --- a/docker-compose-test.yaml +++ /dev/null @@ -1,20 +0,0 @@ -services: - web: - build: - context: . - container_name: kami_boss_test - image: kami_boss_test:0.11 - restart: always - ports: - - "22306:12306" - volumes: - - /data/kami/boss/conf/:/app/conf/ - - /data/kami/boss/logs/:/app/logs/ - networks: - - 1panel-network - labels: - createdBy: Developer - -networks: - 1panel-network: - external: true diff --git a/internal/common/supplier.go b/internal/common/supplier.go index f6d0643..a064444 100644 --- a/internal/common/supplier.go +++ b/internal/common/supplier.go @@ -2,12 +2,13 @@ package common // 添加新的上游通道时，需要添加这里 var supplierCode2Name = map[string]string{ - "KF": "快付支付", - "WEIXIN": "官方微信", - "ALIPAY": "官方支付宝", - "DAILI": "代丽支付", - "APPLE": "苹果充值卡", - "MF178": "蜜蜂178卡密", + //"KF": "快付支付", + //"WEIXIN": "官方微信", + //"ALIPAY": "官方支付宝", + //"DAILI": "代丽支付", + "APPLE": "苹果充值卡", + "MF178": "蜜蜂178卡密", + "TMALLGAME": "天猫游戏充值", } func GetSupplierMap() map[string]string { diff --git a/internal/controllers/addController.go b/internal/controllers/addController.go index 16e2812..23f2c55 100644 --- a/internal/controllers/addController.go +++ b/internal/controllers/addController.go @@ -5,7 +5,7 @@ import ( "boss/internal/datas" "boss/internal/models/merchant" "boss/internal/models/payfor" - road2 "boss/internal/models/road" + "boss/internal/models/road" "boss/internal/models/system" "boss/internal/service" "strconv" @@ -130,6 +130,7 @@ func (c *AddController) AddRoad() { params := strings.TrimSpace(c.GetString("params")) productCode := strings.TrimSpace(c.GetString("productCode")) paymentHtml := strings.TrimSpace(c.GetString("paymentHtml")) + transactionType := strings.TrimSpace(c.GetString("transactionType")) se := new(service.AddService) dataJSON := se.AddRoad( @@ -148,8 +149,8 @@ func (c *AddController) AddRoad() { params, productCode, paymentHtml, + transactionType, ) - c.GenerateJSON(dataJSON) } @@ -307,8 +308,8 @@ func (c *AddController) AddMerchantPayType() { merchantDeployInfo.LoanDays = i merchantDeployInfo.UnfreezeHour = j merchantDeployInfo.RollRoadName = rollPoolRoad - roadInfo := road2.GetRoadInfoByName(singleRoad) - rollPoolInfo := road2.GetRoadPoolByName(rollPoolRoad) + roadInfo := road.GetRoadInfoByName(singleRoad) + rollPoolInfo := road.GetRoadPoolByName(rollPoolRoad) merchantDeployInfo.SingleRoadUid = roadInfo.RoadUid merchantDeployInfo.RollRoadCode = rollPoolInfo.RoadPoolCode merchantDeployInfo.CreateTime = time.Now() diff --git a/internal/controllers/getController.go b/internal/controllers/getController.go index c26d73c..aa9d9b7 100644 --- a/internal/controllers/getController.go +++ b/internal/controllers/getController.go @@ -1,16 +1,16 @@ package controllers import ( - common2 "boss/internal/common" + "boss/internal/common" "boss/internal/datas" - accounts2 "boss/internal/models/accounts" + "boss/internal/models/accounts" "boss/internal/models/agent" - merchant2 "boss/internal/models/merchant" + "boss/internal/models/merchant" "boss/internal/models/notify" - order2 "boss/internal/models/order" + "boss/internal/models/order" "boss/internal/models/payfor" - road2 "boss/internal/models/road" - system2 "boss/internal/models/system" + "boss/internal/models/road" + "boss/internal/models/system" "boss/internal/models/user" "boss/internal/service" "fmt" @@ -67,7 +67,7 @@ func (c *GetController) GetMenu() { params := make(map[string]string) params["first_menu__icontains"] = firstMenuSearch - c.GetCutPage(system2.GetMenuLenByMap(params)) + c.GetCutPage(system.GetMenuLenByMap(params)) menuDataJSON := new(datas.MenuDataJSON) menuDataJSON.DisplayCount = c.DisplayCount @@ -76,15 +76,15 @@ func (c *GetController) GetMenu() { if c.Offset < 0 { menuDataJSON.Code = -1 - menuDataJSON.MenuList = make([]system2.MenuInfo, 0) + menuDataJSON.MenuList = make([]system.MenuInfo, 0) c.GenerateJSON(menuDataJSON) return } - menuInfoList := system2.GetMenuOffsetByMap(params, c.DisplayCount, c.Offset) - sort.Sort(system2.MenuInfoSlice(menuInfoList)) + menuInfoList := system.GetMenuOffsetByMap(params, c.DisplayCount, c.Offset) + sort.Sort(system.MenuInfoSlice(menuInfoList)) for i, m := range menuInfoList { - secondMenuInfoList := system2.GetSecondMenuListByFirstMenuUid(m.MenuUid) + secondMenuInfoList := system.GetSecondMenuListByFirstMenuUid(m.MenuUid) smenus := "" for j := 0; j < len(secondMenuInfoList); j++ { smenus += secondMenuInfoList[j].SecondMenu @@ -108,14 +108,14 @@ func (c *GetController) GetMenu() { func (c *GetController) GetFirstMenu() { menuDataJSON := new(datas.MenuDataJSON) - menuList := system2.GetMenuAll() + menuList := system.GetMenuAll() if len(menuList) == 0 { menuDataJSON.Code = -1 } else { menuDataJSON.Code = 200 } - sort.Sort(system2.MenuInfoSlice(menuList)) + sort.Sort(system.MenuInfoSlice(menuList)) menuDataJSON.MenuList = menuList c.GenerateJSON(menuDataJSON) } @@ -129,7 +129,7 @@ func (c *GetController) GetSecondMenu() { params := make(map[string]string) params["first_menu__icontains"] = firstMenuSearch params["second_menu__icontains"] = secondMenuSearch - l := system2.GetSecondMenuLenByMap(params) + l := system.GetSecondMenuLenByMap(params) c.GetCutPage(l) @@ -141,13 +141,13 @@ func (c *GetController) GetSecondMenu() { secondMenuDataJSON.TotalPage = c.TotalPage if c.Offset < 0 { - secondMenuDataJSON.SecondMenuList = make([]system2.SecondMenuInfo, 0) + secondMenuDataJSON.SecondMenuList = make([]system.SecondMenuInfo, 0) c.GenerateJSON(secondMenuDataJSON) return } - secondMenuList := system2.GetSecondMenuByMap(params, c.DisplayCount, c.Offset) - sort.Sort(system2.SecondMenuSlice(secondMenuList)) + secondMenuList := system.GetSecondMenuByMap(params, c.DisplayCount, c.Offset) + sort.Sort(system.SecondMenuSlice(secondMenuList)) secondMenuDataJSON.SecondMenuList = secondMenuList secondMenuDataJSON.StartIndex = c.Offset @@ -163,7 +163,7 @@ func (c *GetController) GetSecondMenus() { secondMenuDataJSON := new(datas.SecondMenuDataJSON) - secondMenuList := system2.GetSecondMenuListByFirstMenuUid(firstMenuUid) + secondMenuList := system.GetSecondMenuListByFirstMenuUid(firstMenuUid) secondMenuDataJSON.Code = 200 secondMenuDataJSON.SecondMenuList = secondMenuList @@ -174,12 +174,12 @@ func (c *GetController) GetOneMenu() { menuUid := c.GetString("menuUid") dataJSON := new(datas.MenuDataJSON) - menuInfo := system2.GetMenuInfoByMenuUid(menuUid) + menuInfo := system.GetMenuInfoByMenuUid(menuUid) if menuInfo.MenuUid == "" { dataJSON.Code = -1 dataJSON.Msg = "该菜单项不存在" } else { - dataJSON.MenuList = make([]system2.MenuInfo, 0) + dataJSON.MenuList = make([]system.MenuInfo, 0) dataJSON.MenuList = append(dataJSON.MenuList, menuInfo) dataJSON.Code = 200 } @@ -195,7 +195,7 @@ func (c *GetController) GetPowerItem() { params["power_uid__icontains"] = powerID params["power_item_icontains"] = powerItem - l := system2.GetPowerItemLenByMap(params) + l := system.GetPowerItemLenByMap(params) c.GetCutPage(l) @@ -206,14 +206,14 @@ func (c *GetController) GetPowerItem() { powerItemDataJSON.TotalPage = c.TotalPage if c.Offset < 0 { - powerItemDataJSON.PowerItemList = make([]system2.PowerInfo, 0) + powerItemDataJSON.PowerItemList = make([]system.PowerInfo, 0) c.GenerateJSON(powerItemDataJSON) return } powerItemDataJSON.StartIndex = c.Offset - powerItemList := system2.GetPowerItemByMap(params, c.DisplayCount, c.Offset) - sort.Sort(system2.PowerInfoSlice(powerItemList)) + powerItemList := system.GetPowerItemByMap(params, c.DisplayCount, c.Offset) + sort.Sort(system.PowerInfoSlice(powerItemList)) powerItemDataJSON.PowerItemList = powerItemList c.GenerateJSON(powerItemDataJSON) @@ -225,7 +225,7 @@ func (c *GetController) GetRole() { params := make(map[string]string) params["role_name__icontains"] = roleName - l := system2.GetRoleLenByMap(params) + l := system.GetRoleLenByMap(params) c.GetCutPage(l) @@ -236,18 +236,18 @@ func (c *GetController) GetRole() { roleInfoDataJSON.TotalPage = c.TotalPage if c.Offset < 0 { - roleInfoDataJSON.RoleInfoList = make([]system2.RoleInfo, 0) + roleInfoDataJSON.RoleInfoList = make([]system.RoleInfo, 0) c.GenerateJSON(roleInfoDataJSON) return } roleInfoDataJSON.StartIndex = c.Offset - roleInfoDataJSON.RoleInfoList = system2.GetRoleByMap(params, c.DisplayCount, c.Offset) + roleInfoDataJSON.RoleInfoList = system.GetRoleByMap(params, c.DisplayCount, c.Offset) c.GenerateJSON(roleInfoDataJSON) } func (c *GetController) GetAllRole() { roleInfoDataJSON := new(datas.RoleInfoDataJSON) - roleInfoList := system2.GetRole() + roleInfoList := system.GetRole() fmt.Println(roleInfoList) if len(roleInfoList) == 0 { roleInfoDataJSON.Code = -1 @@ -260,13 +260,13 @@ func (c *GetController) GetAllRole() { func (c *GetController) GetDeployTree() { roleUid := strings.TrimSpace(c.GetString("roleUid")) - roleInfo := system2.GetRoleByRoleUid(roleUid) + roleInfo := system.GetRoleByRoleUid(roleUid) - allFirstMenu := system2.GetMenuAll() - sort.Sort(system2.MenuInfoSlice(allFirstMenu)) - allSecondMenu := system2.GetSecondMenuList() - sort.Sort(system2.SecondMenuSlice(allSecondMenu)) - allPower := system2.GetPower() + allFirstMenu := system.GetMenuAll() + sort.Sort(system.MenuInfoSlice(allFirstMenu)) + allSecondMenu := system.GetSecondMenuList() + sort.Sort(system.SecondMenuSlice(allSecondMenu)) + allPower := system.GetPower() deployTreeJSON := new(datas.DeployTreeJSON) deployTreeJSON.Code = 200 @@ -336,7 +336,7 @@ func (c *GetController) GetEditOperator() { userInfo := user.GetUserInfoByUserID(userId) fmt.Println(userInfo) editOperatorDataJSON.OperatorList = append(editOperatorDataJSON.OperatorList, userInfo) - editOperatorDataJSON.RoleList = system2.GetRole() + editOperatorDataJSON.RoleList = system.GetRole() editOperatorDataJSON.Code = 200 c.GenerateJSON(editOperatorDataJSON) @@ -347,7 +347,7 @@ func (c *GetController) GetBankCard() { params := make(map[string]string) params["account_name__icontains"] = accountNameSearch - l := system2.GetBankCardLenByMap(params) + l := system.GetBankCardLenByMap(params) c.GetCutPage(l) bankCardDataJSON := new(datas.BankCardDataJSON) @@ -357,19 +357,19 @@ func (c *GetController) GetBankCard() { bankCardDataJSON.TotalPage = c.TotalPage if c.Offset < 0 { - bankCardDataJSON.BankCardInfoList = make([]system2.BankCardInfo, 0) + bankCardDataJSON.BankCardInfoList = make([]system.BankCardInfo, 0) c.GenerateJSON(bankCardDataJSON) return } bankCardDataJSON.StartIndex = c.Offset - bankCardDataJSON.BankCardInfoList = system2.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 := system2.GetBankCardByUid(uid) + bankCardInfo := system.GetBankCardByUid(uid) bankCardDataJSON := new(datas.BankCardDataJSON) bankCardDataJSON.Code = -1 @@ -396,7 +396,7 @@ func (c *GetController) GetRoad() { params["road_uid"] = roadUid params["pay_type"] = payType - l := road2.GetRoadLenByMap(params) + l := road.GetRoadLenByMap(params) c.GetCutPage(l) roadDataJSON := new(datas.RoadDataJSON) @@ -406,14 +406,14 @@ func (c *GetController) GetRoad() { roadDataJSON.TotalPage = c.TotalPage if c.Offset < 0 { - roadDataJSON.RoadInfoList = make([]road2.RoadInfo, 0) + roadDataJSON.RoadInfoList = make([]road.RoadInfo, 0) c.GenerateJSON(roadDataJSON) return } roadDataJSON.StartIndex = c.Offset - roadDataJSON.RoadInfoList = road2.GetRoadInfoByMap(params, c.DisplayCount, c.Offset) - roadDataJSON.RoadPool = road2.GetRoadPoolByRoadPoolCode(roadPoolCode) + roadDataJSON.RoadInfoList = road.GetRoadInfoByMap(params, c.DisplayCount, c.Offset) + roadDataJSON.RoadPool = road.GetRoadPoolByRoadPoolCode(roadPoolCode) c.GenerateJSON(roadDataJSON) } @@ -423,7 +423,7 @@ func (c *GetController) GetAllRoad() { params["road_name__icontains"] = roadName roadDataJSON := new(datas.RoadDataJSON) - roadInfoList := road2.GetAllRoad(params) + roadInfoList := road.GetAllRoad(params) roadDataJSON.Code = 200 roadDataJSON.RoadInfoList = roadInfoList @@ -434,7 +434,7 @@ func (c *GetController) GetAllRoad() { func (c *GetController) GetOneRoad() { roadUid := strings.TrimSpace(c.GetString("roadUid")) - roadInfo := road2.GetRoadInfoByRoadUid(roadUid) + roadInfo := road.GetRoadInfoByRoadUid(roadUid) roadDataJSON := new(datas.RoadDataJSON) roadDataJSON.Code = -1 @@ -442,7 +442,7 @@ func (c *GetController) GetOneRoad() { roadDataJSON.RoadInfoList = append(roadDataJSON.RoadInfoList, roadInfo) roadDataJSON.Code = 200 } else { - roadDataJSON.RoadInfoList = make([]road2.RoadInfo, 0) + roadDataJSON.RoadInfoList = make([]road.RoadInfo, 0) } c.GenerateJSON(roadDataJSON) @@ -456,7 +456,7 @@ func (c *GetController) GetRoadPool() { params["road_pool_name__icontains"] = roadPoolName params["road_pool_code__icontains"] = roadPoolCode - l := road2.GetRoadPoolLenByMap(params) + l := road.GetRoadPoolLenByMap(params) c.GetCutPage(l) roadPoolDataJSON := new(datas.RoadPoolDataJSON) @@ -466,13 +466,13 @@ func (c *GetController) GetRoadPool() { roadPoolDataJSON.TotalPage = c.TotalPage if c.Offset < 0 { - roadPoolDataJSON.RoadPoolInfoList = make([]road2.RoadPoolInfo, 0) + roadPoolDataJSON.RoadPoolInfoList = make([]road.RoadPoolInfo, 0) c.GenerateJSON(roadPoolDataJSON) return } roadPoolDataJSON.StartIndex = c.Offset - roadPoolDataJSON.RoadPoolInfoList = road2.GetRoadPoolByMap(params, c.DisplayCount, c.Offset) + roadPoolDataJSON.RoadPoolInfoList = road.GetRoadPoolByMap(params, c.DisplayCount, c.Offset) c.GenerateJSON(roadPoolDataJSON) } @@ -483,7 +483,7 @@ func (c *GetController) GetAllRollPool() { roadPoolDataJSON := new(datas.RoadPoolDataJSON) roadPoolDataJSON.Code = 200 - roadPoolDataJSON.RoadPoolInfoList = road2.GetAllRollPool(params) + roadPoolDataJSON.RoadPoolInfoList = road.GetAllRollPool(params) c.GenerateJSON(roadPoolDataJSON) } @@ -495,7 +495,7 @@ func (c *GetController) GetMerchant() { params["merchant_name__icontains"] = merchantName params["merchant_uid__icontains"] = merchantNo - l := merchant2.GetMerchantLenByMap(params) + l := merchant.GetMerchantLenByMap(params) c.GetCutPage(l) merchantDataJSON := new(datas.MerchantDataJSON) @@ -505,20 +505,20 @@ func (c *GetController) GetMerchant() { merchantDataJSON.TotalPage = c.TotalPage if c.Offset < 0 { - merchantDataJSON.MerchantList = make([]merchant2.MerchantInfo, 0) + merchantDataJSON.MerchantList = make([]merchant.MerchantInfo, 0) c.GenerateJSON(merchantDataJSON) return } merchantDataJSON.StartIndex = c.Offset - merchantDataJSON.MerchantList = merchant2.GetMerchantListByMap(params, c.DisplayCount, c.Offset) + merchantDataJSON.MerchantList = merchant.GetMerchantListByMap(params, c.DisplayCount, c.Offset) c.GenerateJSON(merchantDataJSON) } func (c *GetController) GetAllMerchant() { merchantDataJSON := new(datas.MerchantDataJSON) merchantDataJSON.Code = 200 - merchantDataJSON.MerchantList = merchant2.GetAllMerchant() + merchantDataJSON.MerchantList = merchant.GetAllMerchant() c.GenerateJSON(merchantDataJSON) } @@ -532,7 +532,7 @@ func (c *GetController) GetOneMerchant() { return } - merchantInfo := merchant2.GetMerchantByUid(merchantUid) + merchantInfo := merchant.GetMerchantByUid(merchantUid) merchantDataJSON.Code = 200 merchantDataJSON.MerchantList = append(merchantDataJSON.MerchantList, merchantInfo) @@ -545,7 +545,7 @@ func (c *GetController) GetOneMerchantDeploy() { merchantDeployDataJSON := new(datas.MerchantDeployDataJSON) - merchantDeployInfo := merchant2.GetMerchantDeployByUidAndPayType(merchantNo, payType) + merchantDeployInfo := merchant.GetMerchantDeployByUidAndPayType(merchantNo, payType) if merchantDeployInfo.Status == "active" { merchantDeployDataJSON.Code = 200 @@ -562,7 +562,7 @@ func (c *GetController) GetAllAccount() { accountDataJSON := new(datas.AccountDataJSON) accountDataJSON.Code = 200 - accountDataJSON.AccountList = accounts2.GetAllAccount() + accountDataJSON.AccountList = accounts.GetAllAccount() c.GenerateJSON(accountDataJSON) } @@ -575,7 +575,7 @@ func (c *GetController) GetAccount() { params["account_name__icontains"] = accountName params["account_uid_icontains"] = accountUid - l := accounts2.GetAccountLenByMap(params) + l := accounts.GetAccountLenByMap(params) c.GetCutPage(l) accountDataJSON := new(datas.AccountDataJSON) @@ -585,13 +585,13 @@ func (c *GetController) GetAccount() { accountDataJSON.TotalPage = c.TotalPage if c.Offset < 0 { - accountDataJSON.AccountList = make([]accounts2.AccountInfo, 0) + accountDataJSON.AccountList = make([]accounts.AccountInfo, 0) c.GenerateJSON(accountDataJSON) return } accountDataJSON.StartIndex = c.Offset - accountDataJSON.AccountList = accounts2.GetAccountByMap(params, c.DisplayCount, c.Offset) + accountDataJSON.AccountList = accounts.GetAccountByMap(params, c.DisplayCount, c.Offset) c.GenerateJSON(accountDataJSON) } @@ -601,7 +601,7 @@ func (c *GetController) GetOneAccount() { //new一个accountDataJSON结构体对象，用来做jsonp返回 accountDataJSON := new(datas.AccountDataJSON) //用accountuid作为过滤字段，从数据库中读取一条信息 - accountInfo := accounts2.GetAccountByUid(accountUid) + accountInfo := accounts.GetAccountByUid(accountUid) //code初始值为200 accountDataJSON.Code = 200 //将从数据库读出来的数据插入到accountList数组中 @@ -619,13 +619,13 @@ func (c *GetController) GetAccountHistory() { switch operatorType { case "plus-amount": - operatorType = common2.PLUS_AMOUNT + operatorType = common.PLUS_AMOUNT case "sub-amount": - operatorType = common2.SUB_AMOUNT + operatorType = common.SUB_AMOUNT case "freeze-amount": - operatorType = common2.FREEZE_AMOUNT + operatorType = common.FREEZE_AMOUNT case "unfreeze-amount": - operatorType = common2.UNFREEZE_AMOUNT + operatorType = common.UNFREEZE_AMOUNT } params := make(map[string]string) params["account_name__icontains"] = accountName @@ -634,7 +634,7 @@ func (c *GetController) GetAccountHistory() { params["create_time__gte"] = startTime params["create_time__lte"] = endTime - l := accounts2.GetAccountHistoryLenByMap(params) + l := accounts.GetAccountHistoryLenByMap(params) c.GetCutPage(l) accountHistoryDataJSON := new(datas.AccountHistoryDataJSON) @@ -644,13 +644,13 @@ func (c *GetController) GetAccountHistory() { accountHistoryDataJSON.TotalPage = c.TotalPage if c.Offset < 0 { - accountHistoryDataJSON.AccountHistoryList = make([]accounts2.AccountHistoryInfo, 0) + accountHistoryDataJSON.AccountHistoryList = make([]accounts.AccountHistoryInfo, 0) c.GenerateJSON(accountHistoryDataJSON) return } accountHistoryDataJSON.StartIndex = c.Offset - accountHistoryDataJSON.AccountHistoryList = accounts2.GetAccountHistoryByMap(params, c.DisplayCount, c.Offset) + accountHistoryDataJSON.AccountHistoryList = accounts.GetAccountHistoryByMap(params, c.DisplayCount, c.Offset) c.GenerateJSON(accountHistoryDataJSON) } @@ -692,7 +692,7 @@ func (c *GetController) GetAllAgent() { } func (c *GetController) GetProduct() { - supplierCode2Name := common2.GetSupplierMap() + supplierCode2Name := common.GetSupplierMap() productDataJSON := new(datas.ProductDataJSON) productDataJSON.Code = 200 productDataJSON.ProductMap = supplierCode2Name @@ -707,7 +707,7 @@ func (c *GetController) GetAgentToMerchant() { params["belong_agent_uid"] = agentUid params["merchant_uid"] = merchantUid - l := merchant2.GetMerchantLenByParams(params) + l := merchant.GetMerchantLenByParams(params) c.GetCutPage(l) merchantDataJSON := new(datas.MerchantDataJSON) @@ -717,9 +717,9 @@ func (c *GetController) GetAgentToMerchant() { merchantDataJSON.TotalPage = c.TotalPage if c.Offset < 0 { - merchantDataJSON.MerchantList = make([]merchant2.MerchantInfo, 0) + merchantDataJSON.MerchantList = make([]merchant.MerchantInfo, 0) } else { - merchantDataJSON.MerchantList = merchant2.GetMerchantByParams(params, c.DisplayCount, c.Offset) + merchantDataJSON.MerchantList = merchant.GetMerchantByParams(params, c.DisplayCount, c.Offset) } c.GenerateJSON(merchantDataJSON) @@ -758,7 +758,7 @@ func (c *GetController) GetOrder() { case "refund": params["refund"] = "yes" } - l := order2.GetOrderLenByMap(params) + l := order.GetOrderLenByMap(params) c.GetCutPage(l) orderDataJSON := new(datas.OrderDataJSON) orderDataJSON.DisplayCount = c.DisplayCount @@ -766,17 +766,17 @@ func (c *GetController) GetOrder() { orderDataJSON.CurrentPage = c.CurrentPage orderDataJSON.TotalPage = c.TotalPage if c.Offset < 0 { - orderDataJSON.OrderList = make([]order2.OrderInfo, 0) + orderDataJSON.OrderList = make([]order.OrderInfo, 0) c.GenerateJSON(orderDataJSON) return } orderDataJSON.StartIndex = c.Offset - orderDataJSON.OrderList = order2.GetOrderByMap(params, c.DisplayCount, c.Offset) + orderDataJSON.OrderList = order.GetOrderByMap(params, c.DisplayCount, c.Offset) // orderDataJSON.OrderProfitSummary = order.ProfitSummary{ // TotalProfit: service.QueryTotalSummary(params), // TodayProfit: service.QueryTodaySummary(params), // } - params["status"] = common2.OrderStatusSuccess + params["status"] = common.OrderStatusSuccess c.GenerateJSON(orderDataJSON) } @@ -813,15 +813,15 @@ func (c *GetController) GetOrderSummary() { case "refund": params["refund"] = "yes" } - l := order2.GetOrderLenByMap(params) + l := order.GetOrderLenByMap(params) c.GetCutPage(l) orderDataJSON := new(datas.OrderDataSummaryJSON) // orderDataJSON.OrderList = order.GetOrderByMap(params, c.DisplayCount, c.Offset) - orderDataJSON.OrderProfitSummary = order2.ProfitSummary{ + orderDataJSON.OrderProfitSummary = order.ProfitSummary{ TotalProfit: service.QueryTotalSummary(params), TodayProfit: service.QueryTodaySummary(params), } - params["status"] = common2.OrderStatusSuccess + params["status"] = common.OrderStatusSuccess c.GenerateJSON(orderDataJSON) } @@ -829,7 +829,7 @@ func (c *GetController) GetOrderSummary() { func (c *GetController) GetOneOrder() { bankOrderId := strings.TrimSpace(c.GetString("bankOrderId")) orderDataJSON := new(datas.OrderDataJSON) - orderInfo := order2.GetOneOrder(bankOrderId) + orderInfo := order.GetOneOrder(bankOrderId) orderDataJSON.Code = 200 orderDataJSON.OrderList = append(orderDataJSON.OrderList, orderInfo) @@ -862,7 +862,7 @@ func (c *GetController) GetOrderProfit() { params["status"] = status params["pay_product_code"] = supplierUid params["pay_type_code"] = payWayCode - orderList := order2.GetAllOrderByMap(map[string]string{"road_uid": roadUid}) + orderList := order.GetAllOrderByMap(map[string]string{"road_uid": roadUid}) if len(orderList) > 0 { orderIDList := make([]string, len(orderList)) for _, info := range orderList { @@ -870,7 +870,7 @@ func (c *GetController) GetOrderProfit() { } params["bank_order_id__in"] = orderIDList } - l := order2.GetOrderProfitLenByMap(params) + l := order.GetOrderProfitLenByMap(params) c.GetCutPage(l) listDataJSON := new(datas.ListDataJSON) @@ -880,13 +880,13 @@ func (c *GetController) GetOrderProfit() { listDataJSON.TotalPage = c.TotalPage if c.Offset < 0 { - listDataJSON.List = make([]order2.OrderProfitInfo, 0) + listDataJSON.List = make([]order.OrderProfitInfo, 0) c.GenerateJSON(listDataJSON) return } listDataJSON.StartIndex = c.Offset - listDataJSON.List = order2.GetOrderProfitByMap(params, c.DisplayCount, c.Offset) + listDataJSON.List = order.GetOrderProfitByMap(params, c.DisplayCount, c.Offset) c.GenerateJSON(listDataJSON) } @@ -1013,7 +1013,7 @@ func (c *GetController) GetProfit() { profitListJSON := new(datas.ProfitListJSON) profitListJSON.Code = 200 - profitListJSON.ProfitList = order2.GetPlatformProfitByMap(params) + profitListJSON.ProfitList = order.GetPlatformProfitByMap(params) profitListJSON.TotalAmount = 0.00 profitListJSON.PlatformTotalProfit = 0.00 diff --git a/internal/controllers/loginController.go b/internal/controllers/loginController.go index 849a05d..df9aa5d 100644 --- a/internal/controllers/loginController.go +++ b/internal/controllers/loginController.go @@ -4,7 +4,7 @@ import ( "boss/internal/common" "boss/internal/datas" "boss/internal/models/user" - utils2 "boss/internal/utils" + "boss/internal/utils" "boss/internal/utils/mfa" "github.com/beego/beego/v2/core/logs" "github.com/beego/beego/v2/core/validation" @@ -58,7 +58,7 @@ func (c *LoginController) Login() { return } codeInterface := c.GetSession("verifyCode") - if userInfo.Passwd != utils2.GetMD5Upper(passWD) { + if userInfo.Passwd != utils.GetMD5Upper(passWD) { dataJSON.Key = "passWD" dataJSON.Msg = "密码不正确！" dataJSON.Code = -1 @@ -108,7 +108,7 @@ func (c *LoginController) Logout() { // GetVerifyImg 验证码获取，如果获取成功，并将验证码存到session中 func (c *LoginController) GetVerifyImg() { - Image, verifyCode := utils2.GenerateVerifyCodeImg() + Image, verifyCode := utils.GenerateVerifyCodeImg() if Image == nil || len(verifyCode) != common.VERIFY_CODE_LEN { logs.Error("获取验证码图片失败！") } else { diff --git a/internal/controllers/pageController.go b/internal/controllers/pageController.go index 63c83b4..14f413f 100644 --- a/internal/controllers/pageController.go +++ b/internal/controllers/pageController.go @@ -105,6 +105,42 @@ func (c *PageAuthController) RechargeAppleAccountPage() { c.TplName = "apple-card/account.html" } +func (c *PageAuthController) RechargeTMallGameAccountPage() { + token := "" + // 获取当前时间的时间戳 + currentTime := time.Now() + targetMinute := (currentTime.Minute() / 10) * 10 + targetTime := time.Date(currentTime.Year(), currentTime.Month(), currentTime.Day(), currentTime.Hour(), targetMinute, 0, 0, currentTime.Location()) + now := strconv.Itoa(int(targetTime.Unix())) + secretCfg := config.GetSecret() + tokenB, err := utils.AesCBCEncrypt([]byte(now), []byte(secretCfg.Key), []byte(secretCfg.IV)) + if err == nil { + //base64编码 + token = base64.URLEncoding.EncodeToString(tokenB) + } + c.Data["token"] = token + c.Data["portalHost"] = config.GetPortalHost() + c.TplName = "t-mall-game/account.html" +} + +func (c *PageAuthController) RechargeTMallGameOrderPage() { + token := "" + // 获取当前时间的时间戳 + currentTime := time.Now() + targetMinute := (currentTime.Minute() / 10) * 10 + targetTime := time.Date(currentTime.Year(), currentTime.Month(), currentTime.Day(), currentTime.Hour(), targetMinute, 0, 0, currentTime.Location()) + now := strconv.Itoa(int(targetTime.Unix())) + secretCfg := config.GetSecret() + tokenB, err := utils.AesCBCEncrypt([]byte(now), []byte(secretCfg.Key), []byte(secretCfg.IV)) + if err == nil { + //base64编码 + token = base64.URLEncoding.EncodeToString(tokenB) + } + c.Data["token"] = token + c.Data["portalHost"] = config.GetPortalHost() + c.TplName = "t-mall-game/recharge-order.html" +} + func (c *PageAuthController) OrderSummary() { token := "" // 获取当前时间的时间戳 diff --git a/internal/controllers/sendNotifyMerchantController.go b/internal/controllers/sendNotifyMerchantController.go index 7b12782..ef05051 100644 --- a/internal/controllers/sendNotifyMerchantController.go +++ b/internal/controllers/sendNotifyMerchantController.go @@ -1,14 +1,5 @@ package controllers -/*************************************************** - ** @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 -****************************************************/ import ( "boss/internal/service" "github.com/beego/beego/v2/server/web" diff --git a/internal/controllers/updateMerchantController.go b/internal/controllers/updateMerchantController.go index 868a676..d3a313f 100644 --- a/internal/controllers/updateMerchantController.go +++ b/internal/controllers/updateMerchantController.go @@ -2,7 +2,7 @@ package controllers import ( "boss/internal/datas" - service2 "boss/internal/service" + "boss/internal/service" "boss/internal/utils/valid" ) @@ -20,7 +20,7 @@ func (c *UpdateController) UpdateMerchantPassword() { return } // 判断totp是不是正确 - if service2.ValidTotp(userID, totpCode) { + if service.ValidTotp(userID, totpCode) { dataJSON.Code = -1 dataJSON.Msg = "二次验证错误" c.GenerateJSON(dataJSON) @@ -38,7 +38,7 @@ func (c *UpdateController) UpdateMerchantPassword() { } else { dataJSON.Code = 200 dataJSON.Msg = "密码修改成功!" - service2.UpdateMerchantPassword(merchantUid, totpCode) + service.UpdateMerchantPassword(merchantUid, totpCode) } c.GenerateJSON(dataJSON) } diff --git a/internal/data/demo.json b/internal/data/demo.json deleted file mode 100644 index 6a49037..0000000 --- a/internal/data/demo.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "100": 200 -} \ No newline at end of file diff --git a/internal/datas/datas.go b/internal/datas/datas.go index 122a1bf..c6e9cda 100644 --- a/internal/datas/datas.go +++ b/internal/datas/datas.go @@ -1,13 +1,13 @@ package datas import ( - accounts2 "boss/internal/models/accounts" + "boss/internal/models/accounts" "boss/internal/models/agent" - merchant2 "boss/internal/models/merchant" - order2 "boss/internal/models/order" + "boss/internal/models/merchant" + "boss/internal/models/order" "boss/internal/models/payfor" - road2 "boss/internal/models/road" - system2 "boss/internal/models/system" + "boss/internal/models/road" + "boss/internal/models/system" "boss/internal/models/user" ) @@ -34,7 +34,7 @@ type MenuDataJSON struct { TotalPage int Code int Msg string - MenuList []system2.MenuInfo + MenuList []system.MenuInfo } type SecondMenuDataJSON struct { @@ -44,7 +44,7 @@ type SecondMenuDataJSON struct { TotalPage int Code int Msg string - SecondMenuList []system2.SecondMenuInfo + SecondMenuList []system.SecondMenuInfo } type PowerItemDataJSON struct { @@ -54,7 +54,7 @@ type PowerItemDataJSON struct { TotalPage int Code int Msg string - PowerItemList []system2.PowerInfo + PowerItemList []system.PowerInfo } type RoleInfoDataJSON struct { @@ -64,18 +64,18 @@ type RoleInfoDataJSON struct { TotalPage int Code int Msg string - RoleInfoList []system2.RoleInfo + RoleInfoList []system.RoleInfo } type DeployTreeJSON struct { Msg string Code int Key string - AllFirstMenu []system2.MenuInfo + AllFirstMenu []system.MenuInfo ShowFirstMenuUid map[string]bool - AllSecondMenu []system2.SecondMenuInfo + AllSecondMenu []system.SecondMenuInfo ShowSecondMenuUid map[string]bool - AllPower []system2.PowerInfo + AllPower []system.PowerInfo ShowPowerUid map[string]bool } @@ -93,7 +93,7 @@ type EditOperatorDataJSON struct { Code int Msg string OperatorList []user.UserInfo - RoleList []system2.RoleInfo + RoleList []system.RoleInfo } type BankCardDataJSON struct { @@ -103,7 +103,7 @@ type BankCardDataJSON struct { DisplayCount int CurrentPage int TotalPage int - BankCardInfoList []system2.BankCardInfo + BankCardInfoList []system.BankCardInfo } type RoadDataJSON struct { @@ -113,8 +113,8 @@ type RoadDataJSON struct { DisplayCount int CurrentPage int TotalPage int - RoadInfoList []road2.RoadInfo - RoadPool road2.RoadPoolInfo + RoadInfoList []road.RoadInfo + RoadPool road.RoadPoolInfo } type RoadPoolDataJSON struct { @@ -124,7 +124,7 @@ type RoadPoolDataJSON struct { DisplayCount int CurrentPage int TotalPage int - RoadPoolInfoList []road2.RoadPoolInfo + RoadPoolInfoList []road.RoadPoolInfo } type MerchantDataJSON struct { @@ -134,13 +134,13 @@ type MerchantDataJSON struct { DisplayCount int CurrentPage int TotalPage int - MerchantList []merchant2.MerchantInfo + MerchantList []merchant.MerchantInfo } type MerchantDeployDataJSON struct { Code int Msg string - MerchantDeploy merchant2.MerchantDeployInfo + MerchantDeploy merchant.MerchantDeployInfo } type AccountDataJSON struct { @@ -150,7 +150,7 @@ type AccountDataJSON struct { DisplayCount int CurrentPage int TotalPage int - AccountList []accounts2.AccountInfo + AccountList []accounts.AccountInfo } type AccountHistoryDataJSON struct { @@ -160,7 +160,7 @@ type AccountHistoryDataJSON struct { DisplayCount int CurrentPage int TotalPage int - AccountHistoryList []accounts2.AccountHistoryInfo + AccountHistoryList []accounts.AccountHistoryInfo } type AgentDataJSON struct { @@ -186,7 +186,7 @@ type OrderDataJSON struct { DisplayCount int CurrentPage int TotalPage int - OrderList []order2.OrderInfo + OrderList []order.OrderInfo //AllAmount float64 //SuccessRate string NotifyUrl string @@ -195,7 +195,7 @@ type OrderDataJSON struct { type OrderDataSummaryJSON struct { //AllAmount float64 //SuccessRate string - OrderProfitSummary order2.ProfitSummary `json:"OrderProfitSummary"` + OrderProfitSummary order.ProfitSummary `json:"OrderProfitSummary"` } type ListDataJSON struct { @@ -205,7 +205,7 @@ type ListDataJSON struct { DisplayCount int CurrentPage int TotalPage int - List []order2.OrderProfitInfo + List []order.OrderProfitInfo AllAmount float64 SupplierProfit float64 AgentProfit float64 @@ -251,5 +251,5 @@ type ProfitListJSON struct { AgentTotalProfit float64 Msg string Code int - ProfitList []order2.PlatformProfit + ProfitList []order.PlatformProfit } diff --git a/internal/models/agent/agent_profit.go b/internal/models/agent/agent_profit.go index d78c808..e7f4255 100644 --- a/internal/models/agent/agent_profit.go +++ b/internal/models/agent/agent_profit.go @@ -1,14 +1,4 @@ package agent -/*************************************************** - ** @Desc : This file for ... - ** @Time : 2019/12/17 17:50 - ** @Author : yuebin - ** @File : agent_profit - ** @Last Modified by : yuebin - ** @Last Modified time: 2019/12/17 17:50 - ** @Software: GoLand -****************************************************/ - type AgentProfit struct { } diff --git a/internal/models/init.go b/internal/models/init.go index 9a7b064..6fe39d7 100644 --- a/internal/models/init.go +++ b/internal/models/init.go @@ -1,24 +1,14 @@ package models -/*************************************************** - ** @Desc : This file for ... - ** @Time : 2019/8/9 13:48 - ** @Author : yuebin - ** @File : init - ** @Last Modified by : yuebin - ** @Last Modified time: 2019/8/9 13:48 - ** @Software: GoLand -****************************************************/ - import ( - accounts2 "boss/internal/models/accounts" + "boss/internal/models/accounts" "boss/internal/models/agent" - merchant2 "boss/internal/models/merchant" + "boss/internal/models/merchant" "boss/internal/models/notify" - order2 "boss/internal/models/order" + "boss/internal/models/order" "boss/internal/models/payfor" - road2 "boss/internal/models/road" - system2 "boss/internal/models/system" + "boss/internal/models/road" + "boss/internal/models/system" "boss/internal/models/user" "fmt" "github.com/beego/beego/v2/client/orm" @@ -42,23 +32,23 @@ func init() { _ = orm.RegisterDataBase("default", "mysql", link) orm.RegisterModel( new(user.UserInfo), - new(system2.MenuInfo), - new(system2.SecondMenuInfo), - new(system2.PowerInfo), - new(system2.RoleInfo), - new(system2.BankCardInfo), - new(road2.RoadInfo), - new(road2.RoadPoolInfo), + new(system.MenuInfo), + new(system.SecondMenuInfo), + new(system.PowerInfo), + new(system.RoleInfo), + new(system.BankCardInfo), + new(road.RoadInfo), + new(road.RoadPoolInfo), new(agent.AgentInfo), - new(merchant2.MerchantInfo), - new(merchant2.MerchantDeployInfo), - new(accounts2.AccountInfo), - new(accounts2.AccountHistoryInfo), - new(order2.OrderInfo), - new(order2.OrderProfitInfo), - new(order2.OrderSettleInfo), + new(merchant.MerchantInfo), + new(merchant.MerchantDeployInfo), + new(accounts.AccountInfo), + new(accounts.AccountHistoryInfo), + new(order.OrderInfo), + new(order.OrderProfitInfo), + new(order.OrderSettleInfo), new(notify.NotifyInfo), - new(merchant2.MerchantLoadInfo), + new(merchant.MerchantLoadInfo), new(payfor.PayforInfo), ) } diff --git a/internal/models/merchant/merchant_deploy_info.go b/internal/models/merchant/merchant_deploy_info.go index 5ca7c45..f8b72d5 100644 --- a/internal/models/merchant/merchant_deploy_info.go +++ b/internal/models/merchant/merchant_deploy_info.go @@ -1,15 +1,5 @@ package merchant -/*************************************************** - ** @Desc : This file for ... - ** @Time : 2019/10/7 11:52 - ** @Author : yuebin - ** @File : merchant_deploy_info - ** @Last Modified by : yuebin - ** @Last Modified time: 2019/10/7 11:52 - ** @Software: GoLand -****************************************************/ - import ( "encoding/json" "fmt" diff --git a/internal/models/merchant/merchant_info.go b/internal/models/merchant/merchant_info.go index a1d7097..9c7ca9c 100644 --- a/internal/models/merchant/merchant_info.go +++ b/internal/models/merchant/merchant_info.go @@ -1,15 +1,5 @@ package merchant -/*************************************************** - ** @Desc : This file for ... - ** @Time : 2019/9/28 16:47 - ** @Author : yuebin - ** @File : merchant_info - ** @Last Modified by : yuebin - ** @Last Modified time: 2019/9/28 16:47 - ** @Software: GoLand -****************************************************/ - import ( "github.com/beego/beego/v2/client/orm" "github.com/beego/beego/v2/core/logs" diff --git a/internal/models/order/order_info.go b/internal/models/order/order_info.go index d4627d3..1ad173f 100644 --- a/internal/models/order/order_info.go +++ b/internal/models/order/order_info.go @@ -1,15 +1,5 @@ package order -/*************************************************** - ** @Desc : This file for ... - ** @Time : 2019/10/28 10:15 - ** @Author : yuebin - ** @File : order_info - ** @Last Modified by : yuebin - ** @Last Modified time: 2019/10/28 10:15 - ** @Software: GoLand -****************************************************/ - import ( "fmt" "strconv" @@ -143,7 +133,7 @@ func GetAllOrderByMap(params map[string]string) []OrderInfo { // GetToDayInfo 获得今日数据 func GetToDayInfo() string { - var params map[string]string = map[string]string{} + var params = map[string]string{} //params["create_time__gte"] = startTime //params["create_time__lte"] = endTime o := orm.NewOrm() diff --git a/internal/models/transaction.go b/internal/models/transaction.go index 090dd57..43a659d 100644 --- a/internal/models/transaction.go +++ b/internal/models/transaction.go @@ -2,7 +2,7 @@ package models import ( "boss/internal/common" - accounts2 "boss/internal/models/accounts" + "boss/internal/models/accounts" "context" "errors" "github.com/beego/beego/v2/client/orm" @@ -17,7 +17,7 @@ func OperatorAccount(accountUid, operatorType string, amount float64) (string, b if err := o.DoTx(func(ctx context.Context, txOrm orm.TxOrmer) error { //处理事务 - accountInfo := new(accounts2.AccountInfo) + accountInfo := new(accounts.AccountInfo) if err := txOrm.Raw("select * from account_info where account_uid = ? for update", accountUid). QueryRow(accountInfo); err != nil || accountInfo.AccountUid == "" { logs.Error("operator account get account info for update fail: ", err) @@ -58,7 +58,7 @@ func OperatorAccount(accountUid, operatorType string, amount float64) (string, b return err } //往account_history表中插入一条动账记录 - accountHistory := accounts2.AccountHistoryInfo{AccountUid: accountUid, AccountName: accountInfo.AccountName, Type: operatorType, + accountHistory := accounts.AccountHistoryInfo{AccountUid: accountUid, AccountName: accountInfo.AccountName, Type: operatorType, Amount: amount, Balance: accountInfo.Balance, CreateTime: time.Now(), UpdateTime: time.Now()} if _, err := txOrm.Insert(&accountHistory); err != nil { diff --git a/internal/routers/router.go b/internal/routers/router.go index 09b592f..65d3e0b 100644 --- a/internal/routers/router.go +++ b/internal/routers/router.go @@ -1,7 +1,7 @@ package routers import ( - controllers2 "boss/internal/controllers" + "boss/internal/controllers" "github.com/beego/beego/v2/server/web" ) @@ -14,106 +14,106 @@ func init() { test() //beego.Router("/", &controllers.PageController{}, "*:Index") //添加过滤函数 - web.Router("/filter.html", &controllers2.FilterController{}, "*:Filter") + web.Router("/filter.html", &controllers.FilterController{}, "*:Filter") //登录验证接口 - web.Router("/login", &controllers2.LoginController{}, "*:Login") - web.Router("/logout", &controllers2.LoginController{}, "*:Logout") - web.Router("/getVerifyImg", &controllers2.LoginController{}, "*:GetVerifyImg") - web.Router("/update/password", &controllers2.UpdateController{}, "*:UpdatePassword") - web.Router("/freeze/operator", &controllers2.UpdateController{}, "*:FreezeOperator") - web.Router("/freeze/merchant", &controllers2.UpdateController{}, "*:UpdateMerchantStatus") - web.Router("/unfreeze/operator", &controllers2.UpdateController{}, "*:UnfreezeOperator") - web.Router("/unfreeze/merchant", &controllers2.UpdateController{}, "*:UpdateMerchantStatus") - web.Router("/edit/operator", &controllers2.UpdateController{}, "*:EditOperator") - web.Router("/add/menu", &controllers2.AddController{}, "*:AddMenu") - web.Router("/add/secondMenu", &controllers2.AddController{}, "*:AddSecondMenu") - web.Router("/add/power", &controllers2.AddController{}, "*:AddPower") - web.Router("/add/role", &controllers2.AddController{}, "*:AddRole") - web.Router("/add/operator", &controllers2.AddController{}, "*:AddOperator") - web.Router("/add/bankCard", &controllers2.AddController{}, "*:AddBankCard") - web.Router("/add/road", &controllers2.AddController{}, "*:AddRoad") - web.Router("/add/roadPool", &controllers2.AddController{}, "*:AddRoadPool") - web.Router("/add/merchant", &controllers2.AddController{}, "*:AddMerchant") - web.Router("/add/agent", &controllers2.AddController{}, "*:AddAgent") - web.Router("/add/merchant/deploy", &controllers2.AddController{}, "*:AddMerchantDeploy") - web.Router("/add/merchant/payType", &controllers2.AddController{}, "*:AddMerchantPayType") - web.Router("/add/payfor", &controllers2.AddController{}, "*:AddPayFor") - web.Router("/add/self/payfor", &controllers2.AddController{}, "*:AddSelfPayFor") - web.Router("/get/menu", &controllers2.GetController{}, "*:GetMenu") - web.Router("/get/secondMenu", &controllers2.GetController{}, "*:GetSecondMenu") - web.Router("/get/secondMenus", &controllers2.GetController{}, "*:GetSecondMenus") - web.Router("/get/oneMenu", &controllers2.GetController{}, "*:GetOneMenu") - web.Router("/get/firstMenu", &controllers2.GetController{}, "*:GetFirstMenu") - web.Router("/get/powerItem", &controllers2.GetController{}, "*:GetPowerItem") - web.Router("/get/role", &controllers2.GetController{}, "*:GetRole") - web.Router("/get/allRole", &controllers2.GetController{}, "*:GetAllRole") - web.Router("/get/deployTree", &controllers2.GetController{}, "*:GetDeployTree") - web.Router("/get/operator", &controllers2.GetController{}, "*:GetOperator") - web.Router("/get/oneOperator", &controllers2.GetController{}, "*:GetOneOperator") - web.Router("/get/editOperator", &controllers2.GetController{}, "*:GetEditOperator") - web.Router("/get/bankCard", &controllers2.GetController{}, "*:GetBankCard") - web.Router("/get/oneBankCard", &controllers2.GetController{}, "*:GetOneBankCard") - web.Router("/get/road", &controllers2.GetController{}, "*:GetRoad") - web.Router("/get/oneRoad", &controllers2.GetController{}, "*:GetOneRoad") - web.Router("/get/all/road", &controllers2.GetController{}, "*:GetAllRoad") - web.Router("/get/roadPool", &controllers2.GetController{}, "*:GetRoadPool") - web.Router("/get/all/roll/pool", &controllers2.GetController{}, "*:GetAllRollPool") - web.Router("/get/merchant", &controllers2.GetController{}, "*:GetMerchant") - web.Router("/get/all/merchant", &controllers2.GetController{}, "*:GetAllMerchant") - web.Router("/get/one/merchant", &controllers2.GetController{}, "*:GetOneMerchant") - web.Router("/get/one/merchant/deploy", &controllers2.GetController{}, "*:GetOneMerchantDeploy") - web.Router("/get/all/account", &controllers2.GetController{}, "*:GetAllAccount") - web.Router("/get/account", &controllers2.GetController{}, "*:GetAccount") - web.Router("/get/one/account", &controllers2.GetController{}, "*:GetOneAccount") - web.Router("/get/account/history", &controllers2.GetController{}, "*:GetAccountHistory") - web.Router("/get/agent", &controllers2.GetController{}, "*:GetAgent") - web.Router("/get/all/agent", &controllers2.GetController{}, "*:GetAllAgent") - web.Router("/get/product", &controllers2.GetController{}, "*:GetProduct") - web.Router("/get/order", &controllers2.GetController{}, "*:GetOrder") - web.Router("/get/orderSummary", &controllers2.GetController{}, "*:GetOrderSummary") - web.Router("/get/one/order", &controllers2.GetController{}, "*:GetOneOrder") - web.Router("/get/orderProfit", &controllers2.GetController{}, "*:GetOrderProfit") - web.Router("/get/payfor", &controllers2.GetController{}, "*:GetPayFor") - web.Router("/get/one/payfor", &controllers2.GetController{}, "*:GetOnePayFor") - web.Router("/get/balance", &controllers2.GetController{}, "*:GetBalance") - web.Router("/get/notify/bankOrderId/list", &controllers2.GetController{}, "*:GetNotifyBankOrderIdList") - web.Router("/get/agent/to/merchant", &controllers2.GetController{}, "*:GetAgentToMerchant") - web.Router("/get/profit", &controllers2.GetController{}, "*:GetProfit") - web.Router("/save/power", &controllers2.AddController{}, "*:SavePower") - web.Router("/save/roadUid", &controllers2.AddController{}, "*:SaveRoadUid") - web.Router("/up/menu", &controllers2.UpdateController{}, "*:UpMenu") - web.Router("/down/menu", &controllers2.UpdateController{}, "*:DownMenu") - web.Router("/up/secondMenu", &controllers2.UpdateController{}, "*:UpSecondMenu") - web.Router("/down/secondMenu", &controllers2.UpdateController{}, "*:DownSecondMenu") + web.Router("/login", &controllers.LoginController{}, "*:Login") + web.Router("/logout", &controllers.LoginController{}, "*:Logout") + web.Router("/getVerifyImg", &controllers.LoginController{}, "*:GetVerifyImg") + web.Router("/update/password", &controllers.UpdateController{}, "*:UpdatePassword") + web.Router("/freeze/operator", &controllers.UpdateController{}, "*:FreezeOperator") + web.Router("/freeze/merchant", &controllers.UpdateController{}, "*:UpdateMerchantStatus") + web.Router("/unfreeze/operator", &controllers.UpdateController{}, "*:UnfreezeOperator") + web.Router("/unfreeze/merchant", &controllers.UpdateController{}, "*:UpdateMerchantStatus") + web.Router("/edit/operator", &controllers.UpdateController{}, "*:EditOperator") + web.Router("/add/menu", &controllers.AddController{}, "*:AddMenu") + web.Router("/add/secondMenu", &controllers.AddController{}, "*:AddSecondMenu") + web.Router("/add/power", &controllers.AddController{}, "*:AddPower") + web.Router("/add/role", &controllers.AddController{}, "*:AddRole") + web.Router("/add/operator", &controllers.AddController{}, "*:AddOperator") + web.Router("/add/bankCard", &controllers.AddController{}, "*:AddBankCard") + web.Router("/add/road", &controllers.AddController{}, "*:AddRoad") + web.Router("/add/roadPool", &controllers.AddController{}, "*:AddRoadPool") + web.Router("/add/merchant", &controllers.AddController{}, "*:AddMerchant") + web.Router("/add/agent", &controllers.AddController{}, "*:AddAgent") + web.Router("/add/merchant/deploy", &controllers.AddController{}, "*:AddMerchantDeploy") + web.Router("/add/merchant/payType", &controllers.AddController{}, "*:AddMerchantPayType") + web.Router("/add/payfor", &controllers.AddController{}, "*:AddPayFor") + web.Router("/add/self/payfor", &controllers.AddController{}, "*:AddSelfPayFor") + web.Router("/get/menu", &controllers.GetController{}, "*:GetMenu") + web.Router("/get/secondMenu", &controllers.GetController{}, "*:GetSecondMenu") + web.Router("/get/secondMenus", &controllers.GetController{}, "*:GetSecondMenus") + web.Router("/get/oneMenu", &controllers.GetController{}, "*:GetOneMenu") + web.Router("/get/firstMenu", &controllers.GetController{}, "*:GetFirstMenu") + web.Router("/get/powerItem", &controllers.GetController{}, "*:GetPowerItem") + web.Router("/get/role", &controllers.GetController{}, "*:GetRole") + web.Router("/get/allRole", &controllers.GetController{}, "*:GetAllRole") + web.Router("/get/deployTree", &controllers.GetController{}, "*:GetDeployTree") + web.Router("/get/operator", &controllers.GetController{}, "*:GetOperator") + web.Router("/get/oneOperator", &controllers.GetController{}, "*:GetOneOperator") + web.Router("/get/editOperator", &controllers.GetController{}, "*:GetEditOperator") + web.Router("/get/bankCard", &controllers.GetController{}, "*:GetBankCard") + web.Router("/get/oneBankCard", &controllers.GetController{}, "*:GetOneBankCard") + web.Router("/get/road", &controllers.GetController{}, "*:GetRoad") + web.Router("/get/oneRoad", &controllers.GetController{}, "*:GetOneRoad") + web.Router("/get/all/road", &controllers.GetController{}, "*:GetAllRoad") + web.Router("/get/roadPool", &controllers.GetController{}, "*:GetRoadPool") + web.Router("/get/all/roll/pool", &controllers.GetController{}, "*:GetAllRollPool") + web.Router("/get/merchant", &controllers.GetController{}, "*:GetMerchant") + web.Router("/get/all/merchant", &controllers.GetController{}, "*:GetAllMerchant") + web.Router("/get/one/merchant", &controllers.GetController{}, "*:GetOneMerchant") + web.Router("/get/one/merchant/deploy", &controllers.GetController{}, "*:GetOneMerchantDeploy") + web.Router("/get/all/account", &controllers.GetController{}, "*:GetAllAccount") + web.Router("/get/account", &controllers.GetController{}, "*:GetAccount") + web.Router("/get/one/account", &controllers.GetController{}, "*:GetOneAccount") + web.Router("/get/account/history", &controllers.GetController{}, "*:GetAccountHistory") + web.Router("/get/agent", &controllers.GetController{}, "*:GetAgent") + web.Router("/get/all/agent", &controllers.GetController{}, "*:GetAllAgent") + web.Router("/get/product", &controllers.GetController{}, "*:GetProduct") + web.Router("/get/order", &controllers.GetController{}, "*:GetOrder") + web.Router("/get/orderSummary", &controllers.GetController{}, "*:GetOrderSummary") + web.Router("/get/one/order", &controllers.GetController{}, "*:GetOneOrder") + web.Router("/get/orderProfit", &controllers.GetController{}, "*:GetOrderProfit") + web.Router("/get/payfor", &controllers.GetController{}, "*:GetPayFor") + web.Router("/get/one/payfor", &controllers.GetController{}, "*:GetOnePayFor") + web.Router("/get/balance", &controllers.GetController{}, "*:GetBalance") + web.Router("/get/notify/bankOrderId/list", &controllers.GetController{}, "*:GetNotifyBankOrderIdList") + web.Router("/get/agent/to/merchant", &controllers.GetController{}, "*:GetAgentToMerchant") + web.Router("/get/profit", &controllers.GetController{}, "*:GetProfit") + web.Router("/save/power", &controllers.AddController{}, "*:SavePower") + web.Router("/save/roadUid", &controllers.AddController{}, "*:SaveRoadUid") + web.Router("/up/menu", &controllers.UpdateController{}, "*:UpMenu") + web.Router("/down/menu", &controllers.UpdateController{}, "*:DownMenu") + web.Router("/up/secondMenu", &controllers.UpdateController{}, "*:UpSecondMenu") + web.Router("/down/secondMenu", &controllers.UpdateController{}, "*:DownSecondMenu") - web.Router("/update/roadStatus", &controllers2.UpdateController{}, "*:UpdateRoadStatus") - web.Router("/update/account/status", &controllers2.UpdateController{}, "*:UpdateAccountStatus") - web.Router("/update/agent/status", &controllers2.UpdateController{}, "*:UpdateAgentStatus") - web.Router("/update/order/status", &controllers2.UpdateController{}, "*:UpdateOrderStatus") - web.Router("/update/merchant/newPassword", &controllers2.UpdateController{}, "*:UpdateMerchantPassword") + web.Router("/update/roadStatus", &controllers.UpdateController{}, "*:UpdateRoadStatus") + web.Router("/update/account/status", &controllers.UpdateController{}, "*:UpdateAccountStatus") + web.Router("/update/agent/status", &controllers.UpdateController{}, "*:UpdateAgentStatus") + web.Router("/update/order/status", &controllers.UpdateController{}, "*:UpdateOrderStatus") + web.Router("/update/merchant/newPassword", &controllers.UpdateController{}, "*:UpdateMerchantPassword") - web.Router("/account/operator", &controllers2.UpdateController{}, "*:OperatorAccount") + web.Router("/account/operator", &controllers.UpdateController{}, "*:OperatorAccount") - web.Router("/delete/menu", &controllers2.DeleteController{}, "*:DeleteMenu") - web.Router("/delete/secondMenu", &controllers2.DeleteController{}, "*:DeleteSecondMenu") - web.Router("/delete/powerItem", &controllers2.DeleteController{}, "*:DeletePowerItem") - web.Router("/delete/role", &controllers2.DeleteController{}, "*:DeleteRole") - web.Router("/delete/operator", &controllers2.DeleteController{}, "*:DeleteOperator") - web.Router("/delete/bankCardRecord", &controllers2.DeleteController{}, "*:DeleteBankCardRecord") - web.Router("/delete/road", &controllers2.DeleteController{}, "*:DeleteRoad") - web.Router("/delete/roadPool", &controllers2.DeleteController{}, "*:DeleteRoadPool") - web.Router("/delete/merchant", &controllers2.DeleteController{}, "*:DeleteMerchant") - web.Router("/delete/account", &controllers2.DeleteController{}, "*:DeleteAccount") - web.Router("/delete/agent", &controllers2.DeleteController{}, "*:DeleteAgent") - web.Router("/delete/agent/merchant/relation", &controllers2.DeleteController{}, "*:DeleteAgentRelation") - web.Router("/reset/agent/password", &controllers2.UpdateController{}, "*:ResetAgentPassword") - web.Router("/supplier/order/query", &controllers2.SupplierQuery{}, "*:SupplierOrderQuery") - web.Router("/supplier/payfor/query", &controllers2.SupplierQuery{}, "*:SupplierPayForQuery") - web.Router("/choose/payfor/road", &controllers2.UpdateController{}, "*:ChoosePayForRoad") - web.Router("/result/payfor", &controllers2.UpdateController{}, "*:ResultPayFor") - web.Router("/send/notify", &controllers2.SendNotify{}, "*:SendNotifyToMerchant") - web.Router("/self/send/notify", &controllers2.SendNotify{}, "*:SelfSendNotify") + web.Router("/delete/menu", &controllers.DeleteController{}, "*:DeleteMenu") + web.Router("/delete/secondMenu", &controllers.DeleteController{}, "*:DeleteSecondMenu") + web.Router("/delete/powerItem", &controllers.DeleteController{}, "*:DeletePowerItem") + web.Router("/delete/role", &controllers.DeleteController{}, "*:DeleteRole") + web.Router("/delete/operator", &controllers.DeleteController{}, "*:DeleteOperator") + web.Router("/delete/bankCardRecord", &controllers.DeleteController{}, "*:DeleteBankCardRecord") + web.Router("/delete/road", &controllers.DeleteController{}, "*:DeleteRoad") + web.Router("/delete/roadPool", &controllers.DeleteController{}, "*:DeleteRoadPool") + web.Router("/delete/merchant", &controllers.DeleteController{}, "*:DeleteMerchant") + web.Router("/delete/account", &controllers.DeleteController{}, "*:DeleteAccount") + web.Router("/delete/agent", &controllers.DeleteController{}, "*:DeleteAgent") + web.Router("/delete/agent/merchant/relation", &controllers.DeleteController{}, "*:DeleteAgentRelation") + web.Router("/reset/agent/password", &controllers.UpdateController{}, "*:ResetAgentPassword") + web.Router("/supplier/order/query", &controllers.SupplierQuery{}, "*:SupplierOrderQuery") + web.Router("/supplier/payfor/query", &controllers.SupplierQuery{}, "*:SupplierPayForQuery") + web.Router("/choose/payfor/road", &controllers.UpdateController{}, "*:ChoosePayForRoad") + web.Router("/result/payfor", &controllers.UpdateController{}, "*:ResultPayFor") + web.Router("/send/notify", &controllers.SendNotify{}, "*:SendNotifyToMerchant") + web.Router("/self/send/notify", &controllers.SendNotify{}, "*:SelfSendNotify") - web.Router("/user/genTotp", &controllers2.TotpQuery{}, "*:GenTotp") - web.Router("/user/saveTotp", &controllers2.TotpQuery{}, "*:SaveTotp") + web.Router("/user/genTotp", &controllers.TotpQuery{}, "*:GenTotp") + web.Router("/user/saveTotp", &controllers.TotpQuery{}, "*:SaveTotp") } diff --git a/internal/routers/router_pages.go b/internal/routers/router_pages.go index c9ceb79..9dd4a13 100644 --- a/internal/routers/router_pages.go +++ b/internal/routers/router_pages.go @@ -1,48 +1,51 @@ package routers import ( - controllers2 "boss/internal/controllers" + "boss/internal/controllers" beego "github.com/beego/beego/v2/server/web" ) func init() { - beego.Router("/", &controllers2.PageController{}, "*:Index") - beego.Router("/index.html", &controllers2.PageController{}, "*:Index") - beego.Router("/login.html", &controllers2.PageController{}, "*:LoginPage") - beego.Router("/account.html", &controllers2.PageAuthController{}, "*:AccountPage") - beego.Router("/account_history.html", &controllers2.PageAuthController{}, "*:AccountHistoryPage") - beego.Router("/bank_card.html", &controllers2.PageAuthController{}, "*:BankCardPage") - beego.Router("/create_agent.html", &controllers2.PageAuthController{}, "*:CreateAgentPage") - beego.Router("/edit_role.html", &controllers2.PageAuthController{}, "*:EditRolePage") - beego.Router("/first_menu.html", &controllers2.PageAuthController{}, "*:FirstMenuPage") - beego.Router("/main.html", &controllers2.PageAuthController{}, "*:MainPage") - beego.Router("/menu.html", &controllers2.PageAuthController{}, "*:MenuPage") - beego.Router("/merchant.html", &controllers2.PageAuthController{}, "*:MerchantPage") - beego.Router("/merchant_v2.html", &controllers2.PageAuthController{}, "*:MerchantV2Page") + beego.Router("/", &controllers.PageController{}, "*:Index") + beego.Router("/index.html", &controllers.PageController{}, "*:Index") + beego.Router("/login.html", &controllers.PageController{}, "*:LoginPage") + beego.Router("/account.html", &controllers.PageAuthController{}, "*:AccountPage") + beego.Router("/account_history.html", &controllers.PageAuthController{}, "*:AccountHistoryPage") + beego.Router("/bank_card.html", &controllers.PageAuthController{}, "*:BankCardPage") + beego.Router("/create_agent.html", &controllers.PageAuthController{}, "*:CreateAgentPage") + beego.Router("/edit_role.html", &controllers.PageAuthController{}, "*:EditRolePage") + beego.Router("/first_menu.html", &controllers.PageAuthController{}, "*:FirstMenuPage") + beego.Router("/main.html", &controllers.PageAuthController{}, "*:MainPage") + beego.Router("/menu.html", &controllers.PageAuthController{}, "*:MenuPage") + beego.Router("/merchant.html", &controllers.PageAuthController{}, "*:MerchantPage") + beego.Router("/merchant_v2.html", &controllers.PageAuthController{}, "*:MerchantV2Page") - beego.Router("/customerUserManagement.html", &controllers2.PageAuthController{}, "*:UserManagement") + beego.Router("/customerUserManagement.html", &controllers.PageAuthController{}, "*:UserManagement") - beego.Router("/order-summary-info.html", &controllers2.PageAuthController{}, "*:OrderSummary") - beego.Router("/recharge-apple-card-account.html", &controllers2.PageAuthController{}, "*:RechargeAppleAccountPage") - beego.Router("/recharge-apple-card-order.html", &controllers2.PageAuthController{}, "*:RechargeAppleOrderPage") + beego.Router("/order-summary-info.html", &controllers.PageAuthController{}, "*:OrderSummary") + beego.Router("/recharge-apple-card-account.html", &controllers.PageAuthController{}, "*:RechargeAppleAccountPage") + beego.Router("/recharge-apple-card-order.html", &controllers.PageAuthController{}, "*:RechargeAppleOrderPage") - beego.Router("/operator.html", &controllers2.PageAuthController{}, "*:OperatorPage") - beego.Router("/power.html", &controllers2.PageAuthController{}, "*:PowerPage") - beego.Router("/road.html", &controllers2.PageAuthController{}, "*:RoadPage") - beego.Router("/road_pool.html", &controllers2.PageAuthController{}, "*:RoadPoolPage") - beego.Router("/road_profit.html", &controllers2.PageAuthController{}, "*:RoadProfitPage") - beego.Router("/role.html", &controllers2.PageAuthController{}, "*:RolePage") - beego.Router("/second_menu.html", &controllers2.PageAuthController{}, "*:SecondMenuPage") - beego.Router("/order_info.html", &controllers2.PageAuthController{}, "*:OrderInfoPage") - beego.Router("/order_profit.html", &controllers2.PageAuthController{}, "*:OrderProfitPage") - beego.Router("/merchant_payfor.html", &controllers2.PageAuthController{}, "*:MerchantPayforPage") - beego.Router("/self_payfor.html", &controllers2.PageAuthController{}, "*:SelfPayforPage") - beego.Router("/payfor_record.html", &controllers2.PageAuthController{}, "*:PayforRecordPage") - beego.Router("/confirm.html", &controllers2.PageAuthController{}, "*:ConfirmPage") - beego.Router("/self_notify.html", &controllers2.PageAuthController{}, "*:SelfNotifyPage") + beego.Router("/recharge-t-mall-game-account.html", &controllers.PageAuthController{}, "*:RechargeTMallGameAccountPage") + beego.Router("/recharge-t-mall-game-order.html", &controllers.PageAuthController{}, "*:RechargeTMallGameOrderPage") + + beego.Router("/operator.html", &controllers.PageAuthController{}, "*:OperatorPage") + beego.Router("/power.html", &controllers.PageAuthController{}, "*:PowerPage") + beego.Router("/road.html", &controllers.PageAuthController{}, "*:RoadPage") + beego.Router("/road_pool.html", &controllers.PageAuthController{}, "*:RoadPoolPage") + beego.Router("/road_profit.html", &controllers.PageAuthController{}, "*:RoadProfitPage") + beego.Router("/role.html", &controllers.PageAuthController{}, "*:RolePage") + beego.Router("/second_menu.html", &controllers.PageAuthController{}, "*:SecondMenuPage") + beego.Router("/order_info.html", &controllers.PageAuthController{}, "*:OrderInfoPage") + beego.Router("/order_profit.html", &controllers.PageAuthController{}, "*:OrderProfitPage") + beego.Router("/merchant_payfor.html", &controllers.PageAuthController{}, "*:MerchantPayforPage") + beego.Router("/self_payfor.html", &controllers.PageAuthController{}, "*:SelfPayforPage") + beego.Router("/payfor_record.html", &controllers.PageAuthController{}, "*:PayforRecordPage") + beego.Router("/confirm.html", &controllers.PageAuthController{}, "*:ConfirmPage") + beego.Router("/self_notify.html", &controllers.PageAuthController{}, "*:SelfNotifyPage") //beego.Router("/self_plus_sub.html", &controllers.PageController{}, "*:SelfPlusSubPage") - beego.Router("/agent_to_merchant.html", &controllers2.PageAuthController{}, "*:AgentToMerchantPage") - beego.Router("/platform_profit.html", &controllers2.PageAuthController{}, "*:PlatFormProfitPage") - beego.Router("/agent_profit.html", &controllers2.PageAuthController{}, "*:AgentProfitPage") + beego.Router("/agent_to_merchant.html", &controllers.PageAuthController{}, "*:AgentToMerchantPage") + beego.Router("/platform_profit.html", &controllers.PageAuthController{}, "*:PlatFormProfitPage") + beego.Router("/agent_profit.html", &controllers.PageAuthController{}, "*:AgentProfitPage") } diff --git a/internal/service/addService.go b/internal/service/addService.go index da971e0..a315088 100644 --- a/internal/service/addService.go +++ b/internal/service/addService.go @@ -1,14 +1,14 @@ package service import ( - common2 "boss/internal/common" + "boss/internal/common" "boss/internal/datas" "boss/internal/models/accounts" "boss/internal/models/agent" - merchant2 "boss/internal/models/merchant" + "boss/internal/models/merchant" "boss/internal/models/payfor" - road2 "boss/internal/models/road" - system2 "boss/internal/models/system" + "boss/internal/models/road" + "boss/internal/models/system" "boss/internal/models/user" "boss/internal/utils" "github.com/beego/beego/v2/core/logs" @@ -24,7 +24,7 @@ type AddService struct { func (c *AddService) AddMenu(oneMenu, userID string) *datas.BaseDataJSON { dataJSON := new(datas.BaseDataJSON) - menuInfo := system2.MenuInfo{ + menuInfo := system.MenuInfo{ MenuUid: xid.New().String(), FirstMenu: oneMenu, Status: "active", @@ -32,10 +32,10 @@ func (c *AddService) AddMenu(oneMenu, userID string) *datas.BaseDataJSON { CreateTime: time.Now(), } - exist := system2.FirstMenuIsExists(oneMenu) + exist := system.FirstMenuIsExists(oneMenu) if !exist { - menuInfo.MenuOrder = system2.GetMenuLen() + 1 - flag := system2.InsertMenu(menuInfo) + menuInfo.MenuOrder = system.GetMenuLen() + 1 + flag := system.InsertMenu(menuInfo) if !flag { dataJSON.Code = -1 dataJSON.Msg = "添加菜单失败" @@ -52,9 +52,9 @@ func (c *AddService) AddMenu(oneMenu, userID string) *datas.BaseDataJSON { func (c *AddService) AddSecondMenu(firstMenuUid, secondRouter, secondMenu, userID string) *datas.KeyDataJSON { dataJSON := new(datas.KeyDataJSON) - firstMenuInfo := system2.GetMenuInfoByMenuUid(firstMenuUid) - routerExists := system2.SecondRouterExists(secondRouter) - secondMenuExists := system2.SecondMenuIsExists(secondMenu) + firstMenuInfo := system.GetMenuInfoByMenuUid(firstMenuUid) + routerExists := system.SecondRouterExists(secondRouter) + secondMenuExists := system.SecondMenuIsExists(secondMenu) if firstMenuInfo.MenuUid == "" { dataJSON.Code = -1 @@ -69,8 +69,8 @@ func (c *AddService) AddSecondMenu(firstMenuUid, secondRouter, secondMenu, userI dataJSON.Key = "second-menu-error" dataJSON.Msg = "*该菜单名已经存在" } else { - sl := system2.GetSecondMenuLenByFirstMenuUid(firstMenuUid) - secondMenuInfo := system2.SecondMenuInfo{ + sl := system.GetSecondMenuLenByFirstMenuUid(firstMenuUid) + secondMenuInfo := system.SecondMenuInfo{ MenuOrder: sl + 1, FirstMenuUid: firstMenuInfo.MenuUid, FirstMenu: firstMenuInfo.FirstMenu, @@ -83,7 +83,7 @@ func (c *AddService) AddSecondMenu(firstMenuUid, secondRouter, secondMenu, userI UpdateTime: time.Now(), FirstMenuOrder: firstMenuInfo.MenuOrder, } - if !system2.InsertSecondMenu(secondMenuInfo) { + if !system.InsertSecondMenu(secondMenuInfo) { dataJSON.Code = -1 dataJSON.Msg = "添加二级菜单失败" } else { @@ -108,15 +108,15 @@ func (c *AddService) AddPower(powerItem, powerID, firstMenuUid, secondMenuUid, u keyDataJSON.Msg = "*权限项ID不能为空" return keyDataJSON } - if system2.PowerUidExists(powerID) { + if system.PowerUidExists(powerID) { keyDataJSON.Key = ".power-id-error" keyDataJSON.Msg = "*权限项ID已经存在" return keyDataJSON } - secondMenuInfo := system2.GetSecondMenuInfoBySecondMenuUid(secondMenuUid) + secondMenuInfo := system.GetSecondMenuInfoBySecondMenuUid(secondMenuUid) - powerInfo := system2.PowerInfo{ + powerInfo := system.PowerInfo{ SecondMenuUid: secondMenuUid, SecondMenu: secondMenuInfo.SecondMenu, PowerId: powerID, PowerItem: powerItem, @@ -128,7 +128,7 @@ func (c *AddService) AddPower(powerItem, powerID, firstMenuUid, secondMenuUid, u } keyDataJSON.Code = 200 - if !system2.InsertPowerInfo(powerInfo) { + if !system.InsertPowerInfo(powerInfo) { keyDataJSON.Key = ".power-save-success" keyDataJSON.Msg = "添加权限项失败" } else { @@ -148,14 +148,14 @@ func (c *AddService) AddRole(roleName, roleRemark, userID string) *datas.KeyData return keyDataJSON } - if system2.RoleNameExists(roleName) { + if system.RoleNameExists(roleName) { keyDataJSON.Code = -1 keyDataJSON.Key = ".role-name-error" keyDataJSON.Msg = "*角色名称已经存在" return keyDataJSON } - roleInfo := system2.RoleInfo{ + roleInfo := system.RoleInfo{ RoleName: roleName, RoleUid: xid.New().String(), Creater: userID, @@ -165,7 +165,7 @@ func (c *AddService) AddRole(roleName, roleRemark, userID string) *datas.KeyData UpdateTime: time.Now(), } - if !system2.InsertRole(roleInfo) { + if !system.InsertRole(roleInfo) { keyDataJSON.Code = -1 keyDataJSON.Key = ".role-save-success" keyDataJSON.Msg = "添加角色失败" @@ -179,7 +179,7 @@ func (c *AddService) AddRole(roleName, roleRemark, userID string) *datas.KeyData func (c *AddService) SavePower(roleUid string, firstMenuUids, secondMenuUids, powerIds []string) *datas.BaseDataJSON { dataJSON := new(datas.BaseDataJSON) - roleInfo := system2.GetRoleByRoleUid(roleUid) + roleInfo := system.GetRoleByRoleUid(roleUid) if len(roleUid) == 0 || len(roleInfo.RoleUid) == 0 { dataJSON.Code = -1 return dataJSON @@ -190,28 +190,28 @@ func (c *AddService) SavePower(roleUid string, firstMenuUids, secondMenuUids, po roleInfo.ShowSecondUid = strings.Join(secondMenuUids, "||") roleInfo.ShowPowerUid = strings.Join(powerIds, "||") - menuInfoList := system2.GetMenuInfosByMenuUids(firstMenuUids) + menuInfoList := system.GetMenuInfosByMenuUids(firstMenuUids) showFirstMenu := make([]string, 0) for _, m := range menuInfoList { showFirstMenu = append(showFirstMenu, m.FirstMenu) } roleInfo.ShowFirstMenu = strings.Join(showFirstMenu, "||") - secondMenuInfoList := system2.GetSecondMenuInfoBySecondMenuUids(secondMenuUids) + secondMenuInfoList := system.GetSecondMenuInfoBySecondMenuUids(secondMenuUids) showSecondMenu := make([]string, 0) for _, m := range secondMenuInfoList { showSecondMenu = append(showSecondMenu, m.SecondMenu) } roleInfo.ShowSecondMenu = strings.Join(showSecondMenu, "||") - powerList := system2.GetPowerByIds(powerIds) + powerList := system.GetPowerByIds(powerIds) showPower := make([]string, 0) for _, p := range powerList { showPower = append(showPower, p.PowerItem) } roleInfo.ShowPower = strings.Join(showPower, "||") - if !system2.UpdateRoleInfo(roleInfo) { + if !system.UpdateRoleInfo(roleInfo) { dataJSON.Code = -1 dataJSON.Msg = "更新roleInfo失败" } else { @@ -241,7 +241,7 @@ func (c *AddService) AddOperator(loginAccount, loginPassword, role, status, rema if len(remark) == 0 { remark = loginAccount } - roleInfo := system2.GetRoleByRoleUid(role) + roleInfo := system.GetRoleByRoleUid(role) userInfo := user.UserInfo{ UserId: loginAccount, Passwd: utils.GetMD5Upper(loginPassword), @@ -295,8 +295,8 @@ func (c *AddService) AddBankCard(userName, bankCode, accountName, certificateTyp logs.Error("添加银行卡校验失败") } else { if len(uid) > 0 { - bankCardInfo := system2.GetBankCardByUid(uid) - bankCardInfo = system2.BankCardInfo{ + bankCardInfo := system.GetBankCardByUid(uid) + bankCardInfo = system.BankCardInfo{ Id: bankCardInfo.Id, UserName: userName, BankName: bankName, @@ -312,11 +312,11 @@ func (c *AddService) AddBankCard(userName, bankCode, accountName, certificateTyp CreateTime: bankCardInfo.CreateTime, Uid: bankCardInfo.Uid, } - if system2.UpdateBankCard(bankCardInfo) { + if system.UpdateBankCard(bankCardInfo) { dataJSON.Code = 200 } } else { - bankCardInfo := system2.BankCardInfo{ + bankCardInfo := system.BankCardInfo{ Uid: "3333" + xid.New().String(), UserName: userName, BankName: bankName, @@ -332,7 +332,7 @@ func (c *AddService) AddBankCard(userName, bankCode, accountName, certificateTyp CreateTime: time.Now(), } - if system2.InsertBankCardInfo(bankCardInfo) { + if system.InsertBankCardInfo(bankCardInfo) { dataJSON.Code = 200 } } @@ -340,9 +340,11 @@ func (c *AddService) AddBankCard(userName, bankCode, accountName, certificateTyp return dataJSON } -func (c *AddService) AddRoad(startHour, endHour, roadName, productUid, +func (c *AddService) AddRoad( + startHour, endHour, roadName, productUid, basicRate, settleFee, roadTotalLimit, roadEverydayLimit, - singleMinLimit, singleMaxLimit, roadUid, roadRemark, params, productCode, paymentHtml string) *datas.BaseDataJSON { + singleMinLimit, singleMaxLimit, roadUid, roadRemark, params, productCode, paymentHtml, transactionType string, +) *datas.BaseDataJSON { dataJSON := new(datas.BaseDataJSON) dataJSON.Code = -1 @@ -395,16 +397,15 @@ func (c *AddService) AddRoad(startHour, endHour, roadName, productUid, return dataJSON } productName := "" - supplierMap := common2.GetSupplierMap() + supplierMap := common.GetSupplierMap() for k, v := range supplierMap { if k == productUid { productName = v } } - if len(roadUid) > 0 { //更新通道 - roadInfo := road2.GetRoadInfoByRoadUid(roadUid) + roadInfo := road.GetRoadInfoByRoadUid(roadUid) roadInfo.RoadName = roadName roadInfo.Remark = roadRemark roadInfo.ProductUid = productUid @@ -420,8 +421,9 @@ func (c *AddService) AddRoad(startHour, endHour, roadName, productUid, roadInfo.Params = params roadInfo.ProductCode = productCode roadInfo.PaymentHtml = paymentHtml + roadInfo.TransactionType = transactionType - if road2.UpdateRoadInfo(roadInfo) { + if road.UpdateRoadInfo(roadInfo) { dataJSON.Code = 200 } else { dataJSON.Msg = "通道更新失败" @@ -429,28 +431,31 @@ func (c *AddService) AddRoad(startHour, endHour, roadName, productUid, } else { //添加新的通道 roadUid = "4444" + xid.New().String() - roadInfo := road2.RoadInfo{ - RoadName: roadName, - RoadUid: roadUid, - Remark: roadRemark, - ProductUid: productUid, - ProductName: productName, - BasicFee: basicFee, - SettleFee: settleFeeTmp, - TotalLimit: totalLimit, - TodayLimit: todayLimit, - SingleMinLimit: singleMinLimitTmp, - Balance: common2.ZERO, - SingleMaxLimit: singleMaxLimitTmp, - StarHour: startHourTmp, - EndHour: endHourTmp, - Status: "active", - Params: params, - UpdateTime: time.Now(), - CreateTime: time.Now(), + roadInfo := road.RoadInfo{ + ProductCode: productCode, + RoadName: roadName, + RoadUid: roadUid, + Remark: roadRemark, + ProductUid: productUid, + ProductName: productName, + BasicFee: basicFee, + SettleFee: settleFeeTmp, + TotalLimit: totalLimit, + TodayLimit: todayLimit, + SingleMinLimit: singleMinLimitTmp, + Balance: common.ZERO, + SingleMaxLimit: singleMaxLimitTmp, + StarHour: startHourTmp, + EndHour: endHourTmp, + Status: "active", + Params: params, + TransactionType: transactionType, + PaymentHtml: paymentHtml, + UpdateTime: time.Now(), + CreateTime: time.Now(), } - if road2.InsertRoadInfo(roadInfo) { + if road.InsertRoadInfo(roadInfo) { dataJSON.Code = 200 } else { dataJSON.Msg = "添加新通道失败" @@ -470,7 +475,7 @@ func (c *AddService) AddRoadPool(roadPoolName, roadPoolCode string) *datas.KeyDa keyDataJSON.Msg = "*通道池编号不能为空" } - roadPoolInfo := road2.RoadPoolInfo{ + roadPoolInfo := road.RoadPoolInfo{ Status: "active", RoadPoolName: roadPoolName, RoadPoolCode: roadPoolCode, @@ -478,7 +483,7 @@ func (c *AddService) AddRoadPool(roadPoolName, roadPoolCode string) *datas.KeyDa CreateTime: time.Now(), } - if road2.InsertRoadPool(roadPoolInfo) { + if road.InsertRoadPool(roadPoolInfo) { keyDataJSON.Code = 200 keyDataJSON.Msg = "添加通道池成功" } else { @@ -491,14 +496,14 @@ func (c *AddService) AddRoadPool(roadPoolName, roadPoolCode string) *datas.KeyDa func (c *AddService) SaveRoadUid(roadPoolCode string, roadUids []string) *datas.BaseDataJSON { dataJSON := new(datas.BaseDataJSON) dataJSON.Code = -1 - roadPoolInfo := road2.GetRoadPoolByRoadPoolCode(roadPoolCode) + roadPoolInfo := road.GetRoadPoolByRoadPoolCode(roadPoolCode) if roadPoolInfo.RoadPoolCode == "" { return dataJSON } var uids []string for _, uid := range roadUids { //去掉空格 - if len(uid) > 0 && road2.RoadInfoExistByRoadUid(uid) { + if len(uid) > 0 && road.RoadInfoExistByRoadUid(uid) { uids = append(uids, uid) } } @@ -507,7 +512,7 @@ func (c *AddService) SaveRoadUid(roadPoolCode string, roadUids []string) *datas. roadPoolInfo.RoadUidPool = roadUid } roadPoolInfo.UpdateTime = time.Now() - if road2.UpdateRoadPool(roadPoolInfo) { + if road.UpdateRoadPool(roadPoolInfo) { dataJSON.Code = 200 } return dataJSON @@ -607,7 +612,7 @@ func (c *AddService) AddMerchant(merchantName, phone, loginPassword, keyDataJSON.Code = -1 keyDataJSON.Key = "#merchant-name-error" keyDataJSON.Msg = "商户名称为空" - } else if merchant2.IsExistByMerchantName(merchantName) { + } else if merchant.IsExistByMerchantName(merchantName) { keyDataJSON.Code = -1 keyDataJSON.Key = "#merchant-name-error" keyDataJSON.Msg = "商户名已经存在" @@ -615,7 +620,7 @@ func (c *AddService) AddMerchant(merchantName, phone, loginPassword, keyDataJSON.Code = -1 keyDataJSON.Key = "#merchant-phone-error" keyDataJSON.Msg = "手机号为空" - } else if merchant2.IsExistByMerchantPhone(phone) { + } else if merchant.IsExistByMerchantPhone(phone) { keyDataJSON.Code = -1 keyDataJSON.Key = "#merchant-phone-error" keyDataJSON.Msg = "该手机号已经注册" @@ -639,7 +644,7 @@ func (c *AddService) AddMerchant(merchantName, phone, loginPassword, merchantUid := "8888" + xid.New().String() merchantKey := "kkkk" + xid.New().String() //商户key merchantSecret := "ssss" + xid.New().String() //商户密钥 - merchantInfo := merchant2.MerchantInfo{ + merchantInfo := merchant.MerchantInfo{ MerchantName: merchantName, MerchantUid: merchantUid, LoginAccount: phone, @@ -652,7 +657,7 @@ func (c *AddService) AddMerchant(merchantName, phone, loginPassword, CreateTime: time.Now(), } - if merchant2.InsertMerchantInfo(merchantInfo) { + if merchant.InsertMerchantInfo(merchantInfo) { keyDataJSON.Code = 200 } else { keyDataJSON.Code = -1 @@ -687,7 +692,7 @@ func (c *AddService) AddMerchantDeploy(merchantUid, isAutoSettle, isAutoPayfor, belongAgentUid, payforRoadChoose, rollPayforRoadChoose, payforFee string) *datas.KeyDataJSON { keyDataJSON := new(datas.KeyDataJSON) - merchantInfo := merchant2.GetMerchantByUid(merchantUid) + merchantInfo := merchant.GetMerchantByUid(merchantUid) merchantInfo.AutoSettle = isAutoSettle merchantInfo.AutoPayFor = isAutoPayfor merchantInfo.WhiteIps = ipWhite @@ -695,22 +700,22 @@ func (c *AddService) AddMerchantDeploy(merchantUid, isAutoSettle, isAutoPayfor, merchantInfo.BelongAgentUid = belongAgentUid if payforRoadChoose != "" { - roadInfo := road2.GetRoadInfoByName(payforRoadChoose) + roadInfo := road.GetRoadInfoByName(payforRoadChoose) merchantInfo.SinglePayForRoadName = payforRoadChoose merchantInfo.SinglePayForRoadUid = roadInfo.RoadUid } if rollPayforRoadChoose != "" { - rollPoolInfo := road2.GetRoadPoolByName(rollPayforRoadChoose) + rollPoolInfo := road.GetRoadPoolByName(rollPayforRoadChoose) merchantInfo.RollPayForRoadName = rollPayforRoadChoose merchantInfo.RollPayForRoadCode = rollPoolInfo.RoadPoolCode } tmp, err := strconv.ParseFloat(payforFee, 64) if err != nil { logs.Error("手续费由字符串转为float64失败") - tmp = common2.PAYFOR_FEE + tmp = common.PAYFOR_FEE } merchantInfo.PayforFee = tmp - if merchant2.UpdateMerchant(merchantInfo) { + if merchant.UpdateMerchant(merchantInfo) { keyDataJSON.Code = 200 } else { keyDataJSON.Code = -1 @@ -744,7 +749,7 @@ func (c *AddService) AddMerchantPayType(payType, singleRoad, rollPoolRoad, keyDataJSON.Msg = "轮询通道平台利润率不能为0" } - if !merchant2.CheckMarginValid(singleRoadPlatformFee) { + if !merchant.CheckMarginValid(singleRoadPlatformFee) { keyDataJSON.Code = -1 keyDataJSON.Msg = "费率映射设置错误！" } @@ -779,7 +784,7 @@ func (c *AddService) AddMerchantPayType(payType, singleRoad, rollPoolRoad, j = 0 } - var merchantDeployInfo merchant2.MerchantDeployInfo + var merchantDeployInfo merchant.MerchantDeployInfo merchantDeployInfo.MerchantUid = merchantNo merchantDeployInfo.PayType = payType merchantDeployInfo.SingleRoadName = singleRoad @@ -792,16 +797,16 @@ func (c *AddService) AddMerchantPayType(payType, singleRoad, rollPoolRoad, merchantDeployInfo.LoanDays = i merchantDeployInfo.UnfreezeHour = j merchantDeployInfo.RollRoadName = rollPoolRoad - roadInfo := road2.GetRoadInfoByName(singleRoad) - rollPoolInfo := road2.GetRoadPoolByName(rollPoolRoad) + roadInfo := road.GetRoadInfoByName(singleRoad) + rollPoolInfo := road.GetRoadPoolByName(rollPoolRoad) merchantDeployInfo.SingleRoadUid = roadInfo.RoadUid merchantDeployInfo.RollRoadCode = rollPoolInfo.RoadPoolCode //如果该用户的改支付类型已经存在,那么进行更新，否则进行添加 - if merchant2.IsExistByUidAndPayType(merchantNo, payType) { + if merchant.IsExistByUidAndPayType(merchantNo, payType) { if singleRoad == "" && rollPoolRoad == "" { //表示需要删除该支付类型的通道 - if merchant2.DeleteMerchantDeployByUidAndPayType(merchantNo, payType) { + if merchant.DeleteMerchantDeployByUidAndPayType(merchantNo, payType) { keyDataJSON.Code = 200 keyDataJSON.Msg = "删除该支付类型通道成功" } else { @@ -809,12 +814,12 @@ func (c *AddService) AddMerchantPayType(payType, singleRoad, rollPoolRoad, keyDataJSON.Msg = "删除该支付类型通道失败" } } else { - tmpInfo := merchant2.GetMerchantDeployByUidAndPayType(merchantNo, payType) + tmpInfo := merchant.GetMerchantDeployByUidAndPayType(merchantNo, payType) merchantDeployInfo.Id = tmpInfo.Id merchantDeployInfo.Status = tmpInfo.Status merchantDeployInfo.UpdateTime = time.Now() merchantDeployInfo.CreateTime = tmpInfo.CreateTime - if merchant2.UpdateMerchantDeploy(merchantDeployInfo) { + if merchant.UpdateMerchantDeploy(merchantDeployInfo) { keyDataJSON.Code = 200 keyDataJSON.Msg = "更新成功" } else { @@ -829,8 +834,8 @@ func (c *AddService) AddMerchantPayType(payType, singleRoad, rollPoolRoad, } else { merchantDeployInfo.CreateTime = time.Now() merchantDeployInfo.UpdateTime = time.Now() - merchantDeployInfo.Status = common2.ACTIVE - if merchant2.InsertMerchantDeployInfo(merchantDeployInfo) { + merchantDeployInfo.Status = common.ACTIVE + if merchant.InsertMerchantDeployInfo(merchantDeployInfo) { keyDataJSON.Code = 200 keyDataJSON.Msg = "添加支付类型成功" } else { @@ -866,12 +871,12 @@ func (c *AddService) AddPayFor(merchantUid, bankUid, payForAmount, bankNo, accou } accountInfo := accounts.GetAccountByUid(merchantUid) - if accountInfo.SettleAmount < money+common2.PAYFOR_FEE { + if accountInfo.SettleAmount < money+common.PAYFOR_FEE { keyDataJSON.Msg = "用户可用金额不够" return keyDataJSON } - bankInfo := system2.GetBankCardByUid(bankUid) + bankInfo := system.GetBankCardByUid(bankUid) if bankInfo.BankNo != bankNo || bankInfo.AccountName != accountName || bankInfo.PhoneNo != phone { keyDataJSON.Msg = "银行卡信息有误，请连接管理员" @@ -884,16 +889,16 @@ func (c *AddService) AddPayFor(merchantUid, bankUid, payForAmount, bankNo, accou MerchantName: merchantName, PhoneNo: phone, MerchantOrderId: xid.New().String(), BankOrderId: "4444" + xid.New().String(), - PayforFee: common2.PAYFOR_FEE, Type: common2.SELF_MERCHANT, + PayforFee: common.PAYFOR_FEE, Type: common.SELF_MERCHANT, PayforAmount: money, - PayforTotalAmount: money + common2.PAYFOR_FEE, + PayforTotalAmount: money + common.PAYFOR_FEE, BankCode: bankInfo.BankCode, - BankName: bankName, IsSend: common2.NO, + BankName: bankName, IsSend: common.NO, BankAccountName: bankInfo.AccountName, BankAccountNo: bankInfo.BankNo, BankAccountType: bankInfo.BankAccountType, BankAccountAddress: bankAddress, - Status: common2.PAYFOR_COMFRIM, + Status: common.PAYFOR_COMFRIM, RequestTime: time.Now(), CreateTime: time.Now(), UpdateTime: time.Now(), @@ -926,7 +931,7 @@ func (c *AddService) AddSelfPayFor(bankUid, payForAmount, accountName, return keyDataJSON } - bankInfo := system2.GetBankCardByUid(bankUid) + bankInfo := system.GetBankCardByUid(bankUid) //需要对前端传入的数据做校验，不能完全相信前端的数据 if bankInfo.AccountName != accountName || bankInfo.BankNo != bankNo || bankInfo.PhoneNo != phone { @@ -937,18 +942,18 @@ func (c *AddService) AddSelfPayFor(bankUid, payForAmount, accountName, selfPayFor := payfor.PayforInfo{ PayforUid: "pppp" + xid.New().String(), BankOrderId: "4444" + xid.New().String(), - PayforFee: common2.ZERO, - Type: common2.SELF_HELP, + PayforFee: common.ZERO, + Type: common.SELF_HELP, PayforAmount: money, - PayforTotalAmount: money + common2.ZERO, + PayforTotalAmount: money + common.ZERO, BankCode: bankInfo.BankCode, BankName: bankName, - IsSend: common2.NO, + IsSend: common.NO, BankAccountName: bankInfo.AccountName, BankAccountNo: bankInfo.BankNo, BankAccountType: bankInfo.BankAccountType, BankAccountAddress: bankAddress, - Status: common2.PAYFOR_COMFRIM, + Status: common.PAYFOR_COMFRIM, CreateTime: time.Now(), UpdateTime: time.Now(), } diff --git a/internal/service/deleteService.go b/internal/service/deleteService.go index 243f004..d462ccb 100644 --- a/internal/service/deleteService.go +++ b/internal/service/deleteService.go @@ -5,8 +5,8 @@ import ( "boss/internal/models/accounts" "boss/internal/models/agent" "boss/internal/models/merchant" - road2 "boss/internal/models/road" - system2 "boss/internal/models/system" + "boss/internal/models/road" + "boss/internal/models/system" "boss/internal/models/user" "github.com/beego/beego/v2/core/logs" "sort" @@ -24,27 +24,27 @@ func (c *DeleteService) Finish() { remainderSecondMenu := make([]string, 0) remainderPowerId := make([]string, 0) remainderPower := make([]string, 0) - allRoleInfo := system2.GetRole() + allRoleInfo := system.GetRole() //如果有删除任何的东西，需要重新赋值权限 for _, r := range allRoleInfo { for _, showFirstUid := range strings.Split(r.ShowFirstUid, "||") { - if system2.FirstMenuUidIsExists(showFirstUid) { + if system.FirstMenuUidIsExists(showFirstUid) { remainderFirstMenuUid = append(remainderFirstMenuUid, showFirstUid) - menuInfo := system2.GetMenuInfoByMenuUid(showFirstUid) + menuInfo := system.GetMenuInfoByMenuUid(showFirstUid) remainderFirstMenu = append(remainderFirstMenu, menuInfo.FirstMenu) } } for _, showSecondUid := range strings.Split(r.ShowSecondUid, "||") { - if system2.SecondMenuUidIsExists(showSecondUid) { + if system.SecondMenuUidIsExists(showSecondUid) { remainderSecondMenuUid = append(remainderSecondMenuUid, showSecondUid) - secondMenuInfo := system2.GetSecondMenuInfoBySecondMenuUid(showSecondUid) + secondMenuInfo := system.GetSecondMenuInfoBySecondMenuUid(showSecondUid) remainderSecondMenu = append(remainderSecondMenu, secondMenuInfo.SecondMenu) } } for _, showPowerId := range strings.Split(r.ShowPowerUid, "||") { - if system2.PowerUidExists(showPowerId) { + if system.PowerUidExists(showPowerId) { remainderPowerId = append(remainderPowerId, showPowerId) - powerInfo := system2.GetPowerById(showPowerId) + powerInfo := system.GetPowerById(showPowerId) remainderPower = append(remainderPower, powerInfo.PowerItem) } } @@ -55,22 +55,22 @@ func (c *DeleteService) Finish() { r.ShowPowerUid = strings.Join(remainderPowerId, "||") r.ShowPower = strings.Join(remainderPower, "||") r.UpdateTime = time.Now() - system2.UpdateRoleInfo(r) + system.UpdateRoleInfo(r) } } func (c *DeleteService) DeleteMenu(menuUid, userID string) *datas.BaseDataJSON { dataJSON := new(datas.BaseDataJSON) - menuInfo := system2.GetMenuInfoByMenuUid(menuUid) + menuInfo := system.GetMenuInfoByMenuUid(menuUid) if menuInfo.MenuUid == "" { dataJSON.Msg = "不存在该菜单" dataJSON.Code = -1 } else { logs.Info(userID + "，执行了删除一级菜单操作") - system2.DeleteMenuInfo(menuUid) + system.DeleteMenuInfo(menuUid) //删除该一级目下下的所有二级目录 - system2.DeleteSecondMenuByFirstMenuUid(menuUid) + system.DeleteSecondMenuByFirstMenuUid(menuUid) SortFirstMenuOrder() dataJSON.Code = 200 } @@ -79,27 +79,27 @@ func (c *DeleteService) DeleteMenu(menuUid, userID string) *datas.BaseDataJSON { } func (c *DeleteService) DeleteSecondMenu(secondMenuUid string) *datas.BaseDataJSON { - secondMenuInfo := system2.GetSecondMenuInfoBySecondMenuUid(secondMenuUid) + secondMenuInfo := system.GetSecondMenuInfoBySecondMenuUid(secondMenuUid) dataJSON := new(datas.BaseDataJSON) if secondMenuUid == "" || secondMenuInfo.SecondMenuUid == "" { dataJSON.Code = -1 dataJSON.Msg = "该二级菜单不存在" } else { - if system2.DeleteSecondMenuBySecondMenuUid(secondMenuUid) { + if system.DeleteSecondMenuBySecondMenuUid(secondMenuUid) { dataJSON.Code = 200 - ml := system2.GetSecondMenuLenByFirstMenuUid(secondMenuInfo.FirstMenuUid) + ml := system.GetSecondMenuLenByFirstMenuUid(secondMenuInfo.FirstMenuUid) //删除该二级页面下的所有权限项 - system2.DeletePowerBySecondUid(secondMenuUid) + system.DeletePowerBySecondUid(secondMenuUid) if ml == 0 { //如果该二级类目已经被全部删除，那么对应的一级类目也应当删除 - system2.DeleteMenuInfo(secondMenuInfo.FirstMenuUid) + system.DeleteMenuInfo(secondMenuInfo.FirstMenuUid) SortFirstMenuOrder() } else { - secondMenuInfoList := system2.GetSecondMenuListByFirstMenuUid(secondMenuInfo.FirstMenuUid) - sort.Sort(system2.SecondMenuSlice(secondMenuInfoList)) + secondMenuInfoList := system.GetSecondMenuListByFirstMenuUid(secondMenuInfo.FirstMenuUid) + sort.Sort(system.SecondMenuSlice(secondMenuInfoList)) for i := 0; i < len(secondMenuInfoList); i++ { m := secondMenuInfoList[i] - system2.UpdateSecondMenuOrderBySecondUid(m.SecondMenuUid, i+1) + system.UpdateSecondMenuOrderBySecondUid(m.SecondMenuUid, i+1) } } } else { @@ -111,7 +111,7 @@ func (c *DeleteService) DeleteSecondMenu(secondMenuUid string) *datas.BaseDataJS } func (c *DeleteService) DeletePowerItem(powerID string) *datas.BaseDataJSON { - system2.DeletePowerItemByPowerID(powerID) + system.DeletePowerItemByPowerID(powerID) dataJSON := new(datas.BaseDataJSON) dataJSON.Code = 200 return dataJSON @@ -120,7 +120,7 @@ func (c *DeleteService) DeletePowerItem(powerID string) *datas.BaseDataJSON { func (c *DeleteService) DeleteRole(roleUid string) *datas.BaseDataJSON { dataJSON := new(datas.BaseDataJSON) - if system2.DeleteRoleByRoleUid(roleUid) { + if system.DeleteRoleByRoleUid(roleUid) { dataJSON.Code = 200 } else { dataJSON.Code = -1 @@ -145,7 +145,7 @@ func (c *DeleteService) DeleteBankCardRecord(uid string) *datas.BankCardDataJSON dataJSON := new(datas.BankCardDataJSON) dataJSON.Code = -1 - if system2.DeleteBankCardByUid(uid) { + if system.DeleteBankCardByUid(uid) { dataJSON.Code = 200 } return dataJSON @@ -156,11 +156,11 @@ func (c *DeleteService) DeleteRoad(roadUid string) *datas.BaseDataJSON { dataJSON := new(datas.BaseDataJSON) dataJSON.Code = -1 - if road2.DeleteRoadByRoadUid(roadUid) { + if road.DeleteRoadByRoadUid(roadUid) { dataJSON.Code = 200 } params := make(map[string]string) - roadPoolInfoList := road2.GetAllRollPool(params) + roadPoolInfoList := road.GetAllRollPool(params) //将轮询池中的对应的通道删除 for _, roadPoolInfo := range roadPoolInfoList { var uids []string @@ -172,7 +172,7 @@ func (c *DeleteService) DeleteRoad(roadUid string) *datas.BaseDataJSON { } roadPoolInfo.RoadUidPool = strings.Join(uids, "||") roadPoolInfo.UpdateTime = time.Now() - road2.UpdateRoadPool(roadPoolInfo) + road.UpdateRoadPool(roadPoolInfo) } return dataJSON } @@ -181,7 +181,7 @@ func (c *DeleteService) DeleteRoadPool(roadPoolCode string) *datas.BaseDataJSON dataJSON := new(datas.BaseDataJSON) dataJSON.Code = -1 - if road2.DeleteRoadPoolByCode(roadPoolCode) { + if road.DeleteRoadPoolByCode(roadPoolCode) { dataJSON.Code = 200 } else { dataJSON.Msg = "删除通道池失败" @@ -264,14 +264,14 @@ func (c *DeleteService) DeleteAgentRelation(merchantUid string) *datas.KeyDataJS * 对一级菜单重新进行排序 */ func SortFirstMenuOrder() { - menuInfoList := system2.GetMenuAll() - sort.Sort(system2.MenuInfoSlice(menuInfoList)) + menuInfoList := system.GetMenuAll() + sort.Sort(system.MenuInfoSlice(menuInfoList)) for i := 0; i < len(menuInfoList); i++ { m := menuInfoList[i] m.UpdateTime = time.Now() m.MenuOrder = i + 1 - system2.UpdateMenuInfo(m) + system.UpdateMenuInfo(m) //对应的二级菜单也应该重新分配顺序号 SortSecondMenuOrder(m) } @@ -280,13 +280,13 @@ func SortFirstMenuOrder() { /* * 对二级菜单分配顺序号 */ -func SortSecondMenuOrder(firstMenuInfo system2.MenuInfo) { - secondMenuInfoList := system2.GetSecondMenuListByFirstMenuUid(firstMenuInfo.MenuUid) +func SortSecondMenuOrder(firstMenuInfo system.MenuInfo) { + secondMenuInfoList := system.GetSecondMenuListByFirstMenuUid(firstMenuInfo.MenuUid) for _, sm := range secondMenuInfoList { sm.FirstMenuOrder = firstMenuInfo.MenuOrder sm.UpdateTime = time.Now() - system2.UpdateSecondMenu(sm) + system.UpdateSecondMenu(sm) //删除下下一级的所有权限项 - system2.DeletePowerBySecondUid(sm.SecondMenuUid) + system.DeletePowerBySecondUid(sm.SecondMenuUid) } } diff --git a/internal/service/queryService.go b/internal/service/queryService.go index 6db465a..55d6dd6 100644 --- a/internal/service/queryService.go +++ b/internal/service/queryService.go @@ -3,7 +3,7 @@ package service import ( "boss/internal/common" "boss/internal/datas" - order2 "boss/internal/models/order" + "boss/internal/models/order" "boss/internal/models/payfor" "boss/internal/models/road" "boss/internal/models/user" @@ -21,7 +21,7 @@ type QueryService struct { } func OrderQuery(bankOrderId string) string { - orderInfo := order2.GetOrderByBankOrderId(bankOrderId) + orderInfo := order.GetOrderByBankOrderId(bankOrderId) if orderInfo.BankOrderId == "" || len(orderInfo.BankOrderId) == 0 { logs.Error("不存在这样的订单，订单查询结束") return "不存在这样的订单" @@ -47,7 +47,7 @@ func OrderQuery(bankOrderId string) string { func (c *QueryService) SupplierOrderQuery(bankOrderId string) *datas.KeyDataJSON { keyDataJSON := new(datas.KeyDataJSON) keyDataJSON.Code = 200 - exist := order2.BankOrderIdIsExist(bankOrderId) + exist := order.BankOrderIdIsExist(bankOrderId) if !exist { keyDataJSON.Msg = "该订单不存在" keyDataJSON.Code = -1 @@ -97,13 +97,13 @@ func querySupplierPayForResult(bankOrderId string) bool { } } -func QueryTotalSummary(params map[string]string) order2.Summary { - orderInfoList := order2.GetOrderByMap(params, -1, 0) +func QueryTotalSummary(params map[string]string) order.Summary { + orderInfoList := order.GetOrderByMap(params, -1, 0) bankIdList := make([]string, 0) for _, info := range orderInfoList { bankIdList = append(bankIdList, info.BankOrderId) } - orderProfitList := order2.GetOrderProfitListByBankOrderIdList(bankIdList) + orderProfitList := order.GetOrderProfitListByBankOrderIdList(bankIdList) supplierAll := 0.0 platformAll := 0.0 agentAll := 0.0 @@ -129,7 +129,7 @@ func QueryTotalSummary(params map[string]string) order2.Summary { } else { succeedRate = 0 } - return order2.Summary{ + return order.Summary{ TotalNum: totalNum, TotalAmount: math.Round(allAmount*100) / 100, PaidNum: succeedNum, @@ -139,11 +139,11 @@ func QueryTotalSummary(params map[string]string) order2.Summary { } } -func QuerySummaryByOrderInfo(infoInfoList []order2.OrderInfo) order2.Summary { - orderProfitInfoList := make([]order2.OrderProfitInfo, 0) +func QuerySummaryByOrderInfo(infoInfoList []order.OrderInfo) order.Summary { + orderProfitInfoList := make([]order.OrderProfitInfo, 0) for _, info := range infoInfoList { - orderProfitInfoList = append(orderProfitInfoList, order2.GetOrderProfitByBankOrderId(info.BankOrderId)) + orderProfitInfoList = append(orderProfitInfoList, order.GetOrderProfitByBankOrderId(info.BankOrderId)) } totalNum := 0 @@ -175,7 +175,7 @@ func QuerySummaryByOrderInfo(infoInfoList []order2.OrderInfo) order2.Summary { succeedRate = 0 } - return order2.Summary{ + return order.Summary{ TotalNum: totalNum, TotalAmount: math.Round(todayAllAmount*100) / 100, PaidNum: TodaySuccessNum, @@ -185,7 +185,7 @@ func QuerySummaryByOrderInfo(infoInfoList []order2.OrderInfo) order2.Summary { } } -func QueryTodaySummary(params map[string]string) order2.Summary { +func QueryTodaySummary(params map[string]string) order.Summary { now := time.Now() todayAtMidnight := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location()) tomorrowAtMidNight := time.Date(now.Year(), now.Month(), now.Day(), 59, 59, 59, 0, now.Location()) @@ -217,13 +217,13 @@ func QueryTodaySummary(params map[string]string) order2.Summary { } else { paramsProfit["create_time__lte"] = end } - orderInfoList := order2.GetOrderByMap(paramsProfit, -1, 0) + orderInfoList := order.GetOrderByMap(paramsProfit, -1, 0) bankIdList := make([]string, 0) for _, info := range orderInfoList { bankIdList = append(bankIdList, info.BankOrderId) } - dataInfo := order2.GetOrderProfitListByBankOrderIdList(bankIdList) + dataInfo := order.GetOrderProfitListByBankOrderIdList(bankIdList) totalNum := 0 todaySuccessNum := 0 todayAllAmount := 0.0 @@ -247,7 +247,7 @@ func QueryTodaySummary(params map[string]string) order2.Summary { if totalNum != 0 { succeedRate = math.Round(float64(todaySuccessNum)/float64(totalNum)*100*100) / 100 } - return order2.Summary{ + return order.Summary{ TotalNum: totalNum, TotalAmount: math.Round(todayAllAmount*100) / 100, PaidNum: todaySuccessNum, diff --git a/internal/service/summary.go b/internal/service/summary.go index 3114c11..2b8949d 100644 --- a/internal/service/summary.go +++ b/internal/service/summary.go @@ -2,7 +2,7 @@ package service import ( "boss/internal/common" - order2 "boss/internal/models/order" + "boss/internal/models/order" "math" "time" ) @@ -10,13 +10,13 @@ import ( type OrderSummary struct { } -func (s *OrderSummary) GetTodaySummary() (todaySummary order2.Summary) { - todaySummary = order2.Summary{} +func (s *OrderSummary) GetTodaySummary() (todaySummary order.Summary) { + todaySummary = order.Summary{} now := time.Now() // 获取今日零点 todayZero := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.UTC) - orderList, err := order2.GetOrderByTime(todayZero.String(), now.String()) + orderList, err := order.GetOrderByTime(todayZero.String(), now.String()) if err != nil { return @@ -38,7 +38,7 @@ func (s *OrderSummary) GetTodaySummary() (todaySummary order2.Summary) { } - todaySummary = order2.Summary{ + todaySummary = order.Summary{ TotalNum: len(orderList), TotalAmount: math.Round(amount*100) / 100, PaidNum: paidNum, diff --git a/internal/service/updateService.go b/internal/service/updateService.go index 8c0bc93..ad80260 100644 --- a/internal/service/updateService.go +++ b/internal/service/updateService.go @@ -10,7 +10,7 @@ import ( "boss/internal/models/merchant" "boss/internal/models/payfor" "boss/internal/models/road" - system2 "boss/internal/models/system" + "boss/internal/models/system" "boss/internal/models/user" "boss/internal/utils" "fmt" @@ -25,26 +25,26 @@ type UpdateService struct { } func (c *UpdateService) UpMenu(menuUid string) *datas.BaseDataJSON { - menuInfo := system2.GetMenuInfoByMenuUid(menuUid) + menuInfo := system.GetMenuInfoByMenuUid(menuUid) dataJSON := new(datas.BaseDataJSON) if menuInfo.MenuUid == "" { dataJSON.Msg = "更改排列顺序失败" dataJSON.Code = -1 } else { - exist := system2.MenuOrderIsExists(menuInfo.MenuOrder - 1) + exist := system.MenuOrderIsExists(menuInfo.MenuOrder - 1) if !exist { dataJSON.Msg = "已经是最高的顺序" dataJSON.Code = -1 } else { //如果他前面有菜单，那么交换他们的menuOrder - preMenuInfo := system2.GetMenuInfoByMenuOrder(menuInfo.MenuOrder - 1) + preMenuInfo := system.GetMenuInfoByMenuOrder(menuInfo.MenuOrder - 1) menuInfo.MenuOrder = menuInfo.MenuOrder - 1 preMenuInfo.MenuOrder = preMenuInfo.MenuOrder + 1 preMenuInfo.UpdateTime = time.Now() menuInfo.UpdateTime = time.Now() //更新菜单表 - system2.UpdateMenuInfo(preMenuInfo) - system2.UpdateMenuInfo(menuInfo) + system.UpdateMenuInfo(preMenuInfo) + system.UpdateMenuInfo(menuInfo) //更新二级菜单表 SortSecondMenuOrder(preMenuInfo) SortSecondMenuOrder(menuInfo) @@ -55,26 +55,26 @@ func (c *UpdateService) UpMenu(menuUid string) *datas.BaseDataJSON { } func (c *UpdateService) DownMenu(menuUid string) *datas.BaseDataJSON { - menuInfo := system2.GetMenuInfoByMenuUid(menuUid) + menuInfo := system.GetMenuInfoByMenuUid(menuUid) dataJSON := new(datas.BaseDataJSON) if menuInfo.MenuUid == "" { dataJSON.Msg = "更改排列顺序失败" dataJSON.Code = -1 } else { - exist := system2.MenuOrderIsExists(menuInfo.MenuOrder + 1) + exist := system.MenuOrderIsExists(menuInfo.MenuOrder + 1) if !exist { dataJSON.Msg = "已经是最高的顺序" dataJSON.Code = -1 } else { //如果他前面有菜单，那么交换他们的menuOrder - lastMenuInfo := system2.GetMenuInfoByMenuOrder(menuInfo.MenuOrder + 1) + lastMenuInfo := system.GetMenuInfoByMenuOrder(menuInfo.MenuOrder + 1) menuInfo.MenuOrder = menuInfo.MenuOrder + 1 lastMenuInfo.MenuOrder = lastMenuInfo.MenuOrder - 1 lastMenuInfo.UpdateTime = time.Now() menuInfo.UpdateTime = time.Now() //更新菜单表 - system2.UpdateMenuInfo(lastMenuInfo) - system2.UpdateMenuInfo(menuInfo) + system.UpdateMenuInfo(lastMenuInfo) + system.UpdateMenuInfo(menuInfo) //更新二级菜单表 SortSecondMenuOrder(lastMenuInfo) SortSecondMenuOrder(menuInfo) @@ -85,19 +85,19 @@ func (c *UpdateService) DownMenu(menuUid string) *datas.BaseDataJSON { } func (c *UpdateService) UpSecondMenu(secondMenuUid string) *datas.BaseDataJSON { - secondMenuInfo := system2.GetSecondMenuInfoBySecondMenuUid(secondMenuUid) + secondMenuInfo := system.GetSecondMenuInfoBySecondMenuUid(secondMenuUid) dataJSON := new(datas.BaseDataJSON) if secondMenuInfo.MenuOrder == 1 { dataJSON.Code = -1 } else { - preSecondMenuInfo := system2.GetSecondMenuInfoByMenuOrder(secondMenuInfo.MenuOrder-1, secondMenuInfo.FirstMenuUid) + preSecondMenuInfo := system.GetSecondMenuInfoByMenuOrder(secondMenuInfo.MenuOrder-1, secondMenuInfo.FirstMenuUid) preSecondMenuInfo.MenuOrder = preSecondMenuInfo.MenuOrder + 1 preSecondMenuInfo.UpdateTime = time.Now() secondMenuInfo.MenuOrder = secondMenuInfo.MenuOrder - 1 secondMenuInfo.UpdateTime = time.Now() //更新二级菜单项 - system2.UpdateSecondMenu(preSecondMenuInfo) - system2.UpdateSecondMenu(secondMenuInfo) + system.UpdateSecondMenu(preSecondMenuInfo) + system.UpdateSecondMenu(secondMenuInfo) dataJSON.Code = 200 } @@ -105,23 +105,23 @@ func (c *UpdateService) UpSecondMenu(secondMenuUid string) *datas.BaseDataJSON { } func (c *UpdateService) DownSecondMenu(secondMenuUid string) *datas.BaseDataJSON { - secondMenuInfo := system2.GetSecondMenuInfoBySecondMenuUid(secondMenuUid) + secondMenuInfo := system.GetSecondMenuInfoBySecondMenuUid(secondMenuUid) dataJSON := new(datas.BaseDataJSON) - l := system2.GetSecondMenuLenByFirstMenuUid(secondMenuInfo.FirstMenuUid) + l := system.GetSecondMenuLenByFirstMenuUid(secondMenuInfo.FirstMenuUid) if l == secondMenuInfo.MenuOrder { dataJSON.Code = -1 } else { - lastSecondMenu := system2.GetSecondMenuInfoByMenuOrder(secondMenuInfo.MenuOrder+1, secondMenuInfo.FirstMenuUid) + lastSecondMenu := system.GetSecondMenuInfoByMenuOrder(secondMenuInfo.MenuOrder+1, secondMenuInfo.FirstMenuUid) lastSecondMenu.MenuOrder = lastSecondMenu.MenuOrder - 1 lastSecondMenu.UpdateTime = time.Now() secondMenuInfo.MenuOrder = secondMenuInfo.MenuOrder + 1 secondMenuInfo.UpdateTime = time.Now() - system2.UpdateSecondMenu(lastSecondMenu) - system2.UpdateSecondMenu(secondMenuInfo) + system.UpdateSecondMenu(lastSecondMenu) + system.UpdateSecondMenu(secondMenuInfo) dataJSON.Code = 200 } @@ -179,7 +179,7 @@ func (c *UpdateService) EditOperator(password, changePassword, role, userId, nic } else { userInfo.UpdateTime = time.Now() userInfo.Remark = remark - roleInfo := system2.GetRoleByRoleUid(role) + roleInfo := system.GetRoleByRoleUid(role) userInfo.RoleName = roleInfo.RoleName userInfo.Role = role if len(password) > 0 && len(changePassword) > 0 && password == changePassword { diff --git a/main.go b/main.go index d5b4a1f..af51111 100644 --- a/main.go +++ b/main.go @@ -1,8 +1,8 @@ package main import ( - _ "boss/models" - _ "boss/routers" + _ "boss/internal/models" + _ "boss/internal/routers" "github.com/beego/beego/v2/core/logs" "github.com/beego/beego/v2/server/web" diff --git a/views/account.html b/views/account.html index 50fd592..7c6f62c 100644 --- a/views/account.html +++ b/views/account.html @@ -5,7 +5,7 @@ 管理后台 - + +
-
+
- -
- -
- - - - - - - - - - - - - - -
序列号账户编号账户名称动账类型动账金额当前余额动账时间
-
- -
-
  • - 每页显示 - -
    • - -
  • 第0/0页
    • -
  • 上一页
    • -
  • 下一页
    • -
  • 跳转
    • -
    + +
    + +
    + + + + + + + + + + + + + + +
    序列号账户编号账户名称动账类型动账金额当前余额动账时间
    +
    + +
    +
  • + 每页显示 + +
    • + +
  • 第0/0页
    • +
  • 上一页
    • +
  • 下一页
    • +
  • 跳转 + +
    • +
    diff --git a/views/agent_to_merchant.html b/views/agent_to_merchant.html index e00c219..cb848bc 100644 --- a/views/agent_to_merchant.html +++ b/views/agent_to_merchant.html @@ -3,9 +3,10 @@ 管理后台 - - - + + + @@ -16,9 +17,11 @@ .search label { font-weight: normal; } - #select-agent-name,#select-merchant-name { + + #select-agent-name, #select-merchant-name { margin-right: 20px; } + .search label select { height: 30px; line-height: 30px; @@ -26,175 +29,180 @@ -
    - - - -
    -
    - - - - - - - - - - - - - -
    序列号代理名称代理uid代理商户名代理商户uid操作
    -
    - -
    -
  • - 每页显示 - -
    • +
    + + + +
    +
    + + + + + + + + + + + + + +
    序列号代理名称代理uid代理商户名代理商户uid操作
    +
    + +
    +
  • + 每页显示 + +
    • -
  • 第0/0页
    • -
  • 上一页
    • -
  • 下一页
    • -
  • 跳转
    • -
    +
  • 第0/0页
    • +
  • 上一页
    • +
  • 下一页
    • +
  • 跳转 + +
    • +
    - + } + + function search(dataJSON) { + $.ajax({ + url: "/get/agent/to/merchant", + data: dataJSON, + success: function (res) { + if (res.Code == 404) { + window.parent.location = "/login.html"; + } else { + randAgentToMerchant(res); + } + }, + error: function () { + alert("系统异常，请稍后再试"); + } + }); + } + + $(function () { + setMerchant(); + setAgent(); + search(getValues()); + }); + \ No newline at end of file diff --git a/views/apple-card/account.html b/views/apple-card/account.html index 1c1d1e7..94de1b8 100644 --- a/views/apple-card/account.html +++ b/views/apple-card/account.html @@ -1,8 +1,8 @@ - + + + 管理后台 + + + + -
    -
    -
    - 开户名： - - -
    -
    - -
    - - - - - - - - - - - - - - - - - - - -
    序列号商户名称(UID)银行名称银行编码对账卡类型开户名银行卡号证件类型身份证号手机号开户银行地址操作
    -
    - -
    -
  • - 每页显示 - -
    • - -
  • 第0/0页
    • -
  • 上一页
    • -
  • 下一页
    • -
  • 跳转
    • -
    -
    - -
    -
    - 添加银行卡 -
    -
    - -
    - 商户名称： - -
    -
    - 银行编码： - -
    -
    - 银行开户名： - -
    -
    - 证件类型： - -
    -
    - 手机号： - -
    -
    +
    +
    +
    + 开户名： + + +
    +
    + +
    + + + + + + + + + + + + + + + + + + + +
    序列号商户名称(UID)银行名称银行编码对账卡类型开户名银行卡号证件类型身份证号手机号开户银行地址操作
    +
    + +
    +
  • + 每页显示 + +
    • -
    -
    - 银行名称： - -
    -
    - 银行账户类型 - -
    -
    - 银行卡账号： - -
    -
    - 证件号： - -
    -
    - 开户行详细地址： - -
    -
    -
    -
    -
    - 操作 -
    - 取消 - 保存 -
    -
    -
    +
  • 第0/0页
    • +
  • 上一页
    • +
  • 下一页
    • +
  • 跳转 + +
    • + + - + function getBankCardData() { + let userName = $(".user-name").val(); + let bankCode = $(".bank-code").val(); + let accountName = $(".account-name").val(); + let certificateType = $("#certificate-type").val(); + let phoneNo = $(".phone-code").val(); + let bankName = $(".bank-name").val(); + let bankAccountType = $("#bank-account-type").val(); + let bankNo = $(".bank-no").val(); + let identifyCard = $(".identify-card").val(); + let certificateNo = $(".certificate-no").val(); + let bankAddress = $(".bank-address").val(); + let uid = $(".bank-card-uid").val(); + + return { + "uid": uid, + "userName": userName, + "bankCode": bankCode, + "accountName": accountName, + "certificateType": certificateType, + "phoneNo": phoneNo, + "bankName": bankName, + "bankAccountType": bankAccountType, + "bankNo": bankNo, + "identifyCard": identifyCard, + "certificateNo": certificateNo, + "bankAddress": bankAddress + }; + } + + //当每页显示数更改后，执行的操作 + $("#display_count").change(function () { + let dataJSON = getCutPageval(); + showBankCradRecord(dataJSON); + }); + + //点击上一页的按钮 + $(".pre_page").click(function () { + let dataJSON = getCutPageval(); + + if (dataJSON["currentPage"] == 1) { + return; + } + dataJSON["currentPage"] = parseInt(dataJSON["currentPage"]) - 1; + showBankCradRecord(dataJSON); + }); + //点击下一页的按钮时 + $(".next_page").click(function () { + let dataJSON = getCutPageval(); + + if (dataJSON["currentPage"] == dataJSON["totalPage"]) { + return; + } + + dataJSON["currentPage"] = parseInt(dataJSON["currentPage"]) + 1; + showBankCradRecord(dataJSON); + }); + //点击跳转那一页的按钮 + $(".jump_page button").click(function () { + let dataJSON = getCutPageval(); + + if (dataJSON["jumpPage"].length <= 0) { + return; + } + showBankCradRecord(dataJSON); + }); + + $(".bank-card-save").click(function () { + let dataJSON = getBankCardData(); + if (dataJSON["userName"].length <= 0) { + alert("用户名称不能为空"); + return; + } else if (dataJSON["bankCode"].length <= 0) { + alert("银行编码不能为空"); + return; + } else if (dataJSON["accountName"].length <= 0) { + alert("银行开户名不能为空"); + return; + } else if (dataJSON["phoneNo"].length <= 0) { + alert("手机号不能为空"); + return; + } else if (dataJSON["bankName"].length <= 0) { + alert("银行名称不能为空"); + return; + } else if (dataJSON["bankNo"].length <= 0) { + alert("银行卡账号不能为空"); + return; + } else if (dataJSON["certificateNo"].length <= 0) { + alert("身份证号不能为空"); + return; + } else if (dataJSON["bankAddress"].length <= 0) { + alert("开户行地址不能为空"); + return; + } + $.ajax({ + url: "/add/bankCard", + data: dataJSON, + + success: function (res) { + if (res.Code == 404) { + window.parent.location = "/login.html"; + } else if (res.Code == -1) { + alert(res.Msg); + } else { + alert("添加银行卡成功"); + $(".bank-card-record").show(); + $(".add-bank-card").hide(); + showBankCradRecord(getBankCardData()); + } + } + }); + }); + + function setAccount() { + $.ajax({ + url: "/get/all/account", + success: function (res) { + if (res.Code == 404) { + window.parent.location = "/login.html"; + } else { + let str = ''; + for (let i = 0; i < res.AccountList.length; i++) { + let account = res.AccountList[i]; + str = str + ''; + } + $("#select-self-name").html(str); + } + } + }); + } + + $(function () { + setAccount(); + }); + \ No newline at end of file diff --git a/views/confirm.html b/views/confirm.html index f26557c..5f3643a 100644 --- a/views/confirm.html +++ b/views/confirm.html @@ -3,7 +3,7 @@ 管理后台 - + @@ -13,249 +13,261 @@ font-weight: normal; margin-right: 20px; } - .margin-bottom{ + + .margin-bottom { margin-bottom: 20px; } -
    -
    -

    审核处理

    +
    +
    +

    审核处理

    +
    +
    +
    + + + + +
    -
    -
    - - - - - -
    -
    - -
    - {{/*展示通道列表*/}} -
    -
    - - - - - - - - - - - - - - -
    序列号通道名称通道uid上游名称状态时间操作
    -
    - -
    -
  • - 每页显示 - -
    • - -
  • 第0/0页
    • -
  • 上一页
    • -
  • 下一页
    • -
  • 跳转
    • -
    +
    +{{/*展示通道列表*/}} +
    +
    + + + + + + + + + + + + + + +
    序列号通道名称通道uid上游名称状态时间操作
    + +
    +
  • + 每页显示 + +
    • - + } + + function save(roadName) { + $("#road-name").val(roadName); + } + + //搜索列表 + $("#road-search").click(function () { + let dataJSON = getCutPageValues(); + ajaxRoadList(dataJSON); + }); + $(function () { + let dataJSON = getCutPageValues(); + ajaxRoadList(dataJSON) + }); + \ No newline at end of file diff --git a/views/create_agent.html b/views/create_agent.html index c859d65..89752fc 100644 --- a/views/create_agent.html +++ b/views/create_agent.html @@ -2,464 +2,482 @@ - - 管理后台 - - - + + 管理后台 + + + -
    -
    -
    - 代理名称： - -
    -
    - -
    -
    - - - -
    - - - - - - - - - - - - - - -
    序列号状态代理编号代理名称登录账号重置密码操作
    -
    - -
    -
  • - 每页显示 - -
    • - -
  • 第0/0页
    • -
  • 上一页
    • -
  • 下一页
    • -
  • 跳转
    • -
    -
    +
    +
    +
    + 代理名称： + +
    +
    + +
    +
    + + + +
    + + + + + + + + + + + + + + +
    序列号状态代理编号代理名称登录账号重置密码操作
    +
    + +
    +
  • + 每页显示 + +
    • - - +
  • 第0/0页
    • +
  • 上一页
    • +
  • 下一页
    • +
  • 跳转 + +
    • +
    +
    - + $(".cancel-agent").click(function () { + clearAgentModalError(); + clearAgentModalContent(); + }); + $(function () { + ajaxAgentList(getAgentCutPageValues()); + }); + \ No newline at end of file diff --git a/views/edit_role.html b/views/edit_role.html index 6e154d9..ba557ea 100644 --- a/views/edit_role.html +++ b/views/edit_role.html @@ -2,217 +2,227 @@ - - 管理后台 - - - - - + + 管理后台 + + + + + - - - - + success: function (res) { + if (res.Code == 404) { + window.parent.location = "/login.html"; + return; + } + $(".modal-body-deploy").html(""); + let str = ''; + for (let i = 0; i < res.AllFirstMenu.length; i++) { + str += '
      '; + str += '
    • ' + res.AllFirstMenu[i].FirstMenu + '
      • '; + for (let j = 0; j < res.AllSecondMenu.length; j++) { + str += '
        '; + if (res.AllSecondMenu[j].FirstMenuUid == res.AllFirstMenu[i].MenuUid) { + str += '
      • ' + res.AllSecondMenu[j].SecondMenu + '
        • '; + str += '
          '; + for (let k = 0; k < res.AllPower.length; k++) { + if (res.AllPower[k].SecondMenuUid == res.AllSecondMenu[j].SecondMenuUid) { + str += '
        • ' + res.AllPower[k].PowerItem + '
          • '; + } + } + str += '
        '; + } + str += '
      '; + } + str += '
    '; + } + $(".modal-body-deploy").html(str); + setCheckboxChecked(res); + }, + + error: function () { + alert("系统异常，请稍后重试"); + } + }); + } + + $(document).on("show.bs.modal", ".modal", function () { + $(this).draggable(); + $(this).css("overflow-y", "hidden"); + // 防止出现滚动条，出现的话，你会把滚动条一起拖着走的 + }); + $(".modal-body-deploy").on("click", ".checkbox-first-menu-uid", function () { + if (this.checked) { + $(this).parent().parent().children("ul").children('li').children('.checkbox-second-menu-uid').prop('checked', 'checked'); + } else { + $(this).parent().parent().children("ul").children('li').children('.checkbox-second-menu-uid').removeAttr('checked'); + $(this).parent().parent().children("ul").children('ul').children('li').children('.checkbox-power-id').removeAttr('checked'); + } + }); + $(".modal-body-deploy").on("click", ".checkbox-second-menu-uid", function () { + if (this.checked) { + $(this).parent().parent().parent().children('li').children('.checkbox-first-menu-uid').prop('checked', 'checked'); + } else { + $(this).parent().parent().children("ul").children('li').children('.checkbox-power-id').removeAttr('checked'); + if (getCheckboxSecondMenuUid() <= 0) { + $(this).parent().parent().parent().children('li').children('.checkbox-first-menu-uid').removeAttr('checked'); + } + } + }); + $(".modal-body-deploy").on("click", ".checkbox-power-id", function () { + if (this.checked) { + $(this).parent().parent().parent().children('li').children('.checkbox-second-menu-uid').prop('checked', 'checked'); + $(this).parent().parent().parent().parent().children('li').children('.checkbox-first-menu-uid').prop('checked', 'checked') + } + }); + \ No newline at end of file diff --git a/views/first_menu.html b/views/first_menu.html index 81af334..2ed150b 100644 --- a/views/first_menu.html +++ b/views/first_menu.html @@ -2,287 +2,298 @@ - - 管理后台 - - - - - + + 管理后台 + + + + + - - -
    -
    - 一级菜单 - -
    -
    - -
    -
    -
    - - 提示：创建导航菜单栏，一般由技术开发人员进行配置！ - -
    -
    - - - - - - - - - - - - - - - -
    序列号菜单识别号一级菜单菜单顺序号二级菜单创建者操作
    -
    - -
    -
  • - 每页显示 - -
    • - -
  • 第1/2页
    • -
  • 上一页
    • -
  • 下一页
    • -
  • 跳转
    • -
    + + +
    +
    + 一级菜单 + +
    +
    + +
    +
    +
    + + 提示：创建导航菜单栏，一般由技术开发人员进行配置！ + +
    +
    + + + + + + + + + + + + + + + +
    序列号菜单识别号一级菜单菜单顺序号二级菜单创建者操作
    +
    + +
    +
  • + 每页显示 + +
    • + +
  • 第1/2页
    • +
  • 上一页
    • +
  • 下一页
    • +
  • 跳转 + +
    • +
    - + //此函数的作用，是在每行的最后一格，加入可操作的按钮图标 + function showMenuList(dataJSON) { + $.ajax({ + url: "/get/menu", + data: dataJSON, + + success: function (res) { + + $(".current_page").html(res.CurrentPage); + $(".total_page").html(res.TotalPage); + $("#display_count option").each(function () { + if ($(this).text() == res.DisplayCount) { + $(this).attr('selected', true); + } + }); + $(".jump_page input").val(""); + + + if (res.Code == -1) { + alert(res.Msg); + return; + } else if (res.Code == 404) { + window.parent.location = "/login.html"; + } else { + //将先前的内容清空 + $("#menu_table_body").html(""); + let str = ""; + for (let i = 0; i < res.MenuList.length; i++) { + let v = res.MenuList[i]; + + // let secondMenus = v.SecondMenu.split("|"); + + let tmp = "" + "" + (res.StartIndex + i + 1) + "" + + "" + v.MenuUid + "" + "" + v.FirstMenu + "" + "" + v.MenuOrder + "" + + "" + v.SecondMenu + "" + "" + v.Creater + ""; + tmp = tmp + "" + '
    ' + + '' + + '' + + '' + + '
    ' + "" + ""; + str = str + tmp; + } + $("#menu_table_body").append(str); + } + }, + + error: function () { + alert("系统异常，请稍后重试"); + } + }); + } + + $(".save-menu").click(function () { + let oneMenu = $(".basic-url").val(); + + + if (oneMenu.length <= 0) { + $(".first-menu-error").text(" * 一级菜单不能为空"); + return; + } + + $(".first-menu-error").text(""); + $.ajax({ + url: "/add/menu", + data: { + oneMenu: oneMenu + }, + + success: function (res) { + if (res.Code == 200) { + $(".cancel-menu").trigger('click'); + showMenuList(); + + } else if (res.Code == 404) { + window.parent.location = "/login.html"; + } else { + $(".first-menu-error").text(res.Msg); + } + }, + error: function () { + alert("系统异常，请稍后重试"); + } + }); + }); + + $(".add-button").click(function () { + $(".basic-url").val(""); + $(".basic-url-4").val(""); + $(".first-menu-error").text(""); + + }); + \ No newline at end of file diff --git a/views/index.html b/views/index.html index 57a6433..632fd29 100644 --- a/views/index.html +++ b/views/index.html @@ -3,14 +3,14 @@ - - + + 管理后台 - + - - \ No newline at end of file diff --git a/views/main.html b/views/main.html index 7d9bd9d..a09f569 100644 --- a/views/main.html +++ b/views/main.html @@ -2,13 +2,13 @@ - - - + + +
    - +
    \ No newline at end of file diff --git a/views/menu.html b/views/menu.html index c902d62..3870eff 100644 --- a/views/menu.html +++ b/views/menu.html @@ -2,69 +2,74 @@ - - 商戶后台 - - - - - + + 商戶后台 + + + + + -
    +
    -
    - 一级菜单管理 -
    +
    + 一级菜单管理 +
    -
    - 二级菜单管理 -
    +
    + 二级菜单管理 +
    - -
    -
    - + \ No newline at end of file diff --git a/views/merchant.html b/views/merchant.html index 245c868..dee0670 100644 --- a/views/merchant.html +++ b/views/merchant.html @@ -4,7 +4,7 @@ 管理后台 - + -
    -
    - 选择下发商户 - -
    - - - - - - - - - - - - - - - - - -
    下发所属商户未选择
    商户uid未选择
    可用金额 元
    创建时间未选择
    -
    - 选择下发银行卡 - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    银行名称未选择
    开户名未选择
    卡号未选择
    开户卡类型 - 对私卡 - 对公卡 -
    开户行所在地未选择
    开户人手机号码未选择
    下发金额 元
    -
    - - -
    +
    +
    + 选择下发商户 +
    + + + + + + + + + + + + + + + + + + + + + +
    下发所属商户未选择
    商户uid未选择
    可用金额 元
    创建时间未选择
    +
    + 选择下发银行卡 + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    银行名称未选择
    开户名未选择
    卡号未选择
    开户卡类型 + 对私卡 + 对公卡 +
    开户行所在地未选择
    开户人手机号码未选择
    下发金额 元
    +
    + + +
    +
    - -