allied-creation / allied-creation-cooperation · 提交

转到一个项目

作者 yangfu
提交 182451a3913bce5b6c41959d618b65b53d644525 2 个父辈 1fbc2058 fa044df9

Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creat… 

…ion-cooperation into dev
内嵌 并排对比
正在显示 17 个修改的文件 包含 281 行增加 和 223 行删除
1 -FROM golang:latest 1 +FROM 192.168.0.243:5000/mmm/allied-creation-cooperation:20210908
  2 +#FROM golang:latest
2 MAINTAINER 陈志颖 <steve.d.chan@qq.com> 3 MAINTAINER 陈志颖 <steve.d.chan@qq.com>
3 ENV APP_DIR $GOPATH/src/allied-creation-cooperation 4 ENV APP_DIR $GOPATH/src/allied-creation-cooperation
4 RUN mkdir -p $APP_DIR 5 RUN mkdir -p $APP_DIR
@@ -10,7 +11,7 @@ COPY ./go.sum go.sum @@ -10,7 +11,7 @@ COPY ./go.sum go.sum
10 COPY ./main.go main.go 11 COPY ./main.go main.go
11 RUN ["ln","-sf","/usr/share/zoneinfo/Asia/Shanghai","/etc/localtime"] 12 RUN ["ln","-sf","/usr/share/zoneinfo/Asia/Shanghai","/etc/localtime"]
12 ENV GO111MODULE on 13 ENV GO111MODULE on
13 -ENV GOPROXY https://goproxy.io 14 +ENV GOPROXY https://goproxy.cn
14 RUN ["go","mod","tidy"] 15 RUN ["go","mod","tidy"]
15 RUN ["ls"] 16 RUN ["ls"]
16 RUN ["go","build"] 17 RUN ["go","build"]
@@ -10,18 +10,20 @@ require ( @@ -10,18 +10,20 @@ require (
10 github.com/fatih/structs v1.1.0 // indirect 10 github.com/fatih/structs v1.1.0 // indirect
11 github.com/gavv/httpexpect v2.0.0+incompatible 11 github.com/gavv/httpexpect v2.0.0+incompatible
12 github.com/go-pg/pg/v10 v10.7.7 12 github.com/go-pg/pg/v10 v10.7.7
  13 + github.com/google/go-cmp v0.5.6 // indirect
13 github.com/google/go-querystring v1.1.0 // indirect 14 github.com/google/go-querystring v1.1.0 // indirect
  15 + github.com/google/uuid v1.1.2 // indirect
14 github.com/gorilla/websocket v1.4.2 // indirect 16 github.com/gorilla/websocket v1.4.2 // indirect
15 github.com/imkira/go-interpol v1.1.0 // indirect 17 github.com/imkira/go-interpol v1.1.0 // indirect
16 github.com/linmadan/egglib-go v0.0.0-20210527091316-06b0732fb5f6 18 github.com/linmadan/egglib-go v0.0.0-20210527091316-06b0732fb5f6
17 github.com/mattn/go-colorable v0.1.8 // indirect 19 github.com/mattn/go-colorable v0.1.8 // indirect
18 github.com/moul/http2curl v1.0.0 // indirect 20 github.com/moul/http2curl v1.0.0 // indirect
19 - github.com/olivere/elastic/v7 v7.0.28  
20 github.com/onsi/ginkgo v1.14.2 21 github.com/onsi/ginkgo v1.14.2
21 github.com/onsi/gomega v1.10.3 22 github.com/onsi/gomega v1.10.3
22 github.com/sergi/go-diff v1.2.0 // indirect 23 github.com/sergi/go-diff v1.2.0 // indirect
23 github.com/shopspring/decimal v1.2.0 24 github.com/shopspring/decimal v1.2.0
24 - github.com/sirupsen/logrus v1.8.1 25 + github.com/sirupsen/logrus v1.8.1 // indirect
  26 + github.com/smartystreets/assertions v1.1.1 // indirect
25 github.com/smartystreets/goconvey v1.6.4 // indirect 27 github.com/smartystreets/goconvey v1.6.4 // indirect
26 github.com/valyala/fasthttp v1.28.0 // indirect 28 github.com/valyala/fasthttp v1.28.0 // indirect
27 github.com/xeipuuv/gojsonschema v1.2.0 // indirect 29 github.com/xeipuuv/gojsonschema v1.2.0 // indirect
@@ -29,5 +31,5 @@ require ( @@ -29,5 +31,5 @@ require (
29 github.com/yudai/gojsondiff v1.0.0 // indirect 31 github.com/yudai/gojsondiff v1.0.0 // indirect
30 github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect 32 github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
31 github.com/yudai/pp v2.0.1+incompatible // indirect 33 github.com/yudai/pp v2.0.1+incompatible // indirect
32 - gopkg.in/sohlich/elogrus.v7 v7.0.0 34 + golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
33 ) 35 )
1 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= 1 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
2 -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=  
3 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= 2 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
4 github.com/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= 3 github.com/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
5 -github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=  
6 github.com/Shopify/sarama v1.25.0 h1:ch1ywjRLjfJtU+EaiJ+l0rWffQ6TRpyYmW4DX7Cb2SU= 4 github.com/Shopify/sarama v1.25.0 h1:ch1ywjRLjfJtU+EaiJ+l0rWffQ6TRpyYmW4DX7Cb2SU=
7 github.com/Shopify/sarama v1.25.0/go.mod h1:y/CFFTO9eaMTNriwu/Q+W4eioLqiDMGkA1W+gmdfj8w= 5 github.com/Shopify/sarama v1.25.0/go.mod h1:y/CFFTO9eaMTNriwu/Q+W4eioLqiDMGkA1W+gmdfj8w=
8 github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= 6 github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc=
@@ -17,9 +15,6 @@ github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6/go.mod h1:SGn @@ -17,9 +15,6 @@ github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6/go.mod h1:SGn
17 github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk= 15 github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk=
18 github.com/andybalholm/brotli v1.0.2 h1:JKnhI/XQ75uFBTiuzXpzFrUriDPiZjlOSzh6wXogP0E= 16 github.com/andybalholm/brotli v1.0.2 h1:JKnhI/XQ75uFBTiuzXpzFrUriDPiZjlOSzh6wXogP0E=
19 github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= 17 github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
20 -github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=  
21 -github.com/aws/aws-sdk-go v1.19.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=  
22 -github.com/aws/aws-sdk-go v1.40.32/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=  
23 github.com/beego/beego/v2 v2.0.1 h1:07a7Z0Ok5vbqyqh+q53sDPl9LdhKh0ZDy3gbyGrhFnE= 18 github.com/beego/beego/v2 v2.0.1 h1:07a7Z0Ok5vbqyqh+q53sDPl9LdhKh0ZDy3gbyGrhFnE=
24 github.com/beego/beego/v2 v2.0.1/go.mod h1:8zyHi1FnWO1mZLwTn62aKRIZF/aIKvkCBB2JYs+eqQI= 19 github.com/beego/beego/v2 v2.0.1/go.mod h1:8zyHi1FnWO1mZLwTn62aKRIZF/aIKvkCBB2JYs+eqQI=
25 github.com/beego/goyaml2 v0.0.0-20130207012346-5545475820dd/go.mod h1:1b+Y/CofkYwXMUU0OhQqGvsY2Bvgr4j6jfT699wyZKQ= 20 github.com/beego/goyaml2 v0.0.0-20130207012346-5545475820dd/go.mod h1:1b+Y/CofkYwXMUU0OhQqGvsY2Bvgr4j6jfT699wyZKQ=
@@ -35,7 +30,6 @@ github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+ @@ -35,7 +30,6 @@ github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+
35 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= 30 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
36 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= 31 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
37 github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80= 32 github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
38 -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=  
39 github.com/coreos/etcd v3.3.25+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= 33 github.com/coreos/etcd v3.3.25+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
40 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= 34 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
41 github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= 35 github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
@@ -59,9 +53,7 @@ github.com/elastic/go-elasticsearch/v6 v6.8.5 h1:U2HtkBseC1FNBmDr0TR2tKltL6FxoY+ @@ -59,9 +53,7 @@ github.com/elastic/go-elasticsearch/v6 v6.8.5 h1:U2HtkBseC1FNBmDr0TR2tKltL6FxoY+
59 github.com/elastic/go-elasticsearch/v6 v6.8.5/go.mod h1:UwaDJsD3rWLM5rKNFzv9hgox93HoX8utj1kxD9aFUcI= 53 github.com/elastic/go-elasticsearch/v6 v6.8.5/go.mod h1:UwaDJsD3rWLM5rKNFzv9hgox93HoX8utj1kxD9aFUcI=
60 github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3CKKpKinvZLFk= 54 github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3CKKpKinvZLFk=
61 github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4= 55 github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
62 -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=  
63 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= 56 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
64 -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=  
65 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= 57 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
66 github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072 h1:DddqAaWDpywytcG8w/qoQ5sAN8X12d3Z3koB0C3Rxsc= 58 github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072 h1:DddqAaWDpywytcG8w/qoQ5sAN8X12d3Z3koB0C3Rxsc=
67 github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8= 59 github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
@@ -91,12 +83,9 @@ github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gG @@ -91,12 +83,9 @@ github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gG
91 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= 83 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
92 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= 84 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
93 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= 85 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
94 -github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=  
95 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= 86 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
96 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= 87 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
97 -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=  
98 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= 88 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
99 -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=  
100 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= 89 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
101 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= 90 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
102 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= 91 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -121,7 +110,6 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw @@ -121,7 +110,6 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
121 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 110 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
122 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 111 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
123 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 112 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
124 -github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=  
125 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 113 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
126 github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= 114 github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
127 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 115 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -134,14 +122,11 @@ github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= @@ -134,14 +122,11 @@ github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
134 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 122 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
135 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= 123 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
136 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= 124 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
137 -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=  
138 -github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=  
139 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= 125 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
140 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= 126 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
141 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= 127 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
142 github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE= 128 github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE=
143 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= 129 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
144 -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=  
145 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= 130 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
146 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= 131 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
147 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= 132 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
@@ -151,11 +136,6 @@ github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03 h1:FUwcHNlEqkqLjL @@ -151,11 +136,6 @@ github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03 h1:FUwcHNlEqkqLjL
151 github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= 136 github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o=
152 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= 137 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
153 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= 138 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
154 -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=  
155 -github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=  
156 -github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=  
157 -github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=  
158 -github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=  
159 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= 139 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
160 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= 140 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
161 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= 141 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
@@ -179,10 +159,6 @@ github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= @@ -179,10 +159,6 @@ github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
179 github.com/linmadan/egglib-go v0.0.0-20210527091316-06b0732fb5f6 h1:nyhVnOIXsESuhZ95Ak6VRSF+0fHeKlYWq0EvHByt5RU= 159 github.com/linmadan/egglib-go v0.0.0-20210527091316-06b0732fb5f6 h1:nyhVnOIXsESuhZ95Ak6VRSF+0fHeKlYWq0EvHByt5RU=
180 github.com/linmadan/egglib-go v0.0.0-20210527091316-06b0732fb5f6/go.mod h1:ZZuSWicGxpgN0OulARhuKwFJuJ9we0otaPVAJtz10yk= 160 github.com/linmadan/egglib-go v0.0.0-20210527091316-06b0732fb5f6/go.mod h1:ZZuSWicGxpgN0OulARhuKwFJuJ9we0otaPVAJtz10yk=
181 github.com/magefile/mage v1.10.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= 161 github.com/magefile/mage v1.10.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
182 -github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=  
183 -github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=  
184 -github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=  
185 -github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=  
186 github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= 162 github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
187 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= 163 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
188 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= 164 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
@@ -204,29 +180,21 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWb @@ -204,29 +180,21 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWb
204 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= 180 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
205 github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= 181 github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
206 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= 182 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
207 -github.com/olivere/elastic/v7 v7.0.4/go.mod h1:l4YWa59iTCcOJQXI5ZtxVjcd3p5U8GCxVgvzHZqGn3o=  
208 -github.com/olivere/elastic/v7 v7.0.28 h1:KAP4EuaEcvPJknRNkAAso1xeu0C1+/CeDQsxj9Cw9Fg=  
209 -github.com/olivere/elastic/v7 v7.0.28/go.mod h1:DzHQoqd6YqSuvF1lk/fR4cW4FNUNzSD5/F5MBm3GRMo=  
210 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= 183 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
211 -github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=  
212 github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= 184 github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
213 github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg= 185 github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
214 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= 186 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
215 github.com/onsi/ginkgo v1.14.2 h1:8mVmC9kjFFmA8H4pKMUhcblgifdkOIXPvbhN1T36q1M= 187 github.com/onsi/ginkgo v1.14.2 h1:8mVmC9kjFFmA8H4pKMUhcblgifdkOIXPvbhN1T36q1M=
216 github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= 188 github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
217 -github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=  
218 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= 189 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
219 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= 190 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
220 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= 191 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
221 github.com/onsi/gomega v1.10.3 h1:gph6h/qe9GSUw1NhH1gp+qb+h8rXD8Cy60Z32Qw3ELA= 192 github.com/onsi/gomega v1.10.3 h1:gph6h/qe9GSUw1NhH1gp+qb+h8rXD8Cy60Z32Qw3ELA=
222 github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= 193 github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc=
223 -github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=  
224 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= 194 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
225 -github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=  
226 github.com/pelletier/go-toml v1.0.1/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= 195 github.com/pelletier/go-toml v1.0.1/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
227 github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= 196 github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=
228 github.com/peterh/liner v1.0.1-0.20171122030339-3681c2a91233/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc= 197 github.com/peterh/liner v1.0.1-0.20171122030339-3681c2a91233/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc=
229 -github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=  
230 github.com/pierrec/lz4 v2.2.6+incompatible h1:6aCX4/YZ9v8q69hTyiR7dNLnTA3fgtKHVVW5BCd5Znw= 198 github.com/pierrec/lz4 v2.2.6+incompatible h1:6aCX4/YZ9v8q69hTyiR7dNLnTA3fgtKHVVW5BCd5Znw=
231 github.com/pierrec/lz4 v2.2.6+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= 199 github.com/pierrec/lz4 v2.2.6+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
232 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= 200 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -236,22 +204,18 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE @@ -236,22 +204,18 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
236 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= 204 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
237 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= 205 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
238 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= 206 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
239 -github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=  
240 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= 207 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
241 github.com/prometheus/client_golang v1.7.0 h1:wCi7urQOGBsYcQROHqpUUX4ct84xp40t9R9JX0FuA/U= 208 github.com/prometheus/client_golang v1.7.0 h1:wCi7urQOGBsYcQROHqpUUX4ct84xp40t9R9JX0FuA/U=
242 github.com/prometheus/client_golang v1.7.0/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= 209 github.com/prometheus/client_golang v1.7.0/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
243 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= 210 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
244 -github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=  
245 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= 211 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
246 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= 212 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
247 github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= 213 github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
248 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= 214 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
249 -github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=  
250 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= 215 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
251 github.com/prometheus/common v0.10.0 h1:RyRA7RzGXQZiW+tGMr7sxa85G1z0yOpM1qq5c8lNawc= 216 github.com/prometheus/common v0.10.0 h1:RyRA7RzGXQZiW+tGMr7sxa85G1z0yOpM1qq5c8lNawc=
252 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= 217 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
253 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= 218 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
254 -github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=  
255 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= 219 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
256 github.com/prometheus/procfs v0.1.3 h1:F0+tqvhOksq22sc6iCHF5WGlWjdwj92p0udFh1VFBS8= 220 github.com/prometheus/procfs v0.1.3 h1:F0+tqvhOksq22sc6iCHF5WGlWjdwj92p0udFh1VFBS8=
257 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= 221 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
@@ -275,10 +239,8 @@ github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic @@ -275,10 +239,8 @@ github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic
275 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= 239 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
276 github.com/smartystreets/assertions v1.1.1 h1:T/YLemO5Yp7KPzS+lVtu+WsHn8yoSwTfItdAd1r3cck= 240 github.com/smartystreets/assertions v1.1.1 h1:T/YLemO5Yp7KPzS+lVtu+WsHn8yoSwTfItdAd1r3cck=
277 github.com/smartystreets/assertions v1.1.1/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= 241 github.com/smartystreets/assertions v1.1.1/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
278 -github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM=  
279 github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= 242 github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
280 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= 243 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
281 -github.com/smartystreets/gunit v1.4.2/go.mod h1:ZjM1ozSIMJlAz/ay4SG8PeKF00ckUp+zMHZXV9/bvak=  
282 github.com/ssdb/gossdb v0.0.0-20180723034631-88f6b59b84ec/go.mod h1:QBvMkMya+gXctz3kmljlUCu/yB3GZ6oee+dUozsezQE= 244 github.com/ssdb/gossdb v0.0.0-20180723034631-88f6b59b84ec/go.mod h1:QBvMkMya+gXctz3kmljlUCu/yB3GZ6oee+dUozsezQE=
283 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= 245 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
284 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= 246 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -327,8 +289,6 @@ github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZ @@ -327,8 +289,6 @@ github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZ
327 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 289 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
328 github.com/yuin/gopher-lua v0.0.0-20171031051903-609c9cd26973/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU= 290 github.com/yuin/gopher-lua v0.0.0-20171031051903-609c9cd26973/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU=
329 go.etcd.io/etcd v3.3.25+incompatible/go.mod h1:yaeTdrJi5lOmYerz05bd8+V7KubZs8YSFZfzsF9A6aI= 291 go.etcd.io/etcd v3.3.25+incompatible/go.mod h1:yaeTdrJi5lOmYerz05bd8+V7KubZs8YSFZfzsF9A6aI=
330 -go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=  
331 -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=  
332 go.opentelemetry.io/otel v0.17.0 h1:6MKOu8WY4hmfpQ4oQn34u6rYhnf2sWf1LXYO/UFm71U= 292 go.opentelemetry.io/otel v0.17.0 h1:6MKOu8WY4hmfpQ4oQn34u6rYhnf2sWf1LXYO/UFm71U=
333 go.opentelemetry.io/otel v0.17.0/go.mod h1:Oqtdxmf7UtEvL037ohlgnaYa1h7GtMh0NcSd9eqkC9s= 293 go.opentelemetry.io/otel v0.17.0/go.mod h1:Oqtdxmf7UtEvL037ohlgnaYa1h7GtMh0NcSd9eqkC9s=
334 go.opentelemetry.io/otel/metric v0.17.0 h1:t+5EioN8YFXQ2EH+1j6FHCKMUj+57zIDSnSGr/mWuug= 294 go.opentelemetry.io/otel/metric v0.17.0 h1:t+5EioN8YFXQ2EH+1j6FHCKMUj+57zIDSnSGr/mWuug=
@@ -354,7 +314,6 @@ golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5 @@ -354,7 +314,6 @@ golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5
354 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= 314 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
355 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= 315 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
356 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= 316 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
357 -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=  
358 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= 317 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
359 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= 318 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
360 golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= 319 golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
@@ -366,8 +325,6 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r @@ -366,8 +325,6 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r
366 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= 325 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
367 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= 326 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
368 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= 327 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
369 -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=  
370 -golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=  
371 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= 328 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
372 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= 329 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
373 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= 330 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -383,11 +340,9 @@ golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qx @@ -383,11 +340,9 @@ golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qx
383 golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q= 340 golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q=
384 golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= 341 golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
385 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= 342 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
386 -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=  
387 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 343 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
388 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 344 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
389 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 345 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
390 -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=  
391 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 346 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
392 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 347 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
393 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 348 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -395,7 +350,6 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h @@ -395,7 +350,6 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h
395 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= 350 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
396 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= 351 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
397 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= 352 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
398 -golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=  
399 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= 353 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
400 golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= 354 golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
401 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= 355 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -424,13 +378,11 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= @@ -424,13 +378,11 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
424 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= 378 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
425 golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= 379 golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
426 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= 380 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
427 -golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=  
428 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= 381 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
429 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= 382 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
430 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= 383 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
431 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= 384 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
432 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= 385 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
433 -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=  
434 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= 386 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
435 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= 387 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
436 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= 388 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
@@ -446,20 +398,15 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T @@ -446,20 +398,15 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
446 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 398 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
447 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= 399 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
448 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 400 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
449 -google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=  
450 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= 401 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
451 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= 402 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
452 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= 403 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
453 -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=  
454 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= 404 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
455 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= 405 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
456 -google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=  
457 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= 406 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
458 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= 407 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
459 -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=  
460 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= 408 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
461 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= 409 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
462 -google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=  
463 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= 410 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
464 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= 411 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
465 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= 412 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -489,8 +436,6 @@ gopkg.in/jcmturner/gokrb5.v7 v7.2.3/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuv @@ -489,8 +436,6 @@ gopkg.in/jcmturner/gokrb5.v7 v7.2.3/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuv
489 gopkg.in/jcmturner/rpc.v1 v1.1.0 h1:QHIUxTX1ISuAv9dD2wJ9HWQVuWDX/Zc0PfeC2tjc4rU= 436 gopkg.in/jcmturner/rpc.v1 v1.1.0 h1:QHIUxTX1ISuAv9dD2wJ9HWQVuWDX/Zc0PfeC2tjc4rU=
490 gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8= 437 gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8=
491 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= 438 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
492 -gopkg.in/sohlich/elogrus.v7 v7.0.0 h1:w4pw1DTXK/bqliKbcJk7hSXKrMM/jPdvpaROC9WSK+8=  
493 -gopkg.in/sohlich/elogrus.v7 v7.0.0/go.mod h1:nGmb0kLyAPGwIHLpHNlMlz0l0OfSaFatKgfpuO/+fnY=  
494 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= 439 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
495 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= 440 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
496 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= 441 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -502,7 +447,6 @@ gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= @@ -502,7 +447,6 @@ gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
502 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= 447 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
503 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= 448 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
504 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= 449 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
505 -honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=  
506 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= 450 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
507 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= 451 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
508 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= 452 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
@@ -80,7 +80,6 @@ func (contractUndertakerFeedbackService *ContractUndertakerFeedbackService) Crea @@ -80,7 +80,6 @@ func (contractUndertakerFeedbackService *ContractUndertakerFeedbackService) Crea
80 organization = data 80 organization = data
81 } 81 }
82 82
83 - // 获取项目合约信息  
84 var cooperationContractRepository domain.CooperationContractRepository 83 var cooperationContractRepository domain.CooperationContractRepository
85 if value, err := factory.CreateCooperationContractRepository(map[string]interface{}{ 84 if value, err := factory.CreateCooperationContractRepository(map[string]interface{}{
86 "transactionContext": transactionContext, 85 "transactionContext": transactionContext,
@@ -89,7 +88,13 @@ func (contractUndertakerFeedbackService *ContractUndertakerFeedbackService) Crea @@ -89,7 +88,13 @@ func (contractUndertakerFeedbackService *ContractUndertakerFeedbackService) Crea
89 } else { 88 } else {
90 cooperationContractRepository = value 89 cooperationContractRepository = value
91 } 90 }
92 - cooperationContract, err := cooperationContractRepository.FindOne(map[string]interface{}{"cooperationContractNumber": createContractUndertakerFeedbackCommand.CooperationContractNumber}) 91 +
  92 + // 获取项目合约信息
  93 + cooperationContract, err := cooperationContractRepository.FindOne(map[string]interface{}{
  94 + "cooperationContractNumber": createContractUndertakerFeedbackCommand.CooperationContractNumber,
  95 + "companyId": createContractUndertakerFeedbackCommand.CompanyId,
  96 + "orgId": createContractUndertakerFeedbackCommand.OrgId,
  97 + })
93 if err != nil { 98 if err != nil {
94 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "共创合约不存在") 99 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "共创合约不存在")
95 } 100 }
@@ -19,6 +19,8 @@ type SearchCooperationContractQuery struct { @@ -19,6 +19,8 @@ type SearchCooperationContractQuery struct {
19 SponsorName string `cname:"发起人姓名" json:"sponsorName,omitempty"` 19 SponsorName string `cname:"发起人姓名" json:"sponsorName,omitempty"`
20 // 激励类型 20 // 激励类型
21 IncentivesType int32 `cname:"激励类型" json:"incentivesType,omitempty"` 21 IncentivesType int32 `cname:"激励类型" json:"incentivesType,omitempty"`
  22 + // 合约状态
  23 + Status int32 `cname:"合约状态" json:"status,omitempty"`
22 // 公司ID，通过集成REST上下文获取 24 // 公司ID，通过集成REST上下文获取
23 CompanyId int64 `cname:"公司ID" json:"companyId"` 25 CompanyId int64 `cname:"公司ID" json:"companyId"`
24 // 组织机构ID 26 // 组织机构ID
@@ -147,13 +147,19 @@ func (creditAccountService *CreditAccountService) CreateCreditAccount(createCred @@ -147,13 +147,19 @@ func (creditAccountService *CreditAccountService) CreateCreditAccount(createCred
147 // 预算明细 147 // 预算明细
148 var accountDetail []*domain.AccountDetail 148 var accountDetail []*domain.AccountDetail
149 var settlementAmount float64 149 var settlementAmount float64
  150 + var goodAmountCount float64
150 for _, dividendsEstimate := range dividendsEstimates { 151 for _, dividendsEstimate := range dividendsEstimates {
151 accountDetail = append(accountDetail, &domain.AccountDetail{ 152 accountDetail = append(accountDetail, &domain.AccountDetail{
152 DividendsEstimateOrderNumber: dividendsEstimate.DividendsEstimateOrderNumber, 153 DividendsEstimateOrderNumber: dividendsEstimate.DividendsEstimateOrderNumber,
153 DividendsType: dividendsEstimate.DividendsType, 154 DividendsType: dividendsEstimate.DividendsType,
154 DividendsAmount: dividendsEstimate.DividendsAmount, 155 DividendsAmount: dividendsEstimate.DividendsAmount,
  156 + OrderGoodId: dividendsEstimate.OrderGoodId,
  157 + OrderGoodAmount: dividendsEstimate.OrderGoodAmount,
  158 + CooperationContractNumber: dividendsEstimate.CooperationContractNumber,
155 }) 159 })
156 settlementAmount = settlementAmount + dividendsEstimate.DividendsAmount 160 settlementAmount = settlementAmount + dividendsEstimate.DividendsAmount
  161 +
  162 + goodAmountCount = goodAmountCount + dividendsEstimate.OrderGoodAmount
157 } 163 }
158 164
159 // 生成账期结算单号 165 // 生成账期结算单号
@@ -195,6 +201,8 @@ func (creditAccountService *CreditAccountService) CreateCreditAccount(createCred @@ -195,6 +201,8 @@ func (creditAccountService *CreditAccountService) CreateCreditAccount(createCred
195 CreatedAt: time.Now(), 201 CreatedAt: time.Now(),
196 DeletedAt: time.Time{}, 202 DeletedAt: time.Time{},
197 UpdatedAt: time.Time{}, 203 UpdatedAt: time.Time{},
  204 + GoodAmountCount: goodAmountCount,
  205 + CooperationContractNumber: "", // TODO 弃用
198 } 206 }
199 207
200 if creditAccount, err13 := creditAccountRepository.Save(newCreditAccount); err13 != nil { 208 if creditAccount, err13 := creditAccountRepository.Save(newCreditAccount); err13 != nil {
@@ -615,7 +615,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent @@ -615,7 +615,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
615 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 615 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
616 } else { 616 } else {
617 dividendsEstimates := make([]*domain.DividendsEstimate, 0) 617 dividendsEstimates := make([]*domain.DividendsEstimate, 0)
618 - // 统计当前分红预算单数 618 + // 统计当前企业分红预算单数
619 count, err := dividendsEstimateDao.CountDividendsEstimate(map[string]interface{}{ 619 count, err := dividendsEstimateDao.CountDividendsEstimate(map[string]interface{}{
620 "companyId": confirmDividendsIncentivesEstimateCommand.CompanyId, 620 "companyId": confirmDividendsIncentivesEstimateCommand.CompanyId,
621 }) 621 })
@@ -626,8 +626,11 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent @@ -626,8 +626,11 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
626 for _, orderGood := range orderGoods { 626 for _, orderGood := range orderGoods {
627 dividendsEstimate := &domain.DividendsEstimate{} 627 dividendsEstimate := &domain.DividendsEstimate{}
628 if orderGood.DividendsOrderNumber != "" { // 查询分红订单 628 if orderGood.DividendsOrderNumber != "" { // 查询分红订单
  629 + // 临时方案
  630 + orderGoodsToConfirm := make([]*domain.OrderGood, 0)
  631 + orderGoodsToConfirm = append(orderGoodsToConfirm, orderGood)
629 // 分红订单产品预算 632 // 分红订单产品预算
630 - if dividendsEstimateDetails, err := confirmDividendsIncentivesEstimateService.Confirm(orderGoods); err != nil { 633 + if dividendsEstimateDetails, err := confirmDividendsIncentivesEstimateService.Confirm(orderGoodsToConfirm); err != nil {
631 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 634 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
632 } else { 635 } else {
633 for _, dividendsEstimateDetail := range dividendsEstimateDetails { 636 for _, dividendsEstimateDetail := range dividendsEstimateDetails {
@@ -677,8 +680,10 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent @@ -677,8 +680,10 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
677 } 680 }
678 } 681 }
679 } else if orderGood.DividendsReturnedOrderNumber != "" { // 查询分红退货单 682 } else if orderGood.DividendsReturnedOrderNumber != "" { // 查询分红退货单
  683 + orderGoodsToConfirm := make([]*domain.OrderGood, 0)
  684 + orderGoodsToConfirm = append(orderGoodsToConfirm, orderGood)
680 // 分红退货单产品预算 685 // 分红退货单产品预算
681 - if dividendsReturnedEstimateDetails, err := confirmDividendsIncentivesEstimateService.Confirm(orderGoods); err != nil { 686 + if dividendsReturnedEstimateDetails, err := confirmDividendsIncentivesEstimateService.Confirm(orderGoodsToConfirm); err != nil {
682 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 687 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
683 } else { 688 } else {
684 for _, dividendsReturnedEstimateDetail := range dividendsReturnedEstimateDetails { 689 for _, dividendsReturnedEstimateDetail := range dividendsReturnedEstimateDetails {
@@ -795,11 +800,13 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent @@ -795,11 +800,13 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
795 // 分离分红订单和退货单 800 // 分离分红订单和退货单
796 dividendsOrderNumbers := make([]string, 0) 801 dividendsOrderNumbers := make([]string, 0)
797 dividendsReturnedOrderNumbers := make([]string, 0) 802 dividendsReturnedOrderNumbers := make([]string, 0)
798 - for k, _ := range estimateSuccessfullyDividendsOrders {  
799 - if k[:2] == "RE" { // 分红退货单  
800 - dividendsReturnedOrderNumbers = append(dividendsReturnedOrderNumbers, k)  
801 - } else if k[:2] == "SL" { // 分红订单  
802 - dividendsOrderNumbers = append(dividendsOrderNumbers, k) 803 + if len(estimateSuccessfullyDividendsOrders) > 0 {
  804 + for k, _ := range estimateSuccessfullyDividendsOrders {
  805 + if k[:2] == "RE" { // 分红退货单
  806 + dividendsReturnedOrderNumbers = append(dividendsReturnedOrderNumbers, k)
  807 + } else if k[:2] == "SL" { // 分红订单
  808 + dividendsOrderNumbers = append(dividendsOrderNumbers, k)
  809 + }
803 } 810 }
804 } 811 }
805 812
@@ -814,33 +821,35 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent @@ -814,33 +821,35 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
814 } 821 }
815 822
816 // 查找分红订单 823 // 查找分红订单
817 - if countDividendsOrdersFound, dividendsOrdersFound, err := dividendsOrderRepository.Find(map[string]interface{}{  
818 - "dividendsOrderNumbers": dividendsOrderNumbers,  
819 - "companyId": confirmDividendsIncentivesEstimateCommand.CompanyId,  
820 - "orgId": confirmDividendsIncentivesEstimateCommand.OrgId,  
821 - }); err != nil {  
822 - return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())  
823 - } else {  
824 - if countDividendsOrdersFound > 0 {  
825 - for i, dividendsOrderFound := range dividendsOrdersFound {  
826 - var dividendsGoodCount int  
827 - for _, orderGood := range dividendsOrderFound.Goods {  
828 - if orderGood.OrderGoodDividendsStatus == 2 {  
829 - dividendsGoodCount = dividendsGoodCount + 1 824 + if len(dividendsOrderNumbers) > 0 {
  825 + if countDividendsOrdersFound, dividendsOrdersFound, err := dividendsOrderRepository.Find(map[string]interface{}{
  826 + "dividendsOrderNumbers": dividendsOrderNumbers,
  827 + "companyId": confirmDividendsIncentivesEstimateCommand.CompanyId,
  828 + "orgId": confirmDividendsIncentivesEstimateCommand.OrgId,
  829 + }); err != nil {
  830 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
  831 + } else {
  832 + if countDividendsOrdersFound > 0 {
  833 + for i, dividendsOrderFound := range dividendsOrdersFound {
  834 + var dividendsGoodCount int
  835 + for _, orderGood := range dividendsOrderFound.Goods {
  836 + if orderGood.OrderGoodDividendsStatus == 2 {
  837 + dividendsGoodCount = dividendsGoodCount + 1
  838 + }
  839 + }
  840 + if dividendsGoodCount == len(dividendsOrderFound.Goods) { // 2已分红
  841 + dividendsOrdersFound[i].DividendStatus = 2
  842 + } else if dividendsGoodCount > 0 && dividendsGoodCount < len(dividendsOrderFound.Goods) { // 3部分分红
  843 + dividendsOrdersFound[i].DividendStatus = 3
  844 + } else if dividendsGoodCount == 0 { // 1未分红
  845 + dividendsOrdersFound[i].DividendStatus = 1
830 } 846 }
831 } 847 }
832 - if dividendsGoodCount == len(dividendsOrderFound.Goods) { // 2已分红  
833 - dividendsOrdersFound[i].DividendStatus = 2  
834 - } else if dividendsGoodCount > 0 && dividendsGoodCount < len(dividendsOrderFound.Goods) { // 3部分分红  
835 - dividendsOrdersFound[i].DividendStatus = 3  
836 - } else if dividendsGoodCount == 0 { // 1未分红  
837 - dividendsOrdersFound[i].DividendStatus = 1 848 + // 保存订单状态
  849 + if _, err6 := dividendsOrderRepository.UpdateMany(dividendsOrdersFound); err6 != nil {
  850 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
838 } 851 }
839 } 852 }
840 - // 保存订单状态  
841 - if _, err6 := dividendsOrderRepository.UpdateMany(dividendsOrdersFound); err6 != nil {  
842 - return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())  
843 - }  
844 } 853 }
845 } 854 }
846 855
@@ -855,33 +864,35 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent @@ -855,33 +864,35 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
855 } 864 }
856 865
857 // 查找分红退货单 866 // 查找分红退货单
858 - if countDividendsReturnedOrdersFound, dividendsReturnedOrdersFound, err := dividendsReturnedOrderRepository.Find(map[string]interface{}{  
859 - "dividendsReturnedOrderNumbers": dividendsReturnedOrderNumbers,  
860 - "companyId": confirmDividendsIncentivesEstimateCommand.CompanyId,  
861 - "orgId": confirmDividendsIncentivesEstimateCommand.OrgId,  
862 - }); err != nil {  
863 - return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())  
864 - } else {  
865 - if countDividendsReturnedOrdersFound > 0 {  
866 - for i, dividendsReturnedOrderFound := range dividendsReturnedOrdersFound {  
867 - var dividendsGoodCount int  
868 - for _, orderGood := range dividendsReturnedOrderFound.Goods {  
869 - if orderGood.OrderGoodDividendsStatus == 2 {  
870 - dividendsGoodCount = dividendsGoodCount + 1 867 + if len(dividendsReturnedOrderNumbers) > 0 {
  868 + if countDividendsReturnedOrdersFound, dividendsReturnedOrdersFound, err := dividendsReturnedOrderRepository.Find(map[string]interface{}{
  869 + "dividendsReturnedOrderNumbers": dividendsReturnedOrderNumbers,
  870 + "companyId": confirmDividendsIncentivesEstimateCommand.CompanyId,
  871 + "orgId": confirmDividendsIncentivesEstimateCommand.OrgId,
  872 + }); err != nil {
  873 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
  874 + } else {
  875 + if countDividendsReturnedOrdersFound > 0 {
  876 + for i, dividendsReturnedOrderFound := range dividendsReturnedOrdersFound {
  877 + var dividendsGoodCount int
  878 + for _, orderGood := range dividendsReturnedOrderFound.Goods {
  879 + if orderGood.OrderGoodDividendsStatus == 2 {
  880 + dividendsGoodCount = dividendsGoodCount + 1
  881 + }
  882 + }
  883 + if dividendsGoodCount == len(dividendsReturnedOrderFound.Goods) { // 2已分红
  884 + dividendsReturnedOrdersFound[i].DividendStatus = 2
  885 + } else if dividendsGoodCount > 0 && dividendsGoodCount < len(dividendsReturnedOrderFound.Goods) { // 3部分分红
  886 + dividendsReturnedOrdersFound[i].DividendStatus = 3
  887 + } else if dividendsGoodCount == 0 { // 1未分红
  888 + dividendsReturnedOrdersFound[i].DividendStatus = 1
871 } 889 }
872 } 890 }
873 - if dividendsGoodCount == len(dividendsReturnedOrderFound.Goods) { // 2已分红  
874 - dividendsReturnedOrdersFound[i].DividendStatus = 2  
875 - } else if dividendsGoodCount > 0 && dividendsGoodCount < len(dividendsReturnedOrderFound.Goods) { // 3部分分红  
876 - dividendsReturnedOrdersFound[i].DividendStatus = 3  
877 - } else if dividendsGoodCount == 0 { // 1未分红  
878 - dividendsReturnedOrdersFound[i].DividendStatus = 1 891 + // 保存退货单状态
  892 + if _, err6 := dividendsReturnedOrderRepository.UpdateMany(dividendsReturnedOrdersFound); err6 != nil {
  893 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
879 } 894 }
880 } 895 }
881 - // 保存退货单状态  
882 - if _, err6 := dividendsReturnedOrderRepository.UpdateMany(dividendsReturnedOrdersFound); err6 != nil {  
883 - return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())  
884 - }  
885 } 896 }
886 } 897 }
887 898
@@ -1063,7 +1074,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmMoneyIncentives @@ -1063,7 +1074,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmMoneyIncentives
1063 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 1074 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
1064 } 1075 }
1065 if confirmMoneyIncentivesEstimateCommand.Action == 1 { // 只预算，不入库 1076 if confirmMoneyIncentivesEstimateCommand.Action == 1 { // 只预算，不入库
1066 - return dividendsEstimatesSaved, nil 1077 + return dividendsEstimates, nil
1067 } else if confirmMoneyIncentivesEstimateCommand.Action == 2 { // 确定预算 1078 } else if confirmMoneyIncentivesEstimateCommand.Action == 2 { // 确定预算
1068 if err := transactionContext.CommitTransaction(); err != nil { 1079 if err := transactionContext.CommitTransaction(); err != nil {
1069 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 1080 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
@@ -1367,12 +1378,6 @@ func (dividendsEstimateService *DividendsEstimateService) SearchMoneyIncentivesE @@ -1367,12 +1378,6 @@ func (dividendsEstimateService *DividendsEstimateService) SearchMoneyIncentivesE
1367 dividendsEstimateRepository = value 1378 dividendsEstimateRepository = value
1368 } 1379 }
1369 1380
1370 - // 阶段承接人列表  
1371 - stageAndUndertaker := make([]*dto.StageAndUndertaker, 0)  
1372 -  
1373 - // 阶段承接人map  
1374 - stageUndertakerMap := make(map[int32][]*domain.Undertaker)  
1375 -  
1376 // 查找共创合约 1381 // 查找共创合约
1377 searchMoneyIncentivesEstimateQuery.IncentivesType = 2 1382 searchMoneyIncentivesEstimateQuery.IncentivesType = 2
1378 if count, cooperationContracts, err := cooperationContractRepository.Find(tool_funs.SimpleStructToMap(searchMoneyIncentivesEstimateQuery)); err != nil { 1383 if count, cooperationContracts, err := cooperationContractRepository.Find(tool_funs.SimpleStructToMap(searchMoneyIncentivesEstimateQuery)); err != nil {
@@ -1380,9 +1385,18 @@ func (dividendsEstimateService *DividendsEstimateService) SearchMoneyIncentivesE @@ -1380,9 +1385,18 @@ func (dividendsEstimateService *DividendsEstimateService) SearchMoneyIncentivesE
1380 } else { 1385 } else {
1381 var moneyIncentivesEstimateDtos []*dto.MoneyIncentivesEstimateDto 1386 var moneyIncentivesEstimateDtos []*dto.MoneyIncentivesEstimateDto
1382 for _, cooperationContract := range cooperationContracts { 1387 for _, cooperationContract := range cooperationContracts {
  1388 + // 阶段承接人map
  1389 + stageUndertakerMap := make(map[int32][]*domain.Undertaker)
  1390 + // 阶段承接人列表
  1391 + stageAndUndertaker := make([]*dto.StageAndUndertaker, 0)
  1392 + // 初始化阶段承接人map
1383 for _, rule := range cooperationContract.MoneyIncentivesRules { 1393 for _, rule := range cooperationContract.MoneyIncentivesRules {
1384 stageUndertakerMap[rule.MoneyIncentivesStage] = make([]*domain.Undertaker, 0) 1394 stageUndertakerMap[rule.MoneyIncentivesStage] = make([]*domain.Undertaker, 0)
1385 } 1395 }
  1396 + log.Logger.Info("阶段承接人map初始化", map[string]interface{}{
  1397 + "stageUndertakerMap": stageUndertakerMap,
  1398 + })
  1399 + // 获取承接人
1386 for _, undertaker := range cooperationContract.Undertakers { 1400 for _, undertaker := range cooperationContract.Undertakers {
1387 // 查询承接人分红预算单 1401 // 查询承接人分红预算单
1388 if countDividendsEstimates, dividendsEstimates, err := dividendsEstimateRepository.Find(map[string]interface{}{ 1402 if countDividendsEstimates, dividendsEstimates, err := dividendsEstimateRepository.Find(map[string]interface{}{
@@ -1393,7 +1407,7 @@ func (dividendsEstimateService *DividendsEstimateService) SearchMoneyIncentivesE @@ -1393,7 +1407,7 @@ func (dividendsEstimateService *DividendsEstimateService) SearchMoneyIncentivesE
1393 }); err != nil { 1407 }); err != nil {
1394 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 1408 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
1395 } else { 1409 } else {
1396 - if countDividendsEstimates > 0 { 1410 + if countDividendsEstimates > 0 { // 已有分红
1397 for _, dividendsEstimate := range dividendsEstimates { 1411 for _, dividendsEstimate := range dividendsEstimates {
1398 if dividendsEstimate.DividendsAccountStatus == 1 || dividendsEstimate.IsCanceled { // 分红预算单状态为待结算或已取消 1412 if dividendsEstimate.DividendsAccountStatus == 1 || dividendsEstimate.IsCanceled { // 分红预算单状态为待结算或已取消
1399 stageUndertakerMap[dividendsEstimate.DividendsStage] = append(stageUndertakerMap[dividendsEstimate.DividendsStage], undertaker) 1413 stageUndertakerMap[dividendsEstimate.DividendsStage] = append(stageUndertakerMap[dividendsEstimate.DividendsStage], undertaker)
@@ -1406,7 +1420,9 @@ func (dividendsEstimateService *DividendsEstimateService) SearchMoneyIncentivesE @@ -1406,7 +1420,9 @@ func (dividendsEstimateService *DividendsEstimateService) SearchMoneyIncentivesE
1406 } 1420 }
1407 } 1421 }
1408 } 1422 }
1409 - 1423 + log.Logger.Info("阶段承接人map", map[string]interface{}{
  1424 + "stageUndertakerMap": stageUndertakerMap,
  1425 + })
1410 for k, v := range stageUndertakerMap { 1426 for k, v := range stageUndertakerMap {
1411 stageAndUndertaker = append(stageAndUndertaker, &dto.StageAndUndertaker{ 1427 stageAndUndertaker = append(stageAndUndertaker, &dto.StageAndUndertaker{
1412 Stage: k, 1428 Stage: k,
@@ -1420,6 +1436,7 @@ func (dividendsEstimateService *DividendsEstimateService) SearchMoneyIncentivesE @@ -1420,6 +1436,7 @@ func (dividendsEstimateService *DividendsEstimateService) SearchMoneyIncentivesE
1420 } 1436 }
1421 moneyIncentivesEstimateDtos = append(moneyIncentivesEstimateDtos, moneyIncentivesEstimateDto) 1437 moneyIncentivesEstimateDtos = append(moneyIncentivesEstimateDtos, moneyIncentivesEstimateDto)
1422 } 1438 }
  1439 +
1423 if err := transactionContext.CommitTransaction(); err != nil { 1440 if err := transactionContext.CommitTransaction(); err != nil {
1424 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 1441 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
1425 } 1442 }
@@ -21,7 +21,7 @@ type UpdateDividendsOrderCommand struct { @@ -21,7 +21,7 @@ type UpdateDividendsOrderCommand struct {
21 // 订单产品列表 21 // 订单产品列表
22 OrderGoods []*OrderGoods `cname:"订单产品列表" json:"orderGoods,omitempty"` 22 OrderGoods []*OrderGoods `cname:"订单产品列表" json:"orderGoods,omitempty"`
23 // 备注 23 // 备注
24 - Remarks string `cname:"备注" json:"remarks" valid:"Required"` 24 + Remarks string `cname:"备注" json:"remarks"`
25 // 订单区域名称 25 // 订单区域名称
26 RegionName string `cname:"订单区域名称" json:"regionName,omitempty"` 26 RegionName string `cname:"订单区域名称" json:"regionName,omitempty"`
27 // 业务员uid 27 // 业务员uid
@@ -11,4 +11,6 @@ type AccountDetail struct { @@ -11,4 +11,6 @@ type AccountDetail struct {
11 OrderGoodId int64 `json:"orderGoodId"` 11 OrderGoodId int64 `json:"orderGoodId"`
12 // 订单产品金额 12 // 订单产品金额
13 OrderGoodAmount float64 `json:"orderGoodAmount"` 13 OrderGoodAmount float64 `json:"orderGoodAmount"`
  14 + // 关联共创合约编号
  15 + CooperationContractNumber string `json:"cooperationContractNumber"`
14 } 16 }
@@ -2,6 +2,7 @@ package domain_service @@ -2,6 +2,7 @@ package domain_service
2 2
3 import ( 3 import (
4 "fmt" 4 "fmt"
  5 + "github.com/linmadan/egglib-go/core/application"
5 coreDomain "github.com/linmadan/egglib-go/core/domain" 6 coreDomain "github.com/linmadan/egglib-go/core/domain"
6 pgTransaction "github.com/linmadan/egglib-go/transaction/pg" 7 pgTransaction "github.com/linmadan/egglib-go/transaction/pg"
7 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/domain" 8 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/domain"
@@ -18,6 +19,7 @@ func (domainService *CancelDividendsEstimateService) CancelEstimate(dividendsEst @@ -18,6 +19,7 @@ func (domainService *CancelDividendsEstimateService) CancelEstimate(dividendsEst
18 var dividendsEstimateRepository domain.DividendsEstimateRepository // 分红预算单仓储 19 var dividendsEstimateRepository domain.DividendsEstimateRepository // 分红预算单仓储
19 var dividendsOrderRepository domain.DividendsOrderRepository // 分红订单仓储 20 var dividendsOrderRepository domain.DividendsOrderRepository // 分红订单仓储
20 var dividendsReturnedOrderRepository domain.DividendsReturnedOrderRepository // 分红退货单仓储 21 var dividendsReturnedOrderRepository domain.DividendsReturnedOrderRepository // 分红退货单仓储
  22 + var orderGoodRepository domain.OrderGoodRepository // 订单产品仓储
21 23
22 // 分红预算单仓储初始化 24 // 分红预算单仓储初始化
23 if repo, err := repository.NewDividendsEstimateRepository(domainService.transactionContext); err != nil { 25 if repo, err := repository.NewDividendsEstimateRepository(domainService.transactionContext); err != nil {
@@ -25,17 +27,27 @@ func (domainService *CancelDividendsEstimateService) CancelEstimate(dividendsEst @@ -25,17 +27,27 @@ func (domainService *CancelDividendsEstimateService) CancelEstimate(dividendsEst
25 } else { 27 } else {
26 dividendsEstimateRepository = repo 28 dividendsEstimateRepository = repo
27 } 29 }
  30 +
28 // 分红订单仓储初始化 31 // 分红订单仓储初始化
29 if repo, err := repository.NewDividendsOrderRepository(domainService.transactionContext); err != nil { 32 if repo, err := repository.NewDividendsOrderRepository(domainService.transactionContext); err != nil {
30 return nil, err 33 return nil, err
31 } else { 34 } else {
32 dividendsOrderRepository = repo 35 dividendsOrderRepository = repo
33 } 36 }
34 - // 分红退后单仓储初始化 37 +
  38 + // 分红退货单仓储初始化
35 if repo, err := repository.NewDividendsReturnedOrderRepository(domainService.transactionContext); err != nil { 39 if repo, err := repository.NewDividendsReturnedOrderRepository(domainService.transactionContext); err != nil {
36 return nil, err 40 return nil, err
37 } else { 41 } else {
38 dividendsReturnedOrderRepository = repo 42 dividendsReturnedOrderRepository = repo
  43 +
  44 + }
  45 +
  46 + // 订单产品仓储初始化
  47 + if repo, err := repository.NewOrderGoodRepository(domainService.transactionContext); err != nil {
  48 + return nil, err
  49 + } else {
  50 + orderGoodRepository = repo
39 } 51 }
40 52
41 // 获取分红预算单 53 // 获取分红预算单
@@ -48,7 +60,7 @@ func (domainService *CancelDividendsEstimateService) CancelEstimate(dividendsEst @@ -48,7 +60,7 @@ func (domainService *CancelDividendsEstimateService) CancelEstimate(dividendsEst
48 var dividendsEstimatesCanceled []*domain.DividendsEstimate 60 var dividendsEstimatesCanceled []*domain.DividendsEstimate
49 var orderOrReturnOrderNums []string 61 var orderOrReturnOrderNums []string
50 for _, dividendsEstimate := range dividendsEstimates { 62 for _, dividendsEstimate := range dividendsEstimates {
51 - // 根据当前分红预算单的分红订单号或退货单号获取分红预算单 63 + // 根据当前分红预算单的分红订单号或退货单号获取相关的分红预算单
52 if countRelative, dividendsEstimatesRelative, err2 := dividendsEstimateRepository.Find(map[string]interface{}{ 64 if countRelative, dividendsEstimatesRelative, err2 := dividendsEstimateRepository.Find(map[string]interface{}{
53 "companyId": dividendsEstimate.Company.CompanyId, 65 "companyId": dividendsEstimate.Company.CompanyId,
54 "orgId": dividendsEstimate.Org.OrgId, 66 "orgId": dividendsEstimate.Org.OrgId,
@@ -102,6 +114,28 @@ func (domainService *CancelDividendsEstimateService) CancelEstimate(dividendsEst @@ -102,6 +114,28 @@ func (domainService *CancelDividendsEstimateService) CancelEstimate(dividendsEst
102 if _, err6 := dividendsOrderRepository.UpdateMany(orders); err6 != nil { 114 if _, err6 := dividendsOrderRepository.UpdateMany(orders); err6 != nil {
103 return nil, err6 115 return nil, err6
104 } 116 }
  117 + // 获取订单编号
  118 + ordersNumbers := make([]string, 0)
  119 + for _, order := range orders {
  120 + ordersNumbers = append(ordersNumbers, order.DividendsOrderNumber)
  121 + }
  122 + // 获取分红订单产品并更新产品状态
  123 + if countOrderGood, orderGoodsFound, err := orderGoodRepository.Find(map[string]interface{}{
  124 + "orderNumbers": ordersNumbers,
  125 + "companyId": dividendsEstimates[0].Company.CompanyId,
  126 + "orgId": dividendsEstimates[0].Org.OrgId,
  127 + }); err != nil {
  128 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
  129 + } else {
  130 + if countOrderGood > 0 {
  131 + for i, _ := range orderGoodsFound {
  132 + orderGoodsFound[i].OrderGoodDividendsStatus = int32(1) // 待分红
  133 + }
  134 + if _, err6 := orderGoodRepository.UpdateMany(orderGoodsFound); err6 != nil {
  135 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err6.Error())
  136 + }
  137 + }
  138 + }
105 } 139 }
106 } 140 }
107 141
@@ -121,6 +155,28 @@ func (domainService *CancelDividendsEstimateService) CancelEstimate(dividendsEst @@ -121,6 +155,28 @@ func (domainService *CancelDividendsEstimateService) CancelEstimate(dividendsEst
121 if _, err7 := dividendsReturnedOrderRepository.UpdateMany(returnedOrders); err7 != nil { 155 if _, err7 := dividendsReturnedOrderRepository.UpdateMany(returnedOrders); err7 != nil {
122 return nil, err7 156 return nil, err7
123 } 157 }
  158 + // 获取订单编号
  159 + returnedOrdersNumbers := make([]string, 0)
  160 + for _, returnedOrder := range returnedOrders {
  161 + returnedOrdersNumbers = append(returnedOrdersNumbers, returnedOrder.DividendsReturnedOrderNumber)
  162 + }
  163 + // 获取退货单产品并更新产品状态
  164 + if countOrderGood, orderGoodsFound, err := orderGoodRepository.Find(map[string]interface{}{
  165 + "returnedOrderNumbers": returnedOrdersNumbers,
  166 + "companyId": dividendsEstimates[0].Company.CompanyId,
  167 + "orgId": dividendsEstimates[0].Org.OrgId,
  168 + }); err != nil {
  169 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
  170 + } else {
  171 + if countOrderGood > 0 {
  172 + for i, _ := range orderGoodsFound {
  173 + orderGoodsFound[i].OrderGoodDividendsStatus = int32(1) // 待分红
  174 + }
  175 + if _, err6 := orderGoodRepository.UpdateMany(orderGoodsFound); err6 != nil {
  176 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err6.Error())
  177 + }
  178 + }
  179 + }
124 } 180 }
125 } 181 }
126 182
@@ -70,7 +70,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo @@ -70,7 +70,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
70 Reason: "共创合约错误", 70 Reason: "共创合约错误",
71 }) 71 })
72 continue 72 continue
73 - //return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())  
74 } 73 }
75 if cooperationContract == nil { 74 if cooperationContract == nil {
76 dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{ 75 dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
@@ -83,7 +82,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo @@ -83,7 +82,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
83 Reason: "共创合约" + orderGood.CooperationContractNumber + "不存在", 82 Reason: "共创合约" + orderGood.CooperationContractNumber + "不存在",
84 }) 83 })
85 continue 84 continue
86 - //return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("共创合约%s不存在", orderGood.CooperationContractNumber))  
87 } 85 }
88 86
89 // 获取共创项目 87 // 获取共创项目
@@ -91,7 +89,7 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo @@ -91,7 +89,7 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
91 "cooperationProjectNumber": cooperationContract.CooperationProjectNumber, 89 "cooperationProjectNumber": cooperationContract.CooperationProjectNumber,
92 "companyId": cooperationContract.Company.CompanyId, 90 "companyId": cooperationContract.Company.CompanyId,
93 "orgId": cooperationContract.Org.OrgId, 91 "orgId": cooperationContract.Org.OrgId,
94 - "notPause": true, 92 + //"notPause": true,
95 }) 93 })
96 if err != nil { 94 if err != nil {
97 dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{ 95 dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
@@ -117,7 +115,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo @@ -117,7 +115,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
117 Reason: "共创项目" + orderGood.CooperationContractNumber + "已结束或不存在", 115 Reason: "共创项目" + orderGood.CooperationContractNumber + "已结束或不存在",
118 }) 116 })
119 continue 117 continue
120 - //return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("共创项目%s不存在", cooperationContract.CooperationProjectNumber))  
121 } 118 }
122 119
123 // 校验合约关联的项目是否已结束 120 // 校验合约关联的项目是否已结束
@@ -153,7 +150,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo @@ -153,7 +150,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
153 Reason: "分红订单" + orderGood.DividendsOrderNumber + "查询错误", 150 Reason: "分红订单" + orderGood.DividendsOrderNumber + "查询错误",
154 }) 151 })
155 continue 152 continue
156 - //return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "分红订单不存在")  
157 } 153 }
158 if dividendsOrder == nil { 154 if dividendsOrder == nil {
159 dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{ 155 dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
@@ -166,7 +162,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo @@ -166,7 +162,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
166 Reason: "分红订单" + orderGood.DividendsOrderNumber + "不存在", 162 Reason: "分红订单" + orderGood.DividendsOrderNumber + "不存在",
167 }) 163 })
168 continue 164 continue
169 - //return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("分红订单%s不存在", orderGood.DividendsOrderNumber))  
170 } 165 }
171 166
172 // 匹配分红规则 167 // 匹配分红规则
@@ -189,7 +184,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo @@ -189,7 +184,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
189 Reason: "未匹配到分红规则", 184 Reason: "未匹配到分红规则",
190 }) 185 })
191 continue 186 continue
192 - //return nil, application.ThrowError(application.RES_NO_FIND_ERROR, "未匹配到分红规则")  
193 } 187 }
194 188
195 // 计算分红 189 // 计算分红
@@ -285,7 +279,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo @@ -285,7 +279,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
285 Reason: "退货单" + orderGood.DividendsReturnedOrderNumber + "不存在", 279 Reason: "退货单" + orderGood.DividendsReturnedOrderNumber + "不存在",
286 }) 280 })
287 continue 281 continue
288 - //return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "分红退货单不存在")  
289 } 282 }
290 if dividendsReturnedOrder == nil { 283 if dividendsReturnedOrder == nil {
291 dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{ 284 dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
@@ -298,7 +291,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo @@ -298,7 +291,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
298 Reason: "退货单" + orderGood.DividendsReturnedOrderNumber + "不存在", 291 Reason: "退货单" + orderGood.DividendsReturnedOrderNumber + "不存在",
299 }) 292 })
300 continue 293 continue
301 - //return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", orderGood.DividendsReturnedOrderNumber))  
302 } 294 }
303 // 匹配分红规则 295 // 匹配分红规则
304 var dividendsIncentivesRuleMatched *domain.DividendsIncentivesRule 296 var dividendsIncentivesRuleMatched *domain.DividendsIncentivesRule
@@ -347,7 +339,7 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo @@ -347,7 +339,7 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
347 Roles: undertaker.Referrer.Roles, 339 Roles: undertaker.Referrer.Roles,
348 UserInfo: undertaker.Referrer.UserInfo, 340 UserInfo: undertaker.Referrer.UserInfo,
349 UserType: undertaker.Referrer.UserType, 341 UserType: undertaker.Referrer.UserType,
350 - UserName: undertaker.Referrer.UserInfo.UserName, 342 + UserName: undertaker.Referrer.UserName,
351 UserPhone: undertaker.Referrer.UserPhone, 343 UserPhone: undertaker.Referrer.UserPhone,
352 Company: undertaker.Referrer.Company, 344 Company: undertaker.Referrer.Company,
353 }, 345 },
@@ -8,6 +8,7 @@ import ( @@ -8,6 +8,7 @@ import (
8 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/domain" 8 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/domain"
9 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/domain/service" 9 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/domain/service"
10 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/dao" 10 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/dao"
  11 + "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/utils"
11 "time" 12 "time"
12 ) 13 )
13 14
@@ -49,67 +50,35 @@ func (domainService *ConfirmMoneyIncentivesEstimateService) Confirm(contract *do @@ -49,67 +50,35 @@ func (domainService *ConfirmMoneyIncentivesEstimateService) Confirm(contract *do
49 50
50 // 金额激励预算 51 // 金额激励预算
51 for _, undertaker := range contract.Undertakers { 52 for _, undertaker := range contract.Undertakers {
52 - // 判断承接人在当前阶段是否已经分红  
53 - undertakerEstimated, err := dividendsEstimateDao.UserEstimated(map[string]interface{}{  
54 - "undertakerUid": undertaker.UserId,  
55 - "companyId": contract.Company.CompanyId,  
56 - "orgId": contract.Org.OrgId,  
57 - })  
58 - if err != nil {  
59 - return nil, err  
60 - }  
61 - if undertakerEstimated {  
62 - return nil, fmt.Errorf("用户 " + undertaker.UserName + " 已分红")  
63 - } else {  
64 - undertakerDividendsAmount, _ := decimal.NewFromFloat(moneyIncentivesRuleMatched.MoneyIncentivesAmount).Mul(decimal.NewFromFloat(1).Sub(decimal.NewFromFloat(moneyIncentivesRuleMatched.SalesmanPercentage).Add(decimal.NewFromFloat(moneyIncentivesRuleMatched.ReferrerPercentage))).Div(decimal.NewFromFloat(100))).Float64()  
65 - dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{  
66 - DividendsUser: &domain.User{  
67 - UserId: undertaker.UserId,  
68 - UserBaseId: undertaker.UserBaseId,  
69 - Org: undertaker.Org,  
70 - Orgs: undertaker.Orgs,  
71 - Department: undertaker.Department,  
72 - Roles: undertaker.Roles,  
73 - UserInfo: undertaker.UserInfo,  
74 - UserType: undertaker.UserType,  
75 - UserName: undertaker.UserName,  
76 - UserPhone: undertaker.UserPhone,  
77 - Status: undertaker.Status,  
78 - Company: undertaker.Company,  
79 - },  
80 - DividendsParticipateType: domain.MONEY_INCENTIVES,  
81 - DividendsStage: stage,  
82 - DividendsAmount: undertakerDividendsAmount,  
83 - })  
84 - }  
85 -  
86 - // 判断业务员在当前阶段是否已经分红  
87 - if undertaker.Salesman != nil {  
88 - salesmanEstimated, err := dividendsEstimateDao.UserEstimated(map[string]interface{}{  
89 - "undertakerUid": undertaker.Salesman.UserId, 53 + if utils.IsContain64(undertakerUIDs, undertaker.UndertakerId) {
  54 + // 判断承接人在当前阶段是否已经分红
  55 + undertakerEstimated, err := dividendsEstimateDao.UserEstimated(map[string]interface{}{
  56 + "undertakerUid": undertaker.UserId,
90 "companyId": contract.Company.CompanyId, 57 "companyId": contract.Company.CompanyId,
91 "orgId": contract.Org.OrgId, 58 "orgId": contract.Org.OrgId,
92 }) 59 })
93 if err != nil { 60 if err != nil {
94 return nil, err 61 return nil, err
95 } 62 }
96 - if salesmanEstimated {  
97 - return nil, fmt.Errorf("业务员 " + undertaker.Salesman.UserName + " 已分红") 63 + if undertakerEstimated {
  64 + return nil, fmt.Errorf("用户 " + undertaker.UserName + " 已分红")
98 } else { 65 } else {
99 - undertakerDividendsAmount, _ := decimal.NewFromFloat(moneyIncentivesRuleMatched.MoneyIncentivesAmount).Mul(decimal.NewFromFloat(moneyIncentivesRuleMatched.SalesmanPercentage).Div(decimal.NewFromFloat(100))).Float64() 66 + undertakerDividendsAmount, _ := decimal.NewFromFloat(moneyIncentivesRuleMatched.MoneyIncentivesAmount).Float64()
  67 + //Mul(decimal.NewFromFloat(1).Sub(decimal.NewFromFloat(moneyIncentivesRuleMatched.SalesmanPercentage).Add(decimal.NewFromFloat(moneyIncentivesRuleMatched.ReferrerPercentage)).Div(decimal.NewFromFloat(100)))).Float64()
100 dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{ 68 dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
101 DividendsUser: &domain.User{ 69 DividendsUser: &domain.User{
102 - UserId: undertaker.Salesman.UserId,  
103 - UserBaseId: undertaker.Salesman.UserBaseId,  
104 - Org: undertaker.Salesman.Org,  
105 - Orgs: undertaker.Salesman.Orgs,  
106 - Department: undertaker.Salesman.Department,  
107 - Roles: undertaker.Salesman.Roles,  
108 - UserInfo: undertaker.Salesman.UserInfo,  
109 - UserType: undertaker.Salesman.UserType,  
110 - UserName: undertaker.Salesman.UserName,  
111 - UserPhone: undertaker.Salesman.UserPhone,  
112 - Company: undertaker.Salesman.Company, 70 + UserId: undertaker.UserId,
  71 + UserBaseId: undertaker.UserBaseId,
  72 + Org: undertaker.Org,
  73 + Orgs: undertaker.Orgs,
  74 + Department: undertaker.Department,
  75 + Roles: undertaker.Roles,
  76 + UserInfo: undertaker.UserInfo,
  77 + UserType: undertaker.UserType,
  78 + UserName: undertaker.UserName,
  79 + UserPhone: undertaker.UserPhone,
  80 + Status: undertaker.Status,
  81 + Company: undertaker.Company,
113 }, 82 },
114 DividendsParticipateType: domain.MONEY_INCENTIVES, 83 DividendsParticipateType: domain.MONEY_INCENTIVES,
115 DividendsStage: stage, 84 DividendsStage: stage,
@@ -117,40 +86,75 @@ func (domainService *ConfirmMoneyIncentivesEstimateService) Confirm(contract *do @@ -117,40 +86,75 @@ func (domainService *ConfirmMoneyIncentivesEstimateService) Confirm(contract *do
117 }) 86 })
118 } 87 }
119 88
120 - } 89 + // 判断业务员在当前阶段是否已经分红
  90 + if undertaker.Salesman != nil {
  91 + salesmanEstimated, err := dividendsEstimateDao.UserEstimated(map[string]interface{}{
  92 + "undertakerUid": undertaker.Salesman.UserId,
  93 + "companyId": contract.Company.CompanyId,
  94 + "orgId": contract.Org.OrgId,
  95 + })
  96 + if err != nil {
  97 + return nil, err
  98 + }
  99 + if salesmanEstimated {
  100 + return nil, fmt.Errorf("业务员 " + undertaker.Salesman.UserName + " 已分红")
  101 + } else {
  102 + undertakerDividendsAmount, _ := decimal.NewFromFloat(moneyIncentivesRuleMatched.MoneyIncentivesAmount).Mul(decimal.NewFromFloat(moneyIncentivesRuleMatched.SalesmanPercentage).Div(decimal.NewFromFloat(100))).Float64()
  103 + dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
  104 + DividendsUser: &domain.User{
  105 + UserId: undertaker.Salesman.UserId,
  106 + UserBaseId: undertaker.Salesman.UserBaseId,
  107 + Org: undertaker.Salesman.Org,
  108 + Orgs: undertaker.Salesman.Orgs,
  109 + Department: undertaker.Salesman.Department,
  110 + Roles: undertaker.Salesman.Roles,
  111 + UserInfo: undertaker.Salesman.UserInfo,
  112 + UserType: undertaker.Salesman.UserType,
  113 + UserName: undertaker.Salesman.UserName,
  114 + UserPhone: undertaker.Salesman.UserPhone,
  115 + Company: undertaker.Salesman.Company,
  116 + },
  117 + DividendsParticipateType: domain.MONEY_INCENTIVES,
  118 + DividendsStage: stage,
  119 + DividendsAmount: undertakerDividendsAmount,
  120 + })
  121 + }
121 122
122 - // 判断关联业务员在当前阶段是否已经分红  
123 - if undertaker.Referrer != nil {  
124 - referrerEstimated, err := dividendsEstimateDao.UserEstimated(map[string]interface{}{  
125 - "undertakerUid": undertaker.Referrer.UserId,  
126 - "companyId": contract.Company.CompanyId,  
127 - "orgId": contract.Org.OrgId,  
128 - })  
129 - if err != nil {  
130 - return nil, err  
131 } 123 }
132 - if referrerEstimated {  
133 - return nil, fmt.Errorf("推荐人 " + undertaker.Salesman.UserName + " 已分红")  
134 - } else {  
135 - undertakerDividendsAmount, _ := decimal.NewFromFloat(moneyIncentivesRuleMatched.MoneyIncentivesAmount).Mul(decimal.NewFromFloat(moneyIncentivesRuleMatched.ReferrerPercentage).Div(decimal.NewFromFloat(100))).Float64()  
136 - dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{  
137 - DividendsUser: &domain.User{  
138 - UserId: undertaker.Referrer.UserId,  
139 - UserBaseId: undertaker.Referrer.UserBaseId,  
140 - Org: undertaker.Referrer.Org,  
141 - Orgs: undertaker.Referrer.Orgs,  
142 - Department: undertaker.Referrer.Department,  
143 - Roles: undertaker.Referrer.Roles,  
144 - UserInfo: undertaker.Referrer.UserInfo,  
145 - UserType: undertaker.Referrer.UserType,  
146 - UserName: undertaker.Referrer.UserName,  
147 - UserPhone: undertaker.Referrer.UserPhone,  
148 - Company: undertaker.Referrer.Company,  
149 - },  
150 - DividendsParticipateType: domain.MONEY_INCENTIVES,  
151 - DividendsStage: stage,  
152 - DividendsAmount: undertakerDividendsAmount, 124 +
  125 + // 判断关联业务员在当前阶段是否已经分红
  126 + if undertaker.Referrer != nil {
  127 + referrerEstimated, err := dividendsEstimateDao.UserEstimated(map[string]interface{}{
  128 + "undertakerUid": undertaker.Referrer.UserId,
  129 + "companyId": contract.Company.CompanyId,
  130 + "orgId": contract.Org.OrgId,
153 }) 131 })
  132 + if err != nil {
  133 + return nil, err
  134 + }
  135 + if referrerEstimated {
  136 + return nil, fmt.Errorf("推荐人 " + undertaker.Salesman.UserName + " 已分红")
  137 + } else {
  138 + undertakerDividendsAmount, _ := decimal.NewFromFloat(moneyIncentivesRuleMatched.MoneyIncentivesAmount).Mul(decimal.NewFromFloat(moneyIncentivesRuleMatched.ReferrerPercentage).Div(decimal.NewFromFloat(100))).Float64()
  139 + dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
  140 + DividendsUser: &domain.User{
  141 + UserId: undertaker.Referrer.UserId,
  142 + UserBaseId: undertaker.Referrer.UserBaseId,
  143 + Org: undertaker.Referrer.Org,
  144 + Orgs: undertaker.Referrer.Orgs,
  145 + Department: undertaker.Referrer.Department,
  146 + Roles: undertaker.Referrer.Roles,
  147 + UserInfo: undertaker.Referrer.UserInfo,
  148 + UserType: undertaker.Referrer.UserType,
  149 + UserName: undertaker.Referrer.UserName,
  150 + UserPhone: undertaker.Referrer.UserPhone,
  151 + Company: undertaker.Referrer.Company,
  152 + },
  153 + DividendsParticipateType: domain.MONEY_INCENTIVES,
  154 + DividendsStage: stage,
  155 + DividendsAmount: undertakerDividendsAmount,
  156 + })
  157 + }
154 } 158 }
155 } 159 }
156 } 160 }
@@ -154,7 +154,10 @@ func (repository *ContractUndertakerFeedbackRepository) Find(queryOptions map[st @@ -154,7 +154,10 @@ func (repository *ContractUndertakerFeedbackRepository) Find(queryOptions map[st
154 contractUndertakerFeedbacks := make([]*domain.ContractUndertakerFeedback, 0) 154 contractUndertakerFeedbacks := make([]*domain.ContractUndertakerFeedback, 0)
155 query := sqlbuilder.BuildQuery(tx.Model(&contractUndertakerFeedbackModels), queryOptions) 155 query := sqlbuilder.BuildQuery(tx.Model(&contractUndertakerFeedbackModels), queryOptions)
156 if cooperationContractName, ok := queryOptions["cooperationContractName"]; ok && cooperationContractName != "" { 156 if cooperationContractName, ok := queryOptions["cooperationContractName"]; ok && cooperationContractName != "" {
157 - query.Where("cooperation_contract_number like ?", fmt.Sprintf("%%%s%%", cooperationContractName)) 157 + query.Where("cooperation_contract_name like ?", fmt.Sprintf("%%%s%%", cooperationContractName))
  158 + }
  159 + if cooperationContractNumber, ok := queryOptions["cooperationContractNumber"]; ok && cooperationContractNumber != "" {
  160 + query.Where("cooperation_contract_number = ?", cooperationContractNumber)
158 } 161 }
159 if undertakerName, ok := queryOptions["undertakerName"]; ok && undertakerName != "" { 162 if undertakerName, ok := queryOptions["undertakerName"]; ok && undertakerName != "" {
160 query.Where("contract_undertaker->>'userName' like ?", fmt.Sprintf("%%%s%%", undertakerName)) 163 query.Where("contract_undertaker->>'userName' like ?", fmt.Sprintf("%%%s%%", undertakerName))
@@ -1162,6 +1162,9 @@ func (repository *CooperationContractRepository) Find(queryOptions map[string]in @@ -1162,6 +1162,9 @@ func (repository *CooperationContractRepository) Find(queryOptions map[string]in
1162 if incentivesType, ok := queryOptions["incentivesType"]; ok && incentivesType.(int32) != 0 { 1162 if incentivesType, ok := queryOptions["incentivesType"]; ok && incentivesType.(int32) != 0 {
1163 query.Where("incentives_type = ?", incentivesType) 1163 query.Where("incentives_type = ?", incentivesType)
1164 } 1164 }
  1165 + if status, ok := queryOptions["status"]; ok && status.(int32) != 0 {
  1166 + query.Where("status = ?", status)
  1167 + }
1165 if companyId, ok := queryOptions["companyId"]; ok && companyId.(int64) != 0 { 1168 if companyId, ok := queryOptions["companyId"]; ok && companyId.(int64) != 0 {
1166 query.Where("company->>'companyId' = '?'", companyId) 1169 query.Where("company->>'companyId' = '?'", companyId)
1167 } 1170 }
@@ -535,6 +535,9 @@ func (repository *DividendsOrderRepository) Find(queryOptions map[string]interfa @@ -535,6 +535,9 @@ func (repository *DividendsOrderRepository) Find(queryOptions map[string]interfa
535 if dividendsOrderNumber, ok := queryOptions["dividendsOrderNumber"]; ok && dividendsOrderNumber != "" { 535 if dividendsOrderNumber, ok := queryOptions["dividendsOrderNumber"]; ok && dividendsOrderNumber != "" {
536 query.Where("dividends_order_number ilike ?", fmt.Sprintf("%%%s%%", dividendsOrderNumber)) 536 query.Where("dividends_order_number ilike ?", fmt.Sprintf("%%%s%%", dividendsOrderNumber))
537 } 537 }
  538 + if dividendsOrderNumbers, ok := queryOptions["dividendsOrderNumbers"]; ok && len(dividendsOrderNumbers.([]string)) > 0 {
  539 + query.Where("dividends_order_number IN (?)", pg.In(dividendsOrderNumbers.([]string)))
  540 + }
538 if customerName, ok := queryOptions["customerName"]; ok && customerName != "" { 541 if customerName, ok := queryOptions["customerName"]; ok && customerName != "" {
539 query.Where("customer_name like ?", fmt.Sprintf("%%%s%%", customerName)) 542 query.Where("customer_name like ?", fmt.Sprintf("%%%s%%", customerName))
540 } 543 }
@@ -203,6 +203,12 @@ func (repository *OrderGoodRepository) Find(queryOptions map[string]interface{}) @@ -203,6 +203,12 @@ func (repository *OrderGoodRepository) Find(queryOptions map[string]interface{})
203 return q, nil 203 return q, nil
204 }) 204 })
205 } 205 }
  206 + if returnedOrderNumbers, ok := queryOptions["returnedOrderNumbers"]; ok && len(returnedOrderNumbers.([]string)) > 0 {
  207 + query.Where("dividends_returned_order_number IN (?)", pg.In(returnedOrderNumbers.([]string)))
  208 + }
  209 + if orderNumbers, ok := queryOptions["orderNumbers"]; ok && len(orderNumbers.([]string)) > 0 {
  210 + query.Where("dividends_order_number IN (?)", pg.In(orderNumbers.([]string)))
  211 + }
206 if orderGoodDividendsStatus, ok := queryOptions["orderGoodDividendsStatus"]; ok && orderGoodDividendsStatus.(int32) != 0 { 212 if orderGoodDividendsStatus, ok := queryOptions["orderGoodDividendsStatus"]; ok && orderGoodDividendsStatus.(int32) != 0 {
207 query.Where("order_good_dividends_status = ?", orderGoodDividendsStatus) 213 query.Where("order_good_dividends_status = ?", orderGoodDividendsStatus)
208 } 214 }
@@ -135,3 +135,13 @@ func IsContain(items []int32, item int32) bool { @@ -135,3 +135,13 @@ func IsContain(items []int32, item int32) bool {
135 } 135 }
136 return false 136 return false
137 } 137 }
  138 +
  139 +// IsContain64 判断int64数组是否包含
  140 +func IsContain64(items []int64, item int64) bool {
  141 + for _, eachItem := range items {
  142 + if eachItem == item {
  143 + return true
  144 + }
  145 + }
  146 + return false
  147 +}