This commit is contained in:
邹宗楠
2022-04-13 09:18:02 +08:00
parent aa6fe33435
commit 43dfe84d36

View File

@@ -317,42 +317,42 @@ func (c *OrderManager) ExportMTWaybills(ctx *jxcontext.Context, fromDateStr, toD
func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fromDateStr, toDateStr string, isDateFinish bool, skuIDs []int, isJxFirst bool, params map[string]interface{}, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) { func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fromDateStr, toDateStr string, isDateFinish bool, skuIDs []int, isJxFirst bool, params map[string]interface{}, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
var db = dao.GetDB() var db = dao.GetDB()
//权限 //权限
//if permission.IsRoled(ctx) { if permission.IsRoled(ctx) {
// // 查询用户门店 // 查询用户门店
//configs, _ := dao.QueryConfigs(dao.GetDB(), "checkversion", model.ConfigTypeSys, "") //configs, _ := dao.QueryConfigs(dao.GetDB(), "checkversion", model.ConfigTypeSys, "")
//storeIdInterface, _, err := cms.GetMyStoreListNew(ctx, configs[0].Value) //storeIdInterface, _, err := cms.GetMyStoreListNew(ctx, configs[0].Value)
//if err != nil { //if err != nil {
// return nil, err // return nil, err
//} //}
//fmt.Println(storeIdInterface) //fmt.Println(storeIdInterface)
// if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil { if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil {
// var storeIDs2 []int var storeIDs2 []int
// if params["storeIDs"] != nil { if params["storeIDs"] != nil {
// var storeIDs []int var storeIDs []int
// if err = utils.UnmarshalUseNumber([]byte(params["storeIDs"].(string)), &storeIDs); err == nil { if err = utils.UnmarshalUseNumber([]byte(params["storeIDs"].(string)), &storeIDs); err == nil {
// for _, v := range storeIDs { for _, v := range storeIDs {
// if storeIDsMap[v] != 0 { if storeIDsMap[v] != 0 {
// storeIDs2 = append(storeIDs2, v) storeIDs2 = append(storeIDs2, v)
// } }
// } }
// } }
// if len(storeIDs2) == 0 { if len(storeIDs2) == 0 {
// storeIDs2 = append(storeIDs2, -1) storeIDs2 = append(storeIDs2, -1)
// } }
// } else { } else {
// if len(storeIDsMap) > 0 { if len(storeIDsMap) > 0 {
// for k, _ := range storeIDsMap { for k, _ := range storeIDsMap {
// storeIDs2 = append(storeIDs2, k) storeIDs2 = append(storeIDs2, k)
// } }
// } else { } else {
// storeIDs2 = append(storeIDs2, -1) storeIDs2 = append(storeIDs2, -1)
// } }
// } }
// if data, err := json.Marshal(storeIDs2); err == nil { if data, err := json.Marshal(storeIDs2); err == nil {
// params["storeIDs"] = string(data) params["storeIDs"] = string(data)
// } }
// } }
//} }
//if isJxIncomeArea { //if isJxIncomeArea {
// begin = utils.MustInterface2Int64(params["jxIncomeBegin"]) // begin = utils.MustInterface2Int64(params["jxIncomeBegin"])
// end = utils.MustInterface2Int64(params["jxIncomeEnd"]) // end = utils.MustInterface2Int64(params["jxIncomeEnd"])