order address apis

services/order/validator/address.go

@@ -4,28 +4,33 @@ import "lone-services/pkg/validate"
 
 // AddressDefValidator 查看列表
 type AddressDefValidator struct {
-	Id int64 `validate:"required"`
+	Id   int64 `validate:"required"`
+	Type int32 `validate:"required,oneof=1 2 3"` //类型 1门店 , 2销售，3为用户
 }
 
 // GetMessage 查看列表 - 提示消息
 func (p AddressDefValidator) GetMessage() validate.ValidatorMessages {
 	return validate.ValidatorMessages{
-		"Id.required": "Id不能为空",
+		"Id.required":   "Id不能为空",
+		"Type.required": "类型不能为空",
+		"Type.oneof":    "类型不对",
 	}
 }
 
 // AddressStatusValidator 查看列表
 type AddressStatusValidator struct {
-	Id     int64 `validate:"required"`
-	Status int32 `validate:"required,oneof=1 2"`
+	Id     int64  `validate:"required"`
+	Status int32  `validate:"required,oneof=1 2"`
+	Reason string `validate:"required_if=Status 2"`
 }
 
 // GetMessage 查看列表 - 提示消息
 func (p AddressStatusValidator) GetMessage() validate.ValidatorMessages {
 	return validate.ValidatorMessages{
-		"Id.required":     "Id不能为空",
-		"Status.required": "状态不能为空",
-		"Status.oneof":    "状态不对",
+		"Id.required":        "Id不能为空",
+		"Status.required":    "状态不能为空",
+		"Status.oneof":       "状态不对",
+		"Reason.required_if": "理由不能为空",
 	}
 }
 
@@ -34,7 +39,7 @@ type AddressEditValidator struct {
 	District    string `validate:"required"`
 	Address     string `validate:"required"`
 	Name        string `validate:"required"`
-	Mobile      string `validate:"required"`
+	Mobile      string `validate:"required,mobile"`
 	DistrictIds string `validate:"required"`
 	Type        int32  `validate:"required,oneof=1 2 3"` //类型 1门店 , 2销售，3为用户
 	Default     bool
@@ -47,6 +52,7 @@ func (p AddressEditValidator) GetMessage() validate.ValidatorMessages {
 		"Address.required":     "地址不能为空",
 		"Name.required":        "姓名不能为空",
 		"Mobile.required":      "手机不能为空",
+		"Mobile.mobile":        "手机号不对",
 		"DistrictIds.required": "区域ID不能为空",
 		"Type.required":        "类型不能为空",
 		"Type.oneof":           "类型不对",
@@ -67,3 +73,16 @@ type AdminAddressItemsValidator struct {
 func (p AdminAddressItemsValidator) GetMessage() validate.ValidatorMessages {
 	return validate.ValidatorMessages{}
 }
+
+type WebAddressItemsValidator struct {
+	Type int32 `validate:"required,oneof=1 2 3"` //类型 1门店 , 2销售，3为用户
+
+}
+
+// GetMessage 查看列表 - 提示消息
+func (p WebAddressItemsValidator) GetMessage() validate.ValidatorMessages {
+	return validate.ValidatorMessages{
+		"Type.required": "类型不能为空",
+		"Type.oneof":    "类型不对",
+	}
+}

services/order/validator/cart.go

@@ -4,10 +4,28 @@ import "lone-services/pkg/validate"
 
 // CartEditValidator 查看列表
 type CartEditValidator struct {
-	Info string
+	Info string `validate:"required"`
+	Type int32  `validate:"required,oneof=1 2 3"` //类型 1门店 , 2销售，3为用户
 }
 
 // GetMessage 查看列表 - 提示消息
 func (p CartEditValidator) GetMessage() validate.ValidatorMessages {
-	return validate.ValidatorMessages{}
+	return validate.ValidatorMessages{
+		"Info.required": "类型不能为空",
+		"Type.required": "类型不能为空",
+		"Type.oneof":    "类型不对",
+	}
+}
+
+type CartValidator struct {
+	Type int32 `validate:"required,oneof=1 2 3"` //类型 1门店 , 2销售，3为用户
+
+}
+
+// GetMessage 查看列表 - 提示消息
+func (p CartValidator) GetMessage() validate.ValidatorMessages {
+	return validate.ValidatorMessages{
+		"Type.required": "类型不能为空",
+		"Type.oneof":    "类型不对",
+	}
 }