store wise orders change

This commit is contained in:
Suriya
2026-07-21 09:25:30 +05:30
parent 36f9cf86e7
commit b7af245910
6 changed files with 114 additions and 20 deletions

View File

@@ -209,6 +209,14 @@ func (ctl *DeliveriesController) GetDeliveries(c *fiber.Ctx) error {
stat := c.Query("status")
keyword := c.Query("keyword")
if pid == 0 && tid == 0 && uid == 0 && cid == 0 && aid == 0 && aud == 0 {
return c.Status(http.StatusBadRequest).JSON(fiber.Map{
"code": http.StatusBadRequest,
"message": "At least one of tenantid, partnerid, customerid, applocationid, userid or appuserid is required",
"status": false,
})
}
info := models.DeliveryQuery{
Partnerid: pid,
Tenantid: tid,

View File

@@ -100,8 +100,13 @@ func (ctl *OrderController) GetOrders(c *fiber.Ctx) error {
orders, err = ctl.orderService.GetUserOrders(stat, fdate, tdate, uid, pageno, pagesize, keyword)
} else {
// All orders
orders, err = ctl.orderService.GetAllOrders(stat, fdate, tdate, pageno, pagesize, keyword)
// No scoping id supplied (tenantid/partnerid/customerid/applocationid/appuserid).
// Refuse instead of silently returning every order in the database.
return c.Status(http.StatusBadRequest).JSON(fiber.Map{
"status": false,
"code": http.StatusBadRequest,
"message": "At least one of tenantid, partnerid, customerid, applocationid or appuserid is required",
})
}
if err != nil {
@@ -129,6 +134,14 @@ func (ctl *OrderController) GetOrderSummary(c *fiber.Ctx) error {
fdate := c.Query("fromdate")
tdate := c.Query("todate")
if tid == 0 && pid == 0 && cid == 0 && lid == 0 {
return c.Status(http.StatusBadRequest).JSON(fiber.Map{
"code": http.StatusBadRequest,
"message": "At least one of tenantid, partnerid, customerid or locationid is required",
"status": false,
})
}
data, err := ctl.orderService.GetOrderSummary(tid, pid, cid, lid, fdate, tdate)
if err != nil {
return c.Status(http.StatusConflict).JSON(fiber.Map{
@@ -151,6 +164,14 @@ func (ctl *OrderController) GetlocationOrderSummary(c *fiber.Ctx) error {
tenantIDStr := c.Query("tenantid")
tenantID, _ := strconv.Atoi(tenantIDStr)
if tenantID == 0 {
return c.Status(http.StatusBadRequest).JSON(fiber.Map{
"status": false,
"code": http.StatusBadRequest,
"message": "tenantid is required",
})
}
data, err := ctl.orderService.GetLocationOrderSummary(tenantID)
if err != nil {
return c.Status(http.StatusInternalServerError).JSON(fiber.Map{
@@ -336,6 +357,14 @@ func (ctl *OrderController) GetCustomerOrders(c *fiber.Ctx) error {
}
offset := (pageNo - 1) * pageSize
if customerID == "" {
return c.Status(http.StatusBadRequest).JSON(fiber.Map{
"code": http.StatusBadRequest,
"status": false,
"message": "customerid is required",
})
}
orders, err := ctl.orderService.GetCustomerOrdersv3(customerID, tenantID, moduleID, fromDate, toDate, orderStatus, keyword, pageSize, offset)
if err != nil {
log.Println("GetCustomerOrders error:", err)

View File

@@ -21,6 +21,15 @@ func (ctl *PartnerController) GetActiveRiders(c *fiber.Ctx) error {
aid, _ := strconv.Atoi(c.Query("applocationid"))
uid, _ := strconv.Atoi(c.Query("userid"))
tid, _ := strconv.Atoi(c.Query("tenantid"))
if pid == 0 && aid == 0 && uid == 0 && tid == 0 {
return c.Status(http.StatusBadRequest).JSON(fiber.Map{
"status": false,
"code": http.StatusBadRequest,
"message": "At least one of tenantid, partnerid, applocationid or userid is required",
})
}
result, err := ctl.partnerService.GetActiveRiders(pid, aid, uid, tid)
if err != nil {
@@ -113,7 +122,15 @@ func (ctl *PartnerController) GetRiderLogs(c *fiber.Ctx) error {
pid, _ := strconv.Atoi(c.Query("partnerid"))
aid, _ := strconv.Atoi(c.Query("applocationid"))
fdate := c.Query("fromdate")
tdate := c.Query("fromdate")
tdate := c.Query("todate")
if pid == 0 && aid == 0 {
return c.Status(http.StatusBadRequest).JSON(fiber.Map{
"status": false,
"code": http.StatusBadRequest,
"message": "At least one of partnerid or applocationid is required",
})
}
data, err := ctl.partnerService.GetRiderLogs(pid, aid, fdate, tdate)

View File

@@ -25,6 +25,14 @@ func (ctl *UserController) GetAllUsers(c *fiber.Ctx) error {
pagesize, _ := strconv.Atoi(c.Query("pagesize", "10"))
keyword := c.Query("keyword", "")
if tenantID == 0 {
return c.Status(http.StatusBadRequest).JSON(fiber.Map{
"code": http.StatusBadRequest,
"message": "tenantid is required",
"status": false,
})
}
users, err := ctl.userService.GetAllUsers(roleID, tenantID, pageno, pagesize, keyword)
if err != nil {
return c.Status(http.StatusInternalServerError).JSON(fiber.Map{