Merge remote-tracking branch 'origin/test' into test

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

@@ -22,6 +22,7 @@ import com.ydtech.modules.order.dao.InsOrdersMapper;
 import com.ydtech.modules.order.entity.BasePageResult;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
+import com.ydtech.utils.ObjectUtil;
 import com.ydtech.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -417,7 +418,7 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
         Page<SysAgencyLeader> insOrdersPage = page(page, wrapper);
         List<SysAgencyLeader> records = insOrdersPage.getRecords();
         List<SysAgencyLeaderVo> sysAgencyLeaderVos = BeanUtil.copyToList(records, SysAgencyLeaderVo.class);
-        if (sysAgencyLeaderVos.size() > 0) {
+        if (!sysAgencyLeaderVos.isEmpty()) {
             for (SysAgencyLeaderVo sysAgencyLeaderVo : sysAgencyLeaderVos) {
                 SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>().eq(SysDept::getId, sysAgencyLeaderVo.getDeptId()).eq(SysDept::getDelFlag, 0));
                 if (sysDept != null) {
@@ -425,7 +426,9 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
                     sysAgencyLeaderVo.setDeptName(sysDept.getName());
                 }
                 SysUser sysUser = sysUserMapper.selectById(sysAgencyLeaderVo.getUserId());
-                sysAgencyLeaderVo.setUserName(sysUser.getName());
+                if(!Objects.isNull(sysUser)) {
+                    sysAgencyLeaderVo.setUserName(sysUser.getName());
+                }
             }
         }
 

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

@@ -131,15 +131,17 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
 
         List<SysUserPartner> sysUserPartners = BeanUtil.copyToList(records, SysUserPartner.class);
 
-        if (sysUserPartners.size() > 0) {
+        if (!sysUserPartners.isEmpty()) {
             for (SysUserPartner user : sysUserPartners) {
                 SysUser sysUser1 = sysUserMapper.selectById(user.getUserId());
-                user.setUserName(sysUser1.getName());
-                user.setDeptId(sysUser1.getDeptId());
-                SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>()
-                        .eq(SysDept::getId, sysUser1.getDeptId()).eq(SysDept::getDelFlag, 0));
-                user.setParentId(sysDept.getParentId());
-                user.setDeptName(sysDept.getName());
+                if(!Objects.isNull(sysUser1)) {
+                    user.setUserName(sysUser1.getName());
+                    user.setDeptId(sysUser1.getDeptId());
+                    SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>()
+                            .eq(SysDept::getId, sysUser1.getDeptId()).eq(SysDept::getDelFlag, 0));
+                    user.setParentId(sysDept.getParentId());
+                    user.setDeptName(sysDept.getName());
+                }
                 SysPartner sysPartner = sysPartnerMapper.selectOne(new LambdaQueryWrapper<SysPartner>()
                         .eq(SysPartner::getUserId, user.getUserId()));
                 if (sysPartner != null) {

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/fnc/service/impl/InsFeeAuditServiceImpl.java

@@ -37,6 +37,7 @@ import com.ydtech.modules.lg.service.PushLgDataServerService;
 import com.ydtech.modules.order.dao.InsOrdersMapper;
 import com.ydtech.modules.order.entity.InsFeeOrder;
 import com.ydtech.modules.order.entity.InsOrders;
+import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.protocol.service.PtlAgreementService;
 import com.ydtech.modules.protocol.utils.AssertionUtils;
 import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
@@ -137,6 +138,8 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
     private PushLgDataServerService dataServerService;
 
     private ExecutorService executorService= Executors.newCachedThreadPool();
+    @Autowired
+    private InsOrdersService insOrdersService;
 
 
     public InsFeeAuditServiceImpl(FncInsAreaCompanyMapper insAreaCompanyMapper, InsOrdersMapper insOrdersMapper,
@@ -178,7 +181,6 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
 
             //InsOrders order = insOrdersMapper.selectById(orderNo);
             InsAreaCompany insAreaCompany = insAreaCompanyMapper.selectById(insFeeAudit.getInsOrderNo());
-
             //获取该订单的费用
             InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getOne(new LambdaQueryWrapper<InsFeeOrderNew>()
                     .eq(InsFeeOrderNew::getInsOrderNo, insFeeAudit.getInsOrderNo()));
@@ -335,12 +337,21 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 }
                 sysChannelCostService.updateBatchById(costList);
             }
+
             //先把钱加到总账户，再修改抽层状态
             List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
                     .eq(SysPremiumDetails::getCompanyId,insAreaCompany.getId())
                     .eq(SysPremiumDetails::getType,2)
                     .eq(SysPremiumDetails::getStatus,0));
-            if (sysPremiumDetails.size()>0) {
+
+            if (sysPremiumDetails.isEmpty() && order.getIsExternal() == 1) {
+                //已承保记录保费数据
+                com.ydtech.modules.order.entity.InsAreaCompany insAreaCompany1 = new com.ydtech.modules.order.entity.InsAreaCompany();
+                BeanUtils.copyProperties(insAreaCompany, insAreaCompany1);
+                insOrdersService.saveFeeInfo(insAreaCompany1);
+            }
+
+            if (!sysPremiumDetails.isEmpty()) {
 
                 Map<String, List<SysPremiumDetails>> listMap = sysPremiumDetails.stream().sorted(Comparator.comparing(SysPremiumDetails::getId))
                         .collect(Collectors.groupingBy(SysPremiumDetails::getUserId));

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/InsOrdersService.java

@@ -54,6 +54,12 @@ public interface InsOrdersService extends IService<InsOrders> {
      */
     void updateByOrderStatus(InsAreaCompany insAreaCompany);
 
+    /**
+     * 合伙人插入钱逻辑
+     * @param insAreaCompany
+     */
+    void saveFeeInfo(InsAreaCompany insAreaCompany);
+
     /**
      * 判断订单是否存在
      *

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/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

@@ -262,7 +262,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             String id = insAreaCompany.getId();
             if (StringUtils.isNotEmpty(id)) {
                 List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>().eq(SysPremiumDetails::getCompanyId, id));
-                if ( sysPremiumDetails.size() == 0) {
+                if (sysPremiumDetails.isEmpty()) {
                     //已承保记录保费数据
                     saveFeeInfo(insAreaCompany);
                 }
@@ -281,7 +281,8 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
     }
 
-    private void saveFeeInfo(InsAreaCompany insAreaCompany) {
+    @Override
+    public void saveFeeInfo(InsAreaCompany insAreaCompany) {
         InsOrders insOrders = getById(insAreaCompany.getOrderno());
         String userId = insOrders.getUserid();
         try {
@@ -2411,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;
     }
 
     /**