feat: 用户消息推送，载重上传

guzijian
1 parent f08ffcd7
Showing 24 changed files with 527 additions and 36 deletions
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/mapper/GarOrderMatchAskMapper.java → trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMatchAskMapper.java
trash-garbage/src/main/java/com/trash/garbage/mapper/mapper/GarOrderMatchDisposalMapper.java → trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMatchDisposalMapper.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarUserOrderMessageHistoryMapper.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarUserOrderMessageMapper.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderMatchAsk.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarUserOrderMessage.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/AskTransportDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/GarUserOrderMessageVo.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailTransportVo.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderService.java
trash-garbage/src/main/java/com/trash/garbage/service/GarUserOrderMessageHistoryService.java
trash-garbage/src/main/java/com/trash/garbage/service/GarUserOrderMessageService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchAskServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchDisposalServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserOrderMessageHistoryServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserOrderMessageServiceImpl.java
trash-garbage/src/main/resources/mapper/GarOrderMapper.xml
@@ -19,10 +19,7 @@ import com.trash.garbage.global.Result;
 import com.trash.garbage.global.ResultCode;
 import com.trash.garbage.pojo.domain.GarOrder;
 import com.trash.garbage.pojo.dto.*;
-import com.trash.garbage.pojo.vo.GarOrderMatchAskVo;
-import com.trash.garbage.pojo.vo.OrderDetailTransportVo;
-import com.trash.garbage.pojo.vo.OrderDetailVo;
-import com.trash.garbage.pojo.vo.ScanDriverDetailVo;
+import com.trash.garbage.pojo.vo.*;
 import com.trash.garbage.service.GarOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -55,6 +52,22 @@ public class GarbageOrderController {
         return Result.OK(garOrderService.saveOrder(dto));
     }
+    @GetMapping("/query/message/list/{pageNo}/{pageSize}")
+    public Result<?> queryOrderMessageList(@PathVariable("pageNo") Integer pageNo, @PathVariable("pageSize") Integer pageSize) {
+        return Result.OK(garOrderService.queryOrderMessageList(pageNo, pageSize));
+    }
+
+    @GetMapping("/query/message/count")
+    public Result<Integer> queryOrderMessageCount() {
+        return Result.OK(garOrderService.queryOrderMessageCount());
+    }
+
+    @PutMapping("/read/message")
+    public Result<?> readMessage(@RequestBody List<String> messageIds) {
+        return Result.OK(garOrderService.readMessage(messageIds));
+    }
+
+
     @RequestMapping("upload")
     public Result<?> uploadFile(@RequestParam("file") MultipartFile file) {
         String fileName = null;
@@ -100,8 +113,8 @@ public class GarbageOrderController {
     }
     @GetMapping("/scan/detail/{askId}")
-    @Log(title = "确认趟次", businessType = BusinessType.INSERT)
-    public Result<GarOrderMatchAskVo> scanDetail(@PathVariable("askId")String askId) {
+    @Log(title = "趟次详情", businessType = BusinessType.INSERT)
+    public Result<GarOrderMatchAskVo> scanDetail(@PathVariable("askId") String askId) {
         return Result.OK(garOrderService.scanDetail(askId));
     }
@@ -182,7 +195,6 @@ public class GarbageOrderController {
         return Result.OK(garOrderService.queryEvaluateDetail(orderId));
     }
-
     @GetMapping("/company")
     public Result<?> queryEnterpriseList(TransportationEnterprise dto) {
         return Result.OK(garOrderService.queryEnterpriseList(dto));
@@ -31,6 +31,8 @@ public class GlobalStatus {
         /**
          * 微信登录
          */
+        ORDER_MESSAGE_READ(1, "消息已读"),
+        ORDER_MESSAGE_UNREAD(0, "消息未读"),
         WX_LOGIN(1, "微信登录"),
         /**
          * 普通登录
@@ -125,4 +127,5 @@ public class GlobalStatus {
             return this.description;
         }
     }
+
 }
-package com.trash.garbage.mapper.mapper;
+package com.trash.garbage.mapper;
 import com.trash.garbage.pojo.domain.GarOrderMatchAsk;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-package com.trash.garbage.mapper.mapper;
+package com.trash.garbage.mapper;
 import com.trash.garbage.pojo.domain.GarOrderMatchDisposal;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+package com.trash.garbage.mapper;
+
+import com.trash.garbage.pojo.domain.GarUserOrderMessageHistory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author 20412
+* @description 针对表【gar_user_order_message_history】的数据库操作Mapper
+* @createDate 2024-05-13 14:31:31
+* @Entity com.trash.garbage.pojo.domain.GarUserOrderMessageHistory
+*/
+public interface GarUserOrderMessageHistoryMapper extends BaseMapper<GarUserOrderMessageHistory> {
+
+}
+
+
+
+
+package com.trash.garbage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.trash.garbage.pojo.domain.GarUserOrderMessage;
+import com.trash.garbage.pojo.vo.GarUserOrderMessageVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+* @author 20412
+* @description 针对表【gar_user_order_message】的数据库操作Mapper
+* @createDate 2024-05-13 13:44:12
+* @Entity garbage.domain.GarUserOrderMessage
+*/
+public interface GarUserOrderMessageMapper extends BaseMapper<GarUserOrderMessage> {
+
+    List<GarUserOrderMessageVo> queryMessageListByUserIdWithState(@Param("userId") String userId, @Param("status") Integer status);
+}
+
+
+
+
@@ -36,6 +36,7 @@ public class GarOrderMatchAsk implements Serializable {
      * 
      */
     private String garOrderHandlerTel;
+    private Double garCarryingWeight;
     /**
      * 
@@ -204,4 +205,12 @@ public class GarOrderMatchAsk implements Serializable {
     public void setGarOrderContainerVolume(String garOrderContainerVolume) {
         this.garOrderContainerVolume = garOrderContainerVolume;
     }
+
+    public Double getGarCarryingWeight() {
+        return garCarryingWeight;
+    }
+
+    public void setGarCarryingWeight(Double garCarryingWeight) {
+        this.garCarryingWeight = garCarryingWeight;
+    }
 }
 \ No newline at end of file
+package com.trash.garbage.pojo.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 
+ * @TableName gar_user_order_message
+ */
+@TableName(value ="gar_user_order_message")
+@ToString
+@EqualsAndHashCode
+public class GarUserOrderMessage implements Serializable {
+    /**
+     * 
+     */
+    @TableId
+    private String garId;
+
+    /**
+     * 
+     */
+    private String garContent;
+
+    /**
+     * 
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date garCreateTime;
+
+    /**
+     * 
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date garUpdateTime;
+
+    /**
+     * 
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String garCreateBy;
+
+    /**
+     * 
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String garUpdateBy;
+
+    /**
+     * 
+     */
+    private String garRemark;
+
+    private String garUserId;
+
+    private String garUserTel;
+
+    private Integer garMessageState;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+    public Integer getGarMessageState() {
+        return garMessageState;
+    }
+
+    public void setGarMessageState(Integer garMessageState) {
+        this.garMessageState = garMessageState;
+    }
+
+    public String getGarId() {
+        return garId;
+    }
+
+    public void setGarId(String garId) {
+        this.garId = garId;
+    }
+
+    public String getGarContent() {
+        return garContent;
+    }
+
+    public void setGarContent(String garContent) {
+        this.garContent = garContent;
+    }
+
+    public Date getGarCreateTime() {
+        return garCreateTime;
+    }
+
+    public void setGarCreateTime(Date garCreateTime) {
+        this.garCreateTime = garCreateTime;
+    }
+
+    public Date getGarUpdateTime() {
+        return garUpdateTime;
+    }
+
+    public void setGarUpdateTime(Date garUpdateTime) {
+        this.garUpdateTime = garUpdateTime;
+    }
+
+    public String getGarCreateBy() {
+        return garCreateBy;
+    }
+
+    public void setGarCreateBy(String garCreateBy) {
+        this.garCreateBy = garCreateBy;
+    }
+
+    public String getGarUpdateBy() {
+        return garUpdateBy;
+    }
+
+    public void setGarUpdateBy(String garUpdateBy) {
+        this.garUpdateBy = garUpdateBy;
+    }
+
+    public String getGarRemark() {
+        return garRemark;
+    }
+
+    public void setGarRemark(String garRemark) {
+        this.garRemark = garRemark;
+    }
+
+    public String getGarUserId() {
+        return garUserId;
+    }
+
+    public void setGarUserId(String garUserId) {
+        this.garUserId = garUserId;
+    }
+
+    public String getGarUserTel() {
+        return garUserTel;
+    }
+
+    public void setGarUserTel(String garUserTel) {
+        this.garUserTel = garUserTel;
+    }
+}
 \ No newline at end of file
@@ -5,6 +5,7 @@ import lombok.ToString;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 /**
@@ -17,6 +18,8 @@ public class AskTransportDto {
     private String garOrderId;
     @NotBlank(message = "驾驶员id为不能为空")
     private String garOrderHandlerId;
+    @NotNull(message = "车辆载重不能为空")
+    private Double garCarryingWeight;
     @NotBlank(message = "垃圾类型不能为空")
     private String garOrderTrashType;
     @NotBlank(message = "车牌号不能为空")
@@ -34,6 +37,14 @@ public class AskTransportDto {
     @NotEmpty(message = "请上传全景图片")
     private List<String> fillImageList;
+    public Double getGarCarryingWeight() {
+        return garCarryingWeight;
+    }
+
+    public void setGarCarryingWeight(Double garCarryingWeight) {
+        this.garCarryingWeight = garCarryingWeight;
+    }
+
     public String getGarOrderHandlerCompanyName() {
         return garOrderHandlerCompanyName;
     }
+package com.trash.garbage.pojo.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@ToString
+@EqualsAndHashCode
+public class GarUserOrderMessageVo {
+    private String garId;
+    private String garTitle;
+    private String garContent;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date garCreateTime;
+
+    public Date getGarCreateTime() {
+        return garCreateTime;
+    }
+
+    public void setGarCreateTime(Date garCreateTime) {
+        this.garCreateTime = garCreateTime;
+    }
+
+    public String getGarId() {
+        return garId;
+    }
+
+    public void setGarId(String garId) {
+        this.garId = garId;
+    }
+
+    public String getGarTitle() {
+        return garTitle;
+    }
+
+    public void setGarTitle(String garTitle) {
+        this.garTitle = garTitle;
+    }
+
+    public String getGarContent() {
+        return garContent;
+    }
+
+    public void setGarContent(String garContent) {
+        this.garContent = garContent;
+    }
+}
@@ -66,6 +66,15 @@ public class OrderDetailTransportVo {
         private String garAskId;
         private String garHandlerCarCode;
         private String garOrderContainerVolume;
+        private Double garCarryingWeight;
+
+        public Double getGarCarryingWeight() {
+            return garCarryingWeight;
+        }
+
+        public void setGarCarryingWeight(Double garCarryingWeight) {
+            this.garCarryingWeight = garCarryingWeight;
+        }
         public String getGarOrderContainerVolume() {
             return garOrderContainerVolume;
@@ -235,4 +244,5 @@ public class OrderDetailTransportVo {
     public void setGarOrderCompanyTel(String garOrderCompanyTel) {
         this.garOrderCompanyTel = garOrderCompanyTel;
     }
+
 }
@@ -5,7 +5,6 @@ import com.github.pagehelper.PageInfo;
 import com.trash.enterprise.domain.TransportationEnterprise;
 import com.trash.garbage.pojo.domain.GarOrder;
 import com.trash.garbage.pojo.domain.GarOrderEvaluate;
-import com.trash.garbage.pojo.domain.GarOrderMatchAsk;
 import com.trash.garbage.pojo.domain.GarOrderMatchHandler;
 import com.trash.garbage.pojo.dto.*;
 import com.trash.garbage.pojo.vo.*;
@@ -91,4 +90,9 @@ public interface GarOrderService extends IService&lt;GarOrder&gt; {
     String createHandlerQrCode(String orderId);
+    PageInfo queryOrderMessageList(Integer pageNo, Integer pageSize);
+
+    String readMessage(List<String> messageIds);
+
+    Integer queryOrderMessageCount();
 }
+package com.trash.garbage.service;
+
+import com.trash.garbage.pojo.domain.GarUserOrderMessageHistory;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author 20412
+* @description 针对表【gar_user_order_message_history】的数据库操作Service
+* @createDate 2024-05-13 14:31:31
+*/
+public interface GarUserOrderMessageHistoryService extends IService<GarUserOrderMessageHistory> {
+
+}
+package com.trash.garbage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.trash.garbage.pojo.domain.GarUserOrderMessage;
+import com.trash.garbage.pojo.vo.GarUserOrderMessageVo;
+
+import java.util.List;
+
+/**
+* @author 20412
+* @description 针对表【gar_user_order_message】的数据库操作Service
+* @createDate 2024-05-13 13:44:12
+*/
+public interface GarUserOrderMessageService extends IService<GarUserOrderMessage> {
+
+    List<GarUserOrderMessageVo> queryMessageListByUserIdWithState(String userId, Integer status);
+}
 package com.trash.garbage.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.trash.garbage.mapper.mapper.GarOrderMatchAskMapper;
+import com.trash.garbage.mapper.GarOrderMatchAskMapper;
 import com.trash.garbage.pojo.domain.GarOrderMatchAsk;
-import com.trash.garbage.pojo.vo.DispatchDisposalVo;
 import com.trash.garbage.service.GarOrderMatchAskService;
 import org.springframework.stereotype.Service;
-import java.util.List;
-
 /**
 * @author 20412
 * @description 针对表【gar_order_match_ask(匹配处理场所人员表)】的数据库操作Service实现
 package com.trash.garbage.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.trash.garbage.mapper.mapper.GarOrderMatchDisposalMapper;
+import com.trash.garbage.mapper.GarOrderMatchDisposalMapper;
 import com.trash.garbage.pojo.domain.GarOrderMatchDisposal;
 import com.trash.garbage.pojo.vo.DispatchDisposalVo;
 import com.trash.garbage.service.GarOrderMatchDisposalService;
@@ -43,43 +43,36 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         implements GarOrderService {
+    @Autowired
+    private GarUserOrderMessageService orderMessageService;
+    @Autowired
+    private GarUserOrderMessageHistoryService orderMessageHistoryService;
     @Resource
     private SMSUtils smsUtils;
-
     @Autowired
     private GarOrderImageService garOrderImageService;
-
     @Autowired
     private GarOrderMatchAskService askService;
-
     @Autowired
     private GarAddressService garAddressService;
-
     @Autowired
     private GarOrderMatchAskService matchAskService;
-
     @Autowired
     private GarOrderMatchDisposalService disposalService;
     @Autowired
     private ITransportationEnterpriseService transportationEnterpriseService;
-
     @Autowired
     private GarOrderEvaluateService garOrderEvaluateService;
     @Autowired
     private GarSearchHistoryService garSearchHistoryService;
-
     @Autowired
     private GarUserService garUserService;
-
     @Autowired
     private IDriverService driverService;
-
     @Autowired
     private GarOrderMatchHandlerService handlerService;
-
     @Autowired
     private GarOrderCarService garOrderCarService;
-
     @Autowired
     private RedisCache redisCache;
@@ -354,8 +347,10 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             String tel = GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription().equals(user.getGarUserType()) ?
                     order.getGarOrderCompanyTel() : order.getGarOrderContactTel();
             String message = GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription().equals(user.getGarUserType()) ?
-                    "居民取消订单：您的清运订单已取消，详情可在小程序查看" : "企业拒单";
+                    "您的清运订单已取消，详情可在小程序查看" : "企业拒单";
             smsUtils.sendMessage(tel, message);
+            // TODO 用户消息通知 订单菜单消息
+            userOrderMessageSend(order, message);
             return "订单取消成功";
         }
         // 用户修改
@@ -384,7 +379,10 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             order.setGarRealCarCount(garOrderCars.size());
             updateById(order);
             // TODO  发送短信用户修改订单了
-            smsUtils.sendMessage(dto.getGarOrderCompanyTel(), "您的清运订单有修改，请及时查看并处理!");
+            String message = "您的清运订单有修改，请及时查看并处理!";
+            smsUtils.sendMessage(dto.getGarOrderCompanyTel(), message);
+            // TODO 用户消息通知 订单菜单消息
+            userOrderMessageSend(order, message);
             return "修改成功";
         }
         // 企业负责人 清运-》完成
@@ -398,7 +396,10 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                         .set(GarOrder::getGarOrderCompanyUserId, user.getGarUserId());
                 update(uw);
                 // TODO 短信提醒
-                smsUtils.sendMessage(order.getGarOrderContactTel(), "运输公司已接受订单号为 " + order.getGarOrderId() + " 的订单。");
+                String message = "运输公司已接受订单号为 " + order.getGarOrderId() + " 的订单。";
+                smsUtils.sendMessage(order.getGarOrderContactTel(), message);
+                // TODO 用户消息通知 订单菜单消息
+                userOrderMessageSend(order, message);
                 return "已接受订单";
             }
             // 企业负责人 清运中 ==》已完成
@@ -424,13 +425,25 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 handlerService.update(uwh);
             }
             // TODO 短信提醒
-            smsUtils.sendMessage(order.getGarOrderContactTel(), "运输公司已完成订单号为 " + order.getGarOrderId() + " 的订单。");
+            String message = "运输公司已完成订单号为 " + order.getGarOrderId() + " 的订单。";
+            smsUtils.sendMessage(order.getGarOrderContactTel(), message);
+            // TODO 用户消息通知 订单菜单消息
+            userOrderMessageSend(order, message);
             return "订单已完成";
         }
         throw new BizException(ResultCode.CODE_400);
     }
+    private void userOrderMessageSend(GarOrder order, String message) {
+        GarUserOrderMessage guom = new GarUserOrderMessage();
+        guom.setGarMessageState(GlobalStatus.GarUserStatusEnum.ORDER_MESSAGE_UNREAD.getStatus());
+        guom.setGarContent(message);
+        guom.setGarUserId(order.getGarCreateBy());
+        guom.setGarUserTel(order.getGarOrderContactTel());
+        orderMessageService.save(guom);
+    }
+
     @Override
     public String uploadImageUrlByType(UploadDto dto) {
         List<GarOrderImage> garOrderImages = new ArrayList<>(dto.getImageUrls().size());
@@ -784,7 +797,6 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     @Override
     public String askTransport(AskTransportDto dto) {
-
         // TODO 判断是否运载完毕  已经到预估趟次则不在生成验证码
         String orderId = dto.getGarOrderId();
@@ -815,13 +827,15 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             garOrderImageService.saveBatch(imageList);
             if (transportCount == (order.getGarRealCarCount() - 1)) {
                 // TODO 发送短信  通知企业和用户 修改订单状态为完成 disposal 和 handler表的状态一起修改
-                smsUtils.sendMessage(order.getGarOrderContactTel(), "您的清运订单已完成，可前往小程序进行评价，感谢您的使用");
+                String message = "您的清运订单已完成，可前往小程序进行评价，感谢您的使用";
+                smsUtils.sendMessage(order.getGarOrderContactTel(), message);
                 smsUtils.sendMessage(order.getGarOrderCompanyTel(), "您的清运订单已完成，详情可在小程序查看。");
                 successOrder(order, dto);
                 redisCache.deleteObject(orderId);
+                // TODO 用户消息通知 订单菜单消息
+                userOrderMessageSend(order, message);
                 return "当前订单已完成";
             }
-            //TODO 短信通知
             return "当前趟次记录成功";
         }
@@ -900,6 +914,45 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         return code;
     }
+    @Override
+    public PageInfo queryOrderMessageList(Integer pageNo, Integer pageSize) {
+        PageHelper.startPage(pageNo, pageSize);
+        String userId = SecurityUtils.getLoginUser().getUser().getUserId();
+        LambdaQueryWrapper<GarUserOrderMessage> qw = new LambdaQueryWrapper<>();
+        qw.eq(GarUserOrderMessage::getGarUserId, userId)
+                .eq(GarUserOrderMessage::getGarMessageState, GlobalStatus.GarUserStatusEnum.ORDER_MESSAGE_UNREAD.getStatus());
+        List<GarUserOrderMessageVo> messageVos = orderMessageService.queryMessageListByUserIdWithState(userId, GlobalStatus.GarUserStatusEnum.ORDER_MESSAGE_UNREAD.getStatus());
+        PageInfo<GarUserOrderMessageVo> pageInfo = new PageInfo<>(messageVos, pageSize);
+        return pageInfo;
+    }
+
+    @Override
+    public String readMessage(List<String> messageIds) {
+        LambdaQueryWrapper<GarUserOrderMessage> qw = new LambdaQueryWrapper<>();
+        qw.in(GarUserOrderMessage::getGarId, messageIds);
+        List<GarUserOrderMessage> messageList = orderMessageService.list(qw);
+        List<GarUserOrderMessageHistory> historyList = messageList.stream().map(item -> {
+            GarUserOrderMessageHistory history = new GarUserOrderMessageHistory();
+            item.setGarMessageState(GlobalStatus.GarUserStatusEnum.ORDER_MESSAGE_READ.getStatus());
+            BeanUtils.copyProperties(item, history, "garId");
+            return history;
+        }).collect(Collectors.toList());
+        orderMessageHistoryService.saveBatch(historyList);
+        // 删除数据
+        orderMessageService.removeByIds(messageIds);
+        return "消息确认成功";
+    }
+
+    @Override
+    public Integer queryOrderMessageCount() {
+        String userId = SecurityUtils.getLoginUser().getUser().getUserId();
+        LambdaQueryWrapper<GarUserOrderMessage> qw = new LambdaQueryWrapper<>();
+        qw.eq(GarUserOrderMessage::getGarUserId, userId)
+                .eq(GarUserOrderMessage::getGarMessageState, GlobalStatus.GarUserStatusEnum.ORDER_MESSAGE_UNREAD.getStatus());
+        int count = orderMessageService.count(qw);
+        return count;
+    }
+
     private void handleCleanNumber(TransportationEnterpriseVo vo, List<GarOrder> orderList) {
         Long cleanNumber = 0L;
         for (GarOrder order : orderList) {
+package com.trash.garbage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.trash.garbage.pojo.domain.GarUserOrderMessageHistory;
+import com.trash.garbage.service.GarUserOrderMessageHistoryService;
+import com.trash.garbage.mapper.GarUserOrderMessageHistoryMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author 20412
+* @description 针对表【gar_user_order_message_history】的数据库操作Service实现
+* @createDate 2024-05-13 14:31:31
+*/
+@Service
+public class GarUserOrderMessageHistoryServiceImpl extends ServiceImpl<GarUserOrderMessageHistoryMapper, GarUserOrderMessageHistory>
+    implements GarUserOrderMessageHistoryService{
+
+}
+
+
+
+
+package com.trash.garbage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.trash.garbage.pojo.domain.GarUserOrderMessage;
+import com.trash.garbage.pojo.vo.GarUserOrderMessageVo;
+import com.trash.garbage.service.GarUserOrderMessageService;
+import com.trash.garbage.mapper.GarUserOrderMessageMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+* @author 20412
+* @description 针对表【gar_user_order_message】的数据库操作Service实现
+* @createDate 2024-05-13 13:44:12
+*/
+@Service
+public class GarUserOrderMessageServiceImpl extends ServiceImpl<GarUserOrderMessageMapper, GarUserOrderMessage>
+    implements GarUserOrderMessageService {
+
+    @Override
+    public List<GarUserOrderMessageVo> queryMessageListByUserIdWithState(String userId, Integer status) {
+        return baseMapper.queryMessageListByUserIdWithState(userId, status);
+    }
+}
+
+
+
+
@@ -52,6 +52,7 @@
             <result property="garHandlerCarCode" column="gar_handler_car_code"/>
             <result property="garOrderContainerVolume" column="gar_order_container_volume"/>
             <result property="fillImage" column="fill_image"/>
+            <result property="garCarryingWeight" column="gar_carrying_weight" jdbcType="DOUBLE"/>
             <result property="garAskId" column="gar_ask_id"/>
         </collection>
     </resultMap>
@@ -197,6 +198,7 @@
                `disposal`.gar_order_disposal_status,
                `order`.gar_real_car_count,
                `ask`.gar_id gar_ask_id,
+               `ask`.gar_carrying_weight,
                `ask`.gar_handler_car_code,
                `ask`.gar_order_handler_id
         FROM gar_order `order`
@@ -2,11 +2,12 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.trash.garbage.mapper.mapper.GarOrderMatchAskMapper">
+<mapper namespace="com.trash.garbage.mapper.GarOrderMatchAskMapper">
     <resultMap id="BaseResultMap" type="com.trash.garbage.pojo.domain.GarOrderMatchAsk">
             <id property="garId" column="gar_id" jdbcType="VARCHAR"/>
             <result property="garOrderId" column="gar_order_id" jdbcType="VARCHAR"/>
+            <result property="garCarryingWeight" column="gar_carrying_weight" jdbcType="VARCHAR"/>
             <result property="garOrderHandlerTel" column="gar_order_handler_tel" jdbcType="VARCHAR"/>
             <result property="garOrderHandlerName" column="gar_order_handler_name" jdbcType="VARCHAR"/>
             <result property="garOrderContainerVolume" column="gar_order_container_volume" jdbcType="VARCHAR"/>
@@ -20,7 +21,7 @@
     </resultMap>
     <sql id="Base_Column_List">
-        gar_id,gar_order_id,gar_order_handler_tel,gar_order_container_volume,
+        gar_id,gar_order_id,gar_order_handler_tel,gar_order_container_volume,gar_carrying_weight,
         gar_order_handler_name,gar_order_handler_company_id,gar_order_handler_company_name,
         gar_create_time,gar_update_time,gar_create_by,
         gar_update_by,gar_remark
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.trash.garbage.mapper.mapper.GarOrderMatchDisposalMapper">
+<mapper namespace="com.trash.garbage.mapper.GarOrderMatchDisposalMapper">
     <resultMap id="BaseResultMap" type="com.trash.garbage.pojo.domain.GarOrderMatchDisposal">
         <id property="garId" column="gar_id" jdbcType="VARCHAR"/>
+<?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.GarUserOrderMessageHistoryMapper">
+
+    <resultMap id="BaseResultMap" type="com.trash.garbage.pojo.domain.GarUserOrderMessageHistory">
+            <id property="garId" column="gar_id" jdbcType="VARCHAR"/>
+            <result property="garContent" column="gar_content" jdbcType="VARCHAR"/>
+            <result property="garCreateTime" column="gar_create_time" jdbcType="TIMESTAMP"/>
+            <result property="garUpdateTime" column="gar_update_time" jdbcType="TIMESTAMP"/>
+            <result property="garCreateBy" column="gar_create_by" jdbcType="VARCHAR"/>
+            <result property="garUpdateBy" column="gar_update_by" jdbcType="VARCHAR"/>
+            <result property="garRemark" column="gar_remark" jdbcType="VARCHAR"/>
+            <result property="garUserId" column="gar_user_id" jdbcType="VARCHAR"/>
+            <result property="garUserTel" column="gar_user_tel" jdbcType="VARCHAR"/>
+            <result property="garMessageState" column="gar_message_state" jdbcType="TINYINT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        gar_id,gar_content,gar_create_time,
+        gar_update_time,gar_create_by,gar_update_by,
+        gar_remark,gar_user_id,gar_user_tel,
+        gar_message_state
+    </sql>
+</mapper>
+<?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.GarUserOrderMessageMapper">
+
+    <resultMap id="BaseResultMap" type="com.trash.garbage.pojo.domain.GarUserOrderMessage">
+            <id property="garId" column="gar_id" jdbcType="VARCHAR"/>
+            <result property="garContent" column="gar_content" jdbcType="VARCHAR"/>
+            <result property="garCreateTime" column="gar_create_time" jdbcType="TIMESTAMP"/>
+            <result property="garUpdateTime" column="gar_update_time" jdbcType="TIMESTAMP"/>
+            <result property="garCreateBy" column="gar_create_by" jdbcType="VARCHAR"/>
+            <result property="garUpdateBy" column="gar_update_by" jdbcType="VARCHAR"/>
+            <result property="garRemark" column="gar_remark" jdbcType="VARCHAR"/>
+            <result property="garUserId" column="gar_user_id" jdbcType="VARCHAR"/>
+            <result property="garUserTel" column="gar_user_tel" jdbcType="VARCHAR"/>
+            <result property="garMessageState" column="gar_message_state" jdbcType="TINYINT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        gar_id,gar_content,gar_create_time,gar_user_id,
+        gar_update_time,gar_create_by,gar_update_by,
+        gar_remark,gar_user_tel,gar_message_state
+    </sql>
+    <select id="queryMessageListByUserIdWithState"
+            resultType="com.trash.garbage.pojo.vo.GarUserOrderMessageVo">
+        select gar_id,gar_content,gar_user_tel
+        from gar_user_order_message
+        <where>
+            <if test="userId != null">
+                and gar_user_id = #{userId}
+            </if>
+            <if test="userId != null">
+                and gar_message_state = #{status}
+            </if>
+        </where>
+
+    </select>
+</mapper>