审核

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/DriverViewInfoController.java

@@ -120,5 +120,15 @@ public class DriverViewInfoController {
     public DriverCarInfo selectDriverPhoneByName(String id){
         return driverViewInfoService.selectDriverDetail(id);
     }
+    /**
+     * 审核
+     * @param id
+     * @return
+     */
+    @PostMapping("/api/examine")
+    public String examine(String id,Integer flag){
+        return driverViewInfoService.examine(id,flag);
+
+    }
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/IdentityAuthenticationInfoController.java

@@ -58,7 +58,7 @@ public class IdentityAuthenticationInfoController {
      * @return
      */
     @PostMapping("/api/addIdentityAuthenticationInfo")
-    public String addIdentityAuthenticationInfo(@RequestBody IdentityAuthenticationInfo identityAuthenticationInfo) {
+    public String addIdentityAuthenticationInfo(@RequestBody IdentityAuthenticationInfo identityAuthenticationInfo) throws ServiceException {
         return iIdentityAuthenticationInfoService.addIdentityAuthenticationInfo(identityAuthenticationInfo);
     }
 
@@ -98,6 +98,16 @@ public class IdentityAuthenticationInfoController {
     public IdentityAuthenticationInfo getInfo(@RequestParam String commonId) throws ServiceException {
         return iIdentityAuthenticationInfoService.getInfo(commonId);
     }
+    /**
+     * 审核
+     * @param id
+     * @return
+     */
+    @PostMapping("/api/examine")
+    public String examine(String id,Integer flag){
+        return iIdentityAuthenticationInfoService.examine(id,flag);
+
+    }
 
 }
 

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

@@ -69,6 +69,14 @@ public class DriverViewInfo extends BaseModel<DriverViewInfo> {
      * 司机年龄
      */
     private String driverAge;
+    /**
+     * 认证状态key（1审核中3未通过5已覆盖7已认证）
+     */
+    private String authenticationStatusKey;
+    /**
+     * 认证状态
+     */
+    private String authenticationStatus;
     /**
      * 禁用标识（1:已禁用,0:没禁用）
      */

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

@@ -77,6 +77,9 @@ public class ExceptionDefinition {
     public static  ServiceExceptionDefinition IDENTITY_IS_BEING_AUDITED =
             new ServiceExceptionDefinition(11017, "粮商身份正在审核中");
 
+    public static  ServiceExceptionDefinition PHONE_NUMBER_ALREADY_EXISTS=
+            new ServiceExceptionDefinition(11018, "手机号已存在，是否覆盖");
+
     public static  ServiceExceptionDefinition ADDRESS_DATABASE_QUERY_FAILED  =
             new ServiceExceptionDefinition(16002, "执行语句失败");
     public static  ServiceExceptionDefinition PURCHASE_OVER_NUM  =
@@ -91,7 +94,6 @@ public class ExceptionDefinition {
     public static  ServiceExceptionDefinition ADVERTISEMENT_SQL_UPDATE_FAILED =
             new ServiceExceptionDefinition(22003, "修改广告数据库失败");
 
-
     public static  ServiceExceptionDefinition ADMIN_UNKNOWN_EXCEPTION =
             new ServiceExceptionDefinition(50000, "管理员系统未知异常");
 

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

@@ -67,6 +67,13 @@ public interface IDriverViewInfoService extends IService<DriverViewInfo> {
      * @return
      */
     DriverCarInfo selectDriverDetail(String id);
+    /**
+     * 审核
+     * @param id
+     * @param flag 1通过 2 驳回
+     * @return
+     */
+    String examine(String id,Integer flag);
 
 
 }

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

@@ -32,7 +32,7 @@ public interface IIdentityAuthenticationInfoService extends IService<IdentityAut
      * 添加身份认证
      * @param identityAuthenticationInfo
      */
-    String addIdentityAuthenticationInfo(IdentityAuthenticationInfo identityAuthenticationInfo);
+    String addIdentityAuthenticationInfo(IdentityAuthenticationInfo identityAuthenticationInfo) throws ServiceException;
 
     /**
      * 编辑身份认证
@@ -55,4 +55,11 @@ public interface IIdentityAuthenticationInfoService extends IService<IdentityAut
      * @param
      */
     IdentityAuthenticationInfo getInfo(String commonId) throws ServiceException;
+    /**
+     * 审核
+     * @param id
+     * @param flag 1通过 2 驳回
+     * @return
+     */
+    String examine(String id,Integer flag);
 }

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

@@ -8,6 +8,7 @@ import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.entity.DriverCarInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.DriverPayeeInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.DriverViewInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.IdentityAuthenticationInfo;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
 import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.DriverViewInfoMapper;
@@ -62,13 +63,18 @@ public class DriverViewInfoServiceImpl extends ServiceImpl<DriverViewInfoMapper,
     public String addInfo(DriverViewInfo driverViewInfo) {
         //新增主键id
         driverViewInfo.setId(IdGenerator.generateUUID());
+        //APP添加的司机需要审核
+        if("0".equals(driverViewInfo.getPcFlag())) {
+            driverViewInfo.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+            driverViewInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+        }
         //判断司机电话是否唯一
         List<DriverViewInfo> driverViewInfos =
                 this.selectList(new EntityWrapper<DriverViewInfo>()
                         .eq(DriverViewInfo.QueryFiles.DRIVER_PHONE, driverViewInfo.getDriverPhone())
                         .eq(DriverViewInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
         if (driverViewInfos.size() > 0) {
-            throw new YException(YExceptionEnum.DRIVER_PHONE_ERROR);
+                throw new YException(YExceptionEnum.DRIVER_PHONE_ERROR);
         }
         //判断司机身份证号是否唯一
         List<DriverViewInfo> driverViewInfoList =
@@ -127,6 +133,8 @@ public class DriverViewInfoServiceImpl extends ServiceImpl<DriverViewInfoMapper,
      */
     @Override
     public String editInfo(DriverViewInfo driverViewInfo) {
+        driverViewInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_COVERED.getFlag());
+        driverViewInfo.setAuthenticationStatus(StatusEnum.IDENTITY_COVERED.getName());
         //主表信息编辑
         this.updateById(driverViewInfo);
         //货车信息编辑
@@ -294,6 +302,35 @@ public class DriverViewInfoServiceImpl extends ServiceImpl<DriverViewInfoMapper,
                 .eq(DriverCarInfo.QueryFiles.DRIVER_ID, id).eq(DriverViewInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
         return driverCarInfo;
     }
+
+    /**
+     * 审核
+     * @param id
+     * @param flag 1通过 2 驳回
+     * @return
+     */
+    @Override
+    public String examine(String id, Integer flag) {
+        //查询司机列表
+        DriverViewInfo driverViewInfo = this.selectById(id);
+        if (driverViewInfo != null ){
+            //通过
+            if(flag==1){
+                driverViewInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
+                driverViewInfo.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
+            }
+            //驳回
+            else{
+                driverViewInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
+                driverViewInfo.setAuthenticationStatus(StatusEnum.IDENTITY_FAILED.getName());
+            }
+            //更改司机信息
+            this.updateById(driverViewInfo);
+            return "OK";
+        }
+        return "NG";
+    }
+
     public void DBConnection(){
         try{
             //加载驱动程序

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

@@ -8,6 +8,7 @@ import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.IdentityAuthenticationInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.ProcurementPlanInfo;
 import com.yh.saas.plugin.yiliangyiyun.exception.*;
 import com.yh.saas.plugin.yiliangyiyun.mapper.IdentityAuthenticationInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.*;
@@ -87,7 +88,7 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
      * @return
      */
     @Override
-    public String addIdentityAuthenticationInfo(IdentityAuthenticationInfo identityAuthenticationInfo){
+    public String addIdentityAuthenticationInfo(IdentityAuthenticationInfo identityAuthenticationInfo)throws ServiceException{
         // 根据传参手机号判断手机号是否存在
         //  空是新增
         identityAuthenticationInfo.setId(IdGenerator.generateUUID());
@@ -100,16 +101,7 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
                         .eq(IdentityAuthenticationInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
         //同一手机号再次被认证
         if (identityAuthenticationInfoList.size() > 0) {
-            //认证状态改为已覆盖
-            identityAuthenticationInfo.setAuthenticationStatus(StatusEnum.IDENTITY_COVERED.getName());
-            identityAuthenticationInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_COVERED.getFlag());
-            // 操作主表数据
-            this.updateById(identityAuthenticationInfo);
-            // 插入操作历史
-            String staffName = this.billOperateHisService.getStaffAndName();
-            // 插入操作历史
-            this.billOperateHisService.saveBillOperateHis(identityAuthenticationInfo.getId(), NumberConstant.CONSTANT_PURCHASE, staffName, null,
-                    identityAuthenticationInfo.getAuthenticationStatus(), null, "");
+            throw new AppServiceException(ExceptionDefinition.PHONE_NUMBER_ALREADY_EXISTS);
         }
         // 操作主表数据
         this.insert(identityAuthenticationInfo);
@@ -132,13 +124,14 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
      */
     @Override
     public String editIdentityAuthenticationInfo(IdentityAuthenticationInfo identityAuthenticationInfo) {
-        if("5".equals(identityAuthenticationInfo.getAuthenticationStatusKey())){
-            this.updateById(identityAuthenticationInfo);
-                return "OK";
-        }
-        //身份认证状态非未通过
-        else{
-            throw new YException(YExceptionEnum.AUTHENTICATION_INFORMATION_CHANGE_FAILED);
+        identityAuthenticationInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_COVERED.getFlag());
+        identityAuthenticationInfo.setAuthenticationStatus(StatusEnum.IDENTITY_COVERED.getName());
+        boolean one=this.updateById(identityAuthenticationInfo);
+        //成功返回ok
+        if (one ) {
+            return "OK";
+        } else {
+            return "NG";
         }
     }
     /**
@@ -150,7 +143,7 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
     public IdentityAuthenticationInfo getIdentityAuthenticationInfo(String id) {
        //查看身份认证
         IdentityAuthenticationInfo identityAuthenticationInfo = this.selectById(id);
-            return identityAuthenticationInfo;
+        return identityAuthenticationInfo;
     }
 
     /**
@@ -191,6 +184,35 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
         }
         return identityAuthenticationInfo;
     }
+
+    /**
+     * 审核
+     * @param id
+     * @param flag 1通过 2 驳回
+     * @return
+     */
+    @Override
+    public String examine(String id, Integer flag) {
+        //查询粮商列表
+        IdentityAuthenticationInfo identityAuthenticationInfo = this.selectById(id);
+        if (identityAuthenticationInfo != null ){
+            //通过
+            if(flag==1){
+                identityAuthenticationInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
+                identityAuthenticationInfo.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
+            }
+            //驳回
+            else{
+                identityAuthenticationInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
+                identityAuthenticationInfo.setAuthenticationStatus(StatusEnum.IDENTITY_FAILED.getName());
+            }
+            //更改粮商信息
+            this.updateById(identityAuthenticationInfo);
+            return "OK";
+        }
+        return "NG";
+    }
+
     public void DBConnection(){
         try{
             //加载驱动程序

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

@@ -102,7 +102,6 @@ public class TranCarInfoServiceImpl extends ServiceImpl<TranCarInfoMapper, TranC
                     tranCarInfo.getStatus(), null, "");
             return "OK";
         }
-
         return "NG";
     }