up
This commit is contained in:
@@ -591,7 +591,7 @@ func getAddressInfoFromCoord(db *dao.DaoDB, lng, lat float64) (formattedAddress
|
|||||||
}
|
}
|
||||||
|
|
||||||
func AddUserDeliveryAddress(ctx *jxcontext.Context, address *model.UserDeliveryAddress) (outAddress *model.UserDeliveryAddress, err error) {
|
func AddUserDeliveryAddress(ctx *jxcontext.Context, address *model.UserDeliveryAddress) (outAddress *model.UserDeliveryAddress, err error) {
|
||||||
globals.SugarLogger.Debugf("AddUserDeliveryAddress address:%s", utils.Format4Output(address, true))
|
globals.SugarLogger.Debugf("AddUserDeliveryAddress1 address:%s", utils.Format4Output(address, true))
|
||||||
if address.UserID == "" {
|
if address.UserID == "" {
|
||||||
return nil, fmt.Errorf("操作用户配送地址时必须指定UserID")
|
return nil, fmt.Errorf("操作用户配送地址时必须指定UserID")
|
||||||
}
|
}
|
||||||
@@ -600,6 +600,7 @@ func AddUserDeliveryAddress(ctx *jxcontext.Context, address *model.UserDeliveryA
|
|||||||
lat := address.Lat
|
lat := address.Lat
|
||||||
address.AutoAddress, address.DistrictCode, address.CityCode, err = getAddressInfoFromCoord(db, lng, lat)
|
address.AutoAddress, address.DistrictCode, address.CityCode, err = getAddressInfoFromCoord(db, lng, lat)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
|
globals.SugarLogger.Debugf("AddUserDeliveryAddress2 address:%s", utils.Format4Output(address, true))
|
||||||
dao.Begin(db)
|
dao.Begin(db)
|
||||||
defer func() {
|
defer func() {
|
||||||
if r := recover(); r != nil {
|
if r := recover(); r != nil {
|
||||||
@@ -621,13 +622,16 @@ func AddUserDeliveryAddress(ctx *jxcontext.Context, address *model.UserDeliveryA
|
|||||||
dao.Rollback(db)
|
dao.Rollback(db)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
globals.SugarLogger.Debugf("AddUserDeliveryAddress3 address:%s", utils.Format4Output(address, true))
|
||||||
return outAddress, err
|
return outAddress, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func AddMyDeliveryAddress(ctx *jxcontext.Context, address *model.UserDeliveryAddress) (outAddress *model.UserDeliveryAddress, err error) {
|
func AddMyDeliveryAddress(ctx *jxcontext.Context, address *model.UserDeliveryAddress) (outAddress *model.UserDeliveryAddress, err error) {
|
||||||
globals.SugarLogger.Debugf("AddMyDeliveryAddress address:%s", utils.Format4Output(address, true))
|
globals.SugarLogger.Debugf("AddMyDeliveryAddress address:%s", utils.Format4Output(address, true))
|
||||||
_, address.UserID = ctx.GetMobileAndUserID()
|
_, address.UserID = ctx.GetMobileAndUserID()
|
||||||
return AddUserDeliveryAddress(ctx, address)
|
outAddress, err = AddUserDeliveryAddress(ctx, address)
|
||||||
|
globals.SugarLogger.Debugf("AddMyDeliveryAddress2 address:%s, err:%v", utils.Format4Output(address, true), err)
|
||||||
|
return outAddress, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func DeleteUserDeliveryAddress(ctx *jxcontext.Context, userID string, addressID int) (err error) {
|
func DeleteUserDeliveryAddress(ctx *jxcontext.Context, userID string, addressID int) (err error) {
|
||||||
|
|||||||
Reference in New Issue
Block a user