Merge branch 'hotfix20180104customerpoints' into develop

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

@@ -401,7 +401,12 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
                     throw new ParamInvalidException("date", "error.payment.valid.invalid_date_format");
                 }
                 params.put("channel",record.getString("channel"));
-                int newCustomers = transactionAnalysisMapper.countNewCustomers(params);
+                int newCustomers = 0;
+                if (client.getIntValue("client_id")==0){
+                    newCustomers = transactionAnalysisMapper.getCountCustomers(params.getDate("end")) - transactionAnalysisMapper.getCountCustomers(params.getDate("begin"));
+                }else {
+                    newCustomers = transactionAnalysisMapper.countNewCustomers(params);
+                }
                 int oldCustomers = transactionAnalysisMapper.countOldCustomers(params);
                 record.put("new_customers",newCustomers);
                 record.put("old_customers",oldCustomers);

src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java

@@ -69,4 +69,6 @@ public interface TransactionAnalysisMapper {
 
     BigDecimal getOneOrder(@Param("order_id") String order_id);
 
+    int getCountCustomers(@Param("date") Date date);
+
 }

src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml

@@ -389,6 +389,12 @@
         ]]>
     </select>
 
+    <select id="getCountCustomers" resultType="java.lang.Integer">
+        <![CDATA[
+        SELECT count(DISTINCT o.customer_id) FROM pmt_orders o where
+        o.create_time < #{date} and o.status>=5
+         ]]>
+    </select>
 
     <select id="getTradePartnersInTypes" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[

src/main/ui/static/templates/payment/success.js

@@ -29,6 +29,7 @@ $(function () {
         }
 
     });
+
     function loadEncourage() {
         $.ajax({
             url: '/act/encourage_money/orders/' + window.order_id,
@@ -44,9 +45,11 @@ $(function () {
             }
         })
     }
+
     loadEncourage();
 
     function loadPoints() {
+        if ([0, 1, 2, 11].indexOf(window.order_gateway) >= 0) {
             $.ajax({
                 url: '/customers/points/' + window.order_id + '/check',
                 method: 'GET',
@@ -61,6 +64,8 @@ $(function () {
                 }
             });
         }
+    }
+
     loadPoints();
 
     $('.encourage-dialog .close-circle').click(function () {