瀏覽代碼

add reverse for v1.0.1 分佣规则

tags/v1.0.1
huangjuajun 2 年之前
父節點
當前提交
937895c0c9
共有 10 個文件被更改,包括 12 次插入11 次删除
  1. +2
    -2
      db/db_sys_cfg.go
  2. +2
    -1
      rule/relate_commission.go
  3. +1
    -1
      svc/get_plan_cfg.go
  4. +1
    -1
      svc/reward_commission.go
  5. +1
    -1
      svc/user_relative_network.go
  6. +1
    -1
      utils/cache/base.go
  7. +1
    -1
      utils/cache/redis.go
  8. +1
    -1
      utils/cache/redis_cluster.go
  9. +1
    -1
      utils/cache/redis_pool.go
  10. +1
    -1
      utils/cache/redis_pool_cluster.go

+ 2
- 2
db/db_sys_cfg.go 查看文件

@@ -31,7 +31,7 @@ func SysCfgGetOne(Db *xorm.Engine, key string) (*model.SysCfg, error) {
func SysCfgFindWithDb(eg *xorm.Engine, masterId string, keys ...string) map[string]string {
res := map[string]string{}
cacheKey := fmt.Sprintf(md.AppCfgCacheKey, masterId)
err := cache.GetJson(cacheKey, &res)
err := zhios_order_relate_cache.GetJson(cacheKey, &res)
if err != nil || len(res) == 0 {
cfgList, _ := SysCfgGetAll(eg)
if cfgList == nil {
@@ -40,7 +40,7 @@ func SysCfgFindWithDb(eg *xorm.Engine, masterId string, keys ...string) map[stri
for _, v := range *cfgList {
res[v.Key] = v.Val
}
cache.SetJson(cacheKey, res, md.CfgCacheTime)
zhios_order_relate_cache.SetJson(cacheKey, res, md.CfgCacheTime)
}
if len(keys) == 0 {
return res


+ 2
- 1
rule/relate_commission.go 查看文件

@@ -3,6 +3,7 @@ package rule
import (
"code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git/lib/comm_plan"
"code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git/md"
"code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git/svc"
"context"
"errors"
"golang.org/x/sync/errgroup"
@@ -39,7 +40,7 @@ func BatchGetCommission(eg *xorm.Engine, dbName string, commissionParamList []*m
return errors.New("商品ID缺失")
}

_, _, _, _, lvUser, err := GetRewardCommission(eg, &param.CommissionParam, isShare, param.Uid, param.Provider, dbName, isAllLevelReturn, map[string]string{})
_, _, _, _, lvUser, err := svc.GetRewardCommission(eg, &param.CommissionParam, isShare, param.Uid, param.Provider, dbName, isAllLevelReturn, map[string]string{})
if err != nil {
return err
}


rule/get_plan_cfg.go → svc/get_plan_cfg.go 查看文件

@@ -1,4 +1,4 @@
package rule
package svc

import (
"code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git/db"

rule/reward_commission.go → svc/reward_commission.go 查看文件

@@ -1,4 +1,4 @@
package rule
package svc

import (
"code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git/db"

rule/user_relative_network.go → svc/user_relative_network.go 查看文件

@@ -1,4 +1,4 @@
package rule
package svc

import (
"code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git/db"

+ 1
- 1
utils/cache/base.go 查看文件

@@ -1,4 +1,4 @@
package cache
package zhios_order_relate_cache

import (
"errors"


+ 1
- 1
utils/cache/redis.go 查看文件

@@ -1,4 +1,4 @@
package cache
package zhios_order_relate_cache

import (
"encoding/json"


+ 1
- 1
utils/cache/redis_cluster.go 查看文件

@@ -1,4 +1,4 @@
package cache
package zhios_order_relate_cache

import (
"strconv"


+ 1
- 1
utils/cache/redis_pool.go 查看文件

@@ -1,4 +1,4 @@
package cache
package zhios_order_relate_cache

import (
"errors"


+ 1
- 1
utils/cache/redis_pool_cluster.go 查看文件

@@ -1,4 +1,4 @@
package cache
package zhios_order_relate_cache

import (
"strconv"


Loading…
取消
儲存