feat: 接单，上传装车照片，卸货照片，写评价。

guzijian
1 parent b4baced4
Showing 20 changed files with 602 additions and 18 deletions
trash-garbage/pom.xml
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
trash-garbage/src/main/java/com/trash/garbage/global/GlobalStatus.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderEvaluateMapper.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarAddress.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrder.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderEvaluate.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderImage.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarUser.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/EvaluateDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/OrderDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/OrderUpdateDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/UploadDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailVo.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderEvaluateService.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderEvaluateServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/resources/mapper/GarOrderEvaluateMapper.xml
trash-garbage/src/main/resources/mapper/GarOrderMapper.xml
@@ -19,10 +19,10 @@
             <groupId>com.trash</groupId>
             <artifactId>trash-common</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.trash</groupId>
-            <artifactId>trash-activiti</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.trash</groupId>-->
+<!--            <artifactId>trash-activiti</artifactId>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.trash</groupId>
             <artifactId>trash-framework</artifactId>
@@ -7,13 +7,20 @@ import com.trash.framework.config.ServerConfig;
 import com.trash.garbage.custom.BizException;
 import com.trash.garbage.global.Result;
 import com.trash.garbage.global.ResultCode;
+import com.trash.garbage.pojo.dto.EvaluateDto;
 import com.trash.garbage.pojo.dto.OrderDto;
+import com.trash.garbage.pojo.dto.OrderUpdateDto;
+import com.trash.garbage.pojo.dto.UploadDto;
+import com.trash.garbage.pojo.vo.OrderDetailVo;
 import com.trash.garbage.service.GarOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 /**
  * 订单控制
@@ -30,7 +37,7 @@ public class GarbageOrderController {
     private ServerConfig serverConfig;
     @PostMapping("/add")
-    public Result<?> saveOrder(@RequestBody OrderDto dto) {
+    public Result<?> saveOrder(@Validated @RequestBody OrderDto dto) {
         return Result.OK(garOrderService.saveOrder(dto));
     }
@@ -45,7 +52,36 @@ public class GarbageOrderController {
             throw new BizException(ResultCode.CODE_400, ResultCode.CODE_400.getMsg());
         }
         String url = serverConfig.getUrl() + fileName;
-        return Result.OK("图片上传成功", url);
+        Map<String, String> urlMap = new HashMap<>();
+        urlMap.put("url", url);
+        urlMap.put("fileName", fileName);
+        return Result.OK(urlMap, "图片上传成功");
+    }
+
+    @GetMapping("/detail/{id}")
+    public Result<OrderDetailVo> queryOrderDetail(@PathVariable("id") String id) {
+        return Result.OK(garOrderService.queryOrderDetail(id));
+    }
+
+    @PutMapping("/update")
+    public Result<String> uploadOrder(@RequestBody OrderUpdateDto dto) {
+        return Result.OK(garOrderService.uploadOrder(dto));
+    }
+
+    @PostMapping("/evaluate")
+    public Result<String> evaluateOrder(@Validated @RequestBody EvaluateDto dto) {
+        return Result.OK(garOrderService.evaluateOrder(dto));
+    }
+
+
+    @GetMapping("/query/list")
+    public Result<?> queryOrderList(@RequestParam("type") Integer type, @RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize) {
+        return Result.OK(garOrderService.queryOrderList(type, pageNo, pageSize));
+    }
+
+    @PostMapping("/upload/imageUrl")
+    public Result<?> uploadImageUrlByType(@RequestBody UploadDto dto) {
+        return Result.OK(garOrderService.uploadImageUrlByType(dto));
     }
 }
@@ -42,7 +42,7 @@ public class GlobalStatus {
         private Integer status;
         private String description;
-        public int getStatus() {
+        public Integer getStatus() {
             return this.status;
         }
@@ -85,14 +85,17 @@ public class GlobalStatus {
      */
     public enum GarOrderStatus {
         NEW_ORDER(0, "新订单"),
-        HANDLE_ORDER(1, "被接单"),
-        ACTIVE_ORDER(2, "处理中"),
-        SUCCESS_ORDER(3, "完成订单"),
-        FAIL_ORDER(4, "订单处理失败"),
-        CANCEL_FLAG_NO(0,"未取消订单"),
-        IMAGE_TYPE_CURRENT(0,"现场图片"),
-        IMAGE_TYPE_PUT_ON(1,"装车图片"),
-        IMAGE_TYPE_PUT_DOWN(2,"卸车图片");
+        ACTIVE_ORDER(1, "处理中"),
+        ALL_ORDER(2, "全部订单"),
+        PAY_ORDER(3, "待支付订单"),
+        SUCCESS_ORDER(4, "完成订单"),
+        FAIL_ORDER(9, "订单处理失败"),
+        CANCEL_FLAG_NO(0, "未取消订单"),
+        IMAGE_TYPE_CURRENT(0, "现场图片"),
+        IMAGE_TYPE_PUT_ON(1, "装车图片"),
+        IMAGE_TYPE_PUT_DOWN(2, "卸车图片"),
+        EVALUATE_ORDER_NO(0,"待评价"),
+        EVALUATE_ORDER_YES(1,"已评价");
         GarOrderStatus(Integer status, String description) {
             this.status = status;
+package com.trash.garbage.mapper;
+
+import com.trash.garbage.pojo.domain.GarOrderEvaluate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author 20412
+* @description 针对表【gar_order_evaluate(建筑垃圾-派单评分)】的数据库操作Mapper
+* @createDate 2023-11-29 14:19:18
+* @Entity com.trash.garbage.pojo.domain.GarOrderEvaluate
+*/
+public interface GarOrderEvaluateMapper extends BaseMapper<GarOrderEvaluate> {
+
+}
+
+
+
+
@@ -11,6 +11,7 @@ import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 /**
@@ -49,6 +50,7 @@ public class GarAddress implements Serializable {
      */
     @TableField(fill = FieldFill.INSERT, select = false)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:dd")
     private Date garCreateTime;
     /**
@@ -56,6 +58,7 @@ public class GarAddress implements Serializable {
      */
     @TableField(fill = FieldFill.INSERT_UPDATE, select = false)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:dd")
     private Date garUpdateTime;
     /**
@@ -6,7 +6,9 @@ import java.io.Serializable;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 /**
  * 建筑垃圾—订单表
@@ -24,6 +26,7 @@ public class GarOrder implements Serializable {
     /**
      * 用户id
      */
+    @JsonIgnore
     private String garOrderUserId;
     /**
@@ -86,6 +89,7 @@ public class GarOrder implements Serializable {
      */
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:dd")
     private Date garCreateTime;
     /**
@@ -93,6 +97,7 @@ public class GarOrder implements Serializable {
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:dd")
     private Date garUpdateTime;
     /**
@@ -115,6 +120,11 @@ public class GarOrder implements Serializable {
      * 取消标识
      */
     private Integer garCancelFlag;
+
+    /**
+     * 评分标识
+     */
+    private Integer garEvaluateFlag;
     /**
      * 原因
      */
+package com.trash.garbage.pojo.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 建筑垃圾-派单评分
+ * @author 20412
+ * @TableName gar_order_evaluate
+ */
+@TableName(value ="gar_order_evaluate")
+@Data
+public class GarOrderEvaluate implements Serializable {
+    /**
+     * id
+     */
+    @TableId
+    private String garEvaluateId;
+
+    /**
+     * 订单id
+     */
+    private String garOrderId;
+
+    /**
+     * 公司id
+     */
+    private String garCompanyId;
+
+    /**
+     * 评价内容
+     */
+    private String garEvaluateContent;
+
+    /**
+     * 评分
+     */
+    private Integer garEvaluateScore;
+
+    /**
+     * 修改人
+     */
+    private String garUpdateBy;
+
+    /**
+     * 创建人
+     */
+    private String garCreateBy;
+
+    /**
+     * 修改时间
+     */
+    private Date garUpdateTime;
+
+    /**
+     * 创建时间
+     */
+    private Date garCreateTime;
+
+    /**
+     * 备注
+     */
+    private String garRemark;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}
 \ No newline at end of file
@@ -9,6 +9,7 @@ import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 /**
  * 装修垃圾-订单图片表
@@ -43,6 +44,7 @@ public class GarOrderImage implements Serializable {
      */
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:dd")
     private Date garCreateTime;
     /**
@@ -50,6 +52,7 @@ public class GarOrderImage implements Serializable {
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:dd")
     private Date garUpdateTime;
     /**
@@ -9,6 +9,7 @@ import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 /**
  * 建筑垃圾-用户表
@@ -54,6 +55,7 @@ public class GarUser implements Serializable {
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:dd")
     private Date garCreateTime;
     /**
@@ -61,6 +63,7 @@ public class GarUser implements Serializable {
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:dd")
     private Date garUpdateTime;
     /**
+package com.trash.garbage.pojo.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @author 20412
+ */
+@Data
+public class EvaluateDto {
+    @NotBlank(message = "订单id不能为空")
+    private String orderId;
+    private String garCompanyId;
+    private String content;
+    @NotNull
+    private Integer score;
+    private List<String> imageUrls;
+}
@@ -3,6 +3,8 @@ package com.trash.garbage.pojo.dto;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import java.util.List;
 /**
@@ -15,10 +17,12 @@ public class OrderDto {
     /**
      * 订单地址
      */
+    @NotBlank(message = "地址不能为空")
     private String garOrderAddress;
     /**
      * 图片列表
      */
+    @NotEmpty(message = "必须要有现场图片")
     private List<String> imageUrls;
     /**
      * 订单详细地址
@@ -38,6 +42,7 @@ public class OrderDto {
     /**
      * 订单人电话
      */
+    @NotBlank(message = "电话不能为空")
     private String garOrderContactTel;
     /**
@@ -48,6 +53,7 @@ public class OrderDto {
     /**
      * 公司名称
      */
+    @NotEmpty(message = "公司名称不能为空")
     private String garOrderCompanyName;
     /**
@@ -58,6 +64,7 @@ public class OrderDto {
     /**
      * 约定时间
      */
+    @NotBlank(message = "约定时间不能为空")
     private String garOrderAgreementTime;
     /**
+package com.trash.garbage.pojo.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 20412
+ */
+@Data
+public class OrderUpdateDto {
+
+    /**
+     * 订单id
+     */
+    private String garOrderId;
+
+    /**
+     * 处理类型
+     */
+    private Integer handleType;
+
+    /**
+     * 照片url
+      */
+    private List<String> imageUrls;
+}
+package com.trash.garbage.pojo.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 20412
+ */
+@Data
+public class UploadDto {
+    private String garOrderId;
+    private Integer type;
+    private List<String> imageUrls;
+}
+package com.trash.garbage.pojo.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author 20412
+ */
+@Data
+public class OrderDetailVo {
+
+    private String garOrderHandlerId;
+
+    private Integer garEvaluateFlag;
+    /**
+     * 订单地址
+     */
+    private String garOrderAddress;
+    /**
+     * 现场图片图片列表
+     */
+    private List<String> currentImages;
+    /**
+     * 装车图片
+     */
+    private List<String> putOnImages;
+    /**
+     * 卸车图片
+     */
+    private List<String> putDownImages;
+    /**
+     * 订单详细地址
+     */
+    private String garOrderAddressDetails;
+
+    /**
+     * 订单姓名
+     */
+    private String garOrderContactName;
+
+    /**
+     * 垃圾类型
+     */
+    private String garOrderTrashType;
+
+    /**
+     * 订单状态
+     */
+    private Integer garOrderHandlerStatus;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
+    private Date garCreateTime;
+
+    /**
+     * 订单人电话
+     */
+    private String garOrderContactTel;
+
+    /**
+     * 承接经营单位
+     */
+    private String garOrderCompanyId;
+
+    /**
+     * 公司名称
+     */
+    private String garOrderCompanyName;
+
+    /**
+     * 公司负责人电话
+     */
+    private String garOrderCompanyTel;
+
+    /**
+     * 约定时间
+     */
+    private String garOrderAgreementTime;
+
+    /**
+     * 备注
+     */
+    private String garRemark;
+
+    public OrderDetailVo(){
+        this.currentImages = new ArrayList<>();
+        this.putDownImages = new ArrayList<>();
+        this.putOnImages = new ArrayList<>();
+    }
+
+}
+package com.trash.garbage.service;
+
+import com.trash.garbage.pojo.domain.GarOrderEvaluate;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author 20412
+* @description 针对表【gar_order_evaluate(建筑垃圾-派单评分)】的数据库操作Service
+* @createDate 2023-11-29 14:19:18
+*/
+public interface GarOrderEvaluateService extends IService<GarOrderEvaluate> {
+
+}
 package com.trash.garbage.service;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.pagehelper.PageInfo;
 import com.trash.garbage.pojo.domain.GarOrder;
+import com.trash.garbage.pojo.dto.EvaluateDto;
 import com.trash.garbage.pojo.dto.OrderDto;
+import com.trash.garbage.pojo.dto.OrderUpdateDto;
+import com.trash.garbage.pojo.dto.UploadDto;
+import com.trash.garbage.pojo.vo.OrderDetailVo;
+
+import java.util.List;
 /**
 * @author 20412
@@ -17,4 +24,37 @@ public interface GarOrderService extends IService&lt;GarOrder&gt; {
      * @return
      */
     String saveOrder(OrderDto dto);
+
+    /**
+     * 根据id查询订单详情
+     * @param id
+     * @return
+     */
+    OrderDetailVo queryOrderDetail(String id);
+
+    /**
+     * 根据类型查询订单
+     *
+     * @param type
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    PageInfo queryOrderList(Integer type, Integer pageNo, Integer pageSize);
+
+    /**
+     * 修改订单状态
+     * @param dto
+     * @return
+     */
+    String uploadOrder(OrderUpdateDto dto);
+
+    /**
+     * 上传图片url执行图片type
+     * @param dto
+     * @return
+     */
+    String uploadImageUrlByType(UploadDto dto);
+
+    String evaluateOrder(EvaluateDto dto);
 }
+package com.trash.garbage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.trash.garbage.pojo.domain.GarOrderEvaluate;
+import com.trash.garbage.service.GarOrderEvaluateService;
+import com.trash.garbage.mapper.GarOrderEvaluateMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author 20412
+* @description 针对表【gar_order_evaluate(建筑垃圾-派单评分)】的数据库操作Service实现
+* @createDate 2023-11-29 14:19:18
+*/
+@Service
+public class GarOrderEvaluateServiceImpl extends ServiceImpl<GarOrderEvaluateMapper, GarOrderEvaluate>
+    implements GarOrderEvaluateService{
+
+}
+
+
+
+
 package com.trash.garbage.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.bean.BeanUtils;
 import com.trash.garbage.global.GlobalStatus;
 import com.trash.garbage.pojo.domain.GarOrder;
+import com.trash.garbage.pojo.domain.GarOrderEvaluate;
+import com.trash.garbage.pojo.domain.GarOrderImage;
+import com.trash.garbage.pojo.domain.GarUser;
+import com.trash.garbage.pojo.dto.EvaluateDto;
 import com.trash.garbage.pojo.dto.OrderDto;
+import com.trash.garbage.pojo.dto.OrderUpdateDto;
+import com.trash.garbage.pojo.dto.UploadDto;
+import com.trash.garbage.pojo.vo.OrderDetailVo;
+import com.trash.garbage.service.GarOrderEvaluateService;
 import com.trash.garbage.service.GarOrderImageService;
 import com.trash.garbage.service.GarOrderService;
 import com.trash.garbage.mapper.GarOrderMapper;
+import com.trash.garbage.service.GarUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author 20412
  * @description 针对表【gar_order(建筑垃圾—订单表)】的数据库操作Service实现
@@ -26,6 +42,12 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     @Autowired
     private GarOrderImageService garOrderImageService;
+    @Autowired
+    private GarOrderEvaluateService garOrderEvaluateService;
+
+    @Autowired
+    private GarUserService garUserService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String saveOrder(OrderDto dto) {
@@ -37,9 +59,155 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         order.setGarCancelFlag(GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
         save(order);
         // 保存图片url
+        List<String> imageUrls = dto.getImageUrls();
+        List<GarOrderImage> images = new ArrayList<>(imageUrls.size());
+        for (String imageUrl : imageUrls) {
+            GarOrderImage image = new GarOrderImage();
+            image.setGarOrderId(order.getGarOrderId());
+            image.setGarOrderImageUrl(imageUrl);
+            image.setGarOrderImageType(GlobalStatus.GarOrderStatus.IMAGE_TYPE_CURRENT.getValue());
+            images.add(image);
+        }
+        garOrderImageService.saveBatch(images);
+        return order.getGarOrderId();
+    }
+
+    @Override
+    public OrderDetailVo queryOrderDetail(String id) {
+        GarOrder order = this.getById(id);
+        LambdaQueryWrapper<GarOrderImage> qwi = new LambdaQueryWrapper<>();
+        qwi.eq(GarOrderImage::getGarOrderId, id);
+        OrderDetailVo vo = new OrderDetailVo();
+        BeanUtils.copyBeanProp(vo, order);
+        List<GarOrderImage> imageList = garOrderImageService.list(qwi);
+        for (GarOrderImage image : imageList) {
+            if (GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue().equals(image.getGarOrderImageType())) {
+                vo.getCurrentImages().add(image.getGarOrderImageUrl());
+            }
+            if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_ON.getValue().equals(image.getGarOrderImageType())) {
+                vo.getPutOnImages().add(image.getGarOrderImageUrl());
+            }
+            if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_DOWN.getValue().equals(image.getGarOrderImageType())) {
+                vo.getPutDownImages().add(image.getGarOrderImageUrl());
+            }
+        }
+        return vo;
+    }
+
+    @Override
+    public PageInfo queryOrderList(Integer type, Integer pageNo, Integer pageSize) {
+        String userId = SecurityUtils.getLoginUser().getUser().getUserId();
+        GarUser user = garUserService.getById(userId);
+        // TODO 区分用户类型
+        // 判断用户类型 普通用户
+        if (GlobalStatus.UserStatusEnum.NORMAL_USER.getDescription().equals(user.getGarUserType())) {
+            // 待清运 || 清运中 || 已完成 || 待支付
+            if (GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(type)
+                    || GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(type)
+                    || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)
+                    || GlobalStatus.GarOrderStatus.PAY_ORDER.getValue().equals(type)) {
+                LambdaQueryWrapper<GarOrder> qw = new LambdaQueryWrapper<>();
+                qw.eq(GarOrder::getGarOrderUserId, userId)
+                        .eq(GarOrder::getGarOrderHandlerStatus, type)
+                        .orderByAsc(GarOrder::getGarEvaluateFlag);
+                PageHelper.startPage(pageNo, pageSize);
+                List<GarOrder> orderList = list(qw);
+                PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
+                return pageInfo;
+            }
+            // 全部
+            if (GlobalStatus.GarOrderStatus.ALL_ORDER.getValue().equals(type)) {
+                LambdaQueryWrapper<GarOrder> qw = new LambdaQueryWrapper<>();
+                qw.eq(GarOrder::getGarOrderUserId, userId)
+                        .orderByAsc(GarOrder::getGarEvaluateFlag, GarOrder::getGarOrderHandlerStatus);
+                PageHelper.startPage(pageNo, pageSize);
+                List<GarOrder> orderList = list(qw);
+                PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
+                return pageInfo;
+            }
+
+        } else {
+            // TODO
+
+        }
+
+        return null;
+    }
+
+    @Override
+    public String uploadOrder(OrderUpdateDto dto) {
+        GarOrder order = getById(dto.getGarOrderId());
+        String userId = SecurityUtils.getLoginUser().getUser().getUserId();
+        GarUser user = garUserService.getById(userId);
+        // 运输员操作 TODO 公司所属 待清运- 》 清运中
+        if (order.getGarOrderHandlerStatus().equals(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue())
+                || GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(dto.getHandleType())) {
+            LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();
+            uw.eq(GarOrder::getGarOrderId, dto.getGarOrderId())
+                    .set(GarOrder::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue())
+                    .set(GarOrder::getGarOrderHandlerId, userId);
+            update(uw);
+            return "准备清运";
+        }
+        // 运输员操作 清运中 ==》待支付 TODO
+        if (GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(order.getGarOrderHandlerStatus())
+                && GlobalStatus.GarOrderStatus.PAY_ORDER.getValue().equals(dto.getHandleType())) {
+            LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();
+            uw.eq(GarOrder::getGarOrderId, dto.getGarOrderId())
+                    .set(GarOrder::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.PAY_ORDER.getValue());
+            update(uw);
+        }
+
+        // 用户确认 待支付 ==》已完成
+        if (GlobalStatus.GarOrderStatus.PAY_ORDER.getValue().equals(order.getGarOrderHandlerStatus())
+                && GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(dto.getHandleType())) {
+            LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();
+            uw.eq(GarOrder::getGarOrderId, dto.getGarOrderId())
+                    .set(GarOrder::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue())
+                    .set(GarOrder::getGarEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue());
+            update(uw);
+            // 修改评价状态
+        }
+        return "";
+    }
+
+    @Override
+    public String uploadImageUrlByType(UploadDto dto) {
+        List<GarOrderImage> garOrderImages = new ArrayList<>(dto.getImageUrls().size());
+        for (String imageUrl : dto.getImageUrls()) {
+            GarOrderImage orderImage = new GarOrderImage();
+            orderImage.setGarOrderId(dto.getGarOrderId());
+            orderImage.setGarOrderImageUrl(imageUrl);
+            orderImage.setGarOrderImageType(dto.getType());
+            garOrderImages.add(orderImage);
+        }
+        garOrderImageService.saveBatch(garOrderImages);
+        return "上传成功！";
+    }
+
+    @Override
+    public String evaluateOrder(EvaluateDto dto) {
+        String userId = SecurityUtils.getLoginUser().getUser().getUserId();
+        GarUser user = garUserService.getById(userId);
+        GarOrder order = getById(dto.getOrderId());
+        // TODO 用户评价
+        if (GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(order.getGarOrderHandlerStatus())) {
+            evaluate(dto, order);
+        }
+        return "已评价";
+    }
-//        garOrderImageService.save();
-        return "订单创建成功";
+    private void evaluate(EvaluateDto dto, GarOrder order) {
+        GarOrderEvaluate evaluate = new GarOrderEvaluate();
+        evaluate.setGarOrderId(order.getGarOrderId());
+        evaluate.setGarEvaluateContent(dto.getContent());
+        evaluate.setGarEvaluateScore(dto.getScore());
+        garOrderEvaluateService.save(evaluate);
+        // 修改订单评价状态
+        LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();
+        uw.eq(GarOrder::getGarOrderId, order.getGarOrderId())
+                .set(GarOrder::getGarEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_YES.getValue());
+        update(uw);
     }
 }
+<?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.trash.garbage.mapper.GarOrderEvaluateMapper">
+
+    <resultMap id="BaseResultMap" type="com.trash.garbage.pojo.domain.GarOrderEvaluate">
+            <id property="garEvaluateId" column="gar_evaluate_id" jdbcType="VARCHAR"/>
+            <result property="garEvaluateContent" column="gar_evaluate_content" jdbcType="VARCHAR"/>
+            <result property="garOrderId" column="gar_order_id" jdbcType="VARCHAR"/>
+            <result property="garEvaluateScore" column="gar_evaluate_score" jdbcType="TINYINT"/>
+            <result property="garUpdateBy" column="gar_update_by" jdbcType="VARCHAR"/>
+            <result property="garCreateBy" column="gar_create_by" jdbcType="VARCHAR"/>
+            <result property="garUpdateTime" column="gar_update_time" jdbcType="TIMESTAMP"/>
+            <result property="garCreateTime" column="gar_create_time" jdbcType="TIMESTAMP"/>
+            <result property="garRemark" column="gar_remark" jdbcType="VARCHAR"/>
+            <result property="garCompanyId" column="gar_company_id" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        gar_evaluate_id,gar_evaluate_content,gar_evaluate_score,
+        gar_update_by,gar_create_by,gar_update_time,
+        gar_create_time,gar_remark,gar_order_id,gar_company_id
+    </sql>
+</mapper>
@@ -25,6 +25,7 @@
         <result property="garRemark" column="gar_remark" jdbcType="VARCHAR"/>
         <result property="garReason" column="gar_reason" jdbcType="VARCHAR"/>
         <result property="garCancelFlag" column="gar_cancel_flag" jdbcType="TINYINT"/>
+        <result property="garEvaluateFlag" column="gar_evaluate_flag" jdbcType="TINYINT"/>
     </resultMap>
     <sql id="Base_Column_List">
@@ -34,6 +35,6 @@
         gar_order_trash_type,gar_order_contact_tel,gar_order_company_id,
         gar_order_company_name,gar_order_company_tel,gar_order_hander_status,
         gar_order_agreement_time,gar_create_time,gar_update_time,
-        gar_create_by,gar_update_by,gar_remark,gar_reason,gar_cancel_flag
+        gar_create_by,gar_update_by,gar_remark,gar_reason,gar_cancel_flag,gar_evaluate_flag
     </sql>
 </mapper>