Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun

winsea-haixin-platform-backend/src/main/resources/application.yml

@@ -64,6 +64,8 @@ auth:
     - /ws/**/*
     - /commonUser/*
     - /commonUser/**/*
+    - /patformAnagementEgulations/*
+    - /patformAnagementEgulations/**/*
     - /contractManagementInfo/*
     - /contractManagementInfo/**/*
     - /salePlanInfo/*

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CommonUser.java

@@ -129,6 +129,11 @@ public class CommonUser extends BaseModel<CommonUser> {
      */
     @TableField(exist = false)
     private String identityFlag;
+    /**
+     * 禁用天数
+     */
+    @TableField(exist = false)
+    private Integer disabledDays;
 
 
     @Override

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyCargoOwnerInfo.java

@@ -4,12 +4,15 @@ import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yh.saas.common.support.entity.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -153,6 +156,18 @@ public class HyCargoOwnerInfo extends BaseModel<HyCargoOwnerInfo> {
      * 审核通过一次（1是）
      */
     private String passOnce;
+    /**
+     * 解禁日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private String liftingDate;
+
+    /**
+     * 禁用天数
+     */
+    @TableField(exist = false)
+    private Integer disabledDays;
 
     @TableField(exist = false)
     private List<HyCargoOwnerCompInfo> hyCargoOwnerCompInfoList;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyDriverInfo.java

@@ -239,6 +239,12 @@ public class HyDriverInfo extends BaseModel<HyDriverInfo> {
      * 审核通过一次（1是）
      */
     private String passOnce;
+    /**
+     * 解禁日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private String liftingDate;
 
 
     /**
@@ -289,6 +295,12 @@ public class HyDriverInfo extends BaseModel<HyDriverInfo> {
     @TableField(exist = false)
     private String avatarUrl;
 
+    /**
+     * 禁用天数
+     */
+    @TableField(exist = false)
+    private Integer disabledDays;
+
     @TableField(exist = false)
     private String token;
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/exception/YExceptionEnum.java

@@ -52,6 +52,7 @@ public enum YExceptionEnum {
 	CONG_TERM_OF_VADMIN("ERROR29", "该账号已被锁定"),
 	CONG_TERM_OF_PASS("ERROR30", "用户名或密码错误！"),
 	PAYEE_CARD_ADD("ERROR31", "请您添加银行卡！"),
+	CAR_FINISH_ADD("ERROR32", "尚未完成车辆认证！"),
 	;
 	@Getter
 	private String value;

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

@@ -17,9 +17,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -242,10 +240,19 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
             }
             // 禁用
 //            else if("3".equals(hyCargoOwnerInfo.getFlag())){
+//                hyCargoOwnerInfo1.setDisablingStatus(hyCargoOwnerInfo1.getAuthenticationStatus());
+//                hyCargoOwnerInfo1.setDisablingStatusKey(hyCargoOwnerInfo1.getAuthenticationStatusKey());
+//                hyCargoOwnerInfo1.setDisablingBackStatus(hyCargoOwnerInfo1.getBackStageStatus());
+//                hyCargoOwnerInfo1.setDisablingBackStatusKey(hyCargoOwnerInfo1.getBackStageStatusKey());
 //                hyCargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED_NO.getFlag());
 //                hyCargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED_NO.getName());
 //                hyCargoOwnerInfo1.setBackStageStatus(StatusEnum.IDENTITY_COMPLETED_NO.getName());
 //                hyCargoOwnerInfo1.setBackStageStatusKey(StatusEnum.IDENTITY_COMPLETED_NO.getFlag());
+//                //计算解禁日期
+//                Calendar calendar1 = Calendar.getInstance();
+//                calendar1.add(Calendar.DATE, hyCargoOwnerInfo.getDisabledDays());
+//                Date date = calendar1.getTime();
+//                hyCargoOwnerInfo1.setLiftingDate(date);
 //            }
 //            //启用
 //            else if("4".equals(hyCargoOwnerInfo.getFlag())){

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

@@ -84,7 +84,7 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, HyCar
                 NewsInfo newsInfo = new NewsInfo();
                 newsInfo.setCrtCommonId(orderInfo.getCommonId());
                 newsInfo.setReCommonId(orderInfo.getCargoCommonId());
-                newsInfo.setNewsTitle("司机 " + orderInfo.getDriverName() + "已确认装车，订单编号" + orderInfo.getOrderNo() + "。");
+                newsInfo.setNewsTitle("司机已装车");
                 newsInfo.setNewsContent("司机 " + orderInfo.getDriverName() + "已确认装车，订单编号" + orderInfo.getOrderNo() + "。");
                 newsInfo.setNumber(orderInfo.getOrderNo());
                 newsInfo.setBussId(orderInfo.getId());
@@ -134,7 +134,7 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, HyCar
                 NewsInfo newsInfo = new NewsInfo();
                 newsInfo.setCrtCommonId(orderInfo.getCommonId());
                 newsInfo.setReCommonId(orderInfo.getCargoCommonId());
-                newsInfo.setNewsTitle("司机 " + orderInfo.getDriverName() + "已确认卸车，订单编号" + orderInfo.getOrderNo() + "。");
+                newsInfo.setNewsTitle("司机已卸车");
                 newsInfo.setNewsContent("司机 " + orderInfo.getDriverName() + "已确认卸车，订单编号" + orderInfo.getOrderNo() + "。");
                 newsInfo.setNumber(orderInfo.getOrderNo());
                 newsInfo.setBussId(orderInfo.getId());

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

@@ -47,8 +47,10 @@ import org.springframework.util.StringUtils;
 
 import com.baomidou.mybatisplus.mapper.Wrapper;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.sql.*;
+import java.util.Date;
 import java.util.stream.Collectors;
 
 /**
@@ -293,6 +295,8 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String editUserInfo(CommonUser commonUser) throws ServiceException {
+        //获取当前年月日
+        SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
         //货主
         if ("1".equals(commonUser.getIdentityFlag())) {
             //查询货主信息
@@ -309,18 +313,24 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
                     hyCargoOwnerInfo.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED_NO.getName());
                     hyCargoOwnerInfo.setBackStageStatus(StatusEnum.IDENTITY_COMPLETED_NO.getName());
                     hyCargoOwnerInfo.setBackStageStatusKey(StatusEnum.IDENTITY_COMPLETED_NO.getFlag());
+                    //计算解禁日期
+                    Calendar calendar1 = Calendar.getInstance();
+                    calendar1.add(Calendar.DATE, commonUser.getDisabledDays());
+                    String date = f.format(calendar1.getTime());
+                    hyCargoOwnerInfo.setLiftingDate(date);
                     commonUser.setStatus(0);
                 }
                 //启用
                 else {
                     hyCargoOwnerInfo.setAuthenticationStatusKey(hyCargoOwnerInfo.getDisablingStatusKey());
                     hyCargoOwnerInfo.setAuthenticationStatus(hyCargoOwnerInfo.getDisablingStatus());
-                    hyCargoOwnerInfo.setBackStageStatus(hyCargoOwnerInfo.getDisablingBackStatusKey());
-                    hyCargoOwnerInfo.setBackStageStatusKey(hyCargoOwnerInfo.getDisablingBackStatus());
-                    hyCargoOwnerInfo.setDisablingStatusKey(null);
-                    hyCargoOwnerInfo.setDisablingStatus(null);
-                    hyCargoOwnerInfo.setDisablingBackStatusKey(null);
-                    hyCargoOwnerInfo.setDisablingBackStatus(null);
+                    hyCargoOwnerInfo.setBackStageStatus(hyCargoOwnerInfo.getDisablingBackStatus());
+                    hyCargoOwnerInfo.setBackStageStatusKey(hyCargoOwnerInfo.getDisablingBackStatusKey());
+                    hyCargoOwnerInfo.setDisablingStatusKey("");
+                    hyCargoOwnerInfo.setDisablingStatus("");
+                    hyCargoOwnerInfo.setDisablingBackStatusKey("");
+                    hyCargoOwnerInfo.setDisablingBackStatus("");
+                    hyCargoOwnerInfo.setLiftingDate("");
                     commonUser.setStatus(1);
                 }
                 cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
@@ -342,18 +352,24 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
                     hyDriverInfo.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED_NO.getName());
                     hyDriverInfo.setBackStageStatus(StatusEnum.IDENTITY_COMPLETED_NO.getName());
                     hyDriverInfo.setBackStageStatusKey(StatusEnum.IDENTITY_COMPLETED_NO.getFlag());
+                    //计算解禁日期
+                    Calendar calendar1 = Calendar.getInstance();
+                    calendar1.add(Calendar.DATE, commonUser.getDisabledDays());
+                    String date = f.format(calendar1.getTime());
+                    hyDriverInfo.setLiftingDate(date);
                     commonUser.setStatus(0);
                 }
                 //启用
                 else {
                     hyDriverInfo.setAuthenticationStatusKey(hyDriverInfo.getDisablingStatusKey());
                     hyDriverInfo.setAuthenticationStatus(hyDriverInfo.getDisablingStatus());
-                    hyDriverInfo.setBackStageStatus(hyDriverInfo.getDisablingBackStatusKey());
-                    hyDriverInfo.setBackStageStatusKey(hyDriverInfo.getDisablingBackStatus());
-                    hyDriverInfo.setDisablingStatusKey(null);
-                    hyDriverInfo.setDisablingStatus(null);
-                    hyDriverInfo.setDisablingBackStatusKey(null);
-                    hyDriverInfo.setDisablingBackStatus(null);
+                    hyDriverInfo.setBackStageStatus(hyDriverInfo.getDisablingBackStatus());
+                    hyDriverInfo.setBackStageStatusKey(hyDriverInfo.getDisablingBackStatusKey());
+                    hyDriverInfo.setDisablingStatusKey("");
+                    hyDriverInfo.setDisablingStatus("");
+                    hyDriverInfo.setDisablingBackStatusKey("");
+                    hyDriverInfo.setDisablingBackStatus("");
+                    hyDriverInfo.setLiftingDate("");
                     commonUser.setStatus(1);
                 }
                 driverInfoService.updateById(hyDriverInfo);

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

@@ -418,12 +418,21 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
                 newsInfo.setNewsType("系统消息");
                 newsInfoService.addNewsInfo(newsInfo);
             }
-//            // 禁用
+            // 禁用
 //            else if("3".equals(hyDriverInfo.getFlag())){
+//                hyDriverInfo1.setDisablingStatus(hyDriverInfo1.getAuthenticationStatus());
+//                hyDriverInfo1.setDisablingStatusKey(hyDriverInfo1.getAuthenticationStatusKey());
+//                hyDriverInfo1.setDisablingBackStatus(hyDriverInfo1.getBackStageStatus());
+//                hyDriverInfo1.setDisablingBackStatusKey(hyDriverInfo1.getBackStageStatusKey());
 //                hyDriverInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED_NO.getFlag());
 //                hyDriverInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED_NO.getName());
 //                hyDriverInfo1.setBackStageStatusKey(StatusEnum.IDENTITY_COMPLETED_NO.getFlag());
 //                hyDriverInfo1.setBackStageStatus(StatusEnum.IDENTITY_COMPLETED_NO.getName());
+//                //计算解禁日期
+//                Calendar calendar1 = Calendar.getInstance();
+//                calendar1.add(Calendar.DATE, hyDriverInfo.getDisabledDays());
+//                Date date = calendar1.getTime();
+//                hyDriverInfo1.setLiftingDate(date);
 //            }
 //            else if("4".equals(hyDriverInfo.getFlag())){
 //                hyDriverInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());

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

@@ -166,14 +166,14 @@ public class FeedbackReportServiceImpl extends ServiceImpl<FeedbackReportMapper,
             newsInfo.setReCommonId(feedbackReport.getCommonId());
             //投诉
             if ("1".equals(feedbackReport.getFlag())){
-                newsInfo.setNewsTitle("管理员已处理您的投诉信息，感谢您对平台的监督，请查看处理结果是否满意。");
+                newsInfo.setNewsTitle("您的投诉信息已处理。");
                 newsInfo.setNewsContent("管理员已处理您的投诉信息，感谢您对平台的监督，请查看处理结果是否满意。");
                 newsInfo.setNewsTypeKey("4");
                 newsInfo.setNewsType("投诉结果");
             }
             //举报
             else {
-                newsInfo.setNewsTitle("管理员已处理您的举报信息，感谢您对平台的监督，请查看处理结果是否满意。");
+                newsInfo.setNewsTitle("您的举报信息已处理。");
                 newsInfo.setNewsContent("管理员已处理您的举报信息，感谢您对平台的监督，请查看处理结果是否满意。");
                 newsInfo.setNewsTypeKey("3");
                 newsInfo.setNewsType("举报结果");

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

@@ -439,7 +439,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 NewsInfo newsInfo = new NewsInfo();
                 newsInfo.setCrtCommonId(orderInfo1.getCommonId());
                 newsInfo.setReCommonId(orderInfo1.getCargoCommonId());
-                newsInfo.setNewsTitle("订单编号" + orderInfo1.getOrderNo() + "已被司机 " + orderInfo1.getDriverName() + " 终止。");
+                newsInfo.setNewsTitle("司机终止订单");
                 newsInfo.setNewsContent("订单编号" + orderInfo1.getOrderNo() + "已被司机 " + orderInfo1.getDriverName() + " 终止。" + "\n" + "终止原因" + orderInfo1.getTerminationReasonDescription());
                 newsInfo.setNumber(orderInfo1.getOrderNo());
                 newsInfo.setBussId(orderInfo1.getId());
@@ -457,7 +457,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 NewsInfo newsInfo = new NewsInfo();
                 newsInfo.setCrtCommonId(orderInfo1.getCargoCommonId());
                 newsInfo.setReCommonId(orderInfo1.getCommonId());
-                newsInfo.setNewsTitle("订单编号" + orderInfo1.getOrderNo() + "已被货主 " + orderInfo1.getCargoOwner() + " 终止。");
+                newsInfo.setNewsTitle("货主终止订单");
                 newsInfo.setNewsContent("订单编号" + orderInfo1.getOrderNo() + "已被货主 " + orderInfo1.getCargoOwner() + " 终止。" + "\n" + "终止原因" + orderInfo1.getTerminationReasonDescription());
                 newsInfo.setNumber(orderInfo1.getOrderNo());
                 newsInfo.setBussId(orderInfo1.getId());
@@ -474,7 +474,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 NewsInfo newsInfo = new NewsInfo();
                 newsInfo.setCrtCommonId("000");
                 newsInfo.setReCommonId(orderInfo1.getCommonId());
-                newsInfo.setNewsTitle("订单编号" + orderInfo1.getOrderNo() + "已被平台终止 ");
+                newsInfo.setNewsTitle("平台终止订单");
                 newsInfo.setNewsContent("订单编号" + orderInfo1.getOrderNo() + "已被平台终止");
                 newsInfo.setNumber(orderInfo1.getOrderNo());
                 newsInfo.setBussId(orderInfo1.getId());
@@ -739,7 +739,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 newsInfo.setBussId(orderInfo1.getId());
                 newsInfo.setCrtCommonId(orderInfo1.getCargoCommonId());
                 newsInfo.setReCommonId(orderInfo1.getCommonId());
-                newsInfo.setNewsTitle("订单编号" + orderInfo1.getOrderNo() + "货主已接单 ");
+                newsInfo.setNewsTitle("货主已接单");
                 newsInfo.setNewsContent("订单编号" + orderInfo1.getOrderNo() + "货主已接单");
                 newsInfo.setNewsTypeKey("2");
                 newsInfo.setNewsType("承运通知");
@@ -758,7 +758,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 newsInfo.setBussId(orderInfo1.getId());
                 newsInfo.setCrtCommonId(orderInfo1.getCargoCommonId());
                 newsInfo.setReCommonId(orderInfo1.getCommonId());
-                newsInfo.setNewsTitle("订单编号" + orderInfo1.getOrderNo() + "货主已拒单 ");
+                newsInfo.setNewsTitle("货主拒绝订单");
                 newsInfo.setNewsContent("订单编号" + orderInfo1.getOrderNo() + "货主已拒单");
                 newsInfo.setNewsTypeKey("2");
                 newsInfo.setNewsType("承运通知");

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

@@ -118,11 +118,34 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
             });
         }
         baseMapper.updateRefreshTimes();
+
         //查询货主
         List<HyCargoOwnerInfo> hyCargoOwnerInfos = cargoOwnerInfoService.selectList(new EntityWrapper<HyCargoOwnerInfo>().eq("delete_flag", "0"));
         if (!CollectionUtils.isEmpty(hyCargoOwnerInfos)) {
             hyCargoOwnerInfos.forEach(cargoOwnerInfo -> {
                 cargoOwnerInfo.setRefreshTimes(0L);
+                //查询被禁用的货主
+                if ("7".equals(cargoOwnerInfo.getAuthenticationStatusKey())){
+                    //解禁日期与日期比较
+                    int result1 = cargoOwnerInfo.getLiftingDate().compareTo(date);
+                    if (result1 == 0){
+                        cargoOwnerInfo.setAuthenticationStatusKey(cargoOwnerInfo.getDisablingStatusKey());
+                        cargoOwnerInfo.setAuthenticationStatus(cargoOwnerInfo.getDisablingStatus());
+                        cargoOwnerInfo.setBackStageStatus(cargoOwnerInfo.getDisablingBackStatus());
+                        cargoOwnerInfo.setBackStageStatusKey(cargoOwnerInfo.getDisablingBackStatusKey());
+                        cargoOwnerInfo.setDisablingStatusKey("");
+                        cargoOwnerInfo.setDisablingStatus("");
+                        cargoOwnerInfo.setDisablingBackStatusKey("");
+                        cargoOwnerInfo.setDisablingBackStatus("");
+                        cargoOwnerInfo.setLiftingDate("");
+                        //查询用户信息，将用户状态改为正常
+                        CommonUser commonUser = commonUserService.selectById(cargoOwnerInfo.getCommonId());
+                        if (commonUser != null){
+                            commonUser.setStatus(1);
+                            commonUserService.updateById(commonUser);
+                        }
+                    }
+                }
                 if (!"长期".equals(cargoOwnerInfo.getCardValidityDate())) {
                     int result = cargoOwnerInfo.getCardValidityDate().compareTo(date);
                     if (result < 0) {
@@ -138,7 +161,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                         NewsInfo newsInfo = new NewsInfo();
                         newsInfo.setReCommonId(cargoOwnerInfo.getCommonId());
                         newsInfo.setBussId(cargoOwnerInfo.getId());
-                        newsInfo.setNewsTitle("您的身份证即将到期，请尽快到个人中心中更新，逾期将影响运费垫付。");
+                        newsInfo.setNewsTitle("证件即将到期！");
                         newsInfo.setNewsContent("您的身份证即将到期，请尽快到个人中心中更新，逾期将影响运费垫付。");
                         newsInfo.setNewsTypeKey("1");
                         newsInfo.setNewsType("系统消息");
@@ -151,7 +174,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                         NewsInfo newsInfo = new NewsInfo();
                         newsInfo.setReCommonId(cargoOwnerInfo.getCommonId());
                         newsInfo.setBussId(cargoOwnerInfo.getId());
-                        newsInfo.setNewsTitle("您的身份证即将到期，请尽快到个人中心中更新，逾期将影响运费垫付。");
+                        newsInfo.setNewsTitle("证件即将到期！");
                         newsInfo.setNewsContent("您的身份证即将到期，请尽快到个人中心中更新，逾期将影响运费垫付。");
                         newsInfo.setNewsTypeKey("1");
                         newsInfo.setNewsType("系统消息");
@@ -164,7 +187,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                         NewsInfo newsInfo = new NewsInfo();
                         newsInfo.setReCommonId(cargoOwnerInfo.getCommonId());
                         newsInfo.setBussId(cargoOwnerInfo.getId());
-                        newsInfo.setNewsTitle("您的身份证即将到期，请尽快到个人中心中更新，逾期将影响运费垫付。");
+                        newsInfo.setNewsTitle("证件即将到期！");
                         newsInfo.setNewsContent("您的身份证即将到期，请尽快到个人中心中更新，逾期将影响运费垫付。");
                         newsInfo.setNewsTypeKey("1");
                         newsInfo.setNewsType("系统消息");
@@ -213,7 +236,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                     NewsInfo newsInfo = new NewsInfo();
                     newsInfo.setReCommonId(cargoOwnerCompInfo.getCommonId());
                     newsInfo.setBussId(cargoOwnerCompInfo.getId());
-                    newsInfo.setNewsTitle("您的" + cargoOwnerCompInfo.getCompany() + "的授权书即将到期，请尽快到个人中心中更新，逾期将影响运费垫付。");
+                    newsInfo.setNewsTitle("证件即将到期！");
                     newsInfo.setNewsContent("您的" + cargoOwnerCompInfo.getCompany() + "的授权书即将到期，请尽快到个人中心中更新，逾期将影响运费垫付。");
                     newsInfo.setNewsTypeKey("1");
                     newsInfo.setNewsType("系统消息");
@@ -226,7 +249,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                     NewsInfo newsInfo = new NewsInfo();
                     newsInfo.setReCommonId(cargoOwnerCompInfo.getCommonId());
                     newsInfo.setBussId(cargoOwnerCompInfo.getId());
-                    newsInfo.setNewsTitle("您的" + cargoOwnerCompInfo.getCompany() + "的授权书即将到期，请尽快到个人中心中更新，逾期将影响运费垫付。");
+                    newsInfo.setNewsTitle("证件即将到期！");
                     newsInfo.setNewsContent("您的" + cargoOwnerCompInfo.getCompany() + "的授权书即将到期，请尽快到个人中心中更新，逾期将影响运费垫付。");
                     newsInfo.setNewsTypeKey("1");
                     newsInfo.setNewsType("系统消息");
@@ -239,7 +262,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                     NewsInfo newsInfo = new NewsInfo();
                     newsInfo.setReCommonId(cargoOwnerCompInfo.getCommonId());
                     newsInfo.setBussId(cargoOwnerCompInfo.getId());
-                    newsInfo.setNewsTitle("您的" + cargoOwnerCompInfo.getCompany() + "的授权书即将到期，请尽快到个人中心中更新，逾期将影响运费垫付。");
+                    newsInfo.setNewsTitle("证件即将到期！");
                     newsInfo.setNewsContent("您的" + cargoOwnerCompInfo.getCompany() + "的授权书即将到期，请尽快到个人中心中更新，逾期将影响运费垫付。");
                     newsInfo.setNewsTypeKey("1");
                     newsInfo.setNewsType("系统消息");
@@ -252,6 +275,28 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         List<HyDriverInfo> hyDriverInfos = driverInfoService.selectList(new EntityWrapper<HyDriverInfo>().eq("delete_flag", "0"));
         if (!CollectionUtils.isEmpty(hyDriverInfos)) {
             hyDriverInfos.forEach(driverInfo -> {
+                //查询被禁用的司机
+                if ("7".equals(driverInfo.getAuthenticationStatusKey())){
+                    //解禁日期与日期比较
+                    int result1 = driverInfo.getLiftingDate().compareTo(date);
+                    if (result1 == 0){
+                        driverInfo.setAuthenticationStatusKey(driverInfo.getDisablingStatusKey());
+                        driverInfo.setAuthenticationStatus(driverInfo.getDisablingStatus());
+                        driverInfo.setBackStageStatus(driverInfo.getDisablingBackStatus());
+                        driverInfo.setBackStageStatusKey(driverInfo.getDisablingBackStatusKey());
+                        driverInfo.setDisablingStatusKey("");
+                        driverInfo.setDisablingStatus("");
+                        driverInfo.setDisablingBackStatusKey("");
+                        driverInfo.setDisablingBackStatus("");
+                        driverInfo.setLiftingDate("");
+                        //查询用户信息，将用户状态改为正常
+                        CommonUser commonUser = commonUserService.selectById(driverInfo.getCommonId());
+                        if (commonUser != null){
+                            commonUser.setStatus(1);
+                            commonUserService.updateById(commonUser);
+                        }
+                    }
+                }
                 //身份证
                 if (!"长期".equals(driverInfo.getCardValidityDate())) {
                     //身份证截止日期与日期比较
@@ -273,7 +318,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                         NewsInfo newsInfo = new NewsInfo();
                         newsInfo.setReCommonId(driverInfo.getCommonId());
                         newsInfo.setBussId(driverInfo.getId());
-                        newsInfo.setNewsTitle("您的身份证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。");
+                        newsInfo.setNewsTitle("证件即将到期！");
                         newsInfo.setNewsContent("您的身份证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。");
                         newsInfo.setNewsTypeKey("1");
                         newsInfo.setNewsType("系统消息");
@@ -286,7 +331,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                         NewsInfo newsInfo = new NewsInfo();
                         newsInfo.setReCommonId(driverInfo.getCommonId());
                         newsInfo.setBussId(driverInfo.getId());
-                        newsInfo.setNewsTitle("您的身份证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。");
+                        newsInfo.setNewsTitle("证件即将到期！");
                         newsInfo.setNewsContent("您的身份证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。");
                         newsInfo.setNewsTypeKey("1");
                         newsInfo.setNewsType("系统消息");
@@ -299,7 +344,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                         NewsInfo newsInfo = new NewsInfo();
                         newsInfo.setReCommonId(driverInfo.getCommonId());
                         newsInfo.setBussId(driverInfo.getId());
-                        newsInfo.setNewsTitle("您的身份证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。");
+                        newsInfo.setNewsTitle("证件即将到期！");
                         newsInfo.setNewsContent("您的身份证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。");
                         newsInfo.setNewsTypeKey("1");
                         newsInfo.setNewsType("系统消息");
@@ -325,7 +370,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                     NewsInfo newsInfo = new NewsInfo();
                     newsInfo.setReCommonId(driverInfo.getCommonId());
                     newsInfo.setBussId(driverInfo.getId());
-                    newsInfo.setNewsTitle("您的驾驶证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。");
+                    newsInfo.setNewsTitle("证件即将到期！");
                     newsInfo.setNewsContent("您的驾驶证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。");
                     newsInfo.setNewsTypeKey("1");
                     newsInfo.setNewsType("系统消息");
@@ -338,7 +383,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                     NewsInfo newsInfo = new NewsInfo();
                     newsInfo.setReCommonId(driverInfo.getCommonId());
                     newsInfo.setBussId(driverInfo.getId());
-                    newsInfo.setNewsTitle("您的驾驶证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。");
+                    newsInfo.setNewsTitle("证件即将到期！");
                     newsInfo.setNewsContent("您的驾驶证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。");
                     newsInfo.setNewsTypeKey("1");
                     newsInfo.setNewsType("系统消息");
@@ -351,7 +396,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                     NewsInfo newsInfo = new NewsInfo();
                     newsInfo.setReCommonId(driverInfo.getCommonId());
                     newsInfo.setBussId(driverInfo.getId());
-                    newsInfo.setNewsTitle("您的驾驶证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。");
+                    newsInfo.setNewsTitle("证件即将到期！");
                     newsInfo.setNewsContent("您的驾驶证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。");
                     newsInfo.setNewsTypeKey("1");
                     newsInfo.setNewsType("系统消息");
@@ -376,7 +421,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                     NewsInfo newsInfo = new NewsInfo();
                     newsInfo.setReCommonId(driverInfo.getCommonId());
                     newsInfo.setBussId(driverInfo.getId());
-                    newsInfo.setNewsTitle("您的从业资格证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。");
+                    newsInfo.setNewsTitle("证件即将到期！");
                     newsInfo.setNewsContent("您的从业资格证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。");
                     newsInfo.setNewsTypeKey("1");
                     newsInfo.setNewsType("系统消息");
@@ -389,7 +434,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                     NewsInfo newsInfo = new NewsInfo();
                     newsInfo.setReCommonId(driverInfo.getCommonId());
                     newsInfo.setBussId(driverInfo.getId());
-                    newsInfo.setNewsTitle("您的从业资格证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。");
+                    newsInfo.setNewsTitle("证件即将到期！");
                     newsInfo.setNewsContent("您的从业资格证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。");
                     newsInfo.setNewsTypeKey("1");
                     newsInfo.setNewsType("系统消息");
@@ -402,7 +447,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                     NewsInfo newsInfo = new NewsInfo();
                     newsInfo.setReCommonId(driverInfo.getCommonId());
                     newsInfo.setBussId(driverInfo.getId());
-                    newsInfo.setNewsTitle("您的从业资格证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。");
+                    newsInfo.setNewsTitle("证件即将到期！");
                     newsInfo.setNewsContent("您的从业资格证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。");
                     newsInfo.setNewsTypeKey("1");
                     newsInfo.setNewsType("系统消息");
@@ -432,7 +477,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                     NewsInfo newsInfo = new NewsInfo();
                     newsInfo.setReCommonId(hyDriverInfo.getCommonId());
                     newsInfo.setBussId(hyDriverCarInfo.getId());
-                    newsInfo.setNewsTitle("您的行驶证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
+                    newsInfo.setNewsTitle("证件即将到期！");
                     newsInfo.setNewsContent("您的行驶证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
                     newsInfo.setNewsTypeKey("1");
                     newsInfo.setNewsType("系统消息");
@@ -445,7 +490,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                     NewsInfo newsInfo = new NewsInfo();
                     newsInfo.setReCommonId(hyDriverInfo.getCommonId());
                     newsInfo.setBussId(hyDriverCarInfo.getId());
-                    newsInfo.setNewsTitle("您的行驶证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
+                    newsInfo.setNewsTitle("证件即将到期！");
                     newsInfo.setNewsContent("您的行驶证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
                     newsInfo.setNewsTypeKey("1");
                     newsInfo.setNewsType("系统消息");
@@ -458,7 +503,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                     NewsInfo newsInfo = new NewsInfo();
                     newsInfo.setReCommonId(hyDriverInfo.getCommonId());
                     newsInfo.setBussId(hyDriverCarInfo.getId());
-                    newsInfo.setNewsTitle("您的行驶证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
+                    newsInfo.setNewsTitle("证件即将到期！");
                     newsInfo.setNewsContent("您的行驶证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
                     newsInfo.setNewsTypeKey("1");
                     newsInfo.setNewsType("系统消息");
@@ -480,7 +525,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                         NewsInfo newsInfo = new NewsInfo();
                         newsInfo.setReCommonId(hyDriverInfo.getCommonId());
                         newsInfo.setBussId(hyDriverCarInfo.getId());
-                        newsInfo.setNewsTitle("您的挂车行驶证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
+                        newsInfo.setNewsTitle("证件即将到期！");
                         newsInfo.setNewsContent("您的挂车行驶证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
                         newsInfo.setNewsTypeKey("1");
                         newsInfo.setNewsType("系统消息");
@@ -493,7 +538,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                         NewsInfo newsInfo = new NewsInfo();
                         newsInfo.setReCommonId(hyDriverInfo.getCommonId());
                         newsInfo.setBussId(hyDriverCarInfo.getId());
-                        newsInfo.setNewsTitle("您的挂车行驶证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
+                        newsInfo.setNewsTitle("证件即将到期！");
                         newsInfo.setNewsContent("您的挂车行驶证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
                         newsInfo.setNewsTypeKey("1");
                         newsInfo.setNewsType("系统消息");
@@ -506,7 +551,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                         NewsInfo newsInfo = new NewsInfo();
                         newsInfo.setReCommonId(hyDriverInfo.getCommonId());
                         newsInfo.setBussId(hyDriverCarInfo.getId());
-                        newsInfo.setNewsTitle("您的挂车行驶证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
+                        newsInfo.setNewsTitle("证件即将到期！");
                         newsInfo.setNewsContent("您的挂车行驶证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
                         newsInfo.setNewsTypeKey("1");
                         newsInfo.setNewsType("系统消息");
@@ -528,7 +573,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                     NewsInfo newsInfo = new NewsInfo();
                     newsInfo.setReCommonId(hyDriverInfo.getCommonId());
                     newsInfo.setBussId(hyDriverCarInfo.getId());
-                    newsInfo.setNewsTitle("您的道路运输证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
+                    newsInfo.setNewsTitle("证件即将到期！");
                     newsInfo.setNewsContent("您的道路运输证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
                     newsInfo.setNewsTypeKey("1");
                     newsInfo.setNewsType("系统消息");
@@ -541,7 +586,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                     NewsInfo newsInfo = new NewsInfo();
                     newsInfo.setReCommonId(hyDriverInfo.getCommonId());
                     newsInfo.setBussId(hyDriverCarInfo.getId());
-                    newsInfo.setNewsTitle("您的道路运输证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
+                    newsInfo.setNewsTitle("证件即将到期！");
                     newsInfo.setNewsContent("您的道路运输证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
                     newsInfo.setNewsTypeKey("1");
                     newsInfo.setNewsType("系统消息");
@@ -554,7 +599,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                     NewsInfo newsInfo = new NewsInfo();
                     newsInfo.setReCommonId(hyDriverInfo.getCommonId());
                     newsInfo.setBussId(hyDriverCarInfo.getId());
-                    newsInfo.setNewsTitle("您的道路运输证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
+                    newsInfo.setNewsTitle("证件即将到期！");
                     newsInfo.setNewsContent("您的道路运输证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
                     newsInfo.setNewsTypeKey("1");
                     newsInfo.setNewsType("系统消息");
@@ -576,7 +621,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                         NewsInfo newsInfo = new NewsInfo();
                         newsInfo.setReCommonId(hyDriverInfo.getCommonId());
                         newsInfo.setBussId(hyDriverCarInfo.getId());
-                        newsInfo.setNewsTitle("您的挂车运输证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
+                        newsInfo.setNewsTitle("证件即将到期！");
                         newsInfo.setNewsContent("您的挂车运输证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
                         newsInfo.setNewsTypeKey("1");
                         newsInfo.setNewsType("系统消息");
@@ -589,7 +634,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                         NewsInfo newsInfo = new NewsInfo();
                         newsInfo.setReCommonId(hyDriverInfo.getCommonId());
                         newsInfo.setBussId(hyDriverCarInfo.getId());
-                        newsInfo.setNewsTitle("您的挂车运输证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
+                        newsInfo.setNewsTitle("证件即将到期！");
                         newsInfo.setNewsContent("您的挂车运输证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
                         newsInfo.setNewsTypeKey("1");
                         newsInfo.setNewsType("系统消息");
@@ -602,7 +647,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                         NewsInfo newsInfo = new NewsInfo();
                         newsInfo.setReCommonId(hyDriverInfo.getCommonId());
                         newsInfo.setBussId(hyDriverCarInfo.getId());
-                        newsInfo.setNewsTitle("您的挂车运输证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
+                        newsInfo.setNewsTitle("证件即将到期！");
                         newsInfo.setNewsContent("您的挂车运输证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
                         newsInfo.setNewsTypeKey("1");
                         newsInfo.setNewsType("系统消息");
@@ -1358,6 +1403,12 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         if ("1".equals(hyDriverInfo.getOverdueFlag()) || "1".equals(hyDriverInfo.getDriverOverdueFlag()) || "1".equals(hyDriverInfo.getQualificationOverdueFlag())) {
             throw new YException(YExceptionEnum.CERTIFICATE_EXPIRED);
         }
+        //判断是否有认证的车辆
+        List<HyDriverCarInfo> hyDriverCarInfoList = driverCarInfoService.selectList(new EntityWrapper<HyDriverCarInfo>().eq("common_id", publishTaskInfo.getDriverCommonId())
+                .eq("status_key", "5").eq("delete_flag", "0"));
+        if (hyDriverCarInfoList.size() == 0) {
+            throw new YException(YExceptionEnum.CAR_FINISH_ADD);
+        }
         //查询货主身份是否删除
         HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>().eq("common_id", publishTaskInfo.getCommonId())
                 .eq("delete_flag", "0"));
@@ -1421,8 +1472,8 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         NewsInfo newsInfo = new NewsInfo();
         newsInfo.setCrtCommonId(orderInfo.getCommonId());
         newsInfo.setReCommonId(orderInfo.getCargoCommonId());
-        newsInfo.setNewsTitle("司机 " + orderInfo.getDriverName() + "师傅 已接单，订单编号" + orderInfo.getOrderNo() + "。");
-        newsInfo.setNewsContent("司机 " + orderInfo.getDriverName() + "师傅 已接单，订单编号" + orderInfo.getOrderNo() + "。");
+        newsInfo.setNewsTitle("您有新的订单！");
+        newsInfo.setNewsContent("司机 " + orderInfo.getDriverName() + "师傅 已抢单，订单编号" + orderInfo.getOrderNo() + "。");
         newsInfo.setNumber(orderInfo.getOrderNo());
         newsInfo.setBussId(orderInfo.getId());
         newsInfo.setNewsTypeKey("2");

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

@@ -24,6 +24,9 @@
             <if test="searchType == 3">
                 AND status_key = '3'
             </if>
+            <if test="searchType == 4">
+                AND status_key = '7'
+            </if>
         </if>
         <if test="startDate != null and startDate != ''">
             AND (DATE_FORMAT(create_date,"%Y%m%d") >=
@@ -72,6 +75,9 @@
             <if test="searchType == 3">
                 AND status_key = '3'
             </if>
+            <if test="searchType == 4">
+                AND status_key = '7'
+            </if>
         </if>
         <if test="startDate != null and startDate != ''">
             AND (DATE_FORMAT(create_date,"%Y%m%d") >=