minghui/mh_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、租赁卡带列表优化，如果不传门店id则返回空。

Browse Source
This commit is contained in:
chenlin 2025-02-14 16:22:34 +08:00
parent 84fe0da18b
commit e5772d515a
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
model/autogenerated_order.go
View File

@ -2027,6 +2027,10 @@ func (qs OrderCardQuerySet) StoreIdEq(storeId uint32) OrderCardQuerySet {
return qs.w(qs.db.Where("store_id = ?", storeId)) return qs.w(qs.db.Where("store_id = ?", storeId))
} }
func (qs OrderCardQuerySet) StoreIdOrRevertStoreIdEq(storeId uint64) OrderCardQuerySet {
return qs.w(qs.db.Where("store_id = ? or revert_store_id = ?", storeId, storeId))
}
// StoreIdGt is an autogenerated method // StoreIdGt is an autogenerated method
// nolint: dupl // nolint: dupl
func (qs OrderCardQuerySet) StoreIdGt(storeId uint32) OrderCardQuerySet { func (qs OrderCardQuerySet) StoreIdGt(storeId uint32) OrderCardQuerySet {

22
model/game_card.go
View File

@ -919,10 +919,15 @@ func (m *CooperativeRentCardOrderListReq) List() ([]Order, int, error) {
if m.PageSize == 0 { if m.PageSize == 0 {
m.PageSize = 10 m.PageSize = 10
} }
assistant := GetUserByUid(m.AssistantUid)
if m.SerialNumber == "" { if m.StoreId == 0 {
m.StoreId = assistant.StoreId return []Order{}, 0, nil
} }
assistant := GetUserByUid(m.AssistantUid)
//if m.SerialNumber == "" && m.StoreId == 0{
// m.StoreId = assistant.StoreId
//}
if assistant.UserType != 2 { if assistant.UserType != 2 {
return orders, 0, errors.New("not assistant") return orders, 0, errors.New("not assistant")
} }
@ -978,7 +983,16 @@ func (m *CooperativeRentCardOrderListReq) List() ([]Order, int, error) {
qs = qs.CreatedAtLte(m.EndTime) qs = qs.CreatedAtLte(m.EndTime)
} }
if m.StoreId != 0 { if m.StoreId != 0 {
qs = qs.StoreIdEq(m.StoreId) err := NewOrderCardQuerySet(DB).StoreIdOrRevertStoreIdEq(m.StoreId).OrderDescByID().OrderAscByCardStatus().All(&orderCards)
if err != nil {
logger.Error("err:", err)
return orders, 0, err
}
orderIds := make([]uint32, 0)
for i, _ := range orderCards {
orderIds = append(orderIds, orderCards[i].OrderId)
}
qs = qs.IDIn(orderIds...)
} }
count, err := qs.Count() count, err := qs.Count()
if err != nil { if err != nil {