Merge branch 'develop'

pom.xml

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

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

@@ -125,11 +125,23 @@ public class DailyReportImp implements DailyReport {
                     kpi.put("compare_value",Math.abs(compare.doubleValue()));
                 }
             }
-            kpi.put("kpi_percent", p.getBigDecimal("month_amount").divide(kpi_amount,4,BigDecimal.ROUND_HALF_DOWN).multiply(BigDecimal.valueOf(100)).toString().substring(0,5)+"%");
+            kpi.put("kpi_percent", p.getBigDecimal("month_amount").divide(kpi_amount, 4, BigDecimal.ROUND_HALF_DOWN).multiply(BigDecimal.valueOf(100)).toString().substring(0, 5) + "%");
-            for(JSONObject clientAmount :clientsAmount ){
+            for (JSONObject clientAmount : clientsAmount) {
-                if(clientAmount.getString("bd_group").equals(kpi.getString("bd_group"))){
+                if (clientAmount.getString("bd_group").equals(kpi.getString("bd_group"))) {
-                    kpi.put("clients_month",clientAmount.getBigDecimal("clients_month"));
+                    //  sys_clients中查询出此bd创建并属于此bd的商户，并且时间是昨天和本月
-                    kpi.put("clients_yesterday",clientAmount.getBigDecimal("clients_yesterday"));
+                    JSONObject countByBd = clientMapper.findCountByBd(clientAmount.getString("bd_group"), DateUtils.truncate(dt, Calendar.DATE), DateUtils.truncate(DateUtils.addDays(dt, -1), Calendar.DATE), DateUtils.truncate(dt, Calendar.MONTH));
+                    if (countByBd.getInteger("month_count") == null){
+                        kpi.put("clients_month", 0);
+                    }else {
+                        kpi.put("clients_month", countByBd.getInteger("month_count"));
+                    }
+                    if (countByBd.getInteger("yesterday_count") == null){
+                        kpi.put("clients_yesterday", 0);
+                    }else {
+                        kpi.put("clients_yesterday", countByBd.getInteger("yesterday_count"));
+                    }
+//                    kpi.put("clients_month", clientAmount.getBigDecimal("clients_month"));
+//                    kpi.put("clients_yesterday", clientAmount.getBigDecimal("clients_yesterday"));
                 }
             }
             total_kpi_amount = total_kpi_amount.add(kpi_amount);

src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java

@@ -126,4 +126,6 @@ public interface ClientMapper {
     List<JSONObject> clientPayTypeInfoByClientIdRange(@Param("begin") int begin, @Param("end") int end);
 
     int getPartnercode(@Param("codes") String codes);
+
+    JSONObject findCountByBd(@Param("bd_group") String bd_group, @Param("today") Date today, @Param("yesterday") Date yesterday, @Param("month") Date month);
 }

src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml

@@ -662,4 +662,32 @@
           AND cb_bankpay_url IS NULL
 
     </select>
+
+    <select id="findCountByBd" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+        *
+        FROM
+        (
+        SELECT
+        count( * ) yesterday_count
+        FROM
+        sys_clients
+        WHERE
+        creator = #{bd_group}
+        AND create_time &gt;= #{yesterday}
+        AND create_time &lt; #{today}
+        AND is_valid = 1
+        ) a,
+        (
+        SELECT
+        count( * ) month_count
+        FROM
+        sys_clients
+        WHERE
+        creator = #{bd_group}
+        AND create_time &gt;= #{month}
+        AND create_time &lt; #{today}
+        AND is_valid = 1
+        ) b
+    </select>
 </mapper>

src/main/ui/static/css/common.css

@@ -125,10 +125,13 @@
     transition: opacity 0.5s ease-in, margin-top 0.5s ease-in;
 }
 
-[ui-view].ng-enter {
+/*
+    这里是渐进样式，safari12.1之后出现bug，删除
+*/
+/*[ui-view].ng-enter {
     margin-top: 10px;
     opacity: 0.5;
-}
+}*/
 
 [ui-view], [ui-view].ng-enter.ng-enter-active {
     margin-top: 0;
@@ -870,4 +873,4 @@
 
 .menu-group .is-hide {
     display: none;
-}
+}

src/test/java/au/com/royalpay/payment/manage/support/abafile/SettleRemarkTemplateDescriberTest.java

@@ -1,6 +1,8 @@
 package au.com.royalpay.payment.manage.support.abafile;
 
 import com.alibaba.fastjson.JSONObject;
+import org.joda.time.DateTime;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.Date;
@@ -16,8 +18,17 @@ public class SettleRemarkTemplateDescriberTest {
     public void compile() {
         JSONObject settle = new JSONObject();
         settle.put("client_moniker", "PINE");
-        SettleRemarkTemplateDescriber describer = new SettleRemarkTemplateDescriber("RoyalPay{date(MMdd)}{moniker}", settle, new Date());
+        SettleRemarkTemplateDescriber describer = new SettleRemarkTemplateDescriber("RoyalPay{date(MMdd)}{moniker}", settle, DateTime.parse("2019-07-18").toDate());
         String result = describer.compile();
-        System.out.println(result);
+        Assert.assertEquals("RoyalPay0718PINE", result);
+    }
+
+    @Test
+    public void compile2() {
+        JSONObject settle = new JSONObject();
+        settle.put("client_moniker", "AUPO");
+        SettleRemarkTemplateDescriber describer = new SettleRemarkTemplateDescriber("Pay By App {date(ddMMyy)}", settle, DateTime.parse("2019-07-18").toDate());
+        String res = describer.compile();
+        Assert.assertEquals("Pay By App 180719", res);
     }
 }