大家财险删除测试信息

src/main/java/com/ydtech/modules/admin/constants/RoleConstants.java

@@ -30,7 +30,7 @@ public enum RoleConstants {
 //    R42("42","机构管理员","42,22,19");
 
 
-    R01("1","admin",""),
+    R01("1","admin","17,18,22,23,24,25,28,29,30,31,32,38"),
     R02("2","初始用户","22"),
     R17("17","部长","17,18,22,23,24,25,28,29,30,31,32,38"),
     R18("18","门店长","17,18,22,23,24,25,28,29,30,31,32,38"),

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -371,12 +371,15 @@ public class SysUserController extends BaseController {
         //获取用户角色
         SysUser user = getUser();
         //如果查询后线人员
+//        if (RoleConstants.R22.getCode().equals(pageDto.getDto().getRoleId())) {
+//            if (RoleConstants.R17.getCode().equals(user.getRoleId())) {
+//                pageDto.getDto().setRoleId("18,22");
+//            } else if (RoleConstants.R18.getCode().equals(user.getRoleId())) {
+//                pageDto.getDto().setRoleId("22");
+//            }
+//        }
         if (RoleConstants.R22.getCode().equals(pageDto.getDto().getRoleId())) {
-            if (RoleConstants.R17.getCode().equals(user.getRoleId())) {
-                pageDto.getDto().setRoleId("18,22");
-            } else if (RoleConstants.R18.getCode().equals(user.getRoleId())) {
-                pageDto.getDto().setRoleId("22");
-            }
+            pageDto.getDto().setRoleId("17,18,22,23,24,25,28,29,30,31,32,38");
         }
         //设置登录用户的部门
         if ("".equals(pageDto.getDto().getDeptId()) || null == pageDto.getDto().getDeptId()) {
@@ -752,8 +755,6 @@ public class SysUserController extends BaseController {
                 if (deptLevel != 4) {
                     throw new SystemException("部长只能归属于4级");
                 }
-            } else {
-                throw new SystemException("角色id有误");
             }
 
         }

src/main/java/com/ydtech/modules/order/entity/api/dajia/DaJiaConfigureParameters.java

@@ -44,4 +44,6 @@ public class DaJiaConfigureParameters implements ConfigureParameters {
     private String recommendedSubChannels;
     @JsonProperty("ChannelCode")
     private String channelCode;
+    @JsonProperty("RecommendedCode")
+    private String recommendedCode;
 }

src/main/java/com/ydtech/modules/order/entity/api/dajia/request/ODR1008Request.java

@@ -463,8 +463,8 @@ public class ODR1008Request extends DaJiaBaseRequest {
         vehicleOwnerInfoDTO.setVehicleOwnerCCertfCls("01");
 
         //新能源测试使用
-        vehicleOwnerInfoDTO.setVehicleOwnerCCertfCde("E88888888");
-        vehicleOwnerInfoDTO.setVehicleOwnerCCertfCls("02");
+//        vehicleOwnerInfoDTO.setVehicleOwnerCCertfCde("E88888888");
+//        vehicleOwnerInfoDTO.setVehicleOwnerCCertfCls("02");
 
         //通讯地址
         vehicleOwnerInfoDTO.setVehicleOwnerCClntAddr(quoteInfoVo.getOwnerInfo().getAddr());
@@ -517,8 +517,8 @@ public class ODR1008Request extends DaJiaBaseRequest {
         //设置证件类型
         applicantInfoDTO.setApplicantCCertfCls("01");
         //新能源测试使用
-        applicantInfoDTO.setApplicantCCertfCde("E88888888");
-        applicantInfoDTO.setApplicantCCertfCls("02");
+//        applicantInfoDTO.setApplicantCCertfCde("E88888888");
+//        applicantInfoDTO.setApplicantCCertfCls("02");
         //客户类型
         applicantInfoDTO.setApplicantClntMrk(1);
         //通讯地址
@@ -565,8 +565,8 @@ public class ODR1008Request extends DaJiaBaseRequest {
         //设置证件类型
         insuredInfoDTO.setInsuredCertfCls("01");
         //新能源测试使用
-        insuredInfoDTO.setInsuredCertfCde("E88888888");
-        insuredInfoDTO.setInsuredCertfCls("02");
+//        insuredInfoDTO.setInsuredCertfCde("E88888888");
+//        insuredInfoDTO.setInsuredCertfCls("02");
         //客户类型
         insuredInfoDTO.setInsuredClntMrk(1);
         //通讯地址
@@ -760,11 +760,13 @@ public class ODR1008Request extends DaJiaBaseRequest {
         //设置业务员代码
         businessInfoDTO.setBusiSlsCde(daJiaConfigureParameters.getSalespersonCode());
         //设置推荐人代码
-        businessInfoDTO.setBusiRecommendCde(daJiaConfigureParameters.getOperatorCode());
+        businessInfoDTO.setBusiRecommendCde(daJiaConfigureParameters.getRecommendedCode());
         //设置推荐人渠道
         businessInfoDTO.setBusiRecSubChannel(daJiaConfigureParameters.getRecommendedSubChannels());
         //设置渠道
-        businessInfoDTO.setBusiChannelSrc("10");
+//        businessInfoDTO.setBusiChannelSrc(CChannelSrc.CHANNEL0.getCode().toString());
+        //准生产环境测试
+        businessInfoDTO.setBusiChannelSrc(daJiaConfigureParameters.getChannel());
         //设置一级来源
         businessInfoDTO.setBusiDataSrc("G");
         //设置二级来源

src/main/java/com/ydtech/modules/order/entity/api/dajia/request/ODR1010Request.java

@@ -197,11 +197,11 @@ public class ODR1010Request extends DaJiaBaseRequest {
         //业务员代码
         body.businessInfo.setBusiSlsCde(daJiaConfigureParameters.getSalespersonCode());
         //推荐人代码
-        body.businessInfo.setBusiRecommendCde(daJiaConfigureParameters.getOperatorCode());
+        body.businessInfo.setBusiRecommendCde(daJiaConfigureParameters.getRecommendedCode());
         //推荐子渠道
         body.businessInfo.setBusiRecSubChannel(daJiaConfigureParameters.getRecommendedSubChannels());
         //渠道
-        body.businessInfo.setBusiChannelSrc(CChannelSrc.CHANNEL0.getCode().toString());
+        body.businessInfo.setBusiChannelSrc(daJiaConfigureParameters.getChannel());
         //设置一级来源
         body.businessInfo.setBusiDataSrc("G");
         //设置二级来源
@@ -239,17 +239,13 @@ public class ODR1010Request extends DaJiaBaseRequest {
         //投保人名称
         body.checkInfo.setApplicantNme(insOrders.getApplyinfo().getString("name"));
         //投保人证件号码
-//        body.checkInfo.setApplicantCCertfCde(insOrders.getApplyinfo().getString("identifyNumber"));
-        //新能源测试
-        body.checkInfo.setApplicantCCertfCde("E88888888");
+        body.checkInfo.setApplicantCCertfCde(insOrders.getApplyinfo().getString("identifyNumber"));
         //投保人手机号
         body.checkInfo.setApplicantMobile(insOrders.getApplyinfo().getString("mobile"));
         //被保人名称
         body.checkInfo.setInsuredNme(insOrders.getInsureinfo().getString("name"));
         //被保人证件号码
-//        body.checkInfo.setInsuredCertfCde(insOrders.getInsureinfo().getString("identifyNumber"));
-        //新能源测试
-        body.checkInfo.setInsuredCertfCde("E88888888");
+        body.checkInfo.setInsuredCertfCde(insOrders.getInsureinfo().getString("identifyNumber"));
         //被保人手机号
         body.checkInfo.setInsuredMobile(insOrders.getInsureinfo().getString("mobile"));
 

src/main/java/com/ydtech/modules/order/service/impl/DaJiaOrderServiceImpl.java

@@ -246,6 +246,9 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
                         orderNo, quoteInfoVo.getOrderNo(), busiId, nvhlodr1001Response);
                 return quoteRespVoHttpResult;
             } else {
+                if(Message.M0003.getCode().equals(odr1009Response.getStatus())){
+                    return HttpResult.error("报价失败,原因:" + odr1009Response.getMessage());
+                }
                 if ("0".equals(odr1009Response.getResult().getJqAppStatus()) && "0002".equals(odr1009Response.getStatus())) {
                     return HttpResult.error("报价失败,原因:" + odr1009Response.getResult().getJqAppStatusMessage());
                 } else if ("0".equals(odr1009Response.getResult().getSyAppStatus()) && "0002".equals(odr1009Response.getStatus())) {
@@ -505,6 +508,9 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
                     return HttpResult.ok("核保成功");
                 }
             } else {
+                if(Message.M0003.getCode().equals(odr1010Response.getStatus()) || Message.M0002.getCode().equals(odr1010Response.getStatus())){
+                    return HttpResult.error("核保失败,原因:" + odr1010Response.getMessage());
+                }
                 if ("0".equals(odr1010Response.getResult().getJqAppStatus()) && "0003".equals(odr1010Response.getStatus())) {
                     return HttpResult.error("核保失败,原因:" + odr1010Response.getResult().getJqAppStatusMessage());
                 } else if ("0".equals(odr1010Response.getResult().getSyAppStatus()) && "0003".equals(odr1010Response.getStatus())) {