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

@@ -27,29 +27,6 @@ type CreateDividendsOrderCommand struct {
 		OrderGoodExpense  float64 `json:"orderGoodExpense"`  //订单产品费用
 		OrderGoodName     string  `json:"orderGoodName"`     //订单产品名称
 		OrderGoodPrice    float64 `json:"orderGoodPrice"`    //订单产品单价
-		OrderGoodQuantity int     `json:"orderGoodQuantity"` //订单产品数量
+		OrderGoodQuantity float64 `json:"orderGoodQuantity"` //订单产品数量
 	} `json:"orderGoods"`
 }
-
-// func (createDividendsOrderCommand *CreateDividendsOrderCommand) Valid(validation *validation.Validation) {
-// 	// 162 92522 89000
-// 	orderTimeStr := strconv.Itoa(int(createDividendsOrderCommand.OrderTime))
-// 	orderTimeStrRune := []rune(orderTimeStr)
-// 	if len(orderTimeStrRune) != 13 {
-// 		validation.AddError("订单产生时间", "格式错误")
-// 	}
-// }
-
-// func (createDividendsOrderCommand *CreateDividendsOrderCommand) ValidateCommand() error {
-// 	valid := validation.Validation{}
-// 	b, err := valid.Valid(createDividendsOrderCommand)
-// 	if err != nil {
-// 		return err
-// 	}
-// 	if !b {
-// 		for _, validErr := range valid.Errors {
-// 			return fmt.Errorf("%s  %s", validErr.Key, validErr.Message)
-// 		}
-// 	}
-// 	return nil
-// }

@@ -10,21 +10,3 @@ type RemoveDividendsOrderCommand struct {
 	// 分红订单ID
 	DividendsOrderId []string `json:"dividendsOrderId"`
 }
-
-// func (removeDividendsOrderCommand *RemoveDividendsOrderCommand) Valid(validation *validation.Validation) {
-
-// }
-
-// func (removeDividendsOrderCommand *RemoveDividendsOrderCommand) ValidateCommand() error {
-// 	valid := validation.Validation{}
-// 	b, err := valid.Valid(removeDividendsOrderCommand)
-// 	if err != nil {
-// 		return err
-// 	}
-// 	if !b {
-// 		for _, validErr := range valid.Errors {
-// 			return fmt.Errorf("%s  %s", validErr.Key, validErr.Message)
-// 		}
-// 	}
-// 	return nil
-// }

@@ -30,29 +30,6 @@ type UpdateDividendsOrderCommand struct {
 		OrderGoodExpense  float64 `json:"orderGoodExpense"`  //订单产品费用
 		OrderGoodName     string  `json:"orderGoodName"`     //订单产品名称
 		OrderGoodPrice    float64 `json:"orderGoodPrice"`    //订单产品单价
-		OrderGoodQuantity int     `json:"orderGoodQuantity"` //订单产品数量
+		OrderGoodQuantity float64 `json:"orderGoodQuantity"` //订单产品数量
 	} `json:"orderGoods"`
 }
-
-// func (updateDividendsOrderCommand *UpdateDividendsOrderCommand) Valid(validation *validation.Validation) {
-// 	// 162 92522 89000
-// 	orderTimeStr := strconv.Itoa(int(updateDividendsOrderCommand.OrderTime))
-// 	orderTimeStrRune := []rune(orderTimeStr)
-// 	if len(orderTimeStrRune) != 13 {
-// 		validation.AddError("订单产生时间", "格式错误")
-// 	}
-// }
-
-// func (updateDividendsOrderCommand *UpdateDividendsOrderCommand) ValidateCommand() error {
-// 	valid := validation.Validation{}
-// 	b, err := valid.Valid(updateDividendsOrderCommand)
-// 	if err != nil {
-// 		return err
-// 	}
-// 	if !b {
-// 		for _, validErr := range valid.Errors {
-// 			return fmt.Errorf("%s  %s", validErr.Key, validErr.Message)
-// 		}
-// 	}
-// 	return nil
-// }

@@ -41,7 +41,7 @@ type DividendsOrderGoods struct {
 	OrderGoodExpense          float64 `json:"orderGoodExpense"`          //订单产品费用
 	OrderGoodName             string  `json:"orderGoodName"`             //订单产品名称
 	OrderGoodPrice            float64 `json:"orderGoodPrice"`            //订单产品单价
-	OrderGoodQuantity         int     `json:"orderGoodQuantity"`         //订单产品数量
+	OrderGoodQuantity         float64 `json:"orderGoodQuantity"`         //订单产品数量
 	OrderGoodDividendsStatus  int32   `json:"orderGoodDividendsStatus"`  // 订单产品分红状态， 1待分红，2已分红
 }
 

@@ -15,7 +15,7 @@ type CreateDividendsReturnedOrderCommand struct {
 		// OrderGoodAmount           float64 `json:"orderGoodAmount"`           //订单产品金额
 		OrderGoodName     string  `json:"orderGoodName"`     //订单产品名称
 		OrderGoodPrice    float64 `json:"orderGoodPrice"`    //订单产品单价
-		OrderGoodQuantity int     `json:"orderGoodQuantity"` //订单产品数量
+		OrderGoodQuantity float64 `json:"orderGoodQuantity"` //订单产品数量
 	} `json:"orderGoods"` //货品
 	DividendsReturnedDate int64  `json:"dividendsReturnedDate"` //退货日期
 	OrderTime             int64  `json:"orderTime"`             //订单日期

@@ -17,7 +17,7 @@ type UpdateDividendsReturnedOrderCommand struct {
 		//	OrderGoodAmount           float64 `json:"orderGoodAmount"`           //订单产品金额
 		OrderGoodName     string  `json:"orderGoodName"`     //订单产品名称
 		OrderGoodPrice    float64 `json:"orderGoodPrice"`    //订单产品单价
-		OrderGoodQuantity int     `json:"orderGoodQuantity"` //订单产品数量
+		OrderGoodQuantity float64 `json:"orderGoodQuantity"` //订单产品数量
 	} `json:"orderGoods"` //货品
 	DividendsReturnedDate int64  `json:"dividendsReturnedDate"` //退货日期
 	OrderTime             int64  `json:"orderTime"`             //订单日期

@@ -62,8 +62,8 @@ type DividendsOrderGoods struct {
 	OrderGoodExpense          float64 `json:"orderGoodExpense"`          //订单产品费用
 	OrderGoodName             string  `json:"orderGoodName"`             //订单产品名称
 	OrderGoodPrice            float64 `json:"orderGoodPrice"`            //订单产品单价
-	OrderGoodQuantity         int     `json:"orderGoodQuantity,string"`  //订单产品数量
-	OrderGoodDividendsStatus  int32   `json:"orderGoodDividendsStatus"`  // 订单产品分红状态， 1待分红，2已分红
+	OrderGoodQuantity         float64 `json:"orderGoodQuantity,string"`  //订单产品数量
+	OrderGoodDividendsStatus  int32   `json:"orderGoodDividendsStatus"`  //订单产品分红状态， 1待分红，2已分红
 }
 
 type (
@@ -76,7 +76,7 @@ type (
 		OrderGoodExpense          float64 `json:"orderGoodExpense"`          //订单产品费用
 		OrderGoodName             string  `json:"orderGoodName"`             //订单产品名称
 		OrderGoodPrice            float64 `json:"orderGoodPrice"`            //订单产品单价
-		OrderGoodQuantity         int     `json:"orderGoodQuantity"`         //订单产品数量
+		OrderGoodQuantity         float64 `json:"orderGoodQuantity"`         //订单产品数量
 		OrderGoodDividendsStatus  int32   `json:"orderGoodDividendsStatus"`  // 订单产品分红状态， 1待分红，2已分红
 	}
 	//订单产品

@@ -10,7 +10,7 @@ type (
 		OrderGoodAmount           float64 `json:"orderGoodAmount"`           //订单产品金额
 		OrderGoodName             string  `json:"orderGoodName"`             //订单产品名称
 		OrderGoodPrice            float64 `json:"orderGoodPrice"`            //订单产品单价
-		OrderGoodQuantity         int     `json:"orderGoodQuantity,string"`  //订单产品数量
+		OrderGoodQuantity         float64 `json:"orderGoodQuantity,string"`  //订单产品数量
 		OrderGoodDividendsStatus  int     `json:"orderGoodDividendsStatus"`  // 订单产品分红状态， 1待分红，2已分红
 	}
 
@@ -54,7 +54,7 @@ type (
 		OrderGoodAmount           float64 `json:"orderGoodAmount"`           //订单产品金额
 		OrderGoodName             string  `json:"orderGoodName"`             //订单产品名称
 		OrderGoodPrice            float64 `json:"orderGoodPrice"`            //订单产品单价
-		OrderGoodQuantity         int     `json:"orderGoodQuantity"`         //订单产品数量
+		OrderGoodQuantity         float64 `json:"orderGoodQuantity"`         //订单产品数量
 	}
 	ReqDividendsReturnedOrderAdd struct {
 		DividendsReturnedCustomerName string                          `json:"dividendsReturnedCustomerName"`