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] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A4=E6=98=93=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