数据结构调整

tangxuhui
pkg/application/web/cooperationContract/dto/dto.go
pkg/application/web/cooperationContract/service/cooperation_contract.go
pkg/application/web/dividendsOrder/dto/dto.go
pkg/application/web/dividendsReturnedOrder/dto/dto.go
pkg/application/web/dividendsReturnedOrder/service/dividends_returned_order.go
pkg/infrastructure/service_gateway/allied_creation_cooperation/param_cooperation_contract.go
--- a/pkg/application/web/cooperationContract/dto/dto.go
查看文件 @a10a4ee
+++ b/pkg/application/web/cooperationContract/dto/dto.go
查看文件 @a10a4ee
@@ -29,7 +29,7 @@ func ToCooperationContractItem(param *allied_creation_cooperation.CooperationCon
 		CooperationContractName:   param.CooperationContractName,
 		CooperationContractNumber: param.CooperationContractNumber,
 		Status:                    param.Status,
-		CreateTtime:               int(param.CreatedAt.Unix()),
+		CreateTtime:               int(param.CreatedAt.UnixNano() / 1e6),
 	}
 	data.CooperationContractSponsor.UserId = param.CooperationContractSponsor.UserId
 	data.CooperationContractSponsor.UserName = param.CooperationContractSponsor.UserInfo.UserName
@@ -122,8 +122,8 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon
 			SalesmanPercentage:            v.SalesmanPercentage,
 			DividendsIncentivesPercentage: v.DividendsIncentivesPercentage,
 			DividendsIncentivesStage:      v.DividendsIncentivesStage,
-			DividendsIncentivesStageEnd:   v.DividendsIncentivesStageEnd.Unix(),
-			DividendsIncentivesStageStart: v.DividendsIncentivesStageStart.Unix(),
+			DividendsIncentivesStageEnd:   v.DividendsIncentivesStageEnd.UnixNano() / 1e6,
+			DividendsIncentivesStageStart: v.DividendsIncentivesStageStart.UnixNano() / 1e6,
 		}
 		dividendsIncentivesRules = append(dividendsIncentivesRules, r)
 	}
@@ -134,7 +134,7 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon
 			CooperationContractNumber: v.CooperationContractNumber,
 			MoneyIncentivesAmount:     v.MoneyIncentivesAmount,
 			MoneyIncentivesStage:      v.MoneyIncentivesStage,
-			MoneyIncentivesTime:       v.MoneyIncentivesTime.Unix(),
+			MoneyIncentivesTime:       v.MoneyIncentivesTime.UnixNano() / 1e6,
 			ReferrerPercentage:        v.ReferrerPercentage,
 			SalesmanPercentage:        v.SalesmanPercentage,
 		}
--- a/pkg/application/web/cooperationContract/service/cooperation_contract.go
查看文件 @a10a4ee
+++ b/pkg/application/web/cooperationContract/service/cooperation_contract.go
查看文件 @a10a4ee
@@ -49,10 +49,10 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC
 	underTakers := []allied_creation_cooperation.Undertaker{}
 	for _, v := range createCooperationContractCommand.Undertakers {
 		u := allied_creation_cooperation.Undertaker{
-			UndertakerId: v.UndertakerId,
-			RerferrerId:  v.RerferrerId,
-			SalesmanId:   v.SalesmanId,
-			Attachment:   v.Attachment,
+			UserId:      v.UndertakerId,
+			RerferrerId: v.RerferrerId,
+			SalesmanId:  v.SalesmanId,
+			Attachment:  v.Attachment,
 		}
 		underTakers = append(underTakers, u)
 	}
@@ -164,10 +164,10 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC
 	underTakers := []allied_creation_cooperation.Undertaker{}
 	for _, v := range updateCooperationContractCommand.Undertakers {
 		u := allied_creation_cooperation.Undertaker{
-			UndertakerId: v.UndertakerId,
-			RerferrerId:  v.RerferrerId,
-			SalesmanId:   v.SalesmanId,
-			Attachment:   v.Attachment,
+			UserId:      v.UndertakerId,
+			RerferrerId: v.RerferrerId,
+			SalesmanId:  v.SalesmanId,
+			Attachment:  v.Attachment,
 		}
 		underTakers = append(underTakers, u)
 	}
--- a/pkg/application/web/dividendsOrder/dto/dto.go
查看文件 @a10a4ee
+++ b/pkg/application/web/dividendsOrder/dto/dto.go
查看文件 @a10a4ee
@@ -35,7 +35,7 @@ func ToDividendsOrder(param *allied_creation_cooperation.DividendsOrder) *Divide
 		Company:                   param.Company,
 		CustomerName:              param.CustomerName,
 		DividendStatus:            param.DividendStatus,
-		DividendTime:              param.DividendTime.Unix(),
+		DividendTime:              param.DividendTime.UnixNano() / 1e6,
 		DividendsOrderAmount:      param.DividendsOrderAmount,
 		DividendsOrderID:          param.DividendsOrderID,
 		DividendsOrderNumber:      param.DividendsOrderNumber,
--- a/pkg/application/web/dividendsReturnedOrder/dto/dto.go
查看文件 @a10a4ee
+++ b/pkg/application/web/dividendsReturnedOrder/dto/dto.go
查看文件 @a10a4ee
@@ -41,12 +41,12 @@ func ToDividendsReturnedOrderInfo(param *allied_creation_cooperation.DividendsRe
 		Org:                           param.Org,
 		Region:                        param.Region,
 		Company:                       param.Company,
-		CreatedAt:                     param.CreatedAt.Unix(),
+		CreatedAt:                     param.CreatedAt.UnixNano() / 1e6,
 		DividendStatus:                param.DividendStatus,
-		DividendTime:                  param.DividendTime.Unix(),
+		DividendTime:                  param.DividendTime.UnixNano() / 1e6,
 		DividendsOrderNumber:          param.DividendsOrderNumber,
 		DividendsReturnedCustomerName: param.DividendsReturnedCustomerName,
-		DividendsReturnedDate:         param.DividendsReturnedDate.Unix(),
+		DividendsReturnedDate:         param.DividendsReturnedDate.UnixNano() / 1e6,
 		DividendsReturnedOrderID:      param.DividendsReturnedOrderID,
 		DividendsReturnedOrderNumber:  param.DividendsReturnedOrderNumber,
 		DividendsReturnedOrderRefund:  param.DividendsReturnedOrderRefund,
--- a/pkg/application/web/dividendsReturnedOrder/service/dividends_returned_order.go
查看文件 @a10a4ee
+++ b/pkg/application/web/dividendsReturnedOrder/service/dividends_returned_order.go
查看文件 @a10a4ee
@@ -18,8 +18,8 @@ type DividendsReturnedOrderService struct {
 // 创建分红退货单服务
 func (dividendsReturnedOrderService *DividendsReturnedOrderService) CreateDividendsReturnedOrder(createDividendsReturnedOrderCommand *command.CreateDividendsReturnedOrderCommand) (interface{}, error) {
 	creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(createDividendsReturnedOrderCommand.Operator)
-	dividendsReturnedDate := time.Unix(createDividendsReturnedOrderCommand.DividendsReturnedDate, 0)
-	orderDate := time.Unix(createDividendsReturnedOrderCommand.OrderDate, 0)
+	dividendsReturnedDate := time.Unix(createDividendsReturnedOrderCommand.DividendsReturnedDate/1e3, 0)
+	orderDate := time.Unix(createDividendsReturnedOrderCommand.OrderDate/1e3, 0)
 	result, err := creationCooperationGateway.DividendsReturnedOrderAdd(allied_creation_cooperation.ReqDividendsReturnedOrderAdd{
 		DividendsReturnedCustomerName: createDividendsReturnedOrderCommand.DividendsReturnedCustomerName,
 		DividendsOrderNumber:          createDividendsReturnedOrderCommand.DividendsOrderNumber,
@@ -89,8 +89,8 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) SearchDivide
 // 更新分红退货单服务
 func (dividendsReturnedOrderService *DividendsReturnedOrderService) UpdateDividendsReturnedOrder(updateDividendsReturnedOrderCommand *command.UpdateDividendsReturnedOrderCommand) (interface{}, error) {
 	creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(updateDividendsReturnedOrderCommand.Operator)
-	dividendsReturnedDate := time.Unix(updateDividendsReturnedOrderCommand.DividendsReturnedDate, 0)
-	orderDate := time.Unix(updateDividendsReturnedOrderCommand.OrderDate, 0)
+	dividendsReturnedDate := time.Unix(updateDividendsReturnedOrderCommand.DividendsReturnedDate/1e3, 0)
+	orderDate := time.Unix(updateDividendsReturnedOrderCommand.OrderDate/1e3, 0)
 	_, err := creationCooperationGateway.DividendsReturnedOrderUpdate(allied_creation_cooperation.ReqDividendsReturnedOrderUpdate{
 		DividendsReturnedOrderID:      updateDividendsReturnedOrderCommand.DividendsReturnedOrderID,
 		DividendsReturnedCustomerName: updateDividendsReturnedOrderCommand.DividendsReturnedCustomerName,
--- a/pkg/infrastructure/service_gateway/allied_creation_cooperation/param_cooperation_contract.go
查看文件 @a10a4ee
+++ b/pkg/infrastructure/service_gateway/allied_creation_cooperation/param_cooperation_contract.go
查看文件 @a10a4ee
@@ -142,10 +142,10 @@ type (
 	//合约承接方
 	Undertaker struct {
-		UndertakerId string              `json:"undertakerId"` //承接人用户id
-		RerferrerId  string              `json:"rerferrerId"`  //推荐人用户id
-		SalesmanId   string              `json:"salesmanId"`   //关联业务员id
-		Attachment   []domain.Attachment `json:"attachment"`
+		UserId      string              `json:"userId"`      //承接人用户id
+		RerferrerId string              `json:"rerferrerId"` //推荐人用户id
+		SalesmanId  string              `json:"salesmanId"`  //关联业务员id
+		Attachment  []domain.Attachment `json:"attachment"`
 	}
 	ReqCooperationContractAdd struct {