Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway into dev

 FROM 192.168.0.243:5000/mmm/allied-creation-gateway:20210809
 FROM 192.168.0.243:5000/mmm/allied-creation-gateway:20210809
-ENV APP_DIR $GOPATH/src/project-20210908
+ENV APP_DIR $GOPATH/src/project-20210909
 RUN mkdir -p $APP_DIR
 RUN mkdir -p $APP_DIR
 WORKDIR $APP_DIR/
 WORKDIR $APP_DIR/
 COPY ./pkg pkg
 COPY ./pkg pkg

@@ -47,7 +47,7 @@ spec:
                       - cn-hangzhou.i-bp1hyp5oips9cdwxxgxy
                       - cn-hangzhou.i-bp1hyp5oips9cdwxxgxy
       containers:
       containers:
         - name: allied-creation-gateway
         - name: allied-creation-gateway
-          image: 192.168.0.243:5000/mmm/allied-creation-gateway:test
+          image: 192.168.0.243:5000/mmm/allied-creation-gateway:dev
           imagePullPolicy: Always
           imagePullPolicy: Always
           ports:
           ports:
             - containerPort: 8082
             - containerPort: 8082

@@ -66,6 +66,7 @@ func ToCreditAccountItem(param *allied_creation_cooperation.CreditAccount) *Cred
 		AccountDetail: param.AccountDetail,
 		AccountDetail: param.AccountDetail,
 		Remarks:       param.Remarks,
 		Remarks:       param.Remarks,
 	}
 	}
+	data.Participator.UserName = param.Participator.UserInfo.UsersName
 	data.Participator.UserInfo.UserName = param.Participator.UserInfo.UsersName
 	data.Participator.UserInfo.UserName = param.Participator.UserInfo.UsersName
 	data.Participator.UserInfo.UserPhone = param.Participator.UserInfo.Phone
 	data.Participator.UserInfo.UserPhone = param.Participator.UserInfo.Phone
 	data.Participator.UserType = param.Participator.UserType
 	data.Participator.UserType = param.Participator.UserType

@@ -177,7 +177,7 @@ func (srv CompanyCreditAccountService) PaymentHistoryStatistics(cmd *command.Cre
 		cmd.Operator)
 		cmd.Operator)
 
 
 	var response = struct {
 	var response = struct {
-		rankItems          interface{} `json:"rankItems"`
+		RankItems          interface{} `json:"rankItems"`
 		TotalPaymentAmount interface{} `json:"totalPaymentAmount"`
 		TotalPaymentAmount interface{} `json:"totalPaymentAmount"`
 	}{}
 	}{}
 	cooperationContractNumbers, err := gateway.RelevantCooperationContractNumbers(allied_creation_cooperation.RelevantCooperationContractNumbers, map[string]interface{}{
 	cooperationContractNumbers, err := gateway.RelevantCooperationContractNumbers(allied_creation_cooperation.RelevantCooperationContractNumbers, map[string]interface{}{
@@ -215,7 +215,7 @@ func (srv CompanyCreditAccountService) PaymentHistoryStatistics(cmd *command.Cre
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
 		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
 	}
 	}
-	response.rankItems = cooperationUsersStatistics
+	response.RankItems = cooperationUsersStatistics
 	response.TotalPaymentAmount = creditAccountStatistics.Paid
 	response.TotalPaymentAmount = creditAccountStatistics.Paid
 
 
 	return response, nil
 	return response, nil