From 47a871beb922cba89382cfbb2338087274afa46e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Sat, 18 Oct 2025 10:56:20 +0800
Subject: [PATCH] =?UTF-8?q?feat(shop):=20=E6=B7=BB=E5=8A=A0=E5=88=86?=
 =?UTF-8?q?=E9=94=80=E5=95=86=E8=B5=84=E9=87=91=E6=B5=81=E5=8A=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 shopDealerOrder 模型中新增 title 和 degreePrice 字段
- 优化 request 工具函数，仅在生产环境使用 localStorage 的 ApiUrl
- 新增 shopDealerCapital 资金流动记录的完整 CRUD 功能
- 包括搜索组件、编辑弹窗和列表页面
- 支持四种资金流动类型：佣金收入、提现支出、转账收支
- 实现资金流动记录的新增、编辑、删除和批量删除功能
- 在 shopDealerOrder 编辑页调整佣金计算逻辑和显示方式
- 更新订单列表页字段展示，替换 comments 为 title- 调整订单导入提示文案，增加结算确认说明
-优化订单编辑页分销商佣金比例和收益计算显示
---
 src/api/shop/shopDealerOrder/model/index.ts   |   4 +
 src/utils/request.ts                          |   2 +-
 .../shopDealerCapital/components/search.vue   |  42 ++
 .../components/shopDealerCapitalEdit.vue      | 398 ++++++++++++++++++
 src/views/sdy/shopDealerCapital/index.vue     | 285 +++++++++++++
 .../sdy/shopDealerOrder/components/Import.vue |   4 +
 .../components/shopDealerOrderEdit.vue        | 364 ++++++++--------
 src/views/sdy/shopDealerOrder/index.vue       |  20 +-
 .../components/shopDealerOrderEdit.vue        |  11 +-
 src/views/sdy/shopDealerOrder2/index.vue      |  18 +-
 .../developer/components/TenantInfo.vue       |  17 +-
 src/views/system/developer/index.vue          |   6 +-
 12 files changed, 949 insertions(+), 222 deletions(-)
 create mode 100644 src/views/sdy/shopDealerCapital/components/search.vue
 create mode 100644 src/views/sdy/shopDealerCapital/components/shopDealerCapitalEdit.vue
 create mode 100644 src/views/sdy/shopDealerCapital/index.vue

diff --git a/src/api/shop/shopDealerOrder/model/index.ts b/src/api/shop/shopDealerOrder/model/index.ts
index 9e3b90d..e76f732 100644
--- a/src/api/shop/shopDealerOrder/model/index.ts
+++ b/src/api/shop/shopDealerOrder/model/index.ts
@@ -8,6 +8,8 @@ export interface ShopDealerOrder {
   id?: number;
   // 买家用户ID
   userId?: number;
+  // 商品名称
+  title?: string;
   // 买家用户昵称
   nickname?: string;
   // 订单编号
@@ -16,6 +18,8 @@ export interface ShopDealerOrder {
   orderPrice?: string;
   // 结算金额
   settledPrice?: string;
+  // 换算成度
+  degreePrice?: string;
   // 支付金额
   payPrice?: string;
   // 分销商用户id(一级)
diff --git a/src/utils/request.ts b/src/utils/request.ts
index bca94d7..1285742 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -19,7 +19,7 @@ const getBaseUrl = (): string => {
   try {
     // 如果store中没有，则尝试从localStorage获取
     const ApiUrl = localStorage.getItem('ApiUrl');
-    if (ApiUrl) {
+    if (ApiUrl && import.meta.env.PROD) {
       return ApiUrl;
     }
   } catch (error) {
diff --git a/src/views/sdy/shopDealerCapital/components/search.vue b/src/views/sdy/shopDealerCapital/components/search.vue
new file mode 100644
index 0000000..82fea9d
--- /dev/null
+++ b/src/views/sdy/shopDealerCapital/components/search.vue
@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>
diff --git a/src/views/sdy/shopDealerCapital/components/shopDealerCapitalEdit.vue b/src/views/sdy/shopDealerCapital/components/shopDealerCapitalEdit.vue
new file mode 100644
index 0000000..6557d9c
--- /dev/null
+++ b/src/views/sdy/shopDealerCapital/components/shopDealerCapitalEdit.vue
@@ -0,0 +1,398 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="900"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑资金流动记录' : '新增资金流动记录'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="{ span: 6 }"
+      :wrapper-col="{ span: 18 }"
+    >
+      <!-- 基本信息 -->
+      <a-divider orientation="left">
+        <span style="color: #1890ff; font-weight: 600;">基本信息</span>
+      </a-divider>
+
+      <a-row :gutter="16">
+        <a-col :span="12">
+          <a-form-item label="分销商用户ID" name="userId">
+            <a-input-number
+              :min="1"
+              placeholder="请输入分销商用户ID"
+              v-model:value="form.userId"
+              style="width: 100%"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="订单ID" name="orderId">
+            <a-input-number
+              :min="1"
+              placeholder="请输入订单ID（可选）"
+              v-model:value="form.orderId"
+              style="width: 100%"
+            />
+          </a-form-item>
+        </a-col>
+      </a-row>
+
+      <!-- 资金流动信息 -->
+      <a-divider orientation="left">
+        <span style="color: #1890ff; font-weight: 600;">资金流动信息</span>
+      </a-divider>
+
+      <a-row :gutter="16">
+        <a-col :span="12">
+          <a-form-item label="流动类型" name="flowType">
+            <a-select v-model:value="form.flowType" placeholder="请选择资金流动类型">
+              <a-select-option :value="10">
+                <div class="flow-type-option">
+                  <a-tag color="success">佣金收入</a-tag>
+                  <span>获得分销佣金</span>
+                </div>
+              </a-select-option>
+              <a-select-option :value="20">
+                <div class="flow-type-option">
+                  <a-tag color="warning">提现支出</a-tag>
+                  <span>申请提现</span>
+                </div>
+              </a-select-option>
+              <a-select-option :value="30">
+                <div class="flow-type-option">
+                  <a-tag color="error">转账支出</a-tag>
+                  <span>转账给他人</span>
+                </div>
+              </a-select-option>
+              <a-select-option :value="40">
+                <div class="flow-type-option">
+                  <a-tag color="processing">转账收入</a-tag>
+                  <span>收到转账</span>
+                </div>
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="金额" name="money">
+            <a-input-number
+              :min="0"
+              :precision="2"
+              placeholder="请输入金额"
+              v-model:value="form.money"
+              style="width: 100%"
+            >
+              <template #addonAfter>元</template>
+            </a-input-number>
+          </a-form-item>
+        </a-col>
+      </a-row>
+
+      <a-form-item label="流动描述" name="comments">
+        <a-textarea
+          v-model:value="form.comments"
+          placeholder="请输入资金流动描述"
+          :rows="3"
+          :maxlength="200"
+          show-count
+        />
+      </a-form-item>
+
+      <!-- 关联信息 -->
+      <a-divider orientation="left">
+        <span style="color: #1890ff; font-weight: 600;">关联信息</span>
+      </a-divider>
+
+      <a-form-item
+        label="对方用户ID"
+        name="toUserId"
+        v-if="form.flowType === 30 || form.flowType === 40"
+      >
+        <a-input-number
+          :min="1"
+          placeholder="请输入对方用户ID"
+          v-model:value="form.toUserId"
+          style="width: 300px"
+        />
+        <span style="margin-left: 12px; color: #999; font-size: 12px;">
+          转账相关操作需要填写对方用户ID
+        </span>
+      </a-form-item>
+
+      <!-- 金额预览 -->
+      <div class="amount-preview" v-if="form.money && form.flowType">
+        <a-alert
+          :type="getAmountAlertType()"
+          :message="getAmountPreviewText()"
+          show-icon
+          style="margin-top: 16px"
+        />
+      </div>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addShopDealerCapital, updateShopDealerCapital } from '@/api/shop/shopDealerCapital';
+  import { ShopDealerCapital } from '@/api/shop/shopDealerCapital/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: ShopDealerCapital | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 表单数据
+  const form = reactive<ShopDealerCapital>({
+    id: undefined,
+    userId: undefined,
+    orderId: undefined,
+    flowType: undefined,
+    money: undefined,
+    comments: '',
+    toUserId: undefined,
+    tenantId: undefined,
+    createTime: undefined,
+    updateTime: undefined
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    userId: [
+      {
+        required: true,
+        message: '请输入分销商用户ID',
+        trigger: 'blur'
+      }
+    ],
+    flowType: [
+      {
+        required: true,
+        message: '请选择资金流动类型',
+        trigger: 'change'
+      }
+    ],
+    money: [
+      {
+        required: true,
+        message: '请输入金额',
+        trigger: 'blur'
+      },
+      {
+        validator: (rule: any, value: any) => {
+          if (value && value <= 0) {
+            return Promise.reject('金额必须大于0');
+          }
+          return Promise.resolve();
+        },
+        trigger: 'blur'
+      }
+    ],
+    comments: [
+      {
+        required: true,
+        message: '请输入流动描述',
+        trigger: 'blur'
+      },
+      {
+        min: 2,
+        max: 200,
+        message: '描述长度应在2-200个字符之间',
+        trigger: 'blur'
+      }
+    ],
+    toUserId: [
+      {
+        validator: (rule: any, value: any) => {
+          if ((form.flowType === 30 || form.flowType === 40) && !value) {
+            return Promise.reject('转账操作必须填写对方用户ID');
+          }
+          return Promise.resolve();
+        },
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  /* 获取金额预览提示类型 */
+  const getAmountAlertType = () => {
+    if (!form.flowType) return 'info';
+
+    switch (form.flowType) {
+      case 10: // 佣金收入
+      case 40: // 转账收入
+        return 'success';
+      case 20: // 提现支出
+      case 30: // 转账支出
+        return 'warning';
+      default:
+        return 'info';
+    }
+  };
+
+  /* 获取金额预览文本 */
+  const getAmountPreviewText = () => {
+    if (!form.money || !form.flowType) return '';
+
+    const amount = parseFloat(form.money.toString()).toFixed(2);
+    const flowTypeMap = {
+      10: '佣金收入',
+      20: '提现支出',
+      30: '转账支出',
+      40: '转账收入'
+    };
+
+    const flowTypeName = flowTypeMap[form.flowType] || '未知类型';
+    const symbol = form.flowType === 10 || form.flowType === 40 ? '+' : '-';
+
+    return `${flowTypeName}：${symbol}¥${amount}`;
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateShopDealerCapital : addShopDealerCapital;
+        saveOrUpdate(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,
+            flowType: undefined,
+            money: undefined,
+            comments: '',
+            toUserId: undefined,
+            tenantId: undefined,
+            createTime: undefined,
+            updateTime: undefined
+          });
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>
+
+<style lang="less" scoped>
+.flow-type-option {
+  display: flex;
+  align-items: center;
+
+  .ant-tag {
+    margin-right: 8px;
+  }
+
+  span {
+    color: #666;
+    font-size: 12px;
+  }
+}
+
+.amount-preview {
+  :deep(.ant-alert) {
+    .ant-alert-message {
+      font-weight: 600;
+      font-size: 14px;
+    }
+  }
+}
+
+:deep(.ant-divider-horizontal.ant-divider-with-text-left) {
+  margin: 24px 0 16px 0;
+
+  .ant-divider-inner-text {
+    padding: 0 16px 0 0;
+  }
+}
+
+:deep(.ant-form-item) {
+  margin-bottom: 16px;
+}
+
+:deep(.ant-select-selection-item) {
+  display: flex;
+  align-items: center;
+}
+
+:deep(.ant-input-number) {
+  width: 100%;
+}
+</style>
diff --git a/src/views/sdy/shopDealerCapital/index.vue b/src/views/sdy/shopDealerCapital/index.vue
new file mode 100644
index 0000000..ebe174d
--- /dev/null
+++ b/src/views/sdy/shopDealerCapital/index.vue
@@ -0,0 +1,285 @@
+<template>
+  <a-page-header :title="getPageTitle()" @back="() => $router.go(-1)">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="id"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <ShopDealerCapitalEdit v-model:visible="showEdit" :data="current" @done="reload" />
+  </a-page-header>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import {getPageTitle} from '@/utils/common';
+  import ShopDealerCapitalEdit from './components/shopDealerCapitalEdit.vue';
+  import { pageShopDealerCapital, removeShopDealerCapital, removeBatchShopDealerCapital } from '@/api/shop/shopDealerCapital';
+  import type { ShopDealerCapital, ShopDealerCapitalParam } from '@/api/shop/shopDealerCapital/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<ShopDealerCapital[]>([]);
+  // 当前编辑数据
+  const current = ref<ShopDealerCapital | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageShopDealerCapital({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: 'ID',
+      dataIndex: 'id',
+      key: 'id',
+      align: 'center',
+      width: 80,
+      fixed: 'left'
+    },
+    {
+      title: '用户ID',
+      dataIndex: 'userId',
+      key: 'userId',
+      align: 'center',
+      width: 100,
+      fixed: 'left'
+    },
+    {
+      title: '流动类型',
+      dataIndex: 'flowType',
+      key: 'flowType',
+      align: 'center',
+      width: 120,
+      customRender: ({ text }) => {
+        const typeMap = {
+          10: { text: '佣金收入', color: 'success' },
+          20: { text: '提现支出', color: 'warning' },
+          30: { text: '转账支出', color: 'error' },
+          40: { text: '转账收入', color: 'processing' }
+        };
+        const type = typeMap[text] || { text: '未知', color: 'default' };
+        return { type: 'tag', props: { color: type.color }, children: type.text };
+      }
+    },
+    {
+      title: '金额',
+      dataIndex: 'money',
+      key: 'money',
+      align: 'center',
+      width: 120,
+      customRender: ({ text, record }) => {
+        const amount = parseFloat(text || '0').toFixed(2);
+        const isIncome = record.flowType === 10 || record.flowType === 40;
+        return {
+          type: 'span',
+          props: {
+            style: {
+              color: isIncome ? '#52c41a' : '#ff4d4f',
+              fontWeight: 'bold'
+            }
+          },
+          children: `${isIncome ? '+' : '-'}¥${amount}`
+        };
+      }
+    },
+    {
+      title: '关联订单',
+      dataIndex: 'orderNo',
+      key: 'orderNo',
+      align: 'center',
+      customRender: ({ text }) => text || '-'
+    },
+    {
+      title: '对方用户',
+      dataIndex: 'toUserId',
+      key: 'toUserId',
+      align: 'center',
+      width: 100,
+      customRender: ({ text }) => text ? `ID: ${text}` : '-'
+    },
+    {
+      title: '描述',
+      dataIndex: 'describe',
+      key: 'describe',
+      align: 'left',
+      width: 200,
+      ellipsis: true,
+      customRender: ({ text }) => text || '-'
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: ShopDealerCapitalParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: ShopDealerCapital) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: ShopDealerCapital) => {
+    const hide = message.loading('请求中..', 0);
+    removeShopDealerCapital(row.id)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchShopDealerCapital(selection.value.map((d) => d.id))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: ShopDealerCapital) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'ShopDealerCapital'
+  };
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/sdy/shopDealerOrder/components/Import.vue b/src/views/sdy/shopDealerOrder/components/Import.vue
index cc7cdef..e636ecf 100644
--- a/src/views/sdy/shopDealerOrder/components/Import.vue
+++ b/src/views/sdy/shopDealerOrder/components/Import.vue
@@ -19,6 +19,10 @@
         </p>
         <p class="ant-upload-hint">将文件拖到此处，或点击上传</p>
       </a-upload-dragger>
+      <div class="ant-upload-text text-gray-400">
+        <div>1、必须按<a href="https://oss.wsdns.cn/20251018/9bddad4def5f4516880836421a91ee8a.xlsx" target="_blank">导入模版</a>的格式上传</div>
+        <div>2、导入成功确认结算完成佣金的发放</div>
+      </div>
     </a-spin>
   </ele-modal>
 </template>
diff --git a/src/views/sdy/shopDealerOrder/components/shopDealerOrderEdit.vue b/src/views/sdy/shopDealerOrder/components/shopDealerOrderEdit.vue
index e927d56..e8312c4 100644
--- a/src/views/sdy/shopDealerOrder/components/shopDealerOrderEdit.vue
+++ b/src/views/sdy/shopDealerOrder/components/shopDealerOrderEdit.vue
@@ -25,8 +25,8 @@
 
       <a-row :gutter="16">
         <a-col :span="12">
-          <a-form-item label="客户名称" name="comments">
-            {{ form.comments }}
+          <a-form-item label="客户名称" name="title">
+           {{ form.title }}
           </a-form-item>
         </a-col>
         <a-col :span="12">
@@ -39,6 +39,11 @@
             {{ parseFloat(form.orderPrice || 0).toFixed(2) }}
           </a-form-item>
         </a-col>
+        <a-col :span="12">
+          <a-form-item label="换算成度" name="dealerPrice">
+            {{ parseFloat(form.degreePrice || 0).toFixed(2) }}
+          </a-form-item>
+        </a-col>
         <a-col :span="12">
           <a-form-item label="税率" name="rate">
             {{ form.rate }}
@@ -60,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">
@@ -88,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>
@@ -139,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">
@@ -156,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>
@@ -174,167 +156,171 @@
         {{ form.settleTime }}
       </a-form-item>
     </a-form>
+
   </ele-modal>
 </template>
 
 <script lang="ts" setup>
-  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";
+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 loading = ref(false);
-  // 是否显示最大化切换按钮
-  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,
-    userId: undefined,
-    nickname: undefined,
-    orderNo: undefined,
-    orderPrice: 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 { resetFields } = useForm(form, rules);
-
-  /* 保存编辑 */
-  const save = () => {
-    if (!formRef.value) {
-      return;
+// 表单验证规则
+const rules = reactive({
+  userId: [
+    {
+      required: true,
+      message: '请选择用户ID',
+      trigger: 'blur'
     }
-    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);
-          if(props.data.orderPrice && props.data.rate){
-            form.firstMoney = (Number(props.data.payPrice) * 0.3).toFixed(2)
-            if(props.data.thirdUserId && props.data.thirdUserId > 0){
-              form.secondMoney = (Number(props.data.payPrice) * 0.1).toFixed(2)
-            }else {
-              form.secondMoney = (Number(props.data.payPrice) * 0.7).toFixed(2)
-            }
-            form.thirdMoney = (Number(props.data.payPrice) * 0.6).toFixed(2)
+
+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(() => {
+    });
+};
+
+console.log(localStorage.getItem(''))
+watch(
+  () => props.visible,
+  (visible) => {
+    if (visible) {
+      if (props.data) {
+        assignObject(form, props.data);
+        if (props.data.orderPrice && props.data.rate) {
+          form.secondMoney = (Number(props.data.payPrice) * 0.3).toFixed(2)
+          if (props.data.thirdUserId && props.data.thirdUserId > 0) {
+            form.thirdMoney = (Number(props.data.payPrice) * 0.1).toFixed(2)
+          } else {
+            form.thirdMoney = (Number(props.data.payPrice) * 0.7).toFixed(2)
           }
-          isUpdate.value = true;
-        } else {
-          // 重置为默认值
-          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;
+          form.firstMoney = (Number(props.data.payPrice) * 0.6).toFixed(2)
         }
+        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>
diff --git a/src/views/sdy/shopDealerOrder/index.vue b/src/views/sdy/shopDealerOrder/index.vue
index c5f5482..66bb726 100644
--- a/src/views/sdy/shopDealerOrder/index.vue
+++ b/src/views/sdy/shopDealerOrder/index.vue
@@ -23,21 +23,21 @@
         </template>
         <template #bodyCell="{ column, record }">
 
-          <template v-if="column.key === 'comments'">
-            <div>{{ record.comments }}</div>
+          <template v-if="column.key === 'title'">
+            <div>{{ record.title }}</div>
             <div class="text-gray-400">用户ID：{{ record.userId }}</div>
           </template>
 
           <template v-if="column.key === 'orderPrice'">
-            {{ parseFloat(record.orderPrice).toFixed(2) }}
+            {{ record.orderPrice.toFixed(2) }}
           </template>
 
-          <template v-if="column.key === 'orderPrice1000'">
-            {{ (record.orderPrice * 1000).toFixed(2) }}
+          <template v-if="column.key === 'degreePrice'">
+            {{ record.degreePrice.toFixed(2) }}
           </template>
 
           <template v-if="column.key === 'price'">
-            {{ (record.price || 0).toFixed(2) }}
+            {{ record.price }}
           </template>
 
           <template v-if="column.key === 'settledPrice'">
@@ -179,8 +179,8 @@ const columns = ref<ColumnItem[]>([
   },
   {
     title: '客户名称',
-    dataIndex: 'comments',
-    key: 'comments',
+    dataIndex: 'title',
+    key: 'title',
     width: 220,
   },
   {
@@ -191,8 +191,8 @@ const columns = ref<ColumnItem[]>([
   },
   {
     title: '换算成度',
-    dataIndex: 'orderPrice1000',
-    key: 'orderPrice1000',
+    dataIndex: 'degreePrice',
+    key: 'degreePrice',
     align: 'center'
   },
   {
diff --git a/src/views/sdy/shopDealerOrder2/components/shopDealerOrderEdit.vue b/src/views/sdy/shopDealerOrder2/components/shopDealerOrderEdit.vue
index df1f71f..ed014e6 100644
--- a/src/views/sdy/shopDealerOrder2/components/shopDealerOrderEdit.vue
+++ b/src/views/sdy/shopDealerOrder2/components/shopDealerOrderEdit.vue
@@ -24,8 +24,8 @@
 
       <a-row :gutter="16">
         <a-col :span="12">
-          <a-form-item label="客户名称" name="comments">
-            {{ form.comments }}
+          <a-form-item label="客户名称" name="title">
+            {{ form.title }}
           </a-form-item>
         </a-col>
         <a-col :span="12">
@@ -38,6 +38,11 @@
             {{ parseFloat(form.orderPrice || 0).toFixed(2) }}
           </a-form-item>
         </a-col>
+        <a-col :span="12">
+          <a-form-item label="换算成度" name="dealerPrice">
+            {{ parseFloat(form.degreePrice || 0).toFixed(2) }}
+          </a-form-item>
+        </a-col>
         <a-col :span="12">
           <a-form-item label="税率" name="rate">
             {{ form.rate }}
@@ -207,10 +212,12 @@
   // 表单数据
   const form = reactive<ShopDealerOrder>({
     id: undefined,
+    title: undefined,
     userId: undefined,
     nickname: undefined,
     orderNo: undefined,
     orderPrice: undefined,
+    degreePrice: undefined,
     settledPrice: undefined,
     price: undefined,
     month: undefined,
diff --git a/src/views/sdy/shopDealerOrder2/index.vue b/src/views/sdy/shopDealerOrder2/index.vue
index fbfb7d4..9b3dc91 100644
--- a/src/views/sdy/shopDealerOrder2/index.vue
+++ b/src/views/sdy/shopDealerOrder2/index.vue
@@ -22,8 +22,8 @@
         </template>
         <template #bodyCell="{ column, record }">
 
-          <template v-if="column.key === 'comments'">
-            <div>{{ record.comments }}</div>
+          <template v-if="column.key === 'title'">
+            <div>{{ record.title }}</div>
             <div class="text-gray-400">用户ID：{{ record.userId }}</div>
           </template>
 
@@ -31,12 +31,12 @@
             {{ parseFloat(record.orderPrice).toFixed(2) }}
           </template>
 
-          <template v-if="column.key === 'orderPrice1000'">
-            {{ (record.orderPrice * 1000).toFixed(2) }}
+          <template v-if="column.key === 'degreePrice'">
+            {{ record.degreePrice.toFixed(2) }}
           </template>
 
           <template v-if="column.key === 'price'">
-            {{ (record.price || 0).toFixed(2) }}
+            {{ record.price || 0 }}
           </template>
 
           <template v-if="column.key === 'settledPrice'">
@@ -192,8 +192,8 @@ const columns = ref<ColumnItem[]>([
   },
   {
     title: '客户名称',
-    dataIndex: 'comments',
-    key: 'comments',
+    dataIndex: 'title',
+    key: 'title',
     width: 180
   },
   {
@@ -204,8 +204,8 @@ const columns = ref<ColumnItem[]>([
   },
   {
     title: '换算成度',
-    dataIndex: 'orderPrice1000',
-    key: 'orderPrice1000',
+    dataIndex: 'degreePrice',
+    key: 'degreePrice',
     align: 'center'
   },
   {
diff --git a/src/views/system/developer/components/TenantInfo.vue b/src/views/system/developer/components/TenantInfo.vue
index 832e742..aaa6c8d 100644
--- a/src/views/system/developer/components/TenantInfo.vue
+++ b/src/views/system/developer/components/TenantInfo.vue
@@ -1,24 +1,25 @@
 <template>
   <a-descriptions v-if="website">
-    <a-descriptions-item label="租户ID">
-      <a-tag>{{ website.appId }}</a-tag>
-    </a-descriptions-item>
     <a-descriptions label="系统名称">
       <a-tag>{{ website?.appName }}</a-tag>
     </a-descriptions>
+    <a-descriptions-item label="后台管理">
+      {{ website.apiUrl }}
+      <a-tag>https://mp.websoft.top</a-tag>
+    </a-descriptions-item>
     <a-descriptions-item label="API">
       <a-tag>https://cms-api.websoft.top/api</a-tag>
     </a-descriptions-item>
-    <a-descriptions-item label="域名" v-if="website?.domain">
-      <a-tag>{{ website?.domain }}</a-tag>
-    </a-descriptions-item>
-    <a-descriptions-item label="后台管理">
-      <a-tag>https://mp.websoft.top</a-tag>
+    <a-descriptions-item label="租户ID">
+      <a-tag>{{ website.appId }}</a-tag>
     </a-descriptions-item>
     <a-descriptions-item label="超管账号">
       <a-tag>superAdmin</a-tag>
       <a-tag>vo0wowwj</a-tag>
     </a-descriptions-item>
+    <a-descriptions-item label="域名" v-if="website?.domain">
+      <a-tag>{{ website?.domain }}</a-tag>
+    </a-descriptions-item>
     <a-descriptions-item label="到期时间">
       <a-tag>{{ website?.expirationTime }}</a-tag>
     </a-descriptions-item>
diff --git a/src/views/system/developer/index.vue b/src/views/system/developer/index.vue
index 2c5e5b5..62368b7 100644
--- a/src/views/system/developer/index.vue
+++ b/src/views/system/developer/index.vue
@@ -1,9 +1,9 @@
 <template>
   <a-page-header :title="getPageTitle()" @back="() => $router.go(-1)">
     <a-card title="租户信息" style="margin-bottom: 20px">
-<!--      <template #extra>-->
-<!--        <a-button>编辑</a-button>-->
-<!--      </template>-->
+      <template #extra>
+        <a-button>编辑</a-button>
+      </template>
       <TenantInfo/>
     </a-card>
     <a-card title="服务器信息" style="margin-bottom: 20px">