diff --git a/pom.xml b/pom.xml index 139e8631c..f2839281c 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.3.90 + 1.3.91 UTF-8 1.8.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/DashboardService.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/DashboardService.java index 237e8ab11..700d78df7 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/DashboardService.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/DashboardService.java @@ -57,6 +57,8 @@ public interface DashboardService { void generateCustomersAndOrdersStatistics(Date analysisDate); + void generateCustomersAndOrdersStatisticsByClientMoniker(Date analysisDate,String clientMoniker); + JSONObject getOrderAndCustomerPerDay(JSONObject partner,AnalysisBean partnerAnalysisBean); List getStatisticsCustomersAndOrdersInDays(JSONObject partner, AnalysisBean partnerAnalysisBean); diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java index 0c558bd7c..af21be50c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java @@ -488,7 +488,22 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT JSONObject totalObject = new JSONObject(); totalObject.put("client_id",0); generateData(format,date,totalObject); + } + /** + * 重新生成执行商户下某日消费者数据 + * @param analysisDate + * @param clientMoniker + */ + public void generateCustomersAndOrdersStatisticsByClientMoniker(Date analysisDate,String clientMoniker){ + DateFormat format = new SimpleDateFormat("yyyyMMdd"); + String date = format.format(analysisDate); + List clients =clientMapper.listClients(); + for (JSONObject client:clients){ + if(client.getString("client_moniker").equals(clientMoniker)){ + generateData(format, date, client); + } + } } private void generateData(DateFormat format, String date, JSONObject client) { diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java index a93512df0..ae05ba957 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java @@ -575,6 +575,22 @@ public class TestController implements ApplicationEventPublisherAware { }); } + + /** + * 重新生成执行商户下某日消费者数据 + * @param date + * @param clientMoniker + */ + @GetMapping("/task/analysisCustomerDashboard") + public void analysisCustomerDashboardForClientMoniker(@RequestParam("date") String date,String clientMoniker){ + try { + dashboardService.generateCustomersAndOrdersStatisticsByClientMoniker(DateUtils.addDays(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(date), -1),clientMoniker); + } catch (ParseException e) { + e.printStackTrace(); + } + + } + @ManagerMapping(value = "/reports/ato_reports/royalpay_ato_report_{year}.bttps", role = ManagerRole.DEVELOPER, method = RequestMethod.GET) @ReadOnlyConnection public void downloadATOReport(@PathVariable String year, HttpServletResponse resp) throws IOException {