From 250a1ab132cb5ed126661fb1eb8cdb3245fb8f42 Mon Sep 17 00:00:00 2001 From: shaoying Date: Thu, 15 Oct 2020 20:09:45 +0800 Subject: [PATCH] opt some --- core/mall/asset.go | 61 ++++++++++++++++++++++ core/mall/mall.go | 123 ++++++++++----------------------------------- core/team/asset.go | 1 + 3 files changed, 89 insertions(+), 96 deletions(-) create mode 100644 core/mall/asset.go create mode 100644 core/team/asset.go diff --git a/core/mall/asset.go b/core/mall/asset.go new file mode 100644 index 00000000..55c542a4 --- /dev/null +++ b/core/mall/asset.go @@ -0,0 +1,61 @@ +package mall + +import ( + ice "github.com/shylinux/icebergs" + "github.com/shylinux/icebergs/base/mdb" + kit "github.com/shylinux/toolkits" +) + +func _asset_create(m *ice.Message, account string) { + if msg := m.Cmd(mdb.SELECT, ASSET, "", mdb.HASH, ACCOUNT, account); len(msg.Appendv(kit.MDB_HASH)) == 0 { + m.Conf(ASSET, kit.Keys(m.Option(ice.MSG_DOMAIN), kit.MDB_META, kit.MDB_SHORT), ACCOUNT) + m.Cmdy(mdb.INSERT, ASSET, "", mdb.HASH, ACCOUNT, account) + } +} +func _asset_insert(m *ice.Message, account string, arg ...string) { + m.Richs(ASSET, kit.Keys(kit.MDB_HASH, m.Optionv(ice.MSG_DOMAIN)), account, func(key string, value map[string]interface{}) { + for i := 0; i < len(arg)-1; i += 2 { + if arg[i] == "amount" { + kit.Value(value, "meta.amount", kit.Int(kit.Value(value, "meta.amount"))+kit.Int(arg[i+1])) + } + } + id := m.Grow(ASSET, kit.Keys(kit.MDB_HASH, m.Optionv(ice.MSG_DOMAIN), kit.MDB_HASH, key), kit.Dict( + kit.MDB_EXTRA, kit.Dict(), + arg, + )) + m.Log_INSERT(ACCOUNT, account, kit.MDB_ID, id, arg[0], arg[1]) + m.Echo("%d", id) + }) +} + +const ASSET = "asset" + +func init() { + Index.Merge(&ice.Context{ + Configs: map[string]*ice.Config{ + ASSET: {Name: ASSET, Help: "资产", Value: kit.Data(kit.MDB_SHORT, ACCOUNT)}, + }, + Commands: map[string]*ice.Command{ + ASSET: {Name: "asset account id auto insert export import", Help: "资产", Action: map[string]*ice.Action{ + mdb.INSERT: {Name: "insert account type=spend,trans,bonus amount name text", Help: "添加", Hand: func(m *ice.Message, arg ...string) { + _asset_create(m, arg[1]) + _asset_insert(m, arg[1], arg[2:]...) + }}, + mdb.MODIFY: {Name: "modify", Help: "编辑", Hand: func(m *ice.Message, arg ...string) { + _asset_modify(m, m.Option(ACCOUNT), m.Option(kit.MDB_ID), arg[0], arg[1]) + }}, + mdb.EXPORT: {Name: "export file", Help: "导出", Hand: func(m *ice.Message, arg ...string) { + _asset_export(m, m.Option(kit.MDB_FILE)) + }}, + mdb.IMPORT: {Name: "import file", Help: "导入", Hand: func(m *ice.Message, arg ...string) { + _asset_import(m, m.Option(kit.MDB_FILE)) + }}, + mdb.INPUTS: {Name: "inputs", Help: "补全", Hand: func(m *ice.Message, arg ...string) { + _asset_inputs(m, kit.Select("", arg, 0), kit.Select("", arg, 1)) + }}, + }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { + _asset_list(m, kit.Select("", arg, 0), kit.Select("", arg, 1)) + }}, + }, + }, nil) +} diff --git a/core/mall/mall.go b/core/mall/mall.go index e1a2d1df..f61a5afb 100644 --- a/core/mall/mall.go +++ b/core/mall/mall.go @@ -2,13 +2,11 @@ package mall import ( ice "github.com/shylinux/icebergs" - "github.com/shylinux/icebergs/base/mdb" "github.com/shylinux/icebergs/base/web" kit "github.com/shylinux/toolkits" "encoding/csv" "os" - "path" "strings" ) @@ -31,28 +29,6 @@ func _asset_list(m *ice.Message, account string, id string, field ...interface{} }) }) } -func _asset_create(m *ice.Message, account string) { - if m.Richs(ASSET, kit.Keys(kit.MDB_HASH, m.Optionv(ice.MSG_DOMAIN)), account, nil) == nil { - m.Conf(ASSET, kit.Keys(kit.MDB_HASH, m.Optionv(ice.MSG_DOMAIN), kit.MDB_META, kit.MDB_SHORT), ACCOUNT) - m.Rich(ASSET, kit.Keys(kit.MDB_HASH, m.Optionv(ice.MSG_DOMAIN)), kit.Data(ACCOUNT, account, AMOUNT, 0)) - m.Log_CREATE(ACCOUNT, account) - } -} -func _asset_insert(m *ice.Message, account string, arg ...string) { - m.Richs(ASSET, kit.Keys(kit.MDB_HASH, m.Optionv(ice.MSG_DOMAIN)), account, func(key string, value map[string]interface{}) { - for i := 0; i < len(arg)-1; i += 2 { - if arg[i] == "amount" { - kit.Value(value, "meta.amount", kit.Int(kit.Value(value, "meta.amount"))+kit.Int(arg[i+1])) - } - } - id := m.Grow(ASSET, kit.Keys(kit.MDB_HASH, m.Optionv(ice.MSG_DOMAIN), kit.MDB_HASH, key), kit.Dict( - kit.MDB_EXTRA, kit.Dict(), - arg, - )) - m.Log_INSERT(ACCOUNT, account, kit.MDB_ID, id, arg[0], arg[1]) - m.Echo("%d", id) - }) -} func _asset_modify(m *ice.Message, account, id, pro, set string) { m.Richs(ASSET, kit.Keys(kit.MDB_HASH, m.Optionv(ice.MSG_DOMAIN)), kit.Select(kit.MDB_FOREACH, account), func(key string, val map[string]interface{}) { m.Grows(ASSET, kit.Keys(kit.MDB_HASH, m.Optionv(ice.MSG_DOMAIN), kit.MDB_HASH, key), kit.MDB_ID, id, func(index int, value map[string]interface{}) { @@ -140,6 +116,29 @@ func _asset_import(m *ice.Message, file string) { m.Log_IMPORT("file", file, "count", count) m.Echo(file) } +func _asset_inputs(m *ice.Message, key, value string) { + switch key { + case ACCOUNT: + m.Richs(ASSET, kit.Keys(kit.MDB_HASH, m.Optionv(ice.MSG_DOMAIN)), kit.MDB_FOREACH, func(key string, val map[string]interface{}) { + m.Push("account", kit.Value(val, "meta.account")) + m.Push("count", kit.Select("0", kit.Format(kit.Value(val, "meta.count")))) + }) + + case "name", "text": + list := map[string]int{} + m.Option("cache.limit", 10) + m.Richs(ASSET, kit.Keys(kit.MDB_HASH, m.Optionv(ice.MSG_DOMAIN)), kit.MDB_FOREACH, func(k string, val map[string]interface{}) { + m.Grows(ASSET, kit.Keys(kit.MDB_HASH, m.Optionv(ice.MSG_DOMAIN), kit.MDB_HASH, k), "", "", func(index int, value map[string]interface{}) { + list[kit.Format(value[key])]++ + }) + }) + for k, i := range list { + m.Push("key", k) + m.Push("count", i) + } + } + m.Sort("count", "int_r") +} func _asset_search(m *ice.Message, kind, name, text string, arg ...string) { m.Richs(ASSET, kit.Keys(kit.MDB_HASH, m.Optionv(ice.MSG_DOMAIN)), kit.MDB_FOREACH, func(key string, val map[string]interface{}) { @@ -170,30 +169,6 @@ func _asset_action(m *ice.Message, status interface{}, action ...string) string return strings.Join(action, "") } -func _asset_input(m *ice.Message, key, value string) { - switch key { - case ACCOUNT: - m.Richs(ASSET, kit.Keys(kit.MDB_HASH, m.Optionv(ice.MSG_DOMAIN)), kit.MDB_FOREACH, func(key string, val map[string]interface{}) { - m.Push("account", kit.Value(val, "meta.account")) - m.Push("count", kit.Select("0", kit.Format(kit.Value(val, "meta.count")))) - }) - - case "name", "text": - list := map[string]int{} - m.Option("cache.limit", 10) - m.Richs(ASSET, kit.Keys(kit.MDB_HASH, m.Optionv(ice.MSG_DOMAIN)), kit.MDB_FOREACH, func(k string, val map[string]interface{}) { - m.Grows(ASSET, kit.Keys(kit.MDB_HASH, m.Optionv(ice.MSG_DOMAIN), kit.MDB_HASH, k), "", "", func(index int, value map[string]interface{}) { - list[kit.Format(value[key])]++ - }) - }) - for k, i := range list { - m.Push("key", k) - m.Push("count", i) - } - } - m.Sort("count", "int_r") -} - var _input_spend = kit.List( "_input", "text", "name", "account", "value", "@key", "_input", "select", "name", "type", "values", []interface{}{ @@ -223,7 +198,6 @@ var _input_bonus = kit.List( ) const ( - ASSET = "asset" BONUS = "bonus" SPEND = "spend" ) @@ -234,54 +208,11 @@ const ( ) var Index = &ice.Context{Name: "mall", Help: "贸易中心", - Caches: map[string]*ice.Cache{}, - Configs: map[string]*ice.Config{ - ASSET: {Name: ASSET, Help: "资产", Value: kit.Data(kit.MDB_SHORT, ACCOUNT)}, - }, + Caches: map[string]*ice.Cache{}, + Configs: map[string]*ice.Config{}, Commands: map[string]*ice.Command{ - ice.CTX_INIT: {Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { - m.Load() - - m.Cmd(mdb.SEARCH, mdb.CREATE, ASSET, ASSET, m.Prefix()) - m.Cmd(mdb.RENDER, mdb.CREATE, ASSET, ASSET, m.Prefix()) - }}, - ice.CTX_EXIT: {Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { m.Save(ASSET) }}, - - ASSET: {Name: "asset account=auto id=auto auto 添加:button 导出:button 导入:button", Help: "资产", Meta: kit.Dict( - "添加", _input_spend, - ), Action: map[string]*ice.Action{ - mdb.INSERT: {Name: "insert [key value]...", Help: "添加", Hand: func(m *ice.Message, arg ...string) { - _asset_create(m, arg[1]) - _asset_insert(m, arg[1], arg[2:]...) - }}, - mdb.MODIFY: {Name: "modify key value", Help: "编辑", Hand: func(m *ice.Message, arg ...string) { - _asset_modify(m, m.Option(ACCOUNT), m.Option(kit.MDB_ID), arg[0], arg[1]) - }}, - mdb.EXPORT: {Name: "export file", Help: "导出", Hand: func(m *ice.Message, arg ...string) { - _asset_export(m, kit.Select(path.Join(EXPORT, m.Option(ice.MSG_DOMAIN), "list.csv"), arg, 0)) - }}, - mdb.IMPORT: {Name: "import file", Help: "导入", Hand: func(m *ice.Message, arg ...string) { - _asset_import(m, kit.Select(path.Join(EXPORT, m.Option(ice.MSG_DOMAIN), "list.csv"), arg, 0)) - }}, - - "input": {Name: "input key value", Help: "补全", Hand: func(m *ice.Message, arg ...string) { - _asset_input(m, kit.Select("", arg, 0), kit.Select("", arg, 1)) - }}, - }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { - if _asset_list(m, kit.Select("", arg, 0), kit.Select("", arg, 1)); len(arg) < 2 { - m.Table(func(index int, value map[string]string, head []string) { - - }) - m.Sort("amount", "int_r") - return - } - m.Table(func(index int, value map[string]string, head []string) { - if value["key"] == "status" { - m.Push("key", "action") - m.Push("value", _asset_action(m, value["value"])) - } - }) - }}, + ice.CTX_INIT: {Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { m.Load() }}, + ice.CTX_EXIT: {Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { m.Save() }}, "spend": {Name: "spend account=@key to=@key name=@key 记录:button text:textarea value=@key time=@date", Help: "支出", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { diff --git a/core/team/asset.go b/core/team/asset.go new file mode 100644 index 00000000..f3b5d7c3 --- /dev/null +++ b/core/team/asset.go @@ -0,0 +1 @@ +package team