diff --git a/controller/cb_goods_stock.go b/controller/cb_goods_stock.go index fab27fa..98355d4 100644 --- a/controller/cb_goods_stock.go +++ b/controller/cb_goods_stock.go @@ -132,7 +132,7 @@ func CooperativeExportDataGameCardGoodsStock(c *gin.Context) { return } -// 1.创建调拨 +// 1.创建调拨 func CooperativeCannibalizeTaskCreate(c *gin.Context) { req := struct { FromStoreId uint32 `json:"from_store_id"` @@ -179,7 +179,7 @@ func CooperativeCannibalizeTaskCreate(c *gin.Context) { RespOK(c, nil) } -// 2.导入调拨卡 +// 2.导入调拨卡 func CooperativeCannibalizeTaskImportGoods(c *gin.Context) { req := struct { CannibalizeStockTaskId uint32 `json:"cannibalize_stock_task_id"` @@ -310,13 +310,21 @@ func CooperativeCannibalizeTaskList(c *gin.Context) { RespJson(c, status.Unauthorized, nil) return } - assistant := model.GetUserByUid(uc.Uid) - if assistant.UserType != 2 { - logger.Error("not assistant") - RespJson(c, status.InternalServerError, nil) + //assistant := model.GetUserByUid(uc.Uid) + //if assistant.UserType != 2 { + // logger.Error("not assistant") + // RespJson(c, status.InternalServerError, nil) + // return + //} + //req.StoreId = uint32(assistant.StoreId) + + effectiveStoreInfo, err := model.GetUserEffectiveStore(uc.Uid) + if err != nil { + RespJson(c, status.BadRequest, err) return } - req.StoreId = uint32(assistant.StoreId) + + req.StoreId = uint32(effectiveStoreInfo.StoreID) if req.StoreId == 0 { RespJson(c, status.BadRequest, nil) return diff --git a/controller/user.go b/controller/user.go index cc6de8b..57badc6 100644 --- a/controller/user.go +++ b/controller/user.go @@ -1218,7 +1218,7 @@ func InviteMemberReportList(c *gin.Context) { RespJson(c, status.InternalServerError, nil) return } - list, totalPage, err := req.List() + list, totalPage, count, err := req.List() if err != nil { logger.Errorf("err:%#v", err) RespJson(c, status.InternalServerError, nil) @@ -1229,6 +1229,7 @@ func InviteMemberReportList(c *gin.Context) { List: list, CurPage: req.PageNum, TotalPage: totalPage, + Count: count, } RespOK(c, ret) diff --git a/model/user.go b/model/user.go index c474e93..4594ce9 100644 --- a/model/user.go +++ b/model/user.go @@ -271,7 +271,7 @@ func GetUserEffectiveStore(uid uint32) (*StoreInfo, error) { user := new(SysUser) if err := NewSysUserQuerySet(DB).UidEq(uid).One(user); err != nil { logger.Error("Error:", err, "UID:", uid) - return nil, err + return &StoreInfo{}, err } var userStores []StoreInfo @@ -279,7 +279,7 @@ func GetUserEffectiveStore(uid uint32) (*StoreInfo, error) { var stores []Store err := NewStoreQuerySet(DB).CooperativeBusinessIdEq(user.CooperativeBusinessId).All(&stores) if err != nil { - return nil, err + return &StoreInfo{}, err } for _, item := range stores { @@ -293,11 +293,11 @@ func GetUserEffectiveStore(uid uint32) (*StoreInfo, error) { } else { // 普通用户 // 解析门店数据 if err := json.Unmarshal([]byte(user.StoreData), &userStores); err != nil { - return nil, err + return &StoreInfo{}, err } if len(userStores) == 0 { - return nil, errors.New("no stores found") + return &StoreInfo{}, errors.New("no stores found") } } @@ -1153,16 +1153,17 @@ type InviteMemberReportListReq struct { type InviteMemberReportListResp struct { CurPage int `json:"cur_page"` TotalPage int `json:"total_page"` + Count int `json:"count"` // 总记录数 List []InviteMemberReport `json:"list"` } -func (m *InviteMemberReportListReq) List() ([]InviteMemberReport, int, error) { +func (m *InviteMemberReportListReq) List() ([]InviteMemberReport, int, int, error) { var memberReport []InviteMemberReport qs := NewInviteMemberReportQuerySet(DB).UidEq(m.Uid) count, err := qs.Count() if err != nil { logger.Error("err:", err) - return memberReport, 0, err + return memberReport, 0, 0, err } page := m.PageNum - 1 if page < 0 { @@ -1176,7 +1177,7 @@ func (m *InviteMemberReportListReq) List() ([]InviteMemberReport, int, error) { err = qs.Offset(page * m.PageSize).Limit(m.PageSize).OrderDescByID().All(&memberReport) if err != nil && err != RecordNotFound { logger.Error("err:", err) - return memberReport, totalPage, err + return memberReport, totalPage, count, err } assistant := GetUserByUid(m.Uid) @@ -1197,7 +1198,7 @@ func (m *InviteMemberReportListReq) List() ([]InviteMemberReport, int, error) { memberReport[len(memberReport)-1].DeductAmount += report.BlackGoldCount * report.BlackGoldDeduct } - return memberReport, totalPage, nil + return memberReport, totalPage, count, nil } func GetUserMap(ids []uint32) (map[uint32]*User, error) { diff --git a/pack/configs/dev/server.json b/pack/configs/dev/server.json index 98af85e..d52008d 100644 --- a/pack/configs/dev/server.json +++ b/pack/configs/dev/server.json @@ -1,6 +1,6 @@ { "server": { - "port": 8001 + "port": 6001 }, "jwt": { "user": { @@ -23,11 +23,11 @@ }, "db": { "driver": "mysql", - "host": "112.33.14.191", + "host": "39.108.188.218", "port": 3306, - "user": "mh_dev", - "password": "d9qy46ONI0ZTF9eH", - "db_name": "mh_dev" + "user": "mh_new_pro", + "password": "YnzexdTfBHMSGZki", + "db_name": "mh_new_pro" }, "wx": { "app_id": "wx806c079463b5b56c",