diff --git a/pom.xml b/pom.xml index f2839281c..5242a10a6 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.3.91 + 1.3.92 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 700d78df7..ed0a43e65 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,7 +57,7 @@ public interface DashboardService { void generateCustomersAndOrdersStatistics(Date analysisDate); - void generateCustomersAndOrdersStatisticsByClientMoniker(Date analysisDate,String clientMoniker); + void generateCustomersAndOrdersStatisticsByClientMoniker(Date analysisDate,String clientId); JSONObject getOrderAndCustomerPerDay(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 af21be50c..c5b5c0142 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 @@ -493,14 +493,14 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT /** * 重新生成执行商户下某日消费者数据 * @param analysisDate - * @param clientMoniker + * @param clientId */ - public void generateCustomersAndOrdersStatisticsByClientMoniker(Date analysisDate,String clientMoniker){ + public void generateCustomersAndOrdersStatisticsByClientMoniker(Date analysisDate,String clientId){ 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)){ + if(client.getString("client_id").equals(clientId)){ generateData(format, date, 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 ae05ba957..6e2dd6380 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 @@ -579,12 +579,12 @@ public class TestController implements ApplicationEventPublisherAware { /** * 重新生成执行商户下某日消费者数据 * @param date - * @param clientMoniker + * @param clientId */ @GetMapping("/task/analysisCustomerDashboard") - public void analysisCustomerDashboardForClientMoniker(@RequestParam("date") String date,String clientMoniker){ + public void analysisCustomerDashboardForClientMoniker(@RequestParam("date") String date,@RequestParam("clientId")String clientId){ try { - dashboardService.generateCustomersAndOrdersStatisticsByClientMoniker(DateUtils.addDays(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(date), -1),clientMoniker); + dashboardService.generateCustomersAndOrdersStatisticsByClientMoniker(DateUtils.addDays(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(date), -1),clientId); } catch (ParseException e) { e.printStackTrace(); }