diff --git a/yudao-ui-admin-vben-master/.env.development b/yudao-ui-admin-vben-master/.env.development
index 8e2b007..f43a104 100644
--- a/yudao-ui-admin-vben-master/.env.development
+++ b/yudao-ui-admin-vben-master/.env.development
@@ -7,14 +7,14 @@ VITE_PUBLIC_PATH = /
# 本地开发代理,可以解决跨域及多地址代理
# 如果接口地址匹配到,则会转发到http://localhost:3000,防止本地出现跨域问题
# 可以有多个,注意多个不能换行,否则代理将会失效
-VITE_PROXY = [["/dev-api","http://localhost:8091/admin-api"],["/upload","http://localhost:48080/admin-api/infra/file/upload"]]
+VITE_PROXY = [["/dev-api","http://192.168.0.162:8091/admin-api"],["/upload","http://192.168.0.162:8091/admin-api/infra/file/upload"]]
# VITE_PROXY=[["/api","http://vben.xingyuv.com/test"]]
# 是否删除Console.log
VITE_DROP_CONSOLE = false
# 基础页面地址,例如 swagger 等页面
-VITE_GLOB_BASE_URL = "http://localhost:8091"
+VITE_GLOB_BASE_URL = "http://192.168.0.162:8091"
# 接口地址,如果没有跨域问题,直接在这里配置即可
VITE_GLOB_API_URL = /dev-api
diff --git a/yudao-ui-admin-vben-master/npm b/yudao-ui-admin-vben-master/npm
new file mode 100644
index 0000000..e69de29
diff --git a/yudao-ui-admin-vben-master/src/api/system/enterprise/index.ts b/yudao-ui-admin-vben-master/src/api/system/enterprise/index.ts
index af8ddbe..0e3ef42 100644
--- a/yudao-ui-admin-vben-master/src/api/system/enterprise/index.ts
+++ b/yudao-ui-admin-vben-master/src/api/system/enterprise/index.ts
@@ -20,6 +20,12 @@ export function updateEnterprise(data) {
return defHttp.put({ url: '/system/enterprise/update', data })
}
+// 修改企业状态
+export function updateEnterpriseStatus(data) {
+ return defHttp.put({ url: '/system/enterprise/updateStatus', data })
+}
+
+
// 删除企业信息
export function deleteEnterprise(id: number) {
return defHttp.delete({ url: '/system/enterprise/delete?id=' + id })
diff --git a/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts b/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts
index f77ab45..d254b0a 100644
--- a/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts
+++ b/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts
@@ -25,7 +25,12 @@ export function deleteBusinessWarehouse(id: number) {
return defHttp.delete({ url: '/system/business-warehouse/delete?id=' + id })
}
-// 导出业务线/仓库 Excel
+// 导出业务线 Excel
export function exportBusinessWarehouse(params) {
- return defHttp.download({ url: '/xxjj/business-warehouse/export-excel', params }, '业务线/仓库.xls')
+ return defHttp.download({ url: '/system/business-warehouse/export-excel', params }, '业务线.xls')
}
+
+// 查询业务线(精简)列表
+export function listSimpleBusiness() {
+ return defHttp.get({ url: '/system/business-warehouse/list-all-simple' })
+ }
diff --git a/yudao-ui-admin-vben-master/src/api/xxjj/customer/index.ts b/yudao-ui-admin-vben-master/src/api/xxjj/customer/index.ts
new file mode 100644
index 0000000..ef093c6
--- /dev/null
+++ b/yudao-ui-admin-vben-master/src/api/xxjj/customer/index.ts
@@ -0,0 +1,31 @@
+import { defHttp } from '@/utils/http/axios'
+
+// 查询客户信息列表
+export function getCustomerPage(params) {
+ return defHttp.get({ url: '/xxjj/customer/page', params })
+}
+
+// 查询客户信息详情
+export function getCustomer(id: number) {
+ return defHttp.get({ url: '/xxjj/customer/get?id=' + id })
+}
+
+// 新增客户信息
+export function createCustomer(data) {
+ return defHttp.post({ url: '/xxjj/customer/create', data })
+}
+
+// 修改客户信息
+export function updateCustomer(data) {
+ return defHttp.put({ url: '/xxjj/customer/update', data })
+}
+
+// 删除客户信息
+export function deleteCustomer(id: number) {
+ return defHttp.delete({ url: '/xxjj/customer/delete?id=' + id })
+}
+
+// 导出客户信息 Excel
+export function exportCustomer(params) {
+ return defHttp.download({ url: '/xxjj/customer/export-excel', params }, '客户信息.xls')
+}
diff --git a/yudao-ui-admin-vben-master/src/main.ts b/yudao-ui-admin-vben-master/src/main.ts
index bcb2c12..b1b5d8f 100644
--- a/yudao-ui-admin-vben-master/src/main.ts
+++ b/yudao-ui-admin-vben-master/src/main.ts
@@ -5,6 +5,7 @@ import './design/index.less'
// Register icon sprite
import 'virtual:svg-icons-register'
import { createApp } from 'vue'
+import Antd from 'ant-design-vue'
import App from './App.vue'
import { initAppConfigStore } from '@/logics/initAppConfig'
import { setupErrorHandle } from '@/logics/error-handle'
@@ -17,6 +18,7 @@ import { registerGlobComp } from '@/components/registerGlobComp'
import '@/utils/tongji'
+
async function bootstrap() {
const app = createApp(App)
@@ -57,7 +59,7 @@ async function bootstrap() {
// https://next.router.vuejs.org/api/#isready
// await router.isReady();
- app.mount('#app')
+ app.use(Antd).mount('#app')
}
bootstrap()
diff --git a/yudao-ui-admin-vben-master/src/utils/dict.ts b/yudao-ui-admin-vben-master/src/utils/dict.ts
index 79aaa0f..8a150a0 100644
--- a/yudao-ui-admin-vben-master/src/utils/dict.ts
+++ b/yudao-ui-admin-vben-master/src/utils/dict.ts
@@ -156,9 +156,11 @@ export enum DICT_TYPE {
// ============= BUSINESSLINE 模块=================
BUSINESS_TYPE = 'business_type', //业务线类型
DIFF_FLAG = 'diff_flag',
+ CLASS_STATUS = 'class_status', //类别状态
+ DUTY_TYPE = 'duty_type', //业务线的所属分类
+ BUSINESS_ORGANIZATION_TYPE = 'business_organization_type', //业务组织类型
// ============= ENTERPRISEBRANCHING 模块=================
ENTERPRISE_TYPE = 'enterprise_type', //业务线类型
- CLASS_STATUS = 'class_status',
}
diff --git a/yudao-ui-admin-vben-master/src/views/base/profile/data.ts b/yudao-ui-admin-vben-master/src/views/base/profile/data.ts
index 61f7466..12d6da3 100644
--- a/yudao-ui-admin-vben-master/src/views/base/profile/data.ts
+++ b/yudao-ui-admin-vben-master/src/views/base/profile/data.ts
@@ -34,6 +34,7 @@ export const settingList = [
name: '新消息通知',
component: 'MsgNotify',
},
+
]
// 基础设置 form
diff --git a/yudao-ui-admin-vben-master/src/views/base/profile/index.vue b/yudao-ui-admin-vben-master/src/views/base/profile/index.vue
index a48e4e3..33f7371 100644
--- a/yudao-ui-admin-vben-master/src/views/base/profile/index.vue
+++ b/yudao-ui-admin-vben-master/src/views/base/profile/index.vue
@@ -6,6 +6,7 @@ import BaseSetting from './BaseSetting.vue'
import SecureSetting from './SecureSetting.vue'
import AccountBind from './AccountBind.vue'
import MsgNotify from './MsgNotify.vue'
+
import { ScrollContainer } from '@/components/Container/index'
const wrapperRef = ref(null)
diff --git a/yudao-ui-admin-vben-master/src/views/users/mine.rar b/yudao-ui-admin-vben-master/src/views/users/mine.rar
new file mode 100644
index 0000000..b150a5f
Binary files /dev/null and b/yudao-ui-admin-vben-master/src/views/users/mine.rar differ
diff --git a/yudao-ui-admin-vben-master/src/views/users/mine/index.vue b/yudao-ui-admin-vben-master/src/views/users/mine/index.vue
new file mode 100644
index 0000000..b1f38bf
--- /dev/null
+++ b/yudao-ui-admin-vben-master/src/views/users/mine/index.vue
@@ -0,0 +1,890 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ `2023-08-22` }}
+
+
+
+
+
+
+
+
+ {{ `kang-pc` }}
+
+ {{ `上海市长宁区 14.127.100.242` }}
+
+
+
+ {{ `2023-08-22 12:00` }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 全部信息
+
+
+ 服务信息
+
+
+ 活动信息
+
+
+ 产品信息
+
+
+ 安全信息
+
+
+ 故障信息
+
+
+
+
+ 全部标记为已读
+
+
+
+
+
+
+
+
+
+ 关于供应链管理平台正式上线的通知
+
+
+
+
+
消息类型:{{ `产品信息` }}发布时间:{{ `2023-08-22 22:31` }}
+
+
+
+ 8月22日,由长江云息打造的供应链管理平台正式上线运行!该项目基于云息云建设,涵盖采购需求、采购价格、采购配额、采购订单、到货签收、质量协同、对账开票、付款计划 / 付款申请等全业务流程,助力客户实现对标准采购、VMI 采购、委外加工等业务的全面管理,实现供应商全周期管理,实现从需求、寻源、合同到采购执行的全过程管理,打造具有云息特色的端到端的数智化供应链管理体系。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ `济钢城市矿产科技有限公司` }}
+
+ 职务:{{ `产品经理` }}
+
+
+
+
+
+ 部门:{{ `再生资源事业部<采购部` }}
+
+
+ 业务线:{{ `废铁、废铝` }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganization/BusinessOrganizationModal.vue b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganization/BusinessOrganizationModal.vue
new file mode 100644
index 0000000..1f4d021
--- /dev/null
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganization/BusinessOrganizationModal.vue
@@ -0,0 +1,57 @@
+
+
+
+
+
+
diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganization/businessOrganization.data.ts b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganization/businessOrganization.data.ts
new file mode 100644
index 0000000..75d6aab
--- /dev/null
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganization/businessOrganization.data.ts
@@ -0,0 +1,258 @@
+import { BasicColumn, FormSchema, useRender } from '@/components/Table'
+import { DICT_TYPE, getDictOptions } from '@/utils/dict'
+import { listSimpleBusiness } from '@/api/xxjj/businessWarehouse'
+
+export const columns: BasicColumn[] = [
+ {
+ title: '业务线名称',
+ dataIndex: 'name',
+ width: 160
+ },
+ {
+ title: '类型',
+ dataIndex: 'type',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.BUSINESS_ORGANIZATION_TYPE)
+ }
+ },
+ {
+ title: '状态',
+ dataIndex: 'type',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.CLASS_STATUS)
+ }
+ },
+ {
+ title: '成员数量',
+ dataIndex: 'employeeNum',
+ width: 160
+ },
+ {
+ title: '主管人员',
+ dataIndex: 'belongUserId',
+ width: 160
+ },
+ {
+ title: '描述',
+ dataIndex: 'description',
+ width: 160
+ },
+ {
+ title: '更新时间',
+ dataIndex: 'updateTime',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDate(text)
+ }
+ },
+]
+
+export const searchFormSchema: FormSchema[] = [
+ {
+ label: '业务线名称',
+ field: 'name',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ // {
+ // label: '类型',
+ // field: 'type',
+ // component: 'Select',
+ // componentProps: {
+ // options: getDictOptions(DICT_TYPE.BUSINESS_ORGANIZATION_TYPE)
+ // },
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '所属行业',
+ // field: 'industry',
+ // component: 'Select',
+ // componentProps: {
+ // options: getDictOptions(DICT_TYPE.DUTY_TYPE)
+ // },
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '成立时间',
+ // field: 'establishDate',
+ // component: 'RangePicker',
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '归属人员',
+ // field: 'belongUserId',
+ // component: 'Input',
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '品牌/业务线/事业群名称',
+ // field: 'brandName',
+ // component: 'Input',
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '业务线仓库区分(0:业务线,1:仓库)',
+ // field: 'diffFlag',
+ // component: 'Select',
+ // componentProps: {
+ // options: getDictOptions(DICT_TYPE.DIFF_FLAG)
+ // },
+ // colProps: { span: 8 }
+ // },
+]
+
+export const createFormSchema: FormSchema[] = [
+ {
+ label: '编号',
+ field: 'id',
+ show: false,
+ component: 'Input'
+ },
+ {
+ label: '业务组织编号',
+ field: 'businessCode',
+ required: true,
+ component: 'Input'
+ },
+ {
+ label: '业务组织名称',
+ field: 'name',
+ required: true,
+ component: 'Input'
+ },
+ {
+ label: '业务组织简称',
+ field: 'businessSimple',
+ component: 'Input'
+ },
+ {
+ label: '业务组织简称',
+ field: 'businessSimple',
+ component: 'Input'
+ },
+ {
+ label: '隶属业务线',
+ field: 'parentId',
+ required: true,
+ component: 'ApiTreeSelect',
+ componentProps: {
+ api: () => listSimpleBusiness(),
+ fieldNames: {
+ label: 'name',
+ key: 'id',
+ value: 'id',
+ },
+ handleTree: 'id',
+ },
+ },
+ {
+ label: '类型',
+ field: 'type',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.BUSINESS_ORGANIZATION_TYPE, 'number')
+ }
+ },
+ {
+ label: '所在城市',
+ field: 'city',
+ component: 'Input'
+ },
+ {
+ label: '成立时间',
+ field: 'establishDate',
+ component: 'DatePicker'
+ },
+ {
+ label: '归属人员',
+ field: 'belongUserId',
+ component: 'Input'
+ },
+ {
+ label: '介绍',
+ field: 'description',
+ component: 'InputTextArea'
+ },
+ {
+ label: '区分标志',
+ field: 'diffFlag',
+ required: true,
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.DIFF_FLAG, 'number')
+ }
+ },
+]
+
+export const updateFormSchema: FormSchema[] = [
+ {
+ label: '编号',
+ field: 'id',
+ show: false,
+ component: 'Input'
+ },
+ {
+ label: '业务线编号',
+ field: 'businessCode',
+ required: true,
+ component: 'Input'
+ },
+ {
+ label: '业务线名称',
+ field: 'name',
+ required: true,
+ component: 'Input'
+ },
+ {
+ label: '业务线简称',
+ field: 'businessSimple',
+ component: 'Input'
+ },
+ {
+ label: '类型',
+ field: 'type',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.BUSINESS_ORGANIZATION_TYPE, 'number')
+ }
+ },
+ {
+ label: '所属行业',
+ field: 'industry',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.DUTY_TYPE, 'number')
+ }
+ },
+ {
+ label: '所在城市',
+ field: 'city',
+ component: 'Input'
+ },
+ {
+ label: '成立时间',
+ field: 'establishDate',
+ component: 'DatePicker'
+ },
+ {
+ label: '介绍',
+ field: 'description',
+ component: 'InputTextArea'
+ },
+ {
+ label: '归属人员',
+ field: 'belongUserId',
+ component: 'Input'
+ },
+ {
+ label: '区分标志',
+ field: 'diffFlag',
+ required: true,
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.DIFF_FLAG, 'number')
+ }
+ },
+]
\ No newline at end of file
diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganization/index.vue b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganization/index.vue
new file mode 100644
index 0000000..6f072bd
--- /dev/null
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganization/index.vue
@@ -0,0 +1,92 @@
+
+
+
+
+
+ {{ t('action.create') }}
+
+
+ {{ t('action.export') }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/BusinessTree.vue b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/BusinessTree.vue
new file mode 100644
index 0000000..200b9f1
--- /dev/null
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/BusinessTree.vue
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/BusinessWarehouseModal.vue b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/BusinessWarehouseModal.vue
new file mode 100644
index 0000000..d75087f
--- /dev/null
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/BusinessWarehouseModal.vue
@@ -0,0 +1,57 @@
+
+
+
+
+
+
diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/businessWarehouse.data.ts b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/businessWarehouse.data.ts
new file mode 100644
index 0000000..0542cdd
--- /dev/null
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/businessWarehouse.data.ts
@@ -0,0 +1,250 @@
+import { BasicColumn, FormSchema, useRender } from '@/components/Table'
+import { DICT_TYPE, getDictOptions } from '@/utils/dict'
+
+export const columns: BasicColumn[] = [
+ {
+ title: '业务线名称',
+ dataIndex: 'name',
+ width: 160
+ },
+ {
+ title: '类型',
+ dataIndex: 'type',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.BUSINESS_TYPE)
+ }
+ },
+ {
+ title: '状态',
+ dataIndex: 'type',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.CLASS_STATUS)
+ }
+ },
+ {
+ title: '关联机构',
+ dataIndex: 'institutionNum',
+ width: 160
+ },
+ {
+ title: '成员数量',
+ dataIndex: 'employeeNum',
+ width: 160
+ },
+ {
+ title: '主管人员',
+ dataIndex: 'belongUserId',
+ width: 160
+ },
+ {
+ title: '介绍',
+ dataIndex: 'description',
+ width: 160
+ },
+ {
+ title: '更新时间',
+ dataIndex: 'updateTime',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDate(text)
+ }
+ },
+]
+
+export const searchFormSchema: FormSchema[] = [
+ {
+ label: '业务线名称',
+ field: 'name',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ // {
+ // label: '类型',
+ // field: 'type',
+ // component: 'Select',
+ // componentProps: {
+ // options: getDictOptions(DICT_TYPE.BUSINESS_TYPE)
+ // },
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '所属行业',
+ // field: 'industry',
+ // component: 'Select',
+ // componentProps: {
+ // options: getDictOptions(DICT_TYPE.DUTY_TYPE)
+ // },
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '成立时间',
+ // field: 'establishDate',
+ // component: 'RangePicker',
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '归属人员',
+ // field: 'belongUserId',
+ // component: 'Input',
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '品牌/业务线/事业群名称',
+ // field: 'brandName',
+ // component: 'Input',
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '业务线仓库区分(0:业务线,1:仓库)',
+ // field: 'diffFlag',
+ // component: 'Select',
+ // componentProps: {
+ // options: getDictOptions(DICT_TYPE.DIFF_FLAG)
+ // },
+ // colProps: { span: 8 }
+ // },
+]
+
+export const createFormSchema: FormSchema[] = [
+ {
+ label: '编号',
+ field: 'id',
+ show: false,
+ component: 'Input'
+ },
+ {
+ label: '业务线编号',
+ field: 'businessCode',
+ required: true,
+ component: 'Input'
+ },
+ {
+ label: '业务线名称',
+ field: 'name',
+ required: true,
+ component: 'Input'
+ },
+ {
+ label: '业务线简称',
+ field: 'businessSimple',
+ component: 'Input'
+ },
+ {
+ label: '类型',
+ field: 'type',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.BUSINESS_TYPE, 'number')
+ }
+ },
+ {
+ label: '所属行业',
+ field: 'industry',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.DUTY_TYPE, 'number')
+ }
+ },
+ {
+ label: '所在城市',
+ field: 'city',
+ component: 'Input'
+ },
+ {
+ label: '成立时间',
+ field: 'establishDate',
+ component: 'DatePicker'
+ },
+ {
+ label: '介绍',
+ field: 'description',
+ component: 'InputTextArea'
+ },
+ {
+ label: '归属人员',
+ field: 'belongUserId',
+ component: 'Input'
+ },
+ {
+ label: '区分标志',
+ field: 'diffFlag',
+ required: true,
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.DIFF_FLAG, 'number')
+ }
+ },
+]
+
+export const updateFormSchema: FormSchema[] = [
+ {
+ label: '编号',
+ field: 'id',
+ show: false,
+ component: 'Input'
+ },
+ {
+ label: '业务线编号',
+ field: 'businessCode',
+ required: true,
+ component: 'Input'
+ },
+ {
+ label: '业务线名称',
+ field: 'name',
+ required: true,
+ component: 'Input'
+ },
+ {
+ label: '业务线简称',
+ field: 'businessSimple',
+ component: 'Input'
+ },
+ {
+ label: '类型',
+ field: 'type',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.BUSINESS_TYPE, 'number')
+ }
+ },
+ {
+ label: '所属行业',
+ field: 'industry',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.DUTY_TYPE, 'number')
+ }
+ },
+ {
+ label: '所在城市',
+ field: 'city',
+ component: 'Input'
+ },
+ {
+ label: '成立时间',
+ field: 'establishDate',
+ component: 'DatePicker'
+ },
+ {
+ label: '介绍',
+ field: 'description',
+ component: 'InputTextArea'
+ },
+ {
+ label: '归属人员',
+ field: 'belongUserId',
+ component: 'Input'
+ },
+ {
+ label: '区分标志',
+ field: 'diffFlag',
+ required: true,
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.DIFF_FLAG, 'number')
+ }
+ },
+]
\ No newline at end of file
diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/index.vue b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/index.vue
new file mode 100644
index 0000000..7467aa8
--- /dev/null
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/index.vue
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+ {{ t('action.create') }}
+
+
+ {{ t('action.export') }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/BusinessWarehouseModal.vue b/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/BusinessWarehouseModal.vue
index d75087f..af624f5 100644
--- a/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/BusinessWarehouseModal.vue
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/BusinessWarehouseModal.vue
@@ -21,7 +21,7 @@ const isUpdate = ref(true)
const [registerForm, { setFieldsValue, resetFields, resetSchema, validate }] = useForm({
labelWidth: 120,
- baseColProps: { span: 24 },
+ baseColProps: { span: 12 },
schemas: createFormSchema,
showActionButtonGroup: false,
actionColOptions: { span: 23 }
diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/businessWarehouse.data.ts b/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/businessWarehouse.data.ts
index 1e2ea6d..f98e2e2 100644
--- a/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/businessWarehouse.data.ts
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/businessWarehouse.data.ts
@@ -120,26 +120,6 @@ export const createFormSchema: FormSchema[] = [
required: true,
component: 'Input'
},
- {
- label: '业务线简称',
- field: 'businessSimple',
- component: 'Input'
- },
- {
- label: '传真',
- field: 'fax',
- component: 'Input'
- },
- {
- label: '网址',
- field: 'url',
- component: 'Input'
- },
- {
- label: '介绍',
- field: 'description',
- component: 'InputTextArea'
- },
{
label: '业务线名称',
field: 'name',
@@ -147,17 +127,8 @@ export const createFormSchema: FormSchema[] = [
component: 'Input'
},
{
- label: '业务线LOGO',
- field: 'businessLogo',
- component: 'FileUpload',
- componentProps: {
- fileType: 'file',
- maxCount: 1
- }
- },
- {
- label: '父id',
- field: 'parentId',
+ label: '业务线简称',
+ field: 'businessSimple',
component: 'Input'
},
{
@@ -187,22 +158,17 @@ export const createFormSchema: FormSchema[] = [
component: 'DatePicker'
},
{
- label: '归属人员',
- field: 'belongUserId',
- component: 'Input'
- },
- {
- label: '品牌/业务线/事业群名称',
- field: 'brandName',
- component: 'Input'
+ label: '介绍',
+ field: 'description',
+ component: 'InputTextArea'
},
{
- label: '电话',
- field: 'phone',
+ label: '归属人员',
+ field: 'belongUserId',
component: 'Input'
},
{
- label: '业务线仓库区分(0:业务线,1:仓库)',
+ label: '区分标志',
field: 'diffFlag',
required: true,
component: 'Select',
@@ -225,11 +191,6 @@ export const updateFormSchema: FormSchema[] = [
required: true,
component: 'Input'
},
- {
- label: '业务线简称',
- field: 'businessSimple',
- component: 'Input'
- },
{
label: '业务线名称',
field: 'name',
@@ -237,13 +198,8 @@ export const updateFormSchema: FormSchema[] = [
component: 'Input'
},
{
- label: '业务线LOGO',
- field: 'businessLogo',
- component: 'Upload'
- },
- {
- label: '父id',
- field: 'parentId',
+ label: '业务线简称',
+ field: 'businessSimple',
component: 'Input'
},
{
@@ -272,38 +228,18 @@ export const updateFormSchema: FormSchema[] = [
field: 'establishDate',
component: 'DatePicker'
},
- {
- label: '归属人员',
- field: 'belongUserId',
- component: 'Input'
- },
- {
- label: '品牌/业务线/事业群名称',
- field: 'brandName',
- component: 'Input'
- },
- {
- label: '电话',
- field: 'phone',
- component: 'Input'
- },
- {
- label: '传真',
- field: 'fax',
- component: 'Input'
- },
- {
- label: '网址',
- field: 'url',
- component: 'Input'
- },
{
label: '介绍',
field: 'description',
component: 'InputTextArea'
},
{
- label: '业务线仓库区分(0:业务线,1:仓库)',
+ label: '归属人员',
+ field: 'belongUserId',
+ component: 'Input'
+ },
+ {
+ label: '区分标志',
field: 'diffFlag',
required: true,
component: 'Select',
@@ -311,4 +247,4 @@ export const updateFormSchema: FormSchema[] = [
options: getDictOptions(DICT_TYPE.DIFF_FLAG, 'number')
}
},
-]
\ No newline at end of file
+]
diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/index.vue b/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/index.vue
index 6090326..6bf4ca8 100644
--- a/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/index.vue
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/index.vue
@@ -2,10 +2,10 @@
-
+
{{ t('action.create') }}
-
+
{{ t('action.export') }}
@@ -13,12 +13,12 @@
+
+
+
+
diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/customer/customer.data.ts b/yudao-ui-admin-vben-master/src/views/xxjj/customer/customer.data.ts
new file mode 100644
index 0000000..1cae902
--- /dev/null
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/customer/customer.data.ts
@@ -0,0 +1,1446 @@
+import { BasicColumn, FormSchema, useRender } from '@/components/Table'
+import { DICT_TYPE, getDictOptions } from '@/utils/dict'
+
+export const columns: BasicColumn[] = [
+ {
+ title: '编号',
+ dataIndex: 'id',
+ width: 160
+ },
+ {
+ title: '客户分类(0:一级客户 1:二级客户)',
+ dataIndex: 'customerCalssify',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.CUSTOMER_CALSSIFY)
+ }
+ },
+ {
+ title: '客户名称',
+ dataIndex: 'customerName',
+ width: 160
+ },
+ {
+ title: '公司logo',
+ dataIndex: 'customerLogo',
+ width: 160
+ },
+ {
+ title: '企业性质(0:国有企业 1:集体企业 2:私营企业 3:股份制企业 4:外资企业 5:合资企业)',
+ dataIndex: 'enterpriseNature',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.ENTERPRISE_NATURE)
+ }
+ },
+ {
+ title: '客户来源(0:电话营销 1:主动来电 2:客户介绍 3:朋友介绍 4:独立开发 5:网络搜索 6:广告杂志 7:展会促销 8:其他途径)',
+ dataIndex: 'customerSource',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.PRODUCT_CLASS)
+ }
+ },
+ {
+ title: '客户星级(0:一星 1:二星 2:三星 3:四星 4:五星)',
+ dataIndex: 'customerStarrating',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.CUSTOMER_STARRATING)
+ }
+ },
+ {
+ title: '业务进度(0:了解跟进 1:资料收集 2:客户评审 3:风控核准 4:合作洽谈 5:准备签约 6:已经签约 7:合作叫停 8:暂时搁置)',
+ dataIndex: 'industrySchedule',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.INDUSTRY_SCHEDULE)
+ }
+ },
+ {
+ title: '归属人员',
+ dataIndex: 'belongingPeople',
+ width: 160
+ },
+ {
+ title: '国家',
+ dataIndex: 'country',
+ width: 160
+ },
+ {
+ title: '详细地址',
+ dataIndex: 'address',
+ width: 160
+ },
+ {
+ title: '公司电话',
+ dataIndex: 'phone',
+ width: 160
+ },
+ {
+ title: '公司传真',
+ dataIndex: 'companyFax',
+ width: 160
+ },
+ {
+ title: '公司网址',
+ dataIndex: 'companyHttp',
+ width: 160
+ },
+ {
+ title: '公司介绍',
+ dataIndex: 'companyProfile',
+ width: 160
+ },
+ {
+ title: '客户状态(0:待提交 1:待审核 2:待核准 3:带启用 4:已启用 5:已禁用 6:已关闭)',
+ dataIndex: 'customerStatus',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.CUSTOMER_STATUS1)
+ }
+ },
+ {
+ title: '创建时间',
+ dataIndex: 'createTime',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDate(text)
+ }
+ },
+ {
+ title: '行业分类(0:家用电器 1:交通运输 2:商务服务 3:家具用品 4:电工电气 5:通信产品 6:办公文教 7:运动休闲 8:传媒广电)',
+ dataIndex: 'industryClassify',
+ width: 160
+ },
+ {
+ title: '所在城市',
+ dataIndex: 'city',
+ width: 160
+ },
+ {
+ title: '社会信息代码证(营业执照)',
+ dataIndex: 'socialInformationCodeCertificate',
+ width: 160
+ },
+ {
+ title: '法定代表人证件照',
+ dataIndex: 'legalRepresentativesPhoto',
+ width: 160
+ },
+ {
+ title: '实缴资金证明',
+ dataIndex: 'proofPaidCapital',
+ width: 160
+ },
+ {
+ title: '资产证明',
+ dataIndex: 'assetCertificate',
+ width: 160
+ },
+ {
+ title: '资产抵押证明',
+ dataIndex: 'assetCertificateMortgage',
+ width: 160
+ },
+ {
+ title: '担保人证明',
+ dataIndex: 'guarantorCertificate',
+ width: 160
+ },
+ {
+ title: '其他资质文件',
+ dataIndex: 'otherQualifications',
+ width: 160
+ },
+ {
+ title: '经营范围',
+ dataIndex: 'businessScope',
+ width: 160
+ },
+ {
+ title: '合作范围(关联业务线)',
+ dataIndex: 'collaborationScopeNum',
+ width: 160
+ },
+ {
+ title: '合作起始时间',
+ dataIndex: 'collaborationTime',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDate(text)
+ }
+ },
+ {
+ title: '供货量(每月下限)',
+ dataIndex: 'supplyVolumeDown',
+ width: 160
+ },
+ {
+ title: '供货量(每月下限)',
+ dataIndex: 'supplyVolumeUpper',
+ width: 160
+ },
+ {
+ title: '资金额度',
+ dataIndex: 'fundLimit',
+ width: 160
+ },
+ {
+ title: '营业时间',
+ dataIndex: 'businessHours',
+ width: 160
+ },
+ {
+ title: '允许卸货时间',
+ dataIndex: 'allowableUnloadingTime',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDate(text)
+ }
+ },
+ {
+ title: '卸货效率',
+ dataIndex: 'unloadingEfficiency',
+ width: 160
+ },
+ {
+ title: '允许装货时间',
+ dataIndex: 'allowableShipmentTime',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDate(text)
+ }
+ },
+ {
+ title: '装货效果',
+ dataIndex: 'shipmentEffciency',
+ width: 160
+ },
+ {
+ title: '付款方式(0:无 1:现金 2:银行转账 3:承兑汇票 4:有赞代收 5:支付宝 6:微信 7:国家列表)',
+ dataIndex: 'paymentMethod',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.PAYMENT_METHOD)
+ }
+ },
+ {
+ title: '账户名称',
+ dataIndex: 'accountName',
+ width: 160
+ },
+ {
+ title: '银行账号',
+ dataIndex: 'bankAccount',
+ width: 160
+ },
+ {
+ title: '开户银行',
+ dataIndex: 'bankDeposit',
+ width: 160
+ },
+ {
+ title: '开户地区',
+ dataIndex: 'depositArea',
+ width: 160
+ },
+ {
+ title: '支行名称',
+ dataIndex: 'bankBranch',
+ width: 160
+ },
+ {
+ title: '公司税号',
+ dataIndex: 'companyTaxNumber',
+ width: 160
+ },
+ {
+ title: '企业名称',
+ dataIndex: 'enterpriseName',
+ width: 160
+ },
+ {
+ title: '单位地址',
+ dataIndex: 'workAddress',
+ width: 160
+ },
+ {
+ title: '合作方式(0:买断 1:联营)',
+ dataIndex: 'collaborationMethod',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.COLLABORATION_METHOD)
+ }
+ },
+ {
+ title: '结算方式(0:先货后款 1:先款后货)',
+ dataIndex: 'settlementMethod',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.SETTLEMENT_METHOD)
+ }
+ },
+ {
+ title: '账期',
+ dataIndex: 'accountPeriod',
+ width: 160
+ },
+ {
+ title: '压款方式(0:无 1:按金额 2:按比例)',
+ dataIndex: 'underpaymentMethod',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.UNDERPAYMENT_METHOD)
+ }
+ },
+ {
+ title: '默认压款比例',
+ dataIndex: 'defaultUnderpaymentRatio',
+ width: 160
+ },
+ {
+ title: '申请压款比例',
+ dataIndex: 'applyForUnderpaymentRatio',
+ width: 160
+ },
+ {
+ title: '保证金方式(0:无 1:按金额 2:按比例)',
+ dataIndex: 'marginMethod',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.MARGIN_METHOD)
+ }
+ },
+ {
+ title: '默认保证金比例',
+ dataIndex: 'defaultMarginRatio',
+ width: 160
+ },
+ {
+ title: '申请保证金比例',
+ dataIndex: 'applyForMarginRatio',
+ width: 160
+ },
+ {
+ title: '逾期利率(0:按年化1:按月化)',
+ dataIndex: 'overdueInterestRate',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.OVERDUE_INTEREST_RATE)
+ }
+ },
+ {
+ title: '默认逾期利率',
+ dataIndex: 'defaultOverdueRatio',
+ width: 160
+ },
+ {
+ title: '申请逾期利率',
+ dataIndex: 'applyForOverdueRatio',
+ width: 160
+ },
+ {
+ title: '客户联系人id',
+ dataIndex: 'contactsId',
+ width: 160
+ },
+ {
+ title: '客户类型',
+ dataIndex: 'customerType',
+ width: 160
+ },
+ {
+ title: '账户类型',
+ dataIndex: 'accountType',
+ width: 160
+ },
+ {
+ title: '卸货时长',
+ dataIndex: 'unloading',
+ width: 160
+ },
+ {
+ title: '装货时长',
+ dataIndex: 'shipment',
+ width: 160
+ },
+]
+
+export const searchFormSchema: FormSchema[] = [
+ {
+ label: '客户分类(0:一级客户 1:二级客户)',
+ field: 'customerCalssify',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.CUSTOMER_CALSSIFY)
+ },
+ colProps: { span: 8 }
+ },
+ {
+ label: '客户名称',
+ field: 'customerName',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '公司logo',
+ field: 'customerLogo',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '企业性质(0:国有企业 1:集体企业 2:私营企业 3:股份制企业 4:外资企业 5:合资企业)',
+ field: 'enterpriseNature',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.ENTERPRISE_NATURE)
+ },
+ colProps: { span: 8 }
+ },
+ {
+ label: '客户来源(0:电话营销 1:主动来电 2:客户介绍 3:朋友介绍 4:独立开发 5:网络搜索 6:广告杂志 7:展会促销 8:其他途径)',
+ field: 'customerSource',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.PRODUCT_CLASS)
+ },
+ colProps: { span: 8 }
+ },
+ {
+ label: '客户星级(0:一星 1:二星 2:三星 3:四星 4:五星)',
+ field: 'customerStarrating',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.CUSTOMER_STARRATING)
+ },
+ colProps: { span: 8 }
+ },
+ {
+ label: '业务进度(0:了解跟进 1:资料收集 2:客户评审 3:风控核准 4:合作洽谈 5:准备签约 6:已经签约 7:合作叫停 8:暂时搁置)',
+ field: 'industrySchedule',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.INDUSTRY_SCHEDULE)
+ },
+ colProps: { span: 8 }
+ },
+ {
+ label: '归属人员',
+ field: 'belongingPeople',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '国家',
+ field: 'country',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '详细地址',
+ field: 'address',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '公司电话',
+ field: 'phone',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '公司传真',
+ field: 'companyFax',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '公司网址',
+ field: 'companyHttp',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '公司介绍',
+ field: 'companyProfile',
+ colProps: { span: 8 }
+ },
+ {
+ label: '客户状态(0:待提交 1:待审核 2:待核准 3:带启用 4:已启用 5:已禁用 6:已关闭)',
+ field: 'customerStatus',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.CUSTOMER_STATUS1)
+ },
+ colProps: { span: 8 }
+ },
+ {
+ label: '创建时间',
+ field: 'createTime',
+ component: 'RangePicker',
+ colProps: { span: 8 }
+ },
+ {
+ label: '行业分类(0:家用电器 1:交通运输 2:商务服务 3:家具用品 4:电工电气 5:通信产品 6:办公文教 7:运动休闲 8:传媒广电)',
+ field: 'industryClassify',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '所在城市',
+ field: 'city',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '社会信息代码证(营业执照)',
+ field: 'socialInformationCodeCertificate',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '法定代表人证件照',
+ field: 'legalRepresentativesPhoto',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '实缴资金证明',
+ field: 'proofPaidCapital',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '资产证明',
+ field: 'assetCertificate',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '资产抵押证明',
+ field: 'assetCertificateMortgage',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '担保人证明',
+ field: 'guarantorCertificate',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '其他资质文件',
+ field: 'otherQualifications',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '经营范围',
+ field: 'businessScope',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '合作范围(关联业务线)',
+ field: 'collaborationScopeNum',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '合作起始时间',
+ field: 'collaborationTime',
+ component: 'RangePicker',
+ colProps: { span: 8 }
+ },
+ {
+ label: '供货量(每月下限)',
+ field: 'supplyVolumeDown',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '供货量(每月下限)',
+ field: 'supplyVolumeUpper',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '资金额度',
+ field: 'fundLimit',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '营业时间',
+ field: 'businessHours',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '允许卸货时间',
+ field: 'allowableUnloadingTime',
+ component: 'RangePicker',
+ colProps: { span: 8 }
+ },
+ {
+ label: '卸货效率',
+ field: 'unloadingEfficiency',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '允许装货时间',
+ field: 'allowableShipmentTime',
+ component: 'RangePicker',
+ colProps: { span: 8 }
+ },
+ {
+ label: '装货效果',
+ field: 'shipmentEffciency',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '付款方式(0:无 1:现金 2:银行转账 3:承兑汇票 4:有赞代收 5:支付宝 6:微信 7:国家列表)',
+ field: 'paymentMethod',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '账户名称',
+ field: 'accountName',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '银行账号',
+ field: 'bankAccount',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '开户银行',
+ field: 'bankDeposit',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '开户地区',
+ field: 'depositArea',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '支行名称',
+ field: 'bankBranch',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '公司税号',
+ field: 'companyTaxNumber',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '企业名称',
+ field: 'enterpriseName',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '单位地址',
+ field: 'workAddress',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '合作方式(0:买断 1:联营)',
+ field: 'collaborationMethod',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '结算方式(0:先货后款 1:先款后货)',
+ field: 'settlementMethod',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '账期',
+ field: 'accountPeriod',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '压款方式(0:无 1:按金额 2:按比例)',
+ field: 'underpaymentMethod',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '默认压款比例',
+ field: 'defaultUnderpaymentRatio',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '申请压款比例',
+ field: 'applyForUnderpaymentRatio',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '保证金方式(0:无 1:按金额 2:按比例)',
+ field: 'marginMethod',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '默认保证金比例',
+ field: 'defaultMarginRatio',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '申请保证金比例',
+ field: 'applyForMarginRatio',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '逾期利率(0:按年化1:按月化)',
+ field: 'overdueInterestRate',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '默认逾期利率',
+ field: 'defaultOverdueRatio',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '申请逾期利率',
+ field: 'applyForOverdueRatio',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '客户联系人id',
+ field: 'contactsId',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '客户类型',
+ field: 'customerType',
+ component: 'Select',
+ componentProps: {
+ options: []
+ },
+ colProps: { span: 8 }
+ },
+ {
+ label: '账户类型',
+ field: 'accountType',
+ component: 'Select',
+ componentProps: {
+ options: []
+ },
+ colProps: { span: 8 }
+ },
+ {
+ label: '卸货时长',
+ field: 'unloading',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '装货时长',
+ field: 'shipment',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+]
+
+export const createFormSchema: FormSchema[] = [
+ {
+ label: '编号',
+ field: 'id',
+ show: false,
+ component: 'Input'
+ },
+ {
+ label: '客户分类(0:一级客户 1:二级客户)',
+ field: 'customerCalssify',
+ required: true,
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.CUSTOMER_CALSSIFY, 'number')
+ }
+ },
+ {
+ label: '客户名称',
+ field: 'customerName',
+ component: 'Input'
+ },
+ {
+ label: '公司logo',
+ field: 'customerLogo',
+ component: 'Input'
+ },
+ {
+ label: '企业性质(0:国有企业 1:集体企业 2:私营企业 3:股份制企业 4:外资企业 5:合资企业)',
+ field: 'enterpriseNature',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.ENTERPRISE_NATURE, 'number')
+ }
+ },
+ {
+ label: '客户来源(0:电话营销 1:主动来电 2:客户介绍 3:朋友介绍 4:独立开发 5:网络搜索 6:广告杂志 7:展会促销 8:其他途径)',
+ field: 'customerSource',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.PRODUCT_CLASS, 'number')
+ }
+ },
+ {
+ label: '客户星级(0:一星 1:二星 2:三星 3:四星 4:五星)',
+ field: 'customerStarrating',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.CUSTOMER_STARRATING, 'number')
+ }
+ },
+ {
+ label: '业务进度(0:了解跟进 1:资料收集 2:客户评审 3:风控核准 4:合作洽谈 5:准备签约 6:已经签约 7:合作叫停 8:暂时搁置)',
+ field: 'industrySchedule',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.INDUSTRY_SCHEDULE, 'number')
+ }
+ },
+ {
+ label: '归属人员',
+ field: 'belongingPeople',
+ component: 'Input'
+ },
+ {
+ label: '国家',
+ field: 'country',
+ component: 'Input'
+ },
+ {
+ label: '详细地址',
+ field: 'address',
+ component: 'Input'
+ },
+ {
+ label: '公司电话',
+ field: 'phone',
+ component: 'Input'
+ },
+ {
+ label: '公司传真',
+ field: 'companyFax',
+ component: 'Input'
+ },
+ {
+ label: '公司网址',
+ field: 'companyHttp',
+ component: 'Input'
+ },
+ {
+ label: '公司介绍',
+ field: 'companyProfile',
+ component: 'InputTextArea'
+ },
+ {
+ label: '客户状态(0:待提交 1:待审核 2:待核准 3:带启用 4:已启用 5:已禁用 6:已关闭)',
+ field: 'customerStatus',
+ required: true,
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.CUSTOMER_STATUS1, 'number')
+ }
+ },
+ {
+ label: '行业分类(0:家用电器 1:交通运输 2:商务服务 3:家具用品 4:电工电气 5:通信产品 6:办公文教 7:运动休闲 8:传媒广电)',
+ field: 'industryClassify',
+ component: 'Input'
+ },
+ {
+ label: '所在城市',
+ field: 'city',
+ component: 'Input'
+ },
+ {
+ label: '社会信息代码证(营业执照)',
+ field: 'socialInformationCodeCertificate',
+ component: 'Input'
+ },
+ {
+ label: '法定代表人证件照',
+ field: 'legalRepresentativesPhoto',
+ component: 'Input'
+ },
+ {
+ label: '实缴资金证明',
+ field: 'proofPaidCapital',
+ component: 'Input'
+ },
+ {
+ label: '资产证明',
+ field: 'assetCertificate',
+ component: 'Input'
+ },
+ {
+ label: '资产抵押证明',
+ field: 'assetCertificateMortgage',
+ component: 'Input'
+ },
+ {
+ label: '担保人证明',
+ field: 'guarantorCertificate',
+ component: 'Input'
+ },
+ {
+ label: '其他资质文件',
+ field: 'otherQualifications',
+ component: 'Input'
+ },
+ {
+ label: '经营范围',
+ field: 'businessScope',
+ component: 'Input'
+ },
+ {
+ label: '合作范围(关联业务线)',
+ field: 'collaborationScopeNum',
+ component: 'Input'
+ },
+ {
+ label: '合作起始时间',
+ field: 'collaborationTime',
+ component: 'DatePicker'
+ },
+ {
+ label: '供货量(每月下限)',
+ field: 'supplyVolumeDown',
+ component: 'Input'
+ },
+ {
+ label: '供货量(每月下限)',
+ field: 'supplyVolumeUpper',
+ component: 'Input'
+ },
+ {
+ label: '资金额度',
+ field: 'fundLimit',
+ component: 'Input'
+ },
+ {
+ label: '营业时间',
+ field: 'businessHours',
+ component: 'Input'
+ },
+ {
+ label: '允许卸货时间',
+ field: 'allowableUnloadingTime',
+ component: 'DatePicker'
+ },
+ {
+ label: '卸货效率',
+ field: 'unloadingEfficiency',
+ component: 'Input'
+ },
+ {
+ label: '允许装货时间',
+ field: 'allowableShipmentTime',
+ component: 'DatePicker'
+ },
+ {
+ label: '装货效果',
+ field: 'shipmentEffciency',
+ component: 'Input'
+ },
+ {
+ label: '付款方式(0:无 1:现金 2:银行转账 3:承兑汇票 4:有赞代收 5:支付宝 6:微信 7:国家列表)',
+ field: 'paymentMethod',
+ component: 'Input'
+ },
+ {
+ label: '账户名称',
+ field: 'accountName',
+ component: 'Input'
+ },
+ {
+ label: '银行账号',
+ field: 'bankAccount',
+ component: 'Input'
+ },
+ {
+ label: '开户银行',
+ field: 'bankDeposit',
+ component: 'Input'
+ },
+ {
+ label: '开户地区',
+ field: 'depositArea',
+ component: 'Input'
+ },
+ {
+ label: '支行名称',
+ field: 'bankBranch',
+ component: 'Input'
+ },
+ {
+ label: '公司税号',
+ field: 'companyTaxNumber',
+ component: 'Input'
+ },
+ {
+ label: '企业名称',
+ field: 'enterpriseName',
+ component: 'Input'
+ },
+ {
+ label: '单位地址',
+ field: 'workAddress',
+ component: 'Input'
+ },
+ {
+ label: '合作方式(0:买断 1:联营)',
+ field: 'collaborationMethod',
+ component: 'Input'
+ },
+ {
+ label: '结算方式(0:先货后款 1:先款后货)',
+ field: 'settlementMethod',
+ component: 'Input'
+ },
+ {
+ label: '账期',
+ field: 'accountPeriod',
+ component: 'Input'
+ },
+ {
+ label: '压款方式(0:无 1:按金额 2:按比例)',
+ field: 'underpaymentMethod',
+ component: 'Input'
+ },
+ {
+ label: '默认压款比例',
+ field: 'defaultUnderpaymentRatio',
+ component: 'Input'
+ },
+ {
+ label: '申请压款比例',
+ field: 'applyForUnderpaymentRatio',
+ component: 'Input'
+ },
+ {
+ label: '保证金方式(0:无 1:按金额 2:按比例)',
+ field: 'marginMethod',
+ component: 'Input'
+ },
+ {
+ label: '默认保证金比例',
+ field: 'defaultMarginRatio',
+ component: 'Input'
+ },
+ {
+ label: '申请保证金比例',
+ field: 'applyForMarginRatio',
+ component: 'Input'
+ },
+ {
+ label: '逾期利率(0:按年化1:按月化)',
+ field: 'overdueInterestRate',
+ component: 'Input'
+ },
+ {
+ label: '默认逾期利率',
+ field: 'defaultOverdueRatio',
+ component: 'Input'
+ },
+ {
+ label: '申请逾期利率',
+ field: 'applyForOverdueRatio',
+ component: 'Input'
+ },
+ {
+ label: '客户联系人id',
+ field: 'contactsId',
+ component: 'Input'
+ },
+ {
+ label: '客户类型',
+ field: 'customerType',
+ component: 'Select',
+ componentProps: {
+ options:[]
+ }
+ },
+ {
+ label: '账户类型',
+ field: 'accountType',
+ component: 'Select',
+ componentProps: {
+ options:[]
+ }
+ },
+ {
+ label: '卸货时长',
+ field: 'unloading',
+ component: 'Input'
+ },
+ {
+ label: '装货时长',
+ field: 'shipment',
+ component: 'Input'
+ },
+]
+
+export const updateFormSchema: FormSchema[] = [
+ {
+ label: '编号',
+ field: 'id',
+ show: false,
+ component: 'Input'
+ },
+ {
+ label: '客户分类(0:一级客户 1:二级客户)',
+ field: 'customerCalssify',
+ required: true,
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.CUSTOMER_CALSSIFY, 'number')
+ }
+ },
+ {
+ label: '客户名称',
+ field: 'customerName',
+ component: 'Input'
+ },
+ {
+ label: '公司logo',
+ field: 'customerLogo',
+ component: 'Input'
+ },
+ {
+ label: '企业性质(0:国有企业 1:集体企业 2:私营企业 3:股份制企业 4:外资企业 5:合资企业)',
+ field: 'enterpriseNature',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.ENTERPRISE_NATURE, 'number')
+ }
+ },
+ {
+ label: '客户来源(0:电话营销 1:主动来电 2:客户介绍 3:朋友介绍 4:独立开发 5:网络搜索 6:广告杂志 7:展会促销 8:其他途径)',
+ field: 'customerSource',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.PRODUCT_CLASS, 'number')
+ }
+ },
+ {
+ label: '客户星级(0:一星 1:二星 2:三星 3:四星 4:五星)',
+ field: 'customerStarrating',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.CUSTOMER_STARRATING, 'number')
+ }
+ },
+ {
+ label: '业务进度(0:了解跟进 1:资料收集 2:客户评审 3:风控核准 4:合作洽谈 5:准备签约 6:已经签约 7:合作叫停 8:暂时搁置)',
+ field: 'industrySchedule',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.INDUSTRY_SCHEDULE, 'number')
+ }
+ },
+ {
+ label: '归属人员',
+ field: 'belongingPeople',
+ component: 'Input'
+ },
+ {
+ label: '国家',
+ field: 'country',
+ component: 'Input'
+ },
+ {
+ label: '详细地址',
+ field: 'address',
+ component: 'Input'
+ },
+ {
+ label: '公司电话',
+ field: 'phone',
+ component: 'Input'
+ },
+ {
+ label: '公司传真',
+ field: 'companyFax',
+ component: 'Input'
+ },
+ {
+ label: '公司网址',
+ field: 'companyHttp',
+ component: 'Input'
+ },
+ {
+ label: '公司介绍',
+ field: 'companyProfile',
+ component: 'InputTextArea'
+ },
+ {
+ label: '客户状态(0:待提交 1:待审核 2:待核准 3:带启用 4:已启用 5:已禁用 6:已关闭)',
+ field: 'customerStatus',
+ required: true,
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.CUSTOMER_STATUS1, 'number')
+ }
+ },
+ {
+ label: '行业分类(0:家用电器 1:交通运输 2:商务服务 3:家具用品 4:电工电气 5:通信产品 6:办公文教 7:运动休闲 8:传媒广电)',
+ field: 'industryClassify',
+ component: 'Input'
+ },
+ {
+ label: '所在城市',
+ field: 'city',
+ component: 'Input'
+ },
+ {
+ label: '社会信息代码证(营业执照)',
+ field: 'socialInformationCodeCertificate',
+ component: 'Input'
+ },
+ {
+ label: '法定代表人证件照',
+ field: 'legalRepresentativesPhoto',
+ component: 'Input'
+ },
+ {
+ label: '实缴资金证明',
+ field: 'proofPaidCapital',
+ component: 'Input'
+ },
+ {
+ label: '资产证明',
+ field: 'assetCertificate',
+ component: 'Input'
+ },
+ {
+ label: '资产抵押证明',
+ field: 'assetCertificateMortgage',
+ component: 'Input'
+ },
+ {
+ label: '担保人证明',
+ field: 'guarantorCertificate',
+ component: 'Input'
+ },
+ {
+ label: '其他资质文件',
+ field: 'otherQualifications',
+ component: 'Input'
+ },
+ {
+ label: '经营范围',
+ field: 'businessScope',
+ component: 'Input'
+ },
+ {
+ label: '合作范围(关联业务线)',
+ field: 'collaborationScopeNum',
+ component: 'Input'
+ },
+ {
+ label: '合作起始时间',
+ field: 'collaborationTime',
+ component: 'DatePicker'
+ },
+ {
+ label: '供货量(每月下限)',
+ field: 'supplyVolumeDown',
+ component: 'Input'
+ },
+ {
+ label: '供货量(每月下限)',
+ field: 'supplyVolumeUpper',
+ component: 'Input'
+ },
+ {
+ label: '资金额度',
+ field: 'fundLimit',
+ component: 'Input'
+ },
+ {
+ label: '营业时间',
+ field: 'businessHours',
+ component: 'Input'
+ },
+ {
+ label: '允许卸货时间',
+ field: 'allowableUnloadingTime',
+ component: 'DatePicker'
+ },
+ {
+ label: '卸货效率',
+ field: 'unloadingEfficiency',
+ component: 'Input'
+ },
+ {
+ label: '允许装货时间',
+ field: 'allowableShipmentTime',
+ component: 'DatePicker'
+ },
+ {
+ label: '装货效果',
+ field: 'shipmentEffciency',
+ component: 'Input'
+ },
+ {
+ label: '付款方式(0:无 1:现金 2:银行转账 3:承兑汇票 4:有赞代收 5:支付宝 6:微信 7:国家列表)',
+ field: 'paymentMethod',
+ component: 'Input'
+ },
+ {
+ label: '账户名称',
+ field: 'accountName',
+ component: 'Input'
+ },
+ {
+ label: '银行账号',
+ field: 'bankAccount',
+ component: 'Input'
+ },
+ {
+ label: '开户银行',
+ field: 'bankDeposit',
+ component: 'Input'
+ },
+ {
+ label: '开户地区',
+ field: 'depositArea',
+ component: 'Input'
+ },
+ {
+ label: '支行名称',
+ field: 'bankBranch',
+ component: 'Input'
+ },
+ {
+ label: '公司税号',
+ field: 'companyTaxNumber',
+ component: 'Input'
+ },
+ {
+ label: '企业名称',
+ field: 'enterpriseName',
+ component: 'Input'
+ },
+ {
+ label: '单位地址',
+ field: 'workAddress',
+ component: 'Input'
+ },
+ {
+ label: '合作方式(0:买断 1:联营)',
+ field: 'collaborationMethod',
+ component: 'Input'
+ },
+ {
+ label: '结算方式(0:先货后款 1:先款后货)',
+ field: 'settlementMethod',
+ component: 'Input'
+ },
+ {
+ label: '账期',
+ field: 'accountPeriod',
+ component: 'Input'
+ },
+ {
+ label: '压款方式(0:无 1:按金额 2:按比例)',
+ field: 'underpaymentMethod',
+ component: 'Input'
+ },
+ {
+ label: '默认压款比例',
+ field: 'defaultUnderpaymentRatio',
+ component: 'Input'
+ },
+ {
+ label: '申请压款比例',
+ field: 'applyForUnderpaymentRatio',
+ component: 'Input'
+ },
+ {
+ label: '保证金方式(0:无 1:按金额 2:按比例)',
+ field: 'marginMethod',
+ component: 'Input'
+ },
+ {
+ label: '默认保证金比例',
+ field: 'defaultMarginRatio',
+ component: 'Input'
+ },
+ {
+ label: '申请保证金比例',
+ field: 'applyForMarginRatio',
+ component: 'Input'
+ },
+ {
+ label: '逾期利率(0:按年化1:按月化)',
+ field: 'overdueInterestRate',
+ component: 'Input'
+ },
+ {
+ label: '默认逾期利率',
+ field: 'defaultOverdueRatio',
+ component: 'Input'
+ },
+ {
+ label: '申请逾期利率',
+ field: 'applyForOverdueRatio',
+ component: 'Input'
+ },
+ {
+ label: '客户联系人id',
+ field: 'contactsId',
+ component: 'Input'
+ },
+ {
+ label: '客户类型',
+ field: 'customerType',
+ component: 'Select',
+ componentProps: {
+ options:[]
+ }
+ },
+ {
+ label: '账户类型',
+ field: 'accountType',
+ component: 'Select',
+ componentProps: {
+ options:[]
+ }
+ },
+ {
+ label: '卸货时长',
+ field: 'unloading',
+ component: 'Input'
+ },
+ {
+ label: '装货时长',
+ field: 'shipment',
+ component: 'Input'
+ },
+]
\ No newline at end of file
diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/customer/index.vue b/yudao-ui-admin-vben-master/src/views/xxjj/customer/index.vue
new file mode 100644
index 0000000..e906d5d
--- /dev/null
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/customer/index.vue
@@ -0,0 +1,92 @@
+
+
+
+
+
+ {{ t('action.create') }}
+
+
+ {{ t('action.export') }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/enterprise.data.ts b/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/enterprise.data.ts
index bcbb697..7559da6 100644
--- a/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/enterprise.data.ts
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/enterprise.data.ts
@@ -1,5 +1,9 @@
import { BasicColumn, FormSchema, useRender } from '@/components/Table'
import { DICT_TYPE, getDictOptions } from '@/utils/dict'
+import {h} from "vue";
+import {Switch} from "ant-design-vue";
+import {useMessage} from "@/hooks/web/useMessage";
+import {updateEnterpriseStatus} from "@/api/system/enterprise";
export const columns: BasicColumn[] = [
// {
@@ -53,6 +57,39 @@ export const columns: BasicColumn[] = [
return useRender.renderDate(text)
}
},
+ {
+ title: '状态',
+ dataIndex: 'enterpriseStatus',
+ width: 180,
+ customRender: ({ record }) => {
+ if (!Reflect.has(record, 'pendingStatus'))
+ record.pendingStatus = false
+
+ return h(Switch, {
+ checked: record.status === 0,
+ checkedChildren: '已启用',
+ unCheckedChildren: '已禁用',
+ loading: record.pendingStatus,
+ onChange(checked: boolean) {
+ record.pendingStatus = true
+ const newStatus = checked ? 0 : 1
+ const { createMessage } = useMessage()
+ updateEnterpriseStatus(record.id, newStatus)
+ .then(() => {
+ record.status = newStatus
+ createMessage.success('已成功修改用户状态')
+ })
+ .catch(() => {
+ createMessage.error('修改用户状态失败')
+ })
+ .finally(() => {
+ record.pendingStatus = false
+ })
+ },
+ })
+ },
+ },
+
// {
// title: '企业简称',
// dataIndex: 'shortName',
diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/index.vue b/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/index.vue
index 322a65a..638015f 100644
--- a/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/index.vue
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/index.vue
@@ -6,7 +6,7 @@
- 新增机构
+ {{ '新增机构' }}
{{ t('action.export') }}
@@ -16,10 +16,24 @@
> getSimpleBusinessList() {
+ // 获得业务线列表,只要开启状态的
+ BusinessWarehousePageReqVO pageReqVO = new BusinessWarehousePageReqVO();
+// pageReqVO.setStatus(BusinessEnum.ENABLE.getStatus());
+// pageReqVO.setDiffFlag("0");
+ List list = businessWarehouseService.getBusinessSimpleList(pageReqVO);
+ return success(BusinessWarehouseConvert.INSTANCE.convertList03(list));
+ }
+
}
diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessSimpleRespVo.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessSimpleRespVo.java
new file mode 100644
index 0000000..9229f41
--- /dev/null
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessSimpleRespVo.java
@@ -0,0 +1,21 @@
+package com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+@Schema(description = "管理后台 - 业务线表精简信息 Response VO")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class BusinessSimpleRespVo {
+
+ @Schema(description = "业务线编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ private Long id;
+
+ @Schema(description = "业务线名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+ private String name;
+
+ @Schema(description = "父部门 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ private Long parentId;
+}
diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseRespVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseRespVO.java
index 273b3ff..a48ba16 100644
--- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseRespVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseRespVO.java
@@ -16,4 +16,7 @@ public class BusinessWarehouseRespVO extends BusinessWarehouseBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
+ @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED)
+ private LocalDateTime updateTime;
+
}
diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/EnterpriseController.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/EnterpriseController.java
index cc1b3a9..f8a67b7 100644
--- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/EnterpriseController.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/EnterpriseController.java
@@ -1,5 +1,6 @@
package com.yunxi.scm.module.system.controller.admin.enterprise;
+import com.yunxi.scm.module.system.controller.admin.user.vo.user.UserUpdateStatusReqVO;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@@ -52,6 +53,16 @@ public class EnterpriseController {
return success(true);
}
+ @PutMapping("/updateStatus")
+ @Operation(summary = "更新企业状态")
+ @PreAuthorize("@ss.hasPermission('system:enterprise:updateStatus')")
+ public CommonResult updateEnterpriseStatus(@Valid @RequestBody EnterpriseUpdateReqVO updateReqVO) {
+ updateReqVO.setEnterpriseStatus("1");
+ enterpriseService.updateEnterprise(updateReqVO);
+ return success(true);
+ }
+
+
@DeleteMapping("/delete")
@Operation(summary = "删除企业信息")
@Parameter(name = "id", description = "编号", required = true)
diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseBaseVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseBaseVO.java
index e814adb..78f68a9 100644
--- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseBaseVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseBaseVO.java
@@ -76,4 +76,7 @@ public class EnterpriseBaseVO {
@Schema(description = "描述")
private String description;
+ @Schema(description = "企业状态")
+ private String enterpriseStatus;
+
}
diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseCreateReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseCreateReqVO.java
index 0c0bbd9..72eade9 100644
--- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseCreateReqVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseCreateReqVO.java
@@ -145,4 +145,6 @@ public class EnterpriseCreateReqVO extends EnterpriseBaseVO {
@Schema(description = "描述", example = "你猜")
private String description;
+ @Schema(description = "企业状态")
+ private String enterpriseStatus;
}
diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseExportReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseExportReqVO.java
index 9938961..ec4868b 100644
--- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseExportReqVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseExportReqVO.java
@@ -62,4 +62,7 @@ public class EnterpriseExportReqVO {
@Schema(description = "描述")
private String description;
+
+ @Schema(description = "企业状态")
+ private String enterpriseStatus;
}
diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java
index bf19109..0898a48 100644
--- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java
@@ -64,4 +64,7 @@ public class EnterprisePageReqVO extends PageParam {
@Schema(description = "描述")
private String description;
+
+ @Schema(description = "企业状态")
+ private String enterpriseStatus;
}
diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseUpdateReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseUpdateReqVO.java
index 32ac970..b636aeb 100644
--- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseUpdateReqVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseUpdateReqVO.java
@@ -149,4 +149,6 @@ public class EnterpriseUpdateReqVO extends EnterpriseBaseVO {
@Schema(description = "描述", example = "你猜")
private String description;
+ @Schema(description = "企业状态")
+ private String enterpriseStatus;
}
diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/businesswarehouse/BusinessWarehouseConvert.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/businesswarehouse/BusinessWarehouseConvert.java
index b3a23e3..11fc860 100644
--- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/businesswarehouse/BusinessWarehouseConvert.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/businesswarehouse/BusinessWarehouseConvert.java
@@ -25,8 +25,12 @@ public interface BusinessWarehouseConvert {
BusinessWarehouseRespVO convert(BusinessWarehouseDO bean);
+ BusinessSimpleRespVo convert03(BusinessWarehouseDO bean);
+
List convertList(List list);
+ List convertList03(List list);
+
PageResult convertPage(PageResult page);
List convertList02(List list);
diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/enterprise/EnterpriseDO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/enterprise/EnterpriseDO.java
index f58a1fb..b5437a6 100644
--- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/enterprise/EnterpriseDO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/enterprise/EnterpriseDO.java
@@ -255,5 +255,9 @@ public class EnterpriseDO extends BaseDO {
* 企业父id
*/
private Long parentId;
+ /**
+ * 企业状态
+ */
+ private String enterpriseStatus;
}
diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java
index 7aa3548..78d671f 100644
--- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java
@@ -5,7 +5,9 @@ import java.util.*;
import com.yunxi.scm.framework.common.pojo.PageResult;
import com.yunxi.scm.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.yunxi.scm.framework.mybatis.core.mapper.BaseMapperX;
+import com.yunxi.scm.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO;
+import com.yunxi.scm.module.system.dal.dataobject.dept.DeptDO;
import org.apache.ibatis.annotations.Mapper;
import com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo.*;
@@ -67,4 +69,10 @@ public interface BusinessWarehouseMapper extends BaseMapperX simpleBusiness(BusinessWarehousePageReqVO reqVO) {
+ return selectList(new LambdaQueryWrapperX()
+ .eqIfPresent(BusinessWarehouseDO::getStatus, reqVO.getStatus())
+ .eqIfPresent(BusinessWarehouseDO::getDiffFlag, reqVO.getDiffFlag()));
+ }
+
}
diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseService.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseService.java
index 8368217..cc5e2c9 100644
--- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseService.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseService.java
@@ -67,4 +67,9 @@ public interface BusinessWarehouseService {
*/
List getBusinessWarehouseList(BusinessWarehouseExportReqVO exportReqVO);
+ /**
+ * 业务线列表查询
+ * */
+ List getBusinessSimpleList(BusinessWarehousePageReqVO pageReqVO);
+
}
diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImpl.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImpl.java
index cbf1c49..eda6b62 100644
--- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImpl.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImpl.java
@@ -79,4 +79,9 @@ public class BusinessWarehouseServiceImpl implements BusinessWarehouseService {
return businessWarehouseMapper.selectList(exportReqVO);
}
+ @Override
+ public List getBusinessSimpleList(BusinessWarehousePageReqVO pageReqVO) {
+ return businessWarehouseMapper.simpleBusiness(pageReqVO);
+ }
+
}
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/CustomerController.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/CustomerController.java
index a935b24..1d79307 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/CustomerController.java
+++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/CustomerController.java
@@ -1,8 +1,5 @@
package com.yunxi.scm.module.xxjj.controller.admin.customer;
-import com.yunxi.scm.framework.common.enums.CommonStatusEnum;
-import com.yunxi.scm.module.xxjj.controller.admin.workorder.vo.WorkOrderCreateReqVO;
-import com.yunxi.scm.module.xxjj.service.workorder.WorkOrderService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@@ -39,26 +36,14 @@ public class CustomerController {
@Resource
private CustomerService customerService;
- @Resource
- private WorkOrderService workOrderService;
-
@PostMapping("/create")
@Operation(summary = "创建客户信息")
@PreAuthorize("@ss.hasPermission('xxjj:customer:create')")
- public CommonResult createCustomerwork(@Valid @RequestBody CustomerCreateReqVO createReqVO) {
+ public CommonResult createCustomer(@Valid @RequestBody CustomerCreateReqVO createReqVO) {
return success(customerService.createCustomer(createReqVO));
}
-
- @PostMapping("/creatework")
- @Operation(summary = "创建工单")
- @PreAuthorize("@ss.hasPermission('xxjj:customer:creatework')")
- public CommonResult createCustomer(@Valid @RequestBody WorkOrderCreateReqVO workOrderCreateReqVO) {
- return success(workOrderService.createWorkOrder(workOrderCreateReqVO));
- }
-
-
@PutMapping("/update")
@Operation(summary = "更新客户信息")
@PreAuthorize("@ss.hasPermission('xxjj:customer:update')")
@@ -114,18 +99,4 @@ public class CustomerController {
ExcelUtils.write(response, "客户信息.xls", "数据", CustomerExcelVO.class, datas);
}
-
- @GetMapping("/list-all-simplecustomer")
- @Operation(summary = "获取客户", description = "只包含被开启的客户,主要用于前端的下拉选项")
- public CommonResult> getCustomerId() {
- CustomerRespVO customerRespVO=new CustomerRespVO();
- String status=Integer.toString(CommonStatusEnum.ENABLE.getStatus());
- customerRespVO.setStatus(status);
-
- List list = customerService.getCustomerstaus(customerRespVO);
- return success(CustomerConvert.INSTANCE.convertList(list));
- }
-
-
-
}
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerBaseVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerBaseVO.java
index 93cd012..ce3782d 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerBaseVO.java
+++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerBaseVO.java
@@ -5,7 +5,13 @@ import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
import javax.validation.constraints.*;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
/**
* 客户信息 Base VO,提供给添加、修改、详细的子 VO 使用
@@ -14,34 +20,192 @@ import javax.validation.constraints.*;
@Data
public class CustomerBaseVO {
- @Schema(description = "客户名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
- @NotNull(message = "客户名称不能为空")
+ @Schema(description = "客户分类(0:一级客户 1:二级客户)", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "客户分类(0:一级客户 1:二级客户)不能为空")
+ private String customerCalssify;
+
+ @Schema(description = "客户名称", example = "王五")
private String customerName;
- @Schema(description = "客户类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
- @NotNull(message = "客户类型不能为空")
- private String customerType;
+ @Schema(description = "公司logo")
+ private String customerLogo;
+
+ @Schema(description = "企业性质(0:国有企业 1:集体企业 2:私营企业 3:股份制企业 4:外资企业 5:合资企业)")
+ private String enterpriseNature;
+
+ @Schema(description = "客户来源(0:电话营销 1:主动来电 2:客户介绍 3:朋友介绍 4:独立开发 5:网络搜索 6:广告杂志 7:展会促销 8:其他途径)")
+ private String customerSource;
+
+ @Schema(description = "客户星级(0:一星 1:二星 2:三星 3:四星 4:五星)")
+ private String customerStarrating;
+
+ @Schema(description = "业务进度(0:了解跟进 1:资料收集 2:客户评审 3:风控核准 4:合作洽谈 5:准备签约 6:已经签约 7:合作叫停 8:暂时搁置)")
+ private String industrySchedule;
+
+ @Schema(description = "归属人员")
+ private String belongingPeople;
+
+ @Schema(description = "国家")
+ private String country;
+
+ @Schema(description = "详细地址")
+ private String address;
+
+ @Schema(description = "公司电话")
+ private String phone;
+
+ @Schema(description = "公司传真")
+ private String companyFax;
+
+ @Schema(description = "公司网址")
+ private String companyHttp;
+
+ @Schema(description = "公司介绍")
+ private String companyProfile;
+
+ @Schema(description = "客户状态(0:待提交 1:待审核 2:待核准 3:带启用 4:已启用 5:已禁用 6:已关闭)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "客户状态(0:待提交 1:待审核 2:待核准 3:带启用 4:已启用 5:已禁用 6:已关闭)不能为空")
+ private String customerStatus;
+
+ @Schema(description = "行业分类(0:家用电器 1:交通运输 2:商务服务 3:家具用品 4:电工电气 5:通信产品 6:办公文教 7:运动休闲 8:传媒广电)")
+ private String industryClassify;
+
+ @Schema(description = "所在城市")
+ private String city;
+
+ @Schema(description = "社会信息代码证(营业执照)")
+ private String socialInformationCodeCertificate;
+
+ @Schema(description = "法定代表人证件照")
+ private String legalRepresentativesPhoto;
+
+ @Schema(description = "实缴资金证明")
+ private String proofPaidCapital;
+
+ @Schema(description = "资产证明")
+ private String assetCertificate;
+
+ @Schema(description = "资产抵押证明")
+ private String assetCertificateMortgage;
+
+ @Schema(description = "担保人证明")
+ private String guarantorCertificate;
+
+ @Schema(description = "其他资质文件")
+ private String otherQualifications;
+
+ @Schema(description = "经营范围")
+ private String businessScope;
+
+ @Schema(description = "合作范围(关联业务线)")
+ private Integer collaborationScopeNum;
+
+ @Schema(description = "合作起始时间")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime collaborationTime;
- @Schema(description = "统一结算主体")
- private String unifiedSettlement;
+ @Schema(description = "供货量(每月下限)")
+ private Long supplyVolumeDown;
- @Schema(description = "客户性质", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "客户性质不能为空")
- private String customerNature;
+ @Schema(description = "供货量(每月下限)")
+ private Long supplyVolumeUpper;
- @Schema(description = "合作模式", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "合作模式不能为空")
- private String cooperationMode;
+ @Schema(description = "资金额度")
+ private Long fundLimit;
+
+ @Schema(description = "营业时间")
+ private String businessHours;
+
+ @Schema(description = "允许卸货时间")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime allowableUnloadingTime;
+
+ @Schema(description = "卸货效率")
+ private String unloadingEfficiency;
+
+ @Schema(description = "允许装货时间")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime allowableShipmentTime;
+
+ @Schema(description = "装货效果")
+ private String shipmentEffciency;
+
+ @Schema(description = "付款方式(0:无 1:现金 2:银行转账 3:承兑汇票 4:有赞代收 5:支付宝 6:微信 7:国家列表)")
+ private String paymentMethod;
+
+ @Schema(description = "账户名称", example = "王五")
+ private String accountName;
+
+ @Schema(description = "银行账号", example = "18155")
+ private String bankAccount;
+
+ @Schema(description = "开户银行")
+ private String bankDeposit;
+
+ @Schema(description = "开户地区")
+ private String depositArea;
+
+ @Schema(description = "支行名称")
+ private String bankBranch;
+
+ @Schema(description = "公司税号")
+ private String companyTaxNumber;
+
+ @Schema(description = "企业名称", example = "芋艿")
+ private String enterpriseName;
+
+ @Schema(description = "单位地址")
+ private String workAddress;
+
+ @Schema(description = "合作方式(0:买断 1:联营)")
+ private String collaborationMethod;
+
+ @Schema(description = "结算方式(0:先货后款 1:先款后货)")
+ private String settlementMethod;
+
+ @Schema(description = "账期")
+ private String accountPeriod;
+
+ @Schema(description = "压款方式(0:无 1:按金额 2:按比例)")
+ private String underpaymentMethod;
+
+ @Schema(description = "默认压款比例")
+ private String defaultUnderpaymentRatio;
+
+ @Schema(description = "申请压款比例")
+ private String applyForUnderpaymentRatio;
+
+ @Schema(description = "保证金方式(0:无 1:按金额 2:按比例)")
+ private String marginMethod;
+
+ @Schema(description = "默认保证金比例")
+ private String defaultMarginRatio;
+
+ @Schema(description = "申请保证金比例")
+ private String applyForMarginRatio;
+
+ @Schema(description = "逾期利率(0:按年化1:按月化)")
+ private String overdueInterestRate;
+
+ @Schema(description = "默认逾期利率")
+ private String defaultOverdueRatio;
+
+ @Schema(description = "申请逾期利率")
+ private String applyForOverdueRatio;
+
+ @Schema(description = "客户联系人id", example = "6351")
+ private Long contactsId;
+
+ @Schema(description = "客户类型", example = "1")
+ private String customerType;
- @Schema(description = "隶属业务线", example = "22944")
- private Long linebusinessId;
+ @Schema(description = "账户类型", example = "2")
+ private String accountType;
- @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
- @NotNull(message = "状态不能为空")
- private String status;
+ @Schema(description = "卸货时长")
+ private String unloading;
- @Schema(description = "归属人员",requiredMode = Schema.RequiredMode.REQUIRED, example = "1,2,3")
- @NotNull(message = "成员编号数组不能为空")
- private Set belongingPeople;
+ @Schema(description = "装货时长")
+ private String shipment;
}
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerExcelVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerExcelVO.java
index 2fdcc5b..0bb2fb3 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerExcelVO.java
+++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerExcelVO.java
@@ -5,13 +5,19 @@ import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
import com.alibaba.excel.annotation.ExcelProperty;
+import com.yunxi.scm.framework.excel.core.annotations.DictFormat;
+import com.yunxi.scm.framework.excel.core.convert.DictConvert;
+
/**
* 客户信息 Excel VO
*
- * @author 芋道源码
+ * @author 长江云息
*/
@Data
public class CustomerExcelVO {
@@ -19,34 +25,202 @@ public class CustomerExcelVO {
@ExcelProperty("编号")
private Long id;
+ @ExcelProperty(value = "客户分类(0:一级客户 1:二级客户)", converter = DictConvert.class)
+ @DictFormat("customer_calssify") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
+ private String customerCalssify;
+
@ExcelProperty("客户名称")
private String customerName;
- @ExcelProperty("客户类型")
- private String customerType;
-
- @ExcelProperty("统一结算主体")
- private String unifiedSettlement;
+ @ExcelProperty("公司logo")
+ private String customerLogo;
- @ExcelProperty("客户性质")
- private String customerNature;
+ @ExcelProperty(value = "企业性质(0:国有企业 1:集体企业 2:私营企业 3:股份制企业 4:外资企业 5:合资企业)", converter = DictConvert.class)
+ @DictFormat("enterprise_nature") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
+ private String enterpriseNature;
- @ExcelProperty("合作模式")
- private String cooperationMode;
+ @ExcelProperty(value = "客户来源(0:电话营销 1:主动来电 2:客户介绍 3:朋友介绍 4:独立开发 5:网络搜索 6:广告杂志 7:展会促销 8:其他途径)", converter = DictConvert.class)
+ @DictFormat("product_class") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
+ private String customerSource;
- @ExcelProperty("隶属业务线")
- private Long linebusinessId;
+ @ExcelProperty(value = "客户星级(0:一星 1:二星 2:三星 3:四星 4:五星)", converter = DictConvert.class)
+ @DictFormat("customer_starrating") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
+ private String customerStarrating;
- @ExcelProperty("状态")
- private String status;
+ @ExcelProperty(value = "业务进度(0:了解跟进 1:资料收集 2:客户评审 3:风控核准 4:合作洽谈 5:准备签约 6:已经签约 7:合作叫停 8:暂时搁置)", converter = DictConvert.class)
+ @DictFormat("industry_schedule") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
+ private String industrySchedule;
@ExcelProperty("归属人员")
- private Set belongingPeople;
+ private String belongingPeople;
+
+ @ExcelProperty("国家")
+ private String country;
+
+ @ExcelProperty("详细地址")
+ private String address;
+
+ @ExcelProperty("公司电话")
+ private String phone;
+
+ @ExcelProperty("公司传真")
+ private String companyFax;
+
+ @ExcelProperty("公司网址")
+ private String companyHttp;
+
+ @ExcelProperty("公司介绍")
+ private String companyProfile;
+
+ @ExcelProperty(value = "客户状态(0:待提交 1:待审核 2:待核准 3:带启用 4:已启用 5:已禁用 6:已关闭)", converter = DictConvert.class)
+ @DictFormat("customer_status1") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
+ private String customerStatus;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
- @ExcelProperty("更新时间")
- private LocalDateTime updateTime;
+ @ExcelProperty("行业分类(0:家用电器 1:交通运输 2:商务服务 3:家具用品 4:电工电气 5:通信产品 6:办公文教 7:运动休闲 8:传媒广电)")
+ private String industryClassify;
+
+ @ExcelProperty("所在城市")
+ private String city;
+
+ @ExcelProperty("社会信息代码证(营业执照)")
+ private String socialInformationCodeCertificate;
+
+ @ExcelProperty("法定代表人证件照")
+ private String legalRepresentativesPhoto;
+
+ @ExcelProperty("实缴资金证明")
+ private String proofPaidCapital;
+
+ @ExcelProperty("资产证明")
+ private String assetCertificate;
+
+ @ExcelProperty("资产抵押证明")
+ private String assetCertificateMortgage;
+
+ @ExcelProperty("担保人证明")
+ private String guarantorCertificate;
+
+ @ExcelProperty("其他资质文件")
+ private String otherQualifications;
+
+ @ExcelProperty("经营范围")
+ private String businessScope;
+
+ @ExcelProperty("合作范围(关联业务线)")
+ private Integer collaborationScopeNum;
+
+ @ExcelProperty("合作起始时间")
+ private LocalDateTime collaborationTime;
+
+ @ExcelProperty("供货量(每月下限)")
+ private Long supplyVolumeDown;
+
+ @ExcelProperty("供货量(每月下限)")
+ private Long supplyVolumeUpper;
+
+ @ExcelProperty("资金额度")
+ private Long fundLimit;
+
+ @ExcelProperty("营业时间")
+ private String businessHours;
+
+ @ExcelProperty("允许卸货时间")
+ private LocalDateTime allowableUnloadingTime;
+
+ @ExcelProperty("卸货效率")
+ private String unloadingEfficiency;
+
+ @ExcelProperty("允许装货时间")
+ private LocalDateTime allowableShipmentTime;
+
+ @ExcelProperty("装货效果")
+ private String shipmentEffciency;
+
+ @ExcelProperty(value = "付款方式(0:无 1:现金 2:银行转账 3:承兑汇票 4:有赞代收 5:支付宝 6:微信 7:国家列表)", converter = DictConvert.class)
+ @DictFormat("payment_method") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
+ private String paymentMethod;
+
+ @ExcelProperty("账户名称")
+ private String accountName;
+
+ @ExcelProperty("银行账号")
+ private String bankAccount;
+
+ @ExcelProperty("开户银行")
+ private String bankDeposit;
+
+ @ExcelProperty("开户地区")
+ private String depositArea;
+
+ @ExcelProperty("支行名称")
+ private String bankBranch;
+
+ @ExcelProperty("公司税号")
+ private String companyTaxNumber;
+
+ @ExcelProperty("企业名称")
+ private String enterpriseName;
+
+ @ExcelProperty("单位地址")
+ private String workAddress;
+
+ @ExcelProperty(value = "合作方式(0:买断 1:联营)", converter = DictConvert.class)
+ @DictFormat("collaboration_method") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
+ private String collaborationMethod;
+
+ @ExcelProperty(value = "结算方式(0:先货后款 1:先款后货)", converter = DictConvert.class)
+ @DictFormat("settlement_method") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
+ private String settlementMethod;
+
+ @ExcelProperty("账期")
+ private String accountPeriod;
+
+ @ExcelProperty(value = "压款方式(0:无 1:按金额 2:按比例)", converter = DictConvert.class)
+ @DictFormat("underpayment_method") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
+ private String underpaymentMethod;
+
+ @ExcelProperty("默认压款比例")
+ private String defaultUnderpaymentRatio;
+
+ @ExcelProperty("申请压款比例")
+ private String applyForUnderpaymentRatio;
+
+ @ExcelProperty(value = "保证金方式(0:无 1:按金额 2:按比例)", converter = DictConvert.class)
+ @DictFormat("margin_method") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
+ private String marginMethod;
+
+ @ExcelProperty("默认保证金比例")
+ private String defaultMarginRatio;
+
+ @ExcelProperty("申请保证金比例")
+ private String applyForMarginRatio;
+
+ @ExcelProperty(value = "逾期利率(0:按年化1:按月化)", converter = DictConvert.class)
+ @DictFormat("overdue_interest_rate") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
+ private String overdueInterestRate;
+
+ @ExcelProperty("默认逾期利率")
+ private String defaultOverdueRatio;
+
+ @ExcelProperty("申请逾期利率")
+ private String applyForOverdueRatio;
+
+ @ExcelProperty("客户联系人id")
+ private Long contactsId;
+
+ @ExcelProperty("客户类型")
+ private String customerType;
+
+ @ExcelProperty("账户类型")
+ private String accountType;
+
+ @ExcelProperty("卸货时长")
+ private String unloading;
+
+ @ExcelProperty("装货时长")
+ private String shipment;
}
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerExportReqVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerExportReqVO.java
index 9a0104e..c878f5c 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerExportReqVO.java
+++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerExportReqVO.java
@@ -13,36 +13,194 @@ import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MON
@Data
public class CustomerExportReqVO {
- @Schema(description = "客户名称", example = "赵六")
- private String customerName;
+ @Schema(description = "客户分类(0:一级客户 1:二级客户)")
+ private String customerCalssify;
- @Schema(description = "客户类型", example = "2")
- private String customerType;
+ @Schema(description = "客户名称", example = "王五")
+ private String customerName;
- @Schema(description = "统一结算主体")
- private String unifiedSettlement;
+ @Schema(description = "公司logo")
+ private String customerLogo;
- @Schema(description = "客户性质")
- private String customerNature;
+ @Schema(description = "企业性质(0:国有企业 1:集体企业 2:私营企业 3:股份制企业 4:外资企业 5:合资企业)")
+ private String enterpriseNature;
- @Schema(description = "合作模式")
- private String cooperationMode;
+ @Schema(description = "客户来源(0:电话营销 1:主动来电 2:客户介绍 3:朋友介绍 4:独立开发 5:网络搜索 6:广告杂志 7:展会促销 8:其他途径)")
+ private String customerSource;
- @Schema(description = "隶属业务线", example = "22944")
- private Long linebusinessId;
+ @Schema(description = "客户星级(0:一星 1:二星 2:三星 3:四星 4:五星)")
+ private String customerStarrating;
- @Schema(description = "状态", example = "2")
- private String status;
+ @Schema(description = "业务进度(0:了解跟进 1:资料收集 2:客户评审 3:风控核准 4:合作洽谈 5:准备签约 6:已经签约 7:合作叫停 8:暂时搁置)")
+ private String industrySchedule;
@Schema(description = "归属人员")
private String belongingPeople;
+ @Schema(description = "国家")
+ private String country;
+
+ @Schema(description = "详细地址")
+ private String address;
+
+ @Schema(description = "公司电话")
+ private String phone;
+
+ @Schema(description = "公司传真")
+ private String companyFax;
+
+ @Schema(description = "公司网址")
+ private String companyHttp;
+
+ @Schema(description = "公司介绍")
+ private String companyProfile;
+
+ @Schema(description = "客户状态(0:待提交 1:待审核 2:待核准 3:带启用 4:已启用 5:已禁用 6:已关闭)", example = "1")
+ private String customerStatus;
+
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
- @Schema(description = "更新时间")
+ @Schema(description = "行业分类(0:家用电器 1:交通运输 2:商务服务 3:家具用品 4:电工电气 5:通信产品 6:办公文教 7:运动休闲 8:传媒广电)")
+ private String industryClassify;
+
+ @Schema(description = "所在城市")
+ private String city;
+
+ @Schema(description = "社会信息代码证(营业执照)")
+ private String socialInformationCodeCertificate;
+
+ @Schema(description = "法定代表人证件照")
+ private String legalRepresentativesPhoto;
+
+ @Schema(description = "实缴资金证明")
+ private String proofPaidCapital;
+
+ @Schema(description = "资产证明")
+ private String assetCertificate;
+
+ @Schema(description = "资产抵押证明")
+ private String assetCertificateMortgage;
+
+ @Schema(description = "担保人证明")
+ private String guarantorCertificate;
+
+ @Schema(description = "其他资质文件")
+ private String otherQualifications;
+
+ @Schema(description = "经营范围")
+ private String businessScope;
+
+ @Schema(description = "合作范围(关联业务线)")
+ private Integer collaborationScopeNum;
+
+ @Schema(description = "合作起始时间")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime[] collaborationTime;
+
+ @Schema(description = "供货量(每月下限)")
+ private Long supplyVolumeDown;
+
+ @Schema(description = "供货量(每月下限)")
+ private Long supplyVolumeUpper;
+
+ @Schema(description = "资金额度")
+ private Long fundLimit;
+
+ @Schema(description = "营业时间")
+ private String businessHours;
+
+ @Schema(description = "允许卸货时间")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime[] allowableUnloadingTime;
+
+ @Schema(description = "卸货效率")
+ private String unloadingEfficiency;
+
+ @Schema(description = "允许装货时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- private LocalDateTime[] updateTime;
+ private LocalDateTime[] allowableShipmentTime;
+
+ @Schema(description = "装货效果")
+ private String shipmentEffciency;
+
+ @Schema(description = "付款方式(0:无 1:现金 2:银行转账 3:承兑汇票 4:有赞代收 5:支付宝 6:微信 7:国家列表)")
+ private String paymentMethod;
+
+ @Schema(description = "账户名称", example = "王五")
+ private String accountName;
+
+ @Schema(description = "银行账号", example = "18155")
+ private String bankAccount;
+
+ @Schema(description = "开户银行")
+ private String bankDeposit;
+
+ @Schema(description = "开户地区")
+ private String depositArea;
+
+ @Schema(description = "支行名称")
+ private String bankBranch;
+
+ @Schema(description = "公司税号")
+ private String companyTaxNumber;
+
+ @Schema(description = "企业名称", example = "芋艿")
+ private String enterpriseName;
+
+ @Schema(description = "单位地址")
+ private String workAddress;
+
+ @Schema(description = "合作方式(0:买断 1:联营)")
+ private String collaborationMethod;
+
+ @Schema(description = "结算方式(0:先货后款 1:先款后货)")
+ private String settlementMethod;
+
+ @Schema(description = "账期")
+ private String accountPeriod;
+
+ @Schema(description = "压款方式(0:无 1:按金额 2:按比例)")
+ private String underpaymentMethod;
+
+ @Schema(description = "默认压款比例")
+ private String defaultUnderpaymentRatio;
+
+ @Schema(description = "申请压款比例")
+ private String applyForUnderpaymentRatio;
+
+ @Schema(description = "保证金方式(0:无 1:按金额 2:按比例)")
+ private String marginMethod;
+
+ @Schema(description = "默认保证金比例")
+ private String defaultMarginRatio;
+
+ @Schema(description = "申请保证金比例")
+ private String applyForMarginRatio;
+
+ @Schema(description = "逾期利率(0:按年化1:按月化)")
+ private String overdueInterestRate;
+
+ @Schema(description = "默认逾期利率")
+ private String defaultOverdueRatio;
+
+ @Schema(description = "申请逾期利率")
+ private String applyForOverdueRatio;
+
+ @Schema(description = "客户联系人id", example = "6351")
+ private Long contactsId;
+
+ @Schema(description = "客户类型", example = "1")
+ private String customerType;
+
+ @Schema(description = "账户类型", example = "2")
+ private String accountType;
+
+ @Schema(description = "卸货时长")
+ private String unloading;
+
+ @Schema(description = "装货时长")
+ private String shipment;
}
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerPageReqVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerPageReqVO.java
index ae9fb6b..2cac36f 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerPageReqVO.java
+++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerPageReqVO.java
@@ -15,36 +15,194 @@ import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MON
@ToString(callSuper = true)
public class CustomerPageReqVO extends PageParam {
- @Schema(description = "客户名称", example = "赵六")
- private String customerName;
+ @Schema(description = "客户分类(0:一级客户 1:二级客户)")
+ private String customerCalssify;
- @Schema(description = "客户类型", example = "2")
- private String customerType;
+ @Schema(description = "客户名称", example = "王五")
+ private String customerName;
- @Schema(description = "统一结算主体")
- private String unifiedSettlement;
+ @Schema(description = "公司logo")
+ private String customerLogo;
- @Schema(description = "客户性质")
- private String customerNature;
+ @Schema(description = "企业性质(0:国有企业 1:集体企业 2:私营企业 3:股份制企业 4:外资企业 5:合资企业)")
+ private String enterpriseNature;
- @Schema(description = "合作模式")
- private String cooperationMode;
+ @Schema(description = "客户来源(0:电话营销 1:主动来电 2:客户介绍 3:朋友介绍 4:独立开发 5:网络搜索 6:广告杂志 7:展会促销 8:其他途径)")
+ private String customerSource;
- @Schema(description = "隶属业务线", example = "22944")
- private Long linebusinessId;
+ @Schema(description = "客户星级(0:一星 1:二星 2:三星 3:四星 4:五星)")
+ private String customerStarrating;
- @Schema(description = "状态", example = "2")
- private String status;
+ @Schema(description = "业务进度(0:了解跟进 1:资料收集 2:客户评审 3:风控核准 4:合作洽谈 5:准备签约 6:已经签约 7:合作叫停 8:暂时搁置)")
+ private String industrySchedule;
@Schema(description = "归属人员")
- private Set belongingPeople;
+ private String belongingPeople;
+
+ @Schema(description = "国家")
+ private String country;
+
+ @Schema(description = "详细地址")
+ private String address;
+
+ @Schema(description = "公司电话")
+ private String phone;
+
+ @Schema(description = "公司传真")
+ private String companyFax;
+
+ @Schema(description = "公司网址")
+ private String companyHttp;
+
+ @Schema(description = "公司介绍")
+ private String companyProfile;
+
+ @Schema(description = "客户状态(0:待提交 1:待审核 2:待核准 3:带启用 4:已启用 5:已禁用 6:已关闭)", example = "1")
+ private String customerStatus;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
- @Schema(description = "更新时间")
+ @Schema(description = "行业分类(0:家用电器 1:交通运输 2:商务服务 3:家具用品 4:电工电气 5:通信产品 6:办公文教 7:运动休闲 8:传媒广电)")
+ private String industryClassify;
+
+ @Schema(description = "所在城市")
+ private String city;
+
+ @Schema(description = "社会信息代码证(营业执照)")
+ private String socialInformationCodeCertificate;
+
+ @Schema(description = "法定代表人证件照")
+ private String legalRepresentativesPhoto;
+
+ @Schema(description = "实缴资金证明")
+ private String proofPaidCapital;
+
+ @Schema(description = "资产证明")
+ private String assetCertificate;
+
+ @Schema(description = "资产抵押证明")
+ private String assetCertificateMortgage;
+
+ @Schema(description = "担保人证明")
+ private String guarantorCertificate;
+
+ @Schema(description = "其他资质文件")
+ private String otherQualifications;
+
+ @Schema(description = "经营范围")
+ private String businessScope;
+
+ @Schema(description = "合作范围(关联业务线)")
+ private Integer collaborationScopeNum;
+
+ @Schema(description = "合作起始时间")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime[] collaborationTime;
+
+ @Schema(description = "供货量(每月下限)")
+ private Long supplyVolumeDown;
+
+ @Schema(description = "供货量(每月下限)")
+ private Long supplyVolumeUpper;
+
+ @Schema(description = "资金额度")
+ private Long fundLimit;
+
+ @Schema(description = "营业时间")
+ private String businessHours;
+
+ @Schema(description = "允许卸货时间")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime[] allowableUnloadingTime;
+
+ @Schema(description = "卸货效率")
+ private String unloadingEfficiency;
+
+ @Schema(description = "允许装货时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- private LocalDateTime[] updateTime;
+ private LocalDateTime[] allowableShipmentTime;
+
+ @Schema(description = "装货效果")
+ private String shipmentEffciency;
+
+ @Schema(description = "付款方式(0:无 1:现金 2:银行转账 3:承兑汇票 4:有赞代收 5:支付宝 6:微信 7:国家列表)")
+ private String paymentMethod;
+
+ @Schema(description = "账户名称", example = "王五")
+ private String accountName;
+
+ @Schema(description = "银行账号", example = "18155")
+ private String bankAccount;
+
+ @Schema(description = "开户银行")
+ private String bankDeposit;
+
+ @Schema(description = "开户地区")
+ private String depositArea;
+
+ @Schema(description = "支行名称")
+ private String bankBranch;
+
+ @Schema(description = "公司税号")
+ private String companyTaxNumber;
+
+ @Schema(description = "企业名称", example = "芋艿")
+ private String enterpriseName;
+
+ @Schema(description = "单位地址")
+ private String workAddress;
+
+ @Schema(description = "合作方式(0:买断 1:联营)")
+ private String collaborationMethod;
+
+ @Schema(description = "结算方式(0:先货后款 1:先款后货)")
+ private String settlementMethod;
+
+ @Schema(description = "账期")
+ private String accountPeriod;
+
+ @Schema(description = "压款方式(0:无 1:按金额 2:按比例)")
+ private String underpaymentMethod;
+
+ @Schema(description = "默认压款比例")
+ private String defaultUnderpaymentRatio;
+
+ @Schema(description = "申请压款比例")
+ private String applyForUnderpaymentRatio;
+
+ @Schema(description = "保证金方式(0:无 1:按金额 2:按比例)")
+ private String marginMethod;
+
+ @Schema(description = "默认保证金比例")
+ private String defaultMarginRatio;
+
+ @Schema(description = "申请保证金比例")
+ private String applyForMarginRatio;
+
+ @Schema(description = "逾期利率(0:按年化1:按月化)")
+ private String overdueInterestRate;
+
+ @Schema(description = "默认逾期利率")
+ private String defaultOverdueRatio;
+
+ @Schema(description = "申请逾期利率")
+ private String applyForOverdueRatio;
+
+ @Schema(description = "客户联系人id", example = "6351")
+ private Long contactsId;
+
+ @Schema(description = "客户类型", example = "1")
+ private String customerType;
+
+ @Schema(description = "账户类型", example = "2")
+ private String accountType;
+
+ @Schema(description = "卸货时长")
+ private String unloading;
+
+ @Schema(description = "装货时长")
+ private String shipment;
}
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerRespVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerRespVO.java
index a822035..59a5b3f 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerRespVO.java
+++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerRespVO.java
@@ -10,13 +10,10 @@ import java.time.LocalDateTime;
@ToString(callSuper = true)
public class CustomerRespVO extends CustomerBaseVO {
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "7245")
+ @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "9751")
private Long id;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
- @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime updateTime;
-
}
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerUpdateReqVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerUpdateReqVO.java
index 2d0756e..e4476f7 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerUpdateReqVO.java
+++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerUpdateReqVO.java
@@ -11,7 +11,7 @@ import javax.validation.constraints.*;
@ToString(callSuper = true)
public class CustomerUpdateReqVO extends CustomerBaseVO {
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "7245")
+ @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "9751")
@NotNull(message = "编号不能为空")
private Long id;
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/customer/CustomerConvert.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/customer/CustomerConvert.java
index ef7ecc6..3bb553e 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/customer/CustomerConvert.java
+++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/customer/CustomerConvert.java
@@ -12,7 +12,7 @@ import com.yunxi.scm.module.xxjj.dal.dataobject.customer.CustomerDO;
/**
* 客户信息 Convert
*
- * @author 芋道源码
+ * @author 长江云息
*/
@Mapper
public interface CustomerConvert {
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/customer/CustomerDO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/customer/CustomerDO.java
index 52e9123..37c60ed 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/customer/CustomerDO.java
+++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/customer/CustomerDO.java
@@ -1,20 +1,21 @@
package com.yunxi.scm.module.xxjj.dal.dataobject.customer;
-import com.yunxi.scm.framework.common.enums.CommonStatusEnum;
-import com.yunxi.scm.framework.mybatis.core.type.JsonLongSetTypeHandler;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import com.yunxi.scm.framework.mybatis.core.dataobject.BaseDO;
/**
* 客户信息 DO
*
- * @author 芋道源码
+ * @author 长江云息
*/
-@TableName(value = "xxjj_customer", autoResultMap = true)
+@TableName("xxjj_customer")
@KeySequence("xxjj_customer_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@@ -29,40 +30,273 @@ public class CustomerDO extends BaseDO {
*/
@TableId
private Long id;
+ /**
+ * 客户分类(0:一级客户 1:二级客户)
+ *
+ * 枚举 {@link TODO customer_calssify 对应的类}
+ */
+ private String customerCalssify;
/**
* 客户名称
*/
private String customerName;
/**
- * 客户类型
+ * 公司logo
*/
- private String customerType;
+ private String customerLogo;
+ /**
+ * 企业性质(0:国有企业 1:集体企业 2:私营企业 3:股份制企业 4:外资企业 5:合资企业)
+ *
+ * 枚举 {@link TODO enterprise_nature 对应的类}
+ */
+ private String enterpriseNature;
+ /**
+ * 客户来源(0:电话营销 1:主动来电 2:客户介绍 3:朋友介绍 4:独立开发 5:网络搜索 6:广告杂志 7:展会促销 8:其他途径)
+ *
+ * 枚举 {@link TODO product_class 对应的类}
+ */
+ private String customerSource;
+ /**
+ * 客户星级(0:一星 1:二星 2:三星 3:四星 4:五星)
+ *
+ * 枚举 {@link TODO customer_starrating 对应的类}
+ */
+ private String customerStarrating;
+ /**
+ * 业务进度(0:了解跟进 1:资料收集 2:客户评审 3:风控核准 4:合作洽谈 5:准备签约 6:已经签约 7:合作叫停 8:暂时搁置)
+ *
+ * 枚举 {@link TODO industry_schedule 对应的类}
+ */
+ private String industrySchedule;
+ /**
+ * 归属人员
+ */
+ private String belongingPeople;
+ /**
+ * 国家
+ */
+ private String country;
+ /**
+ * 详细地址
+ */
+ private String address;
/**
- * 统一结算主体
+ * 公司电话
*/
- private String unifiedSettlement;
+ private String phone;
/**
- * 客户性质
+ * 公司传真
*/
- private String customerNature;
+ private String companyFax;
/**
- * 合作模式
+ * 公司网址
*/
- private String cooperationMode;
+ private String companyHttp;
/**
- * 隶属业务线
+ * 公司介绍
*/
- private Long linebusinessId;
+ private String companyProfile;
/**
- * 状态
+ * 客户状态(0:待提交 1:待审核 2:待核准 3:带启用 4:已启用 5:已禁用 6:已关闭)
*
- * 枚举 {@link CommonStatusEnum}
+ * 枚举 {@link TODO customer_status1 对应的类}
*/
- private String status;
+ private String customerStatus;
/**
- * 归属人员
+ * 行业分类(0:家用电器 1:交通运输 2:商务服务 3:家具用品 4:电工电气 5:通信产品 6:办公文教 7:运动休闲 8:传媒广电)
+ */
+ private String industryClassify;
+ /**
+ * 所在城市
+ */
+ private String city;
+ /**
+ * 社会信息代码证(营业执照)
+ */
+ private String socialInformationCodeCertificate;
+ /**
+ * 法定代表人证件照
+ */
+ private String legalRepresentativesPhoto;
+ /**
+ * 实缴资金证明
+ */
+ private String proofPaidCapital;
+ /**
+ * 资产证明
+ */
+ private String assetCertificate;
+ /**
+ * 资产抵押证明
+ */
+ private String assetCertificateMortgage;
+ /**
+ * 担保人证明
+ */
+ private String guarantorCertificate;
+ /**
+ * 其他资质文件
+ */
+ private String otherQualifications;
+ /**
+ * 经营范围
+ */
+ private String businessScope;
+ /**
+ * 合作范围(关联业务线)
+ */
+ private Integer collaborationScopeNum;
+ /**
+ * 合作起始时间
+ */
+ private LocalDateTime collaborationTime;
+ /**
+ * 供货量(每月下限)
+ */
+ private Long supplyVolumeDown;
+ /**
+ * 供货量(每月下限)
+ */
+ private Long supplyVolumeUpper;
+ /**
+ * 资金额度
+ */
+ private Long fundLimit;
+ /**
+ * 营业时间
+ */
+ private String businessHours;
+ /**
+ * 允许卸货时间
+ */
+ private LocalDateTime allowableUnloadingTime;
+ /**
+ * 卸货效率
+ */
+ private String unloadingEfficiency;
+ /**
+ * 允许装货时间
+ */
+ private LocalDateTime allowableShipmentTime;
+ /**
+ * 装货效果
+ */
+ private String shipmentEffciency;
+ /**
+ * 付款方式(0:无 1:现金 2:银行转账 3:承兑汇票 4:有赞代收 5:支付宝 6:微信 7:国家列表)
+ *
+ * 枚举 {@link TODO payment_method 对应的类}
+ */
+ private String paymentMethod;
+ /**
+ * 账户名称
+ */
+ private String accountName;
+ /**
+ * 银行账号
+ */
+ private String bankAccount;
+ /**
+ * 开户银行
+ */
+ private String bankDeposit;
+ /**
+ * 开户地区
+ */
+ private String depositArea;
+ /**
+ * 支行名称
+ */
+ private String bankBranch;
+ /**
+ * 公司税号
+ */
+ private String companyTaxNumber;
+ /**
+ * 企业名称
+ */
+ private String enterpriseName;
+ /**
+ * 单位地址
+ */
+ private String workAddress;
+ /**
+ * 合作方式(0:买断 1:联营)
+ *
+ * 枚举 {@link TODO collaboration_method 对应的类}
+ */
+ private String collaborationMethod;
+ /**
+ * 结算方式(0:先货后款 1:先款后货)
+ *
+ * 枚举 {@link TODO settlement_method 对应的类}
+ */
+ private String settlementMethod;
+ /**
+ * 账期
+ */
+ private String accountPeriod;
+ /**
+ * 压款方式(0:无 1:按金额 2:按比例)
+ *
+ * 枚举 {@link TODO underpayment_method 对应的类}
+ */
+ private String underpaymentMethod;
+ /**
+ * 默认压款比例
+ */
+ private String defaultUnderpaymentRatio;
+ /**
+ * 申请压款比例
+ */
+ private String applyForUnderpaymentRatio;
+ /**
+ * 保证金方式(0:无 1:按金额 2:按比例)
+ *
+ * 枚举 {@link TODO margin_method 对应的类}
+ */
+ private String marginMethod;
+ /**
+ * 默认保证金比例
+ */
+ private String defaultMarginRatio;
+ /**
+ * 申请保证金比例
+ */
+ private String applyForMarginRatio;
+ /**
+ * 逾期利率(0:按年化1:按月化)
+ *
+ * 枚举 {@link TODO overdue_interest_rate 对应的类}
+ */
+ private String overdueInterestRate;
+ /**
+ * 默认逾期利率
+ */
+ private String defaultOverdueRatio;
+ /**
+ * 申请逾期利率
+ */
+ private String applyForOverdueRatio;
+ /**
+ * 客户联系人id
+ */
+ private Long contactsId;
+ /**
+ * 客户类型
+ */
+ private String customerType;
+ /**
+ * 账户类型
+ */
+ private String accountType;
+ /**
+ * 卸货时长
+ */
+ private String unloading;
+ /**
+ * 装货时长
*/
- @TableField(typeHandler = JsonLongSetTypeHandler.class)
- private Set belongingPeople;
+ private String shipment;
}
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/customer/CustomerMapper.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/customer/CustomerMapper.java
index bd293b1..9537fb6 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/customer/CustomerMapper.java
+++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/customer/CustomerMapper.java
@@ -12,43 +12,143 @@ import com.yunxi.scm.module.xxjj.controller.admin.customer.vo.*;
/**
* 客户信息 Mapper
*
- * @author 芋道源码
+ * @author 长江云息
*/
@Mapper
public interface CustomerMapper extends BaseMapperX {
default PageResult selectPage(CustomerPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX()
+ .eqIfPresent(CustomerDO::getCustomerCalssify, reqVO.getCustomerCalssify())
.likeIfPresent(CustomerDO::getCustomerName, reqVO.getCustomerName())
- .eqIfPresent(CustomerDO::getCustomerType, reqVO.getCustomerType())
- .eqIfPresent(CustomerDO::getUnifiedSettlement, reqVO.getUnifiedSettlement())
- .eqIfPresent(CustomerDO::getCustomerNature, reqVO.getCustomerNature())
- .eqIfPresent(CustomerDO::getCooperationMode, reqVO.getCooperationMode())
- .eqIfPresent(CustomerDO::getLinebusinessId, reqVO.getLinebusinessId())
- .eqIfPresent(CustomerDO::getStatus, reqVO.getStatus())
+ .eqIfPresent(CustomerDO::getCustomerLogo, reqVO.getCustomerLogo())
+ .eqIfPresent(CustomerDO::getEnterpriseNature, reqVO.getEnterpriseNature())
+ .eqIfPresent(CustomerDO::getCustomerSource, reqVO.getCustomerSource())
+ .eqIfPresent(CustomerDO::getCustomerStarrating, reqVO.getCustomerStarrating())
+ .eqIfPresent(CustomerDO::getIndustrySchedule, reqVO.getIndustrySchedule())
+ .eqIfPresent(CustomerDO::getBelongingPeople, reqVO.getBelongingPeople())
+ .eqIfPresent(CustomerDO::getCountry, reqVO.getCountry())
+ .eqIfPresent(CustomerDO::getAddress, reqVO.getAddress())
+ .eqIfPresent(CustomerDO::getPhone, reqVO.getPhone())
+ .eqIfPresent(CustomerDO::getCompanyFax, reqVO.getCompanyFax())
+ .eqIfPresent(CustomerDO::getCompanyHttp, reqVO.getCompanyHttp())
+ .eqIfPresent(CustomerDO::getCompanyProfile, reqVO.getCompanyProfile())
+ .eqIfPresent(CustomerDO::getCustomerStatus, reqVO.getCustomerStatus())
.betweenIfPresent(CustomerDO::getCreateTime, reqVO.getCreateTime())
- .betweenIfPresent(CustomerDO::getUpdateTime, reqVO.getUpdateTime())
+ .eqIfPresent(CustomerDO::getIndustryClassify, reqVO.getIndustryClassify())
+ .eqIfPresent(CustomerDO::getCity, reqVO.getCity())
+ .eqIfPresent(CustomerDO::getSocialInformationCodeCertificate, reqVO.getSocialInformationCodeCertificate())
+ .eqIfPresent(CustomerDO::getLegalRepresentativesPhoto, reqVO.getLegalRepresentativesPhoto())
+ .eqIfPresent(CustomerDO::getProofPaidCapital, reqVO.getProofPaidCapital())
+ .eqIfPresent(CustomerDO::getAssetCertificate, reqVO.getAssetCertificate())
+ .eqIfPresent(CustomerDO::getAssetCertificateMortgage, reqVO.getAssetCertificateMortgage())
+ .eqIfPresent(CustomerDO::getGuarantorCertificate, reqVO.getGuarantorCertificate())
+ .eqIfPresent(CustomerDO::getOtherQualifications, reqVO.getOtherQualifications())
+ .eqIfPresent(CustomerDO::getBusinessScope, reqVO.getBusinessScope())
+ .eqIfPresent(CustomerDO::getCollaborationScopeNum, reqVO.getCollaborationScopeNum())
+ .betweenIfPresent(CustomerDO::getCollaborationTime, reqVO.getCollaborationTime())
+ .eqIfPresent(CustomerDO::getSupplyVolumeDown, reqVO.getSupplyVolumeDown())
+ .eqIfPresent(CustomerDO::getSupplyVolumeUpper, reqVO.getSupplyVolumeUpper())
+ .eqIfPresent(CustomerDO::getFundLimit, reqVO.getFundLimit())
+ .eqIfPresent(CustomerDO::getBusinessHours, reqVO.getBusinessHours())
+ .betweenIfPresent(CustomerDO::getAllowableUnloadingTime, reqVO.getAllowableUnloadingTime())
+ .eqIfPresent(CustomerDO::getUnloadingEfficiency, reqVO.getUnloadingEfficiency())
+ .betweenIfPresent(CustomerDO::getAllowableShipmentTime, reqVO.getAllowableShipmentTime())
+ .eqIfPresent(CustomerDO::getShipmentEffciency, reqVO.getShipmentEffciency())
+ .eqIfPresent(CustomerDO::getPaymentMethod, reqVO.getPaymentMethod())
+ .likeIfPresent(CustomerDO::getAccountName, reqVO.getAccountName())
+ .eqIfPresent(CustomerDO::getBankAccount, reqVO.getBankAccount())
+ .eqIfPresent(CustomerDO::getBankDeposit, reqVO.getBankDeposit())
+ .eqIfPresent(CustomerDO::getDepositArea, reqVO.getDepositArea())
+ .eqIfPresent(CustomerDO::getBankBranch, reqVO.getBankBranch())
+ .eqIfPresent(CustomerDO::getCompanyTaxNumber, reqVO.getCompanyTaxNumber())
+ .likeIfPresent(CustomerDO::getEnterpriseName, reqVO.getEnterpriseName())
+ .eqIfPresent(CustomerDO::getWorkAddress, reqVO.getWorkAddress())
+ .eqIfPresent(CustomerDO::getCollaborationMethod, reqVO.getCollaborationMethod())
+ .eqIfPresent(CustomerDO::getSettlementMethod, reqVO.getSettlementMethod())
+ .eqIfPresent(CustomerDO::getAccountPeriod, reqVO.getAccountPeriod())
+ .eqIfPresent(CustomerDO::getUnderpaymentMethod, reqVO.getUnderpaymentMethod())
+ .eqIfPresent(CustomerDO::getDefaultUnderpaymentRatio, reqVO.getDefaultUnderpaymentRatio())
+ .eqIfPresent(CustomerDO::getApplyForUnderpaymentRatio, reqVO.getApplyForUnderpaymentRatio())
+ .eqIfPresent(CustomerDO::getMarginMethod, reqVO.getMarginMethod())
+ .eqIfPresent(CustomerDO::getDefaultMarginRatio, reqVO.getDefaultMarginRatio())
+ .eqIfPresent(CustomerDO::getApplyForMarginRatio, reqVO.getApplyForMarginRatio())
+ .eqIfPresent(CustomerDO::getOverdueInterestRate, reqVO.getOverdueInterestRate())
+ .eqIfPresent(CustomerDO::getDefaultOverdueRatio, reqVO.getDefaultOverdueRatio())
+ .eqIfPresent(CustomerDO::getApplyForOverdueRatio, reqVO.getApplyForOverdueRatio())
+ .eqIfPresent(CustomerDO::getContactsId, reqVO.getContactsId())
+ .eqIfPresent(CustomerDO::getCustomerType, reqVO.getCustomerType())
+ .eqIfPresent(CustomerDO::getAccountType, reqVO.getAccountType())
+ .eqIfPresent(CustomerDO::getUnloading, reqVO.getUnloading())
+ .eqIfPresent(CustomerDO::getShipment, reqVO.getShipment())
.orderByDesc(CustomerDO::getId));
}
default List selectList(CustomerExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX()
+ .eqIfPresent(CustomerDO::getCustomerCalssify, reqVO.getCustomerCalssify())
.likeIfPresent(CustomerDO::getCustomerName, reqVO.getCustomerName())
- .eqIfPresent(CustomerDO::getCustomerType, reqVO.getCustomerType())
- .eqIfPresent(CustomerDO::getUnifiedSettlement, reqVO.getUnifiedSettlement())
- .eqIfPresent(CustomerDO::getCustomerNature, reqVO.getCustomerNature())
- .eqIfPresent(CustomerDO::getCooperationMode, reqVO.getCooperationMode())
- .eqIfPresent(CustomerDO::getLinebusinessId, reqVO.getLinebusinessId())
- .eqIfPresent(CustomerDO::getStatus, reqVO.getStatus())
+ .eqIfPresent(CustomerDO::getCustomerLogo, reqVO.getCustomerLogo())
+ .eqIfPresent(CustomerDO::getEnterpriseNature, reqVO.getEnterpriseNature())
+ .eqIfPresent(CustomerDO::getCustomerSource, reqVO.getCustomerSource())
+ .eqIfPresent(CustomerDO::getCustomerStarrating, reqVO.getCustomerStarrating())
+ .eqIfPresent(CustomerDO::getIndustrySchedule, reqVO.getIndustrySchedule())
+ .eqIfPresent(CustomerDO::getBelongingPeople, reqVO.getBelongingPeople())
+ .eqIfPresent(CustomerDO::getCountry, reqVO.getCountry())
+ .eqIfPresent(CustomerDO::getAddress, reqVO.getAddress())
+ .eqIfPresent(CustomerDO::getPhone, reqVO.getPhone())
+ .eqIfPresent(CustomerDO::getCompanyFax, reqVO.getCompanyFax())
+ .eqIfPresent(CustomerDO::getCompanyHttp, reqVO.getCompanyHttp())
+ .eqIfPresent(CustomerDO::getCompanyProfile, reqVO.getCompanyProfile())
+ .eqIfPresent(CustomerDO::getCustomerStatus, reqVO.getCustomerStatus())
.betweenIfPresent(CustomerDO::getCreateTime, reqVO.getCreateTime())
- .betweenIfPresent(CustomerDO::getUpdateTime, reqVO.getUpdateTime())
+ .eqIfPresent(CustomerDO::getIndustryClassify, reqVO.getIndustryClassify())
+ .eqIfPresent(CustomerDO::getCity, reqVO.getCity())
+ .eqIfPresent(CustomerDO::getSocialInformationCodeCertificate, reqVO.getSocialInformationCodeCertificate())
+ .eqIfPresent(CustomerDO::getLegalRepresentativesPhoto, reqVO.getLegalRepresentativesPhoto())
+ .eqIfPresent(CustomerDO::getProofPaidCapital, reqVO.getProofPaidCapital())
+ .eqIfPresent(CustomerDO::getAssetCertificate, reqVO.getAssetCertificate())
+ .eqIfPresent(CustomerDO::getAssetCertificateMortgage, reqVO.getAssetCertificateMortgage())
+ .eqIfPresent(CustomerDO::getGuarantorCertificate, reqVO.getGuarantorCertificate())
+ .eqIfPresent(CustomerDO::getOtherQualifications, reqVO.getOtherQualifications())
+ .eqIfPresent(CustomerDO::getBusinessScope, reqVO.getBusinessScope())
+ .eqIfPresent(CustomerDO::getCollaborationScopeNum, reqVO.getCollaborationScopeNum())
+ .betweenIfPresent(CustomerDO::getCollaborationTime, reqVO.getCollaborationTime())
+ .eqIfPresent(CustomerDO::getSupplyVolumeDown, reqVO.getSupplyVolumeDown())
+ .eqIfPresent(CustomerDO::getSupplyVolumeUpper, reqVO.getSupplyVolumeUpper())
+ .eqIfPresent(CustomerDO::getFundLimit, reqVO.getFundLimit())
+ .eqIfPresent(CustomerDO::getBusinessHours, reqVO.getBusinessHours())
+ .betweenIfPresent(CustomerDO::getAllowableUnloadingTime, reqVO.getAllowableUnloadingTime())
+ .eqIfPresent(CustomerDO::getUnloadingEfficiency, reqVO.getUnloadingEfficiency())
+ .betweenIfPresent(CustomerDO::getAllowableShipmentTime, reqVO.getAllowableShipmentTime())
+ .eqIfPresent(CustomerDO::getShipmentEffciency, reqVO.getShipmentEffciency())
+ .eqIfPresent(CustomerDO::getPaymentMethod, reqVO.getPaymentMethod())
+ .likeIfPresent(CustomerDO::getAccountName, reqVO.getAccountName())
+ .eqIfPresent(CustomerDO::getBankAccount, reqVO.getBankAccount())
+ .eqIfPresent(CustomerDO::getBankDeposit, reqVO.getBankDeposit())
+ .eqIfPresent(CustomerDO::getDepositArea, reqVO.getDepositArea())
+ .eqIfPresent(CustomerDO::getBankBranch, reqVO.getBankBranch())
+ .eqIfPresent(CustomerDO::getCompanyTaxNumber, reqVO.getCompanyTaxNumber())
+ .likeIfPresent(CustomerDO::getEnterpriseName, reqVO.getEnterpriseName())
+ .eqIfPresent(CustomerDO::getWorkAddress, reqVO.getWorkAddress())
+ .eqIfPresent(CustomerDO::getCollaborationMethod, reqVO.getCollaborationMethod())
+ .eqIfPresent(CustomerDO::getSettlementMethod, reqVO.getSettlementMethod())
+ .eqIfPresent(CustomerDO::getAccountPeriod, reqVO.getAccountPeriod())
+ .eqIfPresent(CustomerDO::getUnderpaymentMethod, reqVO.getUnderpaymentMethod())
+ .eqIfPresent(CustomerDO::getDefaultUnderpaymentRatio, reqVO.getDefaultUnderpaymentRatio())
+ .eqIfPresent(CustomerDO::getApplyForUnderpaymentRatio, reqVO.getApplyForUnderpaymentRatio())
+ .eqIfPresent(CustomerDO::getMarginMethod, reqVO.getMarginMethod())
+ .eqIfPresent(CustomerDO::getDefaultMarginRatio, reqVO.getDefaultMarginRatio())
+ .eqIfPresent(CustomerDO::getApplyForMarginRatio, reqVO.getApplyForMarginRatio())
+ .eqIfPresent(CustomerDO::getOverdueInterestRate, reqVO.getOverdueInterestRate())
+ .eqIfPresent(CustomerDO::getDefaultOverdueRatio, reqVO.getDefaultOverdueRatio())
+ .eqIfPresent(CustomerDO::getApplyForOverdueRatio, reqVO.getApplyForOverdueRatio())
+ .eqIfPresent(CustomerDO::getContactsId, reqVO.getContactsId())
+ .eqIfPresent(CustomerDO::getCustomerType, reqVO.getCustomerType())
+ .eqIfPresent(CustomerDO::getAccountType, reqVO.getAccountType())
+ .eqIfPresent(CustomerDO::getUnloading, reqVO.getUnloading())
+ .eqIfPresent(CustomerDO::getShipment, reqVO.getShipment())
.orderByDesc(CustomerDO::getId));
}
- default List selectcustomerList(CustomerRespVO reqVO) {
- return selectList(new LambdaQueryWrapperX()
- .likeIfPresent(CustomerDO::getCustomerName, reqVO.getCustomerName())
- .eqIfPresent(CustomerDO::getStatus, reqVO.getStatus()));
- }
-
}
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/customer/CustomerService.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/customer/CustomerService.java
index 1e8fd92..e682e49 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/customer/CustomerService.java
+++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/customer/CustomerService.java
@@ -9,7 +9,7 @@ import com.yunxi.scm.framework.common.pojo.PageResult;
/**
* 客户信息 Service 接口
*
- * @author 芋道源码
+ * @author 长江云息
*/
public interface CustomerService {
@@ -67,11 +67,4 @@ public interface CustomerService {
*/
List getCustomerList(CustomerExportReqVO exportReqVO);
- /**
- * 获得指定状态的客户
- *
- *
- * @return 客户
- */
- List getCustomerstaus(CustomerRespVO customerRespVO);
}
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/customer/CustomerServiceImpl.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/customer/CustomerServiceImpl.java
index a927e2a..3abcd30 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/customer/CustomerServiceImpl.java
+++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/customer/CustomerServiceImpl.java
@@ -18,7 +18,7 @@ import static com.yunxi.scm.module.xxjj.enums.ErrorCodeConstants.*;
/**
* 客户信息 Service 实现类
*
- * @author 芋道源码
+ * @author 长江云息
*/
@Service
@Validated
@@ -79,9 +79,4 @@ public class CustomerServiceImpl implements CustomerService {
return customerMapper.selectList(exportReqVO);
}
- @Override
- public List getCustomerstaus(CustomerRespVO customerRespVO) {
- return customerMapper.selectcustomerList(customerRespVO);
- }
-
}
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/customer/CustomerMapper.xml b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/customer/CustomerMapper.xml
index 78d7542..6f5b3b5 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/customer/CustomerMapper.xml
+++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/customer/CustomerMapper.xml
@@ -2,9 +2,11 @@
-
+
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/customer/CustomerServiceImplTest.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/customer/CustomerServiceImplTest.java
index 504e911..a4b04af 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/customer/CustomerServiceImplTest.java
+++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/customer/CustomerServiceImplTest.java
@@ -31,7 +31,7 @@ import static org.mockito.Mockito.*;
/**
* {@link CustomerServiceImpl} 的单元测试类
*
- * @author 芋道源码
+ * @author 长江云息
*/
@Import(CustomerServiceImpl.class)
public class CustomerServiceImplTest extends BaseDbUnitTest {
@@ -110,50 +110,258 @@ public class CustomerServiceImplTest extends BaseDbUnitTest {
public void testGetCustomerPage() {
// mock 数据
CustomerDO dbCustomer = randomPojo(CustomerDO.class, o -> { // 等会查询到
+ o.setCustomerCalssify(null);
o.setCustomerName(null);
- o.setCustomerType(null);
- o.setUnifiedSettlement(null);
- o.setCustomerNature(null);
- o.setCooperationMode(null);
- o.setLinebusinessId(null);
- o.setStatus(null);
+ o.setCustomerLogo(null);
+ o.setEnterpriseNature(null);
+ o.setCustomerSource(null);
+ o.setCustomerStarrating(null);
+ o.setIndustrySchedule(null);
o.setBelongingPeople(null);
+ o.setCountry(null);
+ o.setAddress(null);
+ o.setPhone(null);
+ o.setCompanyFax(null);
+ o.setCompanyHttp(null);
+ o.setCompanyProfile(null);
+ o.setCustomerStatus(null);
o.setCreateTime(null);
- o.setUpdateTime(null);
+ o.setIndustryClassify(null);
+ o.setCity(null);
+ o.setSocialInformationCodeCertificate(null);
+ o.setLegalRepresentativesPhoto(null);
+ o.setProofPaidCapital(null);
+ o.setAssetCertificate(null);
+ o.setAssetCertificateMortgage(null);
+ o.setGuarantorCertificate(null);
+ o.setOtherQualifications(null);
+ o.setBusinessScope(null);
+ o.setCollaborationScopeNum(null);
+ o.setCollaborationTime(null);
+ o.setSupplyVolumeDown(null);
+ o.setSupplyVolumeUpper(null);
+ o.setFundLimit(null);
+ o.setBusinessHours(null);
+ o.setAllowableUnloadingTime(null);
+ o.setUnloadingEfficiency(null);
+ o.setAllowableShipmentTime(null);
+ o.setShipmentEffciency(null);
+ o.setPaymentMethod(null);
+ o.setAccountName(null);
+ o.setBankAccount(null);
+ o.setBankDeposit(null);
+ o.setDepositArea(null);
+ o.setBankBranch(null);
+ o.setCompanyTaxNumber(null);
+ o.setEnterpriseName(null);
+ o.setWorkAddress(null);
+ o.setCollaborationMethod(null);
+ o.setSettlementMethod(null);
+ o.setAccountPeriod(null);
+ o.setUnderpaymentMethod(null);
+ o.setDefaultUnderpaymentRatio(null);
+ o.setApplyForUnderpaymentRatio(null);
+ o.setMarginMethod(null);
+ o.setDefaultMarginRatio(null);
+ o.setApplyForMarginRatio(null);
+ o.setOverdueInterestRate(null);
+ o.setDefaultOverdueRatio(null);
+ o.setApplyForOverdueRatio(null);
+ o.setContactsId(null);
+ o.setCustomerType(null);
+ o.setAccountType(null);
+ o.setUnloading(null);
+ o.setShipment(null);
});
customerMapper.insert(dbCustomer);
+ // 测试 customerCalssify 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCustomerCalssify(null)));
// 测试 customerName 不匹配
customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCustomerName(null)));
- // 测试 customerType 不匹配
- customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCustomerType(null)));
- // 测试 unifiedSettlement 不匹配
- customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setUnifiedSettlement(null)));
- // 测试 customerNature 不匹配
- customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCustomerNature(null)));
- // 测试 cooperationMode 不匹配
- customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCooperationMode(null)));
- // 测试 linebusinessId 不匹配
- customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setLinebusinessId(null)));
- // 测试 status 不匹配
- customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setStatus(null)));
+ // 测试 customerLogo 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCustomerLogo(null)));
+ // 测试 enterpriseNature 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setEnterpriseNature(null)));
+ // 测试 customerSource 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCustomerSource(null)));
+ // 测试 customerStarrating 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCustomerStarrating(null)));
+ // 测试 industrySchedule 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setIndustrySchedule(null)));
// 测试 belongingPeople 不匹配
customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setBelongingPeople(null)));
+ // 测试 country 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCountry(null)));
+ // 测试 address 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAddress(null)));
+ // 测试 phone 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setPhone(null)));
+ // 测试 companyFax 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCompanyFax(null)));
+ // 测试 companyHttp 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCompanyHttp(null)));
+ // 测试 companyProfile 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCompanyProfile(null)));
+ // 测试 customerStatus 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCustomerStatus(null)));
// 测试 createTime 不匹配
customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCreateTime(null)));
- // 测试 updateTime 不匹配
- customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setUpdateTime(null)));
+ // 测试 industryClassify 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setIndustryClassify(null)));
+ // 测试 city 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCity(null)));
+ // 测试 socialInformationCodeCertificate 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setSocialInformationCodeCertificate(null)));
+ // 测试 legalRepresentativesPhoto 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setLegalRepresentativesPhoto(null)));
+ // 测试 proofPaidCapital 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setProofPaidCapital(null)));
+ // 测试 assetCertificate 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAssetCertificate(null)));
+ // 测试 assetCertificateMortgage 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAssetCertificateMortgage(null)));
+ // 测试 guarantorCertificate 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setGuarantorCertificate(null)));
+ // 测试 otherQualifications 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setOtherQualifications(null)));
+ // 测试 businessScope 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setBusinessScope(null)));
+ // 测试 collaborationScopeNum 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCollaborationScopeNum(null)));
+ // 测试 collaborationTime 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCollaborationTime(null)));
+ // 测试 supplyVolumeDown 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setSupplyVolumeDown(null)));
+ // 测试 supplyVolumeUpper 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setSupplyVolumeUpper(null)));
+ // 测试 fundLimit 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setFundLimit(null)));
+ // 测试 businessHours 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setBusinessHours(null)));
+ // 测试 allowableUnloadingTime 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAllowableUnloadingTime(null)));
+ // 测试 unloadingEfficiency 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setUnloadingEfficiency(null)));
+ // 测试 allowableShipmentTime 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAllowableShipmentTime(null)));
+ // 测试 shipmentEffciency 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setShipmentEffciency(null)));
+ // 测试 paymentMethod 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setPaymentMethod(null)));
+ // 测试 accountName 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAccountName(null)));
+ // 测试 bankAccount 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setBankAccount(null)));
+ // 测试 bankDeposit 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setBankDeposit(null)));
+ // 测试 depositArea 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setDepositArea(null)));
+ // 测试 bankBranch 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setBankBranch(null)));
+ // 测试 companyTaxNumber 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCompanyTaxNumber(null)));
+ // 测试 enterpriseName 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setEnterpriseName(null)));
+ // 测试 workAddress 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setWorkAddress(null)));
+ // 测试 collaborationMethod 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCollaborationMethod(null)));
+ // 测试 settlementMethod 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setSettlementMethod(null)));
+ // 测试 accountPeriod 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAccountPeriod(null)));
+ // 测试 underpaymentMethod 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setUnderpaymentMethod(null)));
+ // 测试 defaultUnderpaymentRatio 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setDefaultUnderpaymentRatio(null)));
+ // 测试 applyForUnderpaymentRatio 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setApplyForUnderpaymentRatio(null)));
+ // 测试 marginMethod 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setMarginMethod(null)));
+ // 测试 defaultMarginRatio 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setDefaultMarginRatio(null)));
+ // 测试 applyForMarginRatio 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setApplyForMarginRatio(null)));
+ // 测试 overdueInterestRate 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setOverdueInterestRate(null)));
+ // 测试 defaultOverdueRatio 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setDefaultOverdueRatio(null)));
+ // 测试 applyForOverdueRatio 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setApplyForOverdueRatio(null)));
+ // 测试 contactsId 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setContactsId(null)));
+ // 测试 customerType 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCustomerType(null)));
+ // 测试 accountType 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAccountType(null)));
+ // 测试 unloading 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setUnloading(null)));
+ // 测试 shipment 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setShipment(null)));
// 准备参数
CustomerPageReqVO reqVO = new CustomerPageReqVO();
+ reqVO.setCustomerCalssify(null);
reqVO.setCustomerName(null);
- reqVO.setCustomerType(null);
- reqVO.setUnifiedSettlement(null);
- reqVO.setCustomerNature(null);
- reqVO.setCooperationMode(null);
- reqVO.setLinebusinessId(null);
- reqVO.setStatus(null);
-// reqVO.setBelongingPeople(null);
+ reqVO.setCustomerLogo(null);
+ reqVO.setEnterpriseNature(null);
+ reqVO.setCustomerSource(null);
+ reqVO.setCustomerStarrating(null);
+ reqVO.setIndustrySchedule(null);
+ reqVO.setBelongingPeople(null);
+ reqVO.setCountry(null);
+ reqVO.setAddress(null);
+ reqVO.setPhone(null);
+ reqVO.setCompanyFax(null);
+ reqVO.setCompanyHttp(null);
+ reqVO.setCompanyProfile(null);
+ reqVO.setCustomerStatus(null);
reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
- reqVO.setUpdateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+ reqVO.setIndustryClassify(null);
+ reqVO.setCity(null);
+ reqVO.setSocialInformationCodeCertificate(null);
+ reqVO.setLegalRepresentativesPhoto(null);
+ reqVO.setProofPaidCapital(null);
+ reqVO.setAssetCertificate(null);
+ reqVO.setAssetCertificateMortgage(null);
+ reqVO.setGuarantorCertificate(null);
+ reqVO.setOtherQualifications(null);
+ reqVO.setBusinessScope(null);
+ reqVO.setCollaborationScopeNum(null);
+ reqVO.setCollaborationTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+ reqVO.setSupplyVolumeDown(null);
+ reqVO.setSupplyVolumeUpper(null);
+ reqVO.setFundLimit(null);
+ reqVO.setBusinessHours(null);
+ reqVO.setAllowableUnloadingTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+ reqVO.setUnloadingEfficiency(null);
+ reqVO.setAllowableShipmentTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+ reqVO.setShipmentEffciency(null);
+ reqVO.setPaymentMethod(null);
+ reqVO.setAccountName(null);
+ reqVO.setBankAccount(null);
+ reqVO.setBankDeposit(null);
+ reqVO.setDepositArea(null);
+ reqVO.setBankBranch(null);
+ reqVO.setCompanyTaxNumber(null);
+ reqVO.setEnterpriseName(null);
+ reqVO.setWorkAddress(null);
+ reqVO.setCollaborationMethod(null);
+ reqVO.setSettlementMethod(null);
+ reqVO.setAccountPeriod(null);
+ reqVO.setUnderpaymentMethod(null);
+ reqVO.setDefaultUnderpaymentRatio(null);
+ reqVO.setApplyForUnderpaymentRatio(null);
+ reqVO.setMarginMethod(null);
+ reqVO.setDefaultMarginRatio(null);
+ reqVO.setApplyForMarginRatio(null);
+ reqVO.setOverdueInterestRate(null);
+ reqVO.setDefaultOverdueRatio(null);
+ reqVO.setApplyForOverdueRatio(null);
+ reqVO.setContactsId(null);
+ reqVO.setCustomerType(null);
+ reqVO.setAccountType(null);
+ reqVO.setUnloading(null);
+ reqVO.setShipment(null);
// 调用
PageResult pageResult = customerService.getCustomerPage(reqVO);
@@ -168,50 +376,258 @@ public class CustomerServiceImplTest extends BaseDbUnitTest {
public void testGetCustomerList() {
// mock 数据
CustomerDO dbCustomer = randomPojo(CustomerDO.class, o -> { // 等会查询到
+ o.setCustomerCalssify(null);
o.setCustomerName(null);
- o.setCustomerType(null);
- o.setUnifiedSettlement(null);
- o.setCustomerNature(null);
- o.setCooperationMode(null);
- o.setLinebusinessId(null);
- o.setStatus(null);
+ o.setCustomerLogo(null);
+ o.setEnterpriseNature(null);
+ o.setCustomerSource(null);
+ o.setCustomerStarrating(null);
+ o.setIndustrySchedule(null);
o.setBelongingPeople(null);
+ o.setCountry(null);
+ o.setAddress(null);
+ o.setPhone(null);
+ o.setCompanyFax(null);
+ o.setCompanyHttp(null);
+ o.setCompanyProfile(null);
+ o.setCustomerStatus(null);
o.setCreateTime(null);
- o.setUpdateTime(null);
+ o.setIndustryClassify(null);
+ o.setCity(null);
+ o.setSocialInformationCodeCertificate(null);
+ o.setLegalRepresentativesPhoto(null);
+ o.setProofPaidCapital(null);
+ o.setAssetCertificate(null);
+ o.setAssetCertificateMortgage(null);
+ o.setGuarantorCertificate(null);
+ o.setOtherQualifications(null);
+ o.setBusinessScope(null);
+ o.setCollaborationScopeNum(null);
+ o.setCollaborationTime(null);
+ o.setSupplyVolumeDown(null);
+ o.setSupplyVolumeUpper(null);
+ o.setFundLimit(null);
+ o.setBusinessHours(null);
+ o.setAllowableUnloadingTime(null);
+ o.setUnloadingEfficiency(null);
+ o.setAllowableShipmentTime(null);
+ o.setShipmentEffciency(null);
+ o.setPaymentMethod(null);
+ o.setAccountName(null);
+ o.setBankAccount(null);
+ o.setBankDeposit(null);
+ o.setDepositArea(null);
+ o.setBankBranch(null);
+ o.setCompanyTaxNumber(null);
+ o.setEnterpriseName(null);
+ o.setWorkAddress(null);
+ o.setCollaborationMethod(null);
+ o.setSettlementMethod(null);
+ o.setAccountPeriod(null);
+ o.setUnderpaymentMethod(null);
+ o.setDefaultUnderpaymentRatio(null);
+ o.setApplyForUnderpaymentRatio(null);
+ o.setMarginMethod(null);
+ o.setDefaultMarginRatio(null);
+ o.setApplyForMarginRatio(null);
+ o.setOverdueInterestRate(null);
+ o.setDefaultOverdueRatio(null);
+ o.setApplyForOverdueRatio(null);
+ o.setContactsId(null);
+ o.setCustomerType(null);
+ o.setAccountType(null);
+ o.setUnloading(null);
+ o.setShipment(null);
});
customerMapper.insert(dbCustomer);
+ // 测试 customerCalssify 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCustomerCalssify(null)));
// 测试 customerName 不匹配
customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCustomerName(null)));
- // 测试 customerType 不匹配
- customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCustomerType(null)));
- // 测试 unifiedSettlement 不匹配
- customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setUnifiedSettlement(null)));
- // 测试 customerNature 不匹配
- customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCustomerNature(null)));
- // 测试 cooperationMode 不匹配
- customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCooperationMode(null)));
- // 测试 linebusinessId 不匹配
- customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setLinebusinessId(null)));
- // 测试 status 不匹配
- customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setStatus(null)));
+ // 测试 customerLogo 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCustomerLogo(null)));
+ // 测试 enterpriseNature 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setEnterpriseNature(null)));
+ // 测试 customerSource 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCustomerSource(null)));
+ // 测试 customerStarrating 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCustomerStarrating(null)));
+ // 测试 industrySchedule 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setIndustrySchedule(null)));
// 测试 belongingPeople 不匹配
customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setBelongingPeople(null)));
+ // 测试 country 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCountry(null)));
+ // 测试 address 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAddress(null)));
+ // 测试 phone 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setPhone(null)));
+ // 测试 companyFax 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCompanyFax(null)));
+ // 测试 companyHttp 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCompanyHttp(null)));
+ // 测试 companyProfile 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCompanyProfile(null)));
+ // 测试 customerStatus 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCustomerStatus(null)));
// 测试 createTime 不匹配
customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCreateTime(null)));
- // 测试 updateTime 不匹配
- customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setUpdateTime(null)));
+ // 测试 industryClassify 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setIndustryClassify(null)));
+ // 测试 city 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCity(null)));
+ // 测试 socialInformationCodeCertificate 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setSocialInformationCodeCertificate(null)));
+ // 测试 legalRepresentativesPhoto 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setLegalRepresentativesPhoto(null)));
+ // 测试 proofPaidCapital 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setProofPaidCapital(null)));
+ // 测试 assetCertificate 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAssetCertificate(null)));
+ // 测试 assetCertificateMortgage 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAssetCertificateMortgage(null)));
+ // 测试 guarantorCertificate 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setGuarantorCertificate(null)));
+ // 测试 otherQualifications 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setOtherQualifications(null)));
+ // 测试 businessScope 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setBusinessScope(null)));
+ // 测试 collaborationScopeNum 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCollaborationScopeNum(null)));
+ // 测试 collaborationTime 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCollaborationTime(null)));
+ // 测试 supplyVolumeDown 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setSupplyVolumeDown(null)));
+ // 测试 supplyVolumeUpper 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setSupplyVolumeUpper(null)));
+ // 测试 fundLimit 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setFundLimit(null)));
+ // 测试 businessHours 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setBusinessHours(null)));
+ // 测试 allowableUnloadingTime 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAllowableUnloadingTime(null)));
+ // 测试 unloadingEfficiency 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setUnloadingEfficiency(null)));
+ // 测试 allowableShipmentTime 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAllowableShipmentTime(null)));
+ // 测试 shipmentEffciency 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setShipmentEffciency(null)));
+ // 测试 paymentMethod 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setPaymentMethod(null)));
+ // 测试 accountName 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAccountName(null)));
+ // 测试 bankAccount 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setBankAccount(null)));
+ // 测试 bankDeposit 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setBankDeposit(null)));
+ // 测试 depositArea 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setDepositArea(null)));
+ // 测试 bankBranch 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setBankBranch(null)));
+ // 测试 companyTaxNumber 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCompanyTaxNumber(null)));
+ // 测试 enterpriseName 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setEnterpriseName(null)));
+ // 测试 workAddress 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setWorkAddress(null)));
+ // 测试 collaborationMethod 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCollaborationMethod(null)));
+ // 测试 settlementMethod 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setSettlementMethod(null)));
+ // 测试 accountPeriod 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAccountPeriod(null)));
+ // 测试 underpaymentMethod 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setUnderpaymentMethod(null)));
+ // 测试 defaultUnderpaymentRatio 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setDefaultUnderpaymentRatio(null)));
+ // 测试 applyForUnderpaymentRatio 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setApplyForUnderpaymentRatio(null)));
+ // 测试 marginMethod 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setMarginMethod(null)));
+ // 测试 defaultMarginRatio 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setDefaultMarginRatio(null)));
+ // 测试 applyForMarginRatio 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setApplyForMarginRatio(null)));
+ // 测试 overdueInterestRate 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setOverdueInterestRate(null)));
+ // 测试 defaultOverdueRatio 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setDefaultOverdueRatio(null)));
+ // 测试 applyForOverdueRatio 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setApplyForOverdueRatio(null)));
+ // 测试 contactsId 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setContactsId(null)));
+ // 测试 customerType 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCustomerType(null)));
+ // 测试 accountType 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAccountType(null)));
+ // 测试 unloading 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setUnloading(null)));
+ // 测试 shipment 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setShipment(null)));
// 准备参数
CustomerExportReqVO reqVO = new CustomerExportReqVO();
+ reqVO.setCustomerCalssify(null);
reqVO.setCustomerName(null);
- reqVO.setCustomerType(null);
- reqVO.setUnifiedSettlement(null);
- reqVO.setCustomerNature(null);
- reqVO.setCooperationMode(null);
- reqVO.setLinebusinessId(null);
- reqVO.setStatus(null);
+ reqVO.setCustomerLogo(null);
+ reqVO.setEnterpriseNature(null);
+ reqVO.setCustomerSource(null);
+ reqVO.setCustomerStarrating(null);
+ reqVO.setIndustrySchedule(null);
reqVO.setBelongingPeople(null);
+ reqVO.setCountry(null);
+ reqVO.setAddress(null);
+ reqVO.setPhone(null);
+ reqVO.setCompanyFax(null);
+ reqVO.setCompanyHttp(null);
+ reqVO.setCompanyProfile(null);
+ reqVO.setCustomerStatus(null);
reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
- reqVO.setUpdateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+ reqVO.setIndustryClassify(null);
+ reqVO.setCity(null);
+ reqVO.setSocialInformationCodeCertificate(null);
+ reqVO.setLegalRepresentativesPhoto(null);
+ reqVO.setProofPaidCapital(null);
+ reqVO.setAssetCertificate(null);
+ reqVO.setAssetCertificateMortgage(null);
+ reqVO.setGuarantorCertificate(null);
+ reqVO.setOtherQualifications(null);
+ reqVO.setBusinessScope(null);
+ reqVO.setCollaborationScopeNum(null);
+ reqVO.setCollaborationTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+ reqVO.setSupplyVolumeDown(null);
+ reqVO.setSupplyVolumeUpper(null);
+ reqVO.setFundLimit(null);
+ reqVO.setBusinessHours(null);
+ reqVO.setAllowableUnloadingTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+ reqVO.setUnloadingEfficiency(null);
+ reqVO.setAllowableShipmentTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+ reqVO.setShipmentEffciency(null);
+ reqVO.setPaymentMethod(null);
+ reqVO.setAccountName(null);
+ reqVO.setBankAccount(null);
+ reqVO.setBankDeposit(null);
+ reqVO.setDepositArea(null);
+ reqVO.setBankBranch(null);
+ reqVO.setCompanyTaxNumber(null);
+ reqVO.setEnterpriseName(null);
+ reqVO.setWorkAddress(null);
+ reqVO.setCollaborationMethod(null);
+ reqVO.setSettlementMethod(null);
+ reqVO.setAccountPeriod(null);
+ reqVO.setUnderpaymentMethod(null);
+ reqVO.setDefaultUnderpaymentRatio(null);
+ reqVO.setApplyForUnderpaymentRatio(null);
+ reqVO.setMarginMethod(null);
+ reqVO.setDefaultMarginRatio(null);
+ reqVO.setApplyForMarginRatio(null);
+ reqVO.setOverdueInterestRate(null);
+ reqVO.setDefaultOverdueRatio(null);
+ reqVO.setApplyForOverdueRatio(null);
+ reqVO.setContactsId(null);
+ reqVO.setCustomerType(null);
+ reqVO.setAccountType(null);
+ reqVO.setUnloading(null);
+ reqVO.setShipment(null);
// 调用
List list = customerService.getCustomerList(reqVO);
diff --git a/yunxi-server/src/main/resources/application-dev.yaml b/yunxi-server/src/main/resources/application-dev.yaml
index 1a7b417..c1b112c 100644
--- a/yunxi-server/src/main/resources/application-dev.yaml
+++ b/yunxi-server/src/main/resources/application-dev.yaml
@@ -1,5 +1,5 @@
server:
- port: 48080
+ port: 8091
--- #################### 数据库相关配置 ####################
@@ -37,38 +37,48 @@ spring:
time-between-eviction-runs-millis: 60000 # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位:毫秒
min-evictable-idle-time-millis: 300000 # 配置一个连接在池中最小生存的时间,单位:毫秒
max-evictable-idle-time-millis: 900000 # 配置一个连接在池中最大生存的时间,单位:毫秒
- validation-query: SELECT 1 # 配置检测连接是否有效
+ validation-query: SELECT 1 FROM DUAL # 配置检测连接是否有效
test-while-idle: true
test-on-borrow: false
test-on-return: false
primary: master
datasource:
master:
- name: yxsass
- url: jdbc:mysql://112.124.64.122:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
- driver-class-name: com.mysql.jdbc.Driver
- username: yxsass
- password: jxjitjjxJFNM5YNW
- slave: # 模拟从库,可根据自己需要修改 # 模拟从库,可根据自己需要修改
- name: yxsass
- url: jdbc:mysql://112.124.64.122:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
- driver-class-name: com.mysql.jdbc.Driver
- username: yxsass
- password: jxjitjjxJFNM5YNW
+ name: yxscm
+ url: jdbc:mysql://222.71.165.188:3309/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+ # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
+ # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.master.name} # PostgreSQL 连接的示例
+ # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
+ # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例
+ username: root
+ password: linus,.123
+ # username: sa
+ # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
+ slave: # 模拟从库,可根据自己需要修改
+ name: yxscm
+ url: jdbc:mysql://222.71.165.188:3309/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+ # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
+ # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例
+ # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
+ # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.slave.name} # SQLServer 连接的示例
+ username: root
+ password: linus,.123
+ # username: sa
+ # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
# Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优
redis:
- host: 400-infra.server.iocoder.cn # 地址
+ host: 127.0.0.1 # 地址
port: 6379 # 端口
- database: 1 # 数据库索引
-# password: 123456 # 密码,建议生产环境开启
+ database: 0 # 数据库索引
+ password: 'qweasd,.123' # 密码,建议生产环境开启
--- #################### 定时任务相关配置 ####################
# Quartz 配置项,对应 QuartzProperties 配置类
spring:
quartz:
- auto-startup: true # 测试环境,需要开启 Job
+ auto-startup: false # 本地开发环境,尽量不要开启 Job
scheduler-name: schedulerName # Scheduler 名字。默认为 schedulerName
job-store-type: jdbc # Job 存储器类型。默认为 memory 表示内存,可选 jdbc 使用数据库。
wait-for-jobs-to-complete-on-shutdown: true # 应用关闭时,是否等待定时任务执行完成。默认为 false ,建议设置为 true
@@ -127,7 +137,7 @@ spring:
admin:
# Spring Boot Admin Client 客户端的相关配置
client:
- url: http://127.0.0.1:${server.port}/${spring.boot.admin.context-path} # 设置 Spring Boot Admin Server 地址
+ url: http://222.71.165.187:${server.port}/${spring.boot.admin.context-path} # 设置 Spring Boot Admin Server 地址
instance:
service-host-type: IP # 注册实例时,优先使用 IP [IP, HOST_NAME, CANONICAL_HOST_NAME]
# Spring Boot Admin Server 服务端的相关配置
@@ -137,11 +147,25 @@ spring:
logging:
file:
name: ${user.home}/logs/${spring.application.name}.log # 日志文件名,全路径
-
---- #################### 微信公众号相关配置 ####################
-wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档
- mp:
- # 公众号配置(必填)
+ level:
+ # 配置自己写的 MyBatis Mapper 打印日志
+ com.yunxi.scm.module.bpm.dal.mysql: debug
+ com.yunxi.scm.module.infra.dal.mysql: debug
+ com.yunxi.scm.module.infra.dal.mysql.job.JobLogMapper: INFO # 配置 JobLogMapper 的日志级别为 info
+ com.yunxi.scm.module.pay.dal.mysql: debug
+ com.yunxi.scm.module.pay.dal.mysql.notify.PayNotifyTaskMapper: INFO # 配置 JobLogMapper 的日志级别为 info
+ com.yunxi.scm.module.system.dal.mysql: debug
+ com.yunxi.scm.module.tool.dal.mysql: debug
+ com.yunxi.scm.module.member.dal.mysql: debug
+ com.yunxi.scm.module.trade.dal.mysql: debug
+ com.yunxi.scm.module.promotion.dal.mysql: debug
+ com.yunxi.scm.module.demo.dal.mysql: debug # demo模块 MyBatis 操作日志
+
+debug: false
+
+--- #################### 微信公众号、小程序相关配置 ####################
+wx:
+ mp: # 公众号配置(必填),参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档
app-id: wx041349c6f39b268b
secret: 5abee519483bc9f8cb37ce280e814bd0
# 存储配置,解决 AccessToken 的跨节点的共享
@@ -150,8 +174,8 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta
key-prefix: wx # Redis Key 的前缀
http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台
miniapp: # 小程序配置(必填),参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md 文档
- appid: wx63c280fe3248a3e7
- secret: 6f270509224a7ae1296bbf1c8cb97aed
+ appid: wx62056c0d5e8db250
+ secret: 333ae72f41552af1e998fe1f54e1584a
config-storage:
type: RedisTemplate # 采用 RedisTemplate 操作 Redis,会自动从 Spring 中获取
key-prefix: wa # Redis Key 的前缀
@@ -161,6 +185,10 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta
# 芋道配置项,设置当前项目所有自定义的配置
yunxi:
+ captcha:
+ enable: false # 本地环境,暂时关闭图片验证码,方便登录等接口的测试;
+ security:
+ mock-enable: true
xss:
enable: false
exclude-urls: # 如下两个 url,仅仅是为了演示,去掉配置也没关系
@@ -169,7 +197,11 @@ yunxi:
pay:
order-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/order # 支付渠道的【支付】回调地址
refund-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址
- demo: true # 开启演示模式
+ access-log: # 访问日志的配置项
+ enable: false
+ error-code: # 错误码相关配置项
+ enable: false
+ demo: false # 关闭演示模式
justauth:
enabled: true
@@ -183,15 +215,14 @@ justauth:
client-secret: 1wTb7hYxnpT2TUbIeHGXGo7T0odav1ic10mLdyyATOw
agent-id: 1000004
ignore-check-redirect-uri: true
+ WECHAT_MINI_APP: # 微信小程序
+ client-id: ${wx.miniapp.appid}
+ client-secret: ${wx.miniapp.secret}
+ ignore-check-redirect-uri: true
+ ignore-check-state: true # 微信小程序,不会使用到 state,所以不进行校验
+
cache:
type: REDIS
prefix: 'social_auth_state:' # 缓存前缀,目前只对 Redis 缓存生效,默认 JUSTAUTH::STATE::
timeout: 24h # 超时时长,目前只对 Redis 缓存生效,默认 3 分钟
-wx:
- mp:
- useRedis: false
- defaultContent: \u60A8\u597D\uFF0C\u6709\u4EC0\u4E48\u95EE\u9898\uFF1F
- redisConfig:
- host: 127.0.0.1
- port: 6379
- password:
+