1

controllers/jx_order.go

@@ -10,6 +10,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
 	"git.rosy.net.cn/jx-callback/business/jxstore/permission"
 	"git.rosy.net.cn/jx-callback/business/partner/delivery"
+	"git.rosy.net.cn/jx-callback/business/partner/printer/jxprint"
 	"git.rosy.net.cn/jx-callback/business/partner/purchase/ebai"
 	"strings"
 	"time"
@@ -621,8 +622,8 @@ func (c *OrderController) StoreOrderRank() {
 		if len(storeIdList) == model.NO {
 			storeIdList = dataList
 		}
-		retVal, err = dao.StaticStoreOrderChange(dao.GetDB(), storeIdList, timeList[0], timeList[1], params.Rank, params.Offset, params.PageSize)
-		return retVal, "", err
+		retVal, count, err := dao.StaticStoreOrderChange(dao.GetDB(), storeIdList, timeList[0], timeList[1], params.Rank, params.Offset, params.PageSize)
+		return map[string]interface{}{"data": retVal, "count": count}, "", err
 	})
 }
 
@@ -1679,3 +1680,22 @@ func (c *OrderController) QueryUnansweredInvoice() {
 		return
 	})
 }
+
+// @Title 批量更新店铺开票申请
+// @Description 批量更新店铺开票申请
+// @Param	token			header		string	true	"认证token"
+// @Param	printNo			formData	string	false	"打印机编号"
+// @Param	printKey		formData	string	false	"打印机秘钥"
+// @Param	status			formData	int		false	"激活状态[-1关机/0未连接/1开机]"
+// @Param	isOnline		formData	int		false	"在线装填[-1掉线/0未连接/1链接]"
+// @Param	page			formData	int		true	"跳过数据条数"
+// @Param	size			formData	int		true	"每页展示条数"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /QueryJxPrintList [get]
+func (c *OrderController) QueryJxPrintList() {
+	c.callQueryJxPrintList(func(params *tOrderQueryJxPrintListParams) (retVal interface{}, errCode string, err error) {
+		retVal, err = jxprint.GetPrintList(params.PrintNo, params.PrintKey, params.Status, params.IsOnline, params.Page, params.Size)
+		return
+	})
+}