allied-creation / allied-creation-gateway · 提交

转到一个项目

作者 yangfu
提交 553ddd1b043eaa4dfe5c5f5760861a246dc576b9 2 个父辈 12dcdf4c 20489ce7

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

内嵌 并排对比
正在显示 8 个修改的文件 包含 10 行增加 和 74 行删除
@@ -27,29 +27,6 @@ type CreateDividendsOrderCommand struct { @@ -27,29 +27,6 @@ type CreateDividendsOrderCommand struct {
27 OrderGoodExpense float64 `json:"orderGoodExpense"` //订单产品费用 27 OrderGoodExpense float64 `json:"orderGoodExpense"` //订单产品费用
28 OrderGoodName string `json:"orderGoodName"` //订单产品名称 28 OrderGoodName string `json:"orderGoodName"` //订单产品名称
29 OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价 29 OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价
30 - OrderGoodQuantity int `json:"orderGoodQuantity"` //订单产品数量 30 + OrderGoodQuantity float64 `json:"orderGoodQuantity"` //订单产品数量
31 } `json:"orderGoods"` 31 } `json:"orderGoods"`
32 } 32 }
33 -  
34 -// func (createDividendsOrderCommand *CreateDividendsOrderCommand) Valid(validation *validation.Validation) {  
35 -// // 162 92522 89000  
36 -// orderTimeStr := strconv.Itoa(int(createDividendsOrderCommand.OrderTime))  
37 -// orderTimeStrRune := []rune(orderTimeStr)  
38 -// if len(orderTimeStrRune) != 13 {  
39 -// validation.AddError("订单产生时间", "格式错误")  
40 -// }  
41 -// }  
42 -  
43 -// func (createDividendsOrderCommand *CreateDividendsOrderCommand) ValidateCommand() error {  
44 -// valid := validation.Validation{}  
45 -// b, err := valid.Valid(createDividendsOrderCommand)  
46 -// if err != nil {  
47 -// return err  
48 -// }  
49 -// if !b {  
50 -// for _, validErr := range valid.Errors {  
51 -// return fmt.Errorf("%s %s", validErr.Key, validErr.Message)  
52 -// }  
53 -// }  
54 -// return nil  
55 -// }  
@@ -10,21 +10,3 @@ type RemoveDividendsOrderCommand struct { @@ -10,21 +10,3 @@ type RemoveDividendsOrderCommand struct {
10 // 分红订单ID 10 // 分红订单ID
11 DividendsOrderId []string `json:"dividendsOrderId"` 11 DividendsOrderId []string `json:"dividendsOrderId"`
12 } 12 }
13 -  
14 -// func (removeDividendsOrderCommand *RemoveDividendsOrderCommand) Valid(validation *validation.Validation) {  
15 -  
16 -// }  
17 -  
18 -// func (removeDividendsOrderCommand *RemoveDividendsOrderCommand) ValidateCommand() error {  
19 -// valid := validation.Validation{}  
20 -// b, err := valid.Valid(removeDividendsOrderCommand)  
21 -// if err != nil {  
22 -// return err  
23 -// }  
24 -// if !b {  
25 -// for _, validErr := range valid.Errors {  
26 -// return fmt.Errorf("%s %s", validErr.Key, validErr.Message)  
27 -// }  
28 -// }  
29 -// return nil  
30 -// }  
@@ -30,29 +30,6 @@ type UpdateDividendsOrderCommand struct { @@ -30,29 +30,6 @@ type UpdateDividendsOrderCommand struct {
30 OrderGoodExpense float64 `json:"orderGoodExpense"` //订单产品费用 30 OrderGoodExpense float64 `json:"orderGoodExpense"` //订单产品费用
31 OrderGoodName string `json:"orderGoodName"` //订单产品名称 31 OrderGoodName string `json:"orderGoodName"` //订单产品名称
32 OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价 32 OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价
33 - OrderGoodQuantity int `json:"orderGoodQuantity"` //订单产品数量 33 + OrderGoodQuantity float64 `json:"orderGoodQuantity"` //订单产品数量
34 } `json:"orderGoods"` 34 } `json:"orderGoods"`
35 } 35 }
36 -  
37 -// func (updateDividendsOrderCommand *UpdateDividendsOrderCommand) Valid(validation *validation.Validation) {  
38 -// // 162 92522 89000  
39 -// orderTimeStr := strconv.Itoa(int(updateDividendsOrderCommand.OrderTime))  
40 -// orderTimeStrRune := []rune(orderTimeStr)  
41 -// if len(orderTimeStrRune) != 13 {  
42 -// validation.AddError("订单产生时间", "格式错误")  
43 -// }  
44 -// }  
45 -  
46 -// func (updateDividendsOrderCommand *UpdateDividendsOrderCommand) ValidateCommand() error {  
47 -// valid := validation.Validation{}  
48 -// b, err := valid.Valid(updateDividendsOrderCommand)  
49 -// if err != nil {  
50 -// return err  
51 -// }  
52 -// if !b {  
53 -// for _, validErr := range valid.Errors {  
54 -// return fmt.Errorf("%s %s", validErr.Key, validErr.Message)  
55 -// }  
56 -// }  
57 -// return nil  
58 -// }  
@@ -41,7 +41,7 @@ type DividendsOrderGoods struct { @@ -41,7 +41,7 @@ type DividendsOrderGoods struct {
41 OrderGoodExpense float64 `json:"orderGoodExpense"` //订单产品费用 41 OrderGoodExpense float64 `json:"orderGoodExpense"` //订单产品费用
42 OrderGoodName string `json:"orderGoodName"` //订单产品名称 42 OrderGoodName string `json:"orderGoodName"` //订单产品名称
43 OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价 43 OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价
44 - OrderGoodQuantity int `json:"orderGoodQuantity"` //订单产品数量 44 + OrderGoodQuantity float64 `json:"orderGoodQuantity"` //订单产品数量
45 OrderGoodDividendsStatus int32 `json:"orderGoodDividendsStatus"` // 订单产品分红状态， 1待分红，2已分红 45 OrderGoodDividendsStatus int32 `json:"orderGoodDividendsStatus"` // 订单产品分红状态， 1待分红，2已分红
46 } 46 }
47 47
@@ -15,7 +15,7 @@ type CreateDividendsReturnedOrderCommand struct { @@ -15,7 +15,7 @@ type CreateDividendsReturnedOrderCommand struct {
15 // OrderGoodAmount float64 `json:"orderGoodAmount"` //订单产品金额 15 // OrderGoodAmount float64 `json:"orderGoodAmount"` //订单产品金额
16 OrderGoodName string `json:"orderGoodName"` //订单产品名称 16 OrderGoodName string `json:"orderGoodName"` //订单产品名称
17 OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价 17 OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价
18 - OrderGoodQuantity int `json:"orderGoodQuantity"` //订单产品数量 18 + OrderGoodQuantity float64 `json:"orderGoodQuantity"` //订单产品数量
19 } `json:"orderGoods"` //货品 19 } `json:"orderGoods"` //货品
20 DividendsReturnedDate int64 `json:"dividendsReturnedDate"` //退货日期 20 DividendsReturnedDate int64 `json:"dividendsReturnedDate"` //退货日期
21 OrderTime int64 `json:"orderTime"` //订单日期 21 OrderTime int64 `json:"orderTime"` //订单日期
@@ -17,7 +17,7 @@ type UpdateDividendsReturnedOrderCommand struct { @@ -17,7 +17,7 @@ type UpdateDividendsReturnedOrderCommand struct {
17 // OrderGoodAmount float64 `json:"orderGoodAmount"` //订单产品金额 17 // OrderGoodAmount float64 `json:"orderGoodAmount"` //订单产品金额
18 OrderGoodName string `json:"orderGoodName"` //订单产品名称 18 OrderGoodName string `json:"orderGoodName"` //订单产品名称
19 OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价 19 OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价
20 - OrderGoodQuantity int `json:"orderGoodQuantity"` //订单产品数量 20 + OrderGoodQuantity float64 `json:"orderGoodQuantity"` //订单产品数量
21 } `json:"orderGoods"` //货品 21 } `json:"orderGoods"` //货品
22 DividendsReturnedDate int64 `json:"dividendsReturnedDate"` //退货日期 22 DividendsReturnedDate int64 `json:"dividendsReturnedDate"` //退货日期
23 OrderTime int64 `json:"orderTime"` //订单日期 23 OrderTime int64 `json:"orderTime"` //订单日期
@@ -62,8 +62,8 @@ type DividendsOrderGoods struct { @@ -62,8 +62,8 @@ type DividendsOrderGoods struct {
62 OrderGoodExpense float64 `json:"orderGoodExpense"` //订单产品费用 62 OrderGoodExpense float64 `json:"orderGoodExpense"` //订单产品费用
63 OrderGoodName string `json:"orderGoodName"` //订单产品名称 63 OrderGoodName string `json:"orderGoodName"` //订单产品名称
64 OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价 64 OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价
65 - OrderGoodQuantity int `json:"orderGoodQuantity,string"` //订单产品数量  
66 - OrderGoodDividendsStatus int32 `json:"orderGoodDividendsStatus"` // 订单产品分红状态， 1待分红，2已分红 65 + OrderGoodQuantity float64 `json:"orderGoodQuantity,string"` //订单产品数量
  66 + OrderGoodDividendsStatus int32 `json:"orderGoodDividendsStatus"` //订单产品分红状态， 1待分红，2已分红
67 } 67 }
68 68
69 type ( 69 type (
@@ -76,7 +76,7 @@ type ( @@ -76,7 +76,7 @@ type (
76 OrderGoodExpense float64 `json:"orderGoodExpense"` //订单产品费用 76 OrderGoodExpense float64 `json:"orderGoodExpense"` //订单产品费用
77 OrderGoodName string `json:"orderGoodName"` //订单产品名称 77 OrderGoodName string `json:"orderGoodName"` //订单产品名称
78 OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价 78 OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价
79 - OrderGoodQuantity int `json:"orderGoodQuantity"` //订单产品数量 79 + OrderGoodQuantity float64 `json:"orderGoodQuantity"` //订单产品数量
80 OrderGoodDividendsStatus int32 `json:"orderGoodDividendsStatus"` // 订单产品分红状态， 1待分红，2已分红 80 OrderGoodDividendsStatus int32 `json:"orderGoodDividendsStatus"` // 订单产品分红状态， 1待分红，2已分红
81 } 81 }
82 //订单产品 82 //订单产品
@@ -10,7 +10,7 @@ type ( @@ -10,7 +10,7 @@ type (
10 OrderGoodAmount float64 `json:"orderGoodAmount"` //订单产品金额 10 OrderGoodAmount float64 `json:"orderGoodAmount"` //订单产品金额
11 OrderGoodName string `json:"orderGoodName"` //订单产品名称 11 OrderGoodName string `json:"orderGoodName"` //订单产品名称
12 OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价 12 OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价
13 - OrderGoodQuantity int `json:"orderGoodQuantity,string"` //订单产品数量 13 + OrderGoodQuantity float64 `json:"orderGoodQuantity,string"` //订单产品数量
14 OrderGoodDividendsStatus int `json:"orderGoodDividendsStatus"` // 订单产品分红状态， 1待分红，2已分红 14 OrderGoodDividendsStatus int `json:"orderGoodDividendsStatus"` // 订单产品分红状态， 1待分红，2已分红
15 } 15 }
16 16
@@ -54,7 +54,7 @@ type ( @@ -54,7 +54,7 @@ type (
54 OrderGoodAmount float64 `json:"orderGoodAmount"` //订单产品金额 54 OrderGoodAmount float64 `json:"orderGoodAmount"` //订单产品金额
55 OrderGoodName string `json:"orderGoodName"` //订单产品名称 55 OrderGoodName string `json:"orderGoodName"` //订单产品名称
56 OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价 56 OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价
57 - OrderGoodQuantity int `json:"orderGoodQuantity"` //订单产品数量 57 + OrderGoodQuantity float64 `json:"orderGoodQuantity"` //订单产品数量
58 } 58 }
59 ReqDividendsReturnedOrderAdd struct { 59 ReqDividendsReturnedOrderAdd struct {
60 DividendsReturnedCustomerName string `json:"dividendsReturnedCustomerName"` 60 DividendsReturnedCustomerName string `json:"dividendsReturnedCustomerName"`