temp commit

src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java

@@ -345,7 +345,11 @@ public class ManageAppServiceImp implements ManageAppService {
         String clientType = device.getString("client_type");
         manageDeviceSupport.findRegister(clientType);
         JSONObject manager = managerMapper.findById(device.getString("manager_id"));
-        return financialPartnerCommissionMapper.getOrgPrizeList(manager.getString("org_id"));
+        List<JSONObject> orgPrizeList = financialPartnerCommissionMapper.getOrgPrizeList(manager.getString("org_id"));
+        for (JSONObject params : orgPrizeList) {
+            params.put("data", financialPartnerCommissionMapper.find(params.getIntValue("year"), params.getIntValue("month"), manager.getString("org_id")));
+        }
+        return orgPrizeList;
     }
 
     @Override

src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java

@@ -159,16 +159,16 @@ public class ManageAppController {
         return manageAppService.getOrgPrizeList(device);
     }
 
-    @RequestMapping(value = "/org_prize/{monthStr}", method = RequestMethod.GET)
+//    @RequestMapping(value = "/org_prize/{monthStr}", method = RequestMethod.GET)
-    public List<JSONObject> getOrgPrizeDetail(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device,@PathVariable String monthStr) {
+//    public List<JSONObject> getOrgPrizeDetail(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device,@PathVariable String monthStr) {
-        Date date;
+//        Date date;
-        try {
+//        try {
-            date =  DateUtils.parseDate(monthStr, new String[] { "yyyy-MM" });
+//            date =  DateUtils.parseDate(monthStr, new String[] { "yyyy-MM" });
-        } catch (ParseException e) {
+//        } catch (ParseException e) {
-            throw new BadRequestException("Invalid month format");
+//            throw new BadRequestException("Invalid month format");
-        }
+//        }
-        return manageAppService.getOrgPrizeDetail(device, date);
+//        return manageAppService.getOrgPrizeDetail(device, date);
-    }
+//    }
 
     @RequestMapping(value = "/bd/kpi", method = RequestMethod.GET)
     public JSONObject getBdConfigKpi(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {