修改

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java

@@ -23,7 +23,7 @@ public enum StatusEnum {
 
     //身份认证状态
     IDENTITY_REVIEWED("1", "审核中", "reviewed"),
-    IDENTITY_FAILED("3", "未通过", "passed"),
+    IDENTITY_FAILED("3", "已驳回", "passed"),
     IDENTITY_COMPLETED("5", "已认证", "Completed"),
     IDENTITY_COMPLETED_NO("7", "已禁用", "identity_completed_no"),
     IDENTITY_OVERDUE("9", "已过期", "identity_overdue"),

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

@@ -72,6 +72,14 @@ public class HyCargoOwnerCompInfo extends BaseModel<HyCargoOwnerCompInfo> {
      * 认证状态
      */
     private String status;
+    /**
+     * 后台管理状态key（1企业审核中3企业已驳回5待审核7已驳回9已通过11授权已过期13企业暂不可用15企业不存在17授权已撤销）
+     */
+    private String backStageStatusKey;
+    /**
+     * 后台管理状态
+     */
+    private String backStageStatus;
     /**
      * 审核标识
      */

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

@@ -89,6 +89,14 @@ public class HyCargoOwnerInfo extends BaseModel<HyCargoOwnerInfo> {
      * 认证状态
      */
     private String authenticationStatus;
+    /**
+     * 后台管理状态key（1待审核3已驳回5已通过7已禁用9已过期11已注销）
+     */
+    private String backStageStatusKey;
+    /**
+     * 后台管理状态
+     */
+    private String backStageStatus;
     /**
      * 刷新次数
      */

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

@@ -132,6 +132,14 @@ public class HyCompanyInfo extends BaseModel<HyCompanyInfo> {
      * 认证状态
      */
     private String status;
+    /**
+     * 后台管理状态key（1待审核3已驳回5已通过7已过期）
+     */
+    private String backStageStatusKey;
+    /**
+     * 后台管理状态
+     */
+    private String backStageStatus;
     /**
      * 驳回原因描述
      */

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

@@ -122,13 +122,21 @@ public class HyDriverInfo extends BaseModel<HyDriverInfo> {
      */
     private String qualificationCertificateNumber;
     /**
-     * 认证状态key（1审核中3未通过5已认证7已禁用9已过期11已注销）
+     * 认证状态key（1审核中3已驳回5已认证7已禁用9已过期11已注销）
      */
     private String authenticationStatusKey;
     /**
      * 认证状态
      */
     private String authenticationStatus;
+    /**
+     * 后台管理状态key（1待审核3已驳回5已通过7已禁用9已过期11已注销）
+     */
+    private String backStageStatusKey;
+    /**
+     * 后台管理状态
+     */
+    private String backStageStatus;
     /**
      * 身份证过期标识（1是）
      */

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

@@ -196,6 +196,14 @@ public class PublishTaskInfo extends BaseModel<PublishTaskInfo> {
      * 状态
      */
     private String status;
+    /**
+     * 后台管理状态key（1待审核中3已驳回5已通过7已过期）
+     */
+    private String backStageStatusKey;
+    /**
+     * 后台管理状态
+     */
+    private String backStageStatus;
     /**
      * 显示隐藏（1显示2隐藏）
      */

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

@@ -78,6 +78,8 @@ public class AgentCargoOwnerInfoServiceImpl extends ServiceImpl<AgentCargoOwnerI
                     //更改所属公司状态
                     hyCargoOwnerCompInfo.setStatus(StatusEnum.PLATFORM_EXAMINEING.getName());
                     hyCargoOwnerCompInfo.setStatusKey(StatusEnum.PLATFORM_EXAMINEING.getFlag());
+                    hyCargoOwnerCompInfo.setBackStageStatus(StatusEnum.GRAIN_REVIEWED.getName());
+                    hyCargoOwnerCompInfo.setBackStageStatusKey(StatusEnum.GRAIN_REVIEWED.getFlag());
                 }
             }else if("2".equals(hyAgentCargoOwnerInfo.getGrantFlag())){
                 //信息编辑,驳回
@@ -87,6 +89,8 @@ public class AgentCargoOwnerInfoServiceImpl extends ServiceImpl<AgentCargoOwnerI
                     //更改所属公司状态
                     hyCargoOwnerCompInfo.setStatus(StatusEnum.COMPANY_REJECTED.getName());
                     hyCargoOwnerCompInfo.setStatusKey(StatusEnum.COMPANY_REJECTED.getFlag());
+                    hyCargoOwnerCompInfo.setBackStageStatus(StatusEnum.COMPANY_REJECTED.getName());
+                    hyCargoOwnerCompInfo.setBackStageStatusKey(StatusEnum.COMPANY_REJECTED.getFlag());
                 }
             }else {
                 //信息编辑,撤销授权
@@ -96,6 +100,8 @@ public class AgentCargoOwnerInfoServiceImpl extends ServiceImpl<AgentCargoOwnerI
                     //更改所属公司状态
                     hyCargoOwnerCompInfo.setStatus(StatusEnum.CAUTHORIZATION_REVOKED.getName());
                     hyCargoOwnerCompInfo.setStatusKey(StatusEnum.CAUTHORIZATION_REVOKED.getFlag());
+                    hyCargoOwnerCompInfo.setBackStageStatus(StatusEnum.CAUTHORIZATION_REVOKED.getName());
+                    hyCargoOwnerCompInfo.setBackStageStatusKey(StatusEnum.CAUTHORIZATION_REVOKED.getFlag());
                 }
             }
             boolean one = this.updateById(hyAgentCargoOwnerInfo1);

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

@@ -59,6 +59,8 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
         hyCargoOwnerCompInfo.setId(IdGenerator.generateUUID());
         hyCargoOwnerCompInfo.setStatus(StatusEnum.COMPANY_EXAMINEING.getName());
         hyCargoOwnerCompInfo.setStatusKey(StatusEnum.COMPANY_EXAMINEING.getFlag());
+        hyCargoOwnerCompInfo.setBackStageStatus(StatusEnum.COMPANY_EXAMINEING.getName());
+        hyCargoOwnerCompInfo.setBackStageStatusKey(StatusEnum.COMPANY_EXAMINEING.getFlag());
         //判断是否已经认证
         HyCargoOwnerCompInfo hyCargoOwnerCompInfo1 = this.selectOne(new EntityWrapper<HyCargoOwnerCompInfo>()
                 .eq("common_id", hyCargoOwnerCompInfo.getCommonId())
@@ -103,6 +105,8 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
         //信息编辑
         hyCargoOwnerCompInfo.setStatus(StatusEnum.COMPANY_EXAMINEING.getName());
         hyCargoOwnerCompInfo.setStatusKey(StatusEnum.COMPANY_EXAMINEING.getFlag());
+        hyCargoOwnerCompInfo.setBackStageStatus(StatusEnum.COMPANY_EXAMINEING.getName());
+        hyCargoOwnerCompInfo.setBackStageStatusKey(StatusEnum.COMPANY_EXAMINEING.getFlag());
         boolean one = this.updateById(hyCargoOwnerCompInfo);
         //查询代理货主信息
         HyAgentCargoOwnerInfo hyAgentCargoOwnerInfo = agentCargoOwnerInfoService.selectOne(new EntityWrapper<HyAgentCargoOwnerInfo>()
@@ -186,38 +190,17 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
             if ("1".equals(hyCargoOwnerCompInfo.getFlag())) {
                 hyCargoOwnerCompInfo1.setStatusKey(StatusEnum.PLATFORM_CERTIFIED.getFlag());
                 hyCargoOwnerCompInfo1.setStatus(StatusEnum.PLATFORM_CERTIFIED.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);
+                hyCargoOwnerCompInfo1.setBackStageStatus(StatusEnum.GRAIN_ADOPT.getName());
+                hyCargoOwnerCompInfo1.setBackStageStatusKey(StatusEnum.GRAIN_ADOPT.getFlag());
             }
-//            驳回
+            //驳回
             else if ("2".equals(hyCargoOwnerCompInfo.getFlag())) {
                 hyCargoOwnerCompInfo1.setStatusKey(StatusEnum.PLATFORM_REJECTED.getFlag());
                 hyCargoOwnerCompInfo1.setStatus(StatusEnum.PLATFORM_REJECTED.getName());
+                hyCargoOwnerCompInfo1.setBackStageStatus(StatusEnum.GRAIN_REJECT.getName());
+                hyCargoOwnerCompInfo1.setBackStageStatusKey(StatusEnum.GRAIN_REJECT.getFlag());
                 this.updateById(hyCargoOwnerCompInfo);
-//                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);
             }
-
             //更改信息
             this.updateById(hyCargoOwnerCompInfo1);
             return "OK";

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

@@ -49,6 +49,11 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
         HyCargoOwnerInfo hyCargoOwnerInfo = this.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
                 .eq("phone",phone)
                 .eq("delete_flag",0));
+        if (hyCargoOwnerInfo == null){
+            HyCargoOwnerInfo hyCargoOwnerInfo1 = new HyCargoOwnerInfo();
+            hyCargoOwnerInfo1.setAuthenticationStatus("未认证");
+            return hyCargoOwnerInfo1;
+        }
         return hyCargoOwnerInfo;
     }
 
@@ -125,6 +130,8 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
             }
             hyCargoOwnerInfo.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
             hyCargoOwnerInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+            hyCargoOwnerInfo.setBackStageStatus(StatusEnum.TO_BE_REVIEWED.getName());
+            hyCargoOwnerInfo.setBackStageStatusKey(StatusEnum.TO_BE_REVIEWED.getFlag());
             this.insert(hyCargoOwnerInfo);
         return "OK";
 
@@ -140,6 +147,8 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
             //信息编辑
             hyCargoOwnerInfo.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
             hyCargoOwnerInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+            hyCargoOwnerInfo.setBackStageStatus(StatusEnum.TO_BE_REVIEWED.getName());
+            hyCargoOwnerInfo.setBackStageStatusKey(StatusEnum.TO_BE_REVIEWED.getFlag());
             this.updateById(hyCargoOwnerInfo);
         }
         else{
@@ -161,6 +170,8 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
             }
             hyCargoOwnerInfo.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
             hyCargoOwnerInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+            hyCargoOwnerInfo.setBackStageStatus(StatusEnum.TO_BE_REVIEWED.getName());
+            hyCargoOwnerInfo.setBackStageStatusKey(StatusEnum.TO_BE_REVIEWED.getFlag());
             this.insert(hyCargoOwnerInfo);
         }
         return "OK";
@@ -194,6 +205,8 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
             if ("1".equals(hyCargoOwnerInfo.getFlag())) {
                 hyCargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
                 hyCargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
+                hyCargoOwnerInfo1.setBackStageStatus(StatusEnum.TASK_REJECT.getName());
+                hyCargoOwnerInfo1.setBackStageStatusKey(StatusEnum.TASK_REJECT.getFlag());
                 hyCargoOwnerInfo1.setFirstFlag("1");
                 //发送消息
                 NewsInfo newsInfo = new NewsInfo();
@@ -208,6 +221,8 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
             else if("2".equals(hyCargoOwnerInfo.getFlag())){
                 hyCargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
                 hyCargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_FAILED.getName());
+                hyCargoOwnerInfo1.setBackStageStatus(StatusEnum.IDENTITY_FAILED.getName());
+                hyCargoOwnerInfo1.setBackStageStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
                 this.updateById(hyCargoOwnerInfo);
                 //发送消息
                 NewsInfo newsInfo = new NewsInfo();
@@ -222,10 +237,15 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
             else if("3".equals(hyCargoOwnerInfo.getFlag())){
                 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());
             }
+            //启用
             else if("4".equals(hyCargoOwnerInfo.getFlag())){
                 hyCargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
                 hyCargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
+                hyCargoOwnerInfo1.setBackStageStatus(StatusEnum.TASK_REJECT.getName());
+                hyCargoOwnerInfo1.setBackStageStatusKey(StatusEnum.TASK_REJECT.getFlag());
             }
             //更改信息
             this.updateById(hyCargoOwnerInfo1);

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

@@ -67,6 +67,8 @@ public class CompanyInfoServiceImpl extends ServiceImpl<CompanyInfoMapper, HyCom
         }
         hyCompanyInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
         hyCompanyInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+        hyCompanyInfo.setBackStageStatus(StatusEnum.TO_BE_REVIEWED.getName());
+        hyCompanyInfo.setBackStageStatusKey(StatusEnum.TO_BE_REVIEWED.getFlag());
         this.insert(hyCompanyInfo);
         return "ok";
     }
@@ -80,6 +82,8 @@ public class CompanyInfoServiceImpl extends ServiceImpl<CompanyInfoMapper, HyCom
             //信息编辑
             hyCompanyInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
             hyCompanyInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+            hyCompanyInfo.setBackStageStatus(StatusEnum.TO_BE_REVIEWED.getName());
+            hyCompanyInfo.setBackStageStatusKey(StatusEnum.TO_BE_REVIEWED.getFlag());
             boolean one = this.updateById(hyCompanyInfo);
         if(one){
             return "OK";
@@ -174,11 +178,15 @@ public class CompanyInfoServiceImpl extends ServiceImpl<CompanyInfoMapper, HyCom
             if ("1".equals(hyCompanyInfo.getFlag())) {
                 hyCompanyInfo1.setStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
                 hyCompanyInfo1.setStatus(StatusEnum.IDENTITY_COMPLETED.getName());
+                hyCompanyInfo1.setBackStageStatus(StatusEnum.TASK_REJECT.getName());
+                hyCompanyInfo1.setBackStageStatusKey(StatusEnum.TASK_REJECT.getFlag());
             }
             //驳回
             else if("2".equals(hyCompanyInfo.getFlag())){
                 hyCompanyInfo1.setStatusKey(StatusEnum.TASK_RETURN.getFlag());
                 hyCompanyInfo1.setStatus(StatusEnum.TASK_RETURN.getName());
+                hyCompanyInfo1.setBackStageStatus(StatusEnum.TASK_RETURN.getName());
+                hyCompanyInfo1.setBackStageStatusKey(StatusEnum.TASK_RETURN.getFlag());
             }
             //更改信息
             this.updateById(hyCompanyInfo1);

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

@@ -110,6 +110,8 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
         hyDriverInfo.setAdvancePayment(0.7d);
         hyDriverInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
         hyDriverInfo.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+        hyDriverInfo.setBackStageStatusKey(StatusEnum.TO_BE_REVIEWED.getFlag());
+        hyDriverInfo.setBackStageStatus(StatusEnum.TO_BE_REVIEWED.getName());
         //判断司机电话是否唯一
         List<HyDriverInfo> hyDriverInfos =
                 this.selectList(new EntityWrapper<HyDriverInfo>()
@@ -162,6 +164,8 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
     public String editInfo(HyDriverInfo hyDriverInfo) {
         hyDriverInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
         hyDriverInfo.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+        hyDriverInfo.setBackStageStatusKey(StatusEnum.TO_BE_REVIEWED.getFlag());
+        hyDriverInfo.setBackStageStatus(StatusEnum.TO_BE_REVIEWED.getName());
         //主表信息编辑
         this.updateById(hyDriverInfo);
         //收款人账户信息编辑
@@ -207,6 +211,8 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
             if ("1".equals(hyDriverInfo.getFlag())) {
                 hyDriverInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
                 hyDriverInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
+                hyDriverInfo1.setBackStageStatusKey(StatusEnum.TASK_REJECT.getFlag());
+                hyDriverInfo1.setBackStageStatus(StatusEnum.TASK_REJECT.getName());
                 hyDriverInfo1.setOverdueFlag("0");
                 hyDriverInfo1.setDriverOverdueFlag("0");
                 hyDriverInfo1.setQualificationOverdueFlag("0");
@@ -226,7 +232,8 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
             else if("2".equals(hyDriverInfo.getFlag())){
                 hyDriverInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
                 hyDriverInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_FAILED.getName());
-
+                hyDriverInfo1.setBackStageStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
+                hyDriverInfo1.setBackStageStatus(StatusEnum.IDENTITY_FAILED.getName());
                 //发送消息
                 NewsInfo newsInfo = new NewsInfo();
                 newsInfo.setReCommonId(hyDriverInfo1.getCommonId());
@@ -240,10 +247,14 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
             else if("3".equals(hyDriverInfo.getFlag())){
                 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());
             }
             else if("4".equals(hyDriverInfo.getFlag())){
                 hyDriverInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
                 hyDriverInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
+                hyDriverInfo1.setBackStageStatusKey(StatusEnum.TASK_REJECT.getFlag());
+                hyDriverInfo1.setBackStageStatus(StatusEnum.TASK_REJECT.getName());
             }
             //更改司机信息
             this.updateById(hyDriverInfo1);

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

@@ -999,6 +999,8 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         publishTaskInfo.setShowHide("1");
         publishTaskInfo.setStatus(StatusEnum.TASK_REVIEWING.getName());
         publishTaskInfo.setStatusKey(StatusEnum.TASK_REVIEWING.getFlag());
+        publishTaskInfo.setBackStageStatus(StatusEnum.PLATFORM_REVIEWED.getName());
+        publishTaskInfo.setBackStageStatusKey(StatusEnum.PLATFORM_REVIEWED.getFlag());
         // 操作主表数据
         boolean one = this.insert(publishTaskInfo);
         if (one) {
@@ -1020,6 +1022,8 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         if (publishTaskInfo != null) {
             publishTaskInfo.setStatus(StatusEnum.TASK_REVIEWING.getName());
             publishTaskInfo.setStatusKey(StatusEnum.TASK_REVIEWING.getFlag());
+            publishTaskInfo.setBackStageStatus(StatusEnum.PLATFORM_REVIEWED.getName());
+            publishTaskInfo.setBackStageStatusKey(StatusEnum.PLATFORM_REVIEWED.getFlag());
             this.updateById(publishTaskInfo);
         }
         return "OK";
@@ -1260,11 +1264,15 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
             if ("1".equals(publishTaskInfo.getFlag())) {
                 publishTaskInfo1.setStatusKey(StatusEnum.TASK_REJECT.getFlag());
                 publishTaskInfo1.setStatus(StatusEnum.TASK_REJECT.getName());
+                publishTaskInfo1.setBackStageStatusKey(StatusEnum.TASK_REJECT.getFlag());
+                publishTaskInfo1.setBackStageStatus(StatusEnum.TASK_REJECT.getName());
             }
             //驳回
             else if ("2".equals(publishTaskInfo.getFlag())) {
                 publishTaskInfo1.setStatusKey(StatusEnum.TASK_FAILED.getFlag());
                 publishTaskInfo1.setStatus(StatusEnum.TASK_FAILED.getName());
+                publishTaskInfo1.setBackStageStatusKey(StatusEnum.TASK_RETURN.getFlag());
+                publishTaskInfo1.setBackStageStatus(StatusEnum.TASK_RETURN.getName());
                 // 向货主发送信息
                 NewsInfo newsInfo = new NewsInfo();
                 newsInfo.setCrtCommonId("000");

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

@@ -42,6 +42,8 @@
         c.authorization_deadline as authorizationDeadline,
         c.status_key as statusKey,
         c.status as status,
+        c.back_stage_status_key as backStageStatusKey,
+        c.back_stage_status as backStageStatus,
         c.create_date as createDate,
         c.update_date as updateDate,
         cu.avatar_url as avatarUrl

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

@@ -60,6 +60,8 @@
         GROUP_CONCAT(co.company) as proxyIdentity,
         o.authentication_status_key as authenticationStatusKey,
         case when o.authentication_status is null then '未认证' else o.authentication_status end as authenticationStatus,
+        o.back_stage_status_key as backStageStatusKey,
+        case when o.back_stage_status is null then '未认证' else o.back_stage_status end as backStageStatus,
         o.create_date as createDate,
         o.update_date as updateDate
         FROM common_user c

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

@@ -90,6 +90,8 @@
         c.card_validity_date as cardValidityDate,
         c.status_key as statusKey,
         c.status,
+        c.back_stage_status_key as backStageStatusKey,
+        c.back_stage_status as backStageStatus,
         c.create_date as createDate,
         c.update_date as updateDate,
         cu.phone as accountNumber

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

@@ -81,6 +81,8 @@
         d.qualification_overdue_flag as qualificationOverdueFlag,
         d.authentication_status_key as authenticationStatusKey,
         case when d.authentication_status is null then '未认证' else d.authentication_status end as authenticationStatus,
+        d.back_stage_status_key as backStageStatusKey,
+        case when d.back_stage_status is null then '未认证' else d.back_stage_status end as backStageStatus,
         d.create_date as createDate,
         d.update_date as updateDate
         FROM common_user c

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

@@ -75,6 +75,8 @@
         p.show_hide as showHide,
         p.refresh_times as refreshTimes,
         p.status,
+        p.back_stage_status_key as backStageStatusKey,
+        p.back_stage_status as backStageStatus,
         p.create_date as createDate,
         p.update_date as updateDate,
         c.name as cargoOwnerName,