Merge remote-tracking branch 'origin/master'

src/api/act/act-coupon-record.ts

@@ -0,0 +1,40 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+	return request({
+		url: "/wallet/act-coupon-record/page",
+		method: "get",
+		params: query,
+	})
+}
+
+export function addObj(obj?: Object) {
+	return request({
+		url: "/wallet/act-coupon-record",
+		method: "post",
+		data: obj,
+	})
+}
+
+export function getObj(id?: string) {
+	return request({
+		url: "/wallet/act-coupon-record/" + id,
+		method: "get",
+	})
+}
+
+export function delObjs(ids?: Object) {
+	return request({
+		url: "/wallet/act-coupon-record",
+		method: "delete",
+		data: ids,
+	})
+}
+
+export function putObj(obj?: Object) {
+	return request({
+		url: "/wallet/act-coupon-record",
+		method: "put",
+		data: obj,
+	})
+}

src/api/act/act-coupon.ts

@@ -0,0 +1,40 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+	return request({
+		url: "/wallet/act-coupon/page",
+		method: "get",
+		params: query,
+	})
+}
+
+export function addObj(obj?: Object) {
+	return request({
+		url: "/wallet/act-coupon",
+		method: "post",
+		data: obj,
+	})
+}
+
+export function getObj(id?: string) {
+	return request({
+		url: "/wallet/act-coupon/" + id,
+		method: "get",
+	})
+}
+
+export function delObjs(ids?: Object) {
+	return request({
+		url: "/wallet/act-coupon",
+		method: "delete",
+		data: ids,
+	})
+}
+
+export function putObj(obj?: Object) {
+	return request({
+		url: "/wallet/act-coupon",
+		method: "put",
+		data: obj,
+	})
+}

src/api/hard/hard-third-mi-order.ts

@@ -1,5 +1,13 @@
 import request from "/@/utils/request"
 
+export function refundOrder(params: any) {
+	return request({
+		url: "/hard/hard-third-mi-order/refund",
+		method: "get",
+		params,
+	})
+}
+
 export function refreshOrder(params: any) {
 	return request({
 		url: "/hard/hard-third-mi-order/refresh",

src/api/hard/hard-total.ts

@@ -27,7 +27,7 @@ export function productTotalByDept(query: any) {
 }
 
 /**
- * 食堂统计
+ * 食堂统计(按天)
  */
 export function canteenProudctTotal(query: any) {
 	return request({
@@ -41,6 +41,21 @@ export function canteenProudctTotal(query: any) {
 	})
 }
 
+/**
+ * 食堂统计(按月)
+ */
+export function canteenProudctTotalByMonth(query: any) {
+	return request({
+		url: "/hard/hard-canteen-total-log/proudct-total-by-month",
+		method: "post",
+		params: {
+			current: query.current,
+			size: query.size,
+		},
+		data: query,
+	})
+}
+
 /**
  * 食堂统计
  */
@@ -99,3 +114,15 @@ export function pageListCs(query?: any) {
 		data: query,
 	})
 }
+
+export function pageListCsByMonth(query?: any) {
+	return request({
+		url: "/hard/hard-total/page-list-cs-by-month",
+		method: "post",
+		params: {
+			current: query.current,
+			size: query.size,
+		},
+		data: query,
+	})
+}

src/api/integrated/app-version.ts

@@ -0,0 +1,40 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+	return request({
+		url: "/integrated/app-version/page",
+		method: "get",
+		params: query,
+	})
+}
+
+export function addObj(obj?: Object) {
+	return request({
+		url: "/integrated/app-version",
+		method: "post",
+		data: obj,
+	})
+}
+
+export function getObj(id?: string) {
+	return request({
+		url: "/integrated/app-version/" + id,
+		method: "get",
+	})
+}
+
+export function delObjs(ids?: Object) {
+	return request({
+		url: "/integrated/app-version",
+		method: "delete",
+		data: ids,
+	})
+}
+
+export function putObj(obj?: Object) {
+	return request({
+		url: "/integrated/app-version",
+		method: "put",
+		data: obj,
+	})
+}