修复代码

CatmDogd-Mall-Front-test/src/api/model/AppletOrderItem.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询订单信息列表
+export function listAppletOrderItem(query) {
+  return request({
+    url: '/model/AppletOrderItem/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询订单信息详细
+export function getAppletOrderItem(id) {
+  return request({
+    url: '/model/AppletOrderItem/' + id,
+    method: 'get'
+  })
+}
+
+// 新增订单信息
+export function addAppletOrderItem(data) {
+  return request({
+    url: '/model/AppletOrderItem',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改订单信息
+export function updateAppletOrderItem(data) {
+  return request({
+    url: '/model/AppletOrderItem',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除订单信息
+export function delAppletOrderItem(id) {
+  return request({
+    url: '/model/AppletOrderItem/' + id,
+    method: 'delete'
+  })
+}

CatmDogd-Mall-Front-test/src/views/model/AppletConfig/confindex.vue

@@ -0,0 +1,350 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+      <el-form-item label="说明" prop="paramValue">
+        <el-input
+          v-model="queryParams.paramValue"
+          placeholder="请输入说明"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="编码" prop="paramCode">
+        <el-input
+          v-model="queryParams.paramCode"
+          placeholder="请输入参数编码"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="文本" prop="paramValueText">
+        <el-input
+          v-model="queryParams.paramValueText"
+          placeholder="请输入参数值-普通文本"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="参数值-富文本" prop="paramValueArea">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.paramValueArea"-->
+<!--          placeholder="请输入参数值-富文本"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item class="flex_one tr">
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['model:AppletConfig:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['model:AppletConfig:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['model:AppletConfig:remove']"
+        >删除</el-button>
+      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          :loading="exportLoading"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['model:AppletConfig:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="AppletConfigList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+<!--      <el-table-column label="唯一标识" align="center" prop="id" />-->
+      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="说明" align="center" prop="paramValue" />
+      <el-table-column label="编码" align="center" prop="paramCode" />
+      <el-table-column label="文本" align="center" prop="paramValueText" />
+<!--      <el-table-column label="参数值-图片" align="center" prop="paramValueImage" v-if="columns[3].visible"/>-->
+
+      <el-table-column label="图片" align="center" prop="paramValueImage">
+        <template slot-scope="{ row }">
+          <el-image v-if="row.paramValueImage" :src="row.paramValueImage" :preview-src-list="[row.paramValueImage]" class="small-img circle-img"/>
+        </template>
+      </el-table-column>
+
+      <!--      <el-table-column label="参数值-富文本" align="center" prop="paramValueArea" v-if="columns[4].visible"/>-->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['model:AppletConfig:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['model:AppletConfig:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改配置信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-one">
+        <el-form-item label="说明" prop="paramValue">
+          <el-input v-model="form.paramValue" placeholder="请输入说明" />
+        </el-form-item>
+        <el-form-item label="编码" prop="paramCode">
+          <el-input v-model="form.paramCode" placeholder="请输入参数编码" />
+        </el-form-item>
+        <el-form-item label="文本" prop="paramValueText">
+          <el-input v-model="form.paramValueText" placeholder="请输入参数值-普通文本" />
+        </el-form-item>
+        <el-form-item label="图片">
+<!--          <imageUpload v-model="form.paramValueImage"/>-->
+          <oss-image-upload v-model="form.paramValueImage" :limit="1"></oss-image-upload>
+        </el-form-item>
+        <el-form-item label="富文本" prop="paramValueArea">
+<!--          <el-input v-model="form.paramValueArea" placeholder="请输入参数值-富文本" />-->
+          <Editor v-model="form.paramValueArea" placeholder="请输入内容" type="url"></Editor>
+        </el-form-item>
+<!--        <el-form-item label="删除标识" prop="delFlag">-->
+<!--          <el-input v-model="form.delFlag" placeholder="请输入删除标识" />-->
+<!--        </el-form-item>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listAppletConfig, getAppletConfig, delAppletConfig, addAppletConfig, updateAppletConfig, exportAppletConfig } from "@/api/model/AppletConfig";
+
+export default {
+  name: "AppletConfig",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 配置信息表格数据
+      AppletConfigList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        paramValue: null,
+
+        paramCode: null,
+
+        paramValueText: null,
+
+        paramValueImage: null,
+
+        paramValueArea: null,
+
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" }
+        ],
+
+      },
+      columns: [
+    { key: 1, label: "说明", visible:  true  },
+    { key: 2, label: "参数编码", visible:  true  },
+    { key: 3, label: "参数值-普通文本", visible:  true  },
+    { key: 4, label: "参数值-图片", visible:  false  },
+    { key: 5, label: "参数值-富文本", visible:  true  },
+     ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询配置信息列表 */
+    getList() {
+      this.loading = true;
+      listAppletConfig(this.queryParams).then(response => {
+        this.AppletConfigList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+
+        paramValue: null,
+
+        paramCode: null,
+
+        paramValueText: null,
+
+        paramValueImage: null,
+
+        paramValueArea: null,
+
+        delFlag: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateBy: null,
+
+        updateTime: null,
+
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加配置信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getAppletConfig(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改配置信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateAppletConfig(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAppletConfig(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除配置信息编号为"' + ids + '"的数据项？').then(function() {
+        return delAppletConfig(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有配置信息数据项？').then(() => {
+        this.exportLoading = true;
+        return exportAppletConfig(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

CatmDogd-Mall-Front-test/src/views/model/AppletOrder/index.vue

@@ -140,6 +140,12 @@
           <span>{{ parseTime(scope.row.createTime, '')}}</span>
         </template>
       </el-table-column>
+      <el-table-column label="最新派单时间" align="center" prop="updateTime">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime, '')}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="订单重派时间(min)" align="center" prop="orderTime" />
       <el-table-column label="派单类型" align="center" prop="type">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.applet_order_type" :value="scope.row.type"/>
@@ -147,7 +153,7 @@
       </el-table-column>
       <el-table-column label="派单伴宠师" align="center" prop="userIdJson" />
       <el-table-column label="派单次数" align="center" prop="num" />
-      <el-table-column label="订单状态" align="center" prop="status">
+      <el-table-column label="接单状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.applet_order_status" :value="scope.row.status"/>
         </template>
@@ -158,7 +164,7 @@
       <el-table-column label="接单伴宠师" align="center" prop="userId">
         <template slot-scope="scope">
           <span style="color: #409eff;" v-if="scope.row.userId">指定接单 【{{ scope.row.userId }}】</span>
-          <span style="color: #909399;font-style: italic;" v-else>系统派单【未指定】</span>
+          <span style="color: #909399;font-style: italic;" v-else>系统派单【目前无人接单】</span>
         </template>
       </el-table-column>
 
@@ -172,13 +178,13 @@
 <!--      <el-table-column label="订单说明" align="center" prop="describeNo" v-if="columns[9].visible"/>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['model:AppletOrder:edit']"
-          >修改</el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['model:AppletOrder:edit']"-->
+<!--          >修改</el-button>-->
           <el-button
             size="mini"
             type="text"
@@ -295,6 +301,7 @@ export default {
         userIdJson: null,
         orderSn:null,
         orderId: null,
+        orderTime:null
       },
       // 表单参数
       form: {},
@@ -384,6 +391,7 @@ export default {
         userIdJson: null,
         orderSn:null,
         orderId: null,
+        orderTime:null
       };
       this.resetForm("form");
     },

CatmDogd-Mall-Front-test/src/views/model/AppletOrderItem/index.vue

@@ -0,0 +1,496 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+<!--      <el-form-item label="支付时间" prop="payTime">-->
+<!--        <el-date-picker-->
+<!--            clearable-->
+<!--            size="small"-->
+<!--            v-model="queryParams.payTime"-->
+<!--            type="datetime"-->
+
+<!--            value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--            placeholder="选择支付时间">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="本单酬劳" prop="price">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.price"-->
+<!--          placeholder="请输入本单酬劳"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="地址" prop="address">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.address"-->
+<!--          placeholder="请输入地址"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="派单类型" prop="type">
+<!--        <el-select v-model="queryParams.type" placeholder="请选择派单类型" clearable size="small">-->
+<!--        </el-select>-->
+
+        <el-select v-model="queryParams.type" placeholder="请选择派单类型" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.applet_order_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="订单状态" prop="type">
+<!--        <el-select v-model="queryParams.status" placeholder="请选择订单状态" clearable size="small">-->
+<!--        </el-select>-->
+        <el-select v-model="queryParams.status" placeholder="请选择订单状态" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.applet_order_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="请输入订单编号" label-width="300" prop="orderSn">
+        <el-input
+          v-model="queryParams.orderSn"
+          placeholder="请输入订单编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="关联宠物ID" prop="petId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.petId"-->
+<!--          placeholder="请输入关联宠物ID"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item class="flex_one tr">
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['model:AppletOrderItem:add']"-->
+<!--        >新增派单信息</el-button>-->
+      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['model:AppletOrderItem:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['model:AppletOrderItem:remove']"
+        >删除</el-button>
+      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          :loading="exportLoading"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['model:AppletOrderItem:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="AppletOrderItemList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+
+
+<!--      <el-table-column label="客户支付时间" align="center" prop="payTime">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.payTime, '')}}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column label="开始派单时间" align="center" prop="createTime">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '')}}</span>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column label="派单类型" align="center" prop="type">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.applet_order_type" :value="scope.row.type"/>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="派单伴宠师" align="center" prop="userIdJson" />-->
+<!--      <el-table-column label="派单次数" align="center" prop="num" />-->
+      <el-table-column label="接单状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.applet_order_status" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="接单时间" align="center" prop="startTime">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.startTime, '')}}</span>
+        </template>
+      </el-table-column>
+
+<!--      <el-table-column label="唯一标识" align="center" prop="id" />-->
+
+      <el-table-column label="接单伴宠师" align="center" prop="userId">
+        <template slot-scope="scope">
+          <span style="color: #409eff;" v-if="scope.row.userId">接单者 【{{ scope.row.userId }}】</span>
+          <span style="color: #909399;font-style: italic;" v-else>接单者【{{ scope.row.userId }}】</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="伴宠师姓名" align="center" prop="name" />
+      <el-table-column label="伴宠师电话" align="center" prop="phone" />
+
+      <el-table-column label="订单状态" align="center" prop="orderStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.applet_order_status" :value="scope.row.orderStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="订单支付金额" align="center" prop="price" />
+      <el-table-column label="本单比例(%)" align="center" prop="orderGiveProportion" />
+      <el-table-column label="佣金(￥)" align="center" prop="orderGivePrice" />
+      <el-table-column label="接单详细地址" align="center" prop="address" />
+      <el-table-column label="订单编号" align="center" prop="orderSn" />
+<!--      <el-table-column label="订单类型" align="center" prop="type" v-if="columns[3].visible"/>-->
+      <el-table-column label="无法接单原因" align="center" prop="reason"/>
+      <el-table-column label="确认服务日期" align="center" prop="orderStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.applet_order_status" :value="scope.row.orderStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="确认服务地址" align="center" prop="orderStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.applet_order_status" :value="scope.row.orderStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="确认服务宠物" align="center" prop="orderStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.applet_order_status" :value="scope.row.orderStatus"/>
+        </template>
+      </el-table-column>
+
+<!--      <el-table-column label="关联宠物ID" align="center" prop="petId" v-if="columns[6].visible"/>-->
+<!--      <el-table-column label="订单说明" align="center" prop="describeNo" v-if="columns[9].visible"/>-->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['model:AppletOrderItem:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['model:AppletOrderItem:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改订单信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="108px" >
+<!--        <el-form-item label="支付时间" prop="payTime">-->
+<!--          <el-date-picker clearable size="small"-->
+<!--                        v-model="form.payTime"-->
+<!--                        type="datetime"-->
+<!--                        value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--                        placeholder="选择支付时间">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+        <el-form-item label="派单类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择派单类型">
+            <el-option
+              v-for="dict in dict.type.applet_order_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"            ></el-option>
+          </el-select>
+        </el-form-item>
+<!--        <el-form-item label="本单酬劳" prop="price">-->
+<!--          <el-input v-model="form.price" placeholder="请输入本单酬劳" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="订单标识" prop="orderId">
+          <el-input v-model="form.orderId" placeholder="请输入订单标识" />
+        </el-form-item>
+        <el-form-item label="指定伴宠师" prop="userIdJson">
+          <el-input v-model="form.userIdJson" placeholder="请输入指定伴宠师标识:如果是指定伴宠师必填,如果是系统派单,则不填" />
+        </el-form-item>
+<!--        <el-form-item label="无法接单原因" prop="reason">-->
+<!--          <el-input v-model="form.reason" type="textarea" placeholder="请输入内容" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="订单标识" prop="userId">-->
+<!--          <el-input v-model="form.userId" placeholder="请输入订单标识" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="关联宠物ID" prop="petId">-->
+<!--          <el-input v-model="form.petId" placeholder="请输入关联宠物ID" />-->
+<!--        </el-form-item>-->
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listAppletOrderItem, getAppletOrderItem, delAppletOrderItem, addAppletOrderItem, updateAppletOrderItem, exportAppletOrderItem } from "@/api/model/AppletOrderItem";
+
+export default {
+  name: "AppletOrderItem",
+  dicts: ['applet_order_status','applet_order_type'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 订单信息表格数据
+      AppletOrderItemList: [],
+      // 弹出层标题
+      title: "新增派单信息",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        payTime: null,
+
+        price: null,
+        status: null,
+        address: null,
+
+        type: null,
+
+        reason: null,
+
+        userId: null,
+
+        petId: null,
+        num:null,
+        userIdJson: null,
+        orderSn:null,
+        orderId: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        createBy: [
+          { required: true, message: "创建者不能为空", trigger: "blur" }
+        ],
+
+        price: [
+          { required: true, message: "本单酬劳不能为空", trigger: "blur" }
+        ],
+
+        orderId: [
+          { required: true, message: "客户下单订单标识不能为空", trigger: "blur" }
+        ],
+
+        type: [
+          { required: true, message: "派单类型不能为空", trigger: "change" }
+        ],
+
+        userId: [
+          { required: true, message: "关联服务者ID不能为空", trigger: "blur" }
+        ],
+
+        petId: [
+          { required: true, message: "关联宠物ID不能为空", trigger: "blur" }
+        ],
+
+      },
+      columns: [
+    { key: 5, label: "支付时间", visible:  true  },
+    { key: 6, label: "本单酬劳", visible:  true  },
+    { key: 7, label: "地址", visible:  true  },
+    { key: 8, label: "订单类型", visible:  true  },
+    { key: 9, label: "无法接单原因", visible:  true  },
+    { key: 10, label: "关联服务者ID", visible:  false  },
+    { key: 11, label: "关联宠物ID", visible:  false  },
+     ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询订单信息列表 */
+    getList() {
+      this.loading = true;
+      listAppletOrderItem(this.queryParams).then(response => {
+        this.AppletOrderItemList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+
+        createTime: null,
+
+        createBy: null,
+
+        updateTime: null,
+
+        updateBy: null,
+
+        payTime: null,
+        status: null,
+        price: null,
+
+        address: null,
+
+        type: null,
+
+        reason: null,
+
+        userId: null,
+
+        petId: null,
+        num:null,
+        userIdJson: null,
+        orderSn:null,
+        orderId: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加订单信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getAppletOrderItem(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改订单信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateAppletOrderItem(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAppletOrderItem(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除订单信息编号为"' + ids + '"的数据项？').then(function() {
+        return delAppletOrderItem(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有订单信息数据项？').then(() => {
+        this.exportLoading = true;
+        return exportAppletOrderItem(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderController.java

@@ -58,6 +58,7 @@ public class ApiAppletOrderController extends BaseController {
         if(appletOrder.getType().equals("0")){
             list = appletOrderService.selectAppletOrderListLikeUserIdJson(appletOrder);
 
+
         }else{
             list = appletOrderService.selectAppletOrderList(appletOrder);
 

ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletOrderItemController.java

@@ -0,0 +1,114 @@
+package com.ruoyi.model.controller;
+
+import com.cyl.h5.pojo.vo.H5OrderVO;
+import com.cyl.h5.service.H5OrderService;
+import com.cyl.manager.oms.service.OrderService;
+import com.ruoyi.applet.service.IMallOrderService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.model.domain.AppletOrder;
+import com.ruoyi.model.domain.AppletOrderItem;
+import com.ruoyi.model.service.IAppletOrderItemService;
+import com.ruoyi.model.service.IAppletOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * 订单信息Controller
+ * 
+ * @author ruoyi
+ * @date 2025-03-28
+ */
+@RestController
+@RequestMapping("/model/AppletOrderItem")
+public class AppletOrderItemController extends BaseController
+{
+    @Autowired
+    private IAppletOrderItemService appletOrderItemService;
+    @Autowired
+    private IMallOrderService mallOrderService;
+    //下单小程序：那边来的订单信息
+    @Autowired
+    private H5OrderService h5OrderService;
+    @Autowired
+    private OrderService service;
+
+    /**
+     * 查询订单信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('model:AppletOrderItem:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(AppletOrderItem appletOrderItem)
+    {
+        startPage();
+        List<AppletOrderItem> list = appletOrderItemService.selectAppletOrderItemList(appletOrderItem);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出订单信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('model:AppletOrder:export')")
+    @Log(title = "订单信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, AppletOrderItem appletOrderItem) throws IOException {
+        List<AppletOrderItem> list = appletOrderItemService.selectAppletOrderItemList(appletOrderItem);
+        ExcelUtil<AppletOrderItem> util = new ExcelUtil<AppletOrderItem>(AppletOrderItem.class);
+        util.exportExcel(response, list, "订单信息数据");
+    }
+
+    /**
+     * 获取订单信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('model:AppletOrder:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(appletOrderItemService.selectAppletOrderItemById(id));
+    }
+
+    /**
+     * 新增订单信息
+     */
+    @PreAuthorize("@ss.hasPermi('model:AppletOrderItem:add')")
+    @Log(title = "订单信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody AppletOrderItem appletOrderItem)
+    {
+
+        return toAjax(appletOrderItemService.insertAppletOrderItem(appletOrderItem));
+
+    }
+
+    /**
+     * 修改订单信息
+     */
+    @PreAuthorize("@ss.hasPermi('model:AppletOrderItem:edit')")
+    @Log(title = "订单信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody AppletOrderItem appletOrderItem)
+    {
+        return toAjax(appletOrderItemService.updateAppletOrderItem(appletOrderItem));
+    }
+
+    /**
+     * 删除订单信息
+     */
+    @PreAuthorize("@ss.hasPermi('model:AppletOrderItem:remove')")
+    @Log(title = "订单信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(appletOrderItemService.deleteAppletOrderItemByIds(ids));
+    }
+}

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrder.java

@@ -94,5 +94,8 @@ public class AppletOrder {
     private ManagerOrderDetailVO managerOrderDetailVO;
 
 
+    //给用户的返点
+    @TableField(exist = false)
+    private BigDecimal orderGive;
 
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderItem.java

@@ -0,0 +1,135 @@
+package com.ruoyi.model.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.cyl.h5.pojo.vo.H5OrderVO;
+import com.cyl.manager.oms.pojo.vo.ManagerOrderDetailVO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 订单信息对象 applet_order
+ * 
+ * @author ruoyi
+ * @date 2025-03-28
+ */
+@Data
+public class AppletOrderItem {
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识 */
+    private Long id;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    /** 创建者 */
+    private Integer createBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+
+    /** 修改者 */
+    private Integer updateBy;
+
+    /** 支付时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime payTime;
+
+    /** 订单状态 */
+    @Excel(name = "订单状态")
+    private Integer status;
+
+    /** 派单次数 */
+    @Excel(name = "派单次数")
+    private Integer num;
+
+    /** 本单酬劳 */
+    @Excel(name = "本单酬劳")
+    private BigDecimal price;
+
+    /** 地址 */
+    @Excel(name = "地址")
+    private String address;
+
+    /** 订单类型 */
+    @Excel(name = "订单类型")
+    private String type;
+
+    /** 无法接单原因 */
+    @Excel(name = "无法接单原因")
+    private String reason;
+
+    /** 关联服务者ID */
+    @Excel(name = "关联服务者ID")
+    private Long userId;
+
+
+    /** 派单给的用户集合 */
+    @Excel(name = "派单给的用户集合")
+    private String userIdJson;
+
+    /** 关联宠物ID */
+    @Excel(name = "关联宠物ID")
+    private Integer petId;
+
+
+    private Long orderId;
+    private String orderSn;
+
+
+    @TableField(exist = false)
+    private H5OrderVO h5OrderVO;
+
+
+    @TableField(exist = false)
+    private ManagerOrderDetailVO managerOrderDetailVO;
+
+    
+
+    /** 接单时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "接单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime startTime;
+
+    /** 伴宠师姓名 */
+    @Excel(name = "伴宠师姓名")
+    private String name;
+
+    /** 伴宠师电话 */
+    @Excel(name = "伴宠师电话")
+    private String phone;
+
+    /** 订单状态 */
+    @Excel(name = "订单状态")
+    private Integer orderStatus;
+
+    /** 本单比例 */
+    @Excel(name = "本单比例")
+    private BigDecimal orderGiveProportion;
+
+    /** 本单佣金 */
+    @Excel(name = "本单佣金")
+    private BigDecimal orderGivePrice;
+
+    /** 确认服务日期 */
+    @Excel(name = "确认服务日期")
+    private Integer isDate;
+
+    /** 确认服务地址 */
+    @Excel(name = "确认服务地址")
+    private Integer isAddress;
+
+    /** 确认宠物信息 */
+    @Excel(name = "确认宠物信息")
+    private Integer isPet;
+
+
+}

ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderItemMapper.java

@@ -0,0 +1,64 @@
+package com.ruoyi.model.mapper;
+
+import com.ruoyi.model.domain.AppletOrderItem;
+
+import java.util.List;
+
+/**
+ * 订单信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-03-28
+ */
+public interface AppletOrderItemMapper
+{
+    /**
+     * 查询订单信息
+     * 
+     * @param id 订单信息主键
+     * @return 订单信息
+     */
+    public AppletOrderItem selectAppletOrderItemById(Long id);
+    public AppletOrderItem selectAppletOrderItemByOrderId(Long orderId);
+
+    /**
+     * 查询订单信息列表
+     * 
+     * @param AppletOrderItem 订单信息
+     * @return 订单信息集合
+     */
+    public List<AppletOrderItem> selectAppletOrderItemList(AppletOrderItem AppletOrderItem);
+    public List<AppletOrderItem> selectAppletOrderItemListLikeUserIdJson(AppletOrderItem AppletOrderItem);
+
+    /**
+     * 新增订单信息
+     * 
+     * @param AppletOrderItem 订单信息
+     * @return 结果
+     */
+    public int insertAppletOrderItem(AppletOrderItem AppletOrderItem);
+
+    /**
+     * 修改订单信息
+     * 
+     * @param AppletOrderItem 订单信息
+     * @return 结果
+     */
+    public int updateAppletOrderItem(AppletOrderItem AppletOrderItem);
+
+    /**
+     * 删除订单信息
+     * 
+     * @param id 订单信息主键
+     * @return 结果
+     */
+    public int deleteAppletOrderItemById(Long id);
+
+    /**
+     * 批量删除订单信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAppletOrderItemByIds(Long[] ids);
+}

ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletOrderItemService.java

@@ -0,0 +1,65 @@
+package com.ruoyi.model.service;
+
+import com.ruoyi.model.domain.AppletOrder;
+import com.ruoyi.model.domain.AppletOrderItem;
+
+import java.util.List;
+
+/**
+ * 订单信息Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-03-28
+ */
+public interface IAppletOrderItemService
+{
+    /**
+     * 查询订单信息
+     * 
+     * @param id 订单信息主键
+     * @return 订单信息
+     */
+    public AppletOrderItem selectAppletOrderItemById(Long id);
+    public AppletOrderItem selectAppletOrderItemByOrderId(Long orderId);
+
+    /**
+     * 查询订单信息列表
+     * 
+     * @param appletOrderItem 订单信息
+     * @return 订单信息集合
+     */
+    public List<AppletOrderItem> selectAppletOrderItemList(AppletOrderItem appletOrderItem);
+    public List<AppletOrderItem> selectAppletOrderItemListLikeUserIdJson(AppletOrderItem appletOrderItem);
+
+    /**
+     * 新增订单信息
+     *
+     * @param appletOrderItem 订单信息
+     * @return 结果
+     */
+    public int insertAppletOrderItem(AppletOrderItem appletOrderItem);
+
+    /**
+     * 修改订单信息
+     *
+     * @param appletOrderItem 订单信息
+     * @return 结果
+     */
+    public int updateAppletOrderItem(AppletOrderItem appletOrderItem);
+
+    /**
+     * 批量删除订单信息
+     *
+     * @param ids 需要删除的订单信息主键集合
+     * @return 结果
+     */
+    public int deleteAppletOrderItemByIds(Long[] ids);
+
+    /**
+     * 删除订单信息信息
+     *
+     * @param id 订单信息主键
+     * @return 结果
+     */
+    public int deleteAppletOrderItemById(Long id);
+}

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderItemServiceImpl.java

@@ -0,0 +1,110 @@
+package com.ruoyi.model.service.impl;
+
+import com.ruoyi.model.domain.AppletOrder;
+import com.ruoyi.model.domain.AppletOrderItem;
+import com.ruoyi.model.mapper.AppletOrderItemMapper;
+import com.ruoyi.model.mapper.AppletOrderMapper;
+import com.ruoyi.model.service.IAppletOrderItemService;
+import com.ruoyi.model.service.IAppletOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 订单信息Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2025-03-28
+ */
+@Service
+public class AppletOrderItemServiceImpl implements IAppletOrderItemService
+{
+    @Autowired
+    private AppletOrderItemMapper appletOrderItemMapper;
+
+    /**
+     * 查询订单信息
+     *
+     * @param id 订单信息主键
+     * @return 订单信息
+     */
+    @Override
+    public AppletOrderItem selectAppletOrderItemById(Long id)
+    {
+        return appletOrderItemMapper.selectAppletOrderItemById(id);
+    }
+
+
+    @Override
+    public AppletOrderItem selectAppletOrderItemByOrderId(Long orderId){
+        return appletOrderItemMapper.selectAppletOrderItemByOrderId(orderId);
+    }
+
+    /**
+     * 查询订单信息列表
+     *
+     * @param appletOrder 订单信息
+     * @return 订单信息
+     */
+    @Override
+    public List<AppletOrderItem> selectAppletOrderItemList(AppletOrderItem appletOrder)
+    {
+        return appletOrderItemMapper.selectAppletOrderItemList(appletOrder);
+    }
+
+
+    @Override
+    public List<AppletOrderItem> selectAppletOrderItemListLikeUserIdJson(AppletOrderItem appletOrder){
+        return appletOrderItemMapper.selectAppletOrderItemListLikeUserIdJson(appletOrder);
+    }
+    /**
+     * 新增订单信息
+     *
+     * @param appletOrder 订单信息
+     * @return 结果
+     */
+    @Override
+    public int insertAppletOrderItem(AppletOrderItem appletOrder)
+    {
+//        appletOrder.setCreateTime(new Date());
+        return appletOrderItemMapper.insertAppletOrderItem(appletOrder);
+    }
+
+    /**
+     * 修改订单信息
+     *
+     * @param appletOrder 订单信息
+     * @return 结果
+     */
+    @Override
+    public int updateAppletOrderItem(AppletOrderItem appletOrder)
+    {
+//        appletOrder.setUpdateTime(DateUtils.getNowDate());
+        return appletOrderItemMapper.updateAppletOrderItem(appletOrder);
+    }
+
+    /**
+     * 批量删除订单信息
+     *
+     * @param ids 需要删除的订单信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAppletOrderItemByIds(Long[] ids)
+    {
+        return appletOrderItemMapper.deleteAppletOrderItemByIds(ids);
+    }
+
+    /**
+     * 删除订单信息信息
+     *
+     * @param id 订单信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAppletOrderItemById(Long id)
+    {
+        return appletOrderItemMapper.deleteAppletOrderItemById(id);
+    }
+}

ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemMapper.xml

@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.model.mapper.AppletOrderItemMapper">
+    
+    <resultMap type="AppletOrderItem" id="AppletOrderItemResult">
+        <result property="id" column="id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="payTime" column="pay_time"/>
+        <result property="status" column="status"/>
+        <result property="price" column="price"/>
+        <result property="address" column="address"/>
+        <result property="type" column="type"/>
+        <result property="reason" column="reason"/>
+        <result property="userId" column="user_id"/>
+        <result property="petId" column="pet_id"/>
+        <result property="num" column="num"/>
+        <result property="userIdJson" column="user_id_json"/>
+        <result property="orderSn" column="order_sn"/>
+        <result property="orderId" column="order_id"/>
+
+    </resultMap>
+
+    <sql id="selectAppletOrderItemVo">
+        select id, create_time, create_by, update_time, update_by, pay_time, status, price, address, type, reason, user_id, pet_id,num,user_id_json,order_id,order_sn  from applet_order_item
+    </sql>
+
+    <select id="selectAppletOrderItemList" parameterType="AppletOrderItem" resultMap="AppletOrderItemResult">
+        <include refid="selectAppletOrderItemVo"/>
+        <where>
+            <if test="payTime != null "> and pay_time = #{payTime}</if>
+            <if test="status != null "> and status = #{status}</if>
+            <if test="price != null "> and price = #{price}</if>
+            <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
+            <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="petId != null "> and pet_id = #{petId}</if>
+            <if test="num != null "> and num = #{num}</if>
+            <if test="userIdJson != null "> and user_id_json = #{userIdJson}</if>
+            <if test="orderSn != null "> and order_sn = #{orderSn}</if>
+            <if test="orderId != null "> and order_id = #{orderId}</if>
+        </where>
+        order by create_time desc
+
+    </select>
+
+    <select id="selectAppletOrderItemListLikeUserIdJson" parameterType="AppletOrderItem" resultMap="AppletOrderItemResult">
+
+        <include refid="selectAppletOrderItemVo"/>
+        <where>
+            <!-- 根据具体需求选择方案 -->
+            <!-- 方案1：自动添加通配符 -->
+           type = #{type} and user_id_json like concat('%', #{userIdJson}, '%')
+
+            <!-- 方案2：使用JSON函数查询（MySQL示例） -->
+            <!-- JSON_CONTAINS(user_id_json, #{userIdJson}) -->
+        </where>
+        order by create_time desc
+
+    </select>
+
+
+
+
+
+
+
+
+
+
+
+
+    
+    <select id="selectAppletOrderItemById" parameterType="AppletOrderItem" resultMap="AppletOrderItemResult">
+        <include refid="selectAppletOrderItemVo"/>
+        where id = #{id}
+    </select>
+
+    <select id="selectAppletOrderItemByOrderId" parameterType="AppletOrderItem" resultMap="AppletOrderItemResult">
+        <include refid="selectAppletOrderItemVo"/>
+        where order_id = #{orderId}
+    </select>
+
+
+
+
+    <insert id="insertAppletOrderItem" parameterType="AppletOrderItem" useGeneratedKeys="true" keyProperty="id">
+        insert into applet_order_item
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="payTime != null">pay_time,</if>
+            <if test="status != null">status,</if>
+            <if test="price != null">price,</if>
+            <if test="address != null">address,</if>
+            <if test="type != null">type,</if>
+            <if test="reason != null">reason,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="petId != null">pet_id,</if>
+            <if test="num != null">num,</if>
+            <if test="userIdJson != null">user_id_json,</if>
+            <if test="orderSn != null">order_sn,</if>
+            <if test="orderId != null">order_id,</if>
+
+
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="payTime != null">#{payTime},</if>
+            <if test="status != null">#{status},</if>
+            <if test="price != null">#{price},</if>
+            <if test="address != null">#{address},</if>
+            <if test="type != null">#{type},</if>
+            <if test="reason != null">#{reason},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="petId != null">#{petId},</if>
+            <if test="num != null">#{num},</if>
+            <if test="userIdJson != null">#{userIdJson},</if>
+            <if test="orderSn != null">#{orderSn},</if>
+            <if test="orderId != null">#{orderId},</if>
+
+
+
+
+        </trim>
+    </insert>
+
+    <update id="updateAppletOrderItem" parameterType="AppletOrderItem">
+        update applet_order_item
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="payTime != null">pay_time = #{payTime},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="reason != null">reason = #{reason},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="petId != null">pet_id = #{petId},</if>
+            <if test="userIdJson != null">user_id_json = #{userIdJson},</if>
+            <if test="orderSn != null">order_sn = #{orderSn},</if>
+            <if test="orderId != null">order_id = #{orderId},</if>
+
+
+
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteAppletOrderItemById" parameterType="Long">
+        delete from applet_order_item where id = #{id}
+    </delete>
+
+    <delete id="deleteAppletOrderItemByIds" parameterType="String">
+        delete from applet_order_item where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>