Merge remote-tracking branch 'origin/master'

src/api/hard/hard-total.ts

@@ -1,5 +1,20 @@
 import request from "/@/utils/request"
 
+/**
+ * 食堂统计
+ */
+export function canteenProudctTotal(query: any) {
+	return request({
+		url: "/hard/hard-canteen-total-log/proudct-total",
+		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",

src/api/wallet/mch-checkout.ts

@@ -0,0 +1,44 @@
+import request from "/@/utils/request"
+
+export function pageJoin(data: any) {
+	return request({
+		url: "/wallet/mch-checkout/page-join",
+		method: "post",
+		params: {
+			current: data.current,
+			size: data.size,
+		},
+		data: data,
+	})
+}
+
+export function addObj(obj?: Object) {
+	return request({
+		url: "/wallet/mch-checkout",
+		method: "post",
+		data: obj,
+	})
+}
+
+export function getObj(id?: string) {
+	return request({
+		url: "/wallet/mch-checkout/" + id,
+		method: "get",
+	})
+}
+
+export function delObjs(ids?: Object) {
+	return request({
+		url: "/wallet/mch-checkout",
+		method: "delete",
+		data: ids,
+	})
+}
+
+export function putObj(obj?: Object) {
+	return request({
+		url: "/wallet/mch-checkout",
+		method: "put",
+		data: obj,
+	})
+}

src/views/admin/system/sys-user-transaction/index.vue

@@ -68,7 +68,7 @@
 				@sort-change="sortChangeHandle"
 			>
 				<el-table-column type="selection" width="40" align="center" />
-				<el-table-column type="index" label="#" width="40" />
+				<el-table-column type="index" label="#" width="80" />
 				<el-table-column prop="applyUsername" label="申请人" />
 				<el-table-column prop="username" label="调动人" />
 				<el-table-column prop="userMobile" label="调动人手机号" width="120" />

src/views/canteen/canteenCategory/index.vue

@@ -65,6 +65,7 @@
 						<preview-image :src="scope.row.picUrl" />
 					</template>
 				</el-table-column>
+				<el-table-column prop="sort" label="排序" show-overflow-tooltip min-width="100" />
 				<el-table-column prop="createBy" label="创建者" show-overflow-tooltip min-width="100" />
 				<el-table-column prop="updateBy" label="更新者" show-overflow-tooltip min-width="100" />
 				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip min-width="160" />

src/views/hard/canteen-product-total/index.vue

@@ -0,0 +1,156 @@
+<template>
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<DraggableDepTree
+				ref="draggableDepTreeRef"
+				placeholder="请输入部门名称"
+				:show-expand="true"
+				@getSelectNode="handleGetSelectNode"
+				switch-inactive-text="包含"
+				switch-active-text="不包含"
+				:defaultTreeWidth="20"
+				:nodeClickable="false"
+			>
+				<template #default>
+					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+						<el-row>
+							<el-form-item style="width: 250px" label="用餐时间段" prop="hourType">
+								<dict-select v-model="state.queryForm.hourType" dict-code="daily_menu" />
+							</el-form-item>
+							<el-form-item style="width: 450px" label="创建时间" prop="createTimeList">
+								<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD" type="daterange" />
+							</el-form-item>
+							<el-form-item>
+								<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn") }}</el-button>
+								<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
+							</el-form-item>
+						</el-row>
+					</el-form>
+					<el-row>
+						<div class="mb8" style="width: 100%">
+							<right-toolbar
+								:search="false"
+								v-model:showSearch="showSearch"
+								:export="'wallet_walletTransaction_export'"
+								@exportExcel="exportExcel"
+								class="ml10 mr20"
+								style="float: right"
+								@queryTable="getDataList"
+							></right-toolbar>
+						</div>
+					</el-row>
+					<el-table
+						:data="state.dataList"
+						v-loading="state.loading"
+						border
+						:cell-style="tableStyle.cellStyle"
+						:header-cell-style="tableStyle.headerCellStyle"
+						:summary-method="getSummaries"
+						:show-summary="true"
+						@selection-change="selectionChangHandle"
+						@sort-change="sortChangeHandle"
+					>
+						<el-table-column type="selection" width="80" align="center" />
+						<el-table-column type="index" label="#" width="50" />
+						<el-table-column label="用餐时间" align="center" prop="createTime" />
+						<el-table-column label="用餐时间段" align="center" prop="hourType">
+							<template #default="{ row }">
+								<dict-tag :options="daily_menu" :value="row.hourType" />
+							</template>
+						</el-table-column>
+						<el-table-column label="售出商品数量" align="center" prop="payCount">
+							<template #default="{ row }">
+								<span class="color-success"> {{ row.payCount || 0 }}份 </span>
+							</template>
+						</el-table-column>
+						<el-table-column fixed="right" label="操作" width="200">
+							<template #default="{ row }">
+								<el-button icon="Tickets" text type="primary"> 菜品详情 </el-button>
+							</template>
+						</el-table-column>
+					</el-table>
+					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+				</template>
+			</DraggableDepTree>
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts" name="hard-sb">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import * as hardTotalApi from "/@/api/hard/hard-total"
+import { displayPrice } from "/@/utils/formatMoney"
+import { useDict } from "/@/hooks/dict"
+
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+const draggableDepTreeRef = ref() // 树组件ref引用
+
+// 定义查询字典
+const { daily_menu } = useDict("daily_menu")
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+	queryForm: {},
+	pageList: hardTotalApi.canteenProudctTotal,
+})
+
+//  table hook
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, postDownBlobFile, tableStyle } = useTable(state)
+
+// 导出excel
+const exportExcel = () => {
+	postDownBlobFile("/hard/hard-total/export-sb", Object.assign(state.queryForm), "设备交易记录.xlsx")
+}
+
+const getSummaries = (param: any) => {
+	const { columns, data } = param
+	const totalColumns = ["payCount"]
+	const totalRow = Array.from({ length: columns.length })
+	totalRow[0] = "合计"
+	columns.forEach((i: any, index: number) => {
+		if (totalColumns.includes(i.property)) {
+			const total = data
+				.filter((v: any) => v[i.property] != null)
+				.map((v: any) => Number(v[i.property]))
+				.reduce((pren: number, next: number) => pren + next, 0)
+			if (i.property.includes("Price")) {
+				totalRow[index] = displayPrice(total)
+			} else {
+				totalRow[index] = total
+			}
+		}
+	})
+	return totalRow
+}
+
+// 清空搜索条件
+const resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	state.queryForm.deptId = ""
+	state.queryForm.userDeptIds = []
+	draggableDepTreeRef.value.resetData()
+	getDataList()
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
+
+// 树节点选择时
+const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepTree: any) => {
+	state.queryForm.deptId = curClickedNode.id
+	state.queryForm.userDeptIds = checkedTreeNodes.map((item: any) => item.id)
+	state.queryForm.isInclude = !isDeepTree
+	getDataList()
+}
+</script>

src/views/hard/hard-sh/index.vue

@@ -101,6 +101,15 @@
 								</span>
 							</template>
 						</el-table-column>
+						<el-table-column label="操作" align="center" width="120">
+							<template #default="{ row }">
+								<el-tooltip class="box-item" effect="dark" content="只有合作商家能结账" placement="top">
+									<el-button icon="Tickets" text :disabled="row.merchantType != 2" type="primary" @click="doCheckout(row)">
+										商户结账
+									</el-button>
+								</el-tooltip>
+							</template>
+						</el-table-column>
 					</el-table>
 				</template>
 			</DraggableDepTree>
@@ -113,6 +122,8 @@ import { BasicTableProps, useTable } from "/@/hooks/table"
 import { displayPrice } from "/@/utils/formatMoney"
 import * as hardTotalApi from "/@/api/hard/hard-total"
 
+const { push } = useRouter()
+
 // 搜索变量
 const queryRef = ref()
 const showSearch = ref(true)
@@ -136,6 +147,10 @@ const exportExcel = () => {
 	postDownBlobFile("/hard/hard-total/export-cs", Object.assign(state.queryForm), "商户交易记录.xlsx")
 }
 
+const doCheckout = (row: any) => {
+	push({ path: "/mch/mch-checkout/index", query: { mchId: row.merchantId } })
+}
+
 const getSummaries = (param: any) => {
 	const { columns, data } = param
 	const totalColumns = ["totalPayPrice", "totalPayCount", "totalRefundPrice", "totalRefundCount", "totalProfitPrice", "totalProfitCount"]

src/views/mch/mch-checkout/form.vue

@@ -0,0 +1,127 @@
+<template>
+	<el-dialog :title="form.id ? '编辑' : '新增'" width="40%" v-model="visible" :close-on-click-modal="false" draggable>
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="120px" v-loading="loading">
+			<el-row :gutter="24">
+				<el-col :span="24" class="mb20">
+					<el-form-item label="结账时间" prop="checkoutTime">
+						<el-date-picker v-model="form.checkoutTime" value-format="YYYY-MM-DD" placeholder="请选择结账时间" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="商户" prop="merchantId">
+						<select-mch v-model="form.merchantId" :apiParams="{ types: '2' }" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="结账金额(元)" prop="price">
+						<el-input-number v-model="form.price" :min="0" :max="5000000" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="凭证图片" prop="pic">
+						<upload-imgs v-model="form.pic" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="备注" prop="remark">
+						<el-input v-model="form.remark" placeholder="请输入结账备注" type="textarea" :autosize="{ minRows: 6 }" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<template #footer>
+			<span class="dialog-footer">
+				<el-button @click="visible = false">取消</el-button>
+				<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+			</span>
+		</template>
+	</el-dialog>
+</template>
+
+<script setup lang="ts" name="MchCheckoutDialog">
+import { useDict } from "/@/hooks/dict"
+import { useMessage } from "/@/hooks/message"
+import * as mchCheckoutApi from "/@/api/wallet/mch-checkout"
+import { rule } from "/@/utils/validate"
+import { formatDate } from "/@/utils/formatTime"
+const emit = defineEmits(["refresh"])
+
+// 定义变量内容
+const dataFormRef = ref()
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+
+// 提交表单数据
+const form = reactive({
+	id: "",
+	checkoutTime: formatDate(new Date(), "YYYY-mm-dd"),
+	checkoutUserId: "",
+	merchantId: "",
+	price: 0,
+	pic: "",
+	remark: "",
+})
+
+// 定义校验规则
+const dataRules = ref({
+	checkoutTime: [{ required: true, message: "结账时间不能为空", trigger: "blur" }],
+	merchantId: [{ required: true, message: "商户不能为空", trigger: "change" }],
+	price: [{ required: true, message: "结账金额不能为空", trigger: "blur" }],
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+	visible.value = true
+	form.id = ""
+	// 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields()
+	})
+	// 获取mchCheckout信息
+	if (id) {
+		form.id = id
+		getmchCheckoutData(id)
+	}
+}
+
+// 提交
+const onSubmit = async () => {
+	const valid = await dataFormRef.value.validate().catch(() => {})
+	if (!valid) return false
+	try {
+		loading.value = true
+		const _pa = {
+			...form,
+			price: form.price * 100,
+		}
+		form.id ? await mchCheckoutApi.putObj(_pa) : await mchCheckoutApi.addObj(_pa)
+		useMessage().success(form.id ? "修改成功" : "添加成功")
+		visible.value = false
+		emit("refresh")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	} finally {
+		loading.value = false
+	}
+}
+
+// 初始化表单数据
+const getmchCheckoutData = async (id: string) => {
+	// 获取数据
+	loading.value = true
+	try {
+		const { data } = await mchCheckoutApi.getObj(id)
+		Object.assign(form, data, { price: data.price / 100 })
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	} finally {
+		loading.value = false
+	}
+}
+
+// 暴露变量
+defineExpose({
+	openDialog,
+})
+</script>

src/views/mch/mch-checkout/index.vue

@@ -0,0 +1,172 @@
+<template>
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-form v-if="showSearch" ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+				<el-row>
+					<el-form-item style="width: 300px" label="商户" prop="merchantId">
+						<select-mch v-model="state.queryForm.merchantId" :apiParams="{ types: '2' }" />
+					</el-form-item>
+					<el-form-item style="width: 400px" label="结账时间" prop="checkoutTimeList">
+						<el-date-picker v-model="state.queryForm.checkoutTimeList" value-format="YYYY-MM-DD" type="daterange" />
+					</el-form-item>
+					<el-form-item style="width: 400px" label="创建时间" prop="createTimeList">
+						<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD" type="daterange" />
+					</el-form-item>
+					<el-form-item>
+						<el-button icon="Search" type="primary" @click="getDataList">
+							{{ $t("common.queryBtn") }}
+						</el-button>
+						<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
+					</el-form-item>
+				</el-row>
+			</el-form>
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'wallet_mchCheckout_add'">
+						新 增
+					</el-button>
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						v-auth="'wallet_mchCheckout_del'"
+						@click="handleDelete(selectObjs)"
+					>
+						删除
+					</el-button>
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'wallet_mchCheckout_export'"
+						@exportExcel="exportExcel"
+						class="ml10 mr20"
+						style="float: right"
+						@queryTable="getDataList"
+					></right-toolbar>
+				</div>
+			</el-row>
+			<el-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle"
+				@selection-change="selectionChangHandle"
+				@sort-change="sortChangeHandle"
+			>
+				<el-table-column type="selection" width="40" align="center" />
+				<el-table-column type="index" label="#" width="40" />
+				<el-table-column prop="username" label="结账人" />
+				<el-table-column prop="merchantName" label="结账商户" />
+				<el-table-column prop="price" label="结账金额">
+					<template #default="{ row }">
+						<div class="color-success">{{ displayPrice(row.price) }}</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="pic" label="凭证图片">
+					<template #default="{ row }">
+						<preview-image :src="row.pic" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="checkoutTime" label="结账时间" />
+				<el-table-column prop="createTime" label="创建时间" />
+				<el-table-column prop="remark" label="结账备注" width="250" />
+				<el-table-column label="操作" width="150">
+					<template #default="scope">
+						<el-button
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'wallet_mchCheckout_edit'"
+							@click="formDialogRef.openDialog(scope.row.id)"
+						>
+							编辑
+						</el-button>
+						<el-button icon="delete" text type="primary" v-auth="'wallet_mchCheckout_del'" @click="handleDelete([scope.row.id])">
+							删除
+						</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
+
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+	</div>
+</template>
+
+<script setup lang="ts" name="systemMchCheckout">
+import { displayPrice } from "/@/utils/formatMoney"
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import * as mchCheckoutApi from "/@/api/wallet/mch-checkout"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
+
+const { query } = useRoute()
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+// 定义查询字典
+
+// 定义变量内容
+const formDialogRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+	createdIsNeed: false,
+	queryForm: {},
+	pageList: mchCheckoutApi.pageJoin,
+})
+
+//  table hook
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+	downBlobFile("/wallet/mchCheckout/export", Object.assign(state.queryForm, { ids: selectObjs }), "mchCheckout.xlsx")
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
+
+	try {
+		await mchCheckoutApi.delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
+
+onMounted(async () => {
+	const mchId = query.mchId
+	state.queryForm.merchantId = mchId
+	getDataList()
+})
+</script>

src/views/wallet/wallet-manage/change-balance.vue

@@ -7,19 +7,16 @@
 						<el-input v-model="form.id" placeholder="" disabled />
 					</el-form-item>
 				</el-col>
-
 				<el-col :span="24" class="mb20">
 					<el-form-item label="用户昵称" prop="nickname">
 						<el-input v-model="form.nickname" placeholder="" disabled />
 					</el-form-item>
 				</el-col>
-
 				<el-col :span="24" class="mb20">
 					<el-form-item label="变动前余额(元)" prop="balance">
 						<el-input v-model="form.balance" placeholder="" disabled />
 					</el-form-item>
 				</el-col>
-
 				<el-col :span="24" class="mb20">
 					<el-form-item label="变动类型" prop="changeType">
 						<el-radio-group v-model="form.changeType">
@@ -28,13 +25,11 @@
 						</el-radio-group>
 					</el-form-item>
 				</el-col>
-
 				<el-col :span="24" class="mb20">
 					<el-form-item label="变动余额(元)" prop="changeBalance">
 						<el-input-number v-model="form.changeBalance" :min="0" :precision="2" :step="0.1" class="!w-240px" />
 					</el-form-item>
 				</el-col>
-
 				<el-col :span="24" class="mb20">
 					<el-form-item label="变动后余额(元)" prop="balanceResult">
 						<el-input v-model="balanceResult" placeholder="" disabled />
@@ -79,9 +74,7 @@ const form = reactive<any>({
 })
 
 /** 变动后的余额 */
-const balanceResult = computed(() =>
-	displayPrice(convertToInteger(form.balance) + convertToInteger(form.changeBalance) * form.changeType),
-)
+const balanceResult = computed(() => displayPrice(convertToInteger(form.balance) + convertToInteger(form.changeBalance) * form.changeType))
 
 // 定义校验规则
 const dataRules = ref({

src/views/wallet/wallet-recharge-water/index.vue

@@ -112,8 +112,9 @@
 									text
 									type="primary"
 									@click="handleRecover(row.id)"
-									>恢复</el-button
 								>
+									恢复
+								</el-button>
 							</template>
 						</el-table-column>
 					</el-table>