计费策略修改

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/contractManage/ContractManageApplicationService.java

@@ -509,12 +509,21 @@ public class ContractManageApplicationService {
                 .eq(ContractManage::getTopOrganizationId, topOrganizationId)
                 .eq(ContractManage::getCommonContractFlag, 2));
         if (UserContractManages != null && UserContractManages.size() > 0) {
+            //用户合同计费策略
+            calucateSubjectStrategy(UserContractManages, organizationId, topOrganizationId, sunjectCode, result);
         }else{
+            //通用合同计费策略
             List<ContractManage> commonContractManages = contractManageMapper.selectList(new LambdaQueryWrapper<ContractManage>()
                     .eq(ContractManage::getDelFlag, 1)
                     .eq(ContractManage::getOrganizationId, organizationId)
                     .eq(ContractManage::getTopOrganizationId, topOrganizationId)
                     .eq(ContractManage::getCommonContractFlag, 1));
+            calucateSubjectStrategy(commonContractManages, organizationId, topOrganizationId, sunjectCode, result);
+        }
+        return result;
+    }
+
+    private void calucateSubjectStrategy(List<ContractManage> commonContractManages, Long organizationId, Long topOrganizationId, String sunjectCode, List<SubjectAndPriceReturn> result) {
         if (commonContractManages != null && commonContractManages.size() > 0) {
             ContractManage contractManage = commonContractManages.get(0);
             Long contractManageId = contractManage.getContractManageId();
@@ -563,9 +572,6 @@ public class ContractManageApplicationService {
             }
         }
     }
-        return result;
-    }
-
 
     /**
      * 新增合同管理