From 85e5ae4a27b21fe3ddabc7d5a6080c87f86b8f3e Mon Sep 17 00:00:00 2001
From: liulei <1024028220@qq.com>
Date: Sun, 11 Sep 2022 14:18:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=B8=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/user2.go   | 6 +++++-
 controllers/user2_controller.go | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go
index 618c1a62c..110231b2a 100644
--- a/business/jxstore/cms/user2.go
+++ b/business/jxstore/cms/user2.go
@@ -414,7 +414,11 @@ func AddUserDeliveryAddress(ctx *jxcontext.Context, address *model.UserDeliveryA
 	db := dao.GetDB()
 	lng := address.Lng
 	lat := address.Lat
-	address.AutoAddress, address.DistrictCode, address.CityCode, err = getAddressInfoFromCoord(db, lng, lat)
+	autoAddress := ""
+	autoAddress, address.DistrictCode, address.CityCode, err = getAddressInfoFromCoord(db, lng, lat)
+	if address.AutoAddress == "" {
+		address.AutoAddress = autoAddress
+	}
 	if err == nil {
 		globals.SugarLogger.Debugf("AddUserDeliveryAddress2 address:%s", utils.Format4Output(address, true))
 		txDB, _ := dao.Begin(db)
diff --git a/controllers/user2_controller.go b/controllers/user2_controller.go
index c1d729daf..8078b22eb 100644
--- a/controllers/user2_controller.go
+++ b/controllers/user2_controller.go
@@ -119,6 +119,7 @@ func (c *User2Controller) GetUser() {
 // @Param	remark			formData	string	false	"备注"
 // @Param	isDefault		formData	int		false	"是否是默认"
 // @Param	type			formData	int		false	"1为寄件人，2为取件人（收货人）"
+// @Param	autoAddress	    formData	string	false	"详细地址"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /AddMyDeliveryAddress [post]
@@ -139,6 +140,7 @@ func (c *User2Controller) AddMyDeliveryAddress() {
 			Remark:          params.Remark,
 			IsDefault:       int8(params.IsDefault),
 			Type:            params.Type,
+			AutoAddress: params.AutoAddress,
 		}
 		retVal, err = cms.AddMyDeliveryAddress(params.Ctx, address)
 		return retVal, "", err