youxiw2000 / trash · Commits

Commit f2ac3c9eff8509d3ecb61eb99530e00797c1c2e8

Authored by youxiw2000
2 parents 7b9d15ad c1517f06
build: skipped

Merge branch 'dev' of http://61.169.120.202:8888/youxiw20000/trash into dev

Inline Side-by-side
Showing 26 changed files with 1134 additions and 375 deletions
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
  View file @f2ac3c9
... ... @@ -47,6 +47,7 @@ public class GarbageOrderController {
47 47 private ServerConfig serverConfig;
48 48  
49 49 @PostMapping("/add")
  50 + @Log(title = "创建派单", businessType = BusinessType.INSERT)
50 51 public Result<?> saveOrder(@Validated @RequestBody OrderDto dto) {
51 52 return Result.OK(garOrderService.saveOrder(dto));
52 53 }
... ... @@ -74,11 +75,13 @@ public class GarbageOrderController {
74 75 }
75 76  
76 77 @PutMapping("/update")
  78 + @Log(title = "修改订单状态", businessType = BusinessType.UPDATE)
77 79 public Result<String> uploadOrder(@RequestBody OrderUpdateDto dto) {
78 80 return Result.OK(garOrderService.uploadOrder(dto));
79 81 }
80 82  
81 83 @PostMapping("/evaluate")
  84 + @Log(title = "用户评价", businessType = BusinessType.INSERT)
82 85 public Result<String> evaluateOrder(@Validated @RequestBody EvaluateDto dto) {
83 86 return Result.OK(garOrderService.evaluateOrder(dto));
84 87 }
... ... @@ -89,6 +92,18 @@ public class GarbageOrderController {
89 92 return Result.OK(garOrderService.queryOrderList(type, pageNo, pageSize));
90 93 }
91 94  
  95 + @PutMapping("/dispatch")
  96 + public Result<?> dispatchOrders(@RequestBody DispatchDto dto){
  97 + garOrderService.dispatchOrder(dto);
  98 + return Result.OK();
  99 + }
  100 +
  101 + @GetMapping("/queryDispatch/{orderId}")
  102 + public Result<?> queryDispatch(@PathVariable("orderId") String orderId){
  103 + return Result.OK(garOrderService.queryDispatch(orderId));
  104 + }
  105 +
  106 +
92 107 @PostMapping("/upload/imageUrl")
93 108 public Result<?> uploadImageUrlByType(@RequestBody UploadDto dto) {
94 109 return Result.OK(garOrderService.uploadImageUrlByType(dto));
... ...
trash-garbage/src/main/java/com/trash/garbage/custom/BizException.java
  View file @f2ac3c9
... ... @@ -39,4 +39,9 @@ public class BizException extends RuntimeException{
39 39 this.code = code;
40 40 this.msg = msg;
41 41 }
  42 +
  43 + public BizException(ResultCode code){
  44 + this.code = code;
  45 + this.msg = code.getMsg();
  46 + }
42 47 }
... ...
trash-garbage/src/main/java/com/trash/garbage/global/GlobalStatus.java
  View file @f2ac3c9
... ... @@ -37,7 +37,8 @@ public class GlobalStatus {
37 37 */
38 38 NORMAL_LOGIN(0, "普通登录"),
39 39 NORMAL_USER(0, "居民用户"),
40   - DRIVER_USER(1, "司机");
  40 + DRIVER_USER(1, "运输驾驶员"),
  41 + RESPONSIBLE_USER(2, "企业负责人");
41 42  
42 43 private Integer status;
43 44 private String description;
... ... @@ -89,6 +90,13 @@ public class GlobalStatus {
89 90 ALL_ORDER(2, "全部订单"),
90 91 SUCCESS_ORDER(3, "已完成"),
91 92 FAIL_ORDER(9, "订单处理失败"),
  93 + MATCH_NO(0,"未分配"),
  94 + MATCH_YES(1,"已分配"),
  95 + DISPATCH_HANDLE_NEW(0,"未接受"),
  96 + DISPATCH_HANDLE_ACTIVE(1,"已接受"),
  97 + DISPATCH_HANDLE_SUCCESS(3,"已完成"),
  98 + PLAN_CAR_TYPE(0,"预计车辆"),
  99 + REAL_CAR_TYPE(1,"实际车辆"),
92 100 CANCEL_FLAG_NO(0, "未取消订单"),
93 101 CANCEL_FLAG_YES(1, "取消订单"),
94 102 IMAGE_TYPE_CURRENT(0, "现场图片"),
... ...
trash-garbage/src/main/java/com/trash/garbage/handle/HandleException.java
  View file @f2ac3c9
... ... @@ -2,17 +2,33 @@ package com.trash.garbage.handle;
2 2  
3 3 import com.trash.garbage.custom.BizException;
4 4 import com.trash.garbage.global.Result;
  5 +//import org.springframework.core.annotation.Order;
  6 +import com.trash.garbage.global.ResultCode;
  7 +import org.springframework.core.Ordered;
  8 +import org.springframework.core.annotation.Order;
5 9 import org.springframework.web.bind.annotation.ExceptionHandler;
6 10 import org.springframework.web.bind.annotation.RestControllerAdvice;
7 11  
  12 +import java.sql.SQLIntegrityConstraintViolationException;
  13 +
8 14 /**
9 15 * @author 20412
10 16 */
11   -@RestControllerAdvice
  17 +@RestControllerAdvice(basePackages = {"com.trash.garbage.controller"})
  18 +// 多个RestControllerAdvice注解是需要注意是否有兜底得处理方法 RestControllerAdvice注解有优先级
  19 +@Order(Ordered.HIGHEST_PRECEDENCE)
12 20 public class HandleException {
13 21  
14 22 @ExceptionHandler(BizException.class)
15 23 public Result<?> handleBizException(BizException e) {
16 24 return Result.ERROR(e.getCode(), e.getMsg());
17 25 }
  26 +
  27 +
  28 + @ExceptionHandler(SQLIntegrityConstraintViolationException.class)
  29 + public Result<?> handleSqlDuplicate(SQLIntegrityConstraintViolationException e) {
  30 + String message = e.getMessage();
  31 + String str = message.split(" ")[2];
  32 + return Result.ERROR(ResultCode.CODE_500, "已经下发给:" + str.substring(str.lastIndexOf("-")));
  33 + }
18 34 }
... ...
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderCarMapper.java 0 → 100644
  View file @f2ac3c9
  1 +package com.trash.garbage.mapper;
  2 +
  3 +import com.trash.garbage.pojo.domain.GarOrderCar;
  4 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  5 +
  6 +/**
  7 +* @author 20412
  8 +* @description 针对表【gar_order_car(派单车辆信息)】的数据库操作Mapper
  9 +* @createDate 2024-01-09 14:26:09
  10 +* @Entity com.trash.garbage.pojo.domain.GarOrderCar
  11 +*/
  12 +public interface GarOrderCarMapper extends BaseMapper<GarOrderCar> {
  13 +
  14 +}
  15 +
  16 +
  17 +
  18 +
... ...
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMapper.java
  View file @f2ac3c9
... ... @@ -15,6 +15,8 @@ import java.util.List;
15 15 public interface GarOrderMapper extends BaseMapper<GarOrder> {
16 16  
17 17 List<GarOrder> queryCleanNumberByEnterpriseIds(@Param("list") List<Long> enterpriseIds,@Param("status") Integer value);
  18 +
  19 + List<GarOrder> queryOrderListByTelWithType(@Param("garUserTel") String garUserTel, @Param("type") Integer type,@Param("cancelFlag") Integer value);
18 20 }
19 21  
20 22  
... ...
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMatchHandlerMapper.java 0 → 100644
  View file @f2ac3c9
  1 +package com.trash.garbage.mapper;
  2 +
  3 +import com.trash.garbage.pojo.domain.GarOrderMatchHandler;
  4 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  5 +
  6 +/**
  7 +* @author 20412
  8 +* @description 针对表【gar_order_match_handler(派单分发处理表)】的数据库操作Mapper
  9 +* @createDate 2024-01-09 14:26:09
  10 +* @Entity com.trash.garbage.pojo.domain.GarOrderMatchHandler
  11 +*/
  12 +public interface GarOrderMatchHandlerMapper extends BaseMapper<GarOrderMatchHandler> {
  13 +
  14 +}
  15 +
  16 +
  17 +
  18 +
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrder.java
  View file @f2ac3c9
... ... @@ -42,16 +42,6 @@ public class GarOrder implements Serializable {
42 42 private String garOrderHandlerId;
43 43  
44 44 /**
45   - * 车辆数量
46   - */
47   - private Integer garOrderCarNumber;
48   -
49   - /**
50   - * 车子类型
51   - */
52   - private String garOrderCarType;
53   -
54   - /**
55 45 * 订单地址
56 46 */
57 47 private String garOrderAddress;
... ... @@ -138,7 +128,20 @@ public class GarOrder implements Serializable {
138 128 */
139 129 private Integer garCancelFlag;
140 130  
141   - /**
  131 + /**
  132 + * 分配标识
  133 + */
  134 + private Integer garOrderMatchFlag;
  135 +
  136 + public Integer getGarOrderMatchFlag() {
  137 + return garOrderMatchFlag;
  138 + }
  139 +
  140 + public void setGarOrderMatchFlag(Integer garOrderMatchFlag) {
  141 + this.garOrderMatchFlag = garOrderMatchFlag;
  142 + }
  143 +
  144 + /**
142 145 * 评分标识
143 146 */
144 147 private Integer garEvaluateFlag;
... ... @@ -374,22 +377,6 @@ public class GarOrder implements Serializable {
374 377 this.garReason = garReason;
375 378 }
376 379  
377   - public Integer getGarOrderCarNumber() {
378   - return garOrderCarNumber;
379   - }
380   -
381   - public void setGarOrderCarNumber(Integer garOrderCarNumber) {
382   - this.garOrderCarNumber = garOrderCarNumber;
383   - }
384   -
385   - public String getGarOrderCarType() {
386   - return garOrderCarType;
387   - }
388   -
389   - public void setGarOrderCarType(String garOrderCarType) {
390   - this.garOrderCarType = garOrderCarType;
391   - }
392   -
393 380 public Long getCount() {
394 381 return count;
395 382 }
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderCar.java 0 → 100644
  View file @f2ac3c9
  1 +package com.trash.garbage.pojo.domain;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.*;
  4 +
  5 +import java.io.Serializable;
  6 +import java.util.Date;
  7 +import lombok.Data;
  8 +
  9 +/**
  10 + * 派单车辆信息
  11 + * @TableName gar_order_car
  12 + */
  13 +@TableName(value ="gar_order_car")
  14 +@Data
  15 +public class GarOrderCar implements Serializable {
  16 + /**
  17 + * 主键
  18 + */
  19 + @TableId
  20 + private String garId;
  21 +
  22 + /**
  23 + * 订单id
  24 + */
  25 + private String garOrderId;
  26 +
  27 + /**
  28 + * 车辆类型
  29 + */
  30 + private String garOrderCarType;
  31 +
  32 + /**
  33 + * 0预计 1 实际（一条记录代表一辆车）
  34 + */
  35 + private Integer garOrderCarUserType;
  36 +
  37 + /**
  38 + *
  39 + */
  40 + @TableField(fill = FieldFill.INSERT)
  41 + private Date garCreateTime;
  42 +
  43 + /**
  44 + *
  45 + */
  46 + @TableField(fill = FieldFill.INSERT_UPDATE)
  47 + private Date garUpdateTime;
  48 +
  49 + /**
  50 + *
  51 + */
  52 + @TableField(fill = FieldFill.INSERT)
  53 + private String garCreateBy;
  54 +
  55 + /**
  56 + *
  57 + */
  58 + @TableField(fill = FieldFill.INSERT_UPDATE)
  59 + private String garUpdateBy;
  60 +
  61 + /**
  62 + *
  63 + */
  64 + private String garRemark;
  65 +
  66 + @TableField(exist = false)
  67 + private static final long serialVersionUID = 1L;
  68 +
  69 + public String getGarId() {
  70 + return garId;
  71 + }
  72 +
  73 + public void setGarId(String garId) {
  74 + this.garId = garId;
  75 + }
  76 +
  77 + public String getGarOrderId() {
  78 + return garOrderId;
  79 + }
  80 +
  81 + public void setGarOrderId(String garOrderId) {
  82 + this.garOrderId = garOrderId;
  83 + }
  84 +
  85 + public String getGarOrderCarType() {
  86 + return garOrderCarType;
  87 + }
  88 +
  89 + public void setGarOrderCarType(String garOrderCarType) {
  90 + this.garOrderCarType = garOrderCarType;
  91 + }
  92 +
  93 + public Integer getGarOrderCarUserType() {
  94 + return garOrderCarUserType;
  95 + }
  96 +
  97 + public void setGarOrderCarUserType(Integer garOrderCarUserType) {
  98 + this.garOrderCarUserType = garOrderCarUserType;
  99 + }
  100 +
  101 + public Date getGarCreateTime() {
  102 + return garCreateTime;
  103 + }
  104 +
  105 + public void setGarCreateTime(Date garCreateTime) {
  106 + this.garCreateTime = garCreateTime;
  107 + }
  108 +
  109 + public Date getGarUpdateTime() {
  110 + return garUpdateTime;
  111 + }
  112 +
  113 + public void setGarUpdateTime(Date garUpdateTime) {
  114 + this.garUpdateTime = garUpdateTime;
  115 + }
  116 +
  117 + public String getGarCreateBy() {
  118 + return garCreateBy;
  119 + }
  120 +
  121 + public void setGarCreateBy(String garCreateBy) {
  122 + this.garCreateBy = garCreateBy;
  123 + }
  124 +
  125 + public String getGarUpdateBy() {
  126 + return garUpdateBy;
  127 + }
  128 +
  129 + public void setGarUpdateBy(String garUpdateBy) {
  130 + this.garUpdateBy = garUpdateBy;
  131 + }
  132 +
  133 + public String getGarRemark() {
  134 + return garRemark;
  135 + }
  136 +
  137 + public void setGarRemark(String garRemark) {
  138 + this.garRemark = garRemark;
  139 + }
  140 +}
0 141 \ No newline at end of file
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderMatchHandler.java 0 → 100644
  View file @f2ac3c9
  1 +package com.trash.garbage.pojo.domain;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.FieldFill;
  4 +import com.baomidou.mybatisplus.annotation.TableField;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import java.io.Serializable;
  8 +import java.util.Date;
  9 +import java.util.Objects;
  10 +
  11 +import lombok.Data;
  12 +
  13 +/**
  14 + * 派单分发处理表
  15 + * @TableName gar_order_match_handler
  16 + */
  17 +@TableName(value ="gar_order_match_handler")
  18 +@Data
  19 +public class GarOrderMatchHandler implements Serializable {
  20 + /**
  21 + * 主键
  22 + */
  23 + @TableId
  24 + private String garId;
  25 +
  26 + /**
  27 + * 订单id
  28 + */
  29 + private String garOrderId;
  30 +
  31 + /**
  32 + * 处理人手机号
  33 + */
  34 + private String garOrderHandlerTel;
  35 +
  36 + /**
  37 + * 处理状态
  38 + */
  39 + private Integer garOrderHandlerStatus;
  40 +
  41 +
  42 + /**
  43 + * 处理状态
  44 + */
  45 + private Integer garOrderStatus;
  46 +
  47 + /**
  48 + * 处理人姓名
  49 + */
  50 + private String garOrderHandlerName;
  51 +
  52 + /**
  53 + * 公司id
  54 + */
  55 + private String garOrderHandlerCompanyId;
  56 +
  57 + /**
  58 + * 公司名
  59 + */
  60 + private String garOrderHandlerCompanyName;
  61 +
  62 + /**
  63 + *
  64 + */
  65 + @TableField(fill = FieldFill.INSERT)
  66 + private Date garCreateTime;
  67 +
  68 + /**
  69 + *
  70 + */
  71 + @TableField(fill = FieldFill.INSERT_UPDATE)
  72 + private Date garUpdateTime;
  73 +
  74 + /**
  75 + *
  76 + */
  77 + @TableField(fill = FieldFill.INSERT)
  78 + private String garCreateBy;
  79 +
  80 + /**
  81 + *
  82 + */
  83 + @TableField(fill = FieldFill.INSERT_UPDATE)
  84 + private String garUpdateBy;
  85 +
  86 + /**
  87 + *
  88 + */
  89 + private String garRemark;
  90 +
  91 + private Integer garCancelFlag;
  92 +
  93 + public Integer getGarCancelFlag() {
  94 + return garCancelFlag;
  95 + }
  96 +
  97 + public void setGarCancelFlag(Integer garCancelFlag) {
  98 + this.garCancelFlag = garCancelFlag;
  99 + }
  100 +
  101 + @TableField(exist = false)
  102 + private static final long serialVersionUID = 1L;
  103 +
  104 + public Integer getGarOrderStatus() {
  105 + return garOrderStatus;
  106 + }
  107 +
  108 + public void setGarOrderStatus(Integer garOrderStatus) {
  109 + this.garOrderStatus = garOrderStatus;
  110 + }
  111 +
  112 + public String getGarId() {
  113 + return garId;
  114 + }
  115 +
  116 + public void setGarId(String garId) {
  117 + this.garId = garId;
  118 + }
  119 +
  120 + public String getGarOrderId() {
  121 + return garOrderId;
  122 + }
  123 +
  124 + public void setGarOrderId(String garOrderId) {
  125 + this.garOrderId = garOrderId;
  126 + }
  127 +
  128 + public String getGarOrderHandlerTel() {
  129 + return garOrderHandlerTel;
  130 + }
  131 +
  132 + public void setGarOrderHandlerTel(String garOrderHandlerTel) {
  133 + this.garOrderHandlerTel = garOrderHandlerTel;
  134 + }
  135 +
  136 + public Integer getGarOrderHandlerStatus() {
  137 + return garOrderHandlerStatus;
  138 + }
  139 +
  140 + public void setGarOrderHandlerStatus(Integer garOrderHandlerStatus) {
  141 + this.garOrderHandlerStatus = garOrderHandlerStatus;
  142 + }
  143 +
  144 + public String getGarOrderHandlerName() {
  145 + return garOrderHandlerName;
  146 + }
  147 +
  148 + public void setGarOrderHandlerName(String garOrderHandlerName) {
  149 + this.garOrderHandlerName = garOrderHandlerName;
  150 + }
  151 +
  152 + public String getGarOrderHandlerCompanyId() {
  153 + return garOrderHandlerCompanyId;
  154 + }
  155 +
  156 + public void setGarOrderHandlerCompanyId(String garOrderHandlerCompanyId) {
  157 + this.garOrderHandlerCompanyId = garOrderHandlerCompanyId;
  158 + }
  159 +
  160 + public String getGarOrderHandlerCompanyName() {
  161 + return garOrderHandlerCompanyName;
  162 + }
  163 +
  164 + public void setGarOrderHandlerCompanyName(String garOrderHandlerCompanyName) {
  165 + this.garOrderHandlerCompanyName = garOrderHandlerCompanyName;
  166 + }
  167 +
  168 + public Date getGarCreateTime() {
  169 + return garCreateTime;
  170 + }
  171 +
  172 + public void setGarCreateTime(Date garCreateTime) {
  173 + this.garCreateTime = garCreateTime;
  174 + }
  175 +
  176 + public Date getGarUpdateTime() {
  177 + return garUpdateTime;
  178 + }
  179 +
  180 + public void setGarUpdateTime(Date garUpdateTime) {
  181 + this.garUpdateTime = garUpdateTime;
  182 + }
  183 +
  184 + public String getGarCreateBy() {
  185 + return garCreateBy;
  186 + }
  187 +
  188 + public void setGarCreateBy(String garCreateBy) {
  189 + this.garCreateBy = garCreateBy;
  190 + }
  191 +
  192 + public String getGarUpdateBy() {
  193 + return garUpdateBy;
  194 + }
  195 +
  196 + public void setGarUpdateBy(String garUpdateBy) {
  197 + this.garUpdateBy = garUpdateBy;
  198 + }
  199 +
  200 + public String getGarRemark() {
  201 + return garRemark;
  202 + }
  203 +
  204 + public void setGarRemark(String garRemark) {
  205 + this.garRemark = garRemark;
  206 + }
  207 +
  208 +
  209 + @Override
  210 + public boolean equals(Object o) {
  211 + if (this == o) return true;
  212 + if (o == null || getClass() != o.getClass()) return false;
  213 + GarOrderMatchHandler that = (GarOrderMatchHandler) o;
  214 + return Objects.equals(getGarId(), that.getGarId()) && Objects.equals(getGarOrderId(), that.getGarOrderId()) && Objects.equals(getGarOrderHandlerTel(), that.getGarOrderHandlerTel()) && Objects.equals(getGarOrderHandlerStatus(), that.getGarOrderHandlerStatus()) && Objects.equals(getGarOrderStatus(), that.getGarOrderStatus()) && Objects.equals(getGarOrderHandlerName(), that.getGarOrderHandlerName()) && Objects.equals(getGarOrderHandlerCompanyId(), that.getGarOrderHandlerCompanyId()) && Objects.equals(getGarOrderHandlerCompanyName(), that.getGarOrderHandlerCompanyName()) && Objects.equals(getGarCreateTime(), that.getGarCreateTime()) && Objects.equals(getGarUpdateTime(), that.getGarUpdateTime()) && Objects.equals(getGarCreateBy(), that.getGarCreateBy()) && Objects.equals(getGarUpdateBy(), that.getGarUpdateBy()) && Objects.equals(getGarRemark(), that.getGarRemark()) && Objects.equals(getGarCancelFlag(), that.getGarCancelFlag());
  215 + }
  216 +
  217 + @Override
  218 + public int hashCode() {
  219 + return Objects.hash(getGarId(), getGarOrderId(), getGarOrderHandlerTel(), getGarOrderHandlerStatus(), getGarOrderStatus(), getGarOrderHandlerName(), getGarOrderHandlerCompanyId(), getGarOrderHandlerCompanyName(), getGarCreateTime(), getGarUpdateTime(), getGarCreateBy(), getGarUpdateBy(), getGarRemark(), getGarCancelFlag());
  220 + }
  221 +
  222 + @Override
  223 + public String toString() {
  224 + return "GarOrderMatchHandler{" +
  225 + "garId='" + garId + '\'' +
  226 + ", garOrderId='" + garOrderId + '\'' +
  227 + ", garOrderHandlerTel='" + garOrderHandlerTel + '\'' +
  228 + ", garOrderHandlerStatus=" + garOrderHandlerStatus +
  229 + ", garOrderStatus=" + garOrderStatus +
  230 + ", garOrderHandlerName='" + garOrderHandlerName + '\'' +
  231 + ", garOrderHandlerCompanyId='" + garOrderHandlerCompanyId + '\'' +
  232 + ", garOrderHandlerCompanyName='" + garOrderHandlerCompanyName + '\'' +
  233 + ", garCreateTime=" + garCreateTime +
  234 + ", garUpdateTime=" + garUpdateTime +
  235 + ", garCreateBy='" + garCreateBy + '\'' +
  236 + ", garUpdateBy='" + garUpdateBy + '\'' +
  237 + ", garRemark='" + garRemark + '\'' +
  238 + ", garCancelFlag=" + garCancelFlag +
  239 + '}';
  240 + }
  241 +}
0 242 \ No newline at end of file
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/DispatchDto.java 0 → 100644
  View file @f2ac3c9
  1 +package com.trash.garbage.pojo.dto;
  2 +
  3 +import lombok.Data;
  4 +
  5 +import java.util.List;
  6 +
  7 +@Data
  8 +public class DispatchDto {
  9 + private String garOrderId;
  10 + private List<String> tel;
  11 +
  12 +}
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/OrderDto.java
  View file @f2ac3c9
... ... @@ -8,6 +8,7 @@ import java.util.List;
8 8  
9 9 /**
10 10 * 新增订单dto
  11 + *
11 12 * @author 20412
12 13 */
13 14 @Data
... ... @@ -60,31 +61,6 @@ public class OrderDto {
60 61 */
61 62 private String garOrderCompanyTel;
62 63  
63   - public Integer getGarOrderCarNumber() {
64   - return garOrderCarNumber;
65   - }
66   -
67   - public void setGarOrderCarNumber(Integer garOrderCarNumber) {
68   - this.garOrderCarNumber = garOrderCarNumber;
69   - }
70   -
71   - public String getGarOrderCarType() {
72   - return garOrderCarType;
73   - }
74   -
75   - public void setGarOrderCarType(String garOrderCarType) {
76   - this.garOrderCarType = garOrderCarType;
77   - }
78   -
79   - /**
80   - * 车辆数量
81   - */
82   - private Integer garOrderCarNumber;
83   -
84   - /**
85   - * 车子类型
86   - */
87   - private String garOrderCarType;
88 64  
89 65 /**
90 66 * 约定时间
... ... @@ -97,94 +73,132 @@ public class OrderDto {
97 73 */
98 74 private String garRemark;
99 75  
100   - public String getGarOrderAddress() {
101   - return garOrderAddress;
102   - }
  76 + private List<CarInfo> garCarInfoList;
  77 +
  78 + @Data
  79 + public static class CarInfo {
  80 + /**
  81 + * 车辆数量
  82 + */
  83 + private Integer garOrderCarNumber;
  84 +
  85 + /**
  86 + * 车子类型
  87 + */
  88 + private String garOrderCarType;
  89 +
  90 + public Integer getGarOrderCarNumber() {
  91 + return garOrderCarNumber;
  92 + }
  93 +
  94 + public void setGarOrderCarNumber(Integer garOrderCarNumber) {
  95 + this.garOrderCarNumber = garOrderCarNumber;
  96 + }
  97 +
  98 + public String getGarOrderCarType() {
  99 + return garOrderCarType;
  100 + }
  101 +
  102 + public void setGarOrderCarType(String garOrderCarType) {
  103 + this.garOrderCarType = garOrderCarType;
  104 + }
  105 + }
  106 +
  107 + public List<CarInfo> getGarCarInfoList() {
  108 + return garCarInfoList;
  109 + }
  110 +
  111 + public void setGarCarInfoList(List<CarInfo> garCarInfoList) {
  112 + this.garCarInfoList = garCarInfoList;
  113 + }
  114 +
  115 + public String getGarOrderAddress() {
  116 + return garOrderAddress;
  117 + }
103 118  
104   - public void setGarOrderAddress(String garOrderAddress) {
105   - this.garOrderAddress = garOrderAddress;
106   - }
  119 + public void setGarOrderAddress(String garOrderAddress) {
  120 + this.garOrderAddress = garOrderAddress;
  121 + }
107 122  
108   - public List<String> getImageUrls() {
109   - return imageUrls;
110   - }
  123 + public List<String> getImageUrls() {
  124 + return imageUrls;
  125 + }
111 126  
112   - public void setImageUrls(List<String> imageUrls) {
113   - this.imageUrls = imageUrls;
114   - }
  127 + public void setImageUrls(List<String> imageUrls) {
  128 + this.imageUrls = imageUrls;
  129 + }
115 130  
116   - public String getGarOrderAddressDetails() {
117   - return garOrderAddressDetails;
118   - }
  131 + public String getGarOrderAddressDetails() {
  132 + return garOrderAddressDetails;
  133 + }
119 134  
120   - public void setGarOrderAddressDetails(String garOrderAddressDetails) {
121   - this.garOrderAddressDetails = garOrderAddressDetails;
122   - }
  135 + public void setGarOrderAddressDetails(String garOrderAddressDetails) {
  136 + this.garOrderAddressDetails = garOrderAddressDetails;
  137 + }
123 138  
124   - public String getGarOrderContactName() {
125   - return garOrderContactName;
126   - }
  139 + public String getGarOrderContactName() {
  140 + return garOrderContactName;
  141 + }
127 142  
128   - public void setGarOrderContactName(String garOrderContactName) {
129   - this.garOrderContactName = garOrderContactName;
130   - }
  143 + public void setGarOrderContactName(String garOrderContactName) {
  144 + this.garOrderContactName = garOrderContactName;
  145 + }
131 146  
132   - public String getGarOrderTrashType() {
133   - return garOrderTrashType;
134   - }
  147 + public String getGarOrderTrashType() {
  148 + return garOrderTrashType;
  149 + }
135 150  
136   - public void setGarOrderTrashType(String garOrderTrashType) {
137   - this.garOrderTrashType = garOrderTrashType;
138   - }
  151 + public void setGarOrderTrashType(String garOrderTrashType) {
  152 + this.garOrderTrashType = garOrderTrashType;
  153 + }
139 154  
140   - public String getGarOrderContactTel() {
141   - return garOrderContactTel;
142   - }
  155 + public String getGarOrderContactTel() {
  156 + return garOrderContactTel;
  157 + }
143 158  
144   - public void setGarOrderContactTel(String garOrderContactTel) {
145   - this.garOrderContactTel = garOrderContactTel;
146   - }
  159 + public void setGarOrderContactTel(String garOrderContactTel) {
  160 + this.garOrderContactTel = garOrderContactTel;
  161 + }
147 162  
148   - public String getGarOrderCompanyId() {
149   - return garOrderCompanyId;
150   - }
  163 + public String getGarOrderCompanyId() {
  164 + return garOrderCompanyId;
  165 + }
151 166  
152   - public void setGarOrderCompanyId(String garOrderCompanyId) {
153   - this.garOrderCompanyId = garOrderCompanyId;
154   - }
  167 + public void setGarOrderCompanyId(String garOrderCompanyId) {
  168 + this.garOrderCompanyId = garOrderCompanyId;
  169 + }
155 170  
156   - public String getGarOrderCompanyName() {
157   - return garOrderCompanyName;
158   - }
  171 + public String getGarOrderCompanyName() {
  172 + return garOrderCompanyName;
  173 + }
159 174  
160   - public void setGarOrderCompanyName(String garOrderCompanyName) {
161   - this.garOrderCompanyName = garOrderCompanyName;
162   - }
  175 + public void setGarOrderCompanyName(String garOrderCompanyName) {
  176 + this.garOrderCompanyName = garOrderCompanyName;
  177 + }
  178 +
  179 + public String getGarOrderCompanyTel() {
  180 + return garOrderCompanyTel;
  181 + }
163 182  
164   - public String getGarOrderCompanyTel() {
165   - return garOrderCompanyTel;
166   - }
  183 + public void setGarOrderCompanyTel(String garOrderCompanyTel) {
  184 + this.garOrderCompanyTel = garOrderCompanyTel;
  185 + }
167 186  
168   - public void setGarOrderCompanyTel(String garOrderCompanyTel) {
169   - this.garOrderCompanyTel = garOrderCompanyTel;
170   - }
  187 + public String getGarOrderAgreementTime() {
  188 + return garOrderAgreementTime;
  189 + }
171 190  
172   - public String getGarOrderAgreementTime() {
173   - return garOrderAgreementTime;
174   - }
  191 + public void setGarOrderAgreementTime(String garOrderAgreementTime) {
  192 + this.garOrderAgreementTime = garOrderAgreementTime;
  193 + }
175 194  
176   - public void setGarOrderAgreementTime(String garOrderAgreementTime) {
177   - this.garOrderAgreementTime = garOrderAgreementTime;
178   - }
  195 + public String getGarRemark() {
  196 + return garRemark;
  197 + }
179 198  
180   - public String getGarRemark() {
181   - return garRemark;
182   - }
  199 + public void setGarRemark(String garRemark) {
  200 + this.garRemark = garRemark;
  201 + }
183 202  
184   - public void setGarRemark(String garRemark) {
185   - this.garRemark = garRemark;
186   - }
187   -
188   -
189 203  
190 204 }
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/DispatchDriverVo.java 0 → 100644
  View file @f2ac3c9
  1 +package com.trash.garbage.pojo.vo;
  2 +
  3 +import lombok.EqualsAndHashCode;
  4 +import lombok.ToString;
  5 +
  6 +/**
  7 + * @author 20412
  8 + */
  9 +@ToString
  10 +@EqualsAndHashCode
  11 +public class DispatchDriverVo {
  12 + private String name;
  13 + private String tel;
  14 +
  15 + private Boolean checked;
  16 +
  17 + private String licensePlateNumber;
  18 +
  19 + public String getLicensePlateNumber() {
  20 + return licensePlateNumber;
  21 + }
  22 +
  23 + public void setLicensePlateNumber(String licensePlateNumber) {
  24 + this.licensePlateNumber = licensePlateNumber;
  25 + }
  26 +
  27 + public Boolean getChecked() {
  28 + return checked;
  29 + }
  30 +
  31 + public void setChecked(Boolean checked) {
  32 + this.checked = checked;
  33 + }
  34 +
  35 + public String getName() {
  36 + return name;
  37 + }
  38 +
  39 + public void setName(String name) {
  40 + this.name = name;
  41 + }
  42 +
  43 + public String getTel() {
  44 + return tel;
  45 + }
  46 +
  47 + public void setTel(String tel) {
  48 + this.tel = tel;
  49 + }
  50 +
  51 +}
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/LoginVo.java
  View file @f2ac3c9
... ... @@ -7,7 +7,7 @@ import lombok.ToString;
7 7 @EqualsAndHashCode
8 8 public class LoginVo {
9 9 private String token;
10   - private Boolean companyFlag;
  10 + private String userType;
11 11 private String parentCompanyName;
12 12 private String transportCompanyName;
13 13  
... ... @@ -19,12 +19,12 @@ public class LoginVo {
19 19 this.token = token;
20 20 }
21 21  
22   - public Boolean getCompanyFlag() {
23   - return companyFlag;
  22 + public String getUserType() {
  23 + return userType;
24 24 }
25 25  
26   - public void setCompanyFlag(Boolean companyFlag) {
27   - this.companyFlag = companyFlag;
  26 + public void setUserType(String userType) {
  27 + this.userType = userType;
28 28 }
29 29  
30 30 public String getParentCompanyName() {
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailVo.java
  View file @f2ac3c9
... ... @@ -2,7 +2,11 @@ package com.trash.garbage.pojo.vo;
2 2  
3 3 import com.fasterxml.jackson.annotation.JsonFormat;
4 4 import com.trash.garbage.global.GlobalStatus;
  5 +import com.trash.garbage.pojo.domain.GarOrderCar;
  6 +import com.trash.garbage.pojo.dto.OrderDto;
5 7 import lombok.Data;
  8 +import lombok.EqualsAndHashCode;
  9 +import lombok.ToString;
6 10  
7 11 import java.util.ArrayList;
8 12 import java.util.Date;
... ... @@ -11,39 +15,31 @@ import java.util.List;
11 15 /**
12 16 * @author 20412
13 17 */
14   -@Data
  18 +//@Data
  19 +@ToString
  20 +@EqualsAndHashCode
15 21 public class OrderDetailVo {
16 22  
17   - private Integer garCancelFlag;
  23 + private Integer garCancelFlag;
18 24  
19   - private Integer garOrderCarNumber;
20 25  
21   - private String garReason;
22   - private String garOrderHandlerId;
  26 + private String garReason;
  27 + private String garOrderHandlerId;
23 28  
24 29 private Integer garEvaluateFlag;
25 30  
26   - public Integer getGarOrderCarNumber() {
27   - return garOrderCarNumber;
28   - }
  31 + private Integer garHandlerEvaluateFlag;
29 32  
30   - public void setGarOrderCarNumber(Integer garOrderCarNumber) {
31   - this.garOrderCarNumber = garOrderCarNumber;
32   - }
33   -
34   - private Integer garHandlerEvaluateFlag;
35   - private String garOrderCarType;
36   -
37   - /**
38   - * 处理人名
39   - */
40   - private String garOrderHandleName;
  33 + /**
  34 + * 处理人名
  35 + */
  36 + private String garOrderHandleName;
41 37  
42 38  
43   - /**
44   - * 联系方式
45   - */
46   - private String garOrderHandleTel;
  39 + /**
  40 + * 联系方式
  41 + */
  42 + private String garOrderHandleTel;
47 43 /**
48 44 * 订单地址
49 45 */
... ... @@ -75,6 +71,12 @@ public class OrderDetailVo {
75 71 */
76 72 private String garOrderTrashType;
77 73  
  74 +
  75 + /**
  76 + * 车辆信息
  77 + */
  78 + private List<GarOrderCar> garCarInfoList;
  79 +
78 80 /**
79 81 * 订单状态
80 82 */
... ... @@ -121,210 +123,206 @@ public class OrderDetailVo {
121 123 */
122 124 private Boolean handleFlag;
123 125  
124   - public OrderDetailVo(){
  126 + public OrderDetailVo() {
125 127 this.currentImages = new ArrayList<>();
126 128 this.putDownImages = new ArrayList<>();
127 129 this.putOnImages = new ArrayList<>();
128   - this.handleFlag = false;
129   - this.garHandlerEvaluateFlag = GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue();
  130 + this.garHandlerEvaluateFlag = GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue();
130 131 }
131 132  
  133 + public List<GarOrderCar> getGarCarInfoList() {
  134 + return garCarInfoList;
  135 + }
132 136  
133   - public void setGarOrderHandlerId(String garOrderHandlerId) {
134   - this.garOrderHandlerId = garOrderHandlerId;
135   - }
136   - public String getGarOrderHandlerId() {
137   - return garOrderHandlerId;
138   - }
139   -
140   - public String getGarOrderCarType() {
141   - return garOrderCarType;
142   - }
  137 + public void setGarCarInfoList(List<GarOrderCar> garCarInfoList) {
  138 + this.garCarInfoList = garCarInfoList;
  139 + }
143 140  
144   - public void setGarOrderCarType(String garOrderCarType) {
145   - this.garOrderCarType = garOrderCarType;
146   - }
  141 + public void setGarOrderHandlerId(String garOrderHandlerId) {
  142 + this.garOrderHandlerId = garOrderHandlerId;
  143 + }
147 144  
148   - public String getGarOrderHandleName() {
149   - return garOrderHandleName;
150   - }
  145 + public String getGarOrderHandlerId() {
  146 + return garOrderHandlerId;
  147 + }
151 148  
152   - public void setGarOrderHandleName(String garOrderHandleName) {
153   - this.garOrderHandleName = garOrderHandleName;
154   - }
  149 + public String getGarOrderHandleName() {
  150 + return garOrderHandleName;
  151 + }
155 152  
156   - public String getGarOrderHandleTel() {
157   - return garOrderHandleTel;
158   - }
  153 + public void setGarOrderHandleName(String garOrderHandleName) {
  154 + this.garOrderHandleName = garOrderHandleName;
  155 + }
159 156  
160   - public void setGarOrderHandleTel(String garOrderHandleTel) {
161   - this.garOrderHandleTel = garOrderHandleTel;
162   - }
  157 + public String getGarOrderHandleTel() {
  158 + return garOrderHandleTel;
  159 + }
163 160  
  161 + public void setGarOrderHandleTel(String garOrderHandleTel) {
  162 + this.garOrderHandleTel = garOrderHandleTel;
  163 + }
164 164  
165 165  
166   - public String getGarReason() {
167   - return garReason;
168   - }
  166 + public String getGarReason() {
  167 + return garReason;
  168 + }
169 169  
170   - public void setGarReason(String garReason) {
171   - this.garReason = garReason;
172   - }
  170 + public void setGarReason(String garReason) {
  171 + this.garReason = garReason;
  172 + }
173 173  
174   - public Integer getGarCancelFlag() {
175   - return garCancelFlag;
176   - }
  174 + public Integer getGarCancelFlag() {
  175 + return garCancelFlag;
  176 + }
177 177  
178   - public void setGarCancelFlag(Integer garCancelFlag) {
179   - this.garCancelFlag = garCancelFlag;
180   - }
  178 + public void setGarCancelFlag(Integer garCancelFlag) {
  179 + this.garCancelFlag = garCancelFlag;
  180 + }
181 181  
182 182  
183   - public Integer getGarEvaluateFlag() {
184   - return garEvaluateFlag;
185   - }
  183 + public Integer getGarEvaluateFlag() {
  184 + return garEvaluateFlag;
  185 + }
186 186  
187   - public void setGarEvaluateFlag(Integer garEvaluateFlag) {
188   - this.garEvaluateFlag = garEvaluateFlag;
189   - }
  187 + public void setGarEvaluateFlag(Integer garEvaluateFlag) {
  188 + this.garEvaluateFlag = garEvaluateFlag;
  189 + }
190 190  
191   - public String getGarOrderAddress() {
192   - return garOrderAddress;
193   - }
  191 + public String getGarOrderAddress() {
  192 + return garOrderAddress;
  193 + }
194 194  
195   - public void setGarOrderAddress(String garOrderAddress) {
196   - this.garOrderAddress = garOrderAddress;
197   - }
  195 + public void setGarOrderAddress(String garOrderAddress) {
  196 + this.garOrderAddress = garOrderAddress;
  197 + }
198 198  
199   - public List<String> getCurrentImages() {
200   - return currentImages;
201   - }
  199 + public List<String> getCurrentImages() {
  200 + return currentImages;
  201 + }
202 202  
203   - public void setCurrentImages(List<String> currentImages) {
204   - this.currentImages = currentImages;
205   - }
  203 + public void setCurrentImages(List<String> currentImages) {
  204 + this.currentImages = currentImages;
  205 + }
206 206  
207   - public List<String> getPutOnImages() {
208   - return putOnImages;
209   - }
  207 + public List<String> getPutOnImages() {
  208 + return putOnImages;
  209 + }
210 210  
211   - public void setPutOnImages(List<String> putOnImages) {
212   - this.putOnImages = putOnImages;
213   - }
  211 + public void setPutOnImages(List<String> putOnImages) {
  212 + this.putOnImages = putOnImages;
  213 + }
214 214  
215   - public List<String> getPutDownImages() {
216   - return putDownImages;
217   - }
  215 + public List<String> getPutDownImages() {
  216 + return putDownImages;
  217 + }
218 218  
219   - public void setPutDownImages(List<String> putDownImages) {
220   - this.putDownImages = putDownImages;
221   - }
  219 + public void setPutDownImages(List<String> putDownImages) {
  220 + this.putDownImages = putDownImages;
  221 + }
222 222  
223   - public String getGarOrderAddressDetails() {
224   - return garOrderAddressDetails;
225   - }
  223 + public String getGarOrderAddressDetails() {
  224 + return garOrderAddressDetails;
  225 + }
226 226  
227   - public void setGarOrderAddressDetails(String garOrderAddressDetails) {
228   - this.garOrderAddressDetails = garOrderAddressDetails;
229   - }
  227 + public void setGarOrderAddressDetails(String garOrderAddressDetails) {
  228 + this.garOrderAddressDetails = garOrderAddressDetails;
  229 + }
230 230  
231   - public String getGarOrderContactName() {
232   - return garOrderContactName;
233   - }
  231 + public String getGarOrderContactName() {
  232 + return garOrderContactName;
  233 + }
234 234  
235   - public void setGarOrderContactName(String garOrderContactName) {
236   - this.garOrderContactName = garOrderContactName;
237   - }
  235 + public void setGarOrderContactName(String garOrderContactName) {
  236 + this.garOrderContactName = garOrderContactName;
  237 + }
238 238  
239   - public String getGarOrderTrashType() {
240   - return garOrderTrashType;
241   - }
  239 + public String getGarOrderTrashType() {
  240 + return garOrderTrashType;
  241 + }
242 242  
243   - public void setGarOrderTrashType(String garOrderTrashType) {
244   - this.garOrderTrashType = garOrderTrashType;
245   - }
  243 + public void setGarOrderTrashType(String garOrderTrashType) {
  244 + this.garOrderTrashType = garOrderTrashType;
  245 + }
246 246  
247   - public Integer getGarOrderHandlerStatus() {
248   - return garOrderHandlerStatus;
249   - }
  247 + public Integer getGarOrderHandlerStatus() {
  248 + return garOrderHandlerStatus;
  249 + }
250 250  
251   - public void setGarOrderHandlerStatus(Integer garOrderHandlerStatus) {
252   - this.garOrderHandlerStatus = garOrderHandlerStatus;
253   - }
  251 + public void setGarOrderHandlerStatus(Integer garOrderHandlerStatus) {
  252 + this.garOrderHandlerStatus = garOrderHandlerStatus;
  253 + }
254 254  
255   - public Date getGarCreateTime() {
256   - return garCreateTime;
257   - }
  255 + public Date getGarCreateTime() {
  256 + return garCreateTime;
  257 + }
258 258  
259   - public void setGarCreateTime(Date garCreateTime) {
260   - this.garCreateTime = garCreateTime;
261   - }
  259 + public void setGarCreateTime(Date garCreateTime) {
  260 + this.garCreateTime = garCreateTime;
  261 + }
262 262  
263   - public String getGarOrderContactTel() {
264   - return garOrderContactTel;
265   - }
  263 + public String getGarOrderContactTel() {
  264 + return garOrderContactTel;
  265 + }
266 266  
267   - public void setGarOrderContactTel(String garOrderContactTel) {
268   - this.garOrderContactTel = garOrderContactTel;
269   - }
  267 + public void setGarOrderContactTel(String garOrderContactTel) {
  268 + this.garOrderContactTel = garOrderContactTel;
  269 + }
270 270  
271   - public String getGarOrderCompanyId() {
272   - return garOrderCompanyId;
273   - }
  271 + public String getGarOrderCompanyId() {
  272 + return garOrderCompanyId;
  273 + }
274 274  
275   - public void setGarOrderCompanyId(String garOrderCompanyId) {
276   - this.garOrderCompanyId = garOrderCompanyId;
277   - }
  275 + public void setGarOrderCompanyId(String garOrderCompanyId) {
  276 + this.garOrderCompanyId = garOrderCompanyId;
  277 + }
278 278  
279   - public String getGarOrderCompanyName() {
280   - return garOrderCompanyName;
281   - }
  279 + public String getGarOrderCompanyName() {
  280 + return garOrderCompanyName;
  281 + }
282 282  
283   - public void setGarOrderCompanyName(String garOrderCompanyName) {
284   - this.garOrderCompanyName = garOrderCompanyName;
285   - }
  283 + public void setGarOrderCompanyName(String garOrderCompanyName) {
  284 + this.garOrderCompanyName = garOrderCompanyName;
  285 + }
286 286  
287   - public String getGarOrderCompanyTel() {
288   - return garOrderCompanyTel;
289   - }
  287 + public String getGarOrderCompanyTel() {
  288 + return garOrderCompanyTel;
  289 + }
290 290  
291   - public void setGarOrderCompanyTel(String garOrderCompanyTel) {
292   - this.garOrderCompanyTel = garOrderCompanyTel;
293   - }
  291 + public void setGarOrderCompanyTel(String garOrderCompanyTel) {
  292 + this.garOrderCompanyTel = garOrderCompanyTel;
  293 + }
294 294  
295   - public String getGarOrderAgreementTime() {
296   - return garOrderAgreementTime;
297   - }
  295 + public String getGarOrderAgreementTime() {
  296 + return garOrderAgreementTime;
  297 + }
298 298  
299   - public void setGarOrderAgreementTime(String garOrderAgreementTime) {
300   - this.garOrderAgreementTime = garOrderAgreementTime;
301   - }
  299 + public void setGarOrderAgreementTime(String garOrderAgreementTime) {
  300 + this.garOrderAgreementTime = garOrderAgreementTime;
  301 + }
302 302  
303   - public String getGarRemark() {
304   - return garRemark;
305   - }
  303 + public String getGarRemark() {
  304 + return garRemark;
  305 + }
306 306  
307   - public void setGarRemark(String garRemark) {
308   - this.garRemark = garRemark;
309   - }
  307 + public void setGarRemark(String garRemark) {
  308 + this.garRemark = garRemark;
  309 + }
310 310  
311   - public Boolean getHandleFlag() {
312   - return handleFlag;
313   - }
  311 + public Boolean getHandleFlag() {
  312 + return handleFlag;
  313 + }
314 314  
315   - public void setHandleFlag(Boolean handleFlag) {
316   - this.handleFlag = handleFlag;
317   - }
  315 + public void setHandleFlag(Boolean handleFlag) {
  316 + this.handleFlag = handleFlag;
  317 + }
318 318  
319   - public Integer getGarHandlerEvaluateFlag() {
320   - return garHandlerEvaluateFlag;
321   - }
  319 + public Integer getGarHandlerEvaluateFlag() {
  320 + return garHandlerEvaluateFlag;
  321 + }
322 322  
323   - public void setGarHandlerEvaluateFlag(Integer garHandlerEvaluateFlag) {
324   - this.garHandlerEvaluateFlag = garHandlerEvaluateFlag;
325   - }
  323 + public void setGarHandlerEvaluateFlag(Integer garHandlerEvaluateFlag) {
  324 + this.garHandlerEvaluateFlag = garHandlerEvaluateFlag;
  325 + }
326 326  
327   -
328   -
329 327  
330 328 }
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/TransportationEnterpriseVo.java
  View file @f2ac3c9
... ... @@ -4,10 +4,12 @@ import com.trash.enterprise.domain.TransportationEnterprise;
4 4 import lombok.EqualsAndHashCode;
5 5 import lombok.ToString;
6 6  
  7 +import java.text.DecimalFormat;
  8 +
7 9 @ToString
8 10 @EqualsAndHashCode
9 11 public class TransportationEnterpriseVo extends TransportationEnterprise {
10   - private Integer score;
  12 + private String score;
11 13  
12 14 private Integer cleanNumber;
13 15  
... ... @@ -19,11 +21,12 @@ public class TransportationEnterpriseVo extends TransportationEnterprise {
19 21 this.cleanNumber = cleanNumber;
20 22 }
21 23  
22   - public Integer getScore() {
  24 + public String getScore() {
23 25 return score;
24 26 }
25 27  
26   - public void setScore(Integer score) {
27   - this.score = score;
  28 + public void setScore(Float score) {
  29 + DecimalFormat df =new DecimalFormat("#0.0");
  30 + this.score = df.format(score);;
28 31 }
29 32 }
... ...
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderCarService.java 0 → 100644
  View file @f2ac3c9
  1 +package com.trash.garbage.service;
  2 +
  3 +import com.trash.garbage.pojo.domain.GarOrderCar;
  4 +import com.baomidou.mybatisplus.extension.service.IService;
  5 +
  6 +/**
  7 +* @author 20412
  8 +* @description 针对表【gar_order_car(派单车辆信息)】的数据库操作Service
  9 +* @createDate 2024-01-09 14:26:09
  10 +*/
  11 +public interface GarOrderCarService extends IService<GarOrderCar> {
  12 +
  13 +}
... ...
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderMatchHandlerService.java 0 → 100644
  View file @f2ac3c9
  1 +package com.trash.garbage.service;
  2 +
  3 +import com.trash.garbage.pojo.domain.GarOrderMatchHandler;
  4 +import com.baomidou.mybatisplus.extension.service.IService;
  5 +
  6 +/**
  7 +* @author 20412
  8 +* @description 针对表【gar_order_match_handler(派单分发处理表)】的数据库操作Service
  9 +* @createDate 2024-01-09 14:26:09
  10 +*/
  11 +public interface GarOrderMatchHandlerService extends IService<GarOrderMatchHandler> {
  12 +
  13 +}
... ...
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderService.java
  View file @f2ac3c9
... ... @@ -6,6 +6,7 @@ import com.trash.enterprise.domain.TransportationEnterprise;
6 6 import com.trash.garbage.pojo.domain.GarOrder;
7 7 import com.trash.garbage.pojo.domain.GarOrderEvaluate;
8 8 import com.trash.garbage.pojo.dto.*;
  9 +import com.trash.garbage.pojo.vo.DispatchDriverVo;
9 10 import com.trash.garbage.pojo.vo.OrderDetailVo;
10 11  
11 12 import java.util.List;
... ... @@ -66,4 +67,8 @@ public interface GarOrderService extends IService&lt;GarOrder&gt; {
66 67 PageInfo queryEnterpriseList(TransportationEnterprise enterprise);
67 68  
68 69 List<GarOrderEvaluate> queryEvaluateDetail(String orderId);
  70 +
  71 + void dispatchOrder(DispatchDto dto);
  72 +
  73 + List<DispatchDriverVo> queryDispatch(String orderId);
69 74 }
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderCarServiceImpl.java 0 → 100644
  View file @f2ac3c9
  1 +package com.trash.garbage.service.impl;
  2 +
  3 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  4 +import com.trash.garbage.pojo.domain.GarOrderCar;
  5 +import com.trash.garbage.service.GarOrderCarService;
  6 +import com.trash.garbage.mapper.GarOrderCarMapper;
  7 +import org.springframework.stereotype.Service;
  8 +
  9 +/**
  10 +* @author 20412
  11 +* @description 针对表【gar_order_car(派单车辆信息)】的数据库操作Service实现
  12 +* @createDate 2024-01-09 14:26:09
  13 +*/
  14 +@Service
  15 +public class GarOrderCarServiceImpl extends ServiceImpl<GarOrderCarMapper, GarOrderCar>
  16 + implements GarOrderCarService{
  17 +
  18 +}
  19 +
  20 +
  21 +
  22 +
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchHandlerServiceImpl.java 0 → 100644
  View file @f2ac3c9
  1 +package com.trash.garbage.service.impl;
  2 +
  3 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  4 +import com.trash.garbage.pojo.domain.GarOrderMatchHandler;
  5 +import com.trash.garbage.service.GarOrderMatchHandlerService;
  6 +import com.trash.garbage.mapper.GarOrderMatchHandlerMapper;
  7 +import org.springframework.stereotype.Service;
  8 +
  9 +/**
  10 +* @author 20412
  11 +* @description 针对表【gar_order_match_handler(派单分发处理表)】的数据库操作Service实现
  12 +* @createDate 2024-01-09 14:26:09
  13 +*/
  14 +@Service
  15 +public class GarOrderMatchHandlerServiceImpl extends ServiceImpl<GarOrderMatchHandlerMapper, GarOrderMatchHandler>
  16 + implements GarOrderMatchHandlerService{
  17 +
  18 +}
  19 +
  20 +
  21 +
  22 +
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
  View file @f2ac3c9
... ... @@ -5,8 +5,13 @@ import java.util.stream.Collectors;
5 5  
6 6 import com.trash.enterprise.domain.TransportationEnterprise;
7 7 import com.trash.enterprise.service.ITransportationEnterpriseService;
  8 +import com.trash.garbage.custom.BizException;
  9 +import com.trash.garbage.global.ResultCode;
  10 +import com.trash.garbage.pojo.domain.*;
8 11 import com.trash.garbage.pojo.dto.*;
  12 +import com.trash.garbage.pojo.vo.DispatchDriverVo;
9 13 import com.trash.garbage.pojo.vo.TransportationEnterpriseVo;
  14 +import com.trash.garbage.service.*;
10 15 import org.apache.commons.lang3.StringUtils;
11 16 import org.springframework.beans.factory.annotation.Autowired;
12 17 import org.springframework.stereotype.Service;
... ... @@ -23,15 +28,7 @@ import com.trash.driver.domain.vo.DriverVo;
23 28 import com.trash.driver.service.IDriverService;
24 29 import com.trash.garbage.global.GlobalStatus;
25 30 import com.trash.garbage.mapper.GarOrderMapper;
26   -import com.trash.garbage.pojo.domain.GarOrder;
27   -import com.trash.garbage.pojo.domain.GarOrderEvaluate;
28   -import com.trash.garbage.pojo.domain.GarOrderImage;
29   -import com.trash.garbage.pojo.domain.GarUser;
30 31 import com.trash.garbage.pojo.vo.OrderDetailVo;
31   -import com.trash.garbage.service.GarOrderEvaluateService;
32   -import com.trash.garbage.service.GarOrderImageService;
33   -import com.trash.garbage.service.GarOrderService;
34   -import com.trash.garbage.service.GarUserService;
35 32  
36 33 import cn.hutool.core.collection.CollectionUtil;
37 34  
... ... @@ -63,6 +60,15 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
63 60 @Autowired
64 61 private ITransportationEnterpriseService enterpriseService;
65 62  
  63 + @Autowired
  64 + private IDriverService iDriverService;
  65 +
  66 + @Autowired
  67 + private GarOrderMatchHandlerService handlerService;
  68 +
  69 + @Autowired
  70 + private GarOrderCarService garOrderCarService;
  71 +
66 72 @Override
67 73 @Transactional(rollbackFor = Exception.class)
68 74 public String saveOrder(OrderDto dto) {
... ... @@ -72,7 +78,23 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
72 78 order.setGarOrderUserId(userId);
73 79 order.setGarOrderHandlerStatus(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue());
74 80 order.setGarCancelFlag(GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
  81 + order.setGarOrderMatchFlag(GlobalStatus.GarOrderStatus.MATCH_NO.getValue());
75 82 save(order);
  83 +
  84 + // 保存车辆信息
  85 + List<OrderDto.CarInfo> garCarInfoList = dto.getGarCarInfoList();
  86 + List<GarOrderCar> garOrderCars = new ArrayList<>();
  87 + for (OrderDto.CarInfo carInfo : garCarInfoList) {
  88 + for (int index = 0; index < carInfo.getGarOrderCarNumber(); index++) {
  89 + GarOrderCar car = new GarOrderCar();
  90 + car.setGarOrderCarType(carInfo.getGarOrderCarType());
  91 + car.setGarOrderId(order.getGarOrderId());
  92 + car.setGarOrderCarUserType(GlobalStatus.GarOrderStatus.PLAN_CAR_TYPE.getValue());
  93 + garOrderCars.add(car);
  94 + }
  95 + }
  96 + garOrderCarService.saveBatch(garOrderCars);
  97 +
76 98 // 保存图片url
77 99 List<String> imageUrls = dto.getImageUrls();
78 100 List<GarOrderImage> images = new ArrayList<>(imageUrls.size());
... ... @@ -94,8 +116,8 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
94 116 LambdaQueryWrapper<GarOrderImage> qwi = new LambdaQueryWrapper<>();
95 117 qwi.eq(GarOrderImage::getGarOrderId, id);
96 118 OrderDetailVo vo = new OrderDetailVo();
97   - List<DriverVo> driverVos = null;
98   - if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription())) {
  119 +// List<DriverVo> driverVos = null;
  120 + if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription())) {
99 121 vo.setHandleFlag(true);
100 122 // 防止其他人员处理订单
101 123 if (!order.getGarOrderHandlerStatus().equals(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue()) && !order.getGarOrderHandlerId().equals(user.getGarUserId())) {
... ... @@ -103,6 +125,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
103 125 }
104 126 }
105 127 BeanUtils.copyBeanProp(vo, order);
  128 + // 获取图片
106 129 List<GarOrderImage> imageList = garOrderImageService.list(qwi);
107 130 for (GarOrderImage image : imageList) {
108 131 if (GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue().equals(image.getGarOrderImageType())) {
... ... @@ -115,16 +138,23 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
115 138 vo.getPutDownImages().add(image.getGarOrderImageUrl());
116 139 }
117 140 }
118   - if (StringUtils.isNotEmpty(vo.getGarOrderHandlerId())) {
119   - GarUser handleUser = garUserService.getById(vo.getGarOrderHandlerId());
120   - DriverVo driverVo = new DriverVo();
121   - driverVo.setPhoneNo(handleUser.getGarUserTel());
122   - driverVos = driverService.selectDriverList(driverVo);
123   - if (CollectionUtil.isNotEmpty(driverVos)) {
124   - vo.setGarOrderHandleName(driverVos.get(0).getName());
125   - vo.setGarOrderHandleTel(driverVos.get(0).getPhoneNo());
126   - }
127   - }
  141 +
  142 + // 获取车辆信息
  143 + LambdaQueryWrapper<GarOrderCar> qwc = new LambdaQueryWrapper<>();
  144 + qwc.eq(GarOrderCar::getGarOrderId, order.getGarOrderId());
  145 + List<GarOrderCar> carList = garOrderCarService.list(qwc);
  146 + vo.setGarCarInfoList(carList);
  147 + // TODO 订单分发获取 处理人员
  148 +// if (StringUtils.isNotEmpty(vo.getGarOrderHandlerId())) {
  149 +// GarUser handleUser = garUserService.getById(vo.getGarOrderHandlerId());
  150 +// DriverVo driverVo = new DriverVo();
  151 +// driverVo.setPhoneNo(handleUser.getGarUserTel());
  152 +// driverVos = driverService.selectDriverList(driverVo);
  153 +// if (CollectionUtil.isNotEmpty(driverVos)) {
  154 +// vo.setGarOrderHandleName(driverVos.get(0).getName());
  155 +// vo.setGarOrderHandleTel(driverVos.get(0).getPhoneNo());
  156 +// }
  157 +// }
128 158 return vo;
129 159 }
130 160  
... ... @@ -132,10 +162,10 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
132 162 public PageInfo queryOrderList(Integer type, Integer pageNo, Integer pageSize) {
133 163 String userId = SecurityUtils.getLoginUser().getUser().getUserId();
134 164 GarUser user = garUserService.getById(userId);
135   - LambdaQueryWrapper<GarOrder> qw = new LambdaQueryWrapper<>();
136   - qw.orderByAsc(GarOrder::getGarUpdateTime, GarOrder::getGarOrderHandlerStatus);
137 165 // 居民用户
138 166 if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription())) {
  167 + LambdaQueryWrapper<GarOrder> qw = new LambdaQueryWrapper<>();
  168 + qw.orderByAsc(GarOrder::getGarUpdateTime, GarOrder::getGarOrderHandlerStatus);
139 169 PageHelper.startPage(pageNo, pageSize);
140 170 // 待清运 || 清运中 || 已完成 || 待支付
141 171 if (GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(type)
... ... @@ -155,43 +185,41 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
155 185 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
156 186 return pageInfo;
157 187 }
158   - } else {
159   - DriverVo driver = new DriverVo();
160   - driver.setPhoneNo(user.getGarUserTel());
161   - List<DriverVo> driverList = driverService.selectDriverList(driver);
162   - // 负责人不存在
163   - if (CollectionUtil.isEmpty(driverList)) {
164   - return new PageInfo<GarOrder>(Collections.emptyList(), pageSize);
165   - }
166   - DriverVo driverVo = driverList.get(0);
167   - TransportationEnterprise enterprise = enterpriseService.selectTransportationEnterpriseById(driverVo.getCompanyId());
  188 + }
  189 + // 驾驶员
  190 + else if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription())) {
168 191 PageHelper.startPage(pageNo, pageSize);
169   - if (GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(type)) {
170   - qw.eq(GarOrder::getGarOrderCompanyId, enterprise.getParentId())
171   - .eq(GarOrder::getGarCancelFlag, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue())
172   - .eq(GarOrder::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.NEW_ORDER.getValue());
173   - List<GarOrder> orderList = list(qw);
  192 + if (GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(type)
  193 + || GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(type)
  194 + || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
  195 + List<GarOrder> orderList = baseMapper.queryOrderListByTelWithType(user.getGarUserTel(), type, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
174 196 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
175 197 return pageInfo;
176 198 }
177   - if (GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(type)
178   - || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
179   - qw.eq(GarOrder::getGarOrderCompanyId, enterprise.getParentId())
180   - .eq(GarOrder::getGarOrderHandlerId, user.getGarUserId())
181   - .eq(GarOrder::getGarCancelFlag, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue())
182   - .eq(GarOrder::getGarOrderHandlerStatus, type);
183   - List<GarOrder> orderList = list(qw);
  199 + // 全部
  200 + if (GlobalStatus.GarOrderStatus.ALL_ORDER.getValue().equals(type)) {
  201 + List<GarOrder> orderList = baseMapper.queryOrderListByTelWithType(user.getGarUserTel(), null, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
184 202 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
185 203 return pageInfo;
186 204 }
187   -
  205 + }
  206 + // 企业负责人
  207 + else if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription())) {
  208 + PageHelper.startPage(pageNo, pageSize);
  209 + LambdaQueryWrapper<GarOrder> qw = new LambdaQueryWrapper<GarOrder>();
  210 + qw.eq(GarOrder::getGarOrderCompanyTel, user.getGarUserTel())
  211 + .orderByDesc(GarOrder::getGarOrderAgreementTime);
188 212 // 全部
189 213 if (GlobalStatus.GarOrderStatus.ALL_ORDER.getValue().equals(type)) {
190   - qw.eq(GarOrder::getGarOrderHandlerId, userId);
191   - List<GarOrder> orderList = list(qw);
  214 + List<GarOrder> orderList = baseMapper.selectList(qw);
192 215 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
193 216 return pageInfo;
194 217 }
  218 + qw.eq(GarOrder::getGarOrderHandlerStatus, type)
  219 + .eq(GarOrder::getGarCancelFlag, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
  220 + List<GarOrder> orderList = baseMapper.selectList(qw);
  221 + PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
  222 + return pageInfo;
195 223 }
196 224 return null;
197 225 }
... ... @@ -210,13 +238,13 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
210 238 update(uw);
211 239 return "订单取消成功";
212 240 }
213   - // 运输员操作 TODO
214   - if (GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription().equals(user.getGarUserType())) {
  241 + // 企业负责人 TODO
  242 + if (GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription().equals(user.getGarUserType())) {
215 243 // 公司所属 待清运- 》 清运中
216 244 if (order.getGarOrderHandlerStatus().equals(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue())
217 245 || GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(dto.getHandleType())) {
218 246 if (StringUtils.isNotEmpty(order.getGarOrderHandlerId())) {
219   - return "订单已经被别人接受啦";
  247 + throw new BizException(ResultCode.CODE_500, "订单已经接受了");
220 248 }
221 249 LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();
222 250 uw.eq(GarOrder::getGarOrderId, dto.getGarOrderId())
... ... @@ -225,7 +253,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
225 253 update(uw);
226 254 return "已接受派单";
227 255 }
228   - // 运输员操作 清运中 ==》已完成
  256 + // 企业负责人 清运中 ==》已完成
229 257 if (GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(order.getGarOrderHandlerStatus())
230 258 && GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(dto.getHandleType())) {
231 259 LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();
... ... @@ -237,7 +265,9 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
237 265 }
238 266 return "派单已完成";
239 267 }
240   - return "什么都没发生";
  268 + throw new BizException(ResultCode.CODE_500);
  269 +
  270 +// return "什么都没发生";
241 271 }
242 272  
243 273 @Override
... ... @@ -358,11 +388,57 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
358 388 @Override
359 389 public List<GarOrderEvaluate> queryEvaluateDetail(String orderId) {
360 390 LambdaQueryWrapper<GarOrderEvaluate> qw = new LambdaQueryWrapper<>();
361   - qw.eq(GarOrderEvaluate::getGarOrderId,orderId);
  391 + qw.eq(GarOrderEvaluate::getGarOrderId, orderId);
362 392 List<GarOrderEvaluate> evaluateList = garOrderEvaluateService.list(qw);
363 393 return evaluateList;
364 394 }
365 395  
  396 + @Override
  397 + public void dispatchOrder(DispatchDto dto) {
  398 + // TODO
  399 + GarOrder order = getById(dto.getGarOrderId());
  400 + List<GarOrderMatchHandler> handlerList = new ArrayList<>(dto.getTel().size());
  401 + for (String tel : dto.getTel()) {
  402 + GarOrderMatchHandler handler = new GarOrderMatchHandler();
  403 + handler.setGarOrderHandlerTel(tel);
  404 + handler.setGarCancelFlag(order.getGarCancelFlag());
  405 + handler.setGarOrderId(order.getGarOrderId());
  406 + handler.setGarOrderHandlerStatus(order.getGarOrderHandlerStatus());
  407 + handler.setGarOrderHandlerCompanyName(order.getGarOrderCompanyName());
  408 + handler.setGarOrderHandlerCompanyId(order.getGarOrderCompanyId());
  409 + handler.setGarOrderStatus(GlobalStatus.GarOrderStatus.DISPATCH_HANDLE_NEW.getValue());
  410 + handlerList.add(handler);
  411 + }
  412 + handlerService.saveBatch(handlerList);
  413 + order.setGarOrderMatchFlag(GlobalStatus.GarOrderStatus.MATCH_YES.getValue());
  414 + updateById(order);
  415 + }
  416 +
  417 + @Override
  418 + public List<DispatchDriverVo> queryDispatch(String orderId) {
  419 + String tel = SecurityUtils.getLoginUser().getUser().getPhonenumber();
  420 + TransportationEnterprise enterprise = new TransportationEnterprise();
  421 + enterprise.setServicePhone(tel);
  422 + List<TransportationEnterprise> enterprises = transportationEnterpriseService.selectTransportationEnterpriseList(enterprise);
  423 + DriverVo vo = new DriverVo();
  424 + vo.setCompanyId(enterprises.get(0).getId());
  425 + List<DriverVo> driverList = iDriverService.selectDriverList(vo);
  426 + // 选中的司机
  427 + LambdaQueryWrapper<GarOrderMatchHandler> qw = new LambdaQueryWrapper<>();
  428 + qw.eq(GarOrderMatchHandler::getGarOrderId, orderId);
  429 + Map<String, GarOrderMatchHandler> handlerMap = handlerService.list(qw).stream().collect(Collectors.toMap(GarOrderMatchHandler::getGarOrderHandlerTel, item -> item));
  430 +
  431 + List<DispatchDriverVo> voList = driverList.stream().map(item -> {
  432 + DispatchDriverVo dispatchVo = new DispatchDriverVo();
  433 + dispatchVo.setName(item.getName());
  434 + dispatchVo.setTel(item.getPhoneNo());
  435 +// dispatchVo.setLicensePlateNumber(item.);
  436 +// dispatchVo.setChecked();
  437 + return dispatchVo;
  438 + }).collect(Collectors.toList());
  439 + return voList;
  440 + }
  441 +
366 442 private void handleCleanNumber(TransportationEnterpriseVo vo, List<GarOrder> orderList) {
367 443 Long cleanNumber = 0L;
368 444 for (GarOrder order : orderList) {
... ... @@ -374,7 +450,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
374 450 }
375 451  
376 452 private void handleScore(TransportationEnterpriseVo vo, List<GarOrderEvaluate> evaluate) {
377   - int score = 0;
  453 + float score = 0;
378 454 if (CollectionUtil.isNotEmpty(evaluate)) {
379 455 for (GarOrderEvaluate orderEvaluate : evaluate) {
380 456 score += orderEvaluate.getGarEvaluateScore();
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
  View file @f2ac3c9
... ... @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
8 8 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
9 9 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
10 10 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
11   -import com.github.pagehelper.PageHelper;
12 11 import com.github.pagehelper.PageInfo;
13 12 import com.trash.common.core.domain.entity.SysRole;
14 13 import com.trash.common.core.domain.entity.SysUser;
... ... @@ -27,7 +26,6 @@ import com.trash.garbage.global.GlobalRedisProperties;
27 26 import com.trash.garbage.global.GlobalStatus;
28 27 import com.trash.garbage.global.ResultCode;
29 28 import com.trash.garbage.pojo.domain.GarAddress;
30   -import com.trash.garbage.pojo.domain.GarOrder;
31 29 import com.trash.garbage.pojo.domain.GarUser;
32 30 import com.trash.garbage.pojo.dto.AddressDto;
33 31 import com.trash.garbage.pojo.dto.LoginDto;
... ... @@ -96,7 +94,7 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
96 94 try {
97 95 loginDto.setTel(decrypt(loginDto.getEncryptedData(), sessionKey, loginDto.getIv()));
98 96 } catch (Exception e) {
99   - throw new RuntimeException("解密失败");
  97 + throw new BizException(ResultCode.CODE_500, "解密失败");
100 98 }
101 99 }
102 100 // 验证码验证
... ... @@ -136,20 +134,36 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
136 134 loginUser.setToken(token);
137 135 tokenService.refreshToken(loginUser);
138 136 vo.setToken(token);
139   - loginDto.getTel();
140 137 DriverVo driver = new DriverVo();
141 138 driver.setPhoneNo(loginDto.getTel());
142 139 List<DriverVo> driverList = driverService.selectDriverList(driver);
143   - if (CollectionUtil.isEmpty(driverList)) {
144   - vo.setCompanyFlag(false);
  140 +
  141 + // 运输驾驶员
  142 + if (CollectionUtil.isNotEmpty(driverList)) {
  143 + vo.setUserType(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription());
  144 + DriverVo driverVo = driverList.get(0);
  145 + TransportationEnterprise enterprise = enterpriseService.selectTransportationEnterpriseById(driverVo.getCompanyId());
  146 + TransportationEnterprise parentEnterprise = enterpriseService.selectTransportationEnterpriseById(enterprise.getParentId());
  147 + vo.setTransportCompanyName(enterprise.getName());
  148 + vo.setParentCompanyName(parentEnterprise.getName());
  149 + vo.setUserType(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription());
145 150 return vo;
146 151 }
147   - DriverVo driverVo = driverList.get(0);
148   - TransportationEnterprise enterprise = enterpriseService.selectTransportationEnterpriseById(driverVo.getCompanyId());
149   - TransportationEnterprise parentEnterprise = enterpriseService.selectTransportationEnterpriseById(enterprise.getParentId());
150   - vo.setTransportCompanyName(enterprise.getName());
151   - vo.setParentCompanyName(parentEnterprise.getName());
152   - vo.setCompanyFlag(true);
  152 +
  153 + // 企业负责人 TODO
  154 + TransportationEnterprise transportationEnterprise = new TransportationEnterprise();
  155 + transportationEnterprise.setServicePhone(loginDto.getTel());
  156 + List<TransportationEnterprise> enterpriseList = enterpriseService.selectTransportationEnterpriseList(transportationEnterprise);
  157 + if (CollectionUtil.isNotEmpty(enterpriseList)) {
  158 + TransportationEnterprise enterprise = enterpriseList.get(0);
  159 + String companyName = enterprise.getName();
  160 + vo.setUserType(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription());
  161 + vo.setTransportCompanyName(companyName);
  162 + return vo;
  163 + }
  164 +
  165 + // 普通用户 TODO
  166 + vo.setUserType(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription());
153 167 return vo;
154 168 }
155 169  
... ...
trash-garbage/src/main/resources/mapper/GarOrderCarMapper.xml 0 → 100644
  View file @f2ac3c9
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper
  3 + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  4 + "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  5 +<mapper namespace="com.trash.garbage.mapper.GarOrderCarMapper">
  6 +
  7 + <resultMap id="BaseResultMap" type="com.trash.garbage.pojo.domain.GarOrderCar">
  8 + <id property="garId" column="gar_id" jdbcType="VARCHAR"/>
  9 + <result property="garOrderId" column="gar_order_id" jdbcType="VARCHAR"/>
  10 + <result property="garOrderCarType" column="gar_order_car_type" jdbcType="VARCHAR"/>
  11 + <result property="garOrderCarUserType" column="gar_order_car_user_type" jdbcType="TINYINT"/>
  12 + <result property="garCreateTime" column="gar_create_time" jdbcType="TIMESTAMP"/>
  13 + <result property="garUpdateTime" column="gar_update_time" jdbcType="TIMESTAMP"/>
  14 + <result property="garCreateBy" column="gar_create_by" jdbcType="VARCHAR"/>
  15 + <result property="garUpdateBy" column="gar_update_by" jdbcType="VARCHAR"/>
  16 + <result property="garRemark" column="gar_remark" jdbcType="VARCHAR"/>
  17 + </resultMap>
  18 +
  19 + <sql id="Base_Column_List">
  20 + gar_id,gar_order_id,gar_order_car_type,
  21 + gar_order_car_user_type,gar_create_time,gar_update_time,
  22 + gar_create_by,gar_update_by,gar_remark
  23 + </sql>
  24 +</mapper>
... ...
trash-garbage/src/main/resources/mapper/GarOrderMapper.xml
  View file @f2ac3c9
... ... @@ -27,19 +27,18 @@
27 27 <result property="garCancelFlag" column="gar_cancel_flag" jdbcType="TINYINT"/>
28 28 <result property="garEvaluateFlag" column="gar_evaluate_flag" jdbcType="TINYINT"/>
29 29 <result property="garHandlerEvaluateFlag" column="gar_handler_evaluate_flag" jdbcType="TINYINT"/>
30   - <result property="garOrderCarNumber" column="gar_order_car_number" jdbcType="TINYINT"/>
31   - <result property="garOrderCarType" column="gar_order_car_type" jdbcType="TINYINT"/>
  30 + <result property="garOrderMatchFlag" column="gar_order_match_flag" jdbcType="TINYINT"/>
32 31 </resultMap>
33 32  
34 33 <sql id="Base_Column_List">
35 34 gar_order_id
36   - ,gar_order_user_id,gar_order_handle_id,
  35 + ,gar_order_user_id,gar_order_handler_id,
37 36 gar_order_address,gar_order_address_details,gar_order_contact_name,
38 37 gar_order_trash_type,gar_order_contact_tel,gar_order_company_id,
39   - gar_order_company_name,gar_order_company_tel,gar_order_hander_status,
  38 + gar_order_company_name,gar_order_company_tel,gar_order_handler_status,
40 39 gar_order_agreement_time,gar_create_time,gar_update_time,
41 40 gar_create_by,gar_update_by,gar_remark,gar_reason,gar_cancel_flag,
42   - gar_evaluate_flag,gar_order_car_number,gar_order_car_type,gar_handler_evaluate_flag
  41 + gar_evaluate_flag,gar_order_car_number,gar_order_car_type,gar_handler_evaluate_flag,gar_order_match_flag
43 42 </sql>
44 43 <select id="queryCleanNumberByEnterpriseIds" resultType="com.trash.garbage.pojo.domain.GarOrder">
45 44 select gar_order_company_id, count(gar_order_company_id) as count
... ... @@ -51,4 +50,18 @@
51 50 </foreach>
52 51 group by gar_order_company_id
53 52 </select>
  53 + <select id="queryOrderListByTelWithType" resultType="com.trash.garbage.pojo.domain.GarOrder">
  54 + select <include refid="Base_Column_List"></include> from gar_order
  55 + where gar_order_id in (
  56 + select gar_order_id from gar_order_match_handler
  57 + where gar_order_handler_tel = #{garUserTel}
  58 + <if test="type != null">
  59 + and gar_order_status = #{type}
  60 + </if>
  61 + <if test="cancelFlag != null">
  62 + and gar_cancel_flag = #{cancelFlag}
  63 + </if>
  64 + )
  65 +
  66 + </select>
54 67 </mapper>
... ...
trash-garbage/src/main/resources/mapper/GarOrderMatchHandlerMapper.xml 0 → 100644
  View file @f2ac3c9
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper
  3 + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  4 + "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  5 +<mapper namespace="com.trash.garbage.pojo.domain.GarOrderMatchHandler">
  6 +
  7 + <resultMap id="BaseResultMap" type="com.trash.garbage.pojo.domain.GarOrderMatchHandler">
  8 + <id property="garId" column="gar_id" jdbcType="VARCHAR"/>
  9 + <result property="garOrderId" column="gar_order_id" jdbcType="VARCHAR"/>
  10 + <result property="garOrderHandlerTel" column="gar_order_handler_tel" jdbcType="VARCHAR"/>
  11 + <result property="garOrderHandlerStatus" column="gar_order_handler_status" jdbcType="TINYINT"/>
  12 + <result property="garCancelFlag" column="gar_cancel_flag" jdbcType="TINYINT"/>
  13 + <result property="garOrderHandlerName" column="gar_order_handler_name" jdbcType="VARCHAR"/>
  14 + <result property="garOrderHandlerCompanyId" column="gar_order_handler_company_id" jdbcType="VARCHAR"/>
  15 + <result property="garOrderHandlerCompanyName" column="gar_order_handler_company_name" jdbcType="VARCHAR"/>
  16 + <result property="garCreateTime" column="gar_create_time" jdbcType="TIMESTAMP"/>
  17 + <result property="garUpdateTime" column="gar_update_time" jdbcType="TIMESTAMP"/>
  18 + <result property="garCreateBy" column="gar_create_by" jdbcType="VARCHAR"/>
  19 + <result property="garUpdateBy" column="gar_update_by" jdbcType="VARCHAR"/>
  20 + <result property="garRemark" column="gar_remark" jdbcType="VARCHAR"/>
  21 + </resultMap>
  22 +
  23 + <sql id="Base_Column_List">
  24 + gar_id,gar_order_id,gar_order_handler_tel,
  25 + gar_order_handler_status,gar_cancel_flag,gar_order_handler_name,gar_order_handler_company_id,
  26 + gar_order_handler_company_name,gar_create_time,gar_update_time,
  27 + gar_craete_by,gar_update_by,gar_remark
  28 + </sql>
  29 +</mapper>
... ...