Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway into dev
正在显示
10 个修改的文件
包含
52 行增加
和
95 行删除
@@ -9,5 +9,5 @@ require ( | @@ -9,5 +9,5 @@ require ( | ||
9 | github.com/go-pg/pg/v10 v10.10.1 | 9 | github.com/go-pg/pg/v10 v10.10.1 |
10 | github.com/go-redis/redis v6.14.2+incompatible | 10 | github.com/go-redis/redis v6.14.2+incompatible |
11 | github.com/google/uuid v1.1.1 | 11 | github.com/google/uuid v1.1.1 |
12 | - github.com/linmadan/egglib-go v0.0.0-20210527091316-06b0732fb5f6 | 12 | + github.com/linmadan/egglib-go v0.0.0-20210827085852-177fa745932d |
13 | ) | 13 | ) |
@@ -134,8 +134,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= | @@ -134,8 +134,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= | ||
134 | github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= | 134 | github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= |
135 | github.com/ledisdb/ledisdb v0.0.0-20200510135210-d35789ec47e6/go.mod h1:n931TsDuKuq+uX4v1fulaMbA/7ZLLhjc85h7chZGBCQ= | 135 | github.com/ledisdb/ledisdb v0.0.0-20200510135210-d35789ec47e6/go.mod h1:n931TsDuKuq+uX4v1fulaMbA/7ZLLhjc85h7chZGBCQ= |
136 | github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= | 136 | github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= |
137 | -github.com/linmadan/egglib-go v0.0.0-20210527091316-06b0732fb5f6 h1:nyhVnOIXsESuhZ95Ak6VRSF+0fHeKlYWq0EvHByt5RU= | ||
138 | -github.com/linmadan/egglib-go v0.0.0-20210527091316-06b0732fb5f6/go.mod h1:ZZuSWicGxpgN0OulARhuKwFJuJ9we0otaPVAJtz10yk= | 137 | +github.com/linmadan/egglib-go v0.0.0-20210827085852-177fa745932d h1:3C1xctwbWOdIFqUL1U2DGymTYLJrGOZxPaFu4SLsbkk= |
138 | +github.com/linmadan/egglib-go v0.0.0-20210827085852-177fa745932d/go.mod h1:sK2YggplSGTnGLm3kHobFa41MXuBwpqADilWwb8WHK0= | ||
139 | github.com/magefile/mage v1.10.0 h1:3HiXzCUY12kh9bIuyXShaVe529fJfyqoVM42o/uom2g= | 139 | github.com/magefile/mage v1.10.0 h1:3HiXzCUY12kh9bIuyXShaVe529fJfyqoVM42o/uom2g= |
140 | github.com/magefile/mage v1.10.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= | 140 | github.com/magefile/mage v1.10.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= |
141 | github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= | 141 | github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= |
@@ -147,6 +147,7 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ | @@ -147,6 +147,7 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ | ||
147 | github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= | 147 | github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= |
148 | github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= | 148 | github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= |
149 | github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= | 149 | github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= |
150 | +github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= | ||
150 | github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= | 151 | github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= |
151 | github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= | 152 | github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= |
152 | github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= | 153 | github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= |
@@ -193,6 +194,8 @@ github.com/prometheus/procfs v0.1.3 h1:F0+tqvhOksq22sc6iCHF5WGlWjdwj92p0udFh1VFB | @@ -193,6 +194,8 @@ github.com/prometheus/procfs v0.1.3 h1:F0+tqvhOksq22sc6iCHF5WGlWjdwj92p0udFh1VFB | ||
193 | github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= | 194 | github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= |
194 | github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a h1:9ZKAASQSHhDYGoxY8uLVpewe1GDZ2vu2Tr/vTdVAkFQ= | 195 | github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a h1:9ZKAASQSHhDYGoxY8uLVpewe1GDZ2vu2Tr/vTdVAkFQ= |
195 | github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= | 196 | github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= |
197 | +github.com/richardlehane/mscfb v1.0.3/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk= | ||
198 | +github.com/richardlehane/msoleps v1.0.1/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg= | ||
196 | github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= | 199 | github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= |
197 | github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 h1:X+yvsM2yrEktyI+b2qND5gpH8YhURn0k8OCaeRnkINo= | 200 | github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 h1:X+yvsM2yrEktyI+b2qND5gpH8YhURn0k8OCaeRnkINo= |
198 | github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644/go.mod h1:nkxAfR/5quYxwPZhyDxgasBMnRtBZd0FCEpawpjMUFg= | 201 | github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644/go.mod h1:nkxAfR/5quYxwPZhyDxgasBMnRtBZd0FCEpawpjMUFg= |
@@ -230,6 +233,8 @@ github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV | @@ -230,6 +233,8 @@ github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV | ||
230 | github.com/wendal/errors v0.0.0-20130201093226-f66c77a7882b/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc= | 233 | github.com/wendal/errors v0.0.0-20130201093226-f66c77a7882b/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc= |
231 | github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= | 234 | github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= |
232 | github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= | 235 | github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= |
236 | +github.com/xuri/efp v0.0.0-20210322160811-ab561f5b45e3/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI= | ||
237 | +github.com/xuri/excelize/v2 v2.4.1/go.mod h1:rSu0C3papjzxQA3sdK8cU544TebhrPUoTOaGPIh0Q1A= | ||
233 | github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= | 238 | github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= |
234 | github.com/yuin/gopher-lua v0.0.0-20171031051903-609c9cd26973/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU= | 239 | github.com/yuin/gopher-lua v0.0.0-20171031051903-609c9cd26973/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU= |
235 | go.etcd.io/etcd v3.3.25+incompatible/go.mod h1:yaeTdrJi5lOmYerz05bd8+V7KubZs8YSFZfzsF9A6aI= | 240 | go.etcd.io/etcd v3.3.25+incompatible/go.mod h1:yaeTdrJi5lOmYerz05bd8+V7KubZs8YSFZfzsF9A6aI= |
@@ -249,9 +254,11 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U | @@ -249,9 +254,11 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U | ||
249 | golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | 254 | golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= |
250 | golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | 255 | golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= |
251 | golang.org/x/crypto v0.0.0-20210218145215-b8e89b74b9df/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= | 256 | golang.org/x/crypto v0.0.0-20210218145215-b8e89b74b9df/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= |
252 | -golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b h1:7mWr3k41Qtv8XlltBkDkl8LoP3mpSgBW8BUoxtEdbXg= | ||
253 | golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= | 257 | golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= |
258 | +golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI= | ||
259 | +golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= | ||
254 | golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= | 260 | golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= |
261 | +golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= | ||
255 | golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= | 262 | golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= |
256 | golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= | 263 | golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= |
257 | golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= | 264 | golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= |
@@ -275,8 +282,9 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/ | @@ -275,8 +282,9 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/ | ||
275 | golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= | 282 | golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= |
276 | golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= | 283 | golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= |
277 | golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= | 284 | golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= |
278 | -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw= | ||
279 | golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= | 285 | golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= |
286 | +golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985 h1:4CSI6oo7cOjJKajidEljs9h+uP0rRZBPPPhcCbj5mw8= | ||
287 | +golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= | ||
280 | golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= | 288 | golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= |
281 | golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | 289 | golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= |
282 | golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | 290 | golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= |
@@ -304,14 +312,17 @@ golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7w | @@ -304,14 +312,17 @@ golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7w | ||
304 | golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | 312 | golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |
305 | golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | 313 | golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |
306 | golang.org/x/sys v0.0.0-20210218155724-8ebf48af031b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | 314 | golang.org/x/sys v0.0.0-20210218155724-8ebf48af031b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |
307 | -golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7 h1:iGu644GcxtEcrInvDsQRCwJjtCIOlT2V7IRt6ah2Whw= | 315 | +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |
308 | golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | 316 | golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |
317 | +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4= | ||
318 | +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||
309 | golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= | 319 | golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= |
310 | golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= | 320 | golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= |
311 | golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | 321 | golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= |
312 | golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= | 322 | golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= |
313 | -golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= | ||
314 | golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= | 323 | golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= |
324 | +golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= | ||
325 | +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= | ||
315 | golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | 326 | golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= |
316 | golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | 327 | golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= |
317 | golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | 328 | golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= |
@@ -14,17 +14,14 @@ type CooperationApplicationService struct { | @@ -14,17 +14,14 @@ type CooperationApplicationService struct { | ||
14 | // 审核共创申请 | 14 | // 审核共创申请 |
15 | func (cooperationApplicationService *CooperationApplicationService) AuditCooperationApplication( | 15 | func (cooperationApplicationService *CooperationApplicationService) AuditCooperationApplication( |
16 | auditCooperationApplicationCommand *command.AuditCooperationApplicationCommand) (interface{}, error) { | 16 | auditCooperationApplicationCommand *command.AuditCooperationApplicationCommand) (interface{}, error) { |
17 | - if err := auditCooperationApplicationCommand.ValidateCommand(); err != nil { | ||
18 | - return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
19 | - } | ||
20 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation( | 17 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation( |
21 | auditCooperationApplicationCommand.Operator) | 18 | auditCooperationApplicationCommand.Operator) |
22 | 19 | ||
23 | _, err := creationCooperationGateway.CooperationApplicationsBatchApproval(allied_creation_cooperation.ReqCooperationApplicationBatchApproval{ | 20 | _, err := creationCooperationGateway.CooperationApplicationsBatchApproval(allied_creation_cooperation.ReqCooperationApplicationBatchApproval{ |
24 | - CooperationApplicationIds: auditCooperationApplicationCommand.CooperationApplicationId, | ||
25 | - CooperationApplicationDescription: auditCooperationApplicationCommand.CooperationApplicationVerifyDescription, | ||
26 | - Action: auditCooperationApplicationCommand.CooperationApplicationStatus, | ||
27 | - Code: "BatchApproval", | 21 | + CooperationApplicationIds: auditCooperationApplicationCommand.CooperationApplicationId, |
22 | + CooperationApplicationVerifyDescription: auditCooperationApplicationCommand.CooperationApplicationVerifyDescription, | ||
23 | + Action: auditCooperationApplicationCommand.CooperationApplicationStatus, | ||
24 | + Code: "BatchApproval", | ||
28 | }) | 25 | }) |
29 | if err != nil { | 26 | if err != nil { |
30 | return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | 27 | return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) |
@@ -35,9 +32,7 @@ func (cooperationApplicationService *CooperationApplicationService) AuditCoopera | @@ -35,9 +32,7 @@ func (cooperationApplicationService *CooperationApplicationService) AuditCoopera | ||
35 | 32 | ||
36 | // 返回共创申请管理 | 33 | // 返回共创申请管理 |
37 | func (cooperationApplicationService *CooperationApplicationService) GetCooperationApplication(getCooperationApplicationQuery *query.GetCooperationApplicationQuery) (interface{}, error) { | 34 | func (cooperationApplicationService *CooperationApplicationService) GetCooperationApplication(getCooperationApplicationQuery *query.GetCooperationApplicationQuery) (interface{}, error) { |
38 | - if err := getCooperationApplicationQuery.ValidateQuery(); err != nil { | ||
39 | - return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
40 | - } | 35 | + |
41 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(getCooperationApplicationQuery.Operator) | 36 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(getCooperationApplicationQuery.Operator) |
42 | applicationResult, err := creationCooperationGateway.CooperationApplicationGet(allied_creation_cooperation.ReqCooperationApplicationGet{ | 37 | applicationResult, err := creationCooperationGateway.CooperationApplicationGet(allied_creation_cooperation.ReqCooperationApplicationGet{ |
43 | CooperationApplicationId: getCooperationApplicationQuery.CooperationApplicationId, | 38 | CooperationApplicationId: getCooperationApplicationQuery.CooperationApplicationId, |
@@ -16,9 +16,7 @@ type CooperationContractService struct { | @@ -16,9 +16,7 @@ type CooperationContractService struct { | ||
16 | 16 | ||
17 | // 创建共创合约管理 | 17 | // 创建共创合约管理 |
18 | func (cooperationContractService *CooperationContractService) CreateCooperationContract(createCooperationContractCommand *command.CreateCooperationContractCommand) (interface{}, error) { | 18 | func (cooperationContractService *CooperationContractService) CreateCooperationContract(createCooperationContractCommand *command.CreateCooperationContractCommand) (interface{}, error) { |
19 | - if err := createCooperationContractCommand.ValidateCommand(); err != nil { | ||
20 | - return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
21 | - } | 19 | + |
22 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(createCooperationContractCommand.Operator) | 20 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(createCooperationContractCommand.Operator) |
23 | rules1 := []allied_creation_cooperation.DividendsIncentivesRule{} | 21 | rules1 := []allied_creation_cooperation.DividendsIncentivesRule{} |
24 | for _, v := range createCooperationContractCommand.DividendsIncentivesRules { | 22 | for _, v := range createCooperationContractCommand.DividendsIncentivesRules { |
@@ -84,9 +82,7 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC | @@ -84,9 +82,7 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC | ||
84 | 82 | ||
85 | // 暂停恢复共创合约 | 83 | // 暂停恢复共创合约 |
86 | func (cooperationContractService *CooperationContractService) EnableCooperationContract(enableCooperationContractCommand *command.EnableCooperationContractCommand) (interface{}, error) { | 84 | func (cooperationContractService *CooperationContractService) EnableCooperationContract(enableCooperationContractCommand *command.EnableCooperationContractCommand) (interface{}, error) { |
87 | - if err := enableCooperationContractCommand.ValidateCommand(); err != nil { | ||
88 | - return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
89 | - } | 85 | + |
90 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(enableCooperationContractCommand.Operator) | 86 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(enableCooperationContractCommand.Operator) |
91 | _, err := creationCooperationGateway.CooperationContractsBatchOperate(allied_creation_cooperation.ReqCooperationContractsBatchOperate{ | 87 | _, err := creationCooperationGateway.CooperationContractsBatchOperate(allied_creation_cooperation.ReqCooperationContractsBatchOperate{ |
92 | CooperationContractIds: enableCooperationContractCommand.CooperationContractId, | 88 | CooperationContractIds: enableCooperationContractCommand.CooperationContractId, |
@@ -100,9 +96,7 @@ func (cooperationContractService *CooperationContractService) EnableCooperationC | @@ -100,9 +96,7 @@ func (cooperationContractService *CooperationContractService) EnableCooperationC | ||
100 | 96 | ||
101 | // 返回共创合约详情 | 97 | // 返回共创合约详情 |
102 | func (cooperationContractService *CooperationContractService) GetCooperationContract(getCooperationContractQuery *query.GetCooperationContractQuery) (interface{}, error) { | 98 | func (cooperationContractService *CooperationContractService) GetCooperationContract(getCooperationContractQuery *query.GetCooperationContractQuery) (interface{}, error) { |
103 | - if err := getCooperationContractQuery.ValidateQuery(); err != nil { | ||
104 | - return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
105 | - } | 99 | + |
106 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(getCooperationContractQuery.Operator) | 100 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(getCooperationContractQuery.Operator) |
107 | result, err := creationCooperationGateway.CooperationContractGet(allied_creation_cooperation.ReqCooperationContractGet{ | 101 | result, err := creationCooperationGateway.CooperationContractGet(allied_creation_cooperation.ReqCooperationContractGet{ |
108 | CooperationContractId: getCooperationContractQuery.CooperationContractId, | 102 | CooperationContractId: getCooperationContractQuery.CooperationContractId, |
@@ -117,9 +111,7 @@ func (cooperationContractService *CooperationContractService) GetCooperationCont | @@ -117,9 +111,7 @@ func (cooperationContractService *CooperationContractService) GetCooperationCont | ||
117 | // 返回共创合约管理列表 | 111 | // 返回共创合约管理列表 |
118 | func (cooperationContractService *CooperationContractService) ListCooperationContract( | 112 | func (cooperationContractService *CooperationContractService) ListCooperationContract( |
119 | listCooperationContractQuery *query.ListCooperationContractQuery) (int, interface{}, error) { | 113 | listCooperationContractQuery *query.ListCooperationContractQuery) (int, interface{}, error) { |
120 | - if err := listCooperationContractQuery.ValidateQuery(); err != nil { | ||
121 | - return 0, nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
122 | - } | 114 | + |
123 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(listCooperationContractQuery.Operator) | 115 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(listCooperationContractQuery.Operator) |
124 | result, err := creationCooperationGateway.CooperationContractSearch(allied_creation_cooperation.ReqCooperationContractSearch{ | 116 | result, err := creationCooperationGateway.CooperationContractSearch(allied_creation_cooperation.ReqCooperationContractSearch{ |
125 | PageNumber: listCooperationContractQuery.PageNumber, | 117 | PageNumber: listCooperationContractQuery.PageNumber, |
@@ -141,9 +133,7 @@ func (cooperationContractService *CooperationContractService) ListCooperationCon | @@ -141,9 +133,7 @@ func (cooperationContractService *CooperationContractService) ListCooperationCon | ||
141 | 133 | ||
142 | // 更新共创合约管理 | 134 | // 更新共创合约管理 |
143 | func (cooperationContractService *CooperationContractService) UpdateCooperationContract(updateCooperationContractCommand *command.UpdateCooperationContractCommand) (interface{}, error) { | 135 | func (cooperationContractService *CooperationContractService) UpdateCooperationContract(updateCooperationContractCommand *command.UpdateCooperationContractCommand) (interface{}, error) { |
144 | - if err := updateCooperationContractCommand.ValidateCommand(); err != nil { | ||
145 | - return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
146 | - } | 136 | + |
147 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(updateCooperationContractCommand.Operator) | 137 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(updateCooperationContractCommand.Operator) |
148 | rules1 := []allied_creation_cooperation.DividendsIncentivesRule{} | 138 | rules1 := []allied_creation_cooperation.DividendsIncentivesRule{} |
149 | for _, v := range updateCooperationContractCommand.DividendsIncentivesRules { | 139 | for _, v := range updateCooperationContractCommand.DividendsIncentivesRules { |
@@ -14,9 +14,7 @@ type CooperationModeService struct { | @@ -14,9 +14,7 @@ type CooperationModeService struct { | ||
14 | 14 | ||
15 | //CreateCooperationMode 创建共创模式服务 | 15 | //CreateCooperationMode 创建共创模式服务 |
16 | func (cooperationModeService *CooperationModeService) CreateCooperationMode(createCooperationModeCommand *command.CreateCooperationModeCommand) (interface{}, error) { | 16 | func (cooperationModeService *CooperationModeService) CreateCooperationMode(createCooperationModeCommand *command.CreateCooperationModeCommand) (interface{}, error) { |
17 | - if err := createCooperationModeCommand.ValidateCommand(); err != nil { | ||
18 | - return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
19 | - } | 17 | + |
20 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(createCooperationModeCommand.Operator) | 18 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(createCooperationModeCommand.Operator) |
21 | result, err := creationCooperationGateway.CooperationModeAdd(allied_creation_cooperation.ReqCooperationModeAdd{ | 19 | result, err := creationCooperationGateway.CooperationModeAdd(allied_creation_cooperation.ReqCooperationModeAdd{ |
22 | CooperationModeName: createCooperationModeCommand.CooperationModeName, | 20 | CooperationModeName: createCooperationModeCommand.CooperationModeName, |
@@ -38,9 +36,6 @@ func (cooperationModeService *CooperationModeService) CreateCooperationMode(crea | @@ -38,9 +36,6 @@ func (cooperationModeService *CooperationModeService) CreateCooperationMode(crea | ||
38 | 36 | ||
39 | //GetCooperationMode 返回共创模式服务 | 37 | //GetCooperationMode 返回共创模式服务 |
40 | func (cooperationModeService *CooperationModeService) GetCooperationMode(getCooperationModeQuery *query.GetCooperationModeQuery) (interface{}, error) { | 38 | func (cooperationModeService *CooperationModeService) GetCooperationMode(getCooperationModeQuery *query.GetCooperationModeQuery) (interface{}, error) { |
41 | - if err := getCooperationModeQuery.ValidateQuery(); err != nil { | ||
42 | - return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
43 | - } | ||
44 | 39 | ||
45 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(getCooperationModeQuery.Operator) | 40 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(getCooperationModeQuery.Operator) |
46 | result, err := creationCooperationGateway.CooperationModeGet(allied_creation_cooperation.ReqCooperationModeGet{ | 41 | result, err := creationCooperationGateway.CooperationModeGet(allied_creation_cooperation.ReqCooperationModeGet{ |
@@ -62,9 +57,7 @@ func (cooperationModeService *CooperationModeService) GetCooperationMode(getCoop | @@ -62,9 +57,7 @@ func (cooperationModeService *CooperationModeService) GetCooperationMode(getCoop | ||
62 | 57 | ||
63 | //ListCooperationMode 返回共创模式服务列表 | 58 | //ListCooperationMode 返回共创模式服务列表 |
64 | func (cooperationModeService *CooperationModeService) ListCooperationMode(listCooperationModeQuery *query.ListCooperationModeQuery) (int64, interface{}, error) { | 59 | func (cooperationModeService *CooperationModeService) ListCooperationMode(listCooperationModeQuery *query.ListCooperationModeQuery) (int64, interface{}, error) { |
65 | - if err := listCooperationModeQuery.ValidateQuery(); err != nil { | ||
66 | - return 0, nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
67 | - } | 60 | + |
68 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(listCooperationModeQuery.Operator) | 61 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(listCooperationModeQuery.Operator) |
69 | result, err := creationCooperationGateway.CooperationModesSearch(allied_creation_cooperation.ReqCooperationModesSearch{ | 62 | result, err := creationCooperationGateway.CooperationModesSearch(allied_creation_cooperation.ReqCooperationModesSearch{ |
70 | PageNumber: listCooperationModeQuery.PageNumber, | 63 | PageNumber: listCooperationModeQuery.PageNumber, |
@@ -99,9 +92,7 @@ func (cooperationModeService *CooperationModeService) ListCooperationMode(listCo | @@ -99,9 +92,7 @@ func (cooperationModeService *CooperationModeService) ListCooperationMode(listCo | ||
99 | 92 | ||
100 | //RemoveCooperationMode 移除共创模式服务 | 93 | //RemoveCooperationMode 移除共创模式服务 |
101 | func (cooperationModeService *CooperationModeService) RemoveCooperationMode(removeCooperationModeCommand *command.RemoveCooperationModeCommand) (interface{}, error) { | 94 | func (cooperationModeService *CooperationModeService) RemoveCooperationMode(removeCooperationModeCommand *command.RemoveCooperationModeCommand) (interface{}, error) { |
102 | - if err := removeCooperationModeCommand.ValidateCommand(); err != nil { | ||
103 | - return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
104 | - } | 95 | + |
105 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(removeCooperationModeCommand.Operator) | 96 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(removeCooperationModeCommand.Operator) |
106 | _, err := creationCooperationGateway.CooperationModeBatchRemove(allied_creation_cooperation.ReqCooperationModeBatchRemove{ | 97 | _, err := creationCooperationGateway.CooperationModeBatchRemove(allied_creation_cooperation.ReqCooperationModeBatchRemove{ |
107 | CooperationModeIds: removeCooperationModeCommand.CooperationModeId, | 98 | CooperationModeIds: removeCooperationModeCommand.CooperationModeId, |
@@ -114,9 +105,7 @@ func (cooperationModeService *CooperationModeService) RemoveCooperationMode(remo | @@ -114,9 +105,7 @@ func (cooperationModeService *CooperationModeService) RemoveCooperationMode(remo | ||
114 | 105 | ||
115 | //UpdateCooperationMode 更新共创模式 | 106 | //UpdateCooperationMode 更新共创模式 |
116 | func (cooperationModeService *CooperationModeService) UpdateCooperationMode(updateCooperationModeCommand *command.UpdateCooperationModeCommand) (interface{}, error) { | 107 | func (cooperationModeService *CooperationModeService) UpdateCooperationMode(updateCooperationModeCommand *command.UpdateCooperationModeCommand) (interface{}, error) { |
117 | - if err := updateCooperationModeCommand.ValidateCommand(); err != nil { | ||
118 | - return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
119 | - } | 108 | + |
120 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(updateCooperationModeCommand.Operator) | 109 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(updateCooperationModeCommand.Operator) |
121 | _, err := creationCooperationGateway.CooperationModeUpdate(allied_creation_cooperation.ReqCooperationModeUpdate{ | 110 | _, err := creationCooperationGateway.CooperationModeUpdate(allied_creation_cooperation.ReqCooperationModeUpdate{ |
122 | CooperationModeId: updateCooperationModeCommand.CooperationModeId, | 111 | CooperationModeId: updateCooperationModeCommand.CooperationModeId, |
@@ -132,9 +121,7 @@ func (cooperationModeService *CooperationModeService) UpdateCooperationMode(upda | @@ -132,9 +121,7 @@ func (cooperationModeService *CooperationModeService) UpdateCooperationMode(upda | ||
132 | 121 | ||
133 | // EnableCooperationMode 禁用启用共创模式 | 122 | // EnableCooperationMode 禁用启用共创模式 |
134 | func (cooperationModeService *CooperationModeService) EnableCooperationMode(updateCooperationModeCommand *command.OperateCooperationModeCommand) (interface{}, error) { | 123 | func (cooperationModeService *CooperationModeService) EnableCooperationMode(updateCooperationModeCommand *command.OperateCooperationModeCommand) (interface{}, error) { |
135 | - if err := updateCooperationModeCommand.ValidateCommand(); err != nil { | ||
136 | - return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
137 | - } | 124 | + |
138 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(updateCooperationModeCommand.Operator) | 125 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(updateCooperationModeCommand.Operator) |
139 | _, err := creationCooperationGateway.CooperationModeOperate(allied_creation_cooperation.ReqOperateCooperationMode{ | 126 | _, err := creationCooperationGateway.CooperationModeOperate(allied_creation_cooperation.ReqOperateCooperationMode{ |
140 | CooperationModeId: updateCooperationModeCommand.CooperationModeId, | 127 | CooperationModeId: updateCooperationModeCommand.CooperationModeId, |
@@ -16,9 +16,7 @@ type CooperationProjectService struct { | @@ -16,9 +16,7 @@ type CooperationProjectService struct { | ||
16 | 16 | ||
17 | // 创建共创项目管理 | 17 | // 创建共创项目管理 |
18 | func (cooperationProjectService *CooperationProjectService) CreateCooperationProject(createCooperationProjectCommand *command.CreateCooperationProjectCommand) (interface{}, error) { | 18 | func (cooperationProjectService *CooperationProjectService) CreateCooperationProject(createCooperationProjectCommand *command.CreateCooperationProjectCommand) (interface{}, error) { |
19 | - if err := createCooperationProjectCommand.ValidateCommand(); err != nil { | ||
20 | - return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
21 | - } | 19 | + |
22 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(createCooperationProjectCommand.Operator) | 20 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(createCooperationProjectCommand.Operator) |
23 | 21 | ||
24 | result, err := creationCooperationGateway.CooperationProjectAdd(allied_creation_cooperation.ReqCooperationProjectAdd{ | 22 | result, err := creationCooperationGateway.CooperationProjectAdd(allied_creation_cooperation.ReqCooperationProjectAdd{ |
@@ -47,9 +45,7 @@ func (cooperationProjectService *CooperationProjectService) CreateCooperationPro | @@ -47,9 +45,7 @@ func (cooperationProjectService *CooperationProjectService) CreateCooperationPro | ||
47 | 45 | ||
48 | // 结束共创项目管理 | 46 | // 结束共创项目管理 |
49 | func (cooperationProjectService *CooperationProjectService) EndCooperationProject(endCooperationProjectCommand *command.EndCooperationProjectCommand) (interface{}, error) { | 47 | func (cooperationProjectService *CooperationProjectService) EndCooperationProject(endCooperationProjectCommand *command.EndCooperationProjectCommand) (interface{}, error) { |
50 | - if err := endCooperationProjectCommand.ValidateCommand(); err != nil { | ||
51 | - return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
52 | - } | 48 | + |
53 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(endCooperationProjectCommand.Operator) | 49 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(endCooperationProjectCommand.Operator) |
54 | _, err := creationCooperationGateway.CooperationProjectBatchEnd(allied_creation_cooperation.ReqCooperationProjectBatchEnd{ | 50 | _, err := creationCooperationGateway.CooperationProjectBatchEnd(allied_creation_cooperation.ReqCooperationProjectBatchEnd{ |
55 | CooperationProjectIds: endCooperationProjectCommand.CooperationProjectId, | 51 | CooperationProjectIds: endCooperationProjectCommand.CooperationProjectId, |
@@ -62,9 +58,7 @@ func (cooperationProjectService *CooperationProjectService) EndCooperationProjec | @@ -62,9 +58,7 @@ func (cooperationProjectService *CooperationProjectService) EndCooperationProjec | ||
62 | 58 | ||
63 | // 返回共创项目管理 | 59 | // 返回共创项目管理 |
64 | func (cooperationProjectService *CooperationProjectService) GetCooperationProject(getCooperationProjectQuery *query.GetCooperationProjectQuery) (interface{}, error) { | 60 | func (cooperationProjectService *CooperationProjectService) GetCooperationProject(getCooperationProjectQuery *query.GetCooperationProjectQuery) (interface{}, error) { |
65 | - if err := getCooperationProjectQuery.ValidateQuery(); err != nil { | ||
66 | - return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
67 | - } | 61 | + |
68 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(getCooperationProjectQuery.Operator) | 62 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(getCooperationProjectQuery.Operator) |
69 | resultProject, err := creationCooperationGateway.CooperationProjectGet(allied_creation_cooperation.ReqCooperationProjectGet{ | 63 | resultProject, err := creationCooperationGateway.CooperationProjectGet(allied_creation_cooperation.ReqCooperationProjectGet{ |
70 | CooperationProjectId: getCooperationProjectQuery.CooperationProjectId, | 64 | CooperationProjectId: getCooperationProjectQuery.CooperationProjectId, |
@@ -98,9 +92,7 @@ func (cooperationProjectService *CooperationProjectService) GetCooperationProjec | @@ -98,9 +92,7 @@ func (cooperationProjectService *CooperationProjectService) GetCooperationProjec | ||
98 | 92 | ||
99 | // 返回共创项目管理列表 | 93 | // 返回共创项目管理列表 |
100 | func (cooperationProjectService *CooperationProjectService) ListCooperationProject(listCooperationProjectQuery *query.ListCooperationProjectQuery) (int64, interface{}, error) { | 94 | func (cooperationProjectService *CooperationProjectService) ListCooperationProject(listCooperationProjectQuery *query.ListCooperationProjectQuery) (int64, interface{}, error) { |
101 | - if err := listCooperationProjectQuery.ValidateQuery(); err != nil { | ||
102 | - return 0, nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
103 | - } | 95 | + |
104 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(listCooperationProjectQuery.Operator) | 96 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(listCooperationProjectQuery.Operator) |
105 | result, err := creationCooperationGateway.CooperationProjectsSearch(allied_creation_cooperation.ReqCooperationProjectSearch{ | 97 | result, err := creationCooperationGateway.CooperationProjectsSearch(allied_creation_cooperation.ReqCooperationProjectSearch{ |
106 | PageNumber: listCooperationProjectQuery.PageNumber, | 98 | PageNumber: listCooperationProjectQuery.PageNumber, |
@@ -130,9 +122,7 @@ func (cooperationProjectService *CooperationProjectService) ListCooperationProje | @@ -130,9 +122,7 @@ func (cooperationProjectService *CooperationProjectService) ListCooperationProje | ||
130 | 122 | ||
131 | // 更新共创项目管理 | 123 | // 更新共创项目管理 |
132 | func (cooperationProjectService *CooperationProjectService) UpdateCooperationProject(updateCooperationProjectCommand *command.UpdateCooperationProjectCommand) (interface{}, error) { | 124 | func (cooperationProjectService *CooperationProjectService) UpdateCooperationProject(updateCooperationProjectCommand *command.UpdateCooperationProjectCommand) (interface{}, error) { |
133 | - if err := updateCooperationProjectCommand.ValidateCommand(); err != nil { | ||
134 | - return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
135 | - } | 125 | + |
136 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(updateCooperationProjectCommand.Operator) | 126 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(updateCooperationProjectCommand.Operator) |
137 | _, err := creationCooperationGateway.CooperationProjectUpdate(allied_creation_cooperation.ReqCooperationProjectUpdate{ | 127 | _, err := creationCooperationGateway.CooperationProjectUpdate(allied_creation_cooperation.ReqCooperationProjectUpdate{ |
138 | CooperationProjectId: updateCooperationProjectCommand.CooperationProjectId, | 128 | CooperationProjectId: updateCooperationProjectCommand.CooperationProjectId, |
@@ -16,9 +16,7 @@ type DividendsOrderService struct { | @@ -16,9 +16,7 @@ type DividendsOrderService struct { | ||
16 | 16 | ||
17 | // 创建分红订单实体对象 | 17 | // 创建分红订单实体对象 |
18 | func (dividendsOrderService *DividendsOrderService) CreateDividendsOrder(createDividendsOrderCommand *command.CreateDividendsOrderCommand) (interface{}, error) { | 18 | func (dividendsOrderService *DividendsOrderService) CreateDividendsOrder(createDividendsOrderCommand *command.CreateDividendsOrderCommand) (interface{}, error) { |
19 | - // if err := createDividendsOrderCommand.ValidateCommand(); err != nil { | ||
20 | - // return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
21 | - // } | 19 | + |
22 | orderGoods := []allied_creation_cooperation.DividendsOrderGoodAdd{} | 20 | orderGoods := []allied_creation_cooperation.DividendsOrderGoodAdd{} |
23 | for _, v := range createDividendsOrderCommand.OrderGoods { | 21 | for _, v := range createDividendsOrderCommand.OrderGoods { |
24 | good := allied_creation_cooperation.DividendsOrderGoodAdd{ | 22 | good := allied_creation_cooperation.DividendsOrderGoodAdd{ |
@@ -68,9 +66,6 @@ func (dividendsOrderService *DividendsOrderService) GetDividendsOrder(getDividen | @@ -68,9 +66,6 @@ func (dividendsOrderService *DividendsOrderService) GetDividendsOrder(getDividen | ||
68 | 66 | ||
69 | // 移除分红订单实体对象 | 67 | // 移除分红订单实体对象 |
70 | func (dividendsOrderService *DividendsOrderService) RemoveDividendsOrder(removeDividendsOrderCommand *command.RemoveDividendsOrderCommand) (interface{}, error) { | 68 | func (dividendsOrderService *DividendsOrderService) RemoveDividendsOrder(removeDividendsOrderCommand *command.RemoveDividendsOrderCommand) (interface{}, error) { |
71 | - // if err := removeDividendsOrderCommand.ValidateCommand(); err != nil { | ||
72 | - // return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
73 | - // } | ||
74 | 69 | ||
75 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(removeDividendsOrderCommand.Operator) | 70 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(removeDividendsOrderCommand.Operator) |
76 | _, err := creationCooperationGateway.DividendsOrderBatchRemove(allied_creation_cooperation.ReqDividendsOrderBatchRemove{ | 71 | _, err := creationCooperationGateway.DividendsOrderBatchRemove(allied_creation_cooperation.ReqDividendsOrderBatchRemove{ |
@@ -105,9 +100,7 @@ func (dividendsOrderService *DividendsOrderService) SearchDividendsOrder(searchD | @@ -105,9 +100,7 @@ func (dividendsOrderService *DividendsOrderService) SearchDividendsOrder(searchD | ||
105 | 100 | ||
106 | // 更新分红订单实体对象 | 101 | // 更新分红订单实体对象 |
107 | func (dividendsOrderService *DividendsOrderService) UpdateDividendsOrder(updateDividendsOrderCommand *command.UpdateDividendsOrderCommand) (interface{}, error) { | 102 | func (dividendsOrderService *DividendsOrderService) UpdateDividendsOrder(updateDividendsOrderCommand *command.UpdateDividendsOrderCommand) (interface{}, error) { |
108 | - // if err := updateDividendsOrderCommand.ValidateCommand(); err != nil { | ||
109 | - // return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
110 | - // } | 103 | + |
111 | orderGoods := []allied_creation_cooperation.DividendsOrderGoodAdd{} | 104 | orderGoods := []allied_creation_cooperation.DividendsOrderGoodAdd{} |
112 | for _, v := range updateDividendsOrderCommand.OrderGoods { | 105 | for _, v := range updateDividendsOrderCommand.OrderGoods { |
113 | good := allied_creation_cooperation.DividendsOrderGoodAdd{ | 106 | good := allied_creation_cooperation.DividendsOrderGoodAdd{ |
@@ -19,9 +19,8 @@ type UpdateDividendsReturnedOrderCommand struct { | @@ -19,9 +19,8 @@ type UpdateDividendsReturnedOrderCommand struct { | ||
19 | OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价 | 19 | OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价 |
20 | OrderGoodQuantity int `json:"orderGoodQuantity"` //订单产品数量 | 20 | OrderGoodQuantity int `json:"orderGoodQuantity"` //订单产品数量 |
21 | } `json:"orderGoods"` //货品 | 21 | } `json:"orderGoods"` //货品 |
22 | - DividendsReturnedDate int64 `json:"dividendsReturnedDate"` //退货日期 | ||
23 | - OrderTime int64 `json:"orderTime"` //订单日期 | ||
24 | - | ||
25 | - Remarks string `json:"remarks"` // | ||
26 | - RegionName string `json:"regionName"` | 22 | + DividendsReturnedDate int64 `json:"dividendsReturnedDate"` //退货日期 |
23 | + OrderTime int64 `json:"orderTime"` //订单日期 | ||
24 | + Remarks string `json:"remarks"` // | ||
25 | + RegionName string `json:"regionName"` | ||
27 | } | 26 | } |
@@ -17,9 +17,7 @@ type NoticeSettingService struct { | @@ -17,9 +17,7 @@ type NoticeSettingService struct { | ||
17 | 17 | ||
18 | //NoticeSettingList 推送消息配置列表 | 18 | //NoticeSettingList 推送消息配置列表 |
19 | func (noticeSettingService *NoticeSettingService) NoticeSettingList(noticeSettingListQuery *query.NoticeSettingListQuery) (int64, interface{}, error) { | 19 | func (noticeSettingService *NoticeSettingService) NoticeSettingList(noticeSettingListQuery *query.NoticeSettingListQuery) (int64, interface{}, error) { |
20 | - if err := noticeSettingListQuery.ValidateQuery(); err != nil { | ||
21 | - return 0, nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
22 | - } | 20 | + |
23 | creationBasicGateway := allied_creation_basic.NewHttplibAlliedCreationBasic( | 21 | creationBasicGateway := allied_creation_basic.NewHttplibAlliedCreationBasic( |
24 | noticeSettingListQuery.Operator, | 22 | noticeSettingListQuery.Operator, |
25 | ) | 23 | ) |
@@ -73,9 +71,7 @@ func (noticeSettingService *NoticeSettingService) NoticeSettingList(noticeSettin | @@ -73,9 +71,7 @@ func (noticeSettingService *NoticeSettingService) NoticeSettingList(noticeSettin | ||
73 | 71 | ||
74 | //NoticeSettingProfile 推送消息配置需求的参数候选项 | 72 | //NoticeSettingProfile 推送消息配置需求的参数候选项 |
75 | func (noticeSettingService *NoticeSettingService) NoticeSettingProfile(noticeSettingProfileQuery *query.NoticeSettingProfileQuery) (interface{}, error) { | 73 | func (noticeSettingService *NoticeSettingService) NoticeSettingProfile(noticeSettingProfileQuery *query.NoticeSettingProfileQuery) (interface{}, error) { |
76 | - if err := noticeSettingProfileQuery.ValidateQuery(); err != nil { | ||
77 | - return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
78 | - } | 74 | + |
79 | creationBasicGateway := allied_creation_basic.NewHttplibAlliedCreationBasic( | 75 | creationBasicGateway := allied_creation_basic.NewHttplibAlliedCreationBasic( |
80 | noticeSettingProfileQuery.Operator, | 76 | noticeSettingProfileQuery.Operator, |
81 | ) | 77 | ) |
@@ -110,9 +106,7 @@ func (noticeSettingService *NoticeSettingService) NoticeSettingUpdate(noticeSett | @@ -110,9 +106,7 @@ func (noticeSettingService *NoticeSettingService) NoticeSettingUpdate(noticeSett | ||
110 | 106 | ||
111 | // NoticeSettingUpdate 添加配置 | 107 | // NoticeSettingUpdate 添加配置 |
112 | func (noticeSettingService *NoticeSettingService) NoticeSettingAdd(noticeSettingAddCommand *command.NoticeSettingAddCommand) (interface{}, error) { | 108 | func (noticeSettingService *NoticeSettingService) NoticeSettingAdd(noticeSettingAddCommand *command.NoticeSettingAddCommand) (interface{}, error) { |
113 | - if err := noticeSettingAddCommand.ValidateCommand(); err != nil { | ||
114 | - return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
115 | - } | 109 | + |
116 | creationBasicGateway := allied_creation_basic.NewHttplibAlliedCreationBasic( | 110 | creationBasicGateway := allied_creation_basic.NewHttplibAlliedCreationBasic( |
117 | noticeSettingAddCommand.Operator, | 111 | noticeSettingAddCommand.Operator, |
118 | ) | 112 | ) |
@@ -139,9 +133,7 @@ func (noticeSettingService *NoticeSettingService) NoticeSettingAdd(noticeSetting | @@ -139,9 +133,7 @@ func (noticeSettingService *NoticeSettingService) NoticeSettingAdd(noticeSetting | ||
139 | 133 | ||
140 | // NoticeSettingGet 获取配置 | 134 | // NoticeSettingGet 获取配置 |
141 | func (noticeSettingService *NoticeSettingService) NoticeSettingGet(noticeSettingGetQuery *query.NoticeSettingGetQuery) (interface{}, error) { | 135 | func (noticeSettingService *NoticeSettingService) NoticeSettingGet(noticeSettingGetQuery *query.NoticeSettingGetQuery) (interface{}, error) { |
142 | - if err := noticeSettingGetQuery.ValidateQuery(); err != nil { | ||
143 | - return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | ||
144 | - } | 136 | + |
145 | creationBasicGateway := allied_creation_basic.NewHttplibAlliedCreationBasic( | 137 | creationBasicGateway := allied_creation_basic.NewHttplibAlliedCreationBasic( |
146 | noticeSettingGetQuery.Operator, | 138 | noticeSettingGetQuery.Operator, |
147 | ) | 139 | ) |
@@ -83,10 +83,10 @@ type ( | @@ -83,10 +83,10 @@ type ( | ||
83 | //共创申请批量审核 | 83 | //共创申请批量审核 |
84 | type ( | 84 | type ( |
85 | ReqCooperationApplicationBatchApproval struct { | 85 | ReqCooperationApplicationBatchApproval struct { |
86 | - CooperationApplicationIds []string `json:"cooperationApplicationIds"` | ||
87 | - CooperationApplicationDescription string `json:"cooperationApplicationDescription"` //描述 | ||
88 | - Action int `json:"action"` //审核动作,1同意,2拒绝 | ||
89 | - Code string `json:"code" ` //cname:"菜单编码" | 86 | + CooperationApplicationIds []string `json:"cooperationApplicationIds"` |
87 | + CooperationApplicationVerifyDescription string `json:"cooperationApplicationVerifyDescription"` //描述 | ||
88 | + Action int `json:"action"` //审核动作,1同意,2拒绝 | ||
89 | + Code string `json:"code" ` //cname:"菜单编码" | ||
90 | } | 90 | } |
91 | 91 | ||
92 | DataCooperationApplicationBatchApproval struct { | 92 | DataCooperationApplicationBatchApproval struct { |
-
请 注册 或 登录 后发表评论