Merge branch 'develop'

pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.1.23</version>
+    <version>1.1.24</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/OrgAnalysisServiceImp.java

@@ -64,6 +64,7 @@ public class OrgAnalysisServiceImp implements OrgAnalysisService {
                         }
                     }
                     if (!flag) {
+                        todayOrgTransactionItem.put("amount",todayOrgTransactionItem.getString("clearing_amount"));
                         newOrgTransaction.add(todayOrgTransactionItem);
                     }
                 }

src/main/resources/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.xml

@@ -42,7 +42,7 @@
         SUM(pay_amount) AS total,
         SUM(refund_amount) AS refund_fee
         FROM statistics_bd_sales
-        WHERE isOrg = 1
+        WHERE isOrg = 1 AND org_id!=1
             <if test="org_id != null">
                 AND org_id = #{org_id}
             </if>
@@ -59,8 +59,8 @@
                 AND org_id in
                 <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach>
             </if>
-        GROUP BY bd_id
+        GROUP BY org_id
-        ORDER BY total DESC
+        ORDER BY clearing_amount DESC
     </select>
 
     <select id="findByBDIdAndLogDate" resultType="com.alibaba.fastjson.JSONObject">