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

@@ -66,7 +66,7 @@ type CreateCooperationContractCommand struct {
 		UndertakerId string              `json:"undertakerId"` //承接人用户id
 		RerferrerId  string              `json:"rerferrerId"`  //推荐人用户id
 		SalesmanId   string              `json:"salesmanId"`   //关联业务员id
-		Attachment   domain.Attachment `json:"attachment"`
+		Attachment   []domain.Attachment `json:"attachment"`
 	} `json:"undertakers"`
 	//关联业务员
 	RelevantIds []string `json:"relevantIds"`

@@ -68,7 +68,7 @@ type UpdateCooperationContractCommand struct {
 		UndertakerId string              `json:"undertakerId"` //承接人用户id
 		RerferrerId  string              `json:"rerferrerId"`  //推荐人用户id
 		SalesmanId   string              `json:"salesmanId"`   //关联业务员id
-		Attachment   domain.Attachment `json:"attachment"`
+		Attachment   []domain.Attachment `json:"attachment"`
 	} `json:"undertakers"`
 	//关联业务员
 	RelevantIds []string `json:"relevantIds"`

@@ -28,8 +28,8 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC
 			SalesmanPercentage:            v.SalesmanPercentage,
 			DividendsIncentivesPercentage: v.DividendsIncentivesPercentage,
 			DividendsIncentivesStage:      v.DividendsIncentivesStage,
-			DividendsIncentivesStageEnd:   time.Unix(int64(v.DividendsIncentivesStageEnd), 0),
-			DividendsIncentivesStageStart: time.Unix(int64(v.DividendsIncentivesStageStart), 0),
+			DividendsIncentivesStageEnd:   time.Unix(int64(v.DividendsIncentivesStageEnd/1e3), 0),
+			DividendsIncentivesStageStart: time.Unix(int64(v.DividendsIncentivesStageStart/1e3), 0),
 		}
 		rules1 = append(rules1, r)
 	}
@@ -40,7 +40,7 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC
 			CooperationContractNumber: v.CooperationContractNumber,
 			MoneyIncentivesAmount:     v.MoneyIncentivesAmount,
 			MoneyIncentivesStage:      v.MoneyIncentivesStage,
-			MoneyIncentivesTime:       time.Unix(int64(v.MoneyIncentivesTime), 0),
+			MoneyIncentivesTime:       time.Unix(int64(v.MoneyIncentivesTime/1e3), 0),
 			ReferrerPercentage:        v.ReferrerPercentage,
 			SalesmanPercentage:        v.SalesmanPercentage,
 		}
@@ -143,8 +143,8 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC
 			SalesmanPercentage:            v.SalesmanPercentage,
 			DividendsIncentivesPercentage: v.DividendsIncentivesPercentage,
 			DividendsIncentivesStage:      v.DividendsIncentivesStage,
-			DividendsIncentivesStageEnd:   time.Unix(int64(v.DividendsIncentivesStageEnd), 0),
-			DividendsIncentivesStageStart: time.Unix(int64(v.DividendsIncentivesStageStart), 0),
+			DividendsIncentivesStageEnd:   time.Unix(int64(v.DividendsIncentivesStageEnd/1e3), 0),
+			DividendsIncentivesStageStart: time.Unix(int64(v.DividendsIncentivesStageStart/1e3), 0),
 		}
 		rules1 = append(rules1, r)
 	}
@@ -155,7 +155,7 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC
 			CooperationContractNumber: v.CooperationContractNumber,
 			MoneyIncentivesAmount:     v.MoneyIncentivesAmount,
 			MoneyIncentivesStage:      v.MoneyIncentivesStage,
-			MoneyIncentivesTime:       time.Unix(int64(v.MoneyIncentivesTime), 0),
+			MoneyIncentivesTime:       time.Unix(int64(v.MoneyIncentivesTime/1e3), 0),
 			ReferrerPercentage:        v.ReferrerPercentage,
 			SalesmanPercentage:        v.SalesmanPercentage,
 		}

@@ -27,7 +27,7 @@ type DividendsOrder struct {
 		RegionNumber string `json:"regionNumber"`
 	} `json:"region"`
 	Remarks string                                            `json:"remarks"`
-	Goods   []allied_creation_cooperation.DividendsOrderGoods
+	Goods   []allied_creation_cooperation.DividendsOrderGoods `json:"goods"`
 }
 
 func ToDividendsOrder(param *allied_creation_cooperation.DividendsOrder) *DividendsOrder {

@@ -145,7 +145,7 @@ type (
 		UndertakerId string              `json:"undertakerId"` //承接人用户id
 		RerferrerId  string              `json:"rerferrerId"`  //推荐人用户id
 		SalesmanId   string              `json:"salesmanId"`   //关联业务员id
-		Attachment   domain.Attachment `json:"attachment"`
+		Attachment   []domain.Attachment `json:"attachment"`
 	}
 
 	ReqCooperationContractAdd struct {

@@ -8,7 +8,7 @@ import (
 func init() {
 	web.Router("/v1/web/dividends-returned-order/", &web_client.DividendsReturnedOrderController{}, "Post:CreateDividendsReturnedOrder")
 	web.Router("/v1/web/dividends-returned-order/:projectId", &web_client.DividendsReturnedOrderController{}, "Put:UpdateDividendsReturnedOrder")
-	web.Router("/v1/web/dividends-returned-order/:projectId", &web_client.DividendsReturnedOrderController{}, "Delete:RemoveDividendsReturnedOrder")
+	web.Router("/v1/web/dividends-returned-order/remove", &web_client.DividendsReturnedOrderController{}, "Post:RemoveDividendsReturnedOrder")
 	web.Router("/v1/web/dividends-returned-order/:projectId", &web_client.DividendsReturnedOrderController{}, "Get:GetDividendsReturnedOrder")
 	web.Router("/v1/web/dividends-returned-order/search", &web_client.DividendsReturnedOrderController{}, "Post:SearchDividendsReturnedOrder")
 	web.Router("/v1/web/dividends-returned-order/selector/dividends-order", &web_client.DividendsReturnedOrderController{}, "Post:SelectorDividendsOrder")