更新

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

@@ -39,12 +39,18 @@ auth:
     - /workflowSync/api/startFlow
     - /office/*
     - /warehouseInOutInfo/*
+    - /warehouseInOutInfo/**/*
     - /warehouseBaseInfo/*
+    - /warehouseBaseInfo/**/*
     - /identityAuthenticationInfo/*
+    - /identityAuthenticationInfo/**/*
     - /purchaseOrder/*
+    - /purchaseOrder/**/*
     - /appVersion/*
     - /procurementPlanInfo/*
+    - /procurementPlanInfo/**/*
     - /tranCarInfo/*
+    - /tranCarInfo/**/*
     - /auth/api/phoneLogin
     - /system/query/getComanyMgrUrl
     - /saas/**/*
@@ -52,15 +58,24 @@ auth:
     - /commonUser/*
     - /commonUser/**/*
     - /contractManagementInfo/*
+    - /contractManagementInfo/**/*
     - /salePlanInfo/*
+    - /salePlanInfo/**/*
     - /freightReceivingDispatching/*
+    - /freightReceivingDispatching/**/*
     - /receivingUser/*
+    - /receivingUser/**/*
     - /settledCompanyInfo/*
+    - /settledCompanyInfo/**/*
     - /settledCompanyDynamics/*
+    - /settledCompanyDynamics/**/*
     - /searchRecordsInfo/*
+    - /searchRecordsInfo/**/*
     - /saleOrder/*
     - /saleOrder/**/*
     - /driverViewInfo/*
+    - /driverViewInfo/**/*
+    - /appendix/*
     - /appendix/**/*
   expire-in: 36000
   login-url: /login.html

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

@@ -364,7 +364,7 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
         if (userDO.getStatus() == 0) {
             throw new AppServiceException(ExceptionDefinition.USER_CAN_NOT_ACTICE);
         }
-        else{
+        else if(commonUser.getCid() != null && !commonUser.getCid().isEmpty(){
             userDO.setCid(commonUser.getCid());
         }
         if (commonUser.getPhone() != null) {

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

@@ -11,12 +11,14 @@ import com.yh.saas.plugin.yiliangyiyun.exception.ExceptionDefinition;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
 import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.DriverViewInfoMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.ICommonUserService;
 import com.yh.saas.plugin.yiliangyiyun.service.IDriverCarInfoService;
 import com.yh.saas.plugin.yiliangyiyun.service.IDriverPayeeInfoService;
 import com.yh.saas.plugin.yiliangyiyun.service.IDriverViewInfoService;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.yh.saas.plugin.yiliangyiyun.util.GeTuiUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -54,6 +56,10 @@ public class DriverViewInfoServiceImpl extends ServiceImpl<DriverViewInfoMapper,
     private String password;
 
     Connection coon = null;
+    @Autowired
+    private ICommonUserService commonUserService;
+    @Autowired
+    private GeTuiUtils geTuiUtils;
 
     /**
      * 添加信息
@@ -378,16 +384,20 @@ public class DriverViewInfoServiceImpl extends ServiceImpl<DriverViewInfoMapper,
     public String examine(DriverViewInfo driverViewInfo) {
         //查询司机列表
         DriverViewInfo driverViewInfo1 = this.selectById(driverViewInfo.getId());
+        CommonUser commonUser = commonUserService.selectOne(new EntityWrapper<CommonUser>().eq("phone", driverViewInfo1.getDriverPhone()));
+
         if (driverViewInfo1 != null) {
             //通过
             if (driverViewInfo.getFlag() == 1) {
                 driverViewInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
                 driverViewInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
+                geTuiUtils.pushByCid("审核通知", "您的司机认证申请已审核通过", commonUser.getId());
             }
             //驳回
             else {
                 driverViewInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
                 driverViewInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_FAILED.getName());
+                geTuiUtils.pushByCid("驳回通知", "您的司机认证申请已被驳回", commonUser.getId());
             }
             //更改司机信息
             this.updateById(driverViewInfo1);

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

@@ -218,7 +218,7 @@ public class ProcurementPlanInfoServiceImpl extends ServiceImpl<ProcurementPlanI
             else {
                 procurementPlanInfo1.setStatusFlag(StatusEnum.ORDER_REJECTED.getFlag());
                 procurementPlanInfo1.setStatus(StatusEnum.ORDER_REJECTED.getName());
-                geTuiUtils.pushByCid("审核通知", "您申请的交易已被驳回", procurementPlanInfo1.getCommonId());
+                geTuiUtils.pushByCid("驳回通知", "您申请的交易已被驳回", procurementPlanInfo1.getCommonId());
             }
             //更改采购计划信息
             this.updateById(procurementPlanInfo1);

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

@@ -213,7 +213,7 @@ public class SalePlanInfoServiceImpl extends ServiceImpl<SalePlanInfoMapper, Sal
             else {
                 salePlanInfo1.setStatusFlag(StatusEnum.ORDER_REJECTED.getFlag());
                 salePlanInfo1.setStatus(StatusEnum.ORDER_REJECTED.getName());
-                geTuiUtils.pushByCid("审核通知", "您申请的交易已被驳回", salePlanInfo1.getCommonId());
+                geTuiUtils.pushByCid("驳回通知", "您申请的交易已被驳回", salePlanInfo1.getCommonId());
             }
             //更改销售计划信息
             this.updateById(salePlanInfo1);

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

@@ -136,7 +136,7 @@ public class SettledCompanyDynamicsServiceImpl extends ServiceImpl<SettledCompan
             else {
                 settledCompanyDynamics1.setStatusFlag(StatusEnum.ORDER_REJECTED.getFlag());
                 settledCompanyDynamics1.setStatus(StatusEnum.ORDER_REJECTED.getName());
-                geTuiUtils.pushByCid("审核通知", "您发布的动态已被驳回", commonUser.getId());
+                geTuiUtils.pushByCid("驳回通知", "您发布的动态已被驳回", commonUser.getId());
             }
             //更改信息
             this.updateById(settledCompanyDynamics1);

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

@@ -242,7 +242,7 @@ public class SettledCompanyInfoServiceImpl extends ServiceImpl<SettledCompanyInf
             else {
                 settledCompanyInfo1.setStatusFlag(StatusEnum.ORDER_REJECTED.getFlag());
                 settledCompanyInfo1.setStatus(StatusEnum.ORDER_REJECTED.getName());
-                geTuiUtils.pushByCid("审核通知", "您的公司入住申请已被驳回", commonUser.getId());
+                geTuiUtils.pushByCid("驳回通知", "您的公司入住申请已被驳回", commonUser.getId());
             }
             //更改信息
             this.updateById(settledCompanyInfo1);