优化 修改缴费流程导致1.1 引起的bug

Author: 928255095

java110-core/src/main/java/com/java110/core/language/DefaultLanguage.java

@@ -12,57 +12,30 @@
 public abstract class DefaultLanguage implements Language {
 
 
-    protected static Map<String, String> menuCatalogs = new HashMap<>();
-    protected static Map<String, String> menus = new HashMap<>();
-    protected static Map<String, String> msgs = new HashMap<>();
 
 
 
     public List<MenuCatalogDto> getMenuCatalog(List<MenuCatalogDto> menuCatalogDtos) {
-        String menuCatalogsName = "";
-        for (MenuCatalogDto menuCatalogDto : menuCatalogDtos) {
-            menuCatalogsName = menuCatalogs.get(menuCatalogDto.getName());
-            if (!StringUtil.isEmpty(menuCatalogsName)) {
-                menuCatalogDto.setName(menuCatalogsName);
-            }
-        }
+
         return menuCatalogDtos;
     }
 
 
     @Override
     public List<Map> getMenuDto(List<Map> menuDtos) {
-        String menuName = "";
-        for (Map menuDto : menuDtos) {
-            menuName = menus.get(menuDto.get("menuGroupName"));
-            if (!StringUtil.isEmpty(menuName)) {
-                menuDto.put("menuGroupName", menuName);
-            }
-
-            menuName = menus.get(menuDto.get("menuName"));
-            if (!StringUtil.isEmpty(menuName)) {
-                menuDto.put("menuName", menuName);
-            }
-
-        }
+
         return menuDtos;
     }
 
     @Override
     public ResultVo getResultVo(ResultVo resultVo) {
-        String msg = msgs.get(resultVo.getMsg());
-        if (!StringUtil.isEmpty(msg)) {
-            resultVo.setMsg(msg);
-        }
+
 
         return resultVo;
     }
 
     public String getLangMsg(String msg){
-        String msgStr = msgs.get(msg);
-        if (!StringUtil.isEmpty(msg)) {
-            return msgStr;
-        }
+
 
         return msg;
     }

service-job/src/main/java/com/java110/job/adapt/fee/PayFeeDetailToMonthAdapt.java

@@ -90,7 +90,10 @@ public void execute(Business business, List<Business> businesses) {
                 businessPayFeeDetails = (JSONArray) bObj;
             }
         } else {
-            return;
+            if (data instanceof JSONObject) {
+                businessPayFeeDetails = new JSONArray();
+                businessPayFeeDetails.add(data);
+            }
         }
 
         if (businessPayFeeDetails == null) {

service-job/src/main/java/com/java110/job/adapt/report/ReportOwnerPayFeeAdapt.java

@@ -71,7 +71,10 @@ public void execute(Business business, List<Business> businesses) {
                 businessPayFeeDetails = (JSONArray) bObj;
             }
         } else {
-            return;
+            if (data instanceof JSONObject) {
+                businessPayFeeDetails = new JSONArray();
+                businessPayFeeDetails.add(data);
+            }
         }
         for (int bPayFeeDetailIndex = 0; bPayFeeDetailIndex < businessPayFeeDetails.size(); bPayFeeDetailIndex++) {
             JSONObject businessPayFeeDetail = businessPayFeeDetails.getJSONObject(bPayFeeDetailIndex);