chore(env): 启用开发环境API地址并清理冗余文件

- 启用 .env.development 中的 VITE_API_URL 配置
- 删除 src/views/glt/shopDealerOrder/components/Import.vue 文件
- 删除 src/views/glt/shopDealerOrder2/components/Import.vue 文件
- 删除 src/views/glt/shopDealerWithdraw/components/Import.vue 文件
- 删除 src/views/glt/shopDealerApply/index.vue 文件
- 删除 src/views/glt/shopDealerCapital/index.vue 文件
- 删除 src/views/glt/shopDealerOrder/index.vue 文件
- 从 shopDealerOrder 组件中移除导入模板说明信息

src/views/shop/shopDealerOrder/components/Import.vue

@@ -19,16 +19,6 @@
         </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/408b805ec3cd4084a4dc686e130af578.xlsx"
-            target="_blank"
-            >导入模版</a
-          >的格式上传</div
-        >
-        <div>2、导入成功确认结算完成佣金的发放</div>
-      </div>
     </a-spin>
   </ele-modal>
 </template>

src/views/shop/shopDealerOrder/components/search.vue

@@ -1,182 +1,143 @@
+<!-- 搜索表单 -->
 <template>
-  <div class="flex items-center gap-20">
-    <!-- 搜索表单 -->
-    <a-form
-      :model="where"
-      layout="inline"
-      class="search-form"
-      @finish="handleSearch"
-    >
-      <a-form-item>
-        <a-space>
-          <a-button
-            danger
-            class="ele-btn-icon"
-            v-if="selection.length > 0"
-            :disabled="selection?.length === 0"
-            @click="removeBatch"
-          >
-            <template #icon>
-              <DeleteOutlined />
-            </template>
-            <span>批量删除</span>
-          </a-button>
-        </a-space>
-      </a-form-item>
-
-      <!--      <a-form-item label="订单状态">-->
-      <!--        <a-select-->
-      <!--          v-model:value="where.isInvalid"-->
-      <!--          placeholder="全部"-->
-      <!--          allow-clear-->
-      <!--          style="width: 120px"-->
-      <!--        >-->
-      <!--          <a-select-option :value="0">有效</a-select-option>-->
-      <!--          <a-select-option :value="1">失效</a-select-option>-->
-      <!--        </a-select>-->
-      <!--      </a-form-item>-->
-
-      <!--      <a-form-item label="结算状态">-->
-      <!--        <a-select-->
-      <!--          v-model:value="where.isSettled"-->
-      <!--          placeholder="全部"-->
-      <!--          allow-clear-->
-      <!--          style="width: 120px"-->
-      <!--        >-->
-      <!--          <a-select-option :value="0">未结算</a-select-option>-->
-      <!--          <a-select-option :value="1">已结算</a-select-option>-->
-      <!--        </a-select>-->
-      <!--      </a-form-item>-->
-
-      <a-form-item>
-        <a-space>
-          <a-input-search
-            allow-clear
-            placeholder="请输入关键词"
-            style="width: 240px"
-            v-model:value="where.keywords"
-            @search="handleSearch"
-          />
-          <!--          <a-button type="primary" html-type="submit" class="ele-btn-icon">-->
-          <!--            <template #icon>-->
-          <!--              <SearchOutlined/>-->
-          <!--            </template>-->
-          <!--            搜索-->
-          <!--          </a-button>-->
-          <a-button @click="resetSearch"> 重置 </a-button>
-        </a-space>
-      </a-form-item>
-    </a-form>
-    <a-divider type="vertical" />
-    <a-space>
-      <!--        <a-button @click="exportData" class="ele-btn-icon">-->
-      <!--          <template #icon>-->
-      <!--            <ExportOutlined />-->
-      <!--          </template>-->
-      <!--          导出数据-->
-      <!--        </a-button>-->
-      <a-button @click="openImport" class="ele-btn-icon">
-        <template #icon>
-          <UploadOutlined />
-        </template>
-        导入数据
-      </a-button>
-      <a-button
-        type="primary"
-        danger
-        @click="batchSettle"
-        :disabled="selection?.length === 0"
-      >
-        <template #icon>
-          <DollarOutlined />
-        </template>
-        批量结算
-      </a-button>
-    </a-space>
-  </div>
-
-  <!-- 导入弹窗 -->
-  <Import v-model:visible="showImport" @done="emit('importDone')" />
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-input-search
+      allow-clear
+      placeholder="客户名称|订单编号"
+      style="width: 240px"
+      v-model:value="where.keywords"
+      @search="reload"
+    />
+    <a-button type="dashed" @click="handleExport">导出xls</a-button>
+  </a-space>
 </template>
 
 <script lang="ts" setup>
-  import { ref } from 'vue';
-  import {
-    DollarOutlined,
-    UploadOutlined,
-    DeleteOutlined
-  } from '@ant-design/icons-vue';
-  import type { ShopDealerOrderParam } from '@/api/shop/shopDealerOrder/model';
-  import Import from './Import.vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { ref, watch } from 'vue';
+  import { utils, writeFile } from 'xlsx';
+  import { message } from 'ant-design-vue';
+  import { ShopDealerCapital } from '@/api/shop/shopDealerCapital/model';
+  import { getTenantId } from '@/utils/domain';
   import useSearch from '@/utils/use-search';
+  import {
+    ShopDealerOrder,
+    ShopDealerOrderParam
+  } from '@/api/shop/shopDealerOrder/model';
+  import { pageShopDealerOrder } from '@/api/shop/shopDealerOrder';
 
-  withDefaults(
+  const props = withDefaults(
     defineProps<{
-      // 选中的数据
-      selection?: any[];
+      // 选中的角色
+      selection?: [];
     }>(),
-    {
-      selection: () => []
-    }
+    {}
   );
 
   const emit = defineEmits<{
-    (e: 'search', where?: ShopDealerOrderParam): void;
-    (e: 'batchSettle'): void;
-    (e: 'export'): void;
-    (e: 'importDone'): void;
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
     (e: 'remove'): void;
+    (e: 'batchMove'): void;
   }>();
 
-  // 是否显示导入弹窗
-  const showImport = ref(false);
+  const reload = () => {
+    emit('search', where);
+  };
 
-  // 搜索表单
-  const { where, resetFields } = useSearch<ShopDealerOrderParam>({
-    orderNo: '',
-    productName: '',
-    isInvalid: undefined,
-    isSettled: undefined
+  // 表单数据
+  const { where } = useSearch<ShopDealerOrderParam>({
+    keywords: '',
+    userId: undefined,
+    orderNo: undefined,
+    limit: 5000
   });
 
-  // 搜索
-  const handleSearch = () => {
-    const searchParams = { ...where };
-    // 清除空值
-    Object.keys(searchParams).forEach((key) => {
-      if (searchParams[key] === '' || searchParams[key] === undefined) {
-        delete searchParams[key];
-      }
-    });
-    emit('search', searchParams);
+  const list = ref<ShopDealerCapital[]>([]);
+
+  // 导出
+  const handleExport = async () => {
+    const array: (string | number)[][] = [
+      [
+        '客户名称',
+        '业务员',
+        '订单编号',
+        '结算电量',
+        '换算成度',
+        '结算单价',
+        '结算金额',
+        '税费',
+        '实发金额',
+        '一级佣金30%',
+        '一级佣金收益',
+        '二级佣金10%',
+        '二级佣金收益',
+        '三级佣金60%',
+        '三级佣金收益',
+        '月份',
+        '创建时间',
+        '结算时间',
+        '租户ID'
+      ]
+    ];
+
+    // 按搜索结果导出
+    await pageShopDealerOrder(where)
+      .then((data) => {
+        list.value = data?.list || [];
+        list.value?.forEach((d: ShopDealerOrder) => {
+          array.push([
+            `${d.title}`,
+            `${d.nickname}(${d.userId})`,
+            `${d.orderNo}`,
+            `${d.orderPrice}`,
+            `${d.degreePrice}`,
+            `${d.price}`,
+            `${d.settledPrice}`,
+            `${d.rate}`,
+            `${d.payPrice}`,
+            `${d.firstNickname}(${d.firstUserId})`,
+            `${d.firstMoney}`,
+            `${d.secondNickname}(${d.secondUserId})`,
+            `${d.secondMoney}`,
+            `${d.thirdNickname}(${d.thirdUserId})`,
+            `${d.thirdMoney}`,
+            `${d.month}`,
+            `${d.createTime}`,
+            `${d.settleTime}`,
+            `${d.tenantId}`
+          ]);
+        });
+        const sheetName = `bak_shop_dealer_order_${getTenantId()}`;
+        const workbook = {
+          SheetNames: [sheetName],
+          Sheets: {}
+        };
+        const sheet = utils.aoa_to_sheet(array);
+        workbook.Sheets[sheetName] = sheet;
+        // 设置列宽
+        sheet['!cols'] = [
+          { wch: 10 },
+          { wch: 20 },
+          { wch: 20 },
+          { wch: 15 },
+          { wch: 10 },
+          { wch: 10 },
+          { wch: 20 }
+        ];
+        message.loading('正在导出...');
+        setTimeout(() => {
+          writeFile(workbook, `${sheetName}.xlsx`);
+        }, 1000);
+      })
+      .catch((msg) => {
+        message.error(msg);
+      })
+      .finally(() => {});
   };
 
-  // 重置搜索
-  const resetSearch = () => {
-    // Object.keys(searchForm).forEach(key => {
-    //   searchForm[key] = key === 'orderId' ? undefined : '';
-    // });
-    resetFields();
-    emit('search', {});
-  };
-
-  // 批量删除
-  const removeBatch = () => {
-    emit('remove');
-  };
-
-  // 批量结算
-  const batchSettle = () => {
-    emit('batchSettle');
-  };
-
-  // 导出数据
-  const exportData = () => {
-    emit('export');
-  };
-
-  // 打开导入弹窗
-  const openImport = () => {
-    showImport.value = true;
-  };
+  watch(
+    () => props.selection,
+    () => {}
+  );
 </script>

src/views/shop/shopDealerOrder/components/shopDealerOrderEdit.vue

@@ -24,66 +24,36 @@
       </a-divider>
 
       <a-row :gutter="16">
-        <a-col :span="12">
-          <a-form-item label="客户名称" name="title">
-            {{ form.title }}
-          </a-form-item>
-        </a-col>
         <a-col :span="12">
           <a-form-item label="订单编号" name="orderNo">
             {{ form.orderNo }}
           </a-form-item>
         </a-col>
         <a-col :span="12">
-          <a-form-item label="结算电量" name="orderPrice">
-            {{ 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 }}
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="单价" name="price">
-            {{ form.price }}
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="结算金额" name="payPrice">
-            {{ parseFloat(form.settledPrice || 0).toFixed(2) }}
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="实发金额" name="payPrice">
+          <a-form-item label="订单金额" name="payPrice">
             {{ parseFloat(form.payPrice || 0).toFixed(2) }}
           </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>
+      <!--      <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>
@@ -92,7 +62,7 @@
       <!-- 一级分销商 -->
       <div class="dealer-section">
         <h4 class="dealer-title">
-          <a-tag color="orange">一级佣金30%</a-tag>
+          <a-tag color="orange">一级佣金10%</a-tag>
         </h4>
         <a-row :gutter="16">
           <a-col :span="12">
@@ -105,7 +75,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="占比" name="rate">
-              {{ '30%' }}
+              {{ '10%' }}
             </a-form-item>
             <a-form-item label="获取收益" name="firstMoney">
               {{ form.firstMoney }}
@@ -179,7 +149,7 @@
   import { assignObject } from 'ele-admin-pro';
   import { ShopDealerOrder } from '@/api/shop/shopDealerOrder/model';
   import { FormInstance } from 'ant-design-vue/es/form';
-  import { updateShopDealerOrder} from '@/api/shop/shopDealerOrder';
+  import { updateShopDealerOrder } from '@/api/shop/shopDealerOrder';
 
   // 是否是修改
   const isUpdate = ref(false);

src/views/shop/shopDealerOrder/index.vue

@@ -7,7 +7,6 @@
         :columns="columns"
         :datasource="datasource"
         :customRow="customRow"
-        v-model:selection="selection"
         tool-class="ele-toolbar-form"
         class="sys-org-table"
       >
@@ -24,11 +23,13 @@
         <template #bodyCell="{ column, record }">
           <template v-if="column.key === 'title'">
             <div>{{ record.title }}</div>
-            <div class="text-gray-400">用户ID：{{ record.userId }}</div>
+            <div class="text-gray-400"
+              >{{ record.nickname }}({{ record.userId }})</div
+            >
           </template>
 
           <template v-if="column.key === 'orderPrice'">
-            {{ record.orderPrice.toFixed(2) }}
+            {{ parseFloat(record.orderPrice).toFixed(2) }}
           </template>
 
           <template v-if="column.key === 'degreePrice'">
@@ -36,7 +37,7 @@
           </template>
 
           <template v-if="column.key === 'price'">
-            {{ record.price }}
+            {{ record.price || 0 }}
           </template>
 
           <template v-if="column.key === 'settledPrice'">
@@ -47,6 +48,30 @@
             {{ record.payPrice.toFixed(2) }}
           </template>
 
+          <template v-if="column.key === 'firstNickname'">
+            <div>{{ record.firstMoney }}</div>
+            <div class="text-gray-400">{{ record.firstNickname || '-' }}</div>
+          </template>
+
+          <template v-if="column.key === 'secondNickname'">
+            <div>{{ record.secondMoney }}</div>
+            <div class="text-gray-400">{{ record.secondNickname || '-' }}</div>
+          </template>
+
+          <template v-if="column.key === 'firstDividendUserName'">
+            <div>{{ record.firstDividend }}</div>
+            <div class="text-gray-400"
+              >{{ record.firstDividendUserName || '-' }}</div
+            >
+          </template>
+
+          <template v-if="column.key === 'secondDividendUserName'">
+            <div>{{ record.secondDividend }}</div>
+            <div class="text-gray-400"
+              >{{ record.secondDividendUserName || '-' }}</div
+            >
+          </template>
+
           <template v-if="column.key === 'dealerInfo'">
             <div class="dealer-info">
               <div v-if="record.firstUserId" class="dealer-level">
@@ -93,9 +118,22 @@
 
           <template v-if="column.key === 'action'">
             <template v-if="record.isSettled === 0 && record.isInvalid === 0">
-              <a @click="openEdit(record)" class="ele-text-success"> 结算 </a>
+              <a @click="settleOrder(record)" class="ele-text-success">
+                结算
+              </a>
               <a-divider type="vertical" />
             </template>
+            <!--            <template v-if="record.isInvalid === 0">-->
+            <!--              <a-popconfirm-->
+            <!--                title="确定要标记此订单为失效吗？"-->
+            <!--                @confirm="invalidateOrder(record)"-->
+            <!--                placement="topRight"-->
+            <!--              >-->
+            <!--                <a class="text-purple-500">-->
+            <!--                  验证-->
+            <!--                </a>-->
+            <!--              </a-popconfirm>-->
+            <!--            </template>-->
             <a-popconfirm
               v-if="record.isSettled === 0"
               title="确定要删除吗？"
@@ -121,7 +159,10 @@
 <script lang="ts" setup>
   import { createVNode, ref } from 'vue';
   import { message, Modal } from 'ant-design-vue';
-  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import {
+    ExclamationCircleOutlined,
+    DollarOutlined
+  } from '@ant-design/icons-vue';
   import type { EleProTable } from 'ele-admin-pro';
   import type {
     DatasourceFunction,
@@ -139,7 +180,10 @@
     ShopDealerOrder,
     ShopDealerOrderParam
   } from '@/api/shop/shopDealerOrder/model';
-  import { exportShopDealerOrder } from '@/api/shop/shopDealerOrder';
+  import {
+    exportShopDealerOrder,
+    updateShopDealerOrder
+  } from '@/api/shop/shopDealerOrder';
 
   // 表格实例
   const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -169,9 +213,8 @@
     }
     // 保存当前搜索条件用于导出
     currentWhere.value = { ...where };
-    // 未结算订单
-    where.isSettled = 0;
-    where.myOrder = 1;
+    // 已结算订单
+    where.isSettled = 1;
     return pageShopDealerOrder({
       ...where,
       ...orders,
@@ -182,88 +225,77 @@
 
   // 表格列配置
   const columns = ref<ColumnItem[]>([
+    {
+      key: 'index',
+      width: 48,
+      align: 'center',
+      fixed: 'left',
+      hideInSetting: true,
+      customRender: ({ index }) => index + (tableRef.value?.tableIndex ?? 0)
+    },
     {
       title: '订单编号',
       dataIndex: 'orderNo',
-      key: 'orderNo'
+      key: 'orderNo',
+      align: 'center',
+      width: 200
     },
     {
-      title: '客户名称',
+      title: '买家',
       dataIndex: 'title',
-      key: 'title',
-      width: 220
+      key: 'title'
     },
     {
-      title: '结算电量',
+      title: '订单金额',
       dataIndex: 'orderPrice',
       key: 'orderPrice',
       align: 'center'
     },
     {
-      title: '换算成度',
-      dataIndex: 'degreePrice',
-      key: 'degreePrice',
+      title: '一级佣金(10%)',
+      dataIndex: 'firstNickname',
+      key: 'firstNickname',
       align: 'center'
     },
     {
-      title: '结算单价',
-      dataIndex: 'price',
-      key: 'price',
+      title: '二级佣金(5%)',
+      dataIndex: 'secondNickname',
+      key: 'secondNickname',
       align: 'center'
     },
     {
-      title: '结算金额',
-      dataIndex: 'settledPrice',
-      key: 'settledPrice',
+      title: '一级门店分红(2%/3%)',
+      dataIndex: 'firstDividendUserName',
+      key: 'firstDividendUserName',
       align: 'center'
     },
     {
-      title: '税费',
-      dataIndex: 'rate',
-      key: 'rate',
+      title: '二级门店分红(1%)',
+      dataIndex: 'secondDividendUserName',
+      key: 'secondDividendUserName',
       align: 'center'
     },
-    {
-      title: '实发金额',
-      dataIndex: 'payPrice',
-      key: 'payPrice',
-      align: 'center'
-    },
-    {
-      title: '签约状态',
-      dataIndex: 'isInvalid',
-      key: 'isInvalid',
-      align: 'center',
-      width: 100
-    },
-    {
-      title: '月份',
-      dataIndex: 'month',
-      key: 'month',
-      align: 'center',
-      width: 100
-    },
     {
       title: '结算状态',
       dataIndex: 'isSettled',
       key: 'isSettled',
-      align: 'center',
-      width: 100
+      align: 'center'
     },
     {
       title: '创建时间',
       dataIndex: 'createTime',
       key: 'createTime',
-      align: 'center'
-    },
-    {
-      title: '操作',
-      key: 'action',
-      width: 180,
-      fixed: 'right',
       align: 'center',
-      hideInSetting: true
+      width: 180
     }
+    // {
+    //   title: '操作',
+    //   key: 'action',
+    //   width: 180,
+    //   fixed: 'right',
+    //   align: 'center',
+    //   hideInSetting: true
+    // }
   ]);
 
   /* 搜索 */
@@ -272,6 +304,37 @@
     tableRef?.value?.reload({ where: where });
   };
 
+  /* 结算单个订单 */
+  const settleOrder = (row: ShopDealerOrder) => {
+    const totalCommission = (
+      parseFloat(row.firstMoney || '0') +
+      parseFloat(row.secondMoney || '0') +
+      parseFloat(row.thirdMoney || '0')
+    ).toFixed(2);
+
+    Modal.confirm({
+      title: '确认结算',
+      content: `确定要结算此订单吗？总佣金金额：¥${totalCommission}`,
+      icon: createVNode(DollarOutlined),
+      okText: '确认结算',
+      okType: 'primary',
+      cancelText: '取消',
+      onOk: () => {
+        const hide = message.loading('正在结算...', 0);
+        // 这里调用结算API
+        updateShopDealerOrder({
+          ...row,
+          isSettled: 1
+        });
+        setTimeout(() => {
+          hide();
+          message.success('结算成功');
+          reload();
+        }, 1000);
+      }
+    });
+  };
+
   /* 批量结算 */
   const batchSettle = () => {
     if (!selection.value.length) {
@@ -327,7 +390,7 @@
   /* 打开编辑弹窗 */
   const openEdit = (row?: ShopDealerOrder) => {
     current.value = row ?? null;
-    showEdit.value = true;
+    // showEdit.value = true;
   };
 
   /* 删除单个 */