Skip to content

Commit d30151a

Browse files
MikaelemmmmMikaelemmmm
authored
Merge pull request #118 from Mikaelemmmm/dev
upgrade go-zero and update mode;
2 parents a8fd82c + 60661d0 commit d30151a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+3637
-1989
lines changed

‎app/order/cmd/rpc/etc/order.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Redis:
2323
Host: redis:6379
2424
Type: node
2525
Pass: G62m50oigInC30sf
26+
Key : order-rpc
2627
DB:
2728
DataSource: root:PXDN93VRKUm8TeE7@tcp(mysql:3306)/looklook_order?charset=utf8mb4&parseTime=true&loc=Asia%2FShanghai
2829
Cache:

‎app/order/cmd/rpc/internal/logic/userHomestayOrderListLogic.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ func NewUserHomestayOrderListLogic(ctx context.Context, svcCtx *svc.ServiceConte
3030

3131
func (l *UserHomestayOrderListLogic) UserHomestayOrderList(in *pb.UserHomestayOrderListReq) (*pb.UserHomestayOrderListResp, error) {
3232

33-
whereBuilder:= l.svcCtx.HomestayOrderModel.RowBuilder().Where(squirrel.Eq{"user_id":in.UserId})
33+
whereBuilder := l.svcCtx.HomestayOrderModel.SelectBuilder().Where(squirrel.Eq{"user_id": in.UserId})
3434
//There are supported states in the filter, otherwise return all
35-
if in.TraderState >= model.HomestayOrderTradeStateCancel && in.TraderState <= model.HomestayOrderTradeStateExpire {
36-
whereBuilder = whereBuilder.Where(squirrel.Eq{"trade_state":in.TraderState})
35+
if in.TraderState >= model.HomestayOrderTradeStateCancel && in.TraderState <= model.HomestayOrderTradeStateExpire {
36+
whereBuilder = whereBuilder.Where(squirrel.Eq{"trade_state": in.TraderState})
3737
}
3838

39-
list, err := l.svcCtx.HomestayOrderModel.FindPageListByIdDESC(l.ctx,whereBuilder,in.LastId, in.PageSize)
39+
list, err := l.svcCtx.HomestayOrderModel.FindPageListByIdDESC(l.ctx, whereBuilder, in.LastId, in.PageSize)
4040
if err != nil && err != model.ErrNotFound {
4141
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "Failed to get user's homestay order err : %v , in :%+v", err, in)
4242
}

‎app/order/model/homestayOrderModel.go

-198
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
package model
22

33
import (
4-
"context"
5-
"time"
6-
7-
"looklook/common/globalkey"
8-
"looklook/common/xerr"
9-
10-
"github.com/Masterminds/squirrel"
11-
"github.com/pkg/errors"
124
"github.com/zeromicro/go-zero/core/stores/cache"
135
"github.com/zeromicro/go-zero/core/stores/sqlx"
146
)
@@ -20,18 +12,6 @@ type (
2012
// and implement the added methods in customHomestayOrderModel.
2113
HomestayOrderModel interface {
2214
homestayOrderModel
23-
Trans(ctx context.Context, fn func(context context.Context, session sqlx.Session) error) error
24-
RowBuilder() squirrel.SelectBuilder
25-
CountBuilder(field string) squirrel.SelectBuilder
26-
SumBuilder(field string) squirrel.SelectBuilder
27-
DeleteSoft(ctx context.Context, session sqlx.Session, data *HomestayOrder) error
28-
FindOneByQuery(ctx context.Context, rowBuilder squirrel.SelectBuilder) (*HomestayOrder, error)
29-
FindSum(ctx context.Context, sumBuilder squirrel.SelectBuilder) (float64, error)
30-
FindCount(ctx context.Context, countBuilder squirrel.SelectBuilder) (int64, error)
31-
FindAll(ctx context.Context, rowBuilder squirrel.SelectBuilder, orderBy string) ([]*HomestayOrder, error)
32-
FindPageListByPage(ctx context.Context, rowBuilder squirrel.SelectBuilder, page, pageSize int64, orderBy string) ([]*HomestayOrder, error)
33-
FindPageListByIdDESC(ctx context.Context, rowBuilder squirrel.SelectBuilder, preMinId, pageSize int64) ([]*HomestayOrder, error)
34-
FindPageListByIdASC(ctx context.Context, rowBuilder squirrel.SelectBuilder, preMaxId, pageSize int64) ([]*HomestayOrder, error)
3515
}
3616

3717
customHomestayOrderModel struct {
@@ -45,181 +25,3 @@ func NewHomestayOrderModel(conn sqlx.SqlConn, c cache.CacheConf) HomestayOrderMo
4525
defaultHomestayOrderModel: newHomestayOrderModel(conn, c),
4626
}
4727
}
48-
49-
func (m *defaultHomestayOrderModel) DeleteSoft(ctx context.Context, session sqlx.Session, data *HomestayOrder) error {
50-
data.DelState = globalkey.DelStateYes
51-
data.DeleteTime = time.Now()
52-
if err := m.UpdateWithVersion(ctx, session, data); err != nil {
53-
return errors.Wrapf(xerr.NewErrMsg("删除数据失败"), "HomestayOrderModel delete err : %+v", err)
54-
}
55-
return nil
56-
}
57-
58-
func (m *defaultHomestayOrderModel) FindOneByQuery(ctx context.Context, rowBuilder squirrel.SelectBuilder) (*HomestayOrder, error) {
59-
60-
query, values, err := rowBuilder.Where("del_state = ?", globalkey.DelStateNo).ToSql()
61-
if err != nil {
62-
return nil, err
63-
}
64-
65-
var resp HomestayOrder
66-
err = m.QueryRowNoCacheCtx(ctx, &resp, query, values...)
67-
switch err {
68-
case nil:
69-
return &resp, nil
70-
default:
71-
return nil, err
72-
}
73-
}
74-
75-
func (m *defaultHomestayOrderModel) FindSum(ctx context.Context, sumBuilder squirrel.SelectBuilder) (float64, error) {
76-
77-
query, values, err := sumBuilder.Where("del_state = ?", globalkey.DelStateNo).ToSql()
78-
if err != nil {
79-
return 0, err
80-
}
81-
82-
var resp float64
83-
err = m.QueryRowNoCacheCtx(ctx, &resp, query, values...)
84-
switch err {
85-
case nil:
86-
return resp, nil
87-
default:
88-
return 0, err
89-
}
90-
}
91-
92-
func (m *defaultHomestayOrderModel) FindCount(ctx context.Context, countBuilder squirrel.SelectBuilder) (int64, error) {
93-
94-
query, values, err := countBuilder.Where("del_state = ?", globalkey.DelStateNo).ToSql()
95-
if err != nil {
96-
return 0, err
97-
}
98-
99-
var resp int64
100-
err = m.QueryRowNoCacheCtx(ctx, &resp, query, values...)
101-
switch err {
102-
case nil:
103-
return resp, nil
104-
default:
105-
return 0, err
106-
}
107-
}
108-
109-
func (m *defaultHomestayOrderModel) FindAll(ctx context.Context, rowBuilder squirrel.SelectBuilder, orderBy string) ([]*HomestayOrder, error) {
110-
111-
if orderBy == "" {
112-
rowBuilder = rowBuilder.OrderBy("id DESC")
113-
} else {
114-
rowBuilder = rowBuilder.OrderBy(orderBy)
115-
}
116-
117-
query, values, err := rowBuilder.Where("del_state = ?", globalkey.DelStateNo).ToSql()
118-
if err != nil {
119-
return nil, err
120-
}
121-
122-
var resp []*HomestayOrder
123-
err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...)
124-
switch err {
125-
case nil:
126-
return resp, nil
127-
default:
128-
return nil, err
129-
}
130-
}
131-
132-
func (m *defaultHomestayOrderModel) FindPageListByPage(ctx context.Context, rowBuilder squirrel.SelectBuilder, page, pageSize int64, orderBy string) ([]*HomestayOrder, error) {
133-
134-
if orderBy == "" {
135-
rowBuilder = rowBuilder.OrderBy("id DESC")
136-
} else {
137-
rowBuilder = rowBuilder.OrderBy(orderBy)
138-
}
139-
140-
if page < 1 {
141-
page = 1
142-
}
143-
offset := (page - 1) * pageSize
144-
145-
query, values, err := rowBuilder.Where("del_state = ?", globalkey.DelStateNo).Offset(uint64(offset)).Limit(uint64(pageSize)).ToSql()
146-
if err != nil {
147-
return nil, err
148-
}
149-
150-
var resp []*HomestayOrder
151-
err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...)
152-
switch err {
153-
case nil:
154-
return resp, nil
155-
default:
156-
return nil, err
157-
}
158-
}
159-
160-
func (m *defaultHomestayOrderModel) FindPageListByIdDESC(ctx context.Context, rowBuilder squirrel.SelectBuilder, preMinId, pageSize int64) ([]*HomestayOrder, error) {
161-
162-
if preMinId > 0 {
163-
rowBuilder = rowBuilder.Where(" id < ? ", preMinId)
164-
}
165-
166-
query, values, err := rowBuilder.Where("del_state = ?", globalkey.DelStateNo).OrderBy("id DESC").Limit(uint64(pageSize)).ToSql()
167-
if err != nil {
168-
return nil, err
169-
}
170-
171-
var resp []*HomestayOrder
172-
err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...)
173-
switch err {
174-
case nil:
175-
return resp, nil
176-
default:
177-
return nil, err
178-
}
179-
}
180-
181-
//按照id升序分页查询数据，不支持排序
182-
func (m *defaultHomestayOrderModel) FindPageListByIdASC(ctx context.Context, rowBuilder squirrel.SelectBuilder, preMaxId, pageSize int64) ([]*HomestayOrder, error) {
183-
184-
if preMaxId > 0 {
185-
rowBuilder = rowBuilder.Where(" id > ? ", preMaxId)
186-
}
187-
188-
query, values, err := rowBuilder.Where("del_state = ?", globalkey.DelStateNo).OrderBy("id ASC").Limit(uint64(pageSize)).ToSql()
189-
if err != nil {
190-
return nil, err
191-
}
192-
193-
var resp []*HomestayOrder
194-
err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...)
195-
switch err {
196-
case nil:
197-
return resp, nil
198-
default:
199-
return nil, err
200-
}
201-
}
202-
203-
// export logic
204-
func (m *defaultHomestayOrderModel) Trans(ctx context.Context, fn func(ctx context.Context, session sqlx.Session) error) error {
205-
206-
return m.TransactCtx(ctx, func(ctx context.Context, session sqlx.Session) error {
207-
return fn(ctx, session)
208-
})
209-
210-
}
211-
212-
// export logic
213-
func (m *defaultHomestayOrderModel) RowBuilder() squirrel.SelectBuilder {
214-
return squirrel.Select(homestayOrderRows).From(m.table)
215-
}
216-
217-
// export logic
218-
func (m *defaultHomestayOrderModel) CountBuilder(field string) squirrel.SelectBuilder {
219-
return squirrel.Select("COUNT(" + field + ")").From(m.table)
220-
}
221-
222-
// export logic
223-
func (m *defaultHomestayOrderModel) SumBuilder(field string) squirrel.SelectBuilder {
224-
return squirrel.Select("IFNULL(SUM(" + field + "),0)").From(m.table)
225-
}

0 commit comments

Comments
 (0)