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

…ion-cooperation into dev

-FROM golang:latest
+FROM 192.168.0.243:5000/mmm/allied-creation-cooperation:20210908
+#FROM golang:latest
 MAINTAINER 陈志颖 <steve.d.chan@qq.com>
 ENV APP_DIR $GOPATH/src/allied-creation-cooperation
 RUN mkdir -p $APP_DIR
@@ -10,7 +11,7 @@ COPY ./go.sum go.sum
 COPY ./main.go main.go
 RUN ["ln","-sf","/usr/share/zoneinfo/Asia/Shanghai","/etc/localtime"]
 ENV GO111MODULE on
-ENV GOPROXY https://goproxy.io
+ENV GOPROXY https://goproxy.cn
 RUN ["go","mod","tidy"]
 RUN ["ls"]
 RUN ["go","build"]

@@ -10,18 +10,20 @@ require (
 	github.com/fatih/structs v1.1.0 // indirect
 	github.com/gavv/httpexpect v2.0.0+incompatible
 	github.com/go-pg/pg/v10 v10.7.7
+	github.com/google/go-cmp v0.5.6 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
+	github.com/google/uuid v1.1.2 // indirect
 	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/imkira/go-interpol v1.1.0 // indirect
 	github.com/linmadan/egglib-go v0.0.0-20210527091316-06b0732fb5f6
 	github.com/mattn/go-colorable v0.1.8 // indirect
 	github.com/moul/http2curl v1.0.0 // indirect
-	github.com/olivere/elastic/v7 v7.0.28
 	github.com/onsi/ginkgo v1.14.2
 	github.com/onsi/gomega v1.10.3
 	github.com/sergi/go-diff v1.2.0 // indirect
 	github.com/shopspring/decimal v1.2.0
-	github.com/sirupsen/logrus v1.8.1
+	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/smartystreets/assertions v1.1.1 // indirect
 	github.com/smartystreets/goconvey v1.6.4 // indirect
 	github.com/valyala/fasthttp v1.28.0 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
@@ -29,5 +31,5 @@ require (
 	github.com/yudai/gojsondiff v1.0.0 // indirect
 	github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
 	github.com/yudai/pp v2.0.1+incompatible // indirect
-	gopkg.in/sohlich/elogrus.v7 v7.0.0
+	golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
 )

 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
-github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/sarama v1.25.0 h1:ch1ywjRLjfJtU+EaiJ+l0rWffQ6TRpyYmW4DX7Cb2SU=
 github.com/Shopify/sarama v1.25.0/go.mod h1:y/CFFTO9eaMTNriwu/Q+W4eioLqiDMGkA1W+gmdfj8w=
 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
 github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk=
 github.com/andybalholm/brotli v1.0.2 h1:JKnhI/XQ75uFBTiuzXpzFrUriDPiZjlOSzh6wXogP0E=
 github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
-github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
-github.com/aws/aws-sdk-go v1.19.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.40.32/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
 github.com/beego/beego/v2 v2.0.1 h1:07a7Z0Ok5vbqyqh+q53sDPl9LdhKh0ZDy3gbyGrhFnE=
 github.com/beego/beego/v2 v2.0.1/go.mod h1:8zyHi1FnWO1mZLwTn62aKRIZF/aIKvkCBB2JYs+eqQI=
 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+
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/coreos/etcd v3.3.25+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 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+
 github.com/elastic/go-elasticsearch/v6 v6.8.5/go.mod h1:UwaDJsD3rWLM5rKNFzv9hgox93HoX8utj1kxD9aFUcI=
 github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3CKKpKinvZLFk=
 github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072 h1:DddqAaWDpywytcG8w/qoQ5sAN8X12d3Z3koB0C3Rxsc=
 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
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 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
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 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=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
-github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE=
 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 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
 github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
-github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 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=
 github.com/linmadan/egglib-go v0.0.0-20210527091316-06b0732fb5f6 h1:nyhVnOIXsESuhZ95Ak6VRSF+0fHeKlYWq0EvHByt5RU=
 github.com/linmadan/egglib-go v0.0.0-20210527091316-06b0732fb5f6/go.mod h1:ZZuSWicGxpgN0OulARhuKwFJuJ9we0otaPVAJtz10yk=
 github.com/magefile/mage v1.10.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
-github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
-github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 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
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
-github.com/olivere/elastic/v7 v7.0.4/go.mod h1:l4YWa59iTCcOJQXI5ZtxVjcd3p5U8GCxVgvzHZqGn3o=
-github.com/olivere/elastic/v7 v7.0.28 h1:KAP4EuaEcvPJknRNkAAso1xeu0C1+/CeDQsxj9Cw9Fg=
-github.com/olivere/elastic/v7 v7.0.28/go.mod h1:DzHQoqd6YqSuvF1lk/fR4cW4FNUNzSD5/F5MBm3GRMo=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
 github.com/onsi/ginkgo v1.14.2 h1:8mVmC9kjFFmA8H4pKMUhcblgifdkOIXPvbhN1T36q1M=
 github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
-github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.10.3 h1:gph6h/qe9GSUw1NhH1gp+qb+h8rXD8Cy60Z32Qw3ELA=
 github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc=
-github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
-github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/pelletier/go-toml v1.0.1/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=
 github.com/peterh/liner v1.0.1-0.20171122030339-3681c2a91233/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc=
-github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pierrec/lz4 v2.2.6+incompatible h1:6aCX4/YZ9v8q69hTyiR7dNLnTA3fgtKHVVW5BCd5Znw=
 github.com/pierrec/lz4 v2.2.6+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 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
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.7.0 h1:wCi7urQOGBsYcQROHqpUUX4ct84xp40t9R9JX0FuA/U=
 github.com/prometheus/client_golang v1.7.0/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.10.0 h1:RyRA7RzGXQZiW+tGMr7sxa85G1z0yOpM1qq5c8lNawc=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.1.3 h1:F0+tqvhOksq22sc6iCHF5WGlWjdwj92p0udFh1VFBS8=
 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
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/assertions v1.1.1 h1:T/YLemO5Yp7KPzS+lVtu+WsHn8yoSwTfItdAd1r3cck=
 github.com/smartystreets/assertions v1.1.1/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
-github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM=
 github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/smartystreets/gunit v1.4.2/go.mod h1:ZjM1ozSIMJlAz/ay4SG8PeKF00ckUp+zMHZXV9/bvak=
 github.com/ssdb/gossdb v0.0.0-20180723034631-88f6b59b84ec/go.mod h1:QBvMkMya+gXctz3kmljlUCu/yB3GZ6oee+dUozsezQE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 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
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/gopher-lua v0.0.0-20171031051903-609c9cd26973/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU=
 go.etcd.io/etcd v3.3.25+incompatible/go.mod h1:yaeTdrJi5lOmYerz05bd8+V7KubZs8YSFZfzsF9A6aI=
-go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
-go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 go.opentelemetry.io/otel v0.17.0 h1:6MKOu8WY4hmfpQ4oQn34u6rYhnf2sWf1LXYO/UFm71U=
 go.opentelemetry.io/otel v0.17.0/go.mod h1:Oqtdxmf7UtEvL037ohlgnaYa1h7GtMh0NcSd9eqkC9s=
 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
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 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
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 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
 golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q=
 golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 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
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 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=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 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
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 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
 gopkg.in/jcmturner/rpc.v1 v1.1.0 h1:QHIUxTX1ISuAv9dD2wJ9HWQVuWDX/Zc0PfeC2tjc4rU=
 gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8=
 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
-gopkg.in/sohlich/elogrus.v7 v7.0.0 h1:w4pw1DTXK/bqliKbcJk7hSXKrMM/jPdvpaROC9WSK+8=
-gopkg.in/sohlich/elogrus.v7 v7.0.0/go.mod h1:nGmb0kLyAPGwIHLpHNlMlz0l0OfSaFatKgfpuO/+fnY=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 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=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=

@@ -80,7 +80,6 @@ func (contractUndertakerFeedbackService *ContractUndertakerFeedbackService) Crea
 		organization = data
 	}
 
-	// 获取项目合约信息
 	var cooperationContractRepository domain.CooperationContractRepository
 	if value, err := factory.CreateCooperationContractRepository(map[string]interface{}{
 		"transactionContext": transactionContext,
@@ -89,7 +88,13 @@ func (contractUndertakerFeedbackService *ContractUndertakerFeedbackService) Crea
 	} else {
 		cooperationContractRepository = value
 	}
-	cooperationContract, err := cooperationContractRepository.FindOne(map[string]interface{}{"cooperationContractNumber": createContractUndertakerFeedbackCommand.CooperationContractNumber})
+
+	// 获取项目合约信息
+	cooperationContract, err := cooperationContractRepository.FindOne(map[string]interface{}{
+		"cooperationContractNumber": createContractUndertakerFeedbackCommand.CooperationContractNumber,
+		"companyId":                 createContractUndertakerFeedbackCommand.CompanyId,
+		"orgId":                     createContractUndertakerFeedbackCommand.OrgId,
+	})
 	if err != nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "共创合约不存在")
 	}

@@ -19,6 +19,8 @@ type SearchCooperationContractQuery struct {
 	SponsorName string `cname:"发起人姓名" json:"sponsorName,omitempty"`
 	// 激励类型
 	IncentivesType int32 `cname:"激励类型" json:"incentivesType,omitempty"`
+	// 合约状态
+	Status int32 `cname:"合约状态" json:"status,omitempty"`
 	// 公司ID，通过集成REST上下文获取
 	CompanyId int64 `cname:"公司ID" json:"companyId"`
 	// 组织机构ID

@@ -147,13 +147,19 @@ func (creditAccountService *CreditAccountService) CreateCreditAccount(createCred
 		// 预算明细
 		var accountDetail []*domain.AccountDetail
 		var settlementAmount float64
+		var goodAmountCount float64
 		for _, dividendsEstimate := range dividendsEstimates {
 			accountDetail = append(accountDetail, &domain.AccountDetail{
 				DividendsEstimateOrderNumber: dividendsEstimate.DividendsEstimateOrderNumber,
 				DividendsType:                dividendsEstimate.DividendsType,
 				DividendsAmount:              dividendsEstimate.DividendsAmount,
+				OrderGoodId:                  dividendsEstimate.OrderGoodId,
+				OrderGoodAmount:              dividendsEstimate.OrderGoodAmount,
+				CooperationContractNumber:    dividendsEstimate.CooperationContractNumber,
 			})
 			settlementAmount = settlementAmount + dividendsEstimate.DividendsAmount
+
+			goodAmountCount = goodAmountCount + dividendsEstimate.OrderGoodAmount
 		}
 
 		// 生成账期结算单号
@@ -195,6 +201,8 @@ func (creditAccountService *CreditAccountService) CreateCreditAccount(createCred
 			CreatedAt:                  time.Now(),
 			DeletedAt:                  time.Time{},
 			UpdatedAt:                  time.Time{},
+			GoodAmountCount:            goodAmountCount,
+			CooperationContractNumber:  "", // TODO 弃用
 		}
 
 		if creditAccount, err13 := creditAccountRepository.Save(newCreditAccount); err13 != nil {

@@ -615,7 +615,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	} else {
 		dividendsEstimates := make([]*domain.DividendsEstimate, 0)
-		// 统计当前分红预算单数
+		// 统计当前企业分红预算单数
 		count, err := dividendsEstimateDao.CountDividendsEstimate(map[string]interface{}{
 			"companyId": confirmDividendsIncentivesEstimateCommand.CompanyId,
 		})
@@ -626,8 +626,11 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
 		for _, orderGood := range orderGoods {
 			dividendsEstimate := &domain.DividendsEstimate{}
 			if orderGood.DividendsOrderNumber != "" { // 查询分红订单
+				// 临时方案
+				orderGoodsToConfirm := make([]*domain.OrderGood, 0)
+				orderGoodsToConfirm = append(orderGoodsToConfirm, orderGood)
 				// 分红订单产品预算
-				if dividendsEstimateDetails, err := confirmDividendsIncentivesEstimateService.Confirm(orderGoods); err != nil {
+				if dividendsEstimateDetails, err := confirmDividendsIncentivesEstimateService.Confirm(orderGoodsToConfirm); err != nil {
 					return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 				} else {
 					for _, dividendsEstimateDetail := range dividendsEstimateDetails {
@@ -677,8 +680,10 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
 					}
 				}
 			} else if orderGood.DividendsReturnedOrderNumber != "" { // 查询分红退货单
+				orderGoodsToConfirm := make([]*domain.OrderGood, 0)
+				orderGoodsToConfirm = append(orderGoodsToConfirm, orderGood)
 				//	分红退货单产品预算
-				if dividendsReturnedEstimateDetails, err := confirmDividendsIncentivesEstimateService.Confirm(orderGoods); err != nil {
+				if dividendsReturnedEstimateDetails, err := confirmDividendsIncentivesEstimateService.Confirm(orderGoodsToConfirm); err != nil {
 					return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 				} else {
 					for _, dividendsReturnedEstimateDetail := range dividendsReturnedEstimateDetails {
@@ -795,11 +800,13 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
 			// 分离分红订单和退货单
 			dividendsOrderNumbers := make([]string, 0)
 			dividendsReturnedOrderNumbers := make([]string, 0)
-			for k, _ := range estimateSuccessfullyDividendsOrders {
-				if k[:2] == "RE" { // 分红退货单
-					dividendsReturnedOrderNumbers = append(dividendsReturnedOrderNumbers, k)
-				} else if k[:2] == "SL" { // 分红订单
-					dividendsOrderNumbers = append(dividendsOrderNumbers, k)
+			if len(estimateSuccessfullyDividendsOrders) > 0 {
+				for k, _ := range estimateSuccessfullyDividendsOrders {
+					if k[:2] == "RE" { // 分红退货单
+						dividendsReturnedOrderNumbers = append(dividendsReturnedOrderNumbers, k)
+					} else if k[:2] == "SL" { // 分红订单
+						dividendsOrderNumbers = append(dividendsOrderNumbers, k)
+					}
 				}
 			}
 
@@ -814,33 +821,35 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
 			}
 
 			// 查找分红订单
-			if countDividendsOrdersFound, dividendsOrdersFound, err := dividendsOrderRepository.Find(map[string]interface{}{
-				"dividendsOrderNumbers": dividendsOrderNumbers,
-				"companyId":             confirmDividendsIncentivesEstimateCommand.CompanyId,
-				"orgId":                 confirmDividendsIncentivesEstimateCommand.OrgId,
-			}); err != nil {
-				return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
-			} else {
-				if countDividendsOrdersFound > 0 {
-					for i, dividendsOrderFound := range dividendsOrdersFound {
-						var dividendsGoodCount int
-						for _, orderGood := range dividendsOrderFound.Goods {
-							if orderGood.OrderGoodDividendsStatus == 2 {
-								dividendsGoodCount = dividendsGoodCount + 1
+			if len(dividendsOrderNumbers) > 0 {
+				if countDividendsOrdersFound, dividendsOrdersFound, err := dividendsOrderRepository.Find(map[string]interface{}{
+					"dividendsOrderNumbers": dividendsOrderNumbers,
+					"companyId":             confirmDividendsIncentivesEstimateCommand.CompanyId,
+					"orgId":                 confirmDividendsIncentivesEstimateCommand.OrgId,
+				}); err != nil {
+					return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+				} else {
+					if countDividendsOrdersFound > 0 {
+						for i, dividendsOrderFound := range dividendsOrdersFound {
+							var dividendsGoodCount int
+							for _, orderGood := range dividendsOrderFound.Goods {
+								if orderGood.OrderGoodDividendsStatus == 2 {
+									dividendsGoodCount = dividendsGoodCount + 1
+								}
+							}
+							if dividendsGoodCount == len(dividendsOrderFound.Goods) { // 2已分红
+								dividendsOrdersFound[i].DividendStatus = 2
+							} else if dividendsGoodCount > 0 && dividendsGoodCount < len(dividendsOrderFound.Goods) { // 3部分分红
+								dividendsOrdersFound[i].DividendStatus = 3
+							} else if dividendsGoodCount == 0 { // 1未分红
+								dividendsOrdersFound[i].DividendStatus = 1
 							}
 						}
-						if dividendsGoodCount == len(dividendsOrderFound.Goods) { // 2已分红
-							dividendsOrdersFound[i].DividendStatus = 2
-						} else if dividendsGoodCount > 0 && dividendsGoodCount < len(dividendsOrderFound.Goods) { // 3部分分红
-							dividendsOrdersFound[i].DividendStatus = 3
-						} else if dividendsGoodCount == 0 { // 1未分红
-							dividendsOrdersFound[i].DividendStatus = 1
+						//	保存订单状态
+						if _, err6 := dividendsOrderRepository.UpdateMany(dividendsOrdersFound); err6 != nil {
+							return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 						}
 					}
-					//	保存订单状态
-					if _, err6 := dividendsOrderRepository.UpdateMany(dividendsOrdersFound); err6 != nil {
-						return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
-					}
 				}
 			}
 
@@ -855,33 +864,35 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
 			}
 
 			// 查找分红退货单
-			if countDividendsReturnedOrdersFound, dividendsReturnedOrdersFound, err := dividendsReturnedOrderRepository.Find(map[string]interface{}{
-				"dividendsReturnedOrderNumbers": dividendsReturnedOrderNumbers,
-				"companyId":                     confirmDividendsIncentivesEstimateCommand.CompanyId,
-				"orgId":                         confirmDividendsIncentivesEstimateCommand.OrgId,
-			}); err != nil {
-				return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
-			} else {
-				if countDividendsReturnedOrdersFound > 0 {
-					for i, dividendsReturnedOrderFound := range dividendsReturnedOrdersFound {
-						var dividendsGoodCount int
-						for _, orderGood := range dividendsReturnedOrderFound.Goods {
-							if orderGood.OrderGoodDividendsStatus == 2 {
-								dividendsGoodCount = dividendsGoodCount + 1
+			if len(dividendsReturnedOrderNumbers) > 0 {
+				if countDividendsReturnedOrdersFound, dividendsReturnedOrdersFound, err := dividendsReturnedOrderRepository.Find(map[string]interface{}{
+					"dividendsReturnedOrderNumbers": dividendsReturnedOrderNumbers,
+					"companyId":                     confirmDividendsIncentivesEstimateCommand.CompanyId,
+					"orgId":                         confirmDividendsIncentivesEstimateCommand.OrgId,
+				}); err != nil {
+					return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+				} else {
+					if countDividendsReturnedOrdersFound > 0 {
+						for i, dividendsReturnedOrderFound := range dividendsReturnedOrdersFound {
+							var dividendsGoodCount int
+							for _, orderGood := range dividendsReturnedOrderFound.Goods {
+								if orderGood.OrderGoodDividendsStatus == 2 {
+									dividendsGoodCount = dividendsGoodCount + 1
+								}
+							}
+							if dividendsGoodCount == len(dividendsReturnedOrderFound.Goods) { // 2已分红
+								dividendsReturnedOrdersFound[i].DividendStatus = 2
+							} else if dividendsGoodCount > 0 && dividendsGoodCount < len(dividendsReturnedOrderFound.Goods) { // 3部分分红
+								dividendsReturnedOrdersFound[i].DividendStatus = 3
+							} else if dividendsGoodCount == 0 { // 1未分红
+								dividendsReturnedOrdersFound[i].DividendStatus = 1
 							}
 						}
-						if dividendsGoodCount == len(dividendsReturnedOrderFound.Goods) { // 2已分红
-							dividendsReturnedOrdersFound[i].DividendStatus = 2
-						} else if dividendsGoodCount > 0 && dividendsGoodCount < len(dividendsReturnedOrderFound.Goods) { // 3部分分红
-							dividendsReturnedOrdersFound[i].DividendStatus = 3
-						} else if dividendsGoodCount == 0 { // 1未分红
-							dividendsReturnedOrdersFound[i].DividendStatus = 1
+						//	保存退货单状态
+						if _, err6 := dividendsReturnedOrderRepository.UpdateMany(dividendsReturnedOrdersFound); err6 != nil {
+							return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 						}
 					}
-					//	保存退货单状态
-					if _, err6 := dividendsReturnedOrderRepository.UpdateMany(dividendsReturnedOrdersFound); err6 != nil {
-						return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
-					}
 				}
 			}
 
@@ -1063,7 +1074,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmMoneyIncentives
 			return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		}
 		if confirmMoneyIncentivesEstimateCommand.Action == 1 { // 只预算，不入库
-			return dividendsEstimatesSaved, nil
+			return dividendsEstimates, nil
 		} else if confirmMoneyIncentivesEstimateCommand.Action == 2 { // 确定预算
 			if err := transactionContext.CommitTransaction(); err != nil {
 				return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
@@ -1367,12 +1378,6 @@ func (dividendsEstimateService *DividendsEstimateService) SearchMoneyIncentivesE
 		dividendsEstimateRepository = value
 	}
 
-	// 阶段承接人列表
-	stageAndUndertaker := make([]*dto.StageAndUndertaker, 0)
-
-	// 阶段承接人map
-	stageUndertakerMap := make(map[int32][]*domain.Undertaker)
-
 	// 查找共创合约
 	searchMoneyIncentivesEstimateQuery.IncentivesType = 2
 	if count, cooperationContracts, err := cooperationContractRepository.Find(tool_funs.SimpleStructToMap(searchMoneyIncentivesEstimateQuery)); err != nil {
@@ -1380,9 +1385,18 @@ func (dividendsEstimateService *DividendsEstimateService) SearchMoneyIncentivesE
 	} else {
 		var moneyIncentivesEstimateDtos []*dto.MoneyIncentivesEstimateDto
 		for _, cooperationContract := range cooperationContracts {
+			// 阶段承接人map
+			stageUndertakerMap := make(map[int32][]*domain.Undertaker)
+			// 阶段承接人列表
+			stageAndUndertaker := make([]*dto.StageAndUndertaker, 0)
+			// 初始化阶段承接人map
 			for _, rule := range cooperationContract.MoneyIncentivesRules {
 				stageUndertakerMap[rule.MoneyIncentivesStage] = make([]*domain.Undertaker, 0)
 			}
+			log.Logger.Info("阶段承接人map初始化", map[string]interface{}{
+				"stageUndertakerMap": stageUndertakerMap,
+			})
+			// 获取承接人
 			for _, undertaker := range cooperationContract.Undertakers {
 				//	 查询承接人分红预算单
 				if countDividendsEstimates, dividendsEstimates, err := dividendsEstimateRepository.Find(map[string]interface{}{
@@ -1393,7 +1407,7 @@ func (dividendsEstimateService *DividendsEstimateService) SearchMoneyIncentivesE
 				}); err != nil {
 					return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 				} else {
-					if countDividendsEstimates > 0 {
+					if countDividendsEstimates > 0 { // 已有分红
 						for _, dividendsEstimate := range dividendsEstimates {
 							if dividendsEstimate.DividendsAccountStatus == 1 || dividendsEstimate.IsCanceled { // 分红预算单状态为待结算或已取消
 								stageUndertakerMap[dividendsEstimate.DividendsStage] = append(stageUndertakerMap[dividendsEstimate.DividendsStage], undertaker)
@@ -1406,7 +1420,9 @@ func (dividendsEstimateService *DividendsEstimateService) SearchMoneyIncentivesE
 					}
 				}
 			}
-
+			log.Logger.Info("阶段承接人map", map[string]interface{}{
+				"stageUndertakerMap": stageUndertakerMap,
+			})
 			for k, v := range stageUndertakerMap {
 				stageAndUndertaker = append(stageAndUndertaker, &dto.StageAndUndertaker{
 					Stage:       k,
@@ -1420,6 +1436,7 @@ func (dividendsEstimateService *DividendsEstimateService) SearchMoneyIncentivesE
 			}
 			moneyIncentivesEstimateDtos = append(moneyIncentivesEstimateDtos, moneyIncentivesEstimateDto)
 		}
+
 		if err := transactionContext.CommitTransaction(); err != nil {
 			return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		}

@@ -21,7 +21,7 @@ type UpdateDividendsOrderCommand struct {
 	// 订单产品列表
 	OrderGoods []*OrderGoods `cname:"订单产品列表" json:"orderGoods,omitempty"`
 	// 备注
-	Remarks string `cname:"备注" json:"remarks" valid:"Required"`
+	Remarks string `cname:"备注" json:"remarks"`
 	// 订单区域名称
 	RegionName string `cname:"订单区域名称" json:"regionName,omitempty"`
 	// 业务员uid

@@ -11,4 +11,6 @@ type AccountDetail struct {
 	OrderGoodId int64 `json:"orderGoodId"`
 	// 订单产品金额
 	OrderGoodAmount float64 `json:"orderGoodAmount"`
+	// 关联共创合约编号
+	CooperationContractNumber string `json:"cooperationContractNumber"`
 }

@@ -2,6 +2,7 @@ package domain_service
 
 import (
 	"fmt"
+	"github.com/linmadan/egglib-go/core/application"
 	coreDomain "github.com/linmadan/egglib-go/core/domain"
 	pgTransaction "github.com/linmadan/egglib-go/transaction/pg"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/domain"
@@ -18,6 +19,7 @@ func (domainService *CancelDividendsEstimateService) CancelEstimate(dividendsEst
 	var dividendsEstimateRepository domain.DividendsEstimateRepository           // 分红预算单仓储
 	var dividendsOrderRepository domain.DividendsOrderRepository                 // 分红订单仓储
 	var dividendsReturnedOrderRepository domain.DividendsReturnedOrderRepository // 分红退货单仓储
+	var orderGoodRepository domain.OrderGoodRepository                           // 订单产品仓储
 
 	// 分红预算单仓储初始化
 	if repo, err := repository.NewDividendsEstimateRepository(domainService.transactionContext); err != nil {
@@ -25,17 +27,27 @@ func (domainService *CancelDividendsEstimateService) CancelEstimate(dividendsEst
 	} else {
 		dividendsEstimateRepository = repo
 	}
+
 	// 分红订单仓储初始化
 	if repo, err := repository.NewDividendsOrderRepository(domainService.transactionContext); err != nil {
 		return nil, err
 	} else {
 		dividendsOrderRepository = repo
 	}
-	// 分红退后单仓储初始化
+
+	// 分红退货单仓储初始化
 	if repo, err := repository.NewDividendsReturnedOrderRepository(domainService.transactionContext); err != nil {
 		return nil, err
 	} else {
 		dividendsReturnedOrderRepository = repo
+
+	}
+
+	// 订单产品仓储初始化
+	if repo, err := repository.NewOrderGoodRepository(domainService.transactionContext); err != nil {
+		return nil, err
+	} else {
+		orderGoodRepository = repo
 	}
 
 	// 获取分红预算单
@@ -48,7 +60,7 @@ func (domainService *CancelDividendsEstimateService) CancelEstimate(dividendsEst
 			var dividendsEstimatesCanceled []*domain.DividendsEstimate
 			var orderOrReturnOrderNums []string
 			for _, dividendsEstimate := range dividendsEstimates {
-				// 根据当前分红预算单的分红订单号或退货单号获取分红预算单
+				// 根据当前分红预算单的分红订单号或退货单号获取相关的分红预算单
 				if countRelative, dividendsEstimatesRelative, err2 := dividendsEstimateRepository.Find(map[string]interface{}{
 					"companyId":               dividendsEstimate.Company.CompanyId,
 					"orgId":                   dividendsEstimate.Org.OrgId,
@@ -102,6 +114,28 @@ func (domainService *CancelDividendsEstimateService) CancelEstimate(dividendsEst
 					if _, err6 := dividendsOrderRepository.UpdateMany(orders); err6 != nil {
 						return nil, err6
 					}
+					// 获取订单编号
+					ordersNumbers := make([]string, 0)
+					for _, order := range orders {
+						ordersNumbers = append(ordersNumbers, order.DividendsOrderNumber)
+					}
+					// 获取分红订单产品并更新产品状态
+					if countOrderGood, orderGoodsFound, err := orderGoodRepository.Find(map[string]interface{}{
+						"orderNumbers": ordersNumbers,
+						"companyId":    dividendsEstimates[0].Company.CompanyId,
+						"orgId":        dividendsEstimates[0].Org.OrgId,
+					}); err != nil {
+						return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+					} else {
+						if countOrderGood > 0 {
+							for i, _ := range orderGoodsFound {
+								orderGoodsFound[i].OrderGoodDividendsStatus = int32(1) // 待分红
+							}
+							if _, err6 := orderGoodRepository.UpdateMany(orderGoodsFound); err6 != nil {
+								return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err6.Error())
+							}
+						}
+					}
 				}
 			}
 
@@ -121,6 +155,28 @@ func (domainService *CancelDividendsEstimateService) CancelEstimate(dividendsEst
 					if _, err7 := dividendsReturnedOrderRepository.UpdateMany(returnedOrders); err7 != nil {
 						return nil, err7
 					}
+					// 获取订单编号
+					returnedOrdersNumbers := make([]string, 0)
+					for _, returnedOrder := range returnedOrders {
+						returnedOrdersNumbers = append(returnedOrdersNumbers, returnedOrder.DividendsReturnedOrderNumber)
+					}
+					// 获取退货单产品并更新产品状态
+					if countOrderGood, orderGoodsFound, err := orderGoodRepository.Find(map[string]interface{}{
+						"returnedOrderNumbers": returnedOrdersNumbers,
+						"companyId":            dividendsEstimates[0].Company.CompanyId,
+						"orgId":                dividendsEstimates[0].Org.OrgId,
+					}); err != nil {
+						return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+					} else {
+						if countOrderGood > 0 {
+							for i, _ := range orderGoodsFound {
+								orderGoodsFound[i].OrderGoodDividendsStatus = int32(1) // 待分红
+							}
+							if _, err6 := orderGoodRepository.UpdateMany(orderGoodsFound); err6 != nil {
+								return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err6.Error())
+							}
+						}
+					}
 				}
 			}
 

@@ -70,7 +70,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
 				Reason:                     "共创合约错误",
 			})
 			continue
-			//return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 		}
 		if cooperationContract == nil {
 			dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
@@ -83,7 +82,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
 				Reason:                     "共创合约" + orderGood.CooperationContractNumber + "不存在",
 			})
 			continue
-			//return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("共创合约%s不存在", orderGood.CooperationContractNumber))
 		}
 
 		// 获取共创项目
@@ -91,7 +89,7 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
 			"cooperationProjectNumber": cooperationContract.CooperationProjectNumber,
 			"companyId":                cooperationContract.Company.CompanyId,
 			"orgId":                    cooperationContract.Org.OrgId,
-			"notPause":                 true,
+			//"notPause":                 true,
 		})
 		if err != nil {
 			dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
@@ -117,7 +115,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
 				Reason:                     "共创项目" + orderGood.CooperationContractNumber + "已结束或不存在",
 			})
 			continue
-			//return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("共创项目%s不存在", cooperationContract.CooperationProjectNumber))
 		}
 
 		// 校验合约关联的项目是否已结束
@@ -153,7 +150,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
 					Reason:                     "分红订单" + orderGood.DividendsOrderNumber + "查询错误",
 				})
 				continue
-				//return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "分红订单不存在")
 			}
 			if dividendsOrder == nil {
 				dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
@@ -166,7 +162,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
 					Reason:                     "分红订单" + orderGood.DividendsOrderNumber + "不存在",
 				})
 				continue
-				//return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("分红订单%s不存在", orderGood.DividendsOrderNumber))
 			}
 
 			// 匹配分红规则
@@ -189,7 +184,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
 					Reason:                     "未匹配到分红规则",
 				})
 				continue
-				//return nil, application.ThrowError(application.RES_NO_FIND_ERROR, "未匹配到分红规则")
 			}
 
 			// 计算分红
@@ -285,7 +279,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
 					Reason:                     "退货单" + orderGood.DividendsReturnedOrderNumber + "不存在",
 				})
 				continue
-				//return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "分红退货单不存在")
 			}
 			if dividendsReturnedOrder == nil {
 				dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
@@ -298,7 +291,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
 					Reason:                     "退货单" + orderGood.DividendsReturnedOrderNumber + "不存在",
 				})
 				continue
-				//return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", orderGood.DividendsReturnedOrderNumber))
 			}
 			// 匹配分红规则
 			var dividendsIncentivesRuleMatched *domain.DividendsIncentivesRule
@@ -347,7 +339,7 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
 							Roles:      undertaker.Referrer.Roles,
 							UserInfo:   undertaker.Referrer.UserInfo,
 							UserType:   undertaker.Referrer.UserType,
-							UserName:   undertaker.Referrer.UserInfo.UserName,
+							UserName:   undertaker.Referrer.UserName,
 							UserPhone:  undertaker.Referrer.UserPhone,
 							Company:    undertaker.Referrer.Company,
 						},

@@ -8,6 +8,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/domain/service"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/dao"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/utils"
 	"time"
 )
 
@@ -49,67 +50,35 @@ func (domainService *ConfirmMoneyIncentivesEstimateService) Confirm(contract *do
 
 	// 金额激励预算
 	for _, undertaker := range contract.Undertakers {
-		//	判断承接人在当前阶段是否已经分红
-		undertakerEstimated, err := dividendsEstimateDao.UserEstimated(map[string]interface{}{
-			"undertakerUid": undertaker.UserId,
-			"companyId":     contract.Company.CompanyId,
-			"orgId":         contract.Org.OrgId,
-		})
-		if err != nil {
-			return nil, err
-		}
-		if undertakerEstimated {
-			return nil, fmt.Errorf("用户 " + undertaker.UserName + " 已分红")
-		} else {
-			undertakerDividendsAmount, _ := decimal.NewFromFloat(moneyIncentivesRuleMatched.MoneyIncentivesAmount).Mul(decimal.NewFromFloat(1).Sub(decimal.NewFromFloat(moneyIncentivesRuleMatched.SalesmanPercentage).Add(decimal.NewFromFloat(moneyIncentivesRuleMatched.ReferrerPercentage))).Div(decimal.NewFromFloat(100))).Float64()
-			dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
-				DividendsUser: &domain.User{
-					UserId:     undertaker.UserId,
-					UserBaseId: undertaker.UserBaseId,
-					Org:        undertaker.Org,
-					Orgs:       undertaker.Orgs,
-					Department: undertaker.Department,
-					Roles:      undertaker.Roles,
-					UserInfo:   undertaker.UserInfo,
-					UserType:   undertaker.UserType,
-					UserName:   undertaker.UserName,
-					UserPhone:  undertaker.UserPhone,
-					Status:     undertaker.Status,
-					Company:    undertaker.Company,
-				},
-				DividendsParticipateType: domain.MONEY_INCENTIVES,
-				DividendsStage:           stage,
-				DividendsAmount:          undertakerDividendsAmount,
-			})
-		}
-
-		//	判断业务员在当前阶段是否已经分红
-		if undertaker.Salesman != nil {
-			salesmanEstimated, err := dividendsEstimateDao.UserEstimated(map[string]interface{}{
-				"undertakerUid": undertaker.Salesman.UserId,
+		if utils.IsContain64(undertakerUIDs, undertaker.UndertakerId) {
+			//	判断承接人在当前阶段是否已经分红
+			undertakerEstimated, err := dividendsEstimateDao.UserEstimated(map[string]interface{}{
+				"undertakerUid": undertaker.UserId,
 				"companyId":     contract.Company.CompanyId,
 				"orgId":         contract.Org.OrgId,
 			})
 			if err != nil {
 				return nil, err
 			}
-			if salesmanEstimated {
-				return nil, fmt.Errorf("业务员 " + undertaker.Salesman.UserName + " 已分红")
+			if undertakerEstimated {
+				return nil, fmt.Errorf("用户 " + undertaker.UserName + " 已分红")
 			} else {
-				undertakerDividendsAmount, _ := decimal.NewFromFloat(moneyIncentivesRuleMatched.MoneyIncentivesAmount).Mul(decimal.NewFromFloat(moneyIncentivesRuleMatched.SalesmanPercentage).Div(decimal.NewFromFloat(100))).Float64()
+				undertakerDividendsAmount, _ := decimal.NewFromFloat(moneyIncentivesRuleMatched.MoneyIncentivesAmount).Float64()
+				//Mul(decimal.NewFromFloat(1).Sub(decimal.NewFromFloat(moneyIncentivesRuleMatched.SalesmanPercentage).Add(decimal.NewFromFloat(moneyIncentivesRuleMatched.ReferrerPercentage)).Div(decimal.NewFromFloat(100)))).Float64()
 				dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
 					DividendsUser: &domain.User{
-						UserId:     undertaker.Salesman.UserId,
-						UserBaseId: undertaker.Salesman.UserBaseId,
-						Org:        undertaker.Salesman.Org,
-						Orgs:       undertaker.Salesman.Orgs,
-						Department: undertaker.Salesman.Department,
-						Roles:      undertaker.Salesman.Roles,
-						UserInfo:   undertaker.Salesman.UserInfo,
-						UserType:   undertaker.Salesman.UserType,
-						UserName:   undertaker.Salesman.UserName,
-						UserPhone:  undertaker.Salesman.UserPhone,
-						Company:    undertaker.Salesman.Company,
+						UserId:     undertaker.UserId,
+						UserBaseId: undertaker.UserBaseId,
+						Org:        undertaker.Org,
+						Orgs:       undertaker.Orgs,
+						Department: undertaker.Department,
+						Roles:      undertaker.Roles,
+						UserInfo:   undertaker.UserInfo,
+						UserType:   undertaker.UserType,
+						UserName:   undertaker.UserName,
+						UserPhone:  undertaker.UserPhone,
+						Status:     undertaker.Status,
+						Company:    undertaker.Company,
 					},
 					DividendsParticipateType: domain.MONEY_INCENTIVES,
 					DividendsStage:           stage,
@@ -117,40 +86,75 @@ func (domainService *ConfirmMoneyIncentivesEstimateService) Confirm(contract *do
 				})
 			}
 
-		}
+			//	判断业务员在当前阶段是否已经分红
+			if undertaker.Salesman != nil {
+				salesmanEstimated, err := dividendsEstimateDao.UserEstimated(map[string]interface{}{
+					"undertakerUid": undertaker.Salesman.UserId,
+					"companyId":     contract.Company.CompanyId,
+					"orgId":         contract.Org.OrgId,
+				})
+				if err != nil {
+					return nil, err
+				}
+				if salesmanEstimated {
+					return nil, fmt.Errorf("业务员 " + undertaker.Salesman.UserName + " 已分红")
+				} else {
+					undertakerDividendsAmount, _ := decimal.NewFromFloat(moneyIncentivesRuleMatched.MoneyIncentivesAmount).Mul(decimal.NewFromFloat(moneyIncentivesRuleMatched.SalesmanPercentage).Div(decimal.NewFromFloat(100))).Float64()
+					dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
+						DividendsUser: &domain.User{
+							UserId:     undertaker.Salesman.UserId,
+							UserBaseId: undertaker.Salesman.UserBaseId,
+							Org:        undertaker.Salesman.Org,
+							Orgs:       undertaker.Salesman.Orgs,
+							Department: undertaker.Salesman.Department,
+							Roles:      undertaker.Salesman.Roles,
+							UserInfo:   undertaker.Salesman.UserInfo,
+							UserType:   undertaker.Salesman.UserType,
+							UserName:   undertaker.Salesman.UserName,
+							UserPhone:  undertaker.Salesman.UserPhone,
+							Company:    undertaker.Salesman.Company,
+						},
+						DividendsParticipateType: domain.MONEY_INCENTIVES,
+						DividendsStage:           stage,
+						DividendsAmount:          undertakerDividendsAmount,
+					})
+				}
 
-		//	判断关联业务员在当前阶段是否已经分红
-		if undertaker.Referrer != nil {
-			referrerEstimated, err := dividendsEstimateDao.UserEstimated(map[string]interface{}{
-				"undertakerUid": undertaker.Referrer.UserId,
-				"companyId":     contract.Company.CompanyId,
-				"orgId":         contract.Org.OrgId,
-			})
-			if err != nil {
-				return nil, err
 			}
-			if referrerEstimated {
-				return nil, fmt.Errorf("推荐人 " + undertaker.Salesman.UserName + " 已分红")
-			} else {
-				undertakerDividendsAmount, _ := decimal.NewFromFloat(moneyIncentivesRuleMatched.MoneyIncentivesAmount).Mul(decimal.NewFromFloat(moneyIncentivesRuleMatched.ReferrerPercentage).Div(decimal.NewFromFloat(100))).Float64()
-				dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
-					DividendsUser: &domain.User{
-						UserId:     undertaker.Referrer.UserId,
-						UserBaseId: undertaker.Referrer.UserBaseId,
-						Org:        undertaker.Referrer.Org,
-						Orgs:       undertaker.Referrer.Orgs,
-						Department: undertaker.Referrer.Department,
-						Roles:      undertaker.Referrer.Roles,
-						UserInfo:   undertaker.Referrer.UserInfo,
-						UserType:   undertaker.Referrer.UserType,
-						UserName:   undertaker.Referrer.UserName,
-						UserPhone:  undertaker.Referrer.UserPhone,
-						Company:    undertaker.Referrer.Company,
-					},
-					DividendsParticipateType: domain.MONEY_INCENTIVES,
-					DividendsStage:           stage,
-					DividendsAmount:          undertakerDividendsAmount,
+
+			//	判断关联业务员在当前阶段是否已经分红
+			if undertaker.Referrer != nil {
+				referrerEstimated, err := dividendsEstimateDao.UserEstimated(map[string]interface{}{
+					"undertakerUid": undertaker.Referrer.UserId,
+					"companyId":     contract.Company.CompanyId,
+					"orgId":         contract.Org.OrgId,
 				})
+				if err != nil {
+					return nil, err
+				}
+				if referrerEstimated {
+					return nil, fmt.Errorf("推荐人 " + undertaker.Salesman.UserName + " 已分红")
+				} else {
+					undertakerDividendsAmount, _ := decimal.NewFromFloat(moneyIncentivesRuleMatched.MoneyIncentivesAmount).Mul(decimal.NewFromFloat(moneyIncentivesRuleMatched.ReferrerPercentage).Div(decimal.NewFromFloat(100))).Float64()
+					dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
+						DividendsUser: &domain.User{
+							UserId:     undertaker.Referrer.UserId,
+							UserBaseId: undertaker.Referrer.UserBaseId,
+							Org:        undertaker.Referrer.Org,
+							Orgs:       undertaker.Referrer.Orgs,
+							Department: undertaker.Referrer.Department,
+							Roles:      undertaker.Referrer.Roles,
+							UserInfo:   undertaker.Referrer.UserInfo,
+							UserType:   undertaker.Referrer.UserType,
+							UserName:   undertaker.Referrer.UserName,
+							UserPhone:  undertaker.Referrer.UserPhone,
+							Company:    undertaker.Referrer.Company,
+						},
+						DividendsParticipateType: domain.MONEY_INCENTIVES,
+						DividendsStage:           stage,
+						DividendsAmount:          undertakerDividendsAmount,
+					})
+				}
 			}
 		}
 	}

@@ -154,7 +154,10 @@ func (repository *ContractUndertakerFeedbackRepository) Find(queryOptions map[st
 	contractUndertakerFeedbacks := make([]*domain.ContractUndertakerFeedback, 0)
 	query := sqlbuilder.BuildQuery(tx.Model(&contractUndertakerFeedbackModels), queryOptions)
 	if cooperationContractName, ok := queryOptions["cooperationContractName"]; ok && cooperationContractName != "" {
-		query.Where("cooperation_contract_number like ?", fmt.Sprintf("%%%s%%", cooperationContractName))
+		query.Where("cooperation_contract_name like ?", fmt.Sprintf("%%%s%%", cooperationContractName))
+	}
+	if cooperationContractNumber, ok := queryOptions["cooperationContractNumber"]; ok && cooperationContractNumber != "" {
+		query.Where("cooperation_contract_number = ?", cooperationContractNumber)
 	}
 	if undertakerName, ok := queryOptions["undertakerName"]; ok && undertakerName != "" {
 		query.Where("contract_undertaker->>'userName' like ?", fmt.Sprintf("%%%s%%", undertakerName))

@@ -1162,6 +1162,9 @@ func (repository *CooperationContractRepository) Find(queryOptions map[string]in
 	if incentivesType, ok := queryOptions["incentivesType"]; ok && incentivesType.(int32) != 0 {
 		query.Where("incentives_type = ?", incentivesType)
 	}
+	if status, ok := queryOptions["status"]; ok && status.(int32) != 0 {
+		query.Where("status = ?", status)
+	}
 	if companyId, ok := queryOptions["companyId"]; ok && companyId.(int64) != 0 {
 		query.Where("company->>'companyId' = '?'", companyId)
 	}

@@ -535,6 +535,9 @@ func (repository *DividendsOrderRepository) Find(queryOptions map[string]interfa
 	if dividendsOrderNumber, ok := queryOptions["dividendsOrderNumber"]; ok && dividendsOrderNumber != "" {
 		query.Where("dividends_order_number ilike ?", fmt.Sprintf("%%%s%%", dividendsOrderNumber))
 	}
+	if dividendsOrderNumbers, ok := queryOptions["dividendsOrderNumbers"]; ok && len(dividendsOrderNumbers.([]string)) > 0 {
+		query.Where("dividends_order_number IN (?)", pg.In(dividendsOrderNumbers.([]string)))
+	}
 	if customerName, ok := queryOptions["customerName"]; ok && customerName != "" {
 		query.Where("customer_name like ?", fmt.Sprintf("%%%s%%", customerName))
 	}

@@ -203,6 +203,12 @@ func (repository *OrderGoodRepository) Find(queryOptions map[string]interface{})
 			return q, nil
 		})
 	}
+	if returnedOrderNumbers, ok := queryOptions["returnedOrderNumbers"]; ok && len(returnedOrderNumbers.([]string)) > 0 {
+		query.Where("dividends_returned_order_number IN (?)", pg.In(returnedOrderNumbers.([]string)))
+	}
+	if orderNumbers, ok := queryOptions["orderNumbers"]; ok && len(orderNumbers.([]string)) > 0 {
+		query.Where("dividends_order_number IN (?)", pg.In(orderNumbers.([]string)))
+	}
 	if orderGoodDividendsStatus, ok := queryOptions["orderGoodDividendsStatus"]; ok && orderGoodDividendsStatus.(int32) != 0 {
 		query.Where("order_good_dividends_status = ?", orderGoodDividendsStatus)
 	}

@@ -135,3 +135,13 @@ func IsContain(items []int32, item int32) bool {
 	}
 	return false
 }
+
+// IsContain64 判断int64数组是否包含
+func IsContain64(items []int64, item int64) bool {
+	for _, eachItem := range items {
+		if eachItem == item {
+			return true
+		}
+	}
+	return false
+}