Browse Source

1

yuhongzhe
于宏哲PHP 10 months ago
parent
commit
d1c9185987
  1. 31
      admin/src/app/api/order_table.ts
  2. 3
      admin/src/app/lang/zh-cn/customer_resource_changes.customer_resource_changes.json
  3. 20
      admin/src/app/lang/zh-cn/customer_resources.customer_resources.json
  4. 36
      admin/src/app/lang/zh-cn/order_table.order_table.json
  5. 127
      admin/src/app/views/customer_resources/customer_resources.vue
  6. 310
      admin/src/app/views/order_table/components/order-table-edit.vue
  7. 331
      admin/src/app/views/order_table/order_table.vue
  8. 6
      niucloud/app/adminapi/controller/customer_resources/CustomerResources.php
  9. 49
      niucloud/app/adminapi/controller/order_table/OrderTable.php
  10. 10
      niucloud/app/adminapi/route/order_table.php
  11. 226
      niucloud/app/model/class_grade/ClassGrade.php
  12. 156
      niucloud/app/model/order_table/OrderTable.php
  13. 40
      niucloud/app/service/admin/customer_resources/CustomerResourcesService.php
  14. 40
      niucloud/app/service/admin/order_table/OrderTableService.php
  15. 12
      niucloud/app/validate/order_table/OrderTable.php

31
admin/src/app/api/order_table.ts

@ -1,5 +1,9 @@
import request from '@/utils/request'
// USER_CODE_BEGIN -- order_table
/**
*
@ -16,7 +20,7 @@ export function getOrderTableList(params: Record<string, any>) {
* @returns
*/
export function getOrderTableInfo(id: number) {
return request.get(`order_table/order_table/${id}`)
return request.get(`order_table/order_table/${id}`);
}
/**
@ -25,10 +29,7 @@ export function getOrderTableInfo(id: number) {
* @returns
*/
export function addOrderTable(params: Record<string, any>) {
return request.post('order_table/order_table', params, {
showErrorMessage: true,
showSuccessMessage: true,
})
return request.post('order_table/order_table', params, { showErrorMessage: true, showSuccessMessage: true })
}
/**
@ -38,10 +39,7 @@ export function addOrderTable(params: Record<string, any>) {
* @returns
*/
export function editOrderTable(params: Record<string, any>) {
return request.put(`order_table/order_table/${params.id}`, params, {
showErrorMessage: true,
showSuccessMessage: true,
})
return request.put(`order_table/order_table/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
}
/**
@ -50,10 +48,17 @@ export function editOrderTable(params: Record<string, any>) {
* @returns
*/
export function deleteOrderTable(id: number) {
return request.delete(`order_table/order_table/${id}`, {
showErrorMessage: true,
showSuccessMessage: true,
})
return request.delete(`order_table/order_table/${id}`, { showErrorMessage: true, showSuccessMessage: true })
}
export function getWithCustomerResourcesList(params: Record<string,any>){
return request.get('order_table/customer_resources_all', {params})
}export function getWithCourseList(params: Record<string,any>){
return request.get('order_table/course_all', {params})
}export function getWithClassGradeList(params: Record<string,any>){
return request.get('order_table/class_grade_all', {params})
}export function getWithPersonnelList(params: Record<string,any>){
return request.get('order_table/personnel_all', {params})
}
// USER_CODE_END -- order_table

3
admin/src/app/lang/zh-cn/customer_resource_changes.customer_resource_changes.json

@ -18,4 +18,7 @@
"customerResourceChangesDeleteTips": "确定要删除该数据吗?",
"startDate": "请选择开始时间",
"endDate": "请选择结束时间"
}

20
admin/src/app/lang/zh-cn/customer_resources.customer_resources.json

@ -34,5 +34,23 @@
"updateCustomerResources":"编辑客户资源",
"customerResourcesDeleteTips":"确定要删除该数据吗?",
"startDate":"请选择开始时间",
"endDate":"请选择结束时间"
"endDate":"请选择结束时间",
"resourceId":"资源",
"resourceIdPlaceholder":"请输入资源",
"orderStatus":"订单状态",
"orderStatusPlaceholder":"请输入订单状态",
"paymentType":"付款类型",
"paymentTypePlaceholder":"请输入付款类型",
"orderAmount":"订单金额",
"orderAmountPlaceholder":"请输入订单金额",
"courseId":"课程",
"courseIdPlaceholder":"请输入课程",
"classId":"班级",
"classIdPlaceholder":"请输入班级",
"staffId":"人员",
"paymentTime":"支付时间",
"addOrderTable":"添加订单",
"updateOrderTable":"编辑订单"
}

36
admin/src/app/lang/zh-cn/order_table.order_table.json

@ -1,32 +1,18 @@
{
"id": "订单编号",
"idPlaceholder": "请输入订单编号",
"paymentId": "支付编号",
"paymentIdPlaceholder": "请输入支付编号",
"orderStatus": "订单状态: pending-待支付, paid-已支付",
"orderStatusPlaceholder": "请输入订单状态: pending-待支付, paid-已支付",
"paymentType": "付款类型: cash-现金支付, scan_code-扫码支付, subscription-订阅支付",
"paymentTypePlaceholder": "请输入付款类型: cash-现金支付, scan_code-扫码支付, subscription-订阅支付",
"resourceId":"资源",
"resourceIdPlaceholder":"请输入资源",
"orderStatus":"订单状态",
"orderStatusPlaceholder":"请输入订单状态",
"paymentType":"付款类型",
"paymentTypePlaceholder":"请输入付款类型",
"orderAmount":"订单金额",
"orderAmountPlaceholder":"请输入订单金额",
"courseId": "课程ID",
"courseIdPlaceholder": "请输入课程ID",
"classId": "班级ID",
"classIdPlaceholder": "请输入班级ID",
"staffId": "人员ID",
"staffIdPlaceholder": "请输入人员ID",
"resourceId": "资源ID",
"resourceIdPlaceholder": "请输入资源ID",
"afterSalesStatus": "售后状态",
"afterSalesStatusPlaceholder": "请输入售后状态",
"afterSalesReason": "售后原因",
"afterSalesReasonPlaceholder": "请输入售后原因",
"afterSalesTime": "售后时间",
"afterSalesTimePlaceholder": "请输入售后时间",
"courseId":"课程",
"courseIdPlaceholder":"请输入课程",
"classId":"班级",
"classIdPlaceholder":"请输入班级",
"staffId":"人员",
"paymentTime":"支付时间",
"paymentTimePlaceholder": "请输入支付时间",
"subscriptionPaymentTime": "订阅支付生成时间",
"subscriptionPaymentTimePlaceholder": "请输入订阅支付生成时间",
"addOrderTable":"添加订单",
"updateOrderTable":"编辑订单",
"orderTableDeleteTips":"确定要删除该数据吗?",

127
admin/src/app/views/customer_resources/customer_resources.vue

@ -4,7 +4,7 @@
<div class="flex justify-between items-center">
<span class="text-lg">{{pageName}}</span>
<el-button type="primary" @click="addEvent" v-if="type == 'khzy'">
<el-button type="primary" @click="addEvent" v-if="customerResourcesTable.searchParam.type == 'khzy'">
{{ t('addCustomerResources') }}
</el-button>
</div>
@ -12,11 +12,45 @@
<el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
<el-form :inline="true" :model="customerResourcesTable.searchParam" ref="searchFormRef">
<el-form-item :label="t('name')" prop="name">
<el-input v-model="customerResourcesTable.searchParam.name" :placeholder="t('namePlaceholder')" />
<el-input v-model="customerResourcesTable.searchParam.name"
:placeholder="t('namePlaceholder')" />
</el-form-item>
<el-form-item label="年龄" prop="age">
<el-input v-model="customerResourcesTable.searchParam.age" placeholder="请输入年龄" />
</el-form-item>
<el-form-item label="性别" prop="gender">
<el-select v-model="customerResourcesTable.searchParam.gender" placeholder="请选择性别">
<el-option label="男性" value="male" />
<el-option label="女性" value="female" />
<el-option label="其他" value="other" />
</el-select>
</el-form-item>
<el-form-item :label="t('phoneNumber')" prop="phone_number">
<el-input v-model="customerResourcesTable.searchParam.phone_number" :placeholder="t('phoneNumberPlaceholder')" />
<el-input v-model="customerResourcesTable.searchParam.phone_number"
:placeholder="t('phoneNumberPlaceholder')" />
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker v-model="customerResourcesTable.searchParam.created_at" type="daterange" range-separator=""
start-placeholder="开始日期" end-placeholder="结束日期" format="YYYY-MM-DD"
value-format="YYYY-MM-DD" />
</el-form-item>
<!-- 更新时间 -->
<el-form-item label="更新时间">
<el-date-picker v-model="customerResourcesTable.searchParam.updated_at" type="daterange" range-separator=""
start-placeholder="开始日期" end-placeholder="结束日期" format="YYYY-MM-DD"
value-format="YYYY-MM-DD" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="loadCustomerResourcesList()">{{ t('search') }}</el-button>
<el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
@ -37,13 +71,14 @@
</template>
</el-table-column>
<el-table-column prop="consultant_name" :label="t('consultant')" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column prop="consultant_name" :label="t('consultant')" min-width="120"
:show-overflow-tooltip="true" />
<el-table-column prop="name" :label="t('name')" min-width="120" :show-overflow-tooltip="true" />
<el-table-column prop="age" :label="t('age')" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column prop="age" :label="t('age')" min-width="50" :show-overflow-tooltip="true" />
<el-table-column :label="t('gender')" min-width="180" align="center" :show-overflow-tooltip="true">
<el-table-column :label="t('gender')" min-width="60" align="center" :show-overflow-tooltip="true">
<template #default="{ row }">
<div v-for="(item, index) in genderList">
<div v-if="item.value == row.gender">{{ item.name }}</div>
@ -51,9 +86,17 @@
</template>
</el-table-column>
<el-table-column prop="phone_number" :label="t('phoneNumber')" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column prop="phone_number" :label="t('phoneNumber')" min-width="120"
:show-overflow-tooltip="true" />
<el-table-column prop="decision_maker" :label="t('decisionMaker')" min-width="120"
:show-overflow-tooltip="true" />
<el-table-column prop="created_at" label="添加时间" min-width="120" :show-overflow-tooltip="true" />
<el-table-column prop="updated_at" label="修改时间" min-width="120" :show-overflow-tooltip="true" />
<el-table-column prop="decision_maker" :label="t('decisionMaker')" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column :label="t('operation')" fixed="right" min-width="200" v-if="type == 'khzy'">
<template #default="{ row }">
@ -67,16 +110,27 @@
<el-table-column :label="t('operation')" fixed="right" min-width="200" v-if="type == 'yjfp'">
<el-table-column :label="t('operation')" fixed="right" min-width="200"
v-if="customerResourcesTable.searchParam.type == 'yjfp'">
<template #default="{ row }">
<el-button type="primary" link @click="fpEvent(row)">分配</el-button>
</template>
</el-table-column>
<el-table-column :label="t('operation')" fixed="right" min-width="200"
v-if="customerResourcesTable.searchParam.type == 'zylb'">
<template #default="{ row }">
<el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
<el-button type="primary" link @click="addOrder({'resource_id':row.id})">添加订单</el-button>
</template>
</el-table-column>
</el-table>
<div class="mt-[16px] flex justify-end">
<el-pagination v-model:current-page="customerResourcesTable.page" v-model:page-size="customerResourcesTable.limit"
<el-pagination v-model:current-page="customerResourcesTable.page"
v-model:page-size="customerResourcesTable.limit"
layout="total, sizes, prev, pager, next, jumper" :total="customerResourcesTable.total"
@size-change="loadCustomerResourcesList()" @current-change="loadCustomerResourcesList" />
</div>
@ -86,6 +140,8 @@
<fp ref="fpCustomerResourcesDialog" @complete="loadCustomerResourcesList" />
<Order ref="editOrderTableDialog" @complete="loadCustomerResourcesList" />
</el-card>
</div>
</template>
@ -99,12 +155,39 @@ import { img } from '@/utils/common'
import { ElMessageBox, FormInstance } from 'element-plus'
import Edit from '@/app/views/customer_resources/components/customer-resources-edit.vue'
import Fp from '@/app/views/customer_resources/components/fp.vue'
import Order from '@/app/views/order_table/components/order-table-edit.vue'
import { useRouter, useRoute } from 'vue-router'
const route = useRoute()
const pageName = route.meta.title;
const router = useRouter()
const type = pageName == '业绩分配' ? 'yjfp' : 'khzy';
let customerResourcesTable = reactive({
page: 1,
limit: 10,
total: 0,
loading: true,
data: [],
searchParam: {
"name": "",
"age": "",
"gender": "",
"phone_number": "",
'type': '',
"created_at" : "",
"updated_at" : ""
}
})
if (pageName == '业绩分配') {
customerResourcesTable.searchParam.type = 'yjfp';
} else if (pageName == '客户资源列表') {
customerResourcesTable.searchParam.type = 'khzy';
} else if (pageName == '资源列表') {
customerResourcesTable.searchParam.type = 'zylb';
}
// const type = pageName == '' ? 'yjfp' : 'khzy';
@ -117,18 +200,17 @@ const resourceChanges = (id: number) => {
}
let customerResourcesTable = reactive({
page: 1,
limit: 10,
total: 0,
loading: true,
data: [],
searchParam:{
"name":"",
"phone_number":"",
'type':type
/**
* 添加订单
*/
const editOrderTableDialog : Record<string, any> | null = ref(null)
const addOrder = (row : any) => {
console.log(row);
editOrderTableDialog.value.setFormData(row)
editOrderTableDialog.value.showDialog = true
}
})
const searchFormRef = ref<FormInstance>()
@ -172,6 +254,7 @@ const selectData = ref<any[]>([])
}
statusDictList();
/**
* 获取客户资源列表
*/

310
admin/src/app/views/order_table/components/order-table-edit.vue

@ -1,146 +1,78 @@
<template>
<el-dialog
v-model="showDialog"
:title="formData.id ? t('updateOrderTable') : t('addOrderTable')"
width="50%"
class="diy-dialog-wrap"
:destroy-on-close="true"
>
<el-form
:model="formData"
label-width="120px"
ref="formRef"
:rules="formRules"
class="page-form"
v-loading="loading"
>
<el-form-item :label="t('paymentId')" prop="payment_id">
<el-input
v-model="formData.payment_id"
clearable
:placeholder="t('paymentIdPlaceholder')"
class="input-width"
<el-dialog v-model="showDialog" :title="formData.id ? t('updateOrderTable') : t('addOrderTable')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
<el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
<el-form-item :label="t('resourceId')" prop="resource_id">
<el-select class="input-width" v-model="formData.resource_id" clearable :placeholder="t('resourceIdPlaceholder')">
<el-option label="请选择" value=""></el-option>
<el-option
v-for="(item, index) in resourceIdList"
:key="index"
:label="item['name']"
:value="item['id']"
/>
</el-select>
</el-form-item>
<el-form-item :label="t('orderStatus')" prop="order_status">
<el-input
v-model="formData.order_status"
clearable
:placeholder="t('orderStatusPlaceholder')"
class="input-width"
<el-select class="input-width" v-model="formData.order_status" clearable :placeholder="t('orderStatusPlaceholder')">
<el-option label="请选择" value=""></el-option>
<el-option
v-for="(item, index) in order_statusList"
:key="index"
:label="item.name"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="t('paymentType')" prop="payment_type">
<el-input
v-model="formData.payment_type"
clearable
:placeholder="t('paymentTypePlaceholder')"
class="input-width"
<el-select class="input-width" v-model="formData.payment_type" clearable :placeholder="t('paymentTypePlaceholder')">
<el-option label="请选择" value=""></el-option>
<el-option
v-for="(item, index) in payment_typeList"
:key="index"
:label="item.name"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="t('orderAmount')" prop="order_amount">
<el-input
v-model="formData.order_amount"
clearable
:placeholder="t('orderAmountPlaceholder')"
class="input-width"
/>
<el-input v-model="formData.order_amount" clearable :placeholder="t('orderAmountPlaceholder')" class="input-width" />
</el-form-item>
<el-form-item :label="t('courseId')" prop="course_id">
<el-input
v-model="formData.course_id"
clearable
:placeholder="t('courseIdPlaceholder')"
class="input-width"
<el-select class="input-width" v-model="formData.course_id" clearable :placeholder="t('courseIdPlaceholder')">
<el-option label="请选择" value=""></el-option>
<el-option
v-for="(item, index) in courseIdList"
:key="index"
:label="item['course_name']"
:value="item['id']"
/>
</el-select>
</el-form-item>
<el-form-item :label="t('classId')" prop="class_id">
<el-input
v-model="formData.class_id"
clearable
:placeholder="t('classIdPlaceholder')"
class="input-width"
/>
</el-form-item>
<el-form-item :label="t('staffId')" prop="staff_id">
<el-input
v-model="formData.staff_id"
clearable
:placeholder="t('staffIdPlaceholder')"
class="input-width"
/>
</el-form-item>
<el-form-item :label="t('resourceId')" prop="resource_id">
<el-input
v-model="formData.resource_id"
clearable
:placeholder="t('resourceIdPlaceholder')"
class="input-width"
/>
</el-form-item>
<el-form-item :label="t('afterSalesStatus')">
<el-input
v-model="formData.after_sales_status"
clearable
:placeholder="t('afterSalesStatusPlaceholder')"
class="input-width"
<el-select class="input-width" v-model="formData.class_id" clearable :placeholder="t('classIdPlaceholder')">
<el-option label="请选择" value=""></el-option>
<el-option
v-for="(item, index) in classIdList"
:key="index"
:label="item['class_name']"
:value="item['id']"
/>
</el-select>
</el-form-item>
<el-form-item :label="t('afterSalesReason')">
<el-input
v-model="formData.after_sales_reason"
clearable
:placeholder="t('afterSalesReasonPlaceholder')"
class="input-width"
/>
</el-form-item>
<el-form-item :label="t('afterSalesTime')">
<el-input
v-model="formData.after_sales_time"
clearable
:placeholder="t('afterSalesTimePlaceholder')"
class="input-width"
/>
</el-form-item>
<el-form-item :label="t('paymentTime')">
<el-input
v-model="formData.payment_time"
clearable
:placeholder="t('paymentTimePlaceholder')"
class="input-width"
/>
</el-form-item>
<el-form-item :label="t('subscriptionPaymentTime')">
<el-input
v-model="formData.subscription_payment_time"
clearable
:placeholder="t('subscriptionPaymentTimePlaceholder')"
class="input-width"
/>
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
<el-button
type="primary"
:loading="loading"
@click="confirm(formRef)"
>{{ t('confirm') }}</el-button
>
<el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
t('confirm')
}}</el-button>
</span>
</template>
</el-dialog>
@ -151,11 +83,7 @@ import { ref, reactive, computed, watch } from 'vue'
import { useDictionary } from '@/app/api/dict'
import { t } from '@/lang'
import type { FormInstance } from 'element-plus'
import {
addOrderTable,
editOrderTable,
getOrderTableInfo,
} from '@/app/api/order_table'
import { addOrderTable, editOrderTable, getOrderTableInfo, getWithCustomerResourcesList, getWithCourseList, getWithClassGradeList, getWithPersonnelList } from '@/app/api/order_table'
let showDialog = ref(false)
const loading = ref(false)
@ -165,19 +93,12 @@ const loading = ref(false)
*/
const initialFormData = {
id: '',
payment_id: '',
resource_id: '',
order_status: '',
payment_type: '',
order_amount: '',
course_id: '',
class_id: '',
staff_id: '',
resource_id: '',
after_sales_status: '',
after_sales_reason: '',
after_sales_time: '',
payment_time: '',
subscription_payment_time: '',
}
const formData: Record<string, any> = reactive({ ...initialFormData })
@ -186,61 +107,36 @@ const formRef = ref<FormInstance>()
//
const formRules = computed(() => {
return {
payment_id: [
{ required: true, message: t('paymentIdPlaceholder'), trigger: 'blur' },
],
resource_id: [
{ required: true, message: t('resourceIdPlaceholder'), trigger: 'blur' },
]
,
order_status: [
{ required: true, message: t('orderStatusPlaceholder'), trigger: 'blur' },
],
]
,
payment_type: [
{ required: true, message: t('paymentTypePlaceholder'), trigger: 'blur' },
],
]
,
order_amount: [
{ required: true, message: t('orderAmountPlaceholder'), trigger: 'blur' },
],
]
,
course_id: [
{ required: true, message: t('courseIdPlaceholder'), trigger: 'blur' },
],
]
,
class_id: [
{ required: true, message: t('classIdPlaceholder'), trigger: 'blur' },
],
staff_id: [
{ required: true, message: t('staffIdPlaceholder'), trigger: 'blur' },
],
resource_id: [
{ required: true, message: t('resourceIdPlaceholder'), trigger: 'blur' },
],
after_sales_status: [
{
required: true,
message: t('afterSalesStatusPlaceholder'),
trigger: 'blur',
},
],
after_sales_reason: [
{
required: true,
message: t('afterSalesReasonPlaceholder'),
trigger: 'blur',
},
],
after_sales_time: [
{
required: true,
message: t('afterSalesTimePlaceholder'),
trigger: 'blur',
},
],
payment_time: [
{ required: true, message: t('paymentTimePlaceholder'), trigger: 'blur' },
],
subscription_payment_time: [
{
required: true,
message: t('subscriptionPaymentTimePlaceholder'),
trigger: 'blur',
},
],
]
,
}
})
@ -260,13 +156,11 @@ const confirm = async (formEl: FormInstance | undefined) => {
let data = formData
save(data)
.then((res) => {
save(data).then(res => {
loading.value = false
showDialog.value = false
emit('complete')
})
.catch((err) => {
}).catch(err => {
loading.value = false
})
}
@ -274,18 +168,53 @@ const confirm = async (formEl: FormInstance | undefined) => {
}
//
let order_statusList = ref([])
const order_statusDictList = async () => {
order_statusList.value = await (await useDictionary('order_status')).data.dictionary
}
order_statusDictList();
watch(() => order_statusList.value, () => { formData.order_status = order_statusList.value[0].value })
let payment_typeList = ref([])
const payment_typeDictList = async () => {
payment_typeList.value = await (await useDictionary('payment_type')).data.dictionary
}
payment_typeDictList();
watch(() => payment_typeList.value, () => { formData.payment_type = payment_typeList.value[0].value })
const resourceIdList = ref([] as any[])
const setResourceIdList = async () => {
resourceIdList.value = await (await getWithCustomerResourcesList({})).data
}
setResourceIdList()
const courseIdList = ref([] as any[])
const setCourseIdList = async () => {
courseIdList.value = await (await getWithCourseList({})).data
}
setCourseIdList()
const classIdList = ref([] as any[])
const setClassIdList = async () => {
classIdList.value = await (await getWithClassGradeList({})).data
}
setClassIdList()
const staffIdList = ref([] as any[])
const setStaffIdList = async () => {
staffIdList.value = await (await getWithPersonnelList({})).data
}
setStaffIdList()
const setFormData = async (row: any = null) => {
Object.assign(formData, initialFormData)
loading.value = true
if (row) {
const data = await (await getOrderTableInfo(row.id)).data
if (data)
Object.keys(formData).forEach((key: string) => {
if (data[key] != undefined) formData[key] = data[key]
})
}
loading.value = false
Object.assign(formData, row)
// formData.resource_id = row.resource_id;
// console.log(0)
// loading.value = true
// if(row){
// const data = await (await getOrderTableInfo(row.id)).data
// if (data) Object.keys(formData).forEach((key: string) => {
// if (data[key] != undefined) formData[key] = data[key]
// })
// }
// loading.value = false
}
//
@ -299,12 +228,7 @@ const mobileVerify = (rule: any, value: any, callback: any) => {
//
const idCardVerify = (rule: any, value: any, callback: any) => {
if (
value &&
!/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(
value
)
) {
if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
callback(new Error(t('generateIdCard')))
} else {
callback()
@ -331,7 +255,7 @@ const numberVerify = (rule: any, value: any, callback: any) => {
defineExpose({
showDialog,
setFormData,
setFormData
})
</script>

331
admin/src/app/views/order_table/order_table.vue

@ -1,6 +1,7 @@
<template>
<div class="main-container">
<el-card class="box-card !border-none" shadow="never">
<div class="flex justify-between items-center">
<span class="text-lg">{{pageName}}</span>
<el-button type="primary" @click="addEvent">
@ -8,238 +9,86 @@
</el-button>
</div>
<el-card
class="box-card !border-none my-[10px] table-search-wrap"
shadow="never"
>
<el-form
:inline="true"
:model="orderTableTable.searchParam"
ref="searchFormRef"
>
<el-form-item :label="t('paymentId')" prop="payment_id">
<el-input
v-model="orderTableTable.searchParam.payment_id"
:placeholder="t('paymentIdPlaceholder')"
/>
</el-form-item>
<el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
<el-form :inline="true" :model="orderTableTable.searchParam" ref="searchFormRef">
<el-form-item :label="t('orderStatus')" prop="order_status">
<el-input
v-model="orderTableTable.searchParam.order_status"
:placeholder="t('orderStatusPlaceholder')"
/>
<el-select class="w-[280px]" v-model="orderTableTable.searchParam.order_status" clearable :placeholder="t('orderStatusPlaceholder')">
<el-option label="全部" value=""></el-option>
<el-option
v-for="(item, index) in order_statusList"
:key="index"
:label="item.name"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="t('paymentType')" prop="payment_type">
<el-input
v-model="orderTableTable.searchParam.payment_type"
:placeholder="t('paymentTypePlaceholder')"
/>
</el-form-item>
<el-form-item :label="t('orderAmount')" prop="order_amount">
<el-input
v-model="orderTableTable.searchParam.order_amount"
:placeholder="t('orderAmountPlaceholder')"
/>
</el-form-item>
<el-form-item :label="t('courseId')" prop="course_id">
<el-input
v-model="orderTableTable.searchParam.course_id"
:placeholder="t('courseIdPlaceholder')"
/>
</el-form-item>
<el-form-item :label="t('classId')" prop="class_id">
<el-input
v-model="orderTableTable.searchParam.class_id"
:placeholder="t('classIdPlaceholder')"
/>
</el-form-item>
<el-form-item :label="t('staffId')" prop="staff_id">
<el-input
v-model="orderTableTable.searchParam.staff_id"
:placeholder="t('staffIdPlaceholder')"
/>
</el-form-item>
<el-form-item :label="t('resourceId')" prop="resource_id">
<el-input
v-model="orderTableTable.searchParam.resource_id"
:placeholder="t('resourceIdPlaceholder')"
/>
</el-form-item>
<el-form-item
:label="t('afterSalesStatus')"
prop="after_sales_status"
>
<el-input
v-model="orderTableTable.searchParam.after_sales_status"
:placeholder="t('afterSalesStatusPlaceholder')"
/>
</el-form-item>
<el-form-item
:label="t('afterSalesReason')"
prop="after_sales_reason"
>
<el-input
v-model="orderTableTable.searchParam.after_sales_reason"
:placeholder="t('afterSalesReasonPlaceholder')"
/>
</el-form-item>
<el-form-item :label="t('afterSalesTime')" prop="after_sales_time">
<el-input
v-model="orderTableTable.searchParam.after_sales_time"
:placeholder="t('afterSalesTimePlaceholder')"
/>
</el-form-item>
<el-form-item :label="t('paymentTime')" prop="payment_time">
<el-input
v-model="orderTableTable.searchParam.payment_time"
:placeholder="t('paymentTimePlaceholder')"
/>
</el-form-item>
<el-form-item
:label="t('subscriptionPaymentTime')"
prop="subscription_payment_time"
>
<el-input
v-model="orderTableTable.searchParam.subscription_payment_time"
:placeholder="t('subscriptionPaymentTimePlaceholder')"
/>
<el-select class="w-[280px]" v-model="orderTableTable.searchParam.payment_type" clearable :placeholder="t('paymentTypePlaceholder')">
<el-option label="全部" value=""></el-option>
<el-option
v-for="(item, index) in payment_typeList"
:key="index"
:label="item.name"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="loadOrderTableList()">{{
t('search')
}}</el-button>
<el-button @click="resetForm(searchFormRef)">{{
t('reset')
}}</el-button>
<el-button type="primary" @click="loadOrderTableList()">{{ t('search') }}</el-button>
<el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
</el-form-item>
</el-form>
</el-card>
<div class="mt-[10px]">
<el-table
:data="orderTableTable.data"
size="large"
v-loading="orderTableTable.loading"
>
<el-table :data="orderTableTable.data" size="large" v-loading="orderTableTable.loading">
<template #empty>
<span>{{ !orderTableTable.loading ? t('emptyData') : '' }}</span>
</template>
<el-table-column
prop="payment_id"
:label="t('paymentId')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="order_status"
:label="t('orderStatus')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="payment_type"
:label="t('paymentType')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="order_amount"
:label="t('orderAmount')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="course_id"
:label="t('courseId')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="class_id"
:label="t('classId')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column prop="resource_id_name" :label="t('resourceId')" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column
prop="staff_id"
:label="t('staffId')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column :label="t('orderStatus')" min-width="180" align="center" :show-overflow-tooltip="true">
<template #default="{ row }">
<div v-for="(item, index) in order_statusList">
<div v-if="item.value == row.order_status">{{ item.name }}</div>
</div>
</template>
</el-table-column>
<el-table-column
prop="resource_id"
:label="t('resourceId')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column :label="t('paymentType')" min-width="180" align="center" :show-overflow-tooltip="true">
<template #default="{ row }">
<div v-for="(item, index) in payment_typeList">
<div v-if="item.value == row.payment_type">{{ item.name }}</div>
</div>
</template>
</el-table-column>
<el-table-column
prop="after_sales_status"
:label="t('afterSalesStatus')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column prop="order_amount" :label="t('orderAmount')" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column
prop="after_sales_reason"
:label="t('afterSalesReason')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column prop="course_id_name" :label="t('courseId')" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column
prop="after_sales_time"
:label="t('afterSalesTime')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column prop="class_id_name" :label="t('classId')" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column
prop="payment_time"
:label="t('paymentTime')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column prop="staff_id_name" :label="t('staffId')" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column
prop="subscription_payment_time"
:label="t('subscriptionPaymentTime')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column prop="payment_time" :label="t('paymentTime')" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column
:label="t('operation')"
fixed="right"
min-width="120"
>
<el-table-column :label="t('operation')" fixed="right" min-width="120">
<template #default="{ row }">
<el-button type="primary" link @click="editEvent(row)">{{
t('edit')
}}</el-button>
<el-button type="primary" link @click="deleteEvent(row.id)">{{
t('delete')
}}</el-button>
<el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
<el-button type="primary" link @click="deleteEvent(row.id)">{{ t('delete') }}</el-button>
</template>
</el-table-column>
</el-table>
<div class="mt-[16px] flex justify-end">
<el-pagination
v-model:current-page="orderTableTable.page"
v-model:page-size="orderTableTable.limit"
layout="total, sizes, prev, pager, next, jumper"
:total="orderTableTable.total"
@size-change="loadOrderTableList()"
@current-change="loadOrderTableList"
/>
<el-pagination v-model:current-page="orderTableTable.page" v-model:page-size="orderTableTable.limit"
layout="total, sizes, prev, pager, next, jumper" :total="orderTableTable.total"
@size-change="loadOrderTableList()" @current-change="loadOrderTableList" />
</div>
</div>
@ -252,13 +101,13 @@
import { reactive, ref, watch } from 'vue'
import { t } from '@/lang'
import { useDictionary } from '@/app/api/dict'
import { getOrderTableList, deleteOrderTable } from '@/app/api/order_table'
import { getOrderTableList, deleteOrderTable, getWithCustomerResourcesList, getWithCourseList, getWithClassGradeList, getWithPersonnelList } from '@/app/api/order_table'
import { img } from '@/utils/common'
import { ElMessageBox,FormInstance } from 'element-plus'
import Edit from '@/app/views/order_table/components/order-table-edit.vue'
import { useRoute } from 'vue-router'
const route = useRoute()
const pageName = route.meta.title
const pageName = route.meta.title;
let orderTableTable = reactive({
page: 1,
@ -267,20 +116,9 @@ let orderTableTable = reactive({
loading: true,
data: [],
searchParam:{
payment_id: '',
order_status: '',
payment_type: '',
order_amount: '',
course_id: '',
class_id: '',
staff_id: '',
resource_id: '',
after_sales_status: '',
after_sales_reason: '',
after_sales_time: '',
payment_time: '',
subscription_payment_time: '',
},
"order_status":"",
"payment_type":""
}
})
const searchFormRef = ref<FormInstance>()
@ -289,6 +127,16 @@ const searchFormRef = ref<FormInstance>()
const selectData = ref<any[]>([])
//
const order_statusList = ref([] as any[])
const order_statusDictList = async () => {
order_statusList.value = await (await useDictionary('order_status')).data.dictionary
}
order_statusDictList();
const payment_typeList = ref([] as any[])
const payment_typeDictList = async () => {
payment_typeList.value = await (await useDictionary('payment_type')).data.dictionary
}
payment_typeDictList();
/**
* 获取订单列表
@ -300,14 +148,12 @@ const loadOrderTableList = (page: number = 1) => {
getOrderTableList({
page: orderTableTable.page,
limit: orderTableTable.limit,
...orderTableTable.searchParam,
})
.then((res) => {
...orderTableTable.searchParam
}).then(res => {
orderTableTable.loading = false
orderTableTable.data = res.data.data
orderTableTable.total = res.data.total
})
.catch(() => {
}).catch(() => {
orderTableTable.loading = false
})
}
@ -336,19 +182,42 @@ const editEvent = (data: any) => {
* 删除订单
*/
const deleteEvent = (id: number) => {
ElMessageBox.confirm(t('orderTableDeleteTips'), t('warning'), {
ElMessageBox.confirm(t('orderTableDeleteTips'), t('warning'),
{
confirmButtonText: t('confirm'),
cancelButtonText: t('cancel'),
type: 'warning',
}).then(() => {
deleteOrderTable(id)
.then(() => {
}
).then(() => {
deleteOrderTable(id).then(() => {
loadOrderTableList()
}).catch(() => {
})
.catch(() => {})
})
}
const resourceIdList = ref([])
const setResourceIdList = async () => {
resourceIdList.value = await (await getWithCustomerResourcesList({})).data
}
setResourceIdList()
const courseIdList = ref([])
const setCourseIdList = async () => {
courseIdList.value = await (await getWithCourseList({})).data
}
setCourseIdList()
const classIdList = ref([])
const setClassIdList = async () => {
classIdList.value = await (await getWithClassGradeList({})).data
}
setClassIdList()
const staffIdList = ref([])
const setStaffIdList = async () => {
staffIdList.value = await (await getWithPersonnelList({})).data
}
setStaffIdList()
const resetForm = (formEl: FormInstance | undefined) => {
if (!formEl) return
formEl.resetFields()

6
niucloud/app/adminapi/controller/customer_resources/CustomerResources.php

@ -29,8 +29,12 @@ class CustomerResources extends BaseAdminController
public function lists(){
$data = $this->request->params([
["name",""],
["age",""],
["gender",""],
["phone_number",""],
["type","khzy"]
["type","khzy"],
["created_at",[]],
["updated_at",[]],
]);
return success((new CustomerResourcesService())->getPage($data));
}

49
niucloud/app/adminapi/controller/order_table/OrderTable.php

@ -28,19 +28,8 @@ class OrderTable extends BaseAdminController
*/
public function lists(){
$data = $this->request->params([
["payment_id",""],
["order_status",""],
["payment_type",""],
["order_amount",""],
["course_id",""],
["class_id",""],
["staff_id",""],
["resource_id",""],
["after_sales_status",""],
["after_sales_reason",""],
["after_sales_time",""],
["payment_time",""],
["subscription_payment_time",""]
["payment_type",""]
]);
return success((new OrderTableService())->getPage($data));
}
@ -60,19 +49,13 @@ class OrderTable extends BaseAdminController
*/
public function add(){
$data = $this->request->params([
["payment_id",""],
["resource_id",0],
["order_status",""],
["payment_type",""],
["order_amount",0.00],
["course_id",0],
["class_id",0],
["staff_id",0],
["resource_id",0],
["after_sales_status",""],
["after_sales_reason",""],
["after_sales_time",1747388736],
["payment_time",1747388736],
["subscription_payment_time",1747388736]
]);
$this->validate($data, 'app\validate\order_table\OrderTable.add');
$id = (new OrderTableService())->add($data);
@ -86,19 +69,13 @@ class OrderTable extends BaseAdminController
*/
public function edit(int $id){
$data = $this->request->params([
["payment_id",""],
["resource_id",0],
["order_status",""],
["payment_type",""],
["order_amount",0.00],
["course_id",0],
["class_id",0],
["staff_id",0],
["resource_id",0],
["after_sales_status",""],
["after_sales_reason",""],
["after_sales_time",1747388736],
["payment_time",1747388736],
["subscription_payment_time",1747388736]
]);
$this->validate($data, 'app\validate\order_table\OrderTable.edit');
(new OrderTableService())->edit($id, $data);
@ -116,4 +93,20 @@ class OrderTable extends BaseAdminController
}
public function getCustomerResourcesAll(){
return success(( new OrderTableService())->getCustomerResourcesAll());
}
public function getCourseAll(){
return success(( new OrderTableService())->getCourseAll());
}
public function getClassGradeAll(){
return success(( new OrderTableService())->getClassGradeAll());
}
public function getPersonnelAll(){
return success(( new OrderTableService())->getPersonnelAll());
}
}

10
niucloud/app/adminapi/route/order_table.php

@ -14,6 +14,8 @@ use think\facade\Route;
use app\adminapi\middleware\AdminCheckRole;
use app\adminapi\middleware\AdminCheckToken;
use app\adminapi\middleware\AdminLog;
// USER_CODE_BEGIN -- order_table
Route::group('order_table', function () {
@ -29,6 +31,14 @@ Route::group('order_table', function () {
//删除订单
Route::delete('order_table/:id', 'order_table.OrderTable/del');
Route::get('customer_resources_all','order_table.OrderTable/getCustomerResourcesAll');
Route::get('course_all','order_table.OrderTable/getCourseAll');
Route::get('class_grade_all','order_table.OrderTable/getClassGradeAll');
Route::get('personnel_all','order_table.OrderTable/getPersonnelAll');
})->middleware([
AdminCheckToken::class,
AdminCheckRole::class,

226
niucloud/app/model/class_grade/ClassGrade.php

@ -0,0 +1,226 @@
<?php
// +----------------------------------------------------------------------
// | Niucloud-admin 企业快速开发的多应用管理平台
// +----------------------------------------------------------------------
// | 官方网址:https://www.niucloud.com
// +----------------------------------------------------------------------
// | niucloud团队 版权所有 开源版本可自由商用
// +----------------------------------------------------------------------
// | Author: Niucloud Team
// +----------------------------------------------------------------------
namespace app\model\class_grade;
use core\base\BaseModel;
use think\model\concern\SoftDelete;
use think\model\relation\HasMany;
use think\model\relation\HasOne;
/**
* 班级模型
* Class Class
* @package app\model\class
*/
class ClassGrade extends BaseModel
{
use SoftDelete;
/**
* 数据表主键
* @var string
*/
protected $pk = 'id';
/**
* 模型名称
* @var string
*/
protected $name = 'class';
/**
* 定义软删除标记字段.
* @var string
*/
protected $deleteTime = 'deleted_at';
/**
* 定义软删除字段的默认值.
* @var int
*/
protected $defaultSoftDelete = 0;
/**
* 搜索器:班级班级编号
* @param $value
* @param $data
*/
public function searchIdAttr($query, $value, $data)
{
if ($value) {
$query->where("id", $value);
}
}
/**
* 搜索器:班级校区ID
* @param $value
* @param $data
*/
public function searchCampusIdAttr($query, $value, $data)
{
if ($value) {
$query->where("campus_id", $value);
}
}
/**
* 搜索器:班级校区名称
* @param $value
* @param $data
*/
public function searchCampusNameAttr($query, $value, $data)
{
if ($value) {
$query->where("campus_name", $value);
}
}
/**
* 搜索器:班级班级名称
* @param $value
* @param $data
*/
public function searchClassNameAttr($query, $value, $data)
{
if ($value) {
$query->where("class_name", $value);
}
}
/**
* 搜索器:班级班级主教练
* @param $value
* @param $data
*/
public function searchHeadCoachAttr($query, $value, $data)
{
if ($value) {
$query->where("head_coach", $value);
}
}
/**
* 搜索器:班级班级授课年龄段
* @param $value
* @param $data
*/
public function searchAgeGroupAttr($query, $value, $data)
{
if ($value) {
$query->where("age_group", $value);
}
}
/**
* 搜索器:班级班级类型
* @param $value
* @param $data
*/
public function searchClassTypeAttr($query, $value, $data)
{
if ($value) {
$query->where("class_type", $value);
}
}
/**
* 搜索器:班级班级助教
* @param $value
* @param $data
*/
public function searchAssistantCoachAttr($query, $value, $data)
{
if ($value) {
$query->where("assistant_coach", $value);
}
}
/**
* 搜索器:班级创建时间
* @param $value
* @param $data
*/
public function searchCreatedAtAttr($query, $value, $data)
{
if ($value) {
$query->where("created_at", $value);
}
}
/**
* 搜索器:班级修改时间
* @param $value
* @param $data
*/
public function searchUpdatedAtAttr($query, $value, $data)
{
if ($value) {
$query->where("updated_at", $value);
}
}
/**
* 搜索器:班级逻辑删除时间
* @param $value
* @param $data
*/
public function searchDeletedAtAttr($query, $value, $data)
{
if ($value) {
$query->where("deleted_at", $value);
}
}
/**
* 搜索器:班级班级状态
* @param $value
* @param $data
*/
public function searchStatusAttr($query, $value, $data)
{
if ($value) {
$query->where("status", $value);
}
}
/**
* 搜索器:班级班级排序
* @param $value
* @param $data
*/
public function searchSortOrderAttr($query, $value, $data)
{
if ($value) {
$query->where("sort_order", $value);
}
}
/**
* 搜索器:班级班级备注
* @param $value
* @param $data
*/
public function searchRemarksAttr($query, $value, $data)
{
if ($value) {
$query->where("remarks", $value);
}
}
}

156
niucloud/app/model/order_table/OrderTable.php

@ -16,6 +16,14 @@ use think\model\concern\SoftDelete;
use think\model\relation\HasMany;
use think\model\relation\HasOne;
use app\model\customer_resources\CustomerResources;
use app\model\course\Course;
use app\model\class_grade\ClassGrade;
use app\model\personnel\Personnel;
/**
* 订单模型
* Class OrderTable
@ -43,31 +51,7 @@ class OrderTable extends BaseModel
/**
* 搜索器:订单订单编号
* @param $value
* @param $data
*/
public function searchIdAttr($query, $value, $data)
{
if ($value) {
$query->where("id", $value);
}
}
/**
* 搜索器:订单支付编号
* @param $value
* @param $data
*/
public function searchPaymentIdAttr($query, $value, $data)
{
if ($value) {
$query->where("payment_id", $value);
}
}
/**
* 搜索器:订单订单状态: pending-待支付, paid-已支付
* 搜索器:订单订单状态
* @param $value
* @param $data
*/
@ -79,7 +63,7 @@ class OrderTable extends BaseModel
}
/**
* 搜索器:订单付款类型: cash-现金支付, scan_code-扫码支付, subscription-订阅支付
* 搜索器:订单付款类型
* @param $value
* @param $data
*/
@ -90,129 +74,25 @@ class OrderTable extends BaseModel
}
}
/**
* 搜索器:订单订单金额
* @param $value
* @param $data
*/
public function searchOrderAmountAttr($query, $value, $data)
{
if ($value) {
$query->where("order_amount", $value);
}
}
/**
* 搜索器:订单课程ID
* @param $value
* @param $data
*/
public function searchCourseIdAttr($query, $value, $data)
{
if ($value) {
$query->where("course_id", $value);
}
}
/**
* 搜索器:订单班级ID
* @param $value
* @param $data
*/
public function searchClassIdAttr($query, $value, $data)
{
if ($value) {
$query->where("class_id", $value);
}
}
/**
* 搜索器:订单人员ID
* @param $value
* @param $data
*/
public function searchStaffIdAttr($query, $value, $data)
{
if ($value) {
$query->where("staff_id", $value);
}
}
/**
* 搜索器:订单资源ID
* @param $value
* @param $data
*/
public function searchResourceIdAttr($query, $value, $data)
{
if ($value) {
$query->where("resource_id", $value);
}
}
/**
* 搜索器:订单售后状态
* @param $value
* @param $data
*/
public function searchAfterSalesStatusAttr($query, $value, $data)
{
if ($value) {
$query->where("after_sales_status", $value);
}
}
/**
* 搜索器:订单售后原因
* @param $value
* @param $data
*/
public function searchAfterSalesReasonAttr($query, $value, $data)
{
if ($value) {
$query->where("after_sales_reason", $value);
}
public function customerResources(){
return $this->hasOne(CustomerResources::class, 'id', 'resource_id')->joinType('left')->withField('name,id')->bind(['resource_id_name'=>'name']);
}
/**
* 搜索器:订单售后时间
* @param $value
* @param $data
*/
public function searchAfterSalesTimeAttr($query, $value, $data)
{
if ($value) {
$query->where("after_sales_time", $value);
}
public function course(){
return $this->hasOne(Course::class, 'id', 'course_id')->joinType('left')->withField('course_name,id')->bind(['course_id_name'=>'course_name']);
}
/**
* 搜索器:订单支付时间
* @param $value
* @param $data
*/
public function searchPaymentTimeAttr($query, $value, $data)
{
if ($value) {
$query->where("payment_time", $value);
}
public function classGrade(){
return $this->hasOne(ClassGrade::class, 'id', 'class_id')->joinType('left')->withField('class_name,id')->bind(['class_id_name'=>'class_name']);
}
/**
* 搜索器:订单订阅支付生成时间
* @param $value
* @param $data
*/
public function searchSubscriptionPaymentTimeAttr($query, $value, $data)
{
if ($value) {
$query->where("subscription_payment_time", $value);
public function personnel(){
return $this->hasOne(Personnel::class, 'id', 'staff_id')->joinType('left')->withField('name,id')->bind(['staff_id_name'=>'name']);
}
}
}

40
niucloud/app/service/admin/customer_resources/CustomerResourcesService.php

@ -42,6 +42,7 @@ class CustomerResourcesService extends BaseAdminService
*/
public function getPage(array $data = [])
{
// dump($data);die;
$field = 'a.*,b.id as shared_id';
$order = 'a.id desc';
$where = [];
@ -53,16 +54,39 @@ class CustomerResourcesService extends BaseAdminService
$where[] = ['a.name','=',$data['name']];
}
if($data['age']){
$where[] = ['a.age','=',$data['age']];
}
if($data['gender']){
$where[] = ['a.gender','=',$data['gender']];
}
if($data['type'] == 'yjfp'){
$where[] = ['b.shared_by','=',0];
}
$search_model = $this->model
->alias("a")
->join(['school_resource_sharing' => 'b'],'a.id = b.resource_id','left')
->where($where)
->with(['personnel'])->field($field)->order($order);
if (isset($data['created_at'][0]) && isset($data['created_at'][1])) {
$search_model->whereBetweenTime('created_at', $data['created_at'][0]."00:00:00", $data['created_at'][1]."23:59:59");
}
if (isset($data['updated_at'][0]) && isset($data['updated_at'][1])) {
$search_model->whereBetweenTime('updated_at', $data['updated_at'][0]."00:00:00", $data['updated_at'][1]."23:59:59");
}
$list = $this->pageQuery($search_model);
@ -152,19 +176,19 @@ class CustomerResourcesService extends BaseAdminService
public function edit(int $id, array $data)
{
$personnel = new Personnel();
$data['consultant'] = $personnel->where(['sys_user_id' => $this->uid])->value("id");
if(!$data['consultant']){
return fail("操作失败");
}
// $data['consultant'] = $personnel->where(['sys_user_id' => $this->uid])->value("id");
// if(!$data['consultant']){
// return fail("操作失败");
// }
// $data['consultant'] = 1;
$data['consultant'] = 1;
$res = $this->model->where([['id', '=', $id]])->findOrEmpty()->toArray();
$this->model->where([['id', '=', $id]])->update([
'source' => $data['source'],
'source_channel' => $data['source_channel'],
'consultant' => $data['consultant'],
// 'consultant' => $data['consultant'],
'name' => $data['name'],
'age' => $data['age'],
'gender' => $data['gender'],
@ -201,7 +225,7 @@ class CustomerResourcesService extends BaseAdminService
if($data['purchase_power']){
$sixSpeedModificationLog = new SixSpeedModificationLog();
$six_id = $sixSpeed->where(['resource_id' => $id])->value("id");
$data['staff_id'] = $data['consultant'];
// $data['staff_id'] = $data['consultant'];
@ -217,7 +241,7 @@ class CustomerResourcesService extends BaseAdminService
'first_visit_status' => $data['first_visit_status'],
'second_visit_status' => $data['second_visit_status'],
'is_closed' => $data['is_closed'],
'staff_id' => $data['staff_id'],
// 'staff_id' => $data['staff_id'],
'resource_id' => $id
];
if($six_id){

40
niucloud/app/service/admin/order_table/OrderTableService.php

@ -12,6 +12,10 @@
namespace app\service\admin\order_table;
use app\model\order_table\OrderTable;
use app\model\customer_resources\CustomerResources;
use app\model\course\Course;
use app\model\class_grade\ClassGrade;
use app\model\personnel\Personnel;
use core\base\BaseAdminService;
@ -36,10 +40,10 @@ class OrderTableService extends BaseAdminService
*/
public function getPage(array $where = [])
{
$field = 'id,payment_id,order_status,payment_type,order_amount,course_id,class_id,staff_id,resource_id,after_sales_status,after_sales_reason,after_sales_time,created_at,updated_at,payment_time,subscription_payment_time';
$field = 'id,resource_id,payment_id,order_status,payment_type,order_amount,course_id,class_id,staff_id,after_sales_status,after_sales_reason,after_sales_time,created_at,updated_at,payment_time,subscription_payment_time';
$order = 'id desc';
$search_model = $this->model->withSearch(["id","payment_id","order_status","payment_type","order_amount","course_id","class_id","staff_id","resource_id","after_sales_status","after_sales_reason","after_sales_time","payment_time","subscription_payment_time"], $where)->field($field)->order($order);
$search_model = $this->model->withSearch(["order_status","payment_type"], $where)->with(['customerResources','course','classGrade','personnel'])->field($field)->order($order);
$list = $this->pageQuery($search_model);
return $list;
}
@ -51,9 +55,9 @@ class OrderTableService extends BaseAdminService
*/
public function getInfo(int $id)
{
$field = 'id,payment_id,order_status,payment_type,order_amount,course_id,class_id,staff_id,resource_id,after_sales_status,after_sales_reason,after_sales_time,created_at,updated_at,payment_time,subscription_payment_time';
$field = 'id,resource_id,payment_id,order_status,payment_type,order_amount,course_id,class_id,staff_id,after_sales_status,after_sales_reason,after_sales_time,created_at,updated_at,payment_time,subscription_payment_time';
$info = $this->model->field($field)->where([['id', "=", $id]])->findOrEmpty()->toArray();
$info = $this->model->field($field)->where([['id', "=", $id]])->with(['customerResources','course','classGrade','personnel'])->findOrEmpty()->toArray();
return $info;
}
@ -64,6 +68,14 @@ class OrderTableService extends BaseAdminService
*/
public function add(array $data)
{
$personnel = new Personnel();
$data['staff_id'] = $personnel->where(['sys_user_id' => $this->uid])->value("id");
if(!$data['staff_id']){
return fail("操作失败");
}
// $data['staff_id'] = 1;
$res = $this->model->create($data);
return $res->id;
@ -95,5 +107,25 @@ class OrderTableService extends BaseAdminService
}
public function getCustomerResourcesAll(){
$customerResourcesModel = new CustomerResources();
return $customerResourcesModel->select()->toArray();
}
public function getCourseAll(){
$courseModel = new Course();
return $courseModel->select()->toArray();
}
public function getClassGradeAll(){
$classGradeModel = new ClassGrade();
return $classGradeModel->select()->toArray();
}
public function getPersonnelAll(){
$personnelModel = new Personnel();
return $personnelModel->select()->toArray();
}
}

12
niucloud/app/validate/order_table/OrderTable.php

@ -20,30 +20,26 @@ class OrderTable extends BaseValidate
{
protected $rule = [
'payment_id' => 'require',
'resource_id' => 'require',
'order_status' => 'require',
'payment_type' => 'require',
'order_amount' => 'require',
'course_id' => 'require',
'class_id' => 'require',
'staff_id' => 'require',
'resource_id' => 'require',
];
protected $message = [
'payment_id.require' => ['common_validate.require', ['payment_id']],
'resource_id.require' => ['common_validate.require', ['resource_id']],
'order_status.require' => ['common_validate.require', ['order_status']],
'payment_type.require' => ['common_validate.require', ['payment_type']],
'order_amount.require' => ['common_validate.require', ['order_amount']],
'course_id.require' => ['common_validate.require', ['course_id']],
'class_id.require' => ['common_validate.require', ['class_id']],
'staff_id.require' => ['common_validate.require', ['staff_id']],
'resource_id.require' => ['common_validate.require', ['resource_id']],
];
protected $scene = [
"add" => ['payment_id', 'order_status', 'payment_type', 'order_amount', 'course_id', 'class_id', 'staff_id', 'resource_id', 'after_sales_status', 'after_sales_reason', 'after_sales_time', 'payment_time', 'subscription_payment_time'],
"edit" => ['payment_id', 'order_status', 'payment_type', 'order_amount', 'course_id', 'class_id', 'staff_id', 'resource_id', 'after_sales_status', 'after_sales_reason', 'after_sales_time', 'payment_time', 'subscription_payment_time']
"add" => ['resource_id', 'order_status', 'payment_type', 'order_amount', 'course_id', 'class_id'],
"edit" => ['resource_id', 'order_status', 'payment_type', 'order_amount', 'course_id', 'class_id']
];
}

Loading…
Cancel
Save