优化审核状态和openid问题

src/main/java/com/qtzl/alterSales/manager/handler/AflUserLoginInfoFindPageHandler.java

@@ -76,8 +76,8 @@ public class AflUserLoginInfoFindPageHandler extends AbstractAfterSalesManager<A
             if (!StringUtils.isEmpty(request.getMobile())) {
                 list.add(cb.equal(root.<String>get("mobile"), request.getMobile()));
             }
-            if (!StringUtils.isEmpty(request.getOpenId())) {
-                list.add(cb.equal(root.<String>get("openId"), request.getOpenId()));
+            if (!StringUtils.isEmpty(request.getPatternOpenId())) {
+                list.add(cb.equal(root.<String>get("openId"), request.getPatternOpenId()));
             }
             if (!StringUtils.isEmpty(request.getNickName())) {
                 list.add(cb.like(root.<String>get("nickName"),"%"+ request.getNickName()+"%"));
@@ -94,7 +94,6 @@ public class AflUserLoginInfoFindPageHandler extends AbstractAfterSalesManager<A
             if (request.getInsertTimeStart()!=null) {
                 list.add(cb.greaterThanOrEqualTo(root.<LocalDateTime>get("insertTime"), request.getInsertTimeStart()));
             }
-            //查询为未删除的数据
             Predicate[] p = new Predicate[list.size()];
             return cb.and(list.toArray(p));
         }), PageRequest.of(request.getPageNo() - 1, request.getPageSize(),

src/main/java/com/qtzl/alterSales/manager/handler/AflUserNoticeInfoFindPageHandler.java

@@ -76,8 +76,8 @@ public class AflUserNoticeInfoFindPageHandler extends AbstractAfterSalesManager<
             if (!StringUtils.isEmpty(request.getMobile())) {
                 list.add(cb.equal(root.<String>get("mobile"), request.getMobile()));
             }
-            if (!StringUtils.isEmpty(request.getOpenId())) {
-                list.add(cb.equal(root.<String>get("openId"), request.getOpenId()));
+            if (!StringUtils.isEmpty(request.getPatternOpenId())) {
+                list.add(cb.equal(root.<String>get("openId"), request.getPatternOpenId()));
             }
             if (request.getType()!=null) {
                 list.add(cb.equal(root.<Integer>get("type"), request.getType()));

src/main/java/com/qtzl/alterSales/manager/model/protocol/sales/AflCenterVehicleInfoExportRequest.java

@@ -18,7 +18,7 @@ public class AflCenterVehicleInfoExportRequest extends BaseModel {
     private String vehicleType;
     /*** 车辆识别码 */
     private String vin;
-    /*** 状态。1-审核中 、2-审核通过 、3-审核不通过 */
+    /*** 状态。0-待审核;1-审核成功;2-审核失败 */
     private String status;
     /*** 插入时间开始 */
     private LocalDateTime insertTimeStart;

src/main/java/com/qtzl/alterSales/manager/model/protocol/sales/AflUserLoginInfoFindPageViewRequest.java

@@ -6,7 +6,8 @@ import java.time.LocalDateTime;
 
 public class AflUserLoginInfoFindPageViewRequest extends AbstractAfterSalesPageRequest<AflUserLoginInfoFindPageViewResponse> {
 
-    private String openId;
+    /*** 路网openId */
+    private String patternOpenId;
     /*** 手机号 */
     private String mobile;
     /*** 状态 默认已实名 */
@@ -68,11 +69,11 @@ public class AflUserLoginInfoFindPageViewRequest extends AbstractAfterSalesPageR
         this.insertTimeEnd = insertTimeEnd;
     }
 
-    public String getOpenId() {
-        return openId;
+    public String getPatternOpenId() {
+        return patternOpenId;
     }
 
-    public void setOpenId(String openId) {
-        this.openId = openId;
+    public void setPatternOpenId(String patternOpenId) {
+        this.patternOpenId = patternOpenId;
     }
 }

src/main/java/com/qtzl/alterSales/manager/model/protocol/sales/AflUserNoticeInfoFindPageViewRequest.java

@@ -7,7 +7,7 @@ import java.time.LocalDateTime;
 public class AflUserNoticeInfoFindPageViewRequest extends AbstractAfterSalesPageRequest<AflUserNoticeInfoFindPageViewResponse> {
 
     /** 用户编号 */
-    private String openId ;
+    private String patternOpenId ;
     /** 账户编号 */
     private String accountId ;
     /** 手机号 */
@@ -21,12 +21,12 @@ public class AflUserNoticeInfoFindPageViewRequest extends AbstractAfterSalesPage
     /** 创建时间结束时间 */
     private LocalDateTime insertTimeEnd;
 
-    public String getOpenId() {
-        return openId;
+    public String getPatternOpenId() {
+        return patternOpenId;
     }
 
-    public void setOpenId(String openId) {
-        this.openId = openId;
+    public void setPatternOpenId(String patternOpenId) {
+        this.patternOpenId = patternOpenId;
     }
 
     public String getAccountId() {

src/main/java/com/qtzl/alterSales/manager/model/protocol/sales/AflUserNoticeInfoSaveOrUpdateRequest.java

@@ -14,7 +14,7 @@ public class AflUserNoticeInfoSaveOrUpdateRequest extends BaseModel {
 
     private String id ;
     /** 用户编号 */
-    private String openId ;
+    private String patternOpenId ;
     /** 账户编号 */
     private String accountId ;
     /** 手机号 */
@@ -39,12 +39,12 @@ public class AflUserNoticeInfoSaveOrUpdateRequest extends BaseModel {
         this.id = id;
     }
 
-    public String getOpenId() {
-        return openId;
+    public String getPatternOpenId() {
+        return patternOpenId;
     }
 
-    public void setOpenId(String openId) {
-        this.openId = openId;
+    public void setPatternOpenId(String patternOpenId) {
+        this.patternOpenId = patternOpenId;
     }
 
     public String getAccountId() {

src/main/java/com/qtzl/alterSales/manager/service/AflCenterVehicleInfoServiceImpl.java

@@ -88,49 +88,6 @@ public class AflCenterVehicleInfoServiceImpl implements AflCenterVehicleInfoServ
                 throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("审核状态变更失败,该车辆所属账户信息不存在。");
             }
             aflCenterUserInfoService.getToken(aflCenterUserInfo);
-//            if (StringUtils.isEmpty(aflCenterUserInfo.getOpenId())|| StringUtils.isEmpty(aflCenterUserInfo.getAccessToken())){
-//                UserInfoAuthenticationRequestVo userInfoAuthenticationRequestVo = new UserInfoAuthenticationRequestVo();
-//                userInfoAuthenticationRequestVo.setId(aflCenterUserInfo.getIdNum());
-//                userInfoAuthenticationRequestVo.setMobile(aflCenterUserInfo.getMobile());
-//                userInfoAuthenticationRequestVo.setName(aflCenterUserInfo.getName());
-//
-//                Integer i = null;
-//                try {
-//                    i = Integer.parseInt(aflCenterUserInfo.getIdType());
-//                } catch (NumberFormatException e) {
-//                    throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("证件类型转换失败，请确认,请重新审核");
-//                }
-//                userInfoAuthenticationRequestVo.setUserIdType(i);
-//                Map<String, String> requestParam = userInfoAuthenticationRequestVo.getRequestParam();
-//                ZtHttpResponse response = null;
-//                try {
-//                    response = httpUtil.doPost(ZttxInterfaceCode.USER_INFO_AUTHENTICATION, requestParam);
-//                } catch (ManagerException e) {
-//                    e.getMessage();
-//                    throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("修改车辆信息失败,请重新审核");
-//                }
-//                if (response != null && response.getRcode() == 0) {
-//                    try {
-//                        UserInfoAuthenticationResponseVo res = JSONObject.parseObject(response.getData(), UserInfoAuthenticationResponseVo.class);
-//                        aflCenterUserInfo.setOpenId(res.getOpenId());
-//                        aflCenterUserInfo.setAccessToken(res.getAccessToken());
-//                        aflCenterUserInfoRepo.save(aflCenterUserInfo);
-//                    } catch (Exception e) {
-//                        throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("返回数据解析异常,请重新审核");
-//                    }
-//                }
-//            }else {
-//                RefreshTokenResponseVo refreshTokenResponseVo = null;
-//                try {
-//                    refreshTokenResponseVo = tokenService.refreshToken(aflCenterUserInfo.getOpenId(), aflCenterUserInfo.getAccessToken());
-//                } catch (ServiceHandleException e) {
-//                    throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("获取刷新令牌失败,请重新审核");
-//                }
-//                if (refreshTokenResponseVo==null){
-//                    throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("获取刷新令牌失败,请重新审核");
-//                }
-//                aflCenterUserInfo.setAccessToken(refreshTokenResponseVo.getAccessToken());
-//            }
             UpdateVehicleInfoRequestVo updateVehicleInfoRequestVo = new UpdateVehicleInfoRequestVo();
             updateVehicleInfoRequestVo.setAccountId(aflCenterVehicleInfo.getAccountId());
             updateVehicleInfoRequestVo.setOpenId(aflCenterUserInfo.getOpenId());

src/main/java/com/qtzl/alterSales/manager/service/AflUserLoginInfoServiceImpl.java

@@ -100,8 +100,8 @@ public class AflUserLoginInfoServiceImpl implements  AflUserLoginInfoService{
             if (!StringUtils.isEmpty(request.getNickName())) {
                 list.add(cb.like(root.<String>get("nickName"), "%"+request.getNickName()+"%"));
             }
-            if (!StringUtils.isEmpty(request.getOpenId())) {
-                list.add(cb.equal(root.<String>get("openId"), request.getOpenId()));
+            if (!StringUtils.isEmpty(request.getPatternOpenId())) {
+                list.add(cb.equal(root.<String>get("openId"), request.getPatternOpenId()));
             }
             if (request.getSex()!=null) {
                 list.add(cb.equal(root.<Integer>get("sex"), request.getSex()));
@@ -129,8 +129,8 @@ public class AflUserLoginInfoServiceImpl implements  AflUserLoginInfoService{
             if (!StringUtils.isEmpty(request.getNickName())) {
                 list.add(cb.like(root.<String>get("nickName"), "%"+request.getNickName()+"%"));
             }
-            if (!StringUtils.isEmpty(request.getOpenId())) {
-                list.add(cb.equal(root.<String>get("openId"), request.getOpenId()));
+            if (!StringUtils.isEmpty(request.getPatternOpenId())) {
+                list.add(cb.equal(root.<String>get("openId"), request.getPatternOpenId()));
             }
             if (request.getSex()!=null) {
                 list.add(cb.equal(root.<Integer>get("sex"), request.getSex()));

src/main/java/com/qtzl/alterSales/manager/service/AflUserNoticeInfoServiceImpl.java

@@ -96,7 +96,7 @@ public class AflUserNoticeInfoServiceImpl implements  AflUserNoticeInfoService{
         if (StringUtils.isEmpty(request.getAccountId())) {
             throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("账户编号不能为空");
         }
-        if (StringUtils.isEmpty(request.getOpenId())) {
+        if (StringUtils.isEmpty(request.getPatternOpenId())) {
             throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("用户编号不能为空");
         }
         if (request.getType()==null) {