- paging added for GetStoreOrderInfo.

- GetStoreOrderCountInfo added.

controllers/jx_order.go

@@ -97,23 +97,65 @@ func (c *OrderController) CreateWaybillOnProviders() {
 // @Description 得到门店订单信息
 // @Param	storeID		query	string	true	"京西门店ID"
 // @Param	lastHours	query	int		false	"最近多少小时的信息"
+// @Success 200 {object} business.model.CallResult
+// @Failure 200 {object} business.model.CallResult
+// @router /GetStoreOrderCountInfo [get]
+func (c *OrderController) GetStoreOrderCountInfo() {
+	var (
+		storeID   string
+		lastHours int
+		err       error
+	)
+	storeID = c.GetString("storeID")
+	lastHours, err1 := c.GetInt("lastHours", 0)
+	if storeID != "" && err1 == nil {
+		result, err2 := orderman.FixedOrderManager.GetStoreOrderCountInfo(storeID, lastHours)
+		if err = err2; err == nil {
+			c.Data["json"] = &model.CallResult{
+				Code: "0",
+				Data: string(utils.MustMarshal(result)),
+			}
+		}
+	}
+	errMsg := jxutils.Errs2Str("", err1, err)
+	if storeID == "" {
+		errMsg += "storeID is empty\n"
+	}
+	if errMsg != "" {
+		c.Data["json"] = &model.CallResult{
+			Code: "-1",
+			Desc: errMsg,
+		}
+	}
+	c.ServeJSON()
+}
+
+// @Title 得到门店订单状态信息
+// @Description 得到门店订单状态信息
+// @Param	storeID		query	string	true	"京西门店ID"
+// @Param	lastHours	query	int		false	"最近多少小时的信息"
 // @Param	fromStatus	query	int		true	"起始状态"
 // @Param	toStatus	query	int		false	"起始状态"
+// @Param	offset		query	int		false	"起始状态"
+// @Param	pageSize	query	int		false	"起始状态"
 // @Success 200 {object} business.model.CallResult
 // @Failure 200 {object} business.model.CallResult
 // @router /GetStoreOrderInfo [get]
 func (c *OrderController) GetStoreOrderInfo() {
 	var (
-		storeID                         string
-		lastHours, fromStatus, toStatus int
-		err                             error
+		storeID                                           string
+		lastHours, fromStatus, toStatus, offset, pageSize int
+		err                                               error
 	)
 	storeID = c.GetString("storeID")
 	lastHours, err1 := c.GetInt("lastHours", 0)
 	fromStatus, err2 := c.GetInt("fromStatus", 0)
 	toStatus, err3 := c.GetInt("toStatus", 0)
-	if storeID != "" && err1 == nil && err2 == nil && err3 == nil {
-		result, err2 := orderman.FixedOrderManager.GetStoreOrderInfo(storeID, lastHours, fromStatus, toStatus)
+	offset, err4 := c.GetInt("offset", 0)
+	pageSize, err5 := c.GetInt("pageSize", 0)
+
+	if storeID != "" && err1 == nil && err2 == nil && err3 == nil && err4 == nil && err5 == nil {
+		result, err2 := orderman.FixedOrderManager.GetStoreOrderInfo(storeID, lastHours, fromStatus, toStatus, offset, pageSize)
 		if err = err2; err == nil {
 			c.Data["json"] = &model.CallResult{
 				Code: "0",