From 8bacdb61ea0ce4700b3edb46c00b4dc1fa125311 Mon Sep 17 00:00:00 2001
From: macminiuser <eason.qian@royalpay.com.au>
Date: Mon, 26 Feb 2018 16:53:30 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BA=A4=E6=98=93=E9=A2=9D+=E9=80=80?=
 =?UTF-8?q?=E6=AC=BE+=E9=80=80=E6=AC=BE+=E9=80=80=E6=AC=BE=E7=AC=94?=
 =?UTF-8?q?=E6=95=B0+App=E6=B5=81=E6=B0=B4=E6=8E=A5=E5=8F=A3=E3=80=81?=
 =?UTF-8?q?=E4=BA=A4=E6=98=93=E9=A2=9D=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/db/modify.sql                             |   4 +
 .../mappers/TransactionAnalysisMapper.java    |   1 +
 .../core/impls/RetailAppServiceImp.java       |  18 +-
 .../manage/mappers/payment/OrderMapper.java   |   2 +
 .../CustomerAndOrdersStatisticsMapper.xml     |   1 +
 .../mappers/TransactionAnalysisMapper.xml     |  28 ++-
 .../manage/mappers/payment/OrderMapper.xml    | 171 ++++++++++++++----
 7 files changed, 178 insertions(+), 47 deletions(-)

diff --git a/src/db/modify.sql b/src/db/modify.sql
index 1a26ebc08..b194d6018 100644
--- a/src/db/modify.sql
+++ b/src/db/modify.sql
@@ -231,3 +231,7 @@ CREATE TABLE `sys_wx_merchant_apply` (
   `operator` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`merchant_app_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+alter table statistics_customer_order add column refund_orders int(10) DEFAULT NULL COMMENT '' AFTER `orders`;
+alter table statistics_customer_order add column refund_amount DECIMAL(20,2) DEFAULT NULL COMMENT '' AFTER `total`;
+
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java
index 3e83dc242..99b8af194 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java
@@ -71,4 +71,5 @@ public interface TransactionAnalysisMapper {
 
     int getCountCustomers(@Param("date") Date date);
 
+    JSONObject getClientTransaction(JSONObject params);
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
index d216cdea7..8156b029a 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
@@ -173,10 +173,10 @@ public class RetailAppServiceImp implements RetailAppService {
         }
         JSONObject params = appQueryBean.toParams();
         setAllClientIds(params, client_id);
-        JSONObject res = new JSONObject();
         params.put("client_id", client_id);
-        res.put("trade_amount", transactionAnalysisMapper.analysisTotalAmount(params));
-        res.put("trade_count", transactionAnalysisMapper.analysisTotalCount(params));
+        JSONObject res = transactionAnalysisMapper.getClientTransaction(params);
+//        res.put("trade_amount", transactionAnalysisMapper.analysisTotalAmount(params));
+//        res.put("trade_count", transactionAnalysisMapper.analysisTotalCount(params));
         // res.put("refund_amount", transactionAnalysisMapper.analysisRefundAmount(params));
         res.put("not_settled", transactionAnalysisMapper.analysisNotSettled(params));
         res.put("old_customers", transactionAnalysisMapper.countOldCustomers(params));
@@ -199,10 +199,11 @@ public class RetailAppServiceImp implements RetailAppService {
         }
         JSONObject params = appQueryBean.toParams();
         setAllClientIds(params, client_id);
-        JSONObject res = new JSONObject();
         params.put("client_id", client_id);
-        res.put("trade_amount", transactionAnalysisMapper.analysisTotalAmount(params));
-        res.put("trade_count", transactionAnalysisMapper.analysisTotalCount(params));
+        JSONObject res = transactionAnalysisMapper.getClientTransaction(params);
+
+//        res.put("trade_amount", transactionAnalysisMapper.analysisTotalAmount(params));
+//        res.put("trade_count", transactionAnalysisMapper.analysisTotalCount(params));
         res.put("not_settled", transactionAnalysisMapper.analysisNotSettled(params));
         return res;
     }
@@ -356,7 +357,10 @@ public class RetailAppServiceImp implements RetailAppService {
             params.put("dev_id", device.getString("dev_id"));
         }
         params.put("client_id", client_id);
-        PageList<JSONObject> orders = orderMapper.listOrdersByClients(params,
+
+//        PageList<JSONObject> orders = orderMapper.listOrdersByClients(params,
+//                new PageBounds(query.getPage(), query.getLimit(), Order.formString("create_time.desc")));
+        PageList<JSONObject> orders = orderMapper.listTransactionsForApp(params,
                 new PageBounds(query.getPage(), query.getLimit(), Order.formString("create_time.desc")));
         TimeZoneUtils.switchTimeZone(orders, query.getTimezone(), "create_time", "transaction_time", "confirm_time");
         ArrayList<String> date_contains = new ArrayList<>();
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java
index 3c7f8f001..7c351ef10 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java
@@ -77,4 +77,6 @@ public interface OrderMapper {
     List<JSONObject> listOrdersByClientsNoPages(JSONObject params);
 
     List<JSONObject> listAnalysisClientCustomer(JSONObject params);
+
+    PageList<JSONObject> listTransactionsForApp(JSONObject params, PageBounds pageBounds);
 }
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml
index a9d1f1e69..2a2a0027b 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml
@@ -39,6 +39,7 @@
     <select id="getSumOrdersAndCustomersDaily" resultType="com.alibaba.fastjson.JSONObject">
         SELECT sum(s.customers) customers,sum(s.orders) orders,sum(s.new_customers) new_customers,
         sum(s.old_customers) old_customers,sum(s.total) total, sum(s.total)/sum(s.customers) single_amount,
+        ifnull(sum(s.refund_amount),0) refund_amount,ifnull(sum(s.refund_orders),0) refund_orders,
         date_format(s.date,'%d/%m/%Y') trade_date
         FROM statistics_customer_order s
         <where>
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
index 1b3a575fc..f2131f1e6 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
@@ -607,7 +607,9 @@
         COUNT(DISTINCT o.order_id) AS orders,
         COUNT(DISTINCT o.customer_id) AS customers,
         o.channel AS channel,
-        ifnull(SUM(if(t.transaction_type = 'Credit', t.clearing_amount, -t.clearing_amount)), 0)  AS total,
+        ifnull(SUM(if(t.transaction_type = 'Credit', t.clearing_amount, 0)), 0)  AS total,
+        ifnull(SUM(if(t.refund_id>0, t.clearing_amount, 0)), 0)  AS refund_amount,
+        SUM(if(t.refund_id>0, 1, 0)) AS refund_orders,
         round(SUM(if(t.transaction_type='Credit',t.clearing_amount,0))/COUNT(DISTINCT o.customer_id),2) single_amount
         FROM pmt_transactions t
         INNER JOIN pmt_orders o ON o.order_id = t.order_id
@@ -729,4 +731,28 @@
         <if test="client_moniker!=null">and c.client_moniker=#{client_moniker}</if>
         <if test="channel!=null">and t.channel=#{channel}</if>
     </select>
+
+    <select id="getClientTransaction" resultType="com.alibaba.fastjson.JSONObject">
+      select
+    IFNULL(sum(if(l.transaction_type='credit',l.clearing_amount,0)),0) trade_amount,
+    ifnull(sum(if(l.refund_id>0,l.clearing_amount,0)),0) refund_amount,
+    sum(if(l.transaction_type='Credit',1,0)) trade_count,
+    sum(if(l.refund_id>0,1,0)) refund_orders,
+    FROM pmt_transactions l
+    where l.channel!='Settlement' and t.system_generate=0
+        <if test="client_ids!=null">
+            AND l.client_id IN
+            <foreach collection="client_ids" open="(" close=")" separator="," item="client_id">
+                #{client_id}
+            </foreach>
+        </if>
+        <if test="client_ids==null and client_id != null">
+            and l.client_id=#{client_id}
+        </if>
+        <if test="begin!=null">and l.transaction &gt;= #{begin}</if>
+        <if test="end!=null">and l.transaction &lt; #{end}</if>
+        <if test="org_id!=null and org_ids==null">and l.org_id=#{org_id}</if>
+        <if test="org_ids!=null">and l.org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
index 784b43597..4c3fe8f60 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
@@ -95,6 +95,8 @@
 
     <update id="updateRefundAmount">
         <![CDATA[
+
+
         UPDATE pmt_orders o
             LEFT JOIN (
                           SELECT
@@ -113,14 +115,20 @@
                                   THEN 7
                               END
         WHERE o.order_id = #{order_id}
+
+
         ]]>
 
     </update>
     <update id="updateOrderCreationError">
         <![CDATA[
+
+
         UPDATE pmt_orders
         SET status = #{status}, error_code = #{error_code}, error_message = #{error_message}
         WHERE order_id = #{order_id} AND status <= #{status}
+
+
         ]]>
     </update>
     <select id="listOrders" resultType="com.alibaba.fastjson.JSONObject">
@@ -150,7 +158,8 @@
                 <bind name="name_pattern" value="'%'+search_text+'%'"/>
                 <if test="text_type=='all'">
                     and (p.client_moniker=#{search_text} or p.short_name like #{name_pattern} or o.order_detail like
-                    #{name_pattern} or t.system_transaction_id =#{search_text} or o.channel = #{search_text} or t.order_id =#{search_text})
+                    #{name_pattern} or t.system_transaction_id =#{search_text} or o.channel = #{search_text} or
+                    t.order_id =#{search_text})
                 </if>
                 <if test="text_type=='client_moniker'">
                     and p.client_moniker=#{search_text}
@@ -177,16 +186,20 @@
             </if>
             <if test="org_id!=null and org_ids==null">and p.org_id=#{org_id}</if>
             <if test="org_ids!=null">and p.org_id in
-                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
+                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach>
+            </if>
             <if test="from!=null">and o.create_time &gt;= #{from}</if>
             <if test="to!=null">and o.create_time &lt; #{to}</if>
             <if test="date!=null">and date(o.create_time)=date(#{date})</if>
             <if test="dev_id!=null">and o.dev_id=#{dev_id}</if>
             <if test="status!=null">
-                and <foreach collection="status" item="std" open="(" close=")" separator=" or ">o.status=#{std}</foreach>
+                and
+                <foreach collection="status" item="std" open="(" close=")" separator=" or ">o.status=#{std}</foreach>
             </if>
             <if test="channel!=null">
-                and <foreach collection="channel" item="chan" open="(" close=")" separator=" or ">o.channel=#{chan}</foreach>
+                and
+                <foreach collection="channel" item="chan" open="(" close=")" separator=" or ">o.channel=#{chan}
+                </foreach>
             </if>
             <if test="bd_group!=null">and p.client_id in
                 (SELECT b.client_id FROM sys_client_bd b
@@ -263,7 +276,8 @@
                 <bind name="name_pattern" value="'%'+search_text+'%'"/>
                 <if test="text_type=='all'">
                     and (p.client_moniker=#{search_text} or p.short_name like #{name_pattern} or o.order_detail like
-                    #{name_pattern} or t.system_transaction_id=#{search_text} or o.channel = #{search_text}  or t.order_id = #{search_text}
+                    #{name_pattern} or t.system_transaction_id=#{search_text} or o.channel = #{search_text} or
+                    t.order_id = #{search_text}
                     or o.client_order_id = #{search_text})
                 </if>
                 <if test="text_type=='client_moniker'">
@@ -294,15 +308,19 @@
             </if>
             <if test="org_id!=null and org_ids==null">and p.org_id=#{org_id}</if>
             <if test="org_ids!=null">and p.org_id in
-                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
+                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach>
+            </if>
             <if test="from!=null">and o.create_time &gt;= #{from}</if>
             <if test="to!=null">and o.create_time &lt; #{to}</if>
             <if test="date!=null">and date(o.create_time)=date(#{date})</if>
             <if test="status!=null">
-                and <foreach collection="status" item="std" open="(" close=")" separator=" or ">o.status=#{std}</foreach>
+                and
+                <foreach collection="status" item="std" open="(" close=")" separator=" or ">o.status=#{std}</foreach>
             </if>
             <if test="channel!=null">
-                and <foreach collection="channel" item="chan" open="(" close=")" separator=" or ">o.channel=#{chan}</foreach>
+                and
+                <foreach collection="channel" item="chan" open="(" close=")" separator=" or ">o.channel=#{chan}
+                </foreach>
             </if>
         </where>
         GROUP BY o.order_id,t.refund_id
@@ -317,10 +335,14 @@
         ifnull(sum(if(l.refund_id is not null AND l.pre_authorization=1,l.clearing_amount,0)),0)
         pre_refund_fee,
         count(DISTINCT l.customer_id) customers,
-        ifnull(sum(if(l.transaction_type='Credit' and l.refund_id is null and l.currency!='CNY',l.display_amount,0)),0) display_amount,
-        ifnull(sum(if(l.transaction_type='Credit' and l.refund_id is null and l.currency!='CNY' and l.pre_authorization=1,l.display_amount,0)),0) pre_display_amount,
-        ifnull(sum(if(l.transaction_type='Credit' and l.refund_id is null and l.currency='CNY',l.display_amount,0)),0) cny_display_amount,
-        ifnull(sum(if(l.transaction_type='Credit' and l.refund_id is null and l.currency='CNY' and l.pre_authorization=1,l.display_amount,0)),0) pre_cny_display_amount
+        ifnull(sum(if(l.transaction_type='Credit' and l.refund_id is null and l.currency!='CNY',l.display_amount,0)),0)
+        display_amount,
+        ifnull(sum(if(l.transaction_type='Credit' and l.refund_id is null and l.currency!='CNY' and
+        l.pre_authorization=1,l.display_amount,0)),0) pre_display_amount,
+        ifnull(sum(if(l.transaction_type='Credit' and l.refund_id is null and l.currency='CNY',l.display_amount,0)),0)
+        cny_display_amount,
+        ifnull(sum(if(l.transaction_type='Credit' and l.refund_id is null and l.currency='CNY' and
+        l.pre_authorization=1,l.display_amount,0)),0) pre_cny_display_amount
         from (
         <if test="bd_user!=null">
             SELECT temp.* FROM (
@@ -344,7 +366,8 @@
                 <bind name="name_pattern" value="'%'+search_text+'%'"/>
                 <if test="text_type=='all'">
                     and (p.client_moniker=#{search_text} or p.short_name like #{name_pattern} or o.order_detail like
-                    #{name_pattern} or t.system_transaction_id=#{search_text} or o.channel = #{search_text}  or t.order_id = #{search_text}
+                    #{name_pattern} or t.system_transaction_id=#{search_text} or o.channel = #{search_text} or
+                    t.order_id = #{search_text}
                     or o.client_order_id = #{search_text})
                 </if>
                 <if test="text_type=='client_moniker'">
@@ -373,7 +396,8 @@
                 </if>
             </if>
             <if test="org_ids!=null">and p.org_id in
-                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
+                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach>
+            </if>
             <if test="order_id!=null">and o.order_id=#{order_id}</if>
             <if test="trade_type!=null">and o.gateway in
                 <foreach collection="trade_type" item="gateway" open="(" close=")" separator=",">#{gateway}</foreach>
@@ -384,10 +408,13 @@
             <if test="date!=null">and date(o.create_time)=date(#{date})</if>
             <if test="dev_id!=null">and o.dev_id=#{dev_id}</if>
             <if test="status!=null">
-                and <foreach collection="status" item="std" open="(" close=")" separator=" or ">o.status=#{std}</foreach>
+                and
+                <foreach collection="status" item="std" open="(" close=")" separator=" or ">o.status=#{std}</foreach>
             </if>
             <if test="channel!=null">
-                and <foreach collection="channel" item="chan" open="(" close=")" separator=" or ">o.channel=#{chan}</foreach>
+                and
+                <foreach collection="channel" item="chan" open="(" close=")" separator=" or ">o.channel=#{chan}
+                </foreach>
             </if>
             <if test="bd_group!=null">and p.client_id in
                 (SELECT b.client_id FROM sys_client_bd b
@@ -449,6 +476,8 @@
     </select>
     <select id="listOrdersWithNoTransactions" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
+
+
         SELECT
             o.order_id,
             o.channel
@@ -457,6 +486,8 @@
             SELECT DISTINCT order_id
             FROM pmt_transactions
             WHERE transaction_type = 'Credit') AND o.status >= 5 AND o.customer_payment_amount > 0
+
+
         ]]>
     </select>
 
@@ -483,7 +514,8 @@
             <if test="to!=null">and o.create_time &lt; #{to}</if>
             <if test="org_id!=null and org_ids==null">and c.org_id=#{org_id}</if>
             <if test="org_ids!=null">and c.org_id in
-                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
+                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach>
+            </if>
         </where>
     </select>
 
@@ -514,7 +546,8 @@
                 <bind name="name_pattern" value="'%'+search_text+'%'"/>
                 <if test="text_type=='all'">
                     and (p.client_moniker=#{search_text} or p.short_name like #{name_pattern} or o.order_detail like
-                    #{name_pattern} or t.system_transaction_id=#{search_text} or o.channel = #{search_text}  or t.order_id = #{search_text})
+                    #{name_pattern} or t.system_transaction_id=#{search_text} or o.channel = #{search_text} or
+                    t.order_id = #{search_text})
                 </if>
                 <if test="text_type=='client_moniker'">
                     and p.client_moniker=#{search_text}
@@ -541,15 +574,19 @@
             </if>
             <if test="org_id!=null and org_ids==null">and p.org_id=#{org_id}</if>
             <if test="org_ids!=null">and p.org_id in
-                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
+                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach>
+            </if>
             <if test="from!=null">and o.create_time &gt;= #{from}</if>
             <if test="to!=null">and o.create_time &lt; #{to}</if>
             <if test="date!=null">and date(o.create_time)=date(#{date})</if>
             <if test="status!=null">
-                and <foreach collection="status" item="std" open="(" close=")" separator=" or ">o.status=#{std}</foreach>
+                and
+                <foreach collection="status" item="std" open="(" close=")" separator=" or ">o.status=#{std}</foreach>
             </if>
             <if test="channel!=null">
-                and <foreach collection="channel" item="chan" open="(" close=")" separator=" or ">o.channel=#{chan}</foreach>
+                and
+                <foreach collection="channel" item="chan" open="(" close=")" separator=" or ">o.channel=#{chan}
+                </foreach>
             </if>
         </where>
         GROUP BY o.order_id,t.refund_id
@@ -558,24 +595,24 @@
 
     <select id="listAnalysisClientCustomer" resultType="com.alibaba.fastjson.JSONObject">
 
-       SELECT
-	count(*) payment_times ,
-	sum(customer_payment_amount) total_amount,
-	o.client_id client_id,
-    o.customer_id customer_id,
-    o.channel channel,
-    max( o.confirm_time) confirm_time
+        SELECT
+        count(*) payment_times ,
+        sum(customer_payment_amount) total_amount,
+        o.client_id client_id,
+        o.customer_id customer_id,
+        o.channel channel,
+        max( o.confirm_time) confirm_time
 
-      from pmt_orders  o
-            where o.customer_id is not null and o.channel is not null
-            and client_id = #{client_id}
-            <if test="confirm_time">
-             and   o.confirm_time > #{confirm_time}
-            </if>
-          <if test="include_success_status!=null">
-              and o.status >#{include_success_status}
-          </if>
-            group by o.customer_id
+        from pmt_orders o
+        where o.customer_id is not null and o.channel is not null
+        and client_id = #{client_id}
+        <if test="confirm_time">
+            and o.confirm_time > #{confirm_time}
+        </if>
+        <if test="include_success_status!=null">
+            and o.status >#{include_success_status}
+        </if>
+        group by o.customer_id
     </select>
     <select id="listPaid" resultType="com.alibaba.fastjson.JSONObject">
         SELECT * FROM pmt_orders
@@ -585,7 +622,63 @@
                 and client_id = #{client_id}
             </if>
             <if test="channels != null">
-                and channel IN <foreach collection="channels" item="channel" open="(" close=")" separator=",">#{channel}</foreach>
+                and channel IN
+                <foreach collection="channels" item="channel" open="(" close=")" separator=",">#{channel}</foreach>
+            </if>
+        </where>
+    </select>
+
+    <select id="listTransactionsForApp" resultType="com.alibaba.fastjson.JSONObject">
+        select
+        o.order_id,
+        o.client_id,
+        o.display_amount,
+        o.customer_payment_amount,
+        o.coupon_payment_amount,
+        o.currency,
+        o.create_time,
+        o.confirm_time,
+        o.status,
+        o.gateway,
+        o.channel,
+        o.pre_authorization,
+        o.refund_amount refund_fee,
+        o.customer_id,
+        t.clearing_amount,
+        t.refund_id,
+        t.transaction_time,
+        t.transaction_type,
+        t.transaction_id,
+        t.exchange_rate,
+        t.clearing_status,
+        t.settle_amount
+        from pmt_orders o
+        left join pmt_transactions t on t.order_id=o.order_id and t.channel!='Settlement' and t.system_generate=0
+        <where>
+            <if test="client_ids!=null">
+                AND o.client_id IN
+                <foreach collection="client_ids" open="(" close=")" separator="," item="client_id">
+                    #{client_id}
+                </foreach>
+            </if>
+            <if test="client_ids==null and client_id !=null">
+                and o.client_id=#{client_id}
+            </if>
+            <if test="from!=null">and o.create_time &gt;= #{from}</if>
+            <if test="to!=null">and o.create_time &lt; #{to}</if>
+            <if test="date!=null">and date(o.create_time)=date(#{date})
+            </if>
+            <if test="trade_type!=null">and o.gateway in
+                <foreach collection="trade_type" item="gateway" open="(" close=")" separator=",">#{gateway}</foreach>
+            </if>
+            <if test="status!=null">
+                and
+                <foreach collection="status" item="std" open="(" close=")" separator=" or ">o.status=#{std}</foreach>
+            </if>
+            <if test="channel!=null">
+                and
+                <foreach collection="channel" item="chan" open="(" close=")" separator=" or ">o.channel=#{chan}
+                </foreach>
             </if>
         </where>
     </select>

From bf9a4f81e0a659f90d96827a5387a22340c32cea Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Tue, 27 Feb 2018 16:52:23 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E8=B4=B9=E7=8E=87=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/impls/DashboardServiceImpl.java      | 16 ++--
 .../analysis/mappers/BDAnalysisMapper.xml     | 11 ++-
 .../analysis/mappers/ClientAnalysisMapper.xml |  5 +-
 .../CustomerAndOrdersStatisticsMapper.xml     | 18 +++-
 .../analysis/mappers/OrderAnalysisMapper.xml  | 12 ++-
 .../mappers/TransactionAnalysisMapper.xml     | 87 ++++++++++++++-----
 .../manage/mappers/payment/OrderMapper.xml    | 13 ++-
 .../mappers/payment/TransactionMapper.xml     | 12 ++-
 src/main/ui/static/dashboard/dashboard.js     | 10 ++-
 9 files changed, 141 insertions(+), 43 deletions(-)

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 d28c2ff4a..55c706383 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
@@ -57,7 +57,7 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
         res.put("new_partners", clientAnalysisMapper.countNewClients(params));
         res.put("total_partners", clientAnalysisMapper.countClients(params));
         res.put("traded_partners", clientAnalysisMapper.countTradedPartners(params));
-        res.put("trade_amount", transactionAnalysisMapper.analysisTotalAmount(params));
+        res.put("trade_amount", transactionAnalysisMapper.getClientTransaction(params).getBigDecimal("trade_amount"));
 //        res.put("trade_count", transactionAnalysisMapper.analysisTotalCount(params));
 //        List<JSONObject> topOrders = transactionAnalysisMapper.getTopOrders(params, new PageBounds(1, 1, Order.formString("aud_fee.desc")));
 //        if (!topOrders.isEmpty()) {
@@ -75,7 +75,7 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
 //        res.put("total_partners", clientAnalysisMapper.countClients(params));
 //        res.put("traded_partners", clientAnalysisMapper.countTradedPartners(params));
 //        res.put("trade_amount", transactionAnalysisMapper.analysisTotalAmount(params));
-        res.put("trade_count", transactionAnalysisMapper.analysisTotalCount(params));
+        res.put("trade_count", transactionAnalysisMapper.getClientTransaction(params).getIntValue("trade_count"));
         List<JSONObject> topOrders = transactionAnalysisMapper.getTopOrders(params, new PageBounds(1, 1, Order.formString("aud_fee.desc")));
         if (!topOrders.isEmpty()) {
             res.put("top_amount_order", topOrders.get(0));
@@ -212,7 +212,10 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
 
     @Override
     public List<JSONObject> getTradeAnalysisInDays(JSONObject params) {
-        return transactionAnalysisMapper.tradeAnalysisInDays(params);
+        if (!params.containsKey("client_ids") && !params.containsKey("org_id")) {
+            params.put("client_id", 0);
+        }
+        return customerAndOrdersStatisticsMapper.getSumCustomersAnalysis(params);
     }
 
     @Override
@@ -227,9 +230,10 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
         }
         JSONObject res = new JSONObject();
         params.put("client_id", partner.getIntValue("client_id"));
-        res.put("trade_amount", transactionAnalysisMapper.analysisTotalAmount(params));
-        res.put("trade_count", transactionAnalysisMapper.analysisTotalCount(params));
-        res.put("refund_amount", transactionAnalysisMapper.analysisRefundAmount(params));
+        JSONObject object = transactionAnalysisMapper.getClientTransaction(params);
+        res.put("trade_amount", object.getBigDecimal("trade_amount"));
+        res.put("trade_count", object.getIntValue("trade_count"));
+        res.put("refund_amount", object.getBigDecimal("refund_amount"));
         res.put("not_settled", transactionAnalysisMapper.analysisNotSettled(params));
         res.put("pre_amount", transactionAnalysisMapper.analysisPreAmount(params));
         List<JSONObject> topOrders = transactionAnalysisMapper.getTopOrders(params, new PageBounds(1, 1, Order.formString("aud_fee.desc")));
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml
index f5f83a564..886be691b 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="au.com.royalpay.payment.manage.analysis.mappers.BDAnalysisMapper">
+    <!--1.BD analysis BD销售量 BD销售数据统计
+        2.BD analysis BD销售量 导出表格-->
     <select id="getBDSaleList" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-        d.bd_name,d.bd_id,sum(if(temp.transaction_type='Credit',temp.clearing_amount*d.proportion,-temp.clearing_amount*d.proportion))
+        d.bd_name,d.bd_id,sum(if(temp.transaction_type='Credit',temp.clearing_amount*d.proportion,0))
         total,
         ifnull(sum(if(temp.refund_id is not null,if(temp.transaction_type='Debit',temp.clearing_amount,-temp.clearing_amount)*d.proportion,0)),0) refund_fee
         FROM
@@ -36,9 +38,11 @@
         GROUP BY d.bd_id
         ORDER BY total DESC
     </select>
+    <!--1.BD analysis BD销售量 商户销售排行
+        2.BD analysis BD销售量 导出表格（每个BD 的商户）-->
     <select id="getBDSalePartnerList" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-        c.client_id,c.client_moniker,c.short_name,c.approve_time,IFNULL(sum(if(temp.transaction_type='Credit',temp.clearing_amount*d.proportion,-temp.clearing_amount*d.proportion)),0)
+        c.client_id,c.client_moniker,c.short_name,c.approve_time,IFNULL(sum(if(temp.transaction_type='Credit',temp.clearing_amount*d.proportion,0)),0)
         total FROM (SELECT l.client_id,l.clearing_amount,l.transaction_type,l.refund_id,o.create_time FROM
         pmt_transactions l
         INNER JOIN pmt_orders o
@@ -153,10 +157,11 @@
         group by bd_id
         order by num desc
     </select>
+    <!--1.BD analysis BD销售量  商户类别交易量分布-->
     <select id="getBDSalePartnerReport" resultType="com.alibaba.fastjson.JSONObject">
         SELECT c.industry,c.royalpayindustry,
         count(DISTINCT c.client_id) partner_counts,
-        IFNULL(sum(if(temp.transaction_type='Credit',temp.clearing_amount*d.proportion,-temp.clearing_amount*d.proportion)),0)
+        IFNULL(sum(if(temp.transaction_type='Credit',temp.clearing_amount*d.proportion,0)),0)
         total
         FROM (SELECT l.client_id,l.clearing_amount,l.transaction_type,l.refund_id,o.create_time FROM pmt_transactions l
         INNER JOIN pmt_orders o
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
index 4f33ecef3..6e813e904 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
@@ -84,10 +84,13 @@
         GROUP BY date(o.create_time)
     </select>
 
+    <!-- 1.Dashboard前十商户交易额（aud_fee）
+         2.GateWay统计 总交易排行-->
+    <!--已修改-->
     <select id="listPartnersTradeAmount" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
        SELECT
-        p.client_moniker,p.short_name,ifnull(sum(if(t.transaction_type='Credit',t.clearing_amount,-t.clearing_amount)),0)aud_fee,
+        p.client_moniker,p.short_name,ifnull(sum(if(t.transaction_type='Credit',t.clearing_amount,0)),0)aud_fee,
         count(DISTINCT t.order_id) orders,max(t.clearing_amount)max_order,ifnull(sum(if(t.refund_id is not null,if(t.transaction_type='Debit',t.clearing_amount,-t.clearing_amount),0)),0)refund_amount,
         ifnull(sum(if(t.refund_id is not null and t.transaction_type='Debit',1,0)),0)refund_orders,max(if(t.refund_id is not null and t.transaction_type='Debit',t.clearing_amount,0))max_refund
         FROM sys_clients p
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml
index 2a2a0027b..d3947449d 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml
@@ -57,6 +57,8 @@
         </where>
     </select>
 
+    <!--1.交易数据（月统计）交易量变化趋势 -->
+    <!--不修改 -->
     <select id="getSumCustomersAnalysisMonthly" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT sum(s.customers) customers,sum(s.orders) orders,sum(s.new_customers) new_customers,
@@ -91,6 +93,12 @@
         GROUP BY trade_date ORDER BY date DESC
     </select>
 
+    <!--1.交易数据（日统计） 交易量变化趋势
+        2.消费者统计
+        3.商户端 Customers Analysis Per customer transaction trends
+        4.商户端 Transaction Analysis Trading amount trends
+        5.Dashboard交易额趋势(aud_fee)-->
+    <!--不修改 -->
     <select id="getSumCustomersAnalysis" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT sum(s.customers) customers,sum(s.orders) orders,sum(s.new_customers) new_customers,
@@ -124,7 +132,8 @@
         </where>
         GROUP BY s.date ORDER BY date DESC
     </select>
-
+    <!--Transaction analysis 支付通道 -->
+    <!--不修改-->
     <select id="getSumChannelAnalysis" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT ifnull(sum(s.orders),0) orders,
@@ -176,9 +185,10 @@
         </where>
     </select>-->
 
-
+    <!--1.交易数据（日统计）（月统计） 各平台交易总额 -->
+    <!--已修改 -->
     <select id="getSumCustomersChannelAnalysis" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT SUM(IF(t.transaction_type = 'Credit', t.clearing_amount, -t.clearing_amount)) AS total_amount
+        SELECT SUM(IF(t.transaction_type = 'Credit', t.clearing_amount,0)) AS total_amount
         FROM pmt_transactions t
         <where>
             t.transaction_time >= #{begin}
@@ -260,6 +270,8 @@
             </if>
     </select>
 
+    <!--Transaction analysis 支付通道 -->
+    <!--不要修改 -->
     <select id="countChannel" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
         ifnull(sum(s.orders),0) orders,
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml
index 5631ef67c..9b81a402d 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml
@@ -196,9 +196,11 @@
         ]]>
     </select>
 
+    <!--1.消费排名列表 -->
+    <!--已修改 -->
     <select id="listCustomersData" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT o.customer_id,sum(if(t.transaction_type='Credit',t.clearing_amount,-t.clearing_amount)) amount,
-        sum(if(t.transaction_type='Credit',t.clearing_amount div 10,-(t.clearing_amount div 10))) points,
+        SELECT o.customer_id,sum(if(t.transaction_type='Credit',t.clearing_amount,0)) amount,
+        sum(if(t.transaction_type='Credit',t.clearing_amount div 10,0)) points,
         COUNT(DISTINCT o.order_id) orders,max(t.clearing_amount) max_order
         FROM pmt_orders o
         INNER JOIN pmt_transactions t on t.order_id=o.order_id and t.system_generate=0 and (t.transaction_type='Credit' or t.transaction_type>0)
@@ -227,9 +229,11 @@
         GROUP BY o.customer_id ORDER BY points desc
     </select>
 
+    <!--1.消费排名 Total Amount -->
+    <!--已修改-->
     <select id="listCustomersDataAnalysis" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT sum(if(t.transaction_type='Credit',t.clearing_amount,-t.clearing_amount)) total_amount,
-        sum(if(t.transaction_type='Credit',t.clearing_amount div 10,-(t.clearing_amount div 10))) total_points
+        SELECT sum(if(t.transaction_type='Credit',t.clearing_amount,0)) total_amount,
+        sum(if(t.transaction_type='Credit',t.clearing_amount div 10,0)) total_points
         FROM pmt_orders o
         INNER JOIN pmt_transactions t on t.order_id=o.order_id and t.system_generate=0 and (t.transaction_type='Credit' or t.refund_id is not null)
         <where>
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
index f2131f1e6..7c3a83ea9 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
@@ -17,10 +17,11 @@
         ORDER BY transaction_time
         LIMIT 1;
     </select>
-
+    <!--1.partner card 标题-->
+    <!--已修改 -->
     <select id="getTransactionCommonAnalysis" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
-         SELECT ifnull(sum(if(t.transaction_type = 'Credit',t.clearing_amount,-t.clearing_amount)), 0) total_amount,
+         SELECT ifnull(sum(if(t.transaction_type = 'Credit' ,t.clearing_amount,0)), 0) total_amount,
          ifnull(sum(if(t.transaction_type = 'Credit' and t.refund_id is null,1,0)), 0) total_count,
         ifnull(sum(if(t.refund_id is not null,if(t.transaction_type = 'Debit',t.clearing_amount,-t.clearing_amount),0)), 0) refund_amount,
         ifnull(sum(if(t.clearing_status != 1,if(t.transaction_type = 'Credit',t.clearing_amount,-t.clearing_amount),0)), 0) notsettle_amount,
@@ -34,7 +35,11 @@
             </if>
         </where>
     </select>
-
+    <!--1.Dashboard标题交易额（移动至getClientTransaction）
+        2 商户端 Dashboard 标题 交易额 （移动至getClientTransaction））
+        3.BD analysis bd提成
+        4./api/v1.0/retail/app 移动至getClientTransaction）-->
+    <!--不修改 -->
     <select id="analysisTotalAmount" resultType="java.math.BigDecimal">
         <![CDATA[
         SELECT ifnull(sum(if(l.transaction_type = 'Credit',l.clearing_amount,-l.clearing_amount)), 0)
@@ -56,7 +61,10 @@
         <if test="org_ids!=null">and l.org_id in
             <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
     </select>
-
+    <!--1.Dashboard交易笔数 （移动至getClientTransaction）
+        2./api/v1.0/retail/app 移动至getClientTransaction）
+        2.商户端 dashboard 交易笔数（移动至getClientTransaction）-->
+    <!--不修改-->
     <select id="analysisTotalCount" resultType="java.lang.Double">
         <![CDATA[
         SELECT ifnull(count(DISTINCT l.order_id), 0)
@@ -80,6 +88,7 @@
         </if>
     </select>
 
+    <!--1.商户端 dashboard退款金额 （移动至getClientTransaction）-->
     <select id="analysisRefundAmount" resultType="java.lang.Double">
         <![CDATA[
         SELECT ifnull(sum(if(l.transaction_type='Debit',l.clearing_amount,-l.clearing_amount)), 0)
@@ -99,7 +108,8 @@
         </if>
     </select>
 
-
+    <!--商户端 dashboard 未清算金额-->
+    <!--不修改-->
     <select id="analysisNotSettled" resultType="java.lang.Double">
         <![CDATA[
         SELECT ifnull(sum(if(transaction_type = 'Credit', clearing_amount, -clearing_amount)), 0)
@@ -117,6 +127,8 @@
         </if>
     </select>
 
+    <!--商户端 dashboard 预授权金额 -->
+    <!--不修改-->
     <select id="analysisPreAmount" resultType="java.lang.Double">
         <![CDATA[
         SELECT ifnull(sum(l.clearing_amount), 0)
@@ -136,7 +148,9 @@
         </if>
     </select>
 
-
+    <!--1.Dashboard最大交易额订单(aud_fee)
+        2.商户端 Dashboard最大交易额订单-->
+    <!-- 不修改-->
     <select id="getTopOrders" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT
@@ -169,6 +183,9 @@
         ]]>
 
     </select>
+    <!--1.Dashboard交易类型分布-交易量
+        2.partner card 交易类型分布-交易量-->
+    <!-- 已修改-->
     <select id="getTradeAmountInTypes" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT
@@ -198,7 +215,7 @@
             WHEN 11
                 THEN 'Share Code'
             END AS                            gateway_label,
-            ifnull(sum(if(l.transaction_type='Credit',l.clearing_amount,-l.clearing_amount)), 0) aud_fee
+            ifnull(sum(if(l.transaction_type='Credit',l.clearing_amount,0)), 0) aud_fee
         FROM pmt_transactions l
             INNER JOIN pmt_orders o ON o.order_id = l.order_id
         WHERE (l.transaction_type = 'Credit' or l.refund_id is not null)
@@ -211,11 +228,15 @@
             <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         GROUP BY gateway_label
     </select>
+    <!--1.交易数据（日统计）交易时间分布
+        2.商户端 Dashboard Trading distribution chart
+        3.partner card Transaction Time Analysis-->
+    <!-- 已修改-->
     <select id="tradeAnalysisInHours" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT h, round(sum(count)/datediff(#{end},#{begin}),1) count, round(sum(aud_fee)/datediff(#{end},#{begin}),2) aud_fee
         FROM(
-                SELECT HOUR(o.create_time) h, DATE(o.create_time) dt, sum(if(l.transaction_type='Credit' and l.refund_id is null,1,0)) count, ifnull(sum(if(l.transaction_type='Credit',l.clearing_amount,-l.clearing_amount)), 0) aud_fee
+                SELECT HOUR(o.create_time) h, DATE(o.create_time) dt, sum(if(l.transaction_type='Credit' and l.refund_id is null,1,0)) count, ifnull(sum(if(l.transaction_type='Credit',l.clearing_amount,0)), 0) aud_fee
                 FROM pmt_transactions l
                     inner join pmt_orders o on o.order_id = l.order_id
                 WHERE (l.transaction_type='Credit' or l.refund_id is not null)
@@ -252,11 +273,14 @@
         order by h
         ]]>
     </select>
+    <!-- 1.Dashboard交易额趋势(aud_fee)（已不用）
+         2.generateReport（方法名）-->
+    <!--已修改 -->
     <select id="tradeAnalysisInDays" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT
             date_format(o.create_time, '%Y-%m-%d') date_str,
-            ifnull(sum(if(l.transaction_type = 'Credit', l.clearing_amount, -l.clearing_amount)), 0) aud_fee,
+            ifnull(sum(if(l.transaction_type = 'Credit', l.clearing_amount, 0)), 0) aud_fee,
             ifnull(sum(if(l.transaction_type='Credit' and l.refund_id is null,1,0)),0) order_count
         FROM pmt_transactions l
             INNER JOIN pmt_orders o ON o.order_id = l.order_id AND o.create_time >= #{begin} AND o.create_time <= #{end}
@@ -279,11 +303,13 @@
         ORDER BY date(o.create_time)
         ]]>
     </select>
+    <!--1.商户端 Dashboard Trading trends-->
+    <!--已修改 -->
     <select id="tradeAnalysisInDay" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT
             date_format(#{end}, '%Y-%m-%d') date_str,
-            ifnull(sum(if(l.transaction_type = 'Credit', l.clearing_amount, -l.clearing_amount)), 0) aud_fee,
+            ifnull(sum(if(l.transaction_type = 'Credit', l.clearing_amount,0)), 0) aud_fee,
             ifnull(sum(if(l.transaction_type='Credit' and l.refund_id is null,1,0)),0) order_count
         FROM pmt_transactions l
             INNER JOIN pmt_orders o ON o.order_id = l.order_id AND o.create_time >= #{begin} AND o.create_time <= #{end}
@@ -416,7 +442,9 @@
         o.create_time < #{date} and o.status>=5
          ]]>
     </select>
-
+    <!--1.Dashboard 交易类型分布-商户数量
+        2.gataway统计 各交易类型商家数量分布（家）-->
+    <!-- 不修改-->
     <select id="getTradePartnersInTypes" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT
@@ -466,9 +494,11 @@
         GROUP BY gateway_label
     </select>
 
+    <!--1.getaWay统计 交易方式商户排名 -->
+    <!--已修改 -->
     <select id="getPartnersByTradeType" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
-        SELECT c.short_name ,ifnull(SUM(if(l.transaction_type = 'Credit',l.clearing_amount,-l.clearing_amount)), 0) total
+        SELECT c.short_name ,ifnull(SUM(if(l.transaction_type = 'Credit',l.clearing_amount,0)), 0) total
         FROM pmt_transactions l
         INNER JOIN pmt_orders o ON o.order_id = l.order_id
         left JOIN sys_clients c on c.client_id=o.client_id AND c.is_valid=1
@@ -542,6 +572,8 @@
     <!--</if>-->
     <!--<if test="org_id!=null">and l.org_id=#{org_id}</if>-->
     <!--</select>-->
+    <!--1.Dashboard交易时间分布(order_total) -->
+    <!-- 不修改-->
     <select id="getOrdersByGateway" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
          SELECT po.create_time,
@@ -631,9 +663,12 @@
             <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         GROUP BY date , channel  ORDER BY date DESC
     </select>
+    <!--1.合伙人 合伙人销量 各组织机构交易量分布
+        2.generateReport（WeekReporter）-->
+    <!--已修改-->
     <select id="getOrgTransactionAnalysis" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
-       SELECT o.org_id, o.name org_name,sum(if(t.transaction_type='Credit',t.clearing_amount,-t.clearing_amount)) amount
+       SELECT o.org_id, o.name org_name,sum(if(t.transaction_type='Credit',t.clearing_amount,0)) amount
         FROM pmt_transactions t
         INNER JOIN pmt_orders ord on ord.order_id = t.order_id
         RIGHT JOIN sys_clients c on t.client_id = c.client_id and c.is_valid = 1
@@ -647,9 +682,11 @@
             <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         GROUP BY o.org_id order by amount desc
     </select>
+    <!--1.合伙人 合伙人销量 合伙人商户交易量排名 -->
+    <!--已修改-->
     <select id="getPartnersAmountByOrg" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
-       SELECT c.client_moniker,c.short_name,sum(if(t.transaction_type='Credit',t.clearing_amount,-t.clearing_amount)) amount
+       SELECT c.client_moniker,c.short_name,sum(if(t.transaction_type='Credit',t.clearing_amount,0)) amount
         FROM pmt_transactions t
         INNER JOIN pmt_orders ord on ord.order_id = t.order_id
         RIGHT JOIN sys_clients c on t.client_id = c.client_id and c.is_valid = 1 AND c.org_id = #{org_id}
@@ -660,9 +697,11 @@
         GROUP BY c.client_id order by amount desc
     </select>
 
+    <!-- (1)Dashboard支付通道交易额，订单数-->
+    <!-- 已修改-->
     <select id="getPlatformAmount" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
-        SELECT ifnull(sum(if(l.transaction_type = 'Credit',l.clearing_amount,-l.clearing_amount)), 0) amount,
+        SELECT ifnull(sum(if(l.transaction_type = 'Credit',l.clearing_amount,0)), 0) amount,
                 ifnull(count(DISTINCT l.order_id), 0) order_count
         FROM pmt_transactions l
             INNER JOIN pmt_orders o ON o.order_id = l.order_id AND o.create_time >= #{begin} AND
@@ -696,7 +735,8 @@
         <if test="amount_to!=null">and t.clearing_amount &lt; #{amount_to}</if>
     </select>
 
-
+    <!--1.交易金额分析 交易订单列表-->
+    <!--不更改 -->
     <select id="listAmountRangeOrders" resultType="com.alibaba.fastjson.JSONObject">
         select c.client_moniker,c.short_name,t.order_id,t.clearing_amount,t.transaction_time,t.channel,o.customer_id,o.customer_ip,o.gateway
         FROM pmt_transactions t
@@ -711,6 +751,8 @@
         <if test="amount_to!=null">and t.clearing_amount &lt; #{amount_to}</if>
     </select>
 
+    <!--交易金额分析 饼图 -->
+    <!--不更改-->
     <select id="getAmountRangeAnalysis" resultType="com.alibaba.fastjson.JSONObject">
         select
         sum(if(t.clearing_amount &gt;= 0 and t.clearing_amount &lt; 20,1,0)) amount0_20,
@@ -732,14 +774,19 @@
         <if test="channel!=null">and t.channel=#{channel}</if>
     </select>
 
+    <!--1.Dashboard标题交易额
+        2.Dashboard 交易笔数
+        3.商户端 交易额，交易笔数 退款金额
+        4./api/v1.0/retail/app-->
+    <!--新增接口-->
     <select id="getClientTransaction" resultType="com.alibaba.fastjson.JSONObject">
       select
     IFNULL(sum(if(l.transaction_type='credit',l.clearing_amount,0)),0) trade_amount,
     ifnull(sum(if(l.refund_id>0,l.clearing_amount,0)),0) refund_amount,
     sum(if(l.transaction_type='Credit',1,0)) trade_count,
-    sum(if(l.refund_id>0,1,0)) refund_orders,
+    sum(if(l.refund_id>0,1,0)) refund_orders
     FROM pmt_transactions l
-    where l.channel!='Settlement' and t.system_generate=0
+    where l.channel!='Settlement' and l.system_generate=0
         <if test="client_ids!=null">
             AND l.client_id IN
             <foreach collection="client_ids" open="(" close=")" separator="," item="client_id">
@@ -749,8 +796,8 @@
         <if test="client_ids==null and client_id != null">
             and l.client_id=#{client_id}
         </if>
-        <if test="begin!=null">and l.transaction &gt;= #{begin}</if>
-        <if test="end!=null">and l.transaction &lt; #{end}</if>
+        <if test="begin!=null">and l.transaction_time &gt;= #{begin}</if>
+        <if test="end!=null">and l.transaction_time &lt; #{end}</if>
         <if test="org_id!=null and org_ids==null">and l.org_id=#{org_id}</if>
         <if test="org_ids!=null">and l.org_id in
             <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
index 4c3fe8f60..3bfd0f466 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
@@ -131,6 +131,8 @@
 
         ]]>
     </update>
+    <!--1.交易流水列表 -->
+    <!--不修改-->
     <select id="listOrders" resultType="com.alibaba.fastjson.JSONObject">
         <if test="bd_user!=null">
             SELECT temp.* FROM (
@@ -248,7 +250,9 @@
         GROUP BY o.order_id,t.refund_id
         order by o.create_time
     </select>
-
+    <!-- 1.商户管理订单列表
+         2.商户端 Orders列表-->
+    <!--不修改 -->
     <select id="listOrdersByClients" resultType="com.alibaba.fastjson.JSONObject">
         <if test="gateway">
             <include refid="gateway_keys"/>
@@ -326,10 +330,13 @@
         GROUP BY o.order_id,t.refund_id
     </select>
 
+    <!--1.交易流水交易金额
+        2.商户端 Orders 标题交易金额-->
+    <!--已修改-->
     <select id="analysisOrders" resultType="com.alibaba.fastjson.JSONObject">
         select
         count(DISTINCT l.order_id) order_count,
-        ifnull(sum(if(l.transaction_type='Credit' and l.refund_id is null,l.clearing_amount,0)),0) paid_fee,
+        ifnull(sum(if(l.transaction_type='Credit',l.clearing_amount,0)),0) paid_fee,
         ifnull(sum(if(l.refund_id is not null,if(l.transaction_type='Debit',-l.clearing_amount,l.clearing_amount),0)),0)
         refund_fee,
         ifnull(sum(if(l.refund_id is not null AND l.pre_authorization=1,l.clearing_amount,0)),0)
@@ -499,6 +506,8 @@
         WHERE o.customer_id = #{customer_id} and t.transaction_time &gt;= '2017-11-07'
     </select>
 
+    <!--1.消费排名 用户列表（单个用户） -->
+    <!--不修改-->
     <select id="listOrderByCustomer" resultType="com.alibaba.fastjson.JSONObject">
         SELECT o.*,c.short_name,c.client_moniker FROM pmt_orders o
         LEFT JOIN sys_clients c on c.client_id = o.client_id
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
index 8614b539a..5907875ab 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
@@ -36,6 +36,8 @@
         </where>
     </select>
 
+    <!--1.Transactions 交易列表-->
+    <!--不修改-->
     <select id="listTransFlow" resultType="com.alibaba.fastjson.JSONObject">
         SELECT t.*,
           ifnull(o.client_order_id,'--') client_order_id,
@@ -77,7 +79,8 @@
         </where>
         order by t.transaction_time desc
     </select>
-
+    <!--1.Transactions 标题金额 -->
+    <!--不修改-->
     <select id="analysisTransFlow" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
         count(t.transaction_id) order_count,
@@ -158,6 +161,7 @@
         FROM pmt_transactions
         WHERE clearing_status = 0 AND client_id = #{client_id}
     </select>
+    <!--1.商户端 Settlement 标题 -->
     <select id="getClientAmountAnalysis" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT
@@ -228,6 +232,7 @@
         ORDER BY t.transaction_type, t.transaction_time
         ]]>
     </select>
+    <!--1.商户端Settlement 列表 -->
     <select id="listSettlementLog" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT t.client_id,DATE(t.transaction_time) clearing_time,SUM(t.clearing_amount) total,
@@ -423,6 +428,8 @@
         WHERE t.transaction_type = 'Credit' OR t.refund_id IS NOT NULL
         ORDER BY t.order_id ASC
     </select>
+    <!--1.BD analysis BD提成 生成报表 -->
+    <!--不修改-->
     <select id="listTransactionsForBDPrize" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
         sum(if(t.transaction_type = 'Credit', t.clearing_amount, -t.clearing_amount))
@@ -516,7 +523,8 @@
         GROUP BY so.org_id, trade_date,t.client_id
         ORDER BY c.org_id ASC, t.client_id ASC, trade_date ASC
     </select>
-
+    <!--1.合伙人，合伙人提成 generateOrgCommission -->
+    <!--不修改-->
     <select id="listTransactionsForAgentCommission" resultType="com.alibaba.fastjson.JSONObject">
          <![CDATA[
         SELECT
diff --git a/src/main/ui/static/dashboard/dashboard.js b/src/main/ui/static/dashboard/dashboard.js
index 1ed933040..c49cc3024 100644
--- a/src/main/ui/static/dashboard/dashboard.js
+++ b/src/main/ui/static/dashboard/dashboard.js
@@ -444,15 +444,21 @@ define(['angular', 'uiRouter', 'uiBootstrap', 'angularEcharts'], function (angul
                         type: 'category',
                         boundaryGap: false
                     },
-                    key: 'date_str'
+                    key: 'trade_date'
                 },
                 series: [
                     {
                         basic: {type: 'line', label: {normal: {show: true}}, showAllSymbols: true},
-                        column: {key: 'aud_fee'}
+                        column: {key: 'total'}
                     }
                 ]
             };
+            params.end = new Date();
+            var day = new Date();
+            day.setDate(day.getDate() - 7);
+            params.begin = day;
+            params.begin = $filter('date')(params.begin, 'yyyyMMdd');
+            params.end = $filter('date')(params.end, 'yyyyMMdd');
             $http.get('/dashboard/system/fee_analysis', {params: params}).then(function (resp) {
                 $scope.analysis.trade_line = chartParser.parse(analysisConfig, resp.data);
             })

From f4cb0221fe493294011d1d41f08ede5596755054 Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Wed, 28 Feb 2018 10:11:46 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A4=E6=98=93?=
 =?UTF-8?q?=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysis/mappers/BDAnalysisMapper.xml     |  5 --
 .../analysis/mappers/ClientAnalysisMapper.xml |  3 -
 .../CustomerAndOrdersStatisticsMapper.xml     | 15 +----
 .../analysis/mappers/OrderAnalysisMapper.xml  |  4 --
 .../mappers/TransactionAnalysisMapper.xml     | 67 +++++--------------
 .../manage/mappers/payment/OrderMapper.xml    | 14 ++--
 .../mappers/payment/TransactionMapper.xml     | 15 ++---
 7 files changed, 25 insertions(+), 98 deletions(-)

diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml
index 886be691b..305285002 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="au.com.royalpay.payment.manage.analysis.mappers.BDAnalysisMapper">
-    <!--1.BD analysis BD销售量 BD销售数据统计
-        2.BD analysis BD销售量 导出表格-->
     <select id="getBDSaleList" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
         d.bd_name,d.bd_id,sum(if(temp.transaction_type='Credit',temp.clearing_amount*d.proportion,0))
@@ -38,8 +36,6 @@
         GROUP BY d.bd_id
         ORDER BY total DESC
     </select>
-    <!--1.BD analysis BD销售量 商户销售排行
-        2.BD analysis BD销售量 导出表格（每个BD 的商户）-->
     <select id="getBDSalePartnerList" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
         c.client_id,c.client_moniker,c.short_name,c.approve_time,IFNULL(sum(if(temp.transaction_type='Credit',temp.clearing_amount*d.proportion,0)),0)
@@ -157,7 +153,6 @@
         group by bd_id
         order by num desc
     </select>
-    <!--1.BD analysis BD销售量  商户类别交易量分布-->
     <select id="getBDSalePartnerReport" resultType="com.alibaba.fastjson.JSONObject">
         SELECT c.industry,c.royalpayindustry,
         count(DISTINCT c.client_id) partner_counts,
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
index 6e813e904..99601e10b 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
@@ -84,9 +84,6 @@
         GROUP BY date(o.create_time)
     </select>
 
-    <!-- 1.Dashboard前十商户交易额（aud_fee）
-         2.GateWay统计 总交易排行-->
-    <!--已修改-->
     <select id="listPartnersTradeAmount" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
        SELECT
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml
index d3947449d..08d0aedcb 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml
@@ -57,8 +57,6 @@
         </where>
     </select>
 
-    <!--1.交易数据（月统计）交易量变化趋势 -->
-    <!--不修改 -->
     <select id="getSumCustomersAnalysisMonthly" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT sum(s.customers) customers,sum(s.orders) orders,sum(s.new_customers) new_customers,
@@ -93,12 +91,6 @@
         GROUP BY trade_date ORDER BY date DESC
     </select>
 
-    <!--1.交易数据（日统计） 交易量变化趋势
-        2.消费者统计
-        3.商户端 Customers Analysis Per customer transaction trends
-        4.商户端 Transaction Analysis Trading amount trends
-        5.Dashboard交易额趋势(aud_fee)-->
-    <!--不修改 -->
     <select id="getSumCustomersAnalysis" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT sum(s.customers) customers,sum(s.orders) orders,sum(s.new_customers) new_customers,
@@ -132,8 +124,7 @@
         </where>
         GROUP BY s.date ORDER BY date DESC
     </select>
-    <!--Transaction analysis 支付通道 -->
-    <!--不修改-->
+
     <select id="getSumChannelAnalysis" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT ifnull(sum(s.orders),0) orders,
@@ -185,8 +176,6 @@
         </where>
     </select>-->
 
-    <!--1.交易数据（日统计）（月统计） 各平台交易总额 -->
-    <!--已修改 -->
     <select id="getSumCustomersChannelAnalysis" resultType="com.alibaba.fastjson.JSONObject">
         SELECT SUM(IF(t.transaction_type = 'Credit', t.clearing_amount,0)) AS total_amount
         FROM pmt_transactions t
@@ -270,8 +259,6 @@
             </if>
     </select>
 
-    <!--Transaction analysis 支付通道 -->
-    <!--不要修改 -->
     <select id="countChannel" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
         ifnull(sum(s.orders),0) orders,
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml
index 9b81a402d..ff6fdfd89 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml
@@ -196,8 +196,6 @@
         ]]>
     </select>
 
-    <!--1.消费排名列表 -->
-    <!--已修改 -->
     <select id="listCustomersData" resultType="com.alibaba.fastjson.JSONObject">
         SELECT o.customer_id,sum(if(t.transaction_type='Credit',t.clearing_amount,0)) amount,
         sum(if(t.transaction_type='Credit',t.clearing_amount div 10,0)) points,
@@ -229,8 +227,6 @@
         GROUP BY o.customer_id ORDER BY points desc
     </select>
 
-    <!--1.消费排名 Total Amount -->
-    <!--已修改-->
     <select id="listCustomersDataAnalysis" resultType="com.alibaba.fastjson.JSONObject">
         SELECT sum(if(t.transaction_type='Credit',t.clearing_amount,0)) total_amount,
         sum(if(t.transaction_type='Credit',t.clearing_amount div 10,0)) total_points
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
index 7c3a83ea9..0bb717fab 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
@@ -17,8 +17,7 @@
         ORDER BY transaction_time
         LIMIT 1;
     </select>
-    <!--1.partner card 标题-->
-    <!--已修改 -->
+
     <select id="getTransactionCommonAnalysis" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
          SELECT ifnull(sum(if(t.transaction_type = 'Credit' ,t.clearing_amount,0)), 0) total_amount,
@@ -35,11 +34,7 @@
             </if>
         </where>
     </select>
-    <!--1.Dashboard标题交易额（移动至getClientTransaction）
-        2 商户端 Dashboard 标题 交易额 （移动至getClientTransaction））
-        3.BD analysis bd提成
-        4./api/v1.0/retail/app 移动至getClientTransaction）-->
-    <!--不修改 -->
+
     <select id="analysisTotalAmount" resultType="java.math.BigDecimal">
         <![CDATA[
         SELECT ifnull(sum(if(l.transaction_type = 'Credit',l.clearing_amount,-l.clearing_amount)), 0)
@@ -61,10 +56,7 @@
         <if test="org_ids!=null">and l.org_id in
             <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
     </select>
-    <!--1.Dashboard交易笔数 （移动至getClientTransaction）
-        2./api/v1.0/retail/app 移动至getClientTransaction）
-        2.商户端 dashboard 交易笔数（移动至getClientTransaction）-->
-    <!--不修改-->
+
     <select id="analysisTotalCount" resultType="java.lang.Double">
         <![CDATA[
         SELECT ifnull(count(DISTINCT l.order_id), 0)
@@ -88,7 +80,6 @@
         </if>
     </select>
 
-    <!--1.商户端 dashboard退款金额 （移动至getClientTransaction）-->
     <select id="analysisRefundAmount" resultType="java.lang.Double">
         <![CDATA[
         SELECT ifnull(sum(if(l.transaction_type='Debit',l.clearing_amount,-l.clearing_amount)), 0)
@@ -108,8 +99,6 @@
         </if>
     </select>
 
-    <!--商户端 dashboard 未清算金额-->
-    <!--不修改-->
     <select id="analysisNotSettled" resultType="java.lang.Double">
         <![CDATA[
         SELECT ifnull(sum(if(transaction_type = 'Credit', clearing_amount, -clearing_amount)), 0)
@@ -127,8 +116,6 @@
         </if>
     </select>
 
-    <!--商户端 dashboard 预授权金额 -->
-    <!--不修改-->
     <select id="analysisPreAmount" resultType="java.lang.Double">
         <![CDATA[
         SELECT ifnull(sum(l.clearing_amount), 0)
@@ -148,9 +135,6 @@
         </if>
     </select>
 
-    <!--1.Dashboard最大交易额订单(aud_fee)
-        2.商户端 Dashboard最大交易额订单-->
-    <!-- 不修改-->
     <select id="getTopOrders" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT
@@ -183,9 +167,7 @@
         ]]>
 
     </select>
-    <!--1.Dashboard交易类型分布-交易量
-        2.partner card 交易类型分布-交易量-->
-    <!-- 已修改-->
+
     <select id="getTradeAmountInTypes" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT
@@ -228,10 +210,7 @@
             <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         GROUP BY gateway_label
     </select>
-    <!--1.交易数据（日统计）交易时间分布
-        2.商户端 Dashboard Trading distribution chart
-        3.partner card Transaction Time Analysis-->
-    <!-- 已修改-->
+
     <select id="tradeAnalysisInHours" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT h, round(sum(count)/datediff(#{end},#{begin}),1) count, round(sum(aud_fee)/datediff(#{end},#{begin}),2) aud_fee
@@ -273,9 +252,7 @@
         order by h
         ]]>
     </select>
-    <!-- 1.Dashboard交易额趋势(aud_fee)（已不用）
-         2.generateReport（方法名）-->
-    <!--已修改 -->
+
     <select id="tradeAnalysisInDays" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT
@@ -303,8 +280,7 @@
         ORDER BY date(o.create_time)
         ]]>
     </select>
-    <!--1.商户端 Dashboard Trading trends-->
-    <!--已修改 -->
+
     <select id="tradeAnalysisInDay" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT
@@ -442,9 +418,7 @@
         o.create_time < #{date} and o.status>=5
          ]]>
     </select>
-    <!--1.Dashboard 交易类型分布-商户数量
-        2.gataway统计 各交易类型商家数量分布（家）-->
-    <!-- 不修改-->
+
     <select id="getTradePartnersInTypes" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT
@@ -494,8 +468,7 @@
         GROUP BY gateway_label
     </select>
 
-    <!--1.getaWay统计 交易方式商户排名 -->
-    <!--已修改 -->
+
     <select id="getPartnersByTradeType" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT c.short_name ,ifnull(SUM(if(l.transaction_type = 'Credit',l.clearing_amount,0)), 0) total
@@ -572,8 +545,7 @@
     <!--</if>-->
     <!--<if test="org_id!=null">and l.org_id=#{org_id}</if>-->
     <!--</select>-->
-    <!--1.Dashboard交易时间分布(order_total) -->
-    <!-- 不修改-->
+
     <select id="getOrdersByGateway" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
          SELECT po.create_time,
@@ -663,9 +635,7 @@
             <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         GROUP BY date , channel  ORDER BY date DESC
     </select>
-    <!--1.合伙人 合伙人销量 各组织机构交易量分布
-        2.generateReport（WeekReporter）-->
-    <!--已修改-->
+
     <select id="getOrgTransactionAnalysis" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
        SELECT o.org_id, o.name org_name,sum(if(t.transaction_type='Credit',t.clearing_amount,0)) amount
@@ -682,8 +652,7 @@
             <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         GROUP BY o.org_id order by amount desc
     </select>
-    <!--1.合伙人 合伙人销量 合伙人商户交易量排名 -->
-    <!--已修改-->
+
     <select id="getPartnersAmountByOrg" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
        SELECT c.client_moniker,c.short_name,sum(if(t.transaction_type='Credit',t.clearing_amount,0)) amount
@@ -697,8 +666,7 @@
         GROUP BY c.client_id order by amount desc
     </select>
 
-    <!-- (1)Dashboard支付通道交易额，订单数-->
-    <!-- 已修改-->
+
     <select id="getPlatformAmount" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT ifnull(sum(if(l.transaction_type = 'Credit',l.clearing_amount,0)), 0) amount,
@@ -735,8 +703,7 @@
         <if test="amount_to!=null">and t.clearing_amount &lt; #{amount_to}</if>
     </select>
 
-    <!--1.交易金额分析 交易订单列表-->
-    <!--不更改 -->
+
     <select id="listAmountRangeOrders" resultType="com.alibaba.fastjson.JSONObject">
         select c.client_moniker,c.short_name,t.order_id,t.clearing_amount,t.transaction_time,t.channel,o.customer_id,o.customer_ip,o.gateway
         FROM pmt_transactions t
@@ -774,11 +741,7 @@
         <if test="channel!=null">and t.channel=#{channel}</if>
     </select>
 
-    <!--1.Dashboard标题交易额
-        2.Dashboard 交易笔数
-        3.商户端 交易额，交易笔数 退款金额
-        4./api/v1.0/retail/app-->
-    <!--新增接口-->
+
     <select id="getClientTransaction" resultType="com.alibaba.fastjson.JSONObject">
       select
     IFNULL(sum(if(l.transaction_type='credit',l.clearing_amount,0)),0) trade_amount,
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
index 3bfd0f466..6e85a145e 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
@@ -131,8 +131,7 @@
 
         ]]>
     </update>
-    <!--1.交易流水列表 -->
-    <!--不修改-->
+
     <select id="listOrders" resultType="com.alibaba.fastjson.JSONObject">
         <if test="bd_user!=null">
             SELECT temp.* FROM (
@@ -250,9 +249,7 @@
         GROUP BY o.order_id,t.refund_id
         order by o.create_time
     </select>
-    <!-- 1.商户管理订单列表
-         2.商户端 Orders列表-->
-    <!--不修改 -->
+
     <select id="listOrdersByClients" resultType="com.alibaba.fastjson.JSONObject">
         <if test="gateway">
             <include refid="gateway_keys"/>
@@ -330,9 +327,7 @@
         GROUP BY o.order_id,t.refund_id
     </select>
 
-    <!--1.交易流水交易金额
-        2.商户端 Orders 标题交易金额-->
-    <!--已修改-->
+
     <select id="analysisOrders" resultType="com.alibaba.fastjson.JSONObject">
         select
         count(DISTINCT l.order_id) order_count,
@@ -506,8 +501,7 @@
         WHERE o.customer_id = #{customer_id} and t.transaction_time &gt;= '2017-11-07'
     </select>
 
-    <!--1.消费排名 用户列表（单个用户） -->
-    <!--不修改-->
+
     <select id="listOrderByCustomer" resultType="com.alibaba.fastjson.JSONObject">
         SELECT o.*,c.short_name,c.client_moniker FROM pmt_orders o
         LEFT JOIN sys_clients c on c.client_id = o.client_id
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
index 5907875ab..7c6869c44 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
@@ -36,8 +36,6 @@
         </where>
     </select>
 
-    <!--1.Transactions 交易列表-->
-    <!--不修改-->
     <select id="listTransFlow" resultType="com.alibaba.fastjson.JSONObject">
         SELECT t.*,
           ifnull(o.client_order_id,'--') client_order_id,
@@ -79,8 +77,7 @@
         </where>
         order by t.transaction_time desc
     </select>
-    <!--1.Transactions 标题金额 -->
-    <!--不修改-->
+
     <select id="analysisTransFlow" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
         count(t.transaction_id) order_count,
@@ -161,7 +158,7 @@
         FROM pmt_transactions
         WHERE clearing_status = 0 AND client_id = #{client_id}
     </select>
-    <!--1.商户端 Settlement 标题 -->
+
     <select id="getClientAmountAnalysis" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT
@@ -232,7 +229,7 @@
         ORDER BY t.transaction_type, t.transaction_time
         ]]>
     </select>
-    <!--1.商户端Settlement 列表 -->
+
     <select id="listSettlementLog" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT t.client_id,DATE(t.transaction_time) clearing_time,SUM(t.clearing_amount) total,
@@ -428,8 +425,7 @@
         WHERE t.transaction_type = 'Credit' OR t.refund_id IS NOT NULL
         ORDER BY t.order_id ASC
     </select>
-    <!--1.BD analysis BD提成 生成报表 -->
-    <!--不修改-->
+
     <select id="listTransactionsForBDPrize" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
         sum(if(t.transaction_type = 'Credit', t.clearing_amount, -t.clearing_amount))
@@ -523,8 +519,7 @@
         GROUP BY so.org_id, trade_date,t.client_id
         ORDER BY c.org_id ASC, t.client_id ASC, trade_date ASC
     </select>
-    <!--1.合伙人，合伙人提成 generateOrgCommission -->
-    <!--不修改-->
+
     <select id="listTransactionsForAgentCommission" resultType="com.alibaba.fastjson.JSONObject">
          <![CDATA[
         SELECT

From e160be4afd2738d579eaa9d1dca3adb11723deb6 Mon Sep 17 00:00:00 2001
From: macminiuser <eason.qian@royalpay.com.au>
Date: Wed, 28 Feb 2018 19:48:53 +0800
Subject: [PATCH 4/4] fix

---
 .../core/impls/DashboardServiceImpl.java      |  6 +-
 .../appclient/core/RetailAppService.java      |  2 +
 .../core/impls/RetailAppServiceImp.java       | 68 ++++++++++++++++++-
 .../appclient/web/RetailAppController.java    |  5 ++
 .../analysis/mappers/BDAnalysisMapper.xml     |  6 +-
 src/main/ui/static/dashboard/dashboard.js     |  4 +-
 6 files changed, 80 insertions(+), 11 deletions(-)

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 55c706383..67b3206ca 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
@@ -53,12 +53,10 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
 
     @Override
     public JSONObject getCommonAnalysis1(JSONObject params) {
-        JSONObject res = new JSONObject();
+        JSONObject res = transactionAnalysisMapper.getClientTransaction(params);
         res.put("new_partners", clientAnalysisMapper.countNewClients(params));
         res.put("total_partners", clientAnalysisMapper.countClients(params));
         res.put("traded_partners", clientAnalysisMapper.countTradedPartners(params));
-        res.put("trade_amount", transactionAnalysisMapper.getClientTransaction(params).getBigDecimal("trade_amount"));
-//        res.put("trade_count", transactionAnalysisMapper.analysisTotalCount(params));
 //        List<JSONObject> topOrders = transactionAnalysisMapper.getTopOrders(params, new PageBounds(1, 1, Order.formString("aud_fee.desc")));
 //        if (!topOrders.isEmpty()) {
 //            res.put("top_amount_order", topOrders.get(0));
@@ -75,7 +73,7 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
 //        res.put("total_partners", clientAnalysisMapper.countClients(params));
 //        res.put("traded_partners", clientAnalysisMapper.countTradedPartners(params));
 //        res.put("trade_amount", transactionAnalysisMapper.analysisTotalAmount(params));
-        res.put("trade_count", transactionAnalysisMapper.getClientTransaction(params).getIntValue("trade_count"));
+//        res.put("trade_count", transactionAnalysisMapper.getClientTransaction(params).getIntValue("trade_count"));
         List<JSONObject> topOrders = transactionAnalysisMapper.getTopOrders(params, new PageBounds(1, 1, Order.formString("aud_fee.desc")));
         if (!topOrders.isEmpty()) {
             res.put("top_amount_order", topOrders.get(0));
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java
index 2029c8870..9c0ec74d3 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java
@@ -24,6 +24,8 @@ public interface RetailAppService {
 
     JSONObject listOrders(JSONObject device, AppQueryBean query);
 
+    JSONObject listOrdersNew(JSONObject device, AppQueryBean query);
+
     JSONObject listOrdersShareCode(JSONObject device, AppQueryBean query);
 
     void updateDevToken(JSONObject device, String devToken);
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
index 8156b029a..c55d4b6a7 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
@@ -358,9 +358,7 @@ public class RetailAppServiceImp implements RetailAppService {
         }
         params.put("client_id", client_id);
 
-//        PageList<JSONObject> orders = orderMapper.listOrdersByClients(params,
-//                new PageBounds(query.getPage(), query.getLimit(), Order.formString("create_time.desc")));
-        PageList<JSONObject> orders = orderMapper.listTransactionsForApp(params,
+        PageList<JSONObject> orders = orderMapper.listOrdersByClients(params,
                 new PageBounds(query.getPage(), query.getLimit(), Order.formString("create_time.desc")));
         TimeZoneUtils.switchTimeZone(orders, query.getTimezone(), "create_time", "transaction_time", "confirm_time");
         ArrayList<String> date_contains = new ArrayList<>();
@@ -391,6 +389,70 @@ public class RetailAppServiceImp implements RetailAppService {
         return PageListUtils.buildPageListResult(orders);
     }
 
+    @Override
+    public JSONObject listOrdersNew(JSONObject device, AppQueryBean query) {
+        String clientType = device.getString("client_type");
+        DeviceRegister register = deviceSupport.findRegister(clientType);
+        int client_id = device.getIntValue("client_id");
+        JSONObject client = clientManager.getClientInfo(client_id);
+        String timezone = client.getString("timezone");
+        if (timezone != null && !timezone.isEmpty()) {
+            query.setTimezone(timezone);
+        }
+        JSONObject params = query.toParams();
+        setAllClientIds(params, client_id);
+        if (register.includeDevId()) {
+            params.put("dev_id", device.getString("dev_id"));
+        }
+        params.put("client_id", client_id);
+
+        PageList<JSONObject> orders = orderMapper.listTransactionsForApp(params,
+                new PageBounds(query.getPage(), query.getLimit(), Order.formString("create_time.desc")));
+        TimeZoneUtils.switchTimeZone(orders, query.getTimezone(), "create_time", "transaction_time", "confirm_time");
+        ArrayList<String> date_contains = new ArrayList<>();
+        for (JSONObject order : orders) {
+            String customer_id = order.getString("customer_id");
+            if (StringUtils.isEmpty(customer_id)) {
+                continue;
+            }
+            switch (order.getString("channel")) {
+                case "Alipay":
+                    JSONObject alipayUser = customerRelationAlipayMapper.findCustomerByUserId(customer_id);
+                    order.put("nickname", alipayUser.getString("nickname"));
+                    order.put("headimg", alipayUser.getString("headimg"));
+                    break;
+                case "Wechat":
+                    JSONObject weUser = customerMapper.findCustomerByOpenId(customer_id);
+                    order.put("nickname", weUser.getString("nickname"));
+                    order.put("headimg", weUser.getString("headimg"));
+                    break;
+                default:
+                    break;
+            }
+            Calendar calendar = (Calendar) order.get("create_time");
+            String trade_date = DateFormatUtils.format(calendar, "yyyy-MM-dd");
+            String trade_time = DateFormatUtils.format(calendar, "HH:mm:ss");
+            order.put("trade_date", trade_date);
+            order.put("trade_time", trade_time);
+            if (!date_contains.contains(trade_date)) {
+                String re_date = trade_date.replaceAll("-", "");
+                TradeLogQuery date_query = new TradeLogQuery();
+                date_query.setDatefrom(re_date);
+                date_query.setDateto(re_date);
+                // date_query.setStatus(OrderStatus.ALL);
+                if (params.containsKey("client_ids")) {
+                    date_query.setClient_ids((String[]) params.get("client_ids"));
+                }
+                JSONObject date_params = date_query.toParams(query.getTimezone());
+                date_params.put("client_id", device.getIntValue("client_id"));
+                JSONObject analysis = orderMapper.analysisOrders(date_params);
+                order.put("date_total", analysis);
+                date_contains.add(trade_date);
+            }
+        }
+        return PageListUtils.buildPageListResult(orders);
+    }
+
     @Override
     public JSONObject listOrdersShareCode(JSONObject device, AppQueryBean query) {
         query.setGateway_app("11");
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
index 670682d8f..62075002c 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
@@ -78,6 +78,11 @@ public class RetailAppController {
         return retailAppService.listOrders(device, query);
     }
 
+    @RequestMapping(value = "/orders_new", method = RequestMethod.GET)
+    public JSONObject listOrdersNew(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device, AppQueryBean query) {
+        return retailAppService.listOrdersNew(device, query);
+    }
+
     @RequestMapping(value = "/orders/share_code", method = RequestMethod.GET)
     public JSONObject listOrdersShareCode(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device, AppQueryBean query) {
         return retailAppService.listOrdersShareCode(device, query);
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml
index 305285002..f5f83a564 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="au.com.royalpay.payment.manage.analysis.mappers.BDAnalysisMapper">
     <select id="getBDSaleList" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-        d.bd_name,d.bd_id,sum(if(temp.transaction_type='Credit',temp.clearing_amount*d.proportion,0))
+        d.bd_name,d.bd_id,sum(if(temp.transaction_type='Credit',temp.clearing_amount*d.proportion,-temp.clearing_amount*d.proportion))
         total,
         ifnull(sum(if(temp.refund_id is not null,if(temp.transaction_type='Debit',temp.clearing_amount,-temp.clearing_amount)*d.proportion,0)),0) refund_fee
         FROM
@@ -38,7 +38,7 @@
     </select>
     <select id="getBDSalePartnerList" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-        c.client_id,c.client_moniker,c.short_name,c.approve_time,IFNULL(sum(if(temp.transaction_type='Credit',temp.clearing_amount*d.proportion,0)),0)
+        c.client_id,c.client_moniker,c.short_name,c.approve_time,IFNULL(sum(if(temp.transaction_type='Credit',temp.clearing_amount*d.proportion,-temp.clearing_amount*d.proportion)),0)
         total FROM (SELECT l.client_id,l.clearing_amount,l.transaction_type,l.refund_id,o.create_time FROM
         pmt_transactions l
         INNER JOIN pmt_orders o
@@ -156,7 +156,7 @@
     <select id="getBDSalePartnerReport" resultType="com.alibaba.fastjson.JSONObject">
         SELECT c.industry,c.royalpayindustry,
         count(DISTINCT c.client_id) partner_counts,
-        IFNULL(sum(if(temp.transaction_type='Credit',temp.clearing_amount*d.proportion,0)),0)
+        IFNULL(sum(if(temp.transaction_type='Credit',temp.clearing_amount*d.proportion,-temp.clearing_amount*d.proportion)),0)
         total
         FROM (SELECT l.client_id,l.clearing_amount,l.transaction_type,l.refund_id,o.create_time FROM pmt_transactions l
         INNER JOIN pmt_orders o
diff --git a/src/main/ui/static/dashboard/dashboard.js b/src/main/ui/static/dashboard/dashboard.js
index c49cc3024..dec9f9dc4 100644
--- a/src/main/ui/static/dashboard/dashboard.js
+++ b/src/main/ui/static/dashboard/dashboard.js
@@ -128,6 +128,8 @@ define(['angular', 'uiRouter', 'uiBootstrap', 'angularEcharts'], function (angul
                 $scope.analysis.total_partners = resp.data.total_partners;
                 $scope.analysis.traded_partners = resp.data.traded_partners;
                 $scope.analysis.trade_amount = resp.data.trade_amount;
+                $scope.analysis.trade_count = resp.data.trade_count;
+
                 // $scope.analysis.top_amount_order = resp.data.top_amount_order;
                 // $scope.analysis.trade_count = resp.data.trade_count;
                 // $scope.analysis.total_customers = resp.data.total_customers;
@@ -140,7 +142,7 @@ define(['angular', 'uiRouter', 'uiBootstrap', 'angularEcharts'], function (angul
                 // $scope.analysis.traded_partners = resp.data.traded_partners;
                 // $scope.analysis.trade_amount = resp.data.trade_amount;
                 $scope.analysis.top_amount_order = resp.data.top_amount_order;
-                $scope.analysis.trade_count = resp.data.trade_count;
+                // $scope.analysis.trade_count = resp.data.trade_count;
                 $scope.analysis.total_customers = resp.data.total_customers;
                 $scope.analysis.new_customers = resp.data.total_customers - resp.data.old_customers;
                 $scope.analysis.old_customers = resp.data.old_customers;