diff --git a/hdl/hdl_upgrade.go b/hdl/hdl_upgrade.go index 327f6db..95cba64 100644 --- a/hdl/hdl_upgrade.go +++ b/hdl/hdl_upgrade.go @@ -6,6 +6,7 @@ import ( "code.fnuoos.com/go_rely_warehouse/zyos_go_condition_statistics.git/md" "code.fnuoos.com/go_rely_warehouse/zyos_go_condition_statistics.git/svc" zhios_condition_statistics_utils "code.fnuoos.com/go_rely_warehouse/zyos_go_condition_statistics.git/utils" + db2 "code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git/db" "code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git/rule/one_circles" "encoding/json" "errors" @@ -255,6 +256,8 @@ func CheckSchemeTasksComplete(params map[string]string, blockStarChain string, e total = "1" hasLevelPay = hasPay LevelPayOrdId = payOrdId + } else if item.TaskType == 6 { + total = "1" } else { total = item.FinishCount } @@ -391,6 +394,17 @@ func GetFinishCount(params map[string]string, blockStarChain string, engine *xor hasPay := false var payOrdId int64 switch task.TaskType { + case 26: + userLevel, _ := db.UserLevelByID(engine, task.TaskTypeLevelId) + user, _ := db2.UserFindByID(engine, uid) + count := "0" + if user != nil && userLevel != nil { + userLevel1, _ := db.UserLevelByID(engine, user.Level) + if userLevel1 != nil && userLevel1.LevelWeight >= userLevel.LevelWeight { + count = "1" + } + } + return count, hasPay, payOrdId case 20: var money float64 = 0 shownewFinTotal, _ := db.SysCfgGetOne(engine, "shownew_fin_total2")