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

…ion-cooperation into dev

 <component name="ProjectRunConfigurationManager">
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Docker for Mac" type="docker-deploy" factoryName="dockerfile" server-name="Docker for Mac">
+  <configuration default="false" name="Docker for Mac" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
     <deployment type="dockerfile">
       <settings>
       <settings>
-        <option name="imageTag" value="" />
+        <option name="imageTag" value="latest" />
         <option name="containerName" value="allied-creation-cooperation" />
         <option name="containerName" value="allied-creation-cooperation" />
+        <option name="envVars">
+          <list>
+            <DockerEnvVarImpl>
+              <option name="name" value="POSTGRESQL_HOST" />
+              <option name="value" value="114.55.200.59" />
+            </DockerEnvVarImpl>
+            <DockerEnvVarImpl>
+              <option name="name" value="POSTGRESQL_DB_NAME" />
+              <option name="value" value="allied_creation_cooperation_dev" />
+            </DockerEnvVarImpl>
+            <DockerEnvVarImpl>
+              <option name="name" value="POSTGRESQL_PORT" />
+              <option name="value" value="31543" />
+            </DockerEnvVarImpl>
+            <DockerEnvVarImpl>
+              <option name="name" value="POSTGRESQL_PASSWORD" />
+              <option name="value" value="eagle1010" />
+            </DockerEnvVarImpl>
+          </list>
+        </option>
+        <option name="portBindings">
+          <list>
+            <DockerPortBindingImpl>
+              <option name="containerPort" value="8082" />
+              <option name="hostPort" value="8082" />
+            </DockerPortBindingImpl>
+          </list>
+        </option>
         <option name="sourceFilePath" value="Dockerfile" />
         <option name="sourceFilePath" value="Dockerfile" />
       </settings>
       </settings>
     </deployment>
     </deployment>

@@ -14,4 +14,22 @@ ENV GOPROXY https://goproxy.io
 RUN ["go","mod","tidy"]
 RUN ["go","mod","tidy"]
 RUN ["ls"]
 RUN ["ls"]
 RUN ["go","build"]
 RUN ["go","build"]
-ENTRYPOINT ["./allied-creation-cooperation"]
+ENTRYPOINT ["./allied-creation-cooperation"]
+
+##############################
+### STEP 1 build executable binary
+##############################
+#FROM golang:latest AS builder
+#MAINTAINER 陈志颖 <steve.d.chan@qq.com>
+#RUN mkdir /app
+#WORKDIR /app
+#COPY . /app
+#RUN ["ln","-sf","/usr/share/zoneinfo/Asia/Shanghai","/etc/localtime"]
+#RUN GO111MODULE="on" GOPROXY="https://goproxy.cn" CGO_ENABLED=0 GOOS=linux go build -o allied-creation-cooperation
+#
+##############################
+### STEP 2 build a small image
+#############################
+#FROM scratch as final
+#COPY --from=builder /app/allied-creation-cooperation /app/allied-creation-cooperation
+#ENTRYPOINT ["./app/allied-creation-cooperation"]

@@ -898,7 +898,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
 			}
 			}
 
 
 			return map[string]interface{}{
 			return map[string]interface{}{
-				"report": fmt.Sprintf("已完成%d笔单订单分红预算，生成%d笔单分红预算，%d笔订单分红预算失败，失败原因：%s", len(estimateSuccessfullyDividendsOrders), successfullyCount, len(estimateFailedDividendsOrders), failedReasonStr),
+				"report": fmt.Sprintf("已完成%d单订单分红预算，生成%d单分红预算，%d笔订单分红预算失败，失败原因：%s", len(estimateSuccessfullyDividendsOrders), successfullyCount, len(estimateFailedDividendsOrders), failedReasonStr),
 			}, nil
 			}, nil
 		}
 		}
 	}
 	}