Merge remote-tracking branch 'origin/dev' into test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/HttpClientUtils.java

@@ -285,7 +285,7 @@ public class HttpClientUtils {
 
     private static void sslClient(HttpClient httpClient) {
         try {
-            SSLContext ctx = SSLContext.getInstance("TLS");
+            SSLContext ctx = SSLContext.getInstance("TLSv1.2");
             X509TrustManager tm = new X509TrustManager() {
                 public X509Certificate[] getAcceptedIssuers() {
                     return null;

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml

@@ -415,15 +415,15 @@
                 SELECT
                     kotr.performance_id AS 'performance_id',
                     kotr.ticket_id,
-                    sum(kot.number) AS 'total_sale_general' ,
-                    sum(kot.price_actual) AS 'total_sale_price',
+                    sum(kot.number)-sum(ifnull(kot.refund_number,0)) AS 'total_sale_general' ,
+                    sum(kot.price_actual)-sum(ifnull(kot.price_refund,0)) AS 'total_sale_price',
                     sum(case when kotr.is_member = 1 then kot.number else 0 end) total_member_number
                 FROM
                     kylin_order_ticket_relations kotr
                         inner join kylin_order_tickets AS kot on kotr.order_id = kot.order_tickets_id
                         inner JOIN kylin_order_ticket_status AS kots ON kots.order_id = kot.order_tickets_id
                 WHERE 1>0 and kotr.performance_id = ${performancesId}
-                  and kots.`status` in(1,3) and kot.coupon_type ='no'
+                  and kots.`status` in(1,3,6) and kot.coupon_type ='no'
                 group by kotr.performance_id,kotr.ticket_id
             ) AS ot ON (ot.performance_id = kp.performances_id and ot.ticket_id = kp.ticket_id)
                 left JOIN(
@@ -448,7 +448,7 @@
                         inner join kylin_order_tickets AS kot on kotr.order_id = kot.order_tickets_id
                         inner JOIN kylin_order_ticket_status AS kots ON kots.order_id = kot.order_tickets_id
                 WHERE 1>0 and kotr.performance_id = ${performancesId}
-                  and kots.`status` = 4 and kot.coupon_type ='no'
+                  and kots.`status` in(4,6) and kot.coupon_type ='no'
                 group by kotr.performance_id,kotr.ticket_id
             ) AS rd ON (rd.performance_id = kp.performances_id and rd.ticket_id = kp.ticket_id)
                 left join kylin_tickets kt on kt.tickets_id = kp.ticket_id