zzw/lone-services
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

order
CI / changes (push) Successful in 38s
Details
CI / ad (push) Successful in 32s
Details
CI / admin (push) Successful in 27s
Details
CI / bff (push) Successful in 23s
Details
CI / chore (push) Successful in 24s
Details
CI / equipment (push) Successful in 26s
Details
CI / express (push) Successful in 24s
Details
CI / factory (push) Successful in 22s
Details
CI / payment (push) Successful in 24s
Details
CI / product (push) Successful in 24s
Details
CI / record (push) Successful in 23s
Details
CI / sale (push) Successful in 26s
Details
CI / task (push) Successful in 25s
Details
CI / user (push) Successful in 26s
Details
CI / wecom (push) Successful in 26s
Details

Browse Source
This commit is contained in:
高纪胜
2026-09-16 16:39:14 +08:00
parent 9af9cc6059
commit 647abf73f6
12 changed files with 789 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/redis/redis.go
+1
View File
@@ -9,6 +9,7 @@ import (
)
const Nil = goredis.Nil
const RedisNil = "redis: nil"
var Client *goredis.Client
pkg/utils/status.go
+14
View File
@@ -73,6 +73,20 @@ const (
StatusWaitPass = 9 //待审核
RpcTimeOut = 5000 //服务连接超时时间 毫秒
StoreApplyReview = 1 // 提交审核（按钮消息）
StoreNeedReview = 2 // 通知申请人
StoreSubmitReview = 3 // 通知一审人员
StoreFirstReview = 4 // 一审审核结果
StoreSecondReview = 5 // 二审审核结果
SaleType = 1
AdminType = 2
EditLogTypeProduct = 1 // 产品
EditLogTypeStore = 2 // 门店
EditLogTypeAddress = 3 // 地址
EditLogTypeSales = 4 // 销售
)
const (
rpc/store/pb/store.pb.go
+605 -135
View File
File diff suppressed because it is too large Load Diff
rpc/store/pb/store_grpc.pb.go
+81 -5
View File
@@ -44,6 +44,8 @@ const (
Store_WebDepositCreate_FullMethodName = "/store.Store/WebDepositCreate"
Store_WebDepositItems_FullMethodName = "/store.Store/WebDepositItems"
Store_SetDef_FullMethodName = "/store.Store/SetDef"
Store_GetInfoById_FullMethodName = "/store.Store/GetInfoById"
Store_GetInfoByIds_FullMethodName = "/store.Store/GetInfoByIds"
)
// StoreClient is the client API for Store service.
@@ -67,7 +69,7 @@ type StoreClient interface {
DepositDone(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error)
DepositIgnore(ctx context.Context, in *DepositIgnoreRequest, opts ...grpc.CallOption) (*Response, error)
DepositVerify(ctx context.Context, in *DepositVerifyRequest, opts ...grpc.CallOption) (*Response, error)
DepositDown(ctx context.Context, in *DepositItemsRequest, opts ...grpc.CallOption) (*Response, error)
DepositDown(ctx context.Context, in *DepositItemsRequest, opts ...grpc.CallOption) (*ExcelExportResponse, error)
DepositItems(ctx context.Context, in *DepositItemsRequest, opts ...grpc.CallOption) (*Response, error)
DepositIgnoreItems(ctx context.Context, in *DepositVerifyRequest, opts ...grpc.CallOption) (*Response, error)
DepositRecover(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error)
@@ -75,6 +77,8 @@ type StoreClient interface {
WebDepositCreate(ctx context.Context, in *WebDepositCreateRequest, opts ...grpc.CallOption) (*Response, error)
WebDepositItems(ctx context.Context, in *WebDepositItemsRequest, opts ...grpc.CallOption) (*Response, error)
SetDef(ctx context.Context, in *EmptyRequest, opts ...grpc.CallOption) (*Response, error)
GetInfoById(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*InfoResponse, error)
GetInfoByIds(ctx context.Context, in *IdsRequest, opts ...grpc.CallOption) (*ItemsResponse, error)
}
type storeClient struct {
@@ -255,9 +259,9 @@ func (c *storeClient) DepositVerify(ctx context.Context, in *DepositVerifyReques
return out, nil
}
func (c *storeClient) DepositDown(ctx context.Context, in *DepositItemsRequest, opts ...grpc.CallOption) (*Response, error) {
func (c *storeClient) DepositDown(ctx context.Context, in *DepositItemsRequest, opts ...grpc.CallOption) (*ExcelExportResponse, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(Response)
out := new(ExcelExportResponse)
err := c.cc.Invoke(ctx, Store_DepositDown_FullMethodName, in, out, cOpts...)
if err != nil {
return nil, err
@@ -335,6 +339,26 @@ func (c *storeClient) SetDef(ctx context.Context, in *EmptyRequest, opts ...grpc
return out, nil
}
func (c *storeClient) GetInfoById(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*InfoResponse, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(InfoResponse)
err := c.cc.Invoke(ctx, Store_GetInfoById_FullMethodName, in, out, cOpts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *storeClient) GetInfoByIds(ctx context.Context, in *IdsRequest, opts ...grpc.CallOption) (*ItemsResponse, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(ItemsResponse)
err := c.cc.Invoke(ctx, Store_GetInfoByIds_FullMethodName, in, out, cOpts...)
if err != nil {
return nil, err
}
return out, nil
}
// StoreServer is the server API for Store service.
// All implementations must embed UnimplementedStoreServer
// for forward compatibility.
@@ -356,7 +380,7 @@ type StoreServer interface {
DepositDone(context.Context, *IdRequest) (*Response, error)
DepositIgnore(context.Context, *DepositIgnoreRequest) (*Response, error)
DepositVerify(context.Context, *DepositVerifyRequest) (*Response, error)
DepositDown(context.Context, *DepositItemsRequest) (*Response, error)
DepositDown(context.Context, *DepositItemsRequest) (*ExcelExportResponse, error)
DepositItems(context.Context, *DepositItemsRequest) (*Response, error)
DepositIgnoreItems(context.Context, *DepositVerifyRequest) (*Response, error)
DepositRecover(context.Context, *IdRequest) (*Response, error)
@@ -364,6 +388,8 @@ type StoreServer interface {
WebDepositCreate(context.Context, *WebDepositCreateRequest) (*Response, error)
WebDepositItems(context.Context, *WebDepositItemsRequest) (*Response, error)
SetDef(context.Context, *EmptyRequest) (*Response, error)
GetInfoById(context.Context, *IdRequest) (*InfoResponse, error)
GetInfoByIds(context.Context, *IdsRequest) (*ItemsResponse, error)
mustEmbedUnimplementedStoreServer()
}
@@ -425,7 +451,7 @@ func (UnimplementedStoreServer) DepositIgnore(context.Context, *DepositIgnoreReq
func (UnimplementedStoreServer) DepositVerify(context.Context, *DepositVerifyRequest) (*Response, error) {
return nil, status.Error(codes.Unimplemented, "method DepositVerify not implemented")
}
func (UnimplementedStoreServer) DepositDown(context.Context, *DepositItemsRequest) (*Response, error) {
func (UnimplementedStoreServer) DepositDown(context.Context, *DepositItemsRequest) (*ExcelExportResponse, error) {
return nil, status.Error(codes.Unimplemented, "method DepositDown not implemented")
}
func (UnimplementedStoreServer) DepositItems(context.Context, *DepositItemsRequest) (*Response, error) {
@@ -449,6 +475,12 @@ func (UnimplementedStoreServer) WebDepositItems(context.Context, *WebDepositItem
func (UnimplementedStoreServer) SetDef(context.Context, *EmptyRequest) (*Response, error) {
return nil, status.Error(codes.Unimplemented, "method SetDef not implemented")
}
func (UnimplementedStoreServer) GetInfoById(context.Context, *IdRequest) (*InfoResponse, error) {
return nil, status.Error(codes.Unimplemented, "method GetInfoById not implemented")
}
func (UnimplementedStoreServer) GetInfoByIds(context.Context, *IdsRequest) (*ItemsResponse, error) {
return nil, status.Error(codes.Unimplemented, "method GetInfoByIds not implemented")
}
func (UnimplementedStoreServer) mustEmbedUnimplementedStoreServer() {}
func (UnimplementedStoreServer) testEmbeddedByValue() {}
@@ -920,6 +952,42 @@ func _Store_SetDef_Handler(srv interface{}, ctx context.Context, dec func(interf
return interceptor(ctx, in, info, handler)
}
func _Store_GetInfoById_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(IdRequest)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(StoreServer).GetInfoById(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: Store_GetInfoById_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(StoreServer).GetInfoById(ctx, req.(*IdRequest))
}
return interceptor(ctx, in, info, handler)
}
func _Store_GetInfoByIds_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(IdsRequest)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(StoreServer).GetInfoByIds(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: Store_GetInfoByIds_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(StoreServer).GetInfoByIds(ctx, req.(*IdsRequest))
}
return interceptor(ctx, in, info, handler)
}
// Store_ServiceDesc is the grpc.ServiceDesc for Store service.
// It's only intended for direct use with grpc.RegisterService,
// and not to be introspected or modified (even as a copy)
@@ -1027,6 +1095,14 @@ var Store_ServiceDesc = grpc.ServiceDesc{
MethodName: "SetDef",
Handler: _Store_SetDef_Handler,
},
{
MethodName: "GetInfoById",
Handler: _Store_GetInfoById_Handler,
},
{
MethodName: "GetInfoByIds",
Handler: _Store_GetInfoByIds_Handler,
},
},
Streams: []grpc.StreamDesc{},
Metadata: "store/store.proto",
rpc/store/store.pb
BIN
View File
Binary file not shown.
rpc/store/store.proto
+55 -8
View File
@@ -10,6 +10,9 @@ message EmptyRequest {
message IdRequest {
int64 id = 1;
}
message IdsRequest {
repeated int64 id = 1;
}
message StatusRequest {
int64 id = 1;
@@ -46,7 +49,7 @@ message EditRequest {
string latitude_wgs84 = 20;
string longitude_gcj02 = 21;
string latitude_gcj02 = 22;
int64 store_type = 23;
repeated string store_type = 23;
int64 province = 24;
string province_name = 25;
int64 city = 26;
@@ -81,7 +84,7 @@ message CreateRequest {
string latitude_wgs84 = 23;
string longitude_gcj02 = 24;
string latitude_gcj02 = 25;
int64 store_type = 26;
repeated string store_type = 26;
int64 province = 27;
string province_name = 28;
int64 city = 29;
@@ -90,6 +93,42 @@ message CreateRequest {
string county_name = 32;
}
message InfoResponse {
int64 id = 1;
string user_mobile = 2;
string name = 3;
string id_card = 4;
string receipt = 5;
int32 type = 6;
string area = 7;
string store_images = 8;
string district_ids = 9;
string address = 10;
string bank_info = 11;
string user_name = 12;
string business_license = 13;
string images = 14;
int64 sale_id = 15;
string contact = 16;
string content = 17;
string open_time = 18;
string longitude_wgs84 = 19;
string latitude_wgs84 = 20;
string longitude_gcj02 = 21;
string latitude_gcj02 = 22;
repeated string store_type = 23;
int64 province = 24;
string province_name = 25;
int64 city = 26;
string city_name = 27;
int64 county = 28;
string county_name = 29;
}
message ItemsResponse {
repeated InfoResponse items = 1;
}
message ToSaleRequest {
int64 id = 1;
int64 sale_id = 2;
@@ -127,14 +166,14 @@ message ApplyEditRequest {
message DepositItemsRequest {
string name = 1;
int32 page = 2;
int32 size = 3;
int32 status = 4;
int32 page = 2;
int32 size = 3;
int32 status = 4;
}
message DepositVerifyRequest {
string name = 1;
int32 page = 2;
int32 size = 3;
int32 page = 2;
int32 size = 3;
}
message DepositIgnoreRequest {
int64 id = 1;
@@ -156,6 +195,12 @@ message WebDepositItemsRequest {
int32 size = 2;
}
message ExcelExportResponse {
bytes data = 1; // excel二进制
string name = 2;
string msg = 3;
}
service Store {
rpc Status(StatusRequest) returns(Response){
option (google.api.http) = {
@@ -263,7 +308,7 @@ service Store {
};
}
rpc DepositDown(DepositItemsRequest) returns (Response) {
rpc DepositDown(DepositItemsRequest) returns (ExcelExportResponse) {
option (google.api.http) = {
get: "/admin/v3/store/deposit/down"
body: "*"
@@ -312,4 +357,6 @@ service Store {
}
rpc SetDef(EmptyRequest) returns (Response);
rpc GetInfoById(IdRequest) returns (InfoResponse);
rpc GetInfoByIds(IdsRequest) returns (ItemsResponse);
}
services/order/internal/logic/base.go
+28
View File
@@ -1,10 +1,12 @@
package logic
import (
"lone-services/pkg/modelbase"
"lone-services/pkg/utils"
"lone-services/pkg/validate"
order "lone-services/rpc/order/pb"
"reflect"
"strconv"
jsoniter "github.com/json-iterator/go"
)
@@ -46,3 +48,29 @@ func (l *BaseLogic) ok(data any) (*order.Response, error) {
buf, _ := jsoniter.Marshal(data)
return &order.Response{Code: utils.Ok.Code, Msg: utils.Ok.Msg, Data: string(buf)}, nil
}
func (s BaseLogic) SetWhere(w *modelbase.Params, u utils.UserInfo) {
if u.Type == utils.SaleType {
s.SetGroupWhere(w, u, false)
}
}
func (s BaseLogic) SetGroupWhere(w *modelbase.Params, u utils.UserInfo, checkProvince bool) {
if w.Eq == nil {
w.Eq = make(map[string]string)
}
if u.GroupId < utils.NumberOne {
return
}
//如果是公司销售
if u.Type == utils.SaleType {
w.Eq["group_id"] = strconv.Itoa(int(u.GroupId))
} else if u.SaleProvince > utils.NumberZero {
if checkProvince {
w.Eq["sale_province"] = strconv.Itoa(int(u.SaleProvince))
} else {
w.Eq["group_id"] = strconv.Itoa(int(u.GroupId))
}
}
}
services/order/internal/logic/itemsLogic.go
+2
View File
@@ -81,6 +81,8 @@ func (l *ItemsLogic) Items(in *order.OrderItemsRequest) (*order.Response, error)
w.Other["create_time < ?"] = strconv.Itoa(int(in.Time[utils.NumberOne]))
}
l.SetWhere(&w, adminInfo)
items, err := model.OrderModel{}.Init().Page(w, &info)
if err != nil {
l.Logger.Error(err)
services/sale/run.toml
-59
View File
@@ -1,59 +0,0 @@
[base]
login_out_time=43200 #api接口超时时间分
login_refresh_out_time=83200
name = "sale-service"
listenOn = "0.0.0.0:10300"
mode = "dev"
[log]
path = "logs"
serviceName = "sale-service"
mode = "file"
encoding = "plain"
level = "info"
keepDays = 7
maxSize = 50
maxBackups = 5
compress = false
[oss]
accessKeyId = "LTAI5t7U8KvxSiPE5auwQUuu"
accessKeySecret = "xjfgbQQRpL4TcIspNuClg6bYADa3pk"
roleArn = "acs:ram::1663896742753915:role/oss-upload"
roleSessionName = "oss-upload"
region = "oss-cn-hangzhou"
bucketName = "lone-images"
endpoint = "https://oss-accelerate.aliyuncs.com"
host = "https://images.ailuowan.com"
dir = "upload/"
expireSeconds = 3600
[mysql]
host = '39.106.171.204'
port = 33066
user = 'root'
password = 'MOLXRZNOU4Y4'
database = 'dms-sale'
charset = 'utf8mb4'
prefix = ''
debug = true
[mysql_read]
host = '39.106.171.204'
port = 33066
user = 'root'
password = 'MOLXRZNOU4Y4'
database = 'dms-sale'
charset = 'utf8mb4'
prefix = ''
[redis]
host = '39.106.171.204'
password = 'lLMLcuPpzSj'
port = 6379
db = 0
[encrypt]
data_key = "u2t9T3luZtoRfhBstkFN6TiIMW38BA8a"
[services]
chore = "chore-service"
user = "user-service"
services/store/internal/model/salesPersonHistory.go → services/store/internal/model/saleChangeHistory.go
View File
services/user/.gitignore
+1
View File
@@ -1,2 +1,3 @@
run.toml
etc/user.yaml
tmp