From 3269a059a7f77cac3606e942e95ca247f09d9e32 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Thu, 24 Oct 2019 10:27:07 +0800
Subject: [PATCH] =?UTF-8?q?UserDeliveryAddress=E6=B7=BB=E5=8A=A0DetailAddr?=
 =?UTF-8?q?ess?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/user.go   | 7 ++++---
 controllers/cms_user2.go | 9 +++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/business/model/user.go b/business/model/user.go
index 3f475a3df..5a4b52ac3 100644
--- a/business/model/user.go
+++ b/business/model/user.go
@@ -116,9 +116,10 @@ type UserDeliveryAddress struct {
 	Tag             string  `orm:"size(32)" json:"tag"`
 	ConsigneeName   string  `orm:"size(32)" json:"consigneeName"`
 	ConsigneeMobile string  `orm:"size(32)" json:"consigneeMobile"`
-	Address         string  `orm:"size(255)" json:"address"`          // 这个是用户手输入的详细地址
-	Lng             float64 `orm:"digits(10);decimals(6)" json:"lng"` // 乘了10的6次方
-	Lat             float64 `orm:"digits(10);decimals(6)" json:"lat"` // 乘了10的6次方
+	Address         string  `orm:"size(255)" json:"address"`       // 地址(区县以下，门牌号以上的地址信息)
+	DetailAddress   string  `orm:"size(255)" json:"detailAddress"` // 门牌号
+	Lng             float64 `orm:"digits(10);decimals(6)" json:"lng"`
+	Lat             float64 `orm:"digits(10);decimals(6)" json:"lat"`
 
 	AutoAddress  string `orm:"size(255)" json:"autoAddress"`        // 这个是通过坐标自动获取的结构化的地址
 	CityCode     int    `orm:"default(0);null" json:"cityCode"`     // 根据坐标获得
diff --git a/controllers/cms_user2.go b/controllers/cms_user2.go
index 17a2a7e30..83b1658f6 100644
--- a/controllers/cms_user2.go
+++ b/controllers/cms_user2.go
@@ -255,19 +255,19 @@ func (c *User2Controller) TransferLegacyWeixins() {
 // @Param	token			header		string	true	"认证token"
 // @Param	consigneeName	formData	string	true	"收货人"
 // @Param	consigneeMobile	formData	string	true	"收货人手机"
-// @Param	address			formData	string	true	"详细地址"
+// @Param	address			formData	string	false	"地址(区县以下，门牌号以上的地址信息)"
+// @Param	detailAddress	formData	string	false	"门牌号"
 // @Param	lng				formData	float64	true	"经度"
 // @Param	lat				formData	float64	true	"纬度"
 // @Param	tag				formData	string	false	"标签"
 // @Param	remark			formData	string	false	"备注"
-// @Param	isDefault		formData	bool	false	"是否是默认"
+// @Param	isDefault		formData	int		false	"是否是默认"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /AddMyDeliveryAddress [post]
 func (c *User2Controller) AddMyDeliveryAddress() {
 	c.callAddMyDeliveryAddress(func(params *tUser2AddMyDeliveryAddressParams) (retVal interface{}, errCode string, err error) {
 		var address *model.UserDeliveryAddress
-		params.MapData["isDefault"] = utils.Bool2Int(params.IsDefault)
 		if err = utils.Map2StructByJson(params.MapData, &address, true); err == nil {
 			retVal, err = cms.AddMyDeliveryAddress(params.Ctx, address)
 		}
@@ -295,7 +295,8 @@ func (c *User2Controller) DeleteMyDeliveryAddress() {
 // @Param	addressID		formData	int		true	"地址ID"
 // @Param	consigneeName	formData	string	false	"收货人"
 // @Param	consigneeMobile	formData	string	false	"收货人手机"
-// @Param	address			formData	string	false	"详细地址"
+// @Param	address			formData	string	false	"地址(区县以下，门牌号以上的地址信息)"
+// @Param	detailAddress	formData	string	false	"门牌号"
 // @Param	lng				formData	float64	false	"经度"
 // @Param	lat				formData	float64	false	"纬度"
 // @Param	tag				formData	string	false	"标签"