修改

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PublishTaskInfoServiceImpl.java

@@ -1118,10 +1118,10 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
             throw new YException(YExceptionEnum.TASK_OVERDUE);
         }
         //判断司机是否有正在进行的订单
-        List<OrderInfo> orderInfos = orderInfoService.getData(publishTaskInfo.getDriverCommonId());
-        if (!CollectionUtils.isEmpty(orderInfos)){
-            throw new YException(YExceptionEnum.CONDUCTED_ORDER);
-        }
+//        List<OrderInfo> orderInfos = orderInfoService.getData(publishTaskInfo.getDriverCommonId());
+//        if (!CollectionUtils.isEmpty(orderInfos)){
+//            throw new YException(YExceptionEnum.CONDUCTED_ORDER);
+//        }
         //新增订单信息
         OrderInfo orderInfo = new OrderInfo();
         orderInfo.setId(IdGenerator.generateUUID());
@@ -1229,43 +1229,27 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String examine(PublishTaskInfo publishTaskInfo) {
-        //查询列表
+        //查询任务
         PublishTaskInfo publishTaskInfo1 = this.selectById(publishTaskInfo.getId());
-
         if (publishTaskInfo1 != null) {
             //通过
             if ("1".equals(publishTaskInfo.getFlag())) {
                 publishTaskInfo1.setStatusKey(StatusEnum.TASK_REJECT.getFlag());
                 publishTaskInfo1.setStatus(StatusEnum.TASK_REJECT.getName());
-//                geTuiUtils.pushByCid("审核通知", "您的司机认证申请已审核通过", commonUser.getId());
-//                UnimallMessage messageDO = new UnimallMessage();
-//                messageDO.setAdminId(commonUser.getId());
-//                messageDO.setCustomer(commonUser.getUserName());
-//                messageDO.setOperation("审核通知");
-//                messageDO.setResult("您的司机认证申请已审核通过");
-//                messageDO.setGmtUpdate(new java.util.Date());
-//                messageDO.setGmtCreate(new Date());
-//                messageDO.setTaskId(IdGenerator.generateUUID());
-//                messageDO.setCompanyId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
-//                messageDO.setPath("XXXXX");
-//                webSocket.sendOneMessage(messageDO);
             }
-//            驳回
+            //驳回
             else if ("2".equals(publishTaskInfo.getFlag())) {
                 publishTaskInfo1.setStatusKey(StatusEnum.TASK_FAILED.getFlag());
                 publishTaskInfo1.setStatus(StatusEnum.TASK_FAILED.getName());
-//                geTuiUtils.pushByCid("驳回通知", "您的司机认证申请已被驳回", commonUser.getId());
-//                UnimallMessage messageDO = new UnimallMessage();
-//                messageDO.setAdminId(commonUser.getId());
-//                messageDO.setCustomer(commonUser.getUserName());
-//                messageDO.setOperation("驳回通知");
-//                messageDO.setResult("您的司机认证申请已被驳回");
-//                messageDO.setGmtUpdate(new java.util.Date());
-//                messageDO.setGmtCreate(new Date());
-//                messageDO.setTaskId(IdGenerator.generateUUID());
-//                messageDO.setCompanyId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
-//                messageDO.setPath("XXXXX");
-//                webSocket.sendOneMessage(messageDO);
+                // 向货主发送信息
+                NewsInfo newsInfo = new NewsInfo();
+                newsInfo.setCrtCommonId("000");
+                newsInfo.setReCommonId(publishTaskInfo1.getCommonId());
+                newsInfo.setNewsContent("您发布的货运任务被驳回。");
+                newsInfo.setBussId(publishTaskInfo1.getId());
+                newsInfo.setNewsTypeKey("1");
+                newsInfo.setNewsType("系统消息");
+                newsInfoService.addNewsInfo(newsInfo);
             }
             //更改信息
             this.updateById(publishTaskInfo1);

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/OrderInfoMapper.xml

@@ -422,6 +422,7 @@
     AND common_id = #{commonId}
     AND DATE_SUB(CURDATE(), INTERVAL 1 MONTH) <= date(create_date)
     AND order_status_key < 15
+    AND order_status_key > 1
     ORDER BY update_date DESC
     </select>