From 8e763a191db7dc5209782ce80f0a8b1529c7a1a9 Mon Sep 17 00:00:00 2001
From: dulingling <dll19920503@qq.com>
Date: Mon, 9 Mar 2020 17:49:06 +0800
Subject: [PATCH] =?UTF-8?q?Upd:=E6=B7=BB=E5=8A=A0=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E5=95=86=E6=88=B7=E6=B6=88=E8=B4=B9=E8=80=85=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=87=8D=E7=94=9F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                     | 2 +-
 .../payment/manage/analysis/core/DashboardService.java      | 2 +-
 .../manage/analysis/core/impls/DashboardServiceImpl.java    | 6 +++---
 .../com/royalpay/payment/manage/dev/web/TestController.java | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index f2839281c..5242a10a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.91</version>
+    <version>1.3.92</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
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<JSONObject> 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();
         }