Explorar o código

供应商、服务客户

shasha hai 1 mes
pai
achega
c2520064e2
Modificáronse 71 ficheiros con 736 adicións e 824 borrados
  1. 2 6
      snowy-admin-web/src/views/biz/bizloadpoint/timeIndex.vue
  2. 5 1
      snowy-admin-web/src/views/biz/bizparkconfig/form.vue
  3. 66 54
      snowy-admin-web/src/views/biz/bizparkconfig/index.vue
  4. 5 1
      snowy-admin-web/src/views/biz/bizprocess/form.vue
  5. 66 54
      snowy-admin-web/src/views/biz/bizprocess/index.vue
  6. 0 76
      snowy-admin-web/src/views/biz/bizprocessnode/form.vue
  7. 0 113
      snowy-admin-web/src/views/biz/bizprocessnode/index.vue
  8. 5 4
      snowy-admin-web/src/views/biz/bizservicecustomer/accountForm.vue
  9. 4 2
      snowy-admin-web/src/views/biz/bizservicecustomer/accountIndex.vue
  10. 5 4
      snowy-admin-web/src/views/biz/bizservicecustomer/flowForm.vue
  11. 13 6
      snowy-admin-web/src/views/biz/bizservicecustomer/flowIndex.vue
  12. 5 1
      snowy-admin-web/src/views/biz/bizservicecustomer/form.vue
  13. 65 56
      snowy-admin-web/src/views/biz/bizservicecustomer/index.vue
  14. 5 4
      snowy-admin-web/src/views/biz/bizsupplier/accountForm.vue
  15. 127 0
      snowy-admin-web/src/views/biz/bizsupplier/accountIndex.vue
  16. 1 1
      snowy-admin-web/src/views/biz/bizsupplier/form.vue
  17. 31 28
      snowy-admin-web/src/views/biz/bizsupplier/index.vue
  18. 9 8
      snowy-admin-web/src/views/biz/bizsupplier/transportForm.vue
  19. 132 0
      snowy-admin-web/src/views/biz/bizsupplier/transportIndex.vue
  20. 0 113
      snowy-admin-web/src/views/biz/bizsupplieraccount/index.vue
  21. 0 117
      snowy-admin-web/src/views/biz/bizsuppliertransport/index.vue
  22. 4 0
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizloadtime/entity/BizLoadTime.java
  23. 6 1
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizloadtime/mapper/BizLoadTimeMapper.java
  24. 17 1
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizloadtime/mapper/mapping/BizLoadTimeMapper.xml
  25. 21 1
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizloadtime/param/BizLoadTimePageParam.java
  26. 17 7
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizloadtime/service/impl/BizLoadTimeServiceImpl.java
  27. 7 7
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/controller/BizServiceCustomerAccountController.java
  28. 7 7
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/controller/BizServiceCustomerFlowController.java
  29. 1 2
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/entity/BizServiceCustomerAccount.java
  30. 1 2
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/entity/BizServiceCustomerFlow.java
  31. 1 1
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/enums/BizServiceCustomerAccountEnum.java
  32. 1 1
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/enums/BizServiceCustomerFlowEnum.java
  33. 2 2
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/mapper/BizServiceCustomerAccountMapper.java
  34. 2 2
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/mapper/BizServiceCustomerFlowMapper.java
  35. 1 1
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/mapper/mapping/BizServiceCustomerAccountMapper.xml
  36. 1 1
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/mapper/mapping/BizServiceCustomerFlowMapper.xml
  37. 1 4
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/param/BizServiceCustomerAccountAddParam.java
  38. 2 3
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/param/BizServiceCustomerAccountEditParam.java
  39. 1 1
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/param/BizServiceCustomerAccountIdParam.java
  40. 1 3
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/param/BizServiceCustomerAccountPageParam.java
  41. 1 4
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/param/BizServiceCustomerFlowAddParam.java
  42. 2 3
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/param/BizServiceCustomerFlowEditParam.java
  43. 1 1
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/param/BizServiceCustomerFlowIdParam.java
  44. 1 3
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/param/BizServiceCustomerFlowPageParam.java
  45. 6 6
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/service/BizServiceCustomerAccountService.java
  46. 6 6
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/service/BizServiceCustomerFlowService.java
  47. 8 8
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/service/impl/BizServiceCustomerAccountServiceImpl.java
  48. 8 8
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/service/impl/BizServiceCustomerFlowServiceImpl.java
  49. 7 7
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/controller/BizSupplierAccountController.java
  50. 7 7
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/controller/BizSupplierTransportController.java
  51. 1 4
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/entity/BizSupplierAccount.java
  52. 1 4
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/entity/BizSupplierTransport.java
  53. 1 1
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/enums/BizSupplierAccountEnum.java
  54. 1 1
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/enums/BizSupplierTransportEnum.java
  55. 2 2
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/mapper/BizSupplierAccountMapper.java
  56. 2 2
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/mapper/BizSupplierTransportMapper.java
  57. 1 1
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/mapper/mapping/BizSupplierAccountMapper.xml
  58. 1 1
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/mapper/mapping/BizSupplierTransportMapper.xml
  59. 1 6
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/param/BizSupplierAccountAddParam.java
  60. 1 4
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/param/BizSupplierAccountEditParam.java
  61. 1 1
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/param/BizSupplierAccountIdParam.java
  62. 1 3
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/param/BizSupplierAccountPageParam.java
  63. 1 6
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/param/BizSupplierTransportAddParam.java
  64. 1 4
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/param/BizSupplierTransportEditParam.java
  65. 1 1
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/param/BizSupplierTransportIdParam.java
  66. 1 3
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/param/BizSupplierTransportPageParam.java
  67. 6 6
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/service/BizSupplierAccountService.java
  68. 6 6
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/service/BizSupplierTransportService.java
  69. 8 8
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/service/impl/BizSupplierAccountServiceImpl.java
  70. 8 8
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/service/impl/BizSupplierTransportServiceImpl.java
  71. 3 3
      snowy-web-app/src/main/resources/application-local.properties

+ 2 - 6
snowy-admin-web/src/views/biz/bizloadpoint/timeIndex.vue

@@ -1,6 +1,6 @@
 <template>
 	<a-drawer :title="title" :width="850" :open="visible" :destroy-on-close="true" @close="onClose">
-		<a-card :bordered="false" style="margin-bottom: 10px" class="mb-2">
+		<a-card :bordered="false" class="mb-2">
 			<s-table
 				ref="tableRef"
 				:columns="columns"
@@ -10,10 +10,7 @@
 			>
 				<template #operator `class="table-operator">
 					<a-button type="primary" v-if="hasPerm('bizLoadTimeAdd')" @click="addFormRef.onOpen(null, pointId)">
-						<template #icon>
-							<plus-outlined />
-						</template>
-						<span>新增配置</span>
+						<template #icon><plus-outlined /></template> 新增
 					</a-button>
 				</template>`
 				<template #bodyCell="{ column, record, index }">
@@ -58,7 +55,6 @@
 	// 默认是关闭状态
 	const visible = ref(false)
 	const searchFormState = ref({})
-	const searchFormRef = ref()
 	const tableRef = ref()
 	const addFormRef = ref()
 	const editFormRef = ref()

+ 5 - 1
snowy-admin-web/src/views/biz/bizparkconfig/form.vue

@@ -6,7 +6,7 @@
 		:destroy-on-close="true"
 		@close="onClose"
 	>
-		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
+		<a-form ref="formRef" :model="formData" :rules="formRules" :wrapper-col="wrapperCol" :label-col="labelCol">
 			<a-form-item label="预约类型:" name="appointmentType">
 				<a-input v-model:value="formData.appointmentType" placeholder="请输入预约类型" allow-clear />
 			</a-form-item>
@@ -39,6 +39,10 @@
 	const formData = ref({})
 	const submitLoading = ref(false)
 
+	//设置表单样式
+	const labelCol = ref({ span: 4})
+	const wrapperCol = ref({ span: 16})
+
 	// 打开抽屉
 	const onOpen = (record) => {
 		open.value = true

+ 66 - 54
snowy-admin-web/src/views/biz/bizparkconfig/index.vue

@@ -1,38 +1,41 @@
 <template>
-	<a-card :bordered="false">
+	<a-card :bordered="false" style="margin-bottom: 10px" class="mb-2">
+		<a-form ref="searchFormRef" name="advanced_search" :model="searchFormState" class="ant-advanced-search-form">
+			<a-row :gutter="24">
+				<a-col :span="6">
+					<a-form-item label="预约类型" name="appointmentType">
+						<a-input v-model:value="searchFormState.appointmentType" placeholder="查询预约类型" allow-clear  />
+					</a-form-item>
+				</a-col>
+				<a-col :span="6">
+					<a-button type="primary" @click="tableRef.refresh()">查询</a-button>
+					<a-button style="margin: 0 8px" @click="reset">重置</a-button>
+					
+					<a-button type="primary" @click="formRef.onOpen()" v-if="hasPerm('bizParkConfigAdd')">
+						<template #icon><plus-outlined /></template>
+						新增
+					</a-button>
+				</a-col>
+			</a-row>
+		</a-form>
+	</a-card>
+	<a-card :bordered="false" style="margin-bottom: 10px" class="mb-2">
 		<s-table
 			ref="tableRef"
 			:columns="columns"
 			:data="loadData"
-			:alert="options.alert.show"
 			bordered
 			:row-key="(record) => record.id"
-			:tool-config="toolConfig"
-			:row-selection="options.rowSelection"
 		>
-			<template #operator class="table-operator">
-				<a-space>
-					<a-button type="primary" @click="formRef.onOpen()" v-if="hasPerm('bizParkConfigAdd')">
-						<template #icon><plus-outlined /></template>
-						新增
-					</a-button>
-					<xn-batch-button
-						v-if="hasPerm('bizParkConfigBatchDelete')"
-						buttonName="批量删除"
-                        icon="DeleteOutlined"
-						:selectedRowKeys="selectedRowKeys"
-						@batchCallBack="deleteBatchBizParkConfig"
-					/>
-				</a-space>
-			</template>
-			<template #bodyCell="{ column, record }">
+			<template #bodyCell="{ column, record, index }">
+				<template v-if="column.dataIndex === 'serial'">
+					{{ index + 1 }}
+				</template>
 				<template v-if="column.dataIndex === 'action'">
 					<a-space>
 						<a @click="formRef.onOpen(record)" v-if="hasPerm('bizParkConfigEdit')">编辑</a>
 						<a-divider type="vertical" v-if="hasPerm(['bizParkConfigEdit', 'bizParkConfigDelete'], 'and')" />
-						<a-popconfirm title="确定要删除吗?" @confirm="deleteBizParkConfig(record)">
-							<a-button type="link" danger size="small" v-if="hasPerm('bizParkConfigDelete')">删除</a-button>
-						</a-popconfirm>
+						<a-button type="link" danger size="small" v-if="hasPerm('bizParkConfigDelete')" @click="deleteConfig(record)">删除</a-button>
 					</a-space>
 				</template>
 			</template>
@@ -45,10 +48,20 @@
 	import { cloneDeep } from 'lodash-es'
 	import Form from './form.vue'
 	import bizParkConfigApi from '@/api/biz/bizParkConfigApi'
+
+	const searchFormState = ref({})
+	const searchFormRef = ref()
 	const tableRef = ref()
 	const formRef = ref()
+	const submitLoading = ref(false)
 	const toolConfig = { refresh: true, height: true, columnSetting: true, striped: false }
 	const columns = [
+		{
+			title: '序号',
+			width: 50,
+			dataIndex: 'serial',
+			align:'center'
+		},
 		{
 			title: '预约类型',
 			dataIndex: 'appointmentType'
@@ -65,6 +78,11 @@
 			title: '支付后停留时长',
 			dataIndex: 'payAfterParkTime'
 		},
+		{
+			title: '创建时间',
+			dataIndex: 'createTime',
+			align: 'center'
+		},
 	]
 	// 操作栏通过权限判断是否显示
 	if (hasPerm(['bizParkConfigEdit', 'bizParkConfigDelete'])) {
@@ -75,24 +93,9 @@
 			width: 150
 		})
 	}
-	const selectedRowKeys = ref([])
-	// 列表选择配置
-	const options = {
-		// columns数字类型字段加入 needTotal: true 可以勾选自动算账
-		alert: {
-			show: true,
-			clear: () => {
-				selectedRowKeys.value = ref([])
-			}
-		},
-		rowSelection: {
-			onChange: (selectedRowKey, selectedRows) => {
-				selectedRowKeys.value = selectedRowKey
-			}
-		}
-	}
 	const loadData = (parameter) => {
-		return bizParkConfigApi.bizParkConfigPage(parameter).then((data) => {
+		const searchFormParam = cloneDeep(searchFormState.value)
+		return bizParkConfigApi.bizParkConfigPage(Object.assign(parameter, searchFormParam)).then((data) => {
 			return data
 		})
 	}
@@ -102,20 +105,29 @@
 		tableRef.value.refresh(true)
 	}
 	// 删除
-	const deleteBizParkConfig = (record) => {
-		let params = [
-			{
-				id: record.id
-			}
-		]
-		bizParkConfigApi.bizParkConfigDelete(params).then(() => {
-			tableRef.value.refresh(true)
-		})
-	}
-	// 批量删除
-	const deleteBatchBizParkConfig = (params) => {
-		bizParkConfigApi.bizParkConfigDelete(params).then(() => {
-			tableRef.value.clearRefreshSelected()
+	const deleteConfig = (record) => {
+		Modal.confirm({
+			title: '确定删除该数据吗?',
+			icon: createVNode(ExclamationCircleOutlined),
+			content: '',
+			onOk() {
+				submitLoading.value = true
+				let params = [
+					{
+						id: record.id
+					}
+				]
+
+				bizServiceCustomerApi
+					.bizServiceCustomerDelete(params)
+					.then(() => {
+						tableRef.value.refresh(true)
+					})
+					.finally(() => {
+						submitLoading.value = false
+					})
+			},
+			onCancel() {}
 		})
 	}
 </script>

+ 5 - 1
snowy-admin-web/src/views/biz/bizprocess/form.vue

@@ -6,7 +6,7 @@
 		:destroy-on-close="true"
 		@close="onClose"
 	>
-		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
+		<a-form ref="formRef" :model="formData" :rules="formRules" :wrapper-col="wrapperCol" :label-col="labelCol">
 			<a-form-item label="工序名称:" name="processName">
 				<a-input v-model:value="formData.processName" placeholder="请输入工序名称" allow-clear />
 			</a-form-item>
@@ -30,6 +30,10 @@
 	const formData = ref({})
 	const submitLoading = ref(false)
 
+	//设置表单样式
+	const labelCol = ref({ span: 4})
+	const wrapperCol = ref({ span: 16})
+
 	// 打开抽屉
 	const onOpen = (record) => {
 		open.value = true

+ 66 - 54
snowy-admin-web/src/views/biz/bizprocess/index.vue

@@ -1,38 +1,41 @@
 <template>
-	<a-card :bordered="false">
+	<a-card :bordered="false" style="margin-bottom: 10px" class="mb-2">
+		<a-form ref="searchFormRef" name="advanced_search" :model="searchFormState" class="ant-advanced-search-form">
+			<a-row :gutter="24">
+				<a-col :span="6">
+					<a-form-item label="工序名称" name="processName">
+						<a-input v-model:value="searchFormState.processName" placeholder="查询工序名称" allow-clear  />
+					</a-form-item>
+				</a-col>
+				<a-col :span="6">
+					<a-button type="primary" @click="tableRef.refresh()">查询</a-button>
+					<a-button style="margin: 0 8px" @click="reset">重置</a-button>
+					
+					<a-button type="primary" @click="formRef.onOpen()" v-if="hasPerm('bizProcessAdd')">
+						<template #icon><plus-outlined /></template>
+						新增
+					</a-button>
+				</a-col>
+			</a-row>
+		</a-form>
+	</a-card>
+	<a-card :bordered="false" style="margin-bottom: 10px" class="mb-2">
 		<s-table
 			ref="tableRef"
 			:columns="columns"
 			:data="loadData"
-			:alert="options.alert.show"
 			bordered
 			:row-key="(record) => record.id"
-			:tool-config="toolConfig"
-			:row-selection="options.rowSelection"
 		>
-			<template #operator class="table-operator">
-				<a-space>
-					<a-button type="primary" @click="formRef.onOpen()" v-if="hasPerm('bizProcessAdd')">
-						<template #icon><plus-outlined /></template>
-						新增
-					</a-button>
-					<xn-batch-button
-						v-if="hasPerm('bizProcessBatchDelete')"
-						buttonName="批量删除"
-                        icon="DeleteOutlined"
-						:selectedRowKeys="selectedRowKeys"
-						@batchCallBack="deleteBatchBizProcess"
-					/>
-				</a-space>
-			</template>
-			<template #bodyCell="{ column, record }">
+			<template #bodyCell="{ column, record, index }">
+				<template v-if="column.dataIndex === 'serial'">
+					{{ index + 1 }}
+				</template>
 				<template v-if="column.dataIndex === 'action'">
 					<a-space>
 						<a @click="formRef.onOpen(record)" v-if="hasPerm('bizProcessEdit')">编辑</a>
 						<a-divider type="vertical" v-if="hasPerm(['bizProcessEdit', 'bizProcessDelete'], 'and')" />
-						<a-popconfirm title="确定要删除吗?" @confirm="deleteBizProcess(record)">
-							<a-button type="link" danger size="small" v-if="hasPerm('bizProcessDelete')">删除</a-button>
-						</a-popconfirm>
+						<a-button type="link" danger size="small" v-if="hasPerm('bizProcessDelete')" @click="deleteConfig(record)">删除</a-button>
 					</a-space>
 				</template>
 			</template>
@@ -45,14 +48,29 @@
 	import { cloneDeep } from 'lodash-es'
 	import Form from './form.vue'
 	import bizProcessApi from '@/api/biz/bizProcessApi'
+
+	const searchFormState = ref({})
+	const searchFormRef = ref()
 	const tableRef = ref()
 	const formRef = ref()
+	const submitLoading = ref(false)
 	const toolConfig = { refresh: true, height: true, columnSetting: true, striped: false }
 	const columns = [
+		{
+			title: '序号',
+			width: 50,
+			dataIndex: 'serial',
+			align:'center'
+		},
 		{
 			title: '工序名称',
 			dataIndex: 'processName'
 		},
+		{
+			title: '创建时间',
+			dataIndex: 'createTime',
+			align: 'center'
+		},
 	]
 	// 操作栏通过权限判断是否显示
 	if (hasPerm(['bizProcessEdit', 'bizProcessDelete'])) {
@@ -63,24 +81,9 @@
 			width: 150
 		})
 	}
-	const selectedRowKeys = ref([])
-	// 列表选择配置
-	const options = {
-		// columns数字类型字段加入 needTotal: true 可以勾选自动算账
-		alert: {
-			show: true,
-			clear: () => {
-				selectedRowKeys.value = ref([])
-			}
-		},
-		rowSelection: {
-			onChange: (selectedRowKey, selectedRows) => {
-				selectedRowKeys.value = selectedRowKey
-			}
-		}
-	}
 	const loadData = (parameter) => {
-		return bizProcessApi.bizProcessPage(parameter).then((data) => {
+		const searchFormParam = cloneDeep(searchFormState.value)
+		return bizProcessApi.bizProcessPage(Object.assign(parameter, searchFormParam)).then((data) => {
 			return data
 		})
 	}
@@ -90,20 +93,29 @@
 		tableRef.value.refresh(true)
 	}
 	// 删除
-	const deleteBizProcess = (record) => {
-		let params = [
-			{
-				id: record.id
-			}
-		]
-		bizProcessApi.bizProcessDelete(params).then(() => {
-			tableRef.value.refresh(true)
-		})
-	}
-	// 批量删除
-	const deleteBatchBizProcess = (params) => {
-		bizProcessApi.bizProcessDelete(params).then(() => {
-			tableRef.value.clearRefreshSelected()
+	const deleteConfig = (record) => {
+		Modal.confirm({
+			title: '确定删除该数据吗?',
+			icon: createVNode(ExclamationCircleOutlined),
+			content: '',
+			onOk() {
+				submitLoading.value = true
+				let params = [
+					{
+						id: record.id
+					}
+				]
+
+				bizServiceCustomerApi
+					.bizServiceCustomerDelete(params)
+					.then(() => {
+						tableRef.value.refresh(true)
+					})
+					.finally(() => {
+						submitLoading.value = false
+					})
+			},
+			onCancel() {}
 		})
 	}
 </script>

+ 0 - 76
snowy-admin-web/src/views/biz/bizprocessnode/form.vue

@@ -1,76 +0,0 @@
-<template>
-	<xn-form-container
-		:title="formData.id ? '编辑工序节点' : '增加工序节点'"
-		:width="700"
-		v-model:open="open"
-		:destroy-on-close="true"
-		@close="onClose"
-	>
-		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
-			<a-form-item label="工序id:" name="processId">
-				<a-input v-model:value="formData.processId" placeholder="请输入工序id" allow-clear />
-			</a-form-item>
-			<a-form-item label="节点名称:" name="nodeName">
-				<a-input v-model:value="formData.nodeName" placeholder="请输入节点名称" allow-clear />
-			</a-form-item>
-		</a-form>
-		<template #footer>
-			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
-			<a-button type="primary" @click="onSubmit" :loading="submitLoading">保存</a-button>
-		</template>
-	</xn-form-container>
-</template>
-
-<script setup name="bizProcessNodeForm">
-	import { cloneDeep } from 'lodash-es'
-	import { required } from '@/utils/formRules'
-	import bizProcessNodeApi from '@/api/biz/bizProcessNodeApi'
-	// 抽屉状态
-	const open = ref(false)
-	const emit = defineEmits({ successful: null })
-	const formRef = ref()
-	// 表单数据
-	const formData = ref({})
-	const submitLoading = ref(false)
-
-	// 打开抽屉
-	const onOpen = (record) => {
-		open.value = true
-		if (record) {
-			let recordData = cloneDeep(record)
-			formData.value = Object.assign({}, recordData)
-		}
-	}
-	// 关闭抽屉
-	const onClose = () => {
-		formRef.value.resetFields()
-		formData.value = {}
-		open.value = false
-	}
-	// 默认要校验的
-	const formRules = {
-	}
-	// 验证并提交数据
-	const onSubmit = () => {
-		formRef.value
-			.validate()
-			.then(() => {
-				submitLoading.value = true
-				const formDataParam = cloneDeep(formData.value)
-				bizProcessNodeApi
-					.bizProcessNodeSubmitForm(formDataParam, formDataParam.id)
-					.then(() => {
-						onClose()
-						emit('successful')
-					})
-					.finally(() => {
-						submitLoading.value = false
-					})
-			})
-			.catch(() => {})
-	}
-	// 抛出函数
-	defineExpose({
-		onOpen
-	})
-</script>

+ 0 - 113
snowy-admin-web/src/views/biz/bizprocessnode/index.vue

@@ -1,113 +0,0 @@
-<template>
-	<a-card :bordered="false">
-		<s-table
-			ref="tableRef"
-			:columns="columns"
-			:data="loadData"
-			:alert="options.alert.show"
-			bordered
-			:row-key="(record) => record.id"
-			:tool-config="toolConfig"
-			:row-selection="options.rowSelection"
-		>
-			<template #operator class="table-operator">
-				<a-space>
-					<a-button type="primary" @click="formRef.onOpen()" v-if="hasPerm('bizProcessNodeAdd')">
-						<template #icon><plus-outlined /></template>
-						新增
-					</a-button>
-					<xn-batch-button
-						v-if="hasPerm('bizProcessNodeBatchDelete')"
-						buttonName="批量删除"
-                        icon="DeleteOutlined"
-						:selectedRowKeys="selectedRowKeys"
-						@batchCallBack="deleteBatchBizProcessNode"
-					/>
-				</a-space>
-			</template>
-			<template #bodyCell="{ column, record }">
-				<template v-if="column.dataIndex === 'action'">
-					<a-space>
-						<a @click="formRef.onOpen(record)" v-if="hasPerm('bizProcessNodeEdit')">编辑</a>
-						<a-divider type="vertical" v-if="hasPerm(['bizProcessNodeEdit', 'bizProcessNodeDelete'], 'and')" />
-						<a-popconfirm title="确定要删除吗?" @confirm="deleteBizProcessNode(record)">
-							<a-button type="link" danger size="small" v-if="hasPerm('bizProcessNodeDelete')">删除</a-button>
-						</a-popconfirm>
-					</a-space>
-				</template>
-			</template>
-		</s-table>
-	</a-card>
-	<Form ref="formRef" @successful="tableRef.refresh()" />
-</template>
-
-<script setup name="bizprocessnode">
-	import { cloneDeep } from 'lodash-es'
-	import Form from './form.vue'
-	import bizProcessNodeApi from '@/api/biz/bizProcessNodeApi'
-	const tableRef = ref()
-	const formRef = ref()
-	const toolConfig = { refresh: true, height: true, columnSetting: true, striped: false }
-	const columns = [
-		{
-			title: '工序id',
-			dataIndex: 'processId'
-		},
-		{
-			title: '节点名称',
-			dataIndex: 'nodeName'
-		},
-	]
-	// 操作栏通过权限判断是否显示
-	if (hasPerm(['bizProcessNodeEdit', 'bizProcessNodeDelete'])) {
-		columns.push({
-			title: '操作',
-			dataIndex: 'action',
-			align: 'center',
-			width: 150
-		})
-	}
-	const selectedRowKeys = ref([])
-	// 列表选择配置
-	const options = {
-		// columns数字类型字段加入 needTotal: true 可以勾选自动算账
-		alert: {
-			show: true,
-			clear: () => {
-				selectedRowKeys.value = ref([])
-			}
-		},
-		rowSelection: {
-			onChange: (selectedRowKey, selectedRows) => {
-				selectedRowKeys.value = selectedRowKey
-			}
-		}
-	}
-	const loadData = (parameter) => {
-		return bizProcessNodeApi.bizProcessNodePage(parameter).then((data) => {
-			return data
-		})
-	}
-	// 重置
-	const reset = () => {
-		searchFormRef.value.resetFields()
-		tableRef.value.refresh(true)
-	}
-	// 删除
-	const deleteBizProcessNode = (record) => {
-		let params = [
-			{
-				id: record.id
-			}
-		]
-		bizProcessNodeApi.bizProcessNodeDelete(params).then(() => {
-			tableRef.value.refresh(true)
-		})
-	}
-	// 批量删除
-	const deleteBatchBizProcessNode = (params) => {
-		bizProcessNodeApi.bizProcessNodeDelete(params).then(() => {
-			tableRef.value.clearRefreshSelected()
-		})
-	}
-</script>

+ 5 - 4
snowy-admin-web/src/views/biz/bizservicecustomeraccount/form.vue → snowy-admin-web/src/views/biz/bizservicecustomer/accountForm.vue

@@ -6,10 +6,7 @@
 		:destroy-on-close="true"
 		@close="onClose"
 	>
-		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
-			<a-form-item label="客户id:" name="customerId">
-				<a-input v-model:value="formData.customerId" placeholder="请输入客户id" allow-clear />
-			</a-form-item>
+		<a-form ref="formRef" :model="formData" :rules="formRules" :wrapper-col="wrapperCol" :label-col="labelCol">
 			<a-form-item label="账号:" name="loginAccount">
 				<a-input v-model:value="formData.loginAccount" placeholder="请输入账号" allow-clear />
 			</a-form-item>
@@ -48,6 +45,10 @@
 	const formData = ref({})
 	const submitLoading = ref(false)
 
+	//设置表单样式
+	const labelCol = ref({ span: 4})
+	const wrapperCol = ref({ span: 16})
+
 	// 打开抽屉
 	const onOpen = (record) => {
 		open.value = true

+ 4 - 2
snowy-admin-web/src/views/biz/bizservicecustomeraccount/index.vue → snowy-admin-web/src/views/biz/bizservicecustomer/accountIndex.vue

@@ -50,8 +50,10 @@
 	const toolConfig = { refresh: true, height: true, columnSetting: true, striped: false }
 	const columns = [
 		{
-			title: '客户id',
-			dataIndex: 'customerId'
+			title: '序号',
+			width: 50,
+			dataIndex: 'serial',
+			align:'center'
 		},
 		{
 			title: '账号',

+ 5 - 4
snowy-admin-web/src/views/biz/bizservicecustomerflow/form.vue → snowy-admin-web/src/views/biz/bizservicecustomer/flowForm.vue

@@ -6,10 +6,7 @@
 		:destroy-on-close="true"
 		@close="onClose"
 	>
-		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
-			<a-form-item label="服务客户id:" name="customerAccountId">
-				<a-input v-model:value="formData.customerAccountId" placeholder="请输入服务客户id" allow-clear />
-			</a-form-item>
+		<a-form ref="formRef" :model="formData" :rules="formRules" :wrapper-col="wrapperCol" :label-col="labelCol">
 			<a-form-item label="操作类型  1:充值   2:消费:" name="operateType">
 				<a-input v-model:value="formData.operateType" placeholder="请输入操作类型  1:充值   2:消费" allow-clear />
 			</a-form-item>
@@ -42,6 +39,10 @@
 	const formData = ref({})
 	const submitLoading = ref(false)
 
+	//设置表单样式
+	const labelCol = ref({ span: 4})
+	const wrapperCol = ref({ span: 16})
+
 	// 打开抽屉
 	const onOpen = (record) => {
 		open.value = true

+ 13 - 6
snowy-admin-web/src/views/biz/bizservicecustomerflow/index.vue → snowy-admin-web/src/views/biz/bizservicecustomer/flowIndex.vue

@@ -43,32 +43,39 @@
 
 <script setup name="bizservicecustomerflow">
 	import { cloneDeep } from 'lodash-es'
-	import Form from './form.vue'
+	import Form from './flowForm.vue'
 	import bizServiceCustomerFlowApi from '@/api/biz/bizServiceCustomerFlowApi'
 	const tableRef = ref()
 	const formRef = ref()
 	const toolConfig = { refresh: true, height: true, columnSetting: true, striped: false }
 	const columns = [
 		{
-			title: '服务客户id',
-			dataIndex: 'customerAccountId'
+			title: '序号',
+			width: 50,
+			dataIndex: 'serial',
+			align:'center'
 		},
 		{
 			title: '操作类型  1:充值   2:消费',
 			dataIndex: 'operateType'
 		},
 		{
-			title: '操作前账户余额(充值或消费前账户余额)',
+			title: '操作前账户余额',
 			dataIndex: 'operateAmountBegin'
 		},
 		{
-			title: '操作金额(充值或消费金额)',
+			title: '操作金额',
 			dataIndex: 'operateAmount'
 		},
 		{
-			title: '操作后账户余额(充值或消费后账户余额)',
+			title: '操作后账户余额',
 			dataIndex: 'operateAmountAfter'
 		},
+		{
+			title: '操作时间',
+			dataIndex: 'createTime',
+			align: 'center'
+		},
 	]
 	// 操作栏通过权限判断是否显示
 	if (hasPerm(['bizServiceCustomerFlowEdit', 'bizServiceCustomerFlowDelete'])) {

+ 5 - 1
snowy-admin-web/src/views/biz/bizservicecustomer/form.vue

@@ -6,7 +6,7 @@
 		:destroy-on-close="true"
 		@close="onClose"
 	>
-		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
+		<a-form ref="formRef" :model="formData" :rules="formRules" :wrapper-col="wrapperCol" :label-col="labelCol">
 			<a-form-item label="客户名称:" name="name">
 				<a-input v-model:value="formData.name" placeholder="请输入客户名称" allow-clear />
 			</a-form-item>
@@ -42,6 +42,10 @@
 	const formData = ref({})
 	const submitLoading = ref(false)
 
+	//设置表单样式
+	const labelCol = ref({ span: 4})
+	const wrapperCol = ref({ span: 16})
+
 	// 打开抽屉
 	const onOpen = (record) => {
 		open.value = true

+ 65 - 56
snowy-admin-web/src/views/biz/bizservicecustomer/index.vue

@@ -1,38 +1,41 @@
 <template>
-	<a-card :bordered="false">
+	<a-card :bordered="false" style="margin-bottom: 10px" class="mb-2">
+		<a-form ref="searchFormRef" name="advanced_search" :model="searchFormState" class="ant-advanced-search-form">
+			<a-row :gutter="24">
+				<a-col :span="6">
+					<a-form-item label="客户" name="name">
+						<a-input v-model:value="searchFormState.name" placeholder="查询客户名称" allow-clear  />
+					</a-form-item>
+				</a-col>
+				<a-col :span="6">
+					<a-button type="primary" @click="tableRef.refresh()">查询</a-button>
+					<a-button style="margin: 0 8px" @click="reset">重置</a-button>
+					
+					<a-button type="primary" @click="formRef.onOpen()" v-if="hasPerm('bizServiceCustomerAdd')">
+						<template #icon><plus-outlined /></template>
+						新增
+					</a-button>
+				</a-col>
+			</a-row>
+		</a-form>
+	</a-card>
+	<a-card :bordered="false" style="margin-bottom: 10px" class="mb-2">
 		<s-table
 			ref="tableRef"
 			:columns="columns"
 			:data="loadData"
-			:alert="options.alert.show"
 			bordered
 			:row-key="(record) => record.id"
-			:tool-config="toolConfig"
-			:row-selection="options.rowSelection"
 		>
-			<template #operator class="table-operator">
-				<a-space>
-					<a-button type="primary" @click="formRef.onOpen()" v-if="hasPerm('bizServiceCustomerAdd')">
-						<template #icon><plus-outlined /></template>
-						新增
-					</a-button>
-					<xn-batch-button
-						v-if="hasPerm('bizServiceCustomerBatchDelete')"
-						buttonName="批量删除"
-                        icon="DeleteOutlined"
-						:selectedRowKeys="selectedRowKeys"
-						@batchCallBack="deleteBatchBizServiceCustomer"
-					/>
-				</a-space>
-			</template>
-			<template #bodyCell="{ column, record }">
+			<template #bodyCell="{ column, record, index }">
+				<template v-if="column.dataIndex === 'serial'">
+					{{ index + 1 }}
+				</template>
 				<template v-if="column.dataIndex === 'action'">
 					<a-space>
 						<a @click="formRef.onOpen(record)" v-if="hasPerm('bizServiceCustomerEdit')">编辑</a>
 						<a-divider type="vertical" v-if="hasPerm(['bizServiceCustomerEdit', 'bizServiceCustomerDelete'], 'and')" />
-						<a-popconfirm title="确定要删除吗?" @confirm="deleteBizServiceCustomer(record)">
-							<a-button type="link" danger size="small" v-if="hasPerm('bizServiceCustomerDelete')">删除</a-button>
-						</a-popconfirm>
+						<a-button type="link" danger size="small" v-if="hasPerm('bizServiceCustomerDelete')" @click="deleteConfig(record)">删除</a-button>
 					</a-space>
 				</template>
 			</template>
@@ -45,10 +48,20 @@
 	import { cloneDeep } from 'lodash-es'
 	import Form from './form.vue'
 	import bizServiceCustomerApi from '@/api/biz/bizServiceCustomerApi'
+
+	const searchFormState = ref({})
+	const searchFormRef = ref()
 	const tableRef = ref()
 	const formRef = ref()
+	const submitLoading = ref(false)
 	const toolConfig = { refresh: true, height: true, columnSetting: true, striped: false }
 	const columns = [
+		{
+			title: '序号',
+			width: 50,
+			dataIndex: 'serial',
+			align:'center'
+		},
 		{
 			title: '客户名称',
 			dataIndex: 'name'
@@ -66,8 +79,9 @@
 			dataIndex: 'address'
 		},
 		{
-			title: '备注',
-			dataIndex: 'remark'
+			title: '创建时间',
+			dataIndex: 'createTime',
+			align: 'center'
 		},
 	]
 	// 操作栏通过权限判断是否显示
@@ -79,24 +93,10 @@
 			width: 150
 		})
 	}
-	const selectedRowKeys = ref([])
-	// 列表选择配置
-	const options = {
-		// columns数字类型字段加入 needTotal: true 可以勾选自动算账
-		alert: {
-			show: true,
-			clear: () => {
-				selectedRowKeys.value = ref([])
-			}
-		},
-		rowSelection: {
-			onChange: (selectedRowKey, selectedRows) => {
-				selectedRowKeys.value = selectedRowKey
-			}
-		}
-	}
+
 	const loadData = (parameter) => {
-		return bizServiceCustomerApi.bizServiceCustomerPage(parameter).then((data) => {
+		const searchFormParam = cloneDeep(searchFormState.value)
+		return bizServiceCustomerApi.bizServiceCustomerPage(Object.assign(parameter, searchFormParam)).then((data) => {
 			return data
 		})
 	}
@@ -106,20 +106,29 @@
 		tableRef.value.refresh(true)
 	}
 	// 删除
-	const deleteBizServiceCustomer = (record) => {
-		let params = [
-			{
-				id: record.id
-			}
-		]
-		bizServiceCustomerApi.bizServiceCustomerDelete(params).then(() => {
-			tableRef.value.refresh(true)
-		})
-	}
-	// 批量删除
-	const deleteBatchBizServiceCustomer = (params) => {
-		bizServiceCustomerApi.bizServiceCustomerDelete(params).then(() => {
-			tableRef.value.clearRefreshSelected()
+	const deleteConfig = (record) => {
+		Modal.confirm({
+			title: '确定删除该数据吗?',
+			icon: createVNode(ExclamationCircleOutlined),
+			content: '',
+			onOk() {
+				submitLoading.value = true
+				let params = [
+					{
+						id: record.id
+					}
+				]
+
+				bizServiceCustomerApi
+					.bizServiceCustomerDelete(params)
+					.then(() => {
+						tableRef.value.refresh(true)
+					})
+					.finally(() => {
+						submitLoading.value = false
+					})
+			},
+			onCancel() {}
 		})
 	}
 </script>

+ 5 - 4
snowy-admin-web/src/views/biz/bizsupplieraccount/form.vue → snowy-admin-web/src/views/biz/bizsupplier/accountForm.vue

@@ -6,10 +6,7 @@
 		:destroy-on-close="true"
 		@close="onClose"
 	>
-		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
-			<a-form-item label="供应商id:" name="supplierId">
-				<a-input v-model:value="formData.supplierId" placeholder="请输入供应商id" allow-clear />
-			</a-form-item>
+		<a-form ref="formRef" :model="formData" :rules="formRules" :wrapper-col="wrapperCol" :label-col="labelCol">
 			<a-form-item label="供应商账号:" name="supplierAccount">
 				<a-input v-model:value="formData.supplierAccount" placeholder="请输入供应商账号" allow-clear />
 			</a-form-item>
@@ -33,6 +30,10 @@
 	const formData = ref({})
 	const submitLoading = ref(false)
 
+	//设置表单样式
+	const labelCol = ref({ span: 4})
+	const wrapperCol = ref({ span: 16})
+
 	// 打开抽屉
 	const onOpen = (record) => {
 		open.value = true

+ 127 - 0
snowy-admin-web/src/views/biz/bizsupplier/accountIndex.vue

@@ -0,0 +1,127 @@
+<template>
+	<a-drawer :title="title" :width="850" :open="visible" :destroy-on-close="true" @close="onClose">
+		<a-card :bordered="false" class="mb-2">
+			<s-table
+				ref="tableRef"
+				:columns="columns"
+				:data="loadData"
+				bordered
+				:row-key="(record) => record.id"
+			>
+				<template #operator class="table-operator">
+					<a-space>
+						<a-button type="primary" @click="formRef.onOpen()" v-if="hasPerm('bizSupplierAccountAdd')">
+							<template #icon><plus-outlined /></template> 新增
+						</a-button>
+					</a-space>
+				</template>
+				<template #bodyCell="{ column, record }">
+					<template v-if="column.dataIndex === 'action'">
+						<a-space>
+							<a @click="formRef.onOpen(record)" v-if="hasPerm('bizSupplierAccountEdit')">编辑</a>
+							<a-divider type="vertical" v-if="hasPerm(['bizSupplierAccountEdit', 'bizSupplierAccountDelete'], 'and')" />
+							<a-button type="link" danger size="small" v-if="hasPerm('bizSupplierAccountDelete')" @click="deleteConfig(record)">删除</a-button>
+						</a-space>
+					</template>
+				</template>
+			</s-table>
+		</a-card>
+	</a-drawer>
+
+	<Form ref="formRef" @successful="tableRef.refresh()" />
+</template>
+
+<script setup name="bizsupplieraccount">
+	import { cloneDeep } from 'lodash-es'
+	import Form from './accountForm.vue'
+	import bizSupplierAccountApi from '@/api/biz/bizSupplierAccountApi'
+	import {ExclamationCircleOutlined} from '@ant-design/icons-vue';
+	import {Modal} from 'ant-design-vue';
+	import {createVNode} from 'vue';
+	
+	const submitLoading = ref(false)
+	const toolConfig = { refresh: true, height: false, columnSetting: false, striped: false }
+	// 默认是关闭状态
+	const visible = ref(false)
+	const searchFormState = ref({})
+	const tableRef = ref()
+	const formRef = ref()
+	const recordData = ref()
+	const title = ref()
+
+	const columns = [
+		{
+			title: '序号',
+			width: 50,
+			dataIndex: 'serial',
+			align:'center'
+		},
+		{
+			title: '供应商账号',
+			dataIndex: 'supplierAccount',
+			align: 'center',
+		},
+		{
+			title: '创建时间',
+			dataIndex: 'createTime',
+			align: 'center'
+		},
+	]
+	// 操作栏通过权限判断是否显示
+	if (hasPerm(['bizSupplierAccountEdit', 'bizSupplierAccountDelete'])) {
+		columns.push({
+			title: '操作',
+			dataIndex: 'action',
+			align: 'center',
+			width: 150
+		})
+	}
+	// 打开抽屉
+	const onOpen = (record) => {
+		recordData.value = record
+		title.value = "【" + record.supplierName + "】-账号管理"
+		searchFormState.value = {
+			supplierId: record.id
+		}
+		visible.value = true
+	}
+	const loadData = (parameter) => {
+		return bizSupplierAccountApi.bizSupplierAccountPage(Object.assign(parameter, searchFormState.value)).then((data) => {
+			return data
+		})
+	}
+	// 关闭抽屉
+	const onClose = () => {
+		visible.value = false
+	}
+	// 删除
+	const deleteConfig = (record) => {
+		Modal.confirm({
+			title: '确定删除该数据吗?',
+			icon: createVNode(ExclamationCircleOutlined),
+			content: '',
+			onOk() {
+				submitLoading.value = true
+				let params = [
+					{
+						id: record.id
+					}
+				]
+
+				bizLoadTimeApi
+					.bizLoadTimeDelete(params)
+					.then(() => {
+						tableRef.value.refresh(true)
+					})
+					.finally(() => {
+						submitLoading.value = false
+					})
+			},
+			onCancel() {}
+		})
+	}
+	// 调用这个函数将子组件的一些数据和方法暴露出去
+	defineExpose({
+		onOpen
+	})
+</script>

+ 1 - 1
snowy-admin-web/src/views/biz/bizsupplier/form.vue

@@ -43,7 +43,7 @@
 	const submitLoading = ref(false)
 
 	//设置表单样式
-	const labelCol = ref({ span: 5})
+	const labelCol = ref({ span: 4})
 	const wrapperCol = ref({ span: 16})
 
 	// 打开抽屉

+ 31 - 28
snowy-admin-web/src/views/biz/bizsupplier/index.vue

@@ -16,7 +16,7 @@
 					<a-button type="primary" @click="tableRef.refresh()">查询</a-button>
 					<a-button style="margin: 0 8px" @click="reset">重置</a-button>
 
-					<a-button type="primary" @click="formRef.onOpen()" v-if="hasPerm('supplierAdd')">
+					<a-button type="primary" @click="formRef.onOpen()" v-if="hasPerm('bizSupplierAdd')">
 						<template #icon><plus-outlined /></template>
 						新增
 					</a-button>
@@ -24,7 +24,7 @@
 			</a-row>
 		</a-form>
 	</a-card>
-	<a-card :bordered="false">
+	<a-card :bordered="false" style="margin-bottom: 10px" class="mb-2">
 		<s-table
 			ref="tableRef"
 			:columns="columns"
@@ -38,20 +38,31 @@
 				</template>
 				<template v-if="column.dataIndex === 'action'">
 					<a-space>
-						<a @click="formRef.onOpen(record)" v-if="hasPerm('supplierEdit')">编辑</a>
-						<a-divider type="vertical" v-if="hasPerm(['supplierEdit', 'supplierDelete'], 'and')" />
-						<a-button type="link" danger size="small" v-if="hasPerm('supplierDelete')" @click="deleteConfig(record)">删除</a-button>
+						<a @click="formRef.onOpen(record)" v-if="hasPerm('bizSupplierEdit')">编辑</a>
+						<a-divider type="vertical" v-if="hasPerm(['bizSupplierEdit', 'bizSupplierDelete'], 'and')" />
+						<a-button type="link" danger size="small" v-if="hasPerm('bizSupplierDelete')" @click="deleteConfig(record)">删除</a-button>
+
+						<a-divider type="vertical" v-if="hasPerm(['bizSupplierEdit', 'bizSupplierDelete'], 'or') && hasPerm('bizSupplierAccount')" />
+						<a @click="accountIndexRef.onOpen(record)" v-if="hasPerm('bizSupplierAccount')">账号</a>
+
+						<a-divider type="vertical" v-if="hasPerm(['bizSupplierEdit', 'bizSupplierDelete', 'bizSupplierAccount'], 'or') && hasPerm('bizSupplierTransport')" />
+						<a @click="transportIndexRef.onOpen(record)" v-if="hasPerm('bizSupplierTransport')">运输</a>
+					
 					</a-space>
 				</template>
 			</template>
 		</s-table>
 	</a-card>
 	<Form ref="formRef" @successful="tableRef.refresh()" />
+	<AccountIndex ref="accountIndexRef" @successful="tableRef.refresh()" />
+	<TransportIndex ref="transportIndexRef" @successful="tableRef.refresh()" />
 </template>
 
 <script setup name="bizsupplier">
 	import { cloneDeep } from 'lodash-es'
 	import Form from './form.vue'
+	import AccountIndex from './accountIndex.vue'
+	import TransportIndex from './transportIndex.vue'
 	import bizSupplierApi from '@/api/biz/bizSupplierApi'
 	import {ExclamationCircleOutlined} from '@ant-design/icons-vue';
 	import {Modal} from 'ant-design-vue';
@@ -61,6 +72,8 @@
 	const searchFormRef = ref()
 	const tableRef = ref()
 	const formRef = ref()
+	const accountIndexRef = ref()
+	const transportIndexRef = ref()
 	const submitLoading = ref(false)
 	const toolConfig = { refresh: true, height: true, columnSetting: true, striped: false }
 	const columns = [
@@ -93,31 +106,22 @@
 			dataIndex: 'supplierPhone',
 			align:'center'
 		},
+		{
+			title: '创建时间',
+			dataIndex: 'createTime',
+			align: 'center'
+		},
 	]
 	// 操作栏通过权限判断是否显示
-	columns.push({
-		title: '操作',
-		dataIndex: 'action',
-		align: 'center',
-		width: 150
-	})
-
-	const selectedRowKeys = ref([])
-	// 列表选择配置
-	const options = {
-		// columns数字类型字段加入 needTotal: true 可以勾选自动算账
-		alert: {
-			show: true,
-			clear: () => {
-				selectedRowKeys.value = ref([])
-			}
-		},
-		rowSelection: {
-			onChange: (selectedRowKey, selectedRows) => {
-				selectedRowKeys.value = selectedRowKey
-			}
-		}
+	if (hasPerm(['bizSupplierEdit', 'bizSupplierDelete', 'bizSupplierAccount', 'bizSupplierTransport'], 'or')) {
+		columns.push({
+			title: '操作',
+			dataIndex: 'action',
+			align: 'center',
+			width: 320
+		})
 	}
+
 	const loadData = (parameter) => {
 		const searchFormParam = cloneDeep(searchFormState.value)
 		return bizSupplierApi.bizSupplierPage(Object.assign(parameter, searchFormParam)).then((data) => {
@@ -131,7 +135,6 @@
 	}
 	// 删除
 	const deleteConfig = (record) => {
-
 		Modal.confirm({
 			title: '确定删除该数据吗?',
 			icon: createVNode(ExclamationCircleOutlined),

+ 9 - 8
snowy-admin-web/src/views/biz/bizsuppliertransport/form.vue → snowy-admin-web/src/views/biz/bizsupplier/transportForm.vue

@@ -6,15 +6,12 @@
 		:destroy-on-close="true"
 		@close="onClose"
 	>
-		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
-			<a-form-item label="供应商id:" name="supplierId">
-				<a-input v-model:value="formData.supplierId" placeholder="请输入供应商id" allow-clear />
+		<a-form ref="formRef" :model="formData" :rules="formRules" :wrapper-col="wrapperCol" :label-col="labelCol">
+			<a-form-item label="运输类型  1:汽运  2:船运:  3通用" name="transportType">
+				<a-input v-model:value="formData.transportType" placeholder="请输入运输类型" allow-clear />
 			</a-form-item>
-			<a-form-item label="运输类型  1:汽运  2:船运:" name="transportType">
-				<a-input v-model:value="formData.transportType" placeholder="请输入运输类型  1:汽运  2:船运" allow-clear />
-			</a-form-item>
-			<a-form-item label="运输号(车牌号或者船舶号):" name="transportNo">
-				<a-input v-model:value="formData.transportNo" placeholder="请输入运输号(车牌号或者船舶号)" allow-clear />
+			<a-form-item label="运输号:" name="transportNo">
+				<a-input v-model:value="formData.transportNo" placeholder="请输入车牌号或者船舶号" allow-clear />
 			</a-form-item>
 		</a-form>
 		<template #footer>
@@ -36,6 +33,10 @@
 	const formData = ref({})
 	const submitLoading = ref(false)
 
+	//设置表单样式
+	const labelCol = ref({ span: 4})
+	const wrapperCol = ref({ span: 16})
+
 	// 打开抽屉
 	const onOpen = (record) => {
 		open.value = true

+ 132 - 0
snowy-admin-web/src/views/biz/bizsupplier/transportIndex.vue

@@ -0,0 +1,132 @@
+<template>
+	<a-drawer :title="title" :width="850" :open="visible" :destroy-on-close="true" @close="onClose">
+		<a-card :bordered="false" class="mb-2">
+			<s-table
+				ref="tableRef"
+				:columns="columns"
+				:data="loadData"
+				bordered
+				:row-key="(record) => record.id"
+			>
+				<template #operator class="table-operator">
+					<a-space>
+						<a-button type="primary" @click="formRef.onOpen()" v-if="hasPerm('bizSupplierTransportAdd')">
+							<template #icon><plus-outlined /></template>
+							新增
+						</a-button>
+					</a-space>
+				</template>
+				<template #bodyCell="{ column, record }">
+					<template v-if="column.dataIndex === 'action'">
+						<a-space>
+							<a @click="formRef.onOpen(record)" v-if="hasPerm('bizSupplierTransportEdit')">编辑</a>
+							<a-divider type="vertical" v-if="hasPerm(['bizSupplierTransportEdit', 'bizSupplierTransportDelete'], 'and')" />
+							<a-button type="link" danger size="small" v-if="hasPerm('bizSupplierTransportDelete')" @click="deleteConfig(record)">删除</a-button>
+						</a-space>
+					</template>
+				</template>
+			</s-table>
+		</a-card>
+	</a-drawer>
+	<Form ref="formRef" @successful="tableRef.refresh()" />
+</template>
+
+<script setup name="bizsuppliertransport">
+	import { cloneDeep } from 'lodash-es'
+	import Form from './transportForm.vue'
+	import bizSupplierTransportApi from '@/api/biz/bizSupplierTransportApi'
+	import {ExclamationCircleOutlined} from '@ant-design/icons-vue';
+	import {Modal} from 'ant-design-vue';
+	import {createVNode} from 'vue';
+	
+	const submitLoading = ref(false)
+	const toolConfig = { refresh: true, height: false, columnSetting: false, striped: false }
+	// 默认是关闭状态
+	const visible = ref(false)
+	const searchFormState = ref({})
+	const tableRef = ref()
+	const formRef = ref()
+	const recordData = ref()
+	const title = ref()
+	
+	const columns = [
+		{
+			title: '序号',
+			width: 50,
+			dataIndex: 'serial',
+			align:'center'
+		},
+		{
+			title: '运输类型  1:汽运  2:船运',
+			dataIndex: 'transportType',
+			align: 'center',
+		},
+		{
+			title: '运输号',
+			dataIndex: 'transportNo',
+			align: 'center',
+		},
+		{
+			title: '创建时间',
+			dataIndex: 'createTime',
+			align: 'center'
+		},
+	]
+	// 操作栏通过权限判断是否显示
+	if (hasPerm(['bizSupplierTransportEdit', 'bizSupplierTransportDelete'])) {
+		columns.push({
+			title: '操作',
+			dataIndex: 'action',
+			align: 'center',
+			width: 150
+		})
+	}
+	// 打开抽屉
+	const onOpen = (record) => {
+		recordData.value = record
+		title.value = "【" + record.supplierName + "】-运输车辆/船舶管理"
+		searchFormState.value = {
+			supplierId: record.id
+		}
+		visible.value = true
+	}
+	const loadData = (parameter) => {
+		return bizSupplierTransportApi.bizSupplierTransportPage(Object.assign(parameter, searchFormState.value)).then((data) => {
+			return data
+		})
+	}
+	// 关闭抽屉
+	const onClose = () => {
+		visible.value = false
+	}
+	// 删除
+	const deleteConfig = (record) => {
+		Modal.confirm({
+			title: '确定删除该数据吗?',
+			icon: createVNode(ExclamationCircleOutlined),
+			content: '',
+			onOk() {
+				submitLoading.value = true
+				let params = [
+					{
+						id: record.id
+					}
+				]
+
+				bizLoadTimeApi
+					.bizLoadTimeDelete(params)
+					.then(() => {
+						tableRef.value.refresh(true)
+					})
+					.finally(() => {
+						submitLoading.value = false
+					})
+			},
+			onCancel() {}
+		})
+	}
+	// 调用这个函数将子组件的一些数据和方法暴露出去
+	defineExpose({
+		onOpen
+	})
+</script>

+ 0 - 113
snowy-admin-web/src/views/biz/bizsupplieraccount/index.vue

@@ -1,113 +0,0 @@
-<template>
-	<a-card :bordered="false">
-		<s-table
-			ref="tableRef"
-			:columns="columns"
-			:data="loadData"
-			:alert="options.alert.show"
-			bordered
-			:row-key="(record) => record.id"
-			:tool-config="toolConfig"
-			:row-selection="options.rowSelection"
-		>
-			<template #operator class="table-operator">
-				<a-space>
-					<a-button type="primary" @click="formRef.onOpen()" v-if="hasPerm('bizSupplierAccountAdd')">
-						<template #icon><plus-outlined /></template>
-						新增
-					</a-button>
-					<xn-batch-button
-						v-if="hasPerm('bizSupplierAccountBatchDelete')"
-						buttonName="批量删除"
-                        icon="DeleteOutlined"
-						:selectedRowKeys="selectedRowKeys"
-						@batchCallBack="deleteBatchBizSupplierAccount"
-					/>
-				</a-space>
-			</template>
-			<template #bodyCell="{ column, record }">
-				<template v-if="column.dataIndex === 'action'">
-					<a-space>
-						<a @click="formRef.onOpen(record)" v-if="hasPerm('bizSupplierAccountEdit')">编辑</a>
-						<a-divider type="vertical" v-if="hasPerm(['bizSupplierAccountEdit', 'bizSupplierAccountDelete'], 'and')" />
-						<a-popconfirm title="确定要删除吗?" @confirm="deleteBizSupplierAccount(record)">
-							<a-button type="link" danger size="small" v-if="hasPerm('bizSupplierAccountDelete')">删除</a-button>
-						</a-popconfirm>
-					</a-space>
-				</template>
-			</template>
-		</s-table>
-	</a-card>
-	<Form ref="formRef" @successful="tableRef.refresh()" />
-</template>
-
-<script setup name="bizsupplieraccount">
-	import { cloneDeep } from 'lodash-es'
-	import Form from './form.vue'
-	import bizSupplierAccountApi from '@/api/biz/bizSupplierAccountApi'
-	const tableRef = ref()
-	const formRef = ref()
-	const toolConfig = { refresh: true, height: true, columnSetting: true, striped: false }
-	const columns = [
-		{
-			title: '供应商id',
-			dataIndex: 'supplierId'
-		},
-		{
-			title: '供应商账号',
-			dataIndex: 'supplierAccount'
-		},
-	]
-	// 操作栏通过权限判断是否显示
-	if (hasPerm(['bizSupplierAccountEdit', 'bizSupplierAccountDelete'])) {
-		columns.push({
-			title: '操作',
-			dataIndex: 'action',
-			align: 'center',
-			width: 150
-		})
-	}
-	const selectedRowKeys = ref([])
-	// 列表选择配置
-	const options = {
-		// columns数字类型字段加入 needTotal: true 可以勾选自动算账
-		alert: {
-			show: true,
-			clear: () => {
-				selectedRowKeys.value = ref([])
-			}
-		},
-		rowSelection: {
-			onChange: (selectedRowKey, selectedRows) => {
-				selectedRowKeys.value = selectedRowKey
-			}
-		}
-	}
-	const loadData = (parameter) => {
-		return bizSupplierAccountApi.bizSupplierAccountPage(parameter).then((data) => {
-			return data
-		})
-	}
-	// 重置
-	const reset = () => {
-		searchFormRef.value.resetFields()
-		tableRef.value.refresh(true)
-	}
-	// 删除
-	const deleteBizSupplierAccount = (record) => {
-		let params = [
-			{
-				id: record.id
-			}
-		]
-		bizSupplierAccountApi.bizSupplierAccountDelete(params).then(() => {
-			tableRef.value.refresh(true)
-		})
-	}
-	// 批量删除
-	const deleteBatchBizSupplierAccount = (params) => {
-		bizSupplierAccountApi.bizSupplierAccountDelete(params).then(() => {
-			tableRef.value.clearRefreshSelected()
-		})
-	}
-</script>

+ 0 - 117
snowy-admin-web/src/views/biz/bizsuppliertransport/index.vue

@@ -1,117 +0,0 @@
-<template>
-	<a-card :bordered="false">
-		<s-table
-			ref="tableRef"
-			:columns="columns"
-			:data="loadData"
-			:alert="options.alert.show"
-			bordered
-			:row-key="(record) => record.id"
-			:tool-config="toolConfig"
-			:row-selection="options.rowSelection"
-		>
-			<template #operator class="table-operator">
-				<a-space>
-					<a-button type="primary" @click="formRef.onOpen()" v-if="hasPerm('bizSupplierTransportAdd')">
-						<template #icon><plus-outlined /></template>
-						新增
-					</a-button>
-					<xn-batch-button
-						v-if="hasPerm('bizSupplierTransportBatchDelete')"
-						buttonName="批量删除"
-                        icon="DeleteOutlined"
-						:selectedRowKeys="selectedRowKeys"
-						@batchCallBack="deleteBatchBizSupplierTransport"
-					/>
-				</a-space>
-			</template>
-			<template #bodyCell="{ column, record }">
-				<template v-if="column.dataIndex === 'action'">
-					<a-space>
-						<a @click="formRef.onOpen(record)" v-if="hasPerm('bizSupplierTransportEdit')">编辑</a>
-						<a-divider type="vertical" v-if="hasPerm(['bizSupplierTransportEdit', 'bizSupplierTransportDelete'], 'and')" />
-						<a-popconfirm title="确定要删除吗?" @confirm="deleteBizSupplierTransport(record)">
-							<a-button type="link" danger size="small" v-if="hasPerm('bizSupplierTransportDelete')">删除</a-button>
-						</a-popconfirm>
-					</a-space>
-				</template>
-			</template>
-		</s-table>
-	</a-card>
-	<Form ref="formRef" @successful="tableRef.refresh()" />
-</template>
-
-<script setup name="bizsuppliertransport">
-	import { cloneDeep } from 'lodash-es'
-	import Form from './form.vue'
-	import bizSupplierTransportApi from '@/api/biz/bizSupplierTransportApi'
-	const tableRef = ref()
-	const formRef = ref()
-	const toolConfig = { refresh: true, height: true, columnSetting: true, striped: false }
-	const columns = [
-		{
-			title: '供应商id',
-			dataIndex: 'supplierId'
-		},
-		{
-			title: '运输类型  1:汽运  2:船运',
-			dataIndex: 'transportType'
-		},
-		{
-			title: '运输号(车牌号或者船舶号)',
-			dataIndex: 'transportNo'
-		},
-	]
-	// 操作栏通过权限判断是否显示
-	if (hasPerm(['bizSupplierTransportEdit', 'bizSupplierTransportDelete'])) {
-		columns.push({
-			title: '操作',
-			dataIndex: 'action',
-			align: 'center',
-			width: 150
-		})
-	}
-	const selectedRowKeys = ref([])
-	// 列表选择配置
-	const options = {
-		// columns数字类型字段加入 needTotal: true 可以勾选自动算账
-		alert: {
-			show: true,
-			clear: () => {
-				selectedRowKeys.value = ref([])
-			}
-		},
-		rowSelection: {
-			onChange: (selectedRowKey, selectedRows) => {
-				selectedRowKeys.value = selectedRowKey
-			}
-		}
-	}
-	const loadData = (parameter) => {
-		return bizSupplierTransportApi.bizSupplierTransportPage(parameter).then((data) => {
-			return data
-		})
-	}
-	// 重置
-	const reset = () => {
-		searchFormRef.value.resetFields()
-		tableRef.value.refresh(true)
-	}
-	// 删除
-	const deleteBizSupplierTransport = (record) => {
-		let params = [
-			{
-				id: record.id
-			}
-		]
-		bizSupplierTransportApi.bizSupplierTransportDelete(params).then(() => {
-			tableRef.value.refresh(true)
-		})
-	}
-	// 批量删除
-	const deleteBatchBizSupplierTransport = (params) => {
-		bizSupplierTransportApi.bizSupplierTransportDelete(params).then(() => {
-			tableRef.value.clearRefreshSelected()
-		})
-	}
-</script>

+ 4 - 0
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizloadtime/entity/BizLoadTime.java

@@ -16,6 +16,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.tika.config.Field;
 import vip.xiaonuo.common.pojo.CommonEntity;
 
 import java.math.BigDecimal;
@@ -57,4 +58,7 @@ public class BizLoadTime extends CommonEntity {
     @Schema(description = "已约次数")
     private Integer alreadyNumber;
 
+    @TableField(exist = false)
+    private String loadPoint;
+
 }

+ 6 - 1
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizloadtime/mapper/BizLoadTimeMapper.java

@@ -12,7 +12,9 @@
  */
 package vip.xiaonuo.biz.modular.bizloadtime.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import vip.xiaonuo.biz.modular.bizloadtime.entity.BizLoadTime;
 
@@ -27,6 +29,9 @@ import java.util.List;
  **/
 public interface BizLoadTimeMapper extends BaseMapper<BizLoadTime> {
 
-    List<BizLoadTime> getSearch(@Param("loadPointId") String loadPointId, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    Page<BizLoadTime> page(@Param("page") Page<BizLoadTime> page, @Param("ew") QueryWrapper<BizLoadTime> wrapper);
+
+    List<BizLoadTime> getSearch(@Param("pointId") String pointId, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
+
 
 }

+ 17 - 1
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizloadtime/mapper/mapping/BizLoadTimeMapper.xml

@@ -2,6 +2,22 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="vip.xiaonuo.biz.modular.bizloadtime.mapper.BizLoadTimeMapper">
 
+    <select id="page" resultType="vip.xiaonuo.biz.modular.bizloadtime.entity.BizLoadTime">
+        select
+            t.id,
+            t.point_id pointId,
+            p.load_point loadPoint,
+            t.begin_time beginTime,
+            t.end_time endTime,
+            t.available_number availableNumber,
+            t.already_number alreadyNumber
+        from biz_load_time t
+        left join biz_load_point p on p.id = t.point_id
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
     <select id="getSearch" resultType="vip.xiaonuo.biz.modular.bizloadtime.entity.BizLoadTime">
         select
             t.id,
@@ -12,7 +28,7 @@
             t.already_number alreadyNumber
         from biz_load_time t
         where t.delete_flag = 'NOT_DELETE'
-            and t.point_id = #{loadPointId}
+            and t.point_id = #{pointId}
             and #{endTime} > t.begin_time
             and t.end_time > #{startTime}
     </select>

+ 21 - 1
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizloadtime/param/BizLoadTimePageParam.java

@@ -50,7 +50,27 @@ public class BizLoadTimePageParam {
 
     /** 点位ID */
     @Schema(description = "点位ID")
-    private String loadPointId;
+    private String pointId;
+
+    /** 点位名称 */
+    @Schema(description = "description")
+    private String loadPoint;
+
+    /** 装货开始时间开始 */
+    @Schema(description = "装货开始时间开始")
+    private String startLoadBeginTime;
+
+    /** 装货开始时间结束 */
+    @Schema(description = "装货开始时间结束")
+    private String endLoadBeginTime;
+
+    /** 装货结束时间开始 */
+    @Schema(description = "装货结束时间开始")
+    private String startLoadEndTime;
+
+    /** 装货结束时间结束 */
+    @Schema(description = "装货结束时间结束")
+    private String endLoadEndTime;
 
     /** 提货时间配置ID */
     @Schema(description = "提货时间配置ID")

+ 17 - 7
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizloadtime/service/impl/BizLoadTimeServiceImpl.java

@@ -66,17 +66,27 @@ public class BizLoadTimeServiceImpl extends ServiceImpl<BizLoadTimeMapper, BizLo
     @Override
     public Page<BizLoadTime> page(BizLoadTimePageParam bizLoadTimePageParam) {
         QueryWrapper<BizLoadTime> queryWrapper = new QueryWrapper<BizLoadTime>().checkSqlInjection();
-        if(ObjectUtil.isNotEmpty(bizLoadTimePageParam.getLoadPointId())) {
-            queryWrapper.lambda().eq(BizLoadTime::getPointId, bizLoadTimePageParam.getLoadPointId());
+        if(ObjectUtil.isNotEmpty(bizLoadTimePageParam.getPointId())) {
+            queryWrapper.eq("t.point_id", bizLoadTimePageParam.getPointId());
         }
+        if(ObjectUtil.isNotEmpty(bizLoadTimePageParam.getLoadPoint())) {
+            queryWrapper.eq("p.load_point", bizLoadTimePageParam.getLoadPoint());
+        }
+        if(ObjectUtil.isNotEmpty(bizLoadTimePageParam.getStartLoadBeginTime()) && ObjectUtil.isNotEmpty(bizLoadTimePageParam.getEndLoadBeginTime())) {
+            queryWrapper.between("t.begin_time", bizLoadTimePageParam.getStartLoadBeginTime(), bizLoadTimePageParam.getEndLoadBeginTime());
+        }
+        if(ObjectUtil.isNotEmpty(bizLoadTimePageParam.getStartLoadEndTime()) && ObjectUtil.isNotEmpty(bizLoadTimePageParam.getEndLoadEndTime())) {
+            queryWrapper.between("t.end_time", bizLoadTimePageParam.getStartLoadEndTime(), bizLoadTimePageParam.getEndLoadEndTime());
+        }
+        queryWrapper.eq("t.DELETE_FLAG", "NOT_DELETE");
         if(ObjectUtil.isAllNotEmpty(bizLoadTimePageParam.getSortField(), bizLoadTimePageParam.getSortOrder())) {
             CommonSortOrderEnum.validate(bizLoadTimePageParam.getSortOrder());
             queryWrapper.orderBy(true, bizLoadTimePageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
                     StrUtil.toUnderlineCase(bizLoadTimePageParam.getSortField()));
         } else {
-            queryWrapper.lambda().orderByDesc(BizLoadTime::getCreateTime);
+            queryWrapper.orderByDesc("t.begin_time");
         }
-        return this.page(CommonPageRequest.defaultPage(), queryWrapper);
+        return this.baseMapper.page(CommonPageRequest.defaultPage(), queryWrapper);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -131,11 +141,11 @@ public class BizLoadTimeServiceImpl extends ServiceImpl<BizLoadTimeMapper, BizLo
     @Override
     public List<BizLoadTime> search(BizLoadTimePageParam bizLoadTimePageParam) {
         /** 点位ID */
-        String loadPointId = bizLoadTimePageParam.getLoadPointId();
+        String pointId = bizLoadTimePageParam.getPointId();
         /** 提货时间配置ID */
         String goodsConfId = bizLoadTimePageParam.getGoodsConfId();
         // 判断参数是否存在
-        if(loadPointId != null && goodsConfId != null) {
+        if(pointId != null && goodsConfId != null) {
             // 获取提货时间段
             BizGoodsConf bizGoodsConf = bizGoodsConfService.queryEntity(goodsConfId);
             // 开始时间
@@ -143,7 +153,7 @@ public class BizLoadTimeServiceImpl extends ServiceImpl<BizLoadTimeMapper, BizLo
             // 结束时间
             Date endTime = bizGoodsConf.getConfEndTime();
             // 根据时间段和装货点位ID过滤装货时间配置
-            List<BizLoadTime> list = this.baseMapper.getSearch(loadPointId, startTime, endTime);
+            List<BizLoadTime> list = this.baseMapper.getSearch(pointId, startTime, endTime);
             return list;
         }else{
             return null;

+ 7 - 7
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomeraccount/controller/BizServiceCustomerAccountController.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/controller/BizServiceCustomerAccountController.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizservicecustomeraccount.controller;
+package vip.xiaonuo.biz.modular.bizservicecustomer.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -23,12 +23,12 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import vip.xiaonuo.common.annotation.CommonLog;
 import vip.xiaonuo.common.pojo.CommonResult;
-import vip.xiaonuo.biz.modular.bizservicecustomeraccount.entity.BizServiceCustomerAccount;
-import vip.xiaonuo.biz.modular.bizservicecustomeraccount.param.BizServiceCustomerAccountAddParam;
-import vip.xiaonuo.biz.modular.bizservicecustomeraccount.param.BizServiceCustomerAccountEditParam;
-import vip.xiaonuo.biz.modular.bizservicecustomeraccount.param.BizServiceCustomerAccountIdParam;
-import vip.xiaonuo.biz.modular.bizservicecustomeraccount.param.BizServiceCustomerAccountPageParam;
-import vip.xiaonuo.biz.modular.bizservicecustomeraccount.service.BizServiceCustomerAccountService;
+import vip.xiaonuo.biz.modular.bizservicecustomer.entity.BizServiceCustomerAccount;
+import vip.xiaonuo.biz.modular.bizservicecustomer.param.BizServiceCustomerAccountAddParam;
+import vip.xiaonuo.biz.modular.bizservicecustomer.param.BizServiceCustomerAccountEditParam;
+import vip.xiaonuo.biz.modular.bizservicecustomer.param.BizServiceCustomerAccountIdParam;
+import vip.xiaonuo.biz.modular.bizservicecustomer.param.BizServiceCustomerAccountPageParam;
+import vip.xiaonuo.biz.modular.bizservicecustomer.service.BizServiceCustomerAccountService;
 
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;

+ 7 - 7
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomerflow/controller/BizServiceCustomerFlowController.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/controller/BizServiceCustomerFlowController.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizservicecustomerflow.controller;
+package vip.xiaonuo.biz.modular.bizservicecustomer.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -23,12 +23,12 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import vip.xiaonuo.common.annotation.CommonLog;
 import vip.xiaonuo.common.pojo.CommonResult;
-import vip.xiaonuo.biz.modular.bizservicecustomerflow.entity.BizServiceCustomerFlow;
-import vip.xiaonuo.biz.modular.bizservicecustomerflow.param.BizServiceCustomerFlowAddParam;
-import vip.xiaonuo.biz.modular.bizservicecustomerflow.param.BizServiceCustomerFlowEditParam;
-import vip.xiaonuo.biz.modular.bizservicecustomerflow.param.BizServiceCustomerFlowIdParam;
-import vip.xiaonuo.biz.modular.bizservicecustomerflow.param.BizServiceCustomerFlowPageParam;
-import vip.xiaonuo.biz.modular.bizservicecustomerflow.service.BizServiceCustomerFlowService;
+import vip.xiaonuo.biz.modular.bizservicecustomer.entity.BizServiceCustomerFlow;
+import vip.xiaonuo.biz.modular.bizservicecustomer.param.BizServiceCustomerFlowAddParam;
+import vip.xiaonuo.biz.modular.bizservicecustomer.param.BizServiceCustomerFlowEditParam;
+import vip.xiaonuo.biz.modular.bizservicecustomer.param.BizServiceCustomerFlowIdParam;
+import vip.xiaonuo.biz.modular.bizservicecustomer.param.BizServiceCustomerFlowPageParam;
+import vip.xiaonuo.biz.modular.bizservicecustomer.service.BizServiceCustomerFlowService;
 
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;

+ 1 - 2
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomeraccount/entity/BizServiceCustomerAccount.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/entity/BizServiceCustomerAccount.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizservicecustomeraccount.entity;
+package vip.xiaonuo.biz.modular.bizservicecustomer.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -19,7 +19,6 @@ import lombok.Setter;
 import vip.xiaonuo.common.pojo.CommonEntity;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 服务客户账号管理实体

+ 1 - 2
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomerflow/entity/BizServiceCustomerFlow.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/entity/BizServiceCustomerFlow.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizservicecustomerflow.entity;
+package vip.xiaonuo.biz.modular.bizservicecustomer.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -19,7 +19,6 @@ import lombok.Setter;
 import vip.xiaonuo.common.pojo.CommonEntity;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 服务客户资金流水实体

+ 1 - 1
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomeraccount/enums/BizServiceCustomerAccountEnum.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/enums/BizServiceCustomerAccountEnum.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizservicecustomeraccount.enums;
+package vip.xiaonuo.biz.modular.bizservicecustomer.enums;
 
 import lombok.Getter;
 

+ 1 - 1
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomerflow/enums/BizServiceCustomerFlowEnum.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/enums/BizServiceCustomerFlowEnum.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizservicecustomerflow.enums;
+package vip.xiaonuo.biz.modular.bizservicecustomer.enums;
 
 import lombok.Getter;
 

+ 2 - 2
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomeraccount/mapper/BizServiceCustomerAccountMapper.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/mapper/BizServiceCustomerAccountMapper.java

@@ -10,10 +10,10 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizservicecustomeraccount.mapper;
+package vip.xiaonuo.biz.modular.bizservicecustomer.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import vip.xiaonuo.biz.modular.bizservicecustomeraccount.entity.BizServiceCustomerAccount;
+import vip.xiaonuo.biz.modular.bizservicecustomer.entity.BizServiceCustomerAccount;
 
 /**
  * 服务客户账号管理Mapper接口

+ 2 - 2
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomerflow/mapper/BizServiceCustomerFlowMapper.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/mapper/BizServiceCustomerFlowMapper.java

@@ -10,10 +10,10 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizservicecustomerflow.mapper;
+package vip.xiaonuo.biz.modular.bizservicecustomer.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import vip.xiaonuo.biz.modular.bizservicecustomerflow.entity.BizServiceCustomerFlow;
+import vip.xiaonuo.biz.modular.bizservicecustomer.entity.BizServiceCustomerFlow;
 
 /**
  * 服务客户资金流水Mapper接口

+ 1 - 1
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomeraccount/mapper/mapping/BizServiceCustomerAccountMapper.xml → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/mapper/mapping/BizServiceCustomerAccountMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="vip.xiaonuo.biz.modular.bizservicecustomeraccount.mapper.BizServiceCustomerAccountMapper">
+<mapper namespace="vip.xiaonuo.biz.modular.bizservicecustomer.mapper.BizServiceCustomerAccountMapper">
 
 </mapper>

+ 1 - 1
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomerflow/mapper/mapping/BizServiceCustomerFlowMapper.xml → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/mapper/mapping/BizServiceCustomerFlowMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="vip.xiaonuo.biz.modular.bizservicecustomerflow.mapper.BizServiceCustomerFlowMapper">
+<mapper namespace="vip.xiaonuo.biz.modular.bizservicecustomer.mapper.BizServiceCustomerFlowMapper">
 
 </mapper>

+ 1 - 4
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomeraccount/param/BizServiceCustomerAccountAddParam.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/param/BizServiceCustomerAccountAddParam.java

@@ -10,16 +10,13 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizservicecustomeraccount.param;
+package vip.xiaonuo.biz.modular.bizservicecustomer.param;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 服务客户账号管理添加参数

+ 2 - 3
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomeraccount/param/BizServiceCustomerAccountEditParam.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/param/BizServiceCustomerAccountEditParam.java

@@ -10,16 +10,15 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizservicecustomeraccount.param;
+package vip.xiaonuo.biz.modular.bizservicecustomer.param;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 服务客户账号管理编辑参数

+ 1 - 1
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomeraccount/param/BizServiceCustomerAccountIdParam.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/param/BizServiceCustomerAccountIdParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizservicecustomeraccount.param;
+package vip.xiaonuo.biz.modular.bizservicecustomer.param;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;

+ 1 - 3
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomeraccount/param/BizServiceCustomerAccountPageParam.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/param/BizServiceCustomerAccountPageParam.java

@@ -10,13 +10,11 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizservicecustomeraccount.param;
+package vip.xiaonuo.biz.modular.bizservicecustomer.param;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
-import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 服务客户账号管理查询参数

+ 1 - 4
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomerflow/param/BizServiceCustomerFlowAddParam.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/param/BizServiceCustomerFlowAddParam.java

@@ -10,16 +10,13 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizservicecustomerflow.param;
+package vip.xiaonuo.biz.modular.bizservicecustomer.param;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 服务客户资金流水添加参数

+ 2 - 3
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomerflow/param/BizServiceCustomerFlowEditParam.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/param/BizServiceCustomerFlowEditParam.java

@@ -10,16 +10,15 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizservicecustomerflow.param;
+package vip.xiaonuo.biz.modular.bizservicecustomer.param;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 服务客户资金流水编辑参数

+ 1 - 1
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomerflow/param/BizServiceCustomerFlowIdParam.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/param/BizServiceCustomerFlowIdParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizservicecustomerflow.param;
+package vip.xiaonuo.biz.modular.bizservicecustomer.param;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;

+ 1 - 3
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomerflow/param/BizServiceCustomerFlowPageParam.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/param/BizServiceCustomerFlowPageParam.java

@@ -10,13 +10,11 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizservicecustomerflow.param;
+package vip.xiaonuo.biz.modular.bizservicecustomer.param;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
-import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 服务客户资金流水查询参数

+ 6 - 6
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomeraccount/service/BizServiceCustomerAccountService.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/service/BizServiceCustomerAccountService.java

@@ -10,15 +10,15 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizservicecustomeraccount.service;
+package vip.xiaonuo.biz.modular.bizservicecustomer.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import vip.xiaonuo.biz.modular.bizservicecustomeraccount.entity.BizServiceCustomerAccount;
-import vip.xiaonuo.biz.modular.bizservicecustomeraccount.param.BizServiceCustomerAccountAddParam;
-import vip.xiaonuo.biz.modular.bizservicecustomeraccount.param.BizServiceCustomerAccountEditParam;
-import vip.xiaonuo.biz.modular.bizservicecustomeraccount.param.BizServiceCustomerAccountIdParam;
-import vip.xiaonuo.biz.modular.bizservicecustomeraccount.param.BizServiceCustomerAccountPageParam;
+import vip.xiaonuo.biz.modular.bizservicecustomer.entity.BizServiceCustomerAccount;
+import vip.xiaonuo.biz.modular.bizservicecustomer.param.BizServiceCustomerAccountAddParam;
+import vip.xiaonuo.biz.modular.bizservicecustomer.param.BizServiceCustomerAccountEditParam;
+import vip.xiaonuo.biz.modular.bizservicecustomer.param.BizServiceCustomerAccountIdParam;
+import vip.xiaonuo.biz.modular.bizservicecustomer.param.BizServiceCustomerAccountPageParam;
 
 import java.util.List;
 

+ 6 - 6
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomerflow/service/BizServiceCustomerFlowService.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/service/BizServiceCustomerFlowService.java

@@ -10,15 +10,15 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizservicecustomerflow.service;
+package vip.xiaonuo.biz.modular.bizservicecustomer.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import vip.xiaonuo.biz.modular.bizservicecustomerflow.entity.BizServiceCustomerFlow;
-import vip.xiaonuo.biz.modular.bizservicecustomerflow.param.BizServiceCustomerFlowAddParam;
-import vip.xiaonuo.biz.modular.bizservicecustomerflow.param.BizServiceCustomerFlowEditParam;
-import vip.xiaonuo.biz.modular.bizservicecustomerflow.param.BizServiceCustomerFlowIdParam;
-import vip.xiaonuo.biz.modular.bizservicecustomerflow.param.BizServiceCustomerFlowPageParam;
+import vip.xiaonuo.biz.modular.bizservicecustomer.entity.BizServiceCustomerFlow;
+import vip.xiaonuo.biz.modular.bizservicecustomer.param.BizServiceCustomerFlowAddParam;
+import vip.xiaonuo.biz.modular.bizservicecustomer.param.BizServiceCustomerFlowEditParam;
+import vip.xiaonuo.biz.modular.bizservicecustomer.param.BizServiceCustomerFlowIdParam;
+import vip.xiaonuo.biz.modular.bizservicecustomer.param.BizServiceCustomerFlowPageParam;
 
 import java.util.List;
 

+ 8 - 8
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomeraccount/service/impl/BizServiceCustomerAccountServiceImpl.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/service/impl/BizServiceCustomerAccountServiceImpl.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizservicecustomeraccount.service.impl;
+package vip.xiaonuo.biz.modular.bizservicecustomer.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
@@ -24,13 +24,13 @@ import org.springframework.transaction.annotation.Transactional;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
-import vip.xiaonuo.biz.modular.bizservicecustomeraccount.entity.BizServiceCustomerAccount;
-import vip.xiaonuo.biz.modular.bizservicecustomeraccount.mapper.BizServiceCustomerAccountMapper;
-import vip.xiaonuo.biz.modular.bizservicecustomeraccount.param.BizServiceCustomerAccountAddParam;
-import vip.xiaonuo.biz.modular.bizservicecustomeraccount.param.BizServiceCustomerAccountEditParam;
-import vip.xiaonuo.biz.modular.bizservicecustomeraccount.param.BizServiceCustomerAccountIdParam;
-import vip.xiaonuo.biz.modular.bizservicecustomeraccount.param.BizServiceCustomerAccountPageParam;
-import vip.xiaonuo.biz.modular.bizservicecustomeraccount.service.BizServiceCustomerAccountService;
+import vip.xiaonuo.biz.modular.bizservicecustomer.entity.BizServiceCustomerAccount;
+import vip.xiaonuo.biz.modular.bizservicecustomer.mapper.BizServiceCustomerAccountMapper;
+import vip.xiaonuo.biz.modular.bizservicecustomer.param.BizServiceCustomerAccountAddParam;
+import vip.xiaonuo.biz.modular.bizservicecustomer.param.BizServiceCustomerAccountEditParam;
+import vip.xiaonuo.biz.modular.bizservicecustomer.param.BizServiceCustomerAccountIdParam;
+import vip.xiaonuo.biz.modular.bizservicecustomer.param.BizServiceCustomerAccountPageParam;
+import vip.xiaonuo.biz.modular.bizservicecustomer.service.BizServiceCustomerAccountService;
 
 import java.util.List;
 

+ 8 - 8
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomerflow/service/impl/BizServiceCustomerFlowServiceImpl.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/service/impl/BizServiceCustomerFlowServiceImpl.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizservicecustomerflow.service.impl;
+package vip.xiaonuo.biz.modular.bizservicecustomer.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
@@ -24,13 +24,13 @@ import org.springframework.transaction.annotation.Transactional;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
-import vip.xiaonuo.biz.modular.bizservicecustomerflow.entity.BizServiceCustomerFlow;
-import vip.xiaonuo.biz.modular.bizservicecustomerflow.mapper.BizServiceCustomerFlowMapper;
-import vip.xiaonuo.biz.modular.bizservicecustomerflow.param.BizServiceCustomerFlowAddParam;
-import vip.xiaonuo.biz.modular.bizservicecustomerflow.param.BizServiceCustomerFlowEditParam;
-import vip.xiaonuo.biz.modular.bizservicecustomerflow.param.BizServiceCustomerFlowIdParam;
-import vip.xiaonuo.biz.modular.bizservicecustomerflow.param.BizServiceCustomerFlowPageParam;
-import vip.xiaonuo.biz.modular.bizservicecustomerflow.service.BizServiceCustomerFlowService;
+import vip.xiaonuo.biz.modular.bizservicecustomer.entity.BizServiceCustomerFlow;
+import vip.xiaonuo.biz.modular.bizservicecustomer.mapper.BizServiceCustomerFlowMapper;
+import vip.xiaonuo.biz.modular.bizservicecustomer.param.BizServiceCustomerFlowAddParam;
+import vip.xiaonuo.biz.modular.bizservicecustomer.param.BizServiceCustomerFlowEditParam;
+import vip.xiaonuo.biz.modular.bizservicecustomer.param.BizServiceCustomerFlowIdParam;
+import vip.xiaonuo.biz.modular.bizservicecustomer.param.BizServiceCustomerFlowPageParam;
+import vip.xiaonuo.biz.modular.bizservicecustomer.service.BizServiceCustomerFlowService;
 
 import java.util.List;
 

+ 7 - 7
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplieraccount/controller/BizSupplierAccountController.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/controller/BizSupplierAccountController.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizsupplieraccount.controller;
+package vip.xiaonuo.biz.modular.bizsupplier.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -23,12 +23,12 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import vip.xiaonuo.common.annotation.CommonLog;
 import vip.xiaonuo.common.pojo.CommonResult;
-import vip.xiaonuo.biz.modular.bizsupplieraccount.entity.BizSupplierAccount;
-import vip.xiaonuo.biz.modular.bizsupplieraccount.param.BizSupplierAccountAddParam;
-import vip.xiaonuo.biz.modular.bizsupplieraccount.param.BizSupplierAccountEditParam;
-import vip.xiaonuo.biz.modular.bizsupplieraccount.param.BizSupplierAccountIdParam;
-import vip.xiaonuo.biz.modular.bizsupplieraccount.param.BizSupplierAccountPageParam;
-import vip.xiaonuo.biz.modular.bizsupplieraccount.service.BizSupplierAccountService;
+import vip.xiaonuo.biz.modular.bizsupplier.entity.BizSupplierAccount;
+import vip.xiaonuo.biz.modular.bizsupplier.param.BizSupplierAccountAddParam;
+import vip.xiaonuo.biz.modular.bizsupplier.param.BizSupplierAccountEditParam;
+import vip.xiaonuo.biz.modular.bizsupplier.param.BizSupplierAccountIdParam;
+import vip.xiaonuo.biz.modular.bizsupplier.param.BizSupplierAccountPageParam;
+import vip.xiaonuo.biz.modular.bizsupplier.service.BizSupplierAccountService;
 
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;

+ 7 - 7
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsuppliertransport/controller/BizSupplierTransportController.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/controller/BizSupplierTransportController.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizsuppliertransport.controller;
+package vip.xiaonuo.biz.modular.bizsupplier.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -23,12 +23,12 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import vip.xiaonuo.common.annotation.CommonLog;
 import vip.xiaonuo.common.pojo.CommonResult;
-import vip.xiaonuo.biz.modular.bizsuppliertransport.entity.BizSupplierTransport;
-import vip.xiaonuo.biz.modular.bizsuppliertransport.param.BizSupplierTransportAddParam;
-import vip.xiaonuo.biz.modular.bizsuppliertransport.param.BizSupplierTransportEditParam;
-import vip.xiaonuo.biz.modular.bizsuppliertransport.param.BizSupplierTransportIdParam;
-import vip.xiaonuo.biz.modular.bizsuppliertransport.param.BizSupplierTransportPageParam;
-import vip.xiaonuo.biz.modular.bizsuppliertransport.service.BizSupplierTransportService;
+import vip.xiaonuo.biz.modular.bizsupplier.entity.BizSupplierTransport;
+import vip.xiaonuo.biz.modular.bizsupplier.param.BizSupplierTransportAddParam;
+import vip.xiaonuo.biz.modular.bizsupplier.param.BizSupplierTransportEditParam;
+import vip.xiaonuo.biz.modular.bizsupplier.param.BizSupplierTransportIdParam;
+import vip.xiaonuo.biz.modular.bizsupplier.param.BizSupplierTransportPageParam;
+import vip.xiaonuo.biz.modular.bizsupplier.service.BizSupplierTransportService;
 
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;

+ 1 - 4
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplieraccount/entity/BizSupplierAccount.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/entity/BizSupplierAccount.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizsupplieraccount.entity;
+package vip.xiaonuo.biz.modular.bizsupplier.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -18,9 +18,6 @@ import lombok.Getter;
 import lombok.Setter;
 import vip.xiaonuo.common.pojo.CommonEntity;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 /**
  * 供应商账号信息实体
  *

+ 1 - 4
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsuppliertransport/entity/BizSupplierTransport.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/entity/BizSupplierTransport.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizsuppliertransport.entity;
+package vip.xiaonuo.biz.modular.bizsupplier.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -18,9 +18,6 @@ import lombok.Getter;
 import lombok.Setter;
 import vip.xiaonuo.common.pojo.CommonEntity;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 /**
  * 供应商运输管理实体
  *

+ 1 - 1
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplieraccount/enums/BizSupplierAccountEnum.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/enums/BizSupplierAccountEnum.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizsupplieraccount.enums;
+package vip.xiaonuo.biz.modular.bizsupplier.enums;
 
 import lombok.Getter;
 

+ 1 - 1
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsuppliertransport/enums/BizSupplierTransportEnum.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/enums/BizSupplierTransportEnum.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizsuppliertransport.enums;
+package vip.xiaonuo.biz.modular.bizsupplier.enums;
 
 import lombok.Getter;
 

+ 2 - 2
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplieraccount/mapper/BizSupplierAccountMapper.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/mapper/BizSupplierAccountMapper.java

@@ -10,10 +10,10 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizsupplieraccount.mapper;
+package vip.xiaonuo.biz.modular.bizsupplier.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import vip.xiaonuo.biz.modular.bizsupplieraccount.entity.BizSupplierAccount;
+import vip.xiaonuo.biz.modular.bizsupplier.entity.BizSupplierAccount;
 
 /**
  * 供应商账号信息Mapper接口

+ 2 - 2
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsuppliertransport/mapper/BizSupplierTransportMapper.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/mapper/BizSupplierTransportMapper.java

@@ -10,10 +10,10 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizsuppliertransport.mapper;
+package vip.xiaonuo.biz.modular.bizsupplier.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import vip.xiaonuo.biz.modular.bizsuppliertransport.entity.BizSupplierTransport;
+import vip.xiaonuo.biz.modular.bizsupplier.entity.BizSupplierTransport;
 
 /**
  * 供应商运输管理Mapper接口

+ 1 - 1
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplieraccount/mapper/mapping/BizSupplierAccountMapper.xml → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/mapper/mapping/BizSupplierAccountMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="vip.xiaonuo.biz.modular.bizsupplieraccount.mapper.BizSupplierAccountMapper">
+<mapper namespace="vip.xiaonuo.biz.modular.bizsupplier.mapper.BizSupplierAccountMapper">
 
 </mapper>

+ 1 - 1
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsuppliertransport/mapper/mapping/BizSupplierTransportMapper.xml → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/mapper/mapping/BizSupplierTransportMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="vip.xiaonuo.biz.modular.bizsuppliertransport.mapper.BizSupplierTransportMapper">
+<mapper namespace="vip.xiaonuo.biz.modular.bizsupplier.mapper.BizSupplierTransportMapper">
 
 </mapper>

+ 1 - 6
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplieraccount/param/BizSupplierAccountAddParam.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/param/BizSupplierAccountAddParam.java

@@ -10,17 +10,12 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizsupplieraccount.param;
+package vip.xiaonuo.biz.modular.bizsupplier.param;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.util.Date;
-
 /**
  * 供应商账号信息添加参数
  *

+ 1 - 4
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplieraccount/param/BizSupplierAccountEditParam.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/param/BizSupplierAccountEditParam.java

@@ -10,16 +10,13 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizsupplieraccount.param;
+package vip.xiaonuo.biz.modular.bizsupplier.param;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 供应商账号信息编辑参数

+ 1 - 1
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplieraccount/param/BizSupplierAccountIdParam.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/param/BizSupplierAccountIdParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizsupplieraccount.param;
+package vip.xiaonuo.biz.modular.bizsupplier.param;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;

+ 1 - 3
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplieraccount/param/BizSupplierAccountPageParam.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/param/BizSupplierAccountPageParam.java

@@ -10,13 +10,11 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizsupplieraccount.param;
+package vip.xiaonuo.biz.modular.bizsupplier.param;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
-import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 供应商账号信息查询参数

+ 1 - 6
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsuppliertransport/param/BizSupplierTransportAddParam.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/param/BizSupplierTransportAddParam.java

@@ -10,17 +10,12 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizsuppliertransport.param;
+package vip.xiaonuo.biz.modular.bizsupplier.param;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.util.Date;
-
 /**
  * 供应商运输管理添加参数
  *

+ 1 - 4
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsuppliertransport/param/BizSupplierTransportEditParam.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/param/BizSupplierTransportEditParam.java

@@ -10,16 +10,13 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizsuppliertransport.param;
+package vip.xiaonuo.biz.modular.bizsupplier.param;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 供应商运输管理编辑参数

+ 1 - 1
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsuppliertransport/param/BizSupplierTransportIdParam.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/param/BizSupplierTransportIdParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizsuppliertransport.param;
+package vip.xiaonuo.biz.modular.bizsupplier.param;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;

+ 1 - 3
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsuppliertransport/param/BizSupplierTransportPageParam.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/param/BizSupplierTransportPageParam.java

@@ -10,13 +10,11 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizsuppliertransport.param;
+package vip.xiaonuo.biz.modular.bizsupplier.param;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
-import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 供应商运输管理查询参数

+ 6 - 6
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplieraccount/service/BizSupplierAccountService.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/service/BizSupplierAccountService.java

@@ -10,15 +10,15 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizsupplieraccount.service;
+package vip.xiaonuo.biz.modular.bizsupplier.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import vip.xiaonuo.biz.modular.bizsupplieraccount.entity.BizSupplierAccount;
-import vip.xiaonuo.biz.modular.bizsupplieraccount.param.BizSupplierAccountAddParam;
-import vip.xiaonuo.biz.modular.bizsupplieraccount.param.BizSupplierAccountEditParam;
-import vip.xiaonuo.biz.modular.bizsupplieraccount.param.BizSupplierAccountIdParam;
-import vip.xiaonuo.biz.modular.bizsupplieraccount.param.BizSupplierAccountPageParam;
+import vip.xiaonuo.biz.modular.bizsupplier.entity.BizSupplierAccount;
+import vip.xiaonuo.biz.modular.bizsupplier.param.BizSupplierAccountAddParam;
+import vip.xiaonuo.biz.modular.bizsupplier.param.BizSupplierAccountEditParam;
+import vip.xiaonuo.biz.modular.bizsupplier.param.BizSupplierAccountIdParam;
+import vip.xiaonuo.biz.modular.bizsupplier.param.BizSupplierAccountPageParam;
 
 import java.util.List;
 

+ 6 - 6
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsuppliertransport/service/BizSupplierTransportService.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/service/BizSupplierTransportService.java

@@ -10,15 +10,15 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizsuppliertransport.service;
+package vip.xiaonuo.biz.modular.bizsupplier.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import vip.xiaonuo.biz.modular.bizsuppliertransport.entity.BizSupplierTransport;
-import vip.xiaonuo.biz.modular.bizsuppliertransport.param.BizSupplierTransportAddParam;
-import vip.xiaonuo.biz.modular.bizsuppliertransport.param.BizSupplierTransportEditParam;
-import vip.xiaonuo.biz.modular.bizsuppliertransport.param.BizSupplierTransportIdParam;
-import vip.xiaonuo.biz.modular.bizsuppliertransport.param.BizSupplierTransportPageParam;
+import vip.xiaonuo.biz.modular.bizsupplier.entity.BizSupplierTransport;
+import vip.xiaonuo.biz.modular.bizsupplier.param.BizSupplierTransportAddParam;
+import vip.xiaonuo.biz.modular.bizsupplier.param.BizSupplierTransportEditParam;
+import vip.xiaonuo.biz.modular.bizsupplier.param.BizSupplierTransportIdParam;
+import vip.xiaonuo.biz.modular.bizsupplier.param.BizSupplierTransportPageParam;
 
 import java.util.List;
 

+ 8 - 8
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplieraccount/service/impl/BizSupplierAccountServiceImpl.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/service/impl/BizSupplierAccountServiceImpl.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizsupplieraccount.service.impl;
+package vip.xiaonuo.biz.modular.bizsupplier.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
@@ -24,13 +24,13 @@ import org.springframework.transaction.annotation.Transactional;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
-import vip.xiaonuo.biz.modular.bizsupplieraccount.entity.BizSupplierAccount;
-import vip.xiaonuo.biz.modular.bizsupplieraccount.mapper.BizSupplierAccountMapper;
-import vip.xiaonuo.biz.modular.bizsupplieraccount.param.BizSupplierAccountAddParam;
-import vip.xiaonuo.biz.modular.bizsupplieraccount.param.BizSupplierAccountEditParam;
-import vip.xiaonuo.biz.modular.bizsupplieraccount.param.BizSupplierAccountIdParam;
-import vip.xiaonuo.biz.modular.bizsupplieraccount.param.BizSupplierAccountPageParam;
-import vip.xiaonuo.biz.modular.bizsupplieraccount.service.BizSupplierAccountService;
+import vip.xiaonuo.biz.modular.bizsupplier.entity.BizSupplierAccount;
+import vip.xiaonuo.biz.modular.bizsupplier.mapper.BizSupplierAccountMapper;
+import vip.xiaonuo.biz.modular.bizsupplier.param.BizSupplierAccountAddParam;
+import vip.xiaonuo.biz.modular.bizsupplier.param.BizSupplierAccountEditParam;
+import vip.xiaonuo.biz.modular.bizsupplier.param.BizSupplierAccountIdParam;
+import vip.xiaonuo.biz.modular.bizsupplier.param.BizSupplierAccountPageParam;
+import vip.xiaonuo.biz.modular.bizsupplier.service.BizSupplierAccountService;
 
 import java.util.List;
 

+ 8 - 8
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsuppliertransport/service/impl/BizSupplierTransportServiceImpl.java → snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/service/impl/BizSupplierTransportServiceImpl.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.biz.modular.bizsuppliertransport.service.impl;
+package vip.xiaonuo.biz.modular.bizsupplier.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
@@ -24,13 +24,13 @@ import org.springframework.transaction.annotation.Transactional;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
-import vip.xiaonuo.biz.modular.bizsuppliertransport.entity.BizSupplierTransport;
-import vip.xiaonuo.biz.modular.bizsuppliertransport.mapper.BizSupplierTransportMapper;
-import vip.xiaonuo.biz.modular.bizsuppliertransport.param.BizSupplierTransportAddParam;
-import vip.xiaonuo.biz.modular.bizsuppliertransport.param.BizSupplierTransportEditParam;
-import vip.xiaonuo.biz.modular.bizsuppliertransport.param.BizSupplierTransportIdParam;
-import vip.xiaonuo.biz.modular.bizsuppliertransport.param.BizSupplierTransportPageParam;
-import vip.xiaonuo.biz.modular.bizsuppliertransport.service.BizSupplierTransportService;
+import vip.xiaonuo.biz.modular.bizsupplier.entity.BizSupplierTransport;
+import vip.xiaonuo.biz.modular.bizsupplier.mapper.BizSupplierTransportMapper;
+import vip.xiaonuo.biz.modular.bizsupplier.param.BizSupplierTransportAddParam;
+import vip.xiaonuo.biz.modular.bizsupplier.param.BizSupplierTransportEditParam;
+import vip.xiaonuo.biz.modular.bizsupplier.param.BizSupplierTransportIdParam;
+import vip.xiaonuo.biz.modular.bizsupplier.param.BizSupplierTransportPageParam;
+import vip.xiaonuo.biz.modular.bizsupplier.service.BizSupplierTransportService;
 
 import java.util.List;
 

+ 3 - 3
snowy-web-app/src/main/resources/application-local.properties

@@ -200,9 +200,9 @@ open-sign.interceptor.sign.enable=true
 open-sign.interceptor.sign.include-paths=/thirdPart/v1/**
 
 #mqtt
-snowy.config.common.mqtt-url=tcp://218.2.6.74:13883
-snowy.config.common.mqtt-name=bydz-smt
-snowy.config.common.mqtt-password=bydzsmt123!@#
+snowy.config.common.mqtt-url=tcp://127.0.0.1:1883
+snowy.config.common.mqtt-name=admin
+snowy.config.common.mqtt-password=public
 snowy.config.common.mqtt-clientId=my-mqtt-client-id
 
 #?????