delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/dwxx/DwxxServiceImpl.java

@@ -51,6 +51,7 @@ import com.unis.module.system.dal.mysql.permission.UserRoleMapper;
 import com.unis.module.system.dal.mysql.user.AdminUserMapper;
 import com.unis.module.system.enums.permission.RoleIdEnum;
 import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.Nullable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
@@ -255,41 +256,8 @@ public class DwxxServiceImpl implements DwxxService {
         String areaLevel = loginUser.getInfo().get("areaLevel");
         // 国家交易中心已选
         if ("0".equals(areaLevel) || ObjectUtil.isEmpty(areaLevel)) {
-            if (YXZT.NOT_SELECTED.getCode().equals(pageReqVO.getYxcf())) {
-                List<StoreRespVO> storeListForNation = dwxxMapper.getStoreListForNation(pageReqVO);
-                List<CaxxDO> caxxDOS = caxxMapper.selectListByKqId(pageReqVO.getKqId());
-                if (!ObjectUtils.isEmpty(storeListForNation)) {
-                    if (!ObjectUtils.isEmpty(caxxDOS)) {
-                        List<Long> idsExist = caxxDOS.stream().map(CaxxDO::getId).collect(Collectors.toList());
-                        if (!ObjectUtils.isEmpty(idsExist)) {
-                            storeListForNation.removeIf(caxxDO -> idsExist.contains(caxxDO.getId()));
-                        }
-                    }
-                    return storeListForNation;
-                }
-            } else if (YXZT.SELECTED.getCode().equals(pageReqVO.getYxcf()) || YXZT.OPTION.getCode().equals(pageReqVO.getYxcf())) {
-                List<CaxxDO> caxxDOS = caxxMapper.selectListByKqId(pageReqVO.getKqId());
-                if (!ObjectUtils.isEmpty(caxxDOS)) {
-                    caxxDOS.stream().forEach(s->{
-                        if (s.getSjcr()!=null) {
-                            BigDecimal truncatedNumber = s.getSjcr().setScale(0, RoundingMode.DOWN);
-                            s.setSjcr(truncatedNumber);
-                        }
-                    });
-                    List<StoreRespVO> selectedStoreSForNation = BeanUtils.toBean(caxxDOS, StoreRespVO.class);
-                    return selectedStoreSForNation;
-                }
-            } else if (YXZT.IDENTIFY.getCode().equals(pageReqVO.getYxcf())) {
-                List<StoreRespVO> storeRespVOS = caxxMapper.selectListForIdentify(pageReqVO.getKqId(), pageReqVO.getYhmc());
-                return storeRespVOS;
-            } else if (YXZT.SELECT.getCode().equals(pageReqVO.getYxcf())) {
-                List<StoreRespVO> storeRespVOS = caxxMapper.selectListForSelect(pageReqVO.getKqId(), pageReqVO.getYhmc());
-                return storeRespVOS;
-            } else {
-                //国家查看省已选仓房列表
-                List<StoreRespVO> storeListForProvince = provinceMapper.getStoreListForProvinceOnly(pageReqVO.getKqId(), 0);
-                return storeListForProvince;
-            }
+            List<StoreRespVO> storeListForNation = getStoreListByNation(pageReqVO);
+            return storeListForNation;
         }
         if ("1".equals(areaLevel)) {
             String roleIds = loginUser.getInfo().get("roleIds");
@@ -305,67 +273,107 @@ public class DwxxServiceImpl implements DwxxService {
                     if (StringUtils.isBlank(bankType)) {
                         throw exception(ERROR, "当前银行用户不存在银行信息");
                     }
-                    if (YXZT.NOT_SELECTED.getCode().equals(pageReqVO.getYxcf())) {
-                        pageReqVO.setType(1);
-                        List<StoreRespVO> storeListForBank = provinceMapper.getStoreListForProvince(pageReqVO);
-                        List<StoreRespVO> storeListSelelct = bankMapper.getStoreListForBank(pageReqVO.getKqId(),bankType);
-                        if (!ObjectUtils.isEmpty(storeListForBank)) {
-                            if (!ObjectUtils.isEmpty(storeListSelelct)) {
-                                List<Long> idsExist = storeListSelelct.stream().map(StoreRespVO::getId).collect(Collectors.toList());
-                                if (!ObjectUtils.isEmpty(idsExist)) {
-                                    storeListForBank.removeIf(a -> idsExist.contains(a.getId()));
-                                }
-                            }
-                            return storeListForBank;
-                        }
-                    } else if (YXZT.SELECTED.getCode().equals(pageReqVO.getYxcf()) || YXZT.OPTION.getCode().equals(pageReqVO.getYxcf())) {
-                        List<StoreRespVO> storeListForBank = bankMapper.getStoreListForBank(pageReqVO.getKqId(),bankType);
-                        return storeListForBank;
-                    } else if (YXZT.IDENTIFY.getCode().equals(pageReqVO.getYxcf())) {
-                        List<StoreRespVO> storeRespVOS = caxxMapper.selectListForIdentify(pageReqVO.getKqId(), bankType);
-                        return storeRespVOS;
-                    } else if (YXZT.SELECT.getCode().equals(pageReqVO.getYxcf())) {
-                        List<StoreRespVO> storeRespVOS = caxxMapper.selectListForSelect(pageReqVO.getKqId(), bankType);
-                        return storeRespVOS;
-                    }
+                    List<StoreRespVO> storeListForBank = getStoreListByBank(pageReqVO, bankType);
+                    return storeListForBank;
                 } else {// 省已选
-                    if (YXZT.NOT_SELECTED.getCode().equals(pageReqVO.getYxcf())) {
-                        List<CaxxDO> caxxDOS = caxxMapper.selectList(pageReqVO);
-                        List<StoreRespVO> storeListSelect = provinceMapper.getStoreListForProvinceOnly(pageReqVO.getKqId(), 0);
-                        List<StoreRespVO> storeListForProvice = new ArrayList<>();
-                        if (!ObjectUtils.isEmpty(caxxDOS)) {
-                            if (!ObjectUtils.isEmpty(storeListSelect)) {
-                                List<Long> idsExist = storeListSelect.stream().map(StoreRespVO::getId).collect(Collectors.toList());
-                                if (!ObjectUtils.isEmpty(idsExist)) {
-                                    caxxDOS.removeIf(a -> idsExist.contains(a.getId()));
-                                }
-                            }
-                            if (!ObjectUtils.isEmpty(caxxDOS)) {
-                                caxxDOS.stream().forEach(s->{
-                                    if (s.getSjcr()!=null) {
-                                        BigDecimal truncatedNumber = s.getSjcr().setScale(0, RoundingMode.DOWN);
-                                        s.setSjcr(truncatedNumber);
-                                    }
-                                });
-                                storeListForProvice = BeanUtils.toBean(caxxDOS, StoreRespVO.class);
-                            }
-                            return storeListForProvice;
-                        }
-                    } else if (YXZT.SELECTED.getCode().equals(pageReqVO.getYxcf()) || YXZT.OPTION.getCode().equals(pageReqVO.getYxcf())) {
-                        List<StoreRespVO> storeListForProvince = provinceMapper.getStoreListForProvinceOnly(pageReqVO.getKqId(), 0);
-                        return storeListForProvince;
-                    } else if (YXZT.IDENTIFY.getCode().equals(pageReqVO.getYxcf())) {
-                        List<StoreRespVO> storeRespVOS = caxxMapper.selectListForIdentify(pageReqVO.getKqId(), pageReqVO.getYhmc());
-                        return storeRespVOS;
-                    } else if (YXZT.SELECT.getCode().equals(pageReqVO.getYxcf())) {
-                        List<StoreRespVO> storeRespVOS = caxxMapper.selectListForSelect(pageReqVO.getKqId(), pageReqVO.getYhmc());
-                        return storeRespVOS;
+                    List<StoreRespVO> storeListForProvice = getStoreListByProvince(pageReqVO);
+                    return storeListForProvice;
+                }
+            }
+        }
+        return null;
+    }
+
+
+    private List<StoreRespVO> getStoreListByNation(StorePageReqVO pageReqVO) {
+        List<StoreRespVO> storeListForNation = new ArrayList<>();
+        if (YXZT.NOT_SELECTED.getCode().equals(pageReqVO.getYxcf())) {
+            storeListForNation = dwxxMapper.getStoreListForNation(pageReqVO);
+            List<CaxxDO> caxxDOS = caxxMapper.selectListByKqId(pageReqVO.getKqId());
+            if (!ObjectUtils.isEmpty(storeListForNation)) {
+                if (!ObjectUtils.isEmpty(caxxDOS)) {
+                    List<Long> idsExist = caxxDOS.stream().map(CaxxDO::getId).collect(Collectors.toList());
+                    if (!ObjectUtils.isEmpty(idsExist)) {
+                        storeListForNation.removeIf(caxxDO -> idsExist.contains(caxxDO.getId()));
                     }
+                }
+            }
+        } else if (YXZT.SELECTED.getCode().equals(pageReqVO.getYxcf()) || YXZT.OPTION.getCode().equals(pageReqVO.getYxcf())) {
+            List<CaxxDO> caxxDOS = caxxMapper.selectListByKqId(pageReqVO.getKqId());
+            if (!ObjectUtils.isEmpty(caxxDOS)) {
+                caxxDOS.stream().forEach(s->{
+                    if (s.getSjcr()!=null) {
+                        BigDecimal truncatedNumber = s.getSjcr().setScale(0, RoundingMode.DOWN);
+                        s.setSjcr(truncatedNumber);
+                    }
+                });
+                storeListForNation = BeanUtils.toBean(caxxDOS, StoreRespVO.class);
+            }
+        } else if (YXZT.IDENTIFY.getCode().equals(pageReqVO.getYxcf())) {
+            storeListForNation = caxxMapper.selectListForIdentify(pageReqVO.getKqId(), pageReqVO.getYhmc());
+        } else if (YXZT.SELECT.getCode().equals(pageReqVO.getYxcf())) {
+            storeListForNation = caxxMapper.selectListForSelect(pageReqVO.getKqId(), pageReqVO.getYhmc());
+        } else {
+            //国家查看省已选仓房列表
+            storeListForNation = provinceMapper.getStoreListForProvinceOnly(pageReqVO.getKqId(), 0);
+        }
+        return storeListForNation;
+    }
 
+    private List<StoreRespVO> getStoreListByBank(StorePageReqVO pageReqVO, String bankType) {
+        List<StoreRespVO> storeListForBank = new ArrayList<>();
+        if (YXZT.NOT_SELECTED.getCode().equals(pageReqVO.getYxcf())) {
+            pageReqVO.setType(1);
+            storeListForBank = provinceMapper.getStoreListForProvince(pageReqVO);
+            List<StoreRespVO> storeListSelelct = bankMapper.getStoreListForBank(pageReqVO.getKqId(),bankType);
+            if (!ObjectUtils.isEmpty(storeListForBank)) {
+                if (!ObjectUtils.isEmpty(storeListSelelct)) {
+                    List<Long> idsExist = storeListSelelct.stream().map(StoreRespVO::getId).collect(Collectors.toList());
+                    if (!ObjectUtils.isEmpty(idsExist)) {
+                        storeListForBank.removeIf(a -> idsExist.contains(a.getId()));
+                    }
                 }
             }
+        } else if (YXZT.SELECTED.getCode().equals(pageReqVO.getYxcf()) || YXZT.OPTION.getCode().equals(pageReqVO.getYxcf())) {
+            storeListForBank = bankMapper.getStoreListForBank(pageReqVO.getKqId(),bankType);
+        } else if (YXZT.IDENTIFY.getCode().equals(pageReqVO.getYxcf())) {
+            storeListForBank = caxxMapper.selectListForIdentify(pageReqVO.getKqId(), bankType);
+        } else if (YXZT.SELECT.getCode().equals(pageReqVO.getYxcf())) {
+            storeListForBank= caxxMapper.selectListForSelect(pageReqVO.getKqId(), bankType);
         }
-        return null;
+        return storeListForBank;
+    }
+
+    private List<StoreRespVO> getStoreListByProvince(StorePageReqVO pageReqVO) {
+        List<StoreRespVO> storeListForProvice = new ArrayList<>();
+        if (YXZT.NOT_SELECTED.getCode().equals(pageReqVO.getYxcf())) {
+            List<CaxxDO> caxxDOS = caxxMapper.selectList(pageReqVO);
+            List<StoreRespVO> storeListSelect = provinceMapper.getStoreListForProvinceOnly(pageReqVO.getKqId(), 0);
+            if (!ObjectUtils.isEmpty(caxxDOS)) {
+                if (!ObjectUtils.isEmpty(storeListSelect)) {
+                    List<Long> idsExist = storeListSelect.stream().map(StoreRespVO::getId).collect(Collectors.toList());
+                    if (!ObjectUtils.isEmpty(idsExist)) {
+                        caxxDOS.removeIf(a -> idsExist.contains(a.getId()));
+                    }
+                }
+                if (!ObjectUtils.isEmpty(caxxDOS)) {
+                    caxxDOS.stream().forEach(s->{
+                        if (s.getSjcr()!=null) {
+                            BigDecimal truncatedNumber = s.getSjcr().setScale(0, RoundingMode.DOWN);
+                            s.setSjcr(truncatedNumber);
+                        }
+                    });
+                    storeListForProvice = BeanUtils.toBean(caxxDOS, StoreRespVO.class);
+                }
+            }
+        } else if (YXZT.SELECTED.getCode().equals(pageReqVO.getYxcf()) || YXZT.OPTION.getCode().equals(pageReqVO.getYxcf())) {
+            storeListForProvice = provinceMapper.getStoreListForProvinceOnly(pageReqVO.getKqId(), 0);
+        } else if (YXZT.IDENTIFY.getCode().equals(pageReqVO.getYxcf())) {
+            storeListForProvice = caxxMapper.selectListForIdentify(pageReqVO.getKqId(), pageReqVO.getYhmc());
+        } else if (YXZT.SELECT.getCode().equals(pageReqVO.getYxcf())) {
+            storeListForProvice = caxxMapper.selectListForSelect(pageReqVO.getKqId(), pageReqVO.getYhmc());
+        }
+        return storeListForProvice;
     }
 
     @Override