fix version 1

This commit is contained in:
2026-09-22 21:15:34 +08:00
parent 9f86366638
commit d63d7e8b3a
277 changed files with 9959 additions and 1514 deletions

View File

@@ -2,9 +2,9 @@ package store
import (
"context"
"time"
pb "bsm/full/module/ec/mall/pb"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/service"
)
@@ -16,14 +16,6 @@ func ApplyJoin(ctx context.Context, in *pb.ApplyJoinRequest) (reply *pb.Identity
return nil, err
}
// TODO: valid code
// TODO: add your logic code & delete this line.
return &pb.IdentityStatusReply{
Code: 0,
Message: "OK",
Timeseq: time.Now().UnixMilli(),
}, nil
// 该接口尚未实现,显式返回未实现错误,避免调用方误判成功。
return nil, errcode.ErrUnimplemented
}

View File

@@ -12,7 +12,7 @@ import (
// 获取邮件服务器配置
func GetEmail(ctx context.Context, in *pb.IdentRequest) (reply *pb.ConfigsReply, err error) {
_, err = service.ParseMetaCtx(ctx, nil)
auth, err := service.ParseMetaCtx(ctx, &service.ParseOptions{RoleValue: "Mall_Admin"})
if err != nil {
return nil, err
}
@@ -21,11 +21,21 @@ func GetEmail(ctx context.Context, in *pb.IdentRequest) (reply *pb.ConfigsReply,
return nil, errcode.ErrInvalidArgument
}
// 只能读取当前登录者所属店铺的配置
owner, _ := auth.Owner.(map[string]any)
storeIdentity, _ := owner["store_identity"].(string)
sotre := models.MallStore{}
if err := impl.DBService.Model(&models.MallStore{}).Select("mail_configs").Where("id=? or identity=?", in.GetId(), in.GetIdentity()).Find(&sotre).Error; err != nil {
print(err.Error())
tx := impl.DBService.Model(&models.MallStore{}).Select("mail_configs").
Where("id=? or identity=?", in.GetId(), in.GetIdentity()).
Where("identity = ?", storeIdentity).Find(&sotre)
if tx.Error != nil {
print(tx.Error.Error())
return nil, errcode.ErrDB
}
if storeIdentity == "" || tx.RowsAffected == 0 {
return nil, errcode.ErrPermissionDenied
}
return &pb.ConfigsReply{
Configs: sotre.MailConfigs,

View File

@@ -13,7 +13,7 @@ import (
// 获取支付方式配置
func GetPayment(ctx context.Context, in *pb.IdentRequest) (reply *pb.ConfigsReply, err error) {
// parse authorization meta.
_, err = service.ParseMetaCtx(ctx, nil)
auth, err := service.ParseMetaCtx(ctx, &service.ParseOptions{RoleValue: "Mall_Admin"})
if err != nil {
return nil, err
}
@@ -22,11 +22,21 @@ func GetPayment(ctx context.Context, in *pb.IdentRequest) (reply *pb.ConfigsRepl
return nil, errcode.ErrInvalidArgument
}
// 只能读取当前登录者所属店铺的配置
owner, _ := auth.Owner.(map[string]any)
storeIdentity, _ := owner["store_identity"].(string)
sotre := models.MallStore{}
if err := impl.DBService.Model(&models.MallStore{}).Select("pay_configs").Where("id=? or identity=?", in.GetId(), in.GetIdentity()).Find(&sotre).Error; err != nil {
print(err.Error())
tx := impl.DBService.Model(&models.MallStore{}).Select("pay_configs").
Where("id=? or identity=?", in.GetId(), in.GetIdentity()).
Where("identity = ?", storeIdentity).Find(&sotre)
if tx.Error != nil {
print(tx.Error.Error())
return nil, errcode.ErrDB
}
if storeIdentity == "" || tx.RowsAffected == 0 {
return nil, errcode.ErrPermissionDenied
}
return &pb.ConfigsReply{Configs: sotre.PayConfigs}, nil

View File

@@ -8,20 +8,36 @@ import (
"bsm/full/module/ec/mall/internal/models"
pb "bsm/full/module/ec/mall/pb"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/service"
)
// 获取店铺基础配置
func GetSetting(ctx context.Context, in *pb.IdentRequest) (reply *pb.StoreBasic, err error) {
// parse authorization meta.
auth, err := service.ParseMetaCtx(ctx, &service.ParseOptions{RoleValue: "Mall_Admin"})
if err != nil {
return nil, err
}
// valildate request id,identity.
if in.Id == 0 && in.Identity == "" {
return nil, errcode.ErrInvalidArgument
}
// 只能读取当前登录者所属店铺的配置
owner, _ := auth.Owner.(map[string]any)
storeIdentity, _ := owner["store_identity"].(string)
var data models.MallStore
if err := impl.DBService.Where("id=? or identity=?", in.GetId(), in.GetIdentity()).First(&data).Error; err != nil {
print(err.Error())
tx := impl.DBService.Where("id=? or identity=?", in.GetId(), in.GetIdentity()).
Where("identity = ?", storeIdentity).Find(&data)
if tx.Error != nil {
print(tx.Error.Error())
return nil, errcode.ErrDB
}
// TODO: add your logic code & delete this line.
if storeIdentity == "" || tx.RowsAffected == 0 {
return nil, errcode.ErrPermissionDenied
}
return &pb.StoreBasic{
Id: int64(data.ID),

View File

@@ -9,10 +9,17 @@ import (
"bsm/full/module/ec/mall/internal/models"
pb "bsm/full/module/ec/mall/pb"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/service"
)
// 店铺许可授权
func Licensing(ctx context.Context, in *pb.LicensingRequest) (reply *pb.IdentityStatusReply, err error) {
// 要求调用者已登录,避免仅凭子域名匿名枚举店铺标识。
auth, err := service.ParseMetaCtx(ctx, nil)
if err != nil {
return nil, err
}
var identity string
licenseType := strings.ToUpper(in.GetLicenseType())
@@ -22,12 +29,17 @@ func Licensing(ctx context.Context, in *pb.LicensingRequest) (reply *pb.Identity
default:
return nil, errcode.ErrInvalidArgument
}
// TODO: valid code
if identity == "" {
return nil, errcode.ErrNotFound(404, "store not found")
}
// TODO: add your logic code & delete this line.
// 归属校验:调用者只能是该店铺的成员,避免店铺标识被枚举获取。
// 说明完整许可码校验in.License/in.LicenseType需要许可数据源当前仓库内不存在暂无法实现。
owner, _ := auth.Owner.(map[string]any)
storeIdentity, _ := owner["store_identity"].(string)
if storeIdentity == "" || storeIdentity != identity {
return nil, errcode.ErrPermissionDenied
}
return &pb.IdentityStatusReply{
Code: 0,

View File

@@ -4,6 +4,7 @@ import (
"context"
pb "bsm/full/module/ec/mall/pb"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/service"
)
@@ -15,9 +16,6 @@ func MiniCode(ctx context.Context, in *pb.MiniCodeRequest) (reply *pb.MiniCodeRe
return nil, err
}
// TODO: valid code
// TODO: add your logic code & delete this line.
return
// 该接口尚未实现,显式返回未实现错误,避免调用方误判成功。
return nil, errcode.ErrUnimplemented
}

View File

@@ -36,7 +36,7 @@ func Search(ctx context.Context, in *pb.MallSearchRequest) (reply *pb.MallSearch
offset = (pageNo - 1) * pageSize
}
var data []*models.MallStore
if err := impl.DBService.Model(&models.MallStore{}).Where("keyword = ?", in.GetKeyword()).Order("created_at desc").Count(&cnt).
if err := impl.DBService.Model(&models.MallStore{}).Where("keywords like ?", "%"+in.GetKeyword()+"%").Order("created_at desc").Count(&cnt).
Offset(int(offset)).Limit(int(pageSize)).Find(&data).Error; err != nil {
printer.Error(err.Error())
return nil, errcode.ErrDB

View File

@@ -14,7 +14,7 @@ import (
// 设置邮件服务器配置
func SetEmail(ctx context.Context, in *pb.SettingRequest) (reply *pb.IdentityStatusReply, err error) {
_, err = service.ParseMetaCtx(ctx, nil)
auth, err := service.ParseMetaCtx(ctx, &service.ParseOptions{RoleValue: "Mall_Admin"})
if err != nil {
return nil, err
}
@@ -23,10 +23,21 @@ func SetEmail(ctx context.Context, in *pb.SettingRequest) (reply *pb.IdentitySta
return nil, errcode.ErrInvalidArgument
}
if err := impl.DBService.Model(&models.MallStore{}).Where("identity = ?", in.GetIdentity()).Update("mail_configs", in.GetConfigs()).Error; err != nil {
printer.Error(err.Error())
// 只能修改当前登录者所属店铺的配置
owner, _ := auth.Owner.(map[string]any)
storeIdentity, _ := owner["store_identity"].(string)
if storeIdentity == "" || in.GetIdentity() != storeIdentity {
return nil, errcode.ErrPermissionDenied
}
tx := impl.DBService.Model(&models.MallStore{}).Where("identity = ?", in.GetIdentity()).Update("mail_configs", in.GetConfigs())
if tx.Error != nil {
printer.Error(tx.Error.Error())
return nil, errcode.ErrDB
}
if tx.RowsAffected == 0 {
return nil, errcode.ErrPermissionDenied
}
return &pb.IdentityStatusReply{
Code: 0,

View File

@@ -14,7 +14,7 @@ import (
// 设置支付方式配置
func SetPayment(ctx context.Context, in *pb.SettingRequest) (reply *pb.IdentityStatusReply, err error) {
_, err = service.ParseMetaCtx(ctx, nil)
auth, err := service.ParseMetaCtx(ctx, &service.ParseOptions{RoleValue: "Mall_Admin"})
if err != nil {
return nil, err
}
@@ -23,10 +23,21 @@ func SetPayment(ctx context.Context, in *pb.SettingRequest) (reply *pb.IdentityS
return nil, errcode.ErrInvalidArgument
}
if err := impl.DBService.Model(&models.MallStore{}).Where("identity = ?", in.GetIdentity()).Update("pay_configs", in.GetConfigs()).Error; err != nil {
printer.Error(err.Error())
// 只能修改当前登录者所属店铺的配置
owner, _ := auth.Owner.(map[string]any)
storeIdentity, _ := owner["store_identity"].(string)
if storeIdentity == "" || in.GetIdentity() != storeIdentity {
return nil, errcode.ErrPermissionDenied
}
tx := impl.DBService.Model(&models.MallStore{}).Where("identity = ?", in.GetIdentity()).Update("pay_configs", in.GetConfigs())
if tx.Error != nil {
printer.Error(tx.Error.Error())
return nil, errcode.ErrDB
}
if tx.RowsAffected == 0 {
return nil, errcode.ErrPermissionDenied
}
return &pb.IdentityStatusReply{
Code: 0,

View File

@@ -8,13 +8,14 @@ import (
"bsm/full/module/ec/mall/internal/models"
pb "bsm/full/module/ec/mall/pb"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/printer"
"git.apinb.com/bsm-sdk/core/service"
)
// 设置店铺基础配置
func SetSetting(ctx context.Context, in *pb.StoreBasic) (reply *pb.IdentityStatusReply, err error) {
// parse authorization meta.
_, err = service.ParseMetaCtx(ctx, &service.ParseOptions{RoleValue: "Mall_Admin"})
auth, err := service.ParseMetaCtx(ctx, &service.ParseOptions{RoleValue: "Mall_Admin"})
if err != nil {
return nil, err
}
@@ -22,6 +23,13 @@ func SetSetting(ctx context.Context, in *pb.StoreBasic) (reply *pb.IdentityStatu
return nil, errcode.ErrInvalidArgument
}
// 只能修改当前登录者所属店铺的配置,禁止凭请求参数改他人店铺
owner, _ := auth.Owner.(map[string]any)
storeIdentity, _ := owner["store_identity"].(string)
if storeIdentity == "" || in.GetIdentity() != storeIdentity {
return nil, errcode.ErrPermissionDenied
}
data := &models.MallStore{
Logo: in.Logo,
Title: in.Title,
@@ -31,12 +39,15 @@ func SetSetting(ctx context.Context, in *pb.StoreBasic) (reply *pb.IdentityStatu
Configs: in.Configs,
}
if err := impl.DBService.Model(&models.MallStore{}).Where("id=? or identity=?", in.GetId(), in.GetIdentity()).Updates(data).Error; err != nil {
print(err.Error())
tx := impl.DBService.Model(&models.MallStore{}).Where("identity = ?", storeIdentity).Updates(data)
if tx.Error != nil {
printer.Error(tx.Error.Error())
return nil, errcode.ErrDB
}
if tx.RowsAffected == 0 {
return nil, errcode.ErrPermissionDenied
}
// TODO: add your logic code & delete this line.
return &pb.IdentityStatusReply{
Code: 0,
Message: "OK",