From 43752954aee06c66c1a2504cd259b788c95ff960 Mon Sep 17 00:00:00 2001
From: eson <9673575+githubcontent@user.noreply.gitee.com>
Date: Wed, 27 Sep 2023 15:37:02 +0800
Subject: [PATCH 1/4] info get profile
---
server/info/internal/logic/addressaddlogic.go | 1 +
1 file changed, 1 insertion(+)
diff --git a/server/info/internal/logic/addressaddlogic.go b/server/info/internal/logic/addressaddlogic.go
index dc291724..606dea84 100644
--- a/server/info/internal/logic/addressaddlogic.go
+++ b/server/info/internal/logic/addressaddlogic.go
@@ -85,6 +85,7 @@ func (l *AddressAddLogic) AddressAdd(req *types.AddressRequest, userinfo *auth.U
}
return resp.SetStatus(basic.CodeOK, map[string]any{
+ "address_id": address.AddressId,
"address_list": addresses,
}) // 返回成功并返回地址ID
From 89e8b4cff97dac1eb2e4d9aea7599523e647e822 Mon Sep 17 00:00:00 2001
From: eson <9673575+githubcontent@user.noreply.gitee.com>
Date: Wed, 27 Sep 2023 15:46:35 +0800
Subject: [PATCH 2/4] info get profile
---
model/gmodel/fs_address_gen.go | 1 -
model/gmodel/fs_address_logic.go | 8 ++++----
server/info/internal/logic/addressdeletelogic.go | 4 +++-
server/info/internal/logic/addressupdatelogic.go | 2 +-
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/model/gmodel/fs_address_gen.go b/model/gmodel/fs_address_gen.go
index c2c8c448..83a4b3b9 100644
--- a/model/gmodel/fs_address_gen.go
+++ b/model/gmodel/fs_address_gen.go
@@ -19,7 +19,6 @@ type FsAddress struct {
Country *string `gorm:"default:'';" json:"country"` //
ZipCode *string `gorm:"default:'';" json:"zip_code"` //
Status *int64 `gorm:"default:0;" json:"status"` // 1正常 0异常
- IsDefault *int64 `gorm:"index;default:0;" json:"is_default"` // 1默认地址，0非默认地址
Ctime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"ctime"` // 创建时间
Utime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"utime"` // 更新时间
Ltime *time.Time `gorm:"index;default:'0000-00-00 00:00:00';" json:"ltime"` // 上次被使用的时间
diff --git a/model/gmodel/fs_address_logic.go b/model/gmodel/fs_address_logic.go
index 2efce67b..8b7ae175 100755
--- a/model/gmodel/fs_address_logic.go
+++ b/model/gmodel/fs_address_logic.go
@@ -37,10 +37,10 @@ func (a *FsAddressModel) CreateOne(ctx context.Context, address *FsAddress) (res
Country: address.Country,
ZipCode: address.ZipCode,
Status: address.Status,
- IsDefault: address.IsDefault,
- Ctime: &now,
- Utime: &now,
- Ltime: &now,
+
+ Ctime: &now,
+ Utime: &now,
+ Ltime: &now,
}
// lastOne := &FsAddress{}
diff --git a/server/info/internal/logic/addressdeletelogic.go b/server/info/internal/logic/addressdeletelogic.go
index b2a398ff..d06729ec 100644
--- a/server/info/internal/logic/addressdeletelogic.go
+++ b/server/info/internal/logic/addressdeletelogic.go
@@ -43,7 +43,9 @@ func (l *AddressDeleteLogic) AddressDelete(req *types.AddressIdRequest, userinfo
return resp.SetStatusWithMessage(basic.CodeApiErr, err.Error())
}
- return resp.SetStatus(basic.CodeOK)
+ return resp.SetStatus(basic.CodeOK, map[string]any{
+ "address_id": req.AddressId,
+ }) // 返回成功并返回地址ID
}
// 处理逻辑后 w,r 如:重定向, resp 必须重新处理
diff --git a/server/info/internal/logic/addressupdatelogic.go b/server/info/internal/logic/addressupdatelogic.go
index cc962cbe..572353bc 100644
--- a/server/info/internal/logic/addressupdatelogic.go
+++ b/server/info/internal/logic/addressupdatelogic.go
@@ -49,7 +49,6 @@ func (l *AddressUpdateLogic) AddressUpdate(req *types.AddressRequest, userinfo *
address := gmodel.FsAddress{
AddressId: req.AddressId,
UserId: &userinfo.UserId,
- IsDefault: &req.IsDefault,
FirstName: &req.FirstName,
LastName: &req.LastName,
Mobile: &req.Mobile,
@@ -73,6 +72,7 @@ func (l *AddressUpdateLogic) AddressUpdate(req *types.AddressRequest, userinfo *
}
return resp.SetStatus(basic.CodeOK, map[string]any{
+ "address_id": req.AddressId,
"address_list": addresses,
}) // 返回成功并返回地址ID
From 0a8f3cd5ba1cd347b54f2cd532e204e513eb2c8b Mon Sep 17 00:00:00 2001
From: eson <9673575+githubcontent@user.noreply.gitee.com>
Date: Wed, 27 Sep 2023 15:47:40 +0800
Subject: [PATCH 3/4] info get profile
---
model/gmodel/fs_address_gen.go | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/model/gmodel/fs_address_gen.go b/model/gmodel/fs_address_gen.go
index 83a4b3b9..2feb031b 100644
--- a/model/gmodel/fs_address_gen.go
+++ b/model/gmodel/fs_address_gen.go
@@ -1,8 +1,9 @@
package gmodel
import (
- "gorm.io/gorm"
"time"
+
+ "gorm.io/gorm"
)
// fs_address 用户地址表
From 31b712784f694c3a800ff9b9174f9975f70fe6a7 Mon Sep 17 00:00:00 2001
From: eson <9673575+githubcontent@user.noreply.gitee.com>
Date: Wed, 27 Sep 2023 15:48:13 +0800
Subject: [PATCH 4/4] info get profile
---
server/home-user-auth/internal/logic/useraddaddresslogic.go | 5 +----
server/info/internal/logic/addressaddlogic.go | 6 ++----
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/server/home-user-auth/internal/logic/useraddaddresslogic.go b/server/home-user-auth/internal/logic/useraddaddresslogic.go
index 0fac637f..be56cd5e 100644
--- a/server/home-user-auth/internal/logic/useraddaddresslogic.go
+++ b/server/home-user-auth/internal/logic/useraddaddresslogic.go
@@ -45,8 +45,7 @@ func (l *UserAddAddressLogic) UserAddAddress(req *types.RequestAddAddress, useri
// 如果ID为0, 表示新增地址
if req.Id == 0 {
var (
- country string = "USA" // 国家默认为美国
- isDefautl int64 = 1 // 默认地址为1
+ country string = "USA" // 国家默认为美国
)
createOne := &gmodel.FsAddress{ // 构建FsAddress结构体
FirstName: &req.FirstName,
@@ -60,7 +59,6 @@ func (l *UserAddAddressLogic) UserAddAddress(req *types.RequestAddAddress, useri
Status: &status,
UserId: &userinfo.UserId,
ZipCode: &req.ZipCode,
- IsDefault: &isDefautl,
}
created, err := m.CreateOne(l.ctx, createOne) // 新增地址
if err != nil {
@@ -82,7 +80,6 @@ func (l *UserAddAddressLogic) UserAddAddress(req *types.RequestAddAddress, useri
Status: &status,
UserId: &userinfo.UserId,
ZipCode: &req.ZipCode,
- IsDefault: &req.IsDefault,
}
// 插入数据库 更新地址
diff --git a/server/info/internal/logic/addressaddlogic.go b/server/info/internal/logic/addressaddlogic.go
index 606dea84..b53a3978 100644
--- a/server/info/internal/logic/addressaddlogic.go
+++ b/server/info/internal/logic/addressaddlogic.go
@@ -49,9 +49,8 @@ func (l *AddressAddLogic) AddressAdd(req *types.AddressRequest, userinfo *auth.U
// 如果ID为0, 表示新增地址
var (
- country string = "USA" // 国家默认为美国
- isDefautl int64 = 1 // 默认地址为1
- status int64 = 1 // 默认地址状态为1(正常)
+ country string = "USA" // 国家默认为美国
+ status int64 = 1 // 默认地址状态为1(正常)
)
createOne := &gmodel.FsAddress{ // 构建FsAddress结构体
@@ -66,7 +65,6 @@ func (l *AddressAddLogic) AddressAdd(req *types.AddressRequest, userinfo *auth.U
Status: &status,
UserId: &userinfo.UserId,
ZipCode: &req.ZipCode,
- IsDefault: &isDefautl,
}
address, err := m.CreateOne(l.ctx, createOne) // 新增地址
if err != nil {