Merge remote-tracking branch 'origin/master'

src/api/admin/user.ts

@@ -1,4 +1,4 @@
-import request, {CommonHeaderEnum} from "/@/utils/request"
+import request, { CommonHeaderEnum } from "/@/utils/request"
 
 /**
  * 同步用户食堂信息
@@ -17,6 +17,18 @@ export const list = () => {
 	})
 }
 
+export const pageSelect = (query: any) => {
+	return request({
+		url: "/admin/user/select",
+		method: "post",
+		params: {
+			current: query.current,
+			size: query.size,
+		},
+		data: query,
+	})
+}
+
 export const pageList = (query: any) => {
 	return request({
 		url: "/admin/user/page",
@@ -41,9 +53,9 @@ export const getObj = (id: String) => {
 	return request({
 		url: "/admin/user/details/" + id,
 		method: "get",
-    headers: {
-      [CommonHeaderEnum.ENC_FLAG]: true,
-    },
+		headers: {
+			[CommonHeaderEnum.ENC_FLAG]: true,
+		},
 	})
 }
 

src/api/hard/hard-order.ts

@@ -11,6 +11,13 @@ export function offlinePay(data: any) {
 	})
 }
 
+export function adminRserveCancelOrder(orderId: string) {
+	return request({
+		url: "/hard/hard-order/rserve-cancel-order/" + orderId,
+		method: "put",
+	})
+}
+
 export function pageJoin(query: any) {
 	return request({
 		url: "/hard/hard-order/page-join",

src/api/hard/hard-total.ts

@@ -56,6 +56,21 @@ export function canteenProudctQuery(query: any) {
 	})
 }
 
+/**
+ * 菜品出售商户统计
+ */
+export function canteenProudctMchQuery(query: any) {
+	return request({
+		url: "/hard/hard-canteen-total-log/proudct-mch-query",
+		method: "post",
+		params: {
+			current: query.current,
+			size: query.size,
+		},
+		data: query,
+	})
+}
+
 export function pageListDept(query?: any) {
 	return request({
 		url: "/hard/hard-total/page-list-dept",