Merge branch 'test' into wuhp

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -1369,6 +1369,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public HttpResult updateUserInfo(String userId, SysUser2Vo sysUserVo) {
         SysUser sysUser = sysUserVo.getSysUser();
         int beStatus = sysUser.getStatus();
+        //查找数据库是否存在相同的身份证
+        if(sysUserMapper.selectCount(new LambdaQueryWrapper<SysUser>()
+                .eq(SysUser::getIdentity, sysUserVo.getSysUser().getIdentity())) > 0){
+            return HttpResult.error("已存在身份证号，无法修改");
+        }
+
         //如果审核驳回则 重新修改为 审核状态
         if (sysUserVo.getSysUser().getStatus().equals(UserWorkStatus.UWS_3.getCode())) {
             sysUserVo.getSysUser().setStatus(UserWorkStatus.UWS_2.getCode());

src/main/java/com/ydtech/modules/order/components/bohai/BoHaiRequestApiComponent.java

@@ -87,7 +87,7 @@ public class BoHaiRequestApiComponent {
                                                                                             String sysSourceCode,
                                                                                             RequestType requestType) throws Exception {
         S response = post(q, url, tClass, sysSourceCode, requestType);
-        verificationResponseCode(response.getResponseCode(), response.getResponseMsg());
+        verificationResponseCode(response.getResponseCode(), response.getResponseMsg(),requestType);
         return response;
     }
 
@@ -234,8 +234,8 @@ public class BoHaiRequestApiComponent {
      * @param responseCode 响应code
      * @param responseMsg  响应内容
      */
-    private void verificationResponseCode(String responseCode, String responseMsg) {
-        if (ResponseCode.R_Z00004.getCode().equals(responseCode)) {
+    private void verificationResponseCode(String responseCode, String responseMsg,RequestType requestType) {
+        if (ResponseCode.R_Z00004.getCode().equals(responseCode) && !requestType.getCode().equals(RequestType.Z00008.getCode())) {
             throw new SystemException(responseMsg);
         }
     }

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

@@ -503,9 +503,22 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode());
             // 支付请求
             PaymentRequest paymentRequest = new PaymentRequest(parameters, insAreaCompany.getId(), insAreaCompany.getInsOrderNo());
-            PaymentResponse paymentResponse = boHaiRequestApiComponent.payment(paymentRequest, parameters.getSysSourceCode());
-            String payUrl = paymentResponse.getData().getPayUrl();
-            insAreaCompany.setPaymentLink(payUrl);
+            int whileNum = 5;
+            PaymentResponse paymentResponse = null;
+            while(whileNum > 1){
+                Thread.sleep(3000);
+                paymentResponse = boHaiRequestApiComponent.payment(paymentRequest, parameters.getSysSourceCode());
+                if(paymentResponse.getResponseCode().equals(ResponseCode.R_Z00001.getCode())) {
+                    String payUrl = paymentResponse.getData().getPayUrl();
+                    insAreaCompany.setPaymentLink(payUrl);
+                    break;
+                }
+                whileNum--;
+            }
+            if(!paymentResponse.getResponseCode().equals(ResponseCode.R_Z00001.getCode())){
+                throw new SystemException(paymentResponse.getResponseMsg());
+            }
+
             insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
             return HttpResult.ok("核保通过");
         } else if (i == 2) {
@@ -574,8 +587,11 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
     public HttpResult<Object> getOrderDetail(String subOrderNo) throws Exception {
         InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(subOrderNo);
         List<StatusDocumentsResponse.DataDTO.DocumentListDTO> documentList = getDocumentListDTO(insAreaCompany);
+        documentList = documentList.stream().filter(x -> !x.getInsuranceType().equals("2")).collect(Collectors.toList());
         List<StatusDocumentsResponse.DataDTO.DocumentListDTO> documentListDTOS =
-                documentList.stream().filter(x -> ResultCode.RC_B5.getCode().equals(x.getStatus())).collect(Collectors.toList());
+                documentList.stream()
+                        .filter(x -> !x.getInsuranceType().equals("2"))
+                        .filter(x -> ResultCode.RC_B5.getCode().equals(x.getStatus())).collect(Collectors.toList());
 
         if (documentListDTOS.size() == documentList.size()) {
             for (StatusDocumentsResponse.DataDTO.DocumentListDTO documentListDTO : documentListDTOS) {

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

@@ -195,11 +195,11 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
             PersonAreaVo insuredPersonArea = new PersonAreaVo();
             if (StringUtils.isBlank(ownerInfo.getProperty()) || !"0".equals(ownerInfo.getProperty())) {
                 //车主区划信息
-                ownerPersonArea = sysAreaService.queryByAddress(quoteInfoVo.getOwnerInfo().getAddr(), quoteInfoVo.getOwnerInfo().getIdentifyNumber());
+                ownerPersonArea = sysAreaService.queryByAddress(quoteInfoVo.getOwnerInfo().getAddr(), quoteInfoVo.getOwnerInfo().getIdentifyNumber(),null);
             }
             if (StringUtils.isBlank(policyHolderInfo.getProperty()) || !"0".equals(policyHolderInfo.getProperty())) {
                 //投保人区划信息
-                policyHolderPersonArea = sysAreaService.queryByAddress(quoteInfoVo.getPolicyHolderInfo().getAddr(), quoteInfoVo.getPolicyHolderInfo().getIdentifyNumber());
+                policyHolderPersonArea = sysAreaService.queryByAddress(quoteInfoVo.getPolicyHolderInfo().getAddr(), quoteInfoVo.getPolicyHolderInfo().getIdentifyNumber(),null);
             }
             if (StringUtils.isBlank(insuredPersonInfo.getProperty()) || !"0".equals(insuredPersonInfo.getProperty())) {
                 //投保人等于被保人
@@ -207,7 +207,7 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
                     insuredPersonArea = policyHolderPersonArea;
                 } else {
                     //被保人区划信息
-                    insuredPersonArea = sysAreaService.queryByAddress(quoteInfoVo.getInsuredPersonInfo().getAddr(), quoteInfoVo.getInsuredPersonInfo().getIdentifyNumber());
+                    insuredPersonArea = sysAreaService.queryByAddress(quoteInfoVo.getInsuredPersonInfo().getAddr(), quoteInfoVo.getInsuredPersonInfo().getIdentifyNumber(),null);
                 }
             }
             // 1.获取业务订单号接口

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

@@ -1146,9 +1146,12 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
      */
     @Override
     public void updateDeleteFalg(String id) {
-        UpdateWrapper<InsAreaCompany> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.set("del_flag", 0).eq("id", id);
-        update(updateWrapper);
+        //修改为真删
+        int i = baseMapper.deleteById(id);
+//        UpdateWrapper<InsAreaCompany> updateWrapper = new UpdateWrapper<>();
+//        updateWrapper.set("del_flag", 0).eq("id", id);
+//        update(updateWrapper);
+
     }
 
     @Override

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

@@ -2412,9 +2412,8 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         if (externalOrder == null) {
             throw new SystemException("未找到暂存订单");
         }
-        //设置删除标识
-        externalOrder.setDelFlag("1");
-        return baseMapper.updateById(externalOrder) > 0;
+        //真删除
+        return baseMapper.deleteById(externalOrder.getOrderno()) > 0;
     }
 
     /**