修改导入付款

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgpayment/service/impl/HlgPaymentServiceImpl.java

@@ -874,54 +874,6 @@ public class HlgPaymentServiceImpl extends ServiceImpl<HlgPaymentMapper, HlgPaym
 
         }
         if (hlgPaymentDetailList.size() > 0) {
-
-            List<HlgPaymentDetailExport> hlgPaymentDetailList1 = hlgPaymentDetailList;
-            for (int j = 0; j < hlgPaymentDetailList.size(); j++) {
-                String name = hlgPaymentDetailList.get(j).getName();//姓名
-                String phone = hlgPaymentDetailList.get(j).getPhone();   //手机号
-                String idcardNumber = hlgPaymentDetailList.get(j).getIdcardNumber();  //身份证号
-                String cardNumber = hlgPaymentDetailList.get(j).getCardNumber();   //银行卡号
-                Map map = new HashMap();//存放错误行数和错误原因
-                if (StringUtils.isBlank(idcardNumber)) {
-                    map.put("id", j + 3);
-                    map.put("phone", phone);
-                    map.put("reason", "身份证号未填写");
-                    resultlist.add(map);
-                    hlgPaymentDetailList1.remove(hlgPaymentDetailList.get(j));
-                    continue;
-                } else {
-                    if (idcardNumber.length() == 18) {
-                        HlgUser hlgUser = hlgUserMapper.getUserByIdcardNumber(idcardNumber);
-                        HlgCompany hlgCompany = hlgCompanyService.getById(hlgPayment.getCompanyId());
-                        if (hlgUser == null) {
-                            //获取当前平台id
-                            HlgPlatform hlgPlatform = hlgPlatformMapper.selectById(hlgCompany.getPlatformId());
-                            HlgUser hlgUser1 = new HlgUser();
-                            hlgUser1.setPlatformId(hlgPlatform.getId());
-                            hlgUser1.setSysOrgCode(hlgPlatform.getSysOrgCode());
-                            hlgUser1.setName(name);
-                            hlgUser1.setIdcardNumber(idcardNumber);
-                            userList.add(hlgUser1);
-                        }
-                    } else {
-                        map.put("id", j + 3);
-                        map.put("phone", phone);
-                        map.put("reason", "身份证号为18位");
-                        resultlist.add(map);
-                        hlgPaymentDetailList1.remove(hlgPaymentDetailList.get(j));
-                        continue;
-                    }
-                }
-                if (StringUtils.isBlank(cardNumber)) {
-                    map.put("id", j + 3);
-                    map.put("phone", phone);
-                    map.put("reason", "银行卡号未填写");
-                    resultlist.add(map);
-                    hlgPaymentDetailList1.remove(hlgPaymentDetailList.get(j));
-                    continue;
-                }
-            }
-            hlgPaymentDetailList = hlgPaymentDetailList1;
             List<HlgPaymentDetailExport> list1 = new ArrayList<HlgPaymentDetailExport>();
             list1.addAll(hlgPaymentDetailList);
             Set<HlgPaymentDetailExport> set1 = new TreeSet<HlgPaymentDetailExport>((hwPaymentDetailExport1, hwPaymentDetailExport2) -> StringUtils.isNotBlank(hwPaymentDetailExport1.idcardNumber) && StringUtils.isNotBlank(hwPaymentDetailExport2.idcardNumber) ? hwPaymentDetailExport1.idcardNumber.compareTo(hwPaymentDetailExport2.idcardNumber) : 1);
@@ -1001,7 +953,41 @@ public class HlgPaymentServiceImpl extends ServiceImpl<HlgPaymentMapper, HlgPaym
                         continue;
                     }
                 }
-
+                if (StringUtils.isBlank(idcardNumber)) {
+                    map.put("id", j + 3);
+                    map.put("phone", phone);
+                    map.put("reason", "身份证号未填写");
+                    resultlist.add(map);
+                    continue;
+                } else {
+                    if (idcardNumber.length() == 18) {
+                        HlgUser hlgUser = hlgUserMapper.getUserByIdcardNumber(idcardNumber);
+                        HlgCompany hlgCompany = hlgCompanyService.getById(hlgPayment.getCompanyId());
+                        if (hlgUser == null) {
+                            //获取当前平台id
+                            HlgPlatform hlgPlatform = hlgPlatformMapper.selectById(hlgCompany.getPlatformId());
+                            HlgUser hlgUser1 = new HlgUser();
+                            hlgUser1.setPlatformId(hlgPlatform.getId());
+                            hlgUser1.setSysOrgCode(hlgPlatform.getSysOrgCode());
+                            hlgUser1.setName(name);
+                            hlgUser1.setIdcardNumber(idcardNumber);
+                            userList.add(hlgUser1);
+                        }
+                    } else {
+                        map.put("id", j + 3);
+                        map.put("phone", phone);
+                        map.put("reason", "身份证号为18位");
+                        resultlist.add(map);
+                        continue;
+                    }
+                }
+                if (StringUtils.isBlank(cardNumber)) {
+                    map.put("id", j + 3);
+                    map.put("phone", phone);
+                    map.put("reason", "银行卡号未填写");
+                    resultlist.add(map);
+                    continue;
+                }
                 if (StringUtils.isBlank(payment)) {
                     map.put("id", j + 3);
                     map.put("phone", phone);