修复代码

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

@@ -113,12 +113,19 @@
             <span>{{ parseTime(scope.row.payTime, '')}}</span>
         </template>
       </el-table-column>
+      <el-table-column label="关联伴宠师" align="center" prop="userId" />
+      <el-table-column label="订单状态" align="center" prop="status" v-if="columns[2].visible">
+        <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="price" v-if="columns[1].visible"/>
       <el-table-column label="地址" align="center" prop="address" v-if="columns[2].visible"/>
-      <el-table-column label="订单类型" align="center" prop="type" v-if="columns[3].visible"/>
-      <el-table-column label="无法接单原因" align="center" prop="reason" v-if="columns[4].visible"/>
-      <el-table-column label="关联服务者ID" align="center" prop="userId" v-if="columns[5].visible"/>
+<!--      <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="关联宠物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
@@ -158,6 +165,15 @@
                         placeholder="选择支付时间">
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="订单状态" prop="status">
+          <el-select v-model="form.status" placeholder="请选择订单状态">
+            <el-option
+              v-for="dict in dict.type.applet_order_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(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>
@@ -173,6 +189,7 @@
         <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>
@@ -187,6 +204,7 @@ import { listAppletOrder, getAppletOrder, delAppletOrder, addAppletOrder, update
 
 export default {
   name: "AppletOrder",
+  dicts: ['applet_order_status'],
   data() {
     return {
       // 遮罩层
@@ -216,7 +234,7 @@ export default {
         payTime: null,
 
         price: null,
-
+        status: null,
         address: null,
 
         type: null,
@@ -300,7 +318,7 @@ export default {
         updateBy: null,
 
         payTime: null,
-
+        status: null,
         price: null,
 
         address: null,

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

@@ -100,10 +100,10 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="用户标识" prop="userId">
+        <el-form-item label="订单标识" prop="orderId">
           <el-input
-            v-model="queryParams.userId"
-            placeholder="请输入用户标识"
+            v-model="queryParams.orderId"
+            placeholder="请输入订单标识"
             clearable
             size="small"
             @keyup.enter.native="handleQuery"
@@ -234,7 +234,7 @@
           <span>{{ parseTime(scope.row.createTime, '')}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="用户标识" align="center" prop="userId" />
+      <el-table-column label="订单标识" align="center" prop="orderId" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -375,8 +375,8 @@
               :value="parseInt(dict.value)"            ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="用户标识" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入用户标识" />
+        <el-form-item label="用户标识" prop="orderId">
+          <el-input v-model="form.orderId" placeholder="请输入用户标识" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -433,7 +433,7 @@ export default {
         health: null,
         petCard: null,
         healthOther: null,
-        userId: null
+        orderId: null
 
       },
       // 表单参数
@@ -519,7 +519,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
-        userId: null
+        orderId: null
 
       };
       this.resetForm("form");

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

@@ -0,0 +1,108 @@
+package com.ruoyi.applet.contoller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.model.domain.AppletOrder;
+import com.ruoyi.model.domain.AppletOutDate;
+import com.ruoyi.model.domain.AppletPet;
+import com.ruoyi.model.service.IAppletOrderService;
+import com.ruoyi.model.service.IAppletPetService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import static cn.hutool.poi.excel.sax.ElementName.v;
+
+@Api(description = "订单模块 - 接单大厅流程")
+@RestController
+@RequestMapping("/applet/order")
+public class ApiAppletOrderController {
+
+    @Autowired
+    private IAppletOrderService appletOrderService;
+    @Autowired
+    private IAppletPetService appletPetService;
+
+    //接单大厅流程
+    @ApiOperation("小程序-接单大厅流程")
+    @GetMapping("/list")
+    public AjaxResult outDateList(AppletOrder appletOrder){
+        if(appletOrder.getStatus()==null){
+            return AjaxResult.error("status状态不能为空");
+        }
+        if(appletOrder.getUserId() == null){
+            return AjaxResult.error("userId用户信息标识不能为空");
+        }
+        List<AppletOrder> list = appletOrderService.selectAppletOrderList(appletOrder);
+        for(AppletOrder order:list){
+            order.setAppletPetList(appletPetService.selectAppletPetListByOrderId(order.getId()));
+        }
+        return AjaxResult.success("接单大厅数据列表",list);
+    }
+
+
+    //接单大厅 - 根据订单标识查询订单详情的接口
+    @ApiOperation("接单大厅 - 根据订单标识查询订单详情的接口")
+    @GetMapping("/getByOrderId")
+    public AjaxResult getByOrderId(AppletOrder appletOrder){
+        if(appletOrder.getId() == null){
+            return AjaxResult.error("订单标识不能为空");
+        }
+        AppletOrder appletOrder1 = appletOrderService.selectAppletOrderById(appletOrder.getId());
+        appletOrder1.setAppletPetList(appletPetService.selectAppletPetListByOrderId(appletOrder1.getId()));
+        return AjaxResult.success("接单大厅查看详情",appletOrder1);
+    }
+
+
+    //接单大厅 - 拒绝、无法接单
+    @ApiOperation("接单大厅 - 拒绝、无法接单")
+    @PostMapping("/endByOrderId")
+    public AjaxResult endByOrderId(@RequestBody AppletOrder appletOrder){
+        if(appletOrder.getId() == null){
+            return AjaxResult.error("订单标识不能为空");
+        }
+        if(appletOrder.getUserId() == null){
+            return AjaxResult.error("userId用户信息标识不能为空");
+        }
+        if(appletOrder.getReason() == null){
+            return AjaxResult.error("无法接单原因不能为空");
+        }
+        appletOrder.setStatus(2);
+        appletOrderService.updateAppletOrder(appletOrder);
+        return AjaxResult.success("拒单成功",appletOrder);
+    }
+
+
+
+    //接单大厅 - 立即接单
+    @ApiOperation("接单大厅 - 立即接单")
+    @PostMapping("/startByOrderId")
+    public AjaxResult startByOrderId(@RequestBody AppletOrder appletOrder){
+        if(appletOrder.getId() == null){
+            return AjaxResult.error("订单标识不能为空");
+        }
+        if(appletOrder.getUserId() == null){
+            return AjaxResult.error("userId用户信息标识不能为空");
+        }
+        appletOrder.setStatus(1);
+        appletOrderService.updateAppletOrder(appletOrder);
+        return AjaxResult.success("接单成功",appletOrder);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

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

@@ -25,37 +25,55 @@ public class ApiAppletPetController {
     public AjaxResult list(AppletPet appletPet)
     {
         List<AppletPet> list = appletPetService.selectAppletPetList(appletPet);
+
         return AjaxResult.success("查询成功",list);
     }
 
 
-    //增加宠物
-    @ApiOperation("增加宠物")
-    @PostMapping("/add")
-    public AjaxResult add(@RequestBody AppletPet appletPet)
+    @ApiOperation("根据宠物标识查询宠物信息")
+    @GetMapping("/getByPetId")
+    public AjaxResult getByPetId(AppletPet appletPet)
     {
-        int i = appletPetService.insertAppletPet(appletPet);
-        return AjaxResult.success("增加成功");
+        if(appletPet.getId() == null){
+            return AjaxResult.error("标识不能为空");
+        }
+        AppletPet pet = appletPetService.selectAppletPetById(appletPet.getId());
+        return AjaxResult.success("查询成功",pet);
     }
 
 
-    //修改宠物信息
-    @ApiOperation("修改宠物信息")
-    @PostMapping("/edit")
-    public AjaxResult edit(@RequestBody AppletPet appletPet)
-    {
-        int i = appletPetService.updateAppletPet(appletPet);
-        return AjaxResult.success("修改成功");
-    }
 
 
-    //删除宠物信息
-    @ApiOperation("删除宠物信息")
-    @PostMapping("/delete")
-    public AjaxResult delete(@RequestBody AppletPet appletPet)
-    {
-        int i = appletPetService.deleteAppletPetById(appletPet.getId());
-        return AjaxResult.success("删除成功");
-    }
+
+
+//
+//    //增加宠物
+//    @ApiOperation("增加宠物")
+//    @PostMapping("/add")
+//    public AjaxResult add(@RequestBody AppletPet appletPet)
+//    {
+//        int i = appletPetService.insertAppletPet(appletPet);
+//        return AjaxResult.success("增加成功");
+//    }
+//
+//
+//    //修改宠物信息
+//    @ApiOperation("修改宠物信息")
+//    @PostMapping("/edit")
+//    public AjaxResult edit(@RequestBody AppletPet appletPet)
+//    {
+//        int i = appletPetService.updateAppletPet(appletPet);
+//        return AjaxResult.success("修改成功");
+//    }
+//
+//
+//    //删除宠物信息
+//    @ApiOperation("删除宠物信息")
+//    @PostMapping("/delete")
+//    public AjaxResult delete(@RequestBody AppletPet appletPet)
+//    {
+//        int i = appletPetService.deleteAppletPetById(appletPet.getId());
+//        return AjaxResult.success("删除成功");
+//    }
 
 }

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

@@ -3,6 +3,9 @@ package com.ruoyi.model.domain;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -69,8 +72,8 @@ public class AppletOrder {
     @Excel(name = "关联宠物ID")
     private Integer petId;
 
-    /** 订单说明 */
-    @Excel(name = "订单说明")
-    private String describeNo;
+
+    @TableField(exist = false)
+    private List<AppletPet> appletPetList;
 
 }

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

@@ -80,9 +80,9 @@ public class AppletPet {
     @Excel(name = "删除标识")
     private Integer delFlag;
 
-    /** 用户标识 */
-    @Excel(name = "用户标识")
-    private Long userId;
+    /** 订单标识 */
+    @Excel(name = "订单标识")
+    private Long orderId;
 
 
     /** 创建人 */

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

@@ -26,6 +26,7 @@ public interface AppletPetMapper
      * @return 宠物信息集合
      */
     public List<AppletPet> selectAppletPetList(AppletPet appletPet);
+    public List<AppletPet> selectAppletPetListByOrderId(Long orderId);
 
     /**
      * 新增宠物信息

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

@@ -26,7 +26,7 @@ public interface IAppletPetService
      * @return 宠物信息集合
      */
     public List<AppletPet> selectAppletPetList(AppletPet appletPet);
-
+    public List<AppletPet> selectAppletPetListByOrderId(Long orderId);
     /**
      * 新增宠物信息
      * 

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

@@ -45,6 +45,10 @@ public class AppletPetServiceImpl implements IAppletPetService
         return appletPetMapper.selectAppletPetList(appletPet);
     }
 
+    @Override
+    public List<AppletPet> selectAppletPetListByOrderId(Long orderId){
+        return appletPetMapper.selectAppletPetListByOrderId(orderId);
+    }
     /**
      * 新增宠物信息
      * 

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

@@ -18,11 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reason" column="reason"/>
         <result property="userId" column="user_id"/>
         <result property="petId" column="pet_id"/>
-        <result property="describeNo" column="describe_no"/>
+
     </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, describe_no  from applet_order
+        select id, create_time, create_by, update_time, update_by, pay_time, status, price, address, type, reason, user_id, pet_id  from applet_order
     </sql>
 
     <select id="selectAppletOrderList" parameterType="AppletOrder" resultMap="AppletOrderResult">
@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="describeNo != null  and describeNo != ''"> and describe_no = #{describeNo}</if>
+
         </where>
     </select>
     
@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reason != null">reason,</if>
             <if test="userId != null">user_id,</if>
             <if test="petId != null">pet_id,</if>
-            <if test="describe_no != null">describe_no,</if>
+
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reason != null">#{reason},</if>
             <if test="userId != null">#{userId},</if>
             <if test="petId != null">#{petId},</if>
-            <if test="describeNO != null">#{describeNO},</if>
+
         </trim>
     </insert>
 
@@ -96,7 +96,7 @@ 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="describeNO != null">describe_no = #{describeNO},</if>
+
         </trim>
         where id = #{id}
     </update>

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

@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
-        <result property="userId" column="user_id"/>
+        <result property="orderId" column="order_id"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectAppletPetVo">
-        select id, head_image, nick_name, sex, type, birthday, weight, personality, vaccine, deworm, neutered, pet_type, health, pet_card, health_other, del_flag, create_by, create_time, update_by, update_time, user_id , create_by, create_time, update_by, update_time from applet_pet
+        select id, head_image, nick_name, sex, type, birthday, weight, personality, vaccine, deworm, neutered, pet_type, health, pet_card, health_other, del_flag, create_by, create_time, update_by, update_time, order_id , create_by, create_time, update_by, update_time from applet_pet
     </sql>
 
     <select id="selectAppletPetList" parameterType="AppletPet" resultMap="AppletPetResult">
@@ -53,9 +53,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="health != null "> and health = #{health}</if>
             <if test="petCard != null "> and pet_card = #{petCard}</if>
             <if test="healthOther != null  and healthOther != ''"> and health_other = #{healthOther}</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="orderId != null "> and order_id = #{orderId}</if>
         </where>
     </select>
+
+    <select id="selectAppletPetListByOrderId" parameterType="AppletPet" resultMap="AppletPetResult">
+        <include refid="selectAppletPetVo"/>
+        where order_id = #{orderId}
+
+    </select>
+
     
     <select id="selectAppletPetById" parameterType="AppletPet" resultMap="AppletPetResult">
         <include refid="selectAppletPetVo"/>
@@ -85,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-            <if test="userId != null">user_id,</if>
+            <if test="orderId != null">order_id,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -112,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-            <if test="userId != null">#{userId},</if>
+            <if test="orderId != null">#{orderId},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -142,7 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="userId != null">user_id = #{userId},</if>
+            <if test="orderId != null">order_id = #{orderId},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>