feat(shopDealerOrder): 实现分销订单结算功能- 添加"立即结算"按钮并绑定保存事件

- 实现结算状态校验,防止重复结算
- 增加用户签约状态检查
- 调用 updateSdyDealerOrder 接口完成结算
-优化分销商信息展示,明确各级佣金比例
- 调整一级、二级、三级分销商显示顺序
- 添加开发调试信息区域,便于跟踪数据
- 移除未使用的表单输入组件和注释代码
- 更新分销商标签文案,统一使用佣金比例描述
This commit is contained in:
2025-10-19 10:03:55 +08:00
parent 5a6c1f8ec3
commit bf38e7e6d9
2 changed files with 161 additions and 255 deletions

View File

@@ -8,7 +8,8 @@
:title="isUpdate ? '分销订单' : '分销订单'"
:body-style="{ paddingBottom: '28px' }"
@update:visible="updateVisible"
:footer="null"
:okText="`立即结算`"
@ok="save"
>
<a-form
ref="formRef"
@@ -64,18 +65,22 @@
</a-form-item>
</a-col>
</a-row>
<div class="font-bold text-gray-400 bg-gray-50">开发调试</div>
<div class="text-gray-400 bg-gray-50">
<div>业务员({{ form.userId }}){{ form.nickname }}</div>
<div>一级分销商({{ form.firstUserId }}){{ form.firstNickname }}一级佣金30%{{ form.firstMoney }}</div>
<div>二级分销商({{ form.secondUserId }}){{ form.secondNickname }}二级佣金10%{{ form.secondMoney }}</div>
<div>三级分销商({{ form.thirdUserId }}){{ form.thirdNickname }}三级佣金60%{{ form.thirdMoney }}</div>
</div>
<!-- 分销商信息 -->
<a-divider orientation="left">
<span style="color: #1890ff; font-weight: 600;">收益计算</span>
</a-divider>
<!-- 级分销商 -->
<!-- 级分销商 -->
<div class="dealer-section">
<h4 class="dealer-title">
<a-tag color="orange">间推收益</a-tag>
<a-tag color="orange">一级佣金30%</a-tag>
</h4>
<a-row :gutter="16">
<a-col :span="12">
@@ -92,49 +97,31 @@
</a-form-item>
<a-form-item label="获取收益" name="firstMoney">
{{ form.firstMoney }}
<!-- <a-input-number-->
<!-- :min="0"-->
<!-- :precision="2"-->
<!-- placeholder="请输入一级分销佣金"-->
<!-- v-model:value=""-->
<!-- style="width: 100%"-->
<!-- >-->
<!-- <template #addonAfter></template>-->
<!-- </a-input-number>-->
</a-form-item>
</a-col>
</a-row>
</div>
<!-- 级分销商 -->
<!-- 级分销商 -->
<div class="dealer-section">
<h4 class="dealer-title">
<a-tag color="orange">{{ form.thirdUserId > 0 ? '推荐收益' : '获取收益' }}</a-tag>
<a-tag color="orange">二级佣金10%</a-tag>
</h4>
<a-row :gutter="16">
<a-col :span="12">
<a-form-item label="用户ID" name="userId">
{{ form.userId }}
<a-form-item label="用户ID" name="secondUserId">
{{ form.secondUserId }}
</a-form-item>
<a-form-item label="昵称" name="nickname">
{{ form.nickname }}
{{ form.secondNickname }}
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="占比" name="rate">
{{ form?.thirdUserId > 0 ? '10%' : '70%' }}
10%
</a-form-item>
<a-form-item label="获取收益" name="firstMoney">
{{ form.secondMoney }}
<!-- <a-input-number-->
<!-- :min="0"-->
<!-- :precision="2"-->
<!-- placeholder="请输入一级分销佣金"-->
<!-- v-model:value=""-->
<!-- style="width: 100%"-->
<!-- >-->
<!-- <template #addonAfter></template>-->
<!-- </a-input-number>-->
</a-form-item>
</a-col>
</a-row>
@@ -143,15 +130,15 @@
<!-- 三级分销商 -->
<div class="dealer-section" v-if="form.thirdUserId > 0">
<h4 class="dealer-title">
<a-tag color="orange">{{ form.thirdUserId > 0 ? '获取收益' : '推荐收益' }}</a-tag>
<a-tag color="orange">三级佣金60%</a-tag>
</h4>
<a-row :gutter="16">
<a-col :span="12">
<a-form-item label="用户ID" name="secondUserId">
{{ form.secondUserId }}
<a-form-item label="用户ID" name="thirdUserId">
{{ form.thirdUserId }}
</a-form-item>
<a-form-item label="昵称" name="secondNickname">
{{ form.secondNickname }}
<a-form-item label="昵称" name="thirdNickname">
{{ form.thirdNickname }}
</a-form-item>
</a-col>
<a-col :span="12">
@@ -160,15 +147,6 @@
</a-form-item>
<a-form-item label="获取收益" name="thirdMoney">
{{ form.thirdMoney }}
<!-- <a-input-number-->
<!-- :min="0"-->
<!-- :precision="2"-->
<!-- placeholder="请输入二级分销佣金"-->
<!-- v-model:value=""-->
<!-- style="width: 100%"-->
<!-- >-->
<!-- <template #addonAfter></template>-->
<!-- </a-input-number>-->
</a-form-item>
</a-col>
</a-row>
@@ -178,121 +156,162 @@
{{ form.settleTime }}
</a-form-item>
</a-form>
</ele-modal>
</template>
<script lang="ts" setup>
import { ref, reactive, watch } from 'vue';
import { Form } from 'ant-design-vue';
import { assignObject } from 'ele-admin-pro';
import { ShopDealerOrder } from '@/api/shop/shopDealerOrder/model';
import { FormInstance } from 'ant-design-vue/es/form';
import {ref, reactive, watch} from 'vue';
import {Form, message} from 'ant-design-vue';
import {assignObject} from 'ele-admin-pro';
import {ShopDealerOrder} from '@/api/shop/shopDealerOrder/model';
import {FormInstance} from 'ant-design-vue/es/form';
import {updateSdyDealerOrder} from "@/api/sdy/sdyDealerOrder";
// 是否是修改
const isUpdate = ref(false);
const useForm = Form.useForm;
// 是否是修改
const isUpdate = ref(false);
const useForm = Form.useForm;
const props = defineProps<{
// 弹窗是否打开
visible: boolean;
// 修改回显的数据
data?: ShopDealerOrder | null;
}>();
const props = defineProps<{
// 弹窗是否打开
visible: boolean;
// 修改回显的数据
data?: ShopDealerOrder | null;
}>();
const emit = defineEmits<{
(e: 'done'): void;
(e: 'update:visible', visible: boolean): void;
}>();
const emit = defineEmits<{
(e: 'done'): void;
(e: 'update:visible', visible: boolean): void;
}>();
// 是否显示最大化切换按钮
const maxable = ref(true);
// 表格选中数据
const formRef = ref<FormInstance | null>(null);
// 提交状态
const loading = ref(false);
// 是否显示最大化切换按钮
const maxable = ref(true);
// 表格选中数据
const formRef = ref<FormInstance | null>(null);
// 表单数据
const form = reactive<ShopDealerOrder>({
id: undefined,
title: undefined,
userId: undefined,
nickname: undefined,
orderNo: undefined,
orderPrice: undefined,
degreePrice: undefined,
settledPrice: undefined,
price: undefined,
month: undefined,
payPrice: undefined,
firstUserId: undefined,
secondUserId: undefined,
thirdUserId: undefined,
firstMoney: undefined,
secondMoney: undefined,
thirdMoney: undefined,
firstNickname: undefined,
secondNickname: undefined,
thirdNickname: undefined,
rate: undefined,
comments: undefined,
isInvalid: 0,
isSettled: 0,
settleTime: undefined,
tenantId: undefined,
createTime: undefined,
updateTime: undefined
});
// 表单数据
const form = reactive<ShopDealerOrder>({
id: undefined,
userId: undefined,
nickname: undefined,
orderNo: undefined,
title: undefined,
orderPrice: undefined,
settledPrice: undefined,
degreePrice: undefined,
price: undefined,
month: undefined,
payPrice: undefined,
firstUserId: undefined,
secondUserId: undefined,
thirdUserId: undefined,
firstMoney: undefined,
secondMoney: undefined,
thirdMoney: undefined,
firstNickname: undefined,
secondNickname: undefined,
thirdNickname: undefined,
rate: undefined,
comments: undefined,
isInvalid: 0,
isSettled: 0,
settleTime: undefined,
tenantId: undefined,
createTime: undefined,
updateTime: undefined
});
/* 更新visible */
const updateVisible = (value: boolean) => {
emit('update:visible', value);
};
/* 更新visible */
const updateVisible = (value: boolean) => {
emit('update:visible', value);
};
// 表单验证规则
const rules = reactive({
userId: [
{
required: true,
message: '请选择用户ID',
trigger: 'blur'
}
],
});
// 表单验证规则
const rules = reactive({
userId: [
{
required: true,
message: '请选择用户ID',
trigger: 'blur'
}
],
});
const {resetFields} = useForm(form, rules);
const { resetFields } = useForm(form, rules);
/* 保存编辑 */
const save = () => {
if (!formRef.value) {
return;
}
if (form.isSettled == 1) {
message.error('请勿重复结算');
return;
}
if (form.userId == 0) {
message.error('未签约');
return;
}
formRef.value
.validate()
.then(() => {
loading.value = true;
const formData = {
...form,
isSettled: 1
};
updateSdyDealerOrder(formData)
.then((msg) => {
loading.value = false;
message.success(msg);
updateVisible(false);
emit('done');
})
.catch((e) => {
loading.value = false;
message.error(e.message);
});
})
.catch(() => {
});
};
watch(
() => props.visible,
(visible) => {
if (visible) {
if (props.data) {
assignObject(form, props.data);
isUpdate.value = true;
} else {
// 重置为默认值
Object.assign(form, {
id: undefined,
userId: undefined,
orderId: undefined,
orderPrice: undefined,
firstUserId: undefined,
secondUserId: undefined,
thirdUserId: undefined,
firstMoney: undefined,
secondMoney: undefined,
thirdMoney: undefined,
isInvalid: 0,
isSettled: 0,
settleTime: undefined
});
isUpdate.value = false;
}
console.log(localStorage.getItem(''))
watch(
() => props.visible,
(visible) => {
if (visible) {
if (props.data) {
assignObject(form, props.data);
isUpdate.value = true;
} else {
resetFields();
// 重置为默认值
Object.assign(form, {
id: undefined,
userId: undefined,
orderNo: undefined,
orderPrice: undefined,
firstUserId: undefined,
secondUserId: undefined,
thirdUserId: undefined,
firstMoney: undefined,
secondMoney: undefined,
thirdMoney: undefined,
isInvalid: 0,
isSettled: 0,
settleTime: undefined
});
isUpdate.value = false;
}
},
{ immediate: true }
);
} else {
resetFields();
}
},
{immediate: true}
);
</script>
<style lang="less" scoped>