From be8102558bc04332f3f1b4acb953799bbc2407e8 Mon Sep 17 00:00:00 2001
From: lzx_win <2602107437@qq.com>
Date: Wed, 9 Apr 2025 04:00:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/model/AppletOrder/index.vue          |  4 +-
 .../src/views/model/AppletOrderItem/index.vue      | 94 +++++++++++++++-------
 .../java/com/ruoyi/model/domain/AppletOrder.java   |  2 +-
 .../com/ruoyi/model/domain/AppletOrderItem.java    |  2 +-
 .../mapper/model/AppletOrderItemMapper.xml         | 63 ++++++++++++---
 .../resources/mapper/model/AppletOrderMapper.xml   |  9 ++-
 6 files changed, 128 insertions(+), 46 deletions(-)

diff --git a/CatmDogd-Mall-Front-test/src/views/model/AppletOrder/index.vue b/CatmDogd-Mall-Front-test/src/views/model/AppletOrder/index.vue
index 9e14f5b..51daf10 100644
--- a/CatmDogd-Mall-Front-test/src/views/model/AppletOrder/index.vue
+++ b/CatmDogd-Mall-Front-test/src/views/model/AppletOrder/index.vue
@@ -43,10 +43,10 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="订单状态" prop="type">
+      <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-select v-model="queryParams.status" placeholder="请选择接单状态" clearable size="small">
           <el-option
             v-for="dict in dict.type.applet_order_status"
             :key="dict.value"
diff --git a/CatmDogd-Mall-Front-test/src/views/model/AppletOrderItem/index.vue b/CatmDogd-Mall-Front-test/src/views/model/AppletOrderItem/index.vue
index 67267bf..8f587cb 100644
--- a/CatmDogd-Mall-Front-test/src/views/model/AppletOrderItem/index.vue
+++ b/CatmDogd-Mall-Front-test/src/views/model/AppletOrderItem/index.vue
@@ -12,15 +12,24 @@
 <!--            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="phone">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入伴宠师电话"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+        <el-form-item label="伴宠师姓名" prop="name">
+          <el-input
+            v-model="queryParams.name"
+            placeholder="请输入伴宠师姓名"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+      </el-form-item>
 <!--      <el-form-item label="地址" prop="address">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.address"-->
@@ -43,10 +52,10 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="订单状态" prop="type">
+      <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-select v-model="queryParams.status" placeholder="请选择接单状态" clearable size="small">
           <el-option
             v-for="dict in dict.type.applet_order_status"
             :key="dict.value"
@@ -55,6 +64,18 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="订单状态" prop="orderStatus">
+        <!--        <el-select v-model="queryParams.status" placeholder="请选择订单状态" clearable size="small">-->
+        <!--        </el-select>-->
+        <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.applet_order_my_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"
@@ -154,6 +175,7 @@
           <dict-tag :options="dict.type.applet_order_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
+      <el-table-column label="无法接单原因" align="center" prop="reason"/>
       <el-table-column label="接单时间" align="center" prop="startTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime, '')}}</span>
@@ -173,7 +195,7 @@
 
       <el-table-column label="订单状态" align="center" prop="orderStatus">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.applet_order_status" :value="scope.row.orderStatus"/>
+          <dict-tag :options="dict.type.applet_order_my_status" :value="scope.row.orderStatus"/>
         </template>
       </el-table-column>
       <el-table-column label="订单支付金额" align="center" prop="price" />
@@ -182,20 +204,20 @@
       <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">
+
+      <el-table-column label="确认服务日期" align="center" prop="isDate" >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.applet_order_status" :value="scope.row.orderStatus"/>
+          <dict-tag :options="dict.type.applet_yes_no" :value="scope.row.isDate"/>
         </template>
       </el-table-column>
-      <el-table-column label="确认服务地址" align="center" prop="orderStatus">
+      <el-table-column label="确认服务地址" align="center" prop="isAddress">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.applet_order_status" :value="scope.row.orderStatus"/>
+          <dict-tag :options="dict.type.applet_yes_no" :value="scope.row.isAddress"/>
         </template>
       </el-table-column>
-      <el-table-column label="确认服务宠物" align="center" prop="orderStatus">
+      <el-table-column label="确认宠物信息" align="center" prop="isPet" >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.applet_order_status" :value="scope.row.orderStatus"/>
+          <dict-tag :options="dict.type.applet_yes_no" :value="scope.row.isPet"/>
         </template>
       </el-table-column>
 
@@ -203,13 +225,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:AppletOrderItem:edit']"
-          >修改</el-button>
+<!--          <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"
@@ -282,7 +304,7 @@ import { listAppletOrderItem, getAppletOrderItem, delAppletOrderItem, addAppletO
 
 export default {
   name: "AppletOrderItem",
-  dicts: ['applet_order_status','applet_order_type'],
+  dicts: ['applet_order_status','applet_order_type','applet_order_my_status', 'applet_yes_no'],
   data() {
     return {
       // 遮罩层
@@ -326,6 +348,15 @@ export default {
         userIdJson: null,
         orderSn:null,
         orderId: null,
+        startTime: null,
+        name: null,
+        phone: null,
+        orderStatus: null,
+        orderGiveProportion: null,
+        orderGivePrice: null,
+        isDate: null,
+        isAddress: null,
+        isPet: null
       },
       // 表单参数
       form: {},
@@ -415,6 +446,15 @@ export default {
         userIdJson: null,
         orderSn:null,
         orderId: null,
+        startTime: null,
+        name: null,
+        phone: null,
+        orderStatus: null,
+        orderGiveProportion: null,
+        orderGivePrice: null,
+        isDate: null,
+        isAddress: null,
+        isPet: null
       };
       this.resetForm("form");
     },
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrder.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrder.java
index 6deeb2d..99ed9e6 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrder.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrder.java
@@ -84,7 +84,7 @@ public class AppletOrder {
 
     private Long orderId;
     private String orderSn;
-
+    private Integer orderTime;
 
     @TableField(exist = false)
     private H5OrderVO h5OrderVO;
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderItem.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderItem.java
index 6fdbb03..3a6ff61 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderItem.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderItem.java
@@ -92,7 +92,7 @@ public class AppletOrderItem {
     @TableField(exist = false)
     private ManagerOrderDetailVO managerOrderDetailVO;
 
-    
+
 
     /** 接单时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemMapper.xml b/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemMapper.xml
index 7ac082d..575bfcf 100644
--- a/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemMapper.xml
+++ b/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemMapper.xml
@@ -22,13 +22,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="userIdJson" column="user_id_json"/>
         <result property="orderSn" column="order_sn"/>
         <result property="orderId" column="order_id"/>
+        <result property="startTime" column="start_time"/>
+        <result property="name" column="name"/>
+        <result property="phone" column="phone"/>
+        <result property="orderStatus" column="order_status"/>
+        <result property="orderGiveProportion" column="order_give_proportion"/>
+        <result property="orderGivePrice" column="order_give_price"/>
+        <result property="isDate" column="is_date"/>
+        <result property="isAddress" column="is_address"/>
+        <result property="isPet" column="is_pet"/>
 
     </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
+        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_sn, order_id, start_time, name, phone, order_status, order_give_proportion, order_give_price, is_date, is_address, is_pet  from applet_order_item
     </sql>
 
+
     <select id="selectAppletOrderItemList" parameterType="AppletOrderItem" resultMap="AppletOrderItemResult">
         <include refid="selectAppletOrderItemVo"/>
         <where>
@@ -41,9 +51,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="userIdJson != null  and userIdJson != ''"> and user_id_json = #{userIdJson}</if>
+            <if test="orderSn != null  and orderSn != ''"> and order_sn = #{orderSn}</if>
             <if test="orderId != null "> and order_id = #{orderId}</if>
+            <if test="startTime != null "> and start_time = #{startTime}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="orderStatus != null "> and order_status = #{orderStatus}</if>
+            <if test="orderGiveProportion != null "> and order_give_proportion = #{orderGiveProportion}</if>
+            <if test="orderGivePrice != null "> and order_give_price = #{orderGivePrice}</if>
+            <if test="isDate != null "> and is_date = #{isDate}</if>
+            <if test="isAddress != null "> and is_address = #{isAddress}</if>
+            <if test="isPet != null "> and is_pet = #{isPet}</if>
         </where>
         order by create_time desc
 
@@ -109,8 +128,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userIdJson != null">user_id_json,</if>
             <if test="orderSn != null">order_sn,</if>
             <if test="orderId != null">order_id,</if>
-
-
+            <if test="startTime != null">start_time,</if>
+            <if test="name != null">name,</if>
+            <if test="phone != null">phone,</if>
+            <if test="orderStatus != null">order_status,</if>
+            <if test="orderGiveProportion != null">order_give_proportion,</if>
+            <if test="orderGivePrice != null">order_give_price,</if>
+            <if test="isDate != null">is_date,</if>
+            <if test="isAddress != null">is_address,</if>
+            <if test="isPet != null">is_pet,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -130,11 +156,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userIdJson != null">#{userIdJson},</if>
             <if test="orderSn != null">#{orderSn},</if>
             <if test="orderId != null">#{orderId},</if>
-
-
-
-
+            <if test="startTime != null">#{startTime},</if>
+            <if test="name != null">#{name},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="orderStatus != null">#{orderStatus},</if>
+            <if test="orderGiveProportion != null">#{orderGiveProportion},</if>
+            <if test="orderGivePrice != null">#{orderGivePrice},</if>
+            <if test="isDate != null">#{isDate},</if>
+            <if test="isAddress != null">#{isAddress},</if>
+            <if test="isPet != null">#{isPet},</if>
         </trim>
+
     </insert>
 
     <update id="updateAppletOrderItem" parameterType="AppletOrderItem">
@@ -152,12 +184,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="num != null">num = #{num},</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>
-
-
-
+            <if test="startTime != null">start_time = #{startTime},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="orderStatus != null">order_status = #{orderStatus},</if>
+            <if test="orderGiveProportion != null">order_give_proportion = #{orderGiveProportion},</if>
+            <if test="orderGivePrice != null">order_give_price = #{orderGivePrice},</if>
+            <if test="isDate != null">is_date = #{isDate},</if>
+            <if test="isAddress != null">is_address = #{isAddress},</if>
+            <if test="isPet != null">is_pet = #{isPet},</if>
         </trim>
         where id = #{id}
     </update>
diff --git a/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderMapper.xml b/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderMapper.xml
index add3633..4175312 100644
--- a/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderMapper.xml
+++ b/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderMapper.xml
@@ -22,11 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="userIdJson" column="user_id_json"/>
         <result property="orderSn" column="order_sn"/>
         <result property="orderId" column="order_id"/>
+        <result property="orderTime" column="order_time"/>
 
     </resultMap>
 
     <sql id="selectAppletOrderVo">
-        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
+        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,order_time  from applet_order
     </sql>
 
     <select id="selectAppletOrderList" parameterType="AppletOrder" resultMap="AppletOrderResult">
@@ -44,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
+            <if test="orderTime != null "> and order_time = #{orderTime}</if>
         </where>
         order by create_time desc
 
@@ -109,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userIdJson != null">user_id_json,</if>
             <if test="orderSn != null">order_sn,</if>
             <if test="orderId != null">order_id,</if>
+            <if test="orderTime != null">order_time,</if>
 
 
         </trim>
@@ -130,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userIdJson != null">#{userIdJson},</if>
             <if test="orderSn != null">#{orderSn},</if>
             <if test="orderId != null">#{orderId},</if>
-
+            <if test="orderTime != null">#{orderTime},</if>
 
 
 
@@ -155,7 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
-
+            <if test="orderTime != null"> order_time = #{orderTime},</if>
 
 
         </trim>