fix incremental rate display

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.4.32</version>
+    <version>1.4.33</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>

src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java

@@ -185,7 +185,7 @@ public class AppActServiceImp implements AppActService {
     @Override
     public void sendTESTAnnualBillMessage(JSONObject params) {
         logger.debug("sendAnnualMessage Begin");
-        JSONObject devToken = clientDeviceTokenMapper.findByDevId("cf90a252-1121-4bfd-a201-fb573b44ac11");
+        JSONObject devToken = clientDeviceTokenMapper.getTestTokens();
         Runnable task = () -> {
             String token = devToken.getString("token");
             JSONObject log = saveAppMessageLog(devToken.getString("dev_id"),

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

@@ -28,6 +28,8 @@ public interface ClientDeviceTokenMapper {
 
     List<JSONObject> listAllTokens(JSONObject devToken);
 
+    JSONObject getTestTokens();
+
     @AutoSql(type = SqlType.SELECT)
     List<JSONObject> listAllTokensByClient_id(@Param("client_id") int client_id);
 }

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

@@ -541,7 +541,7 @@
 
     <select id="listIncrementalOrdersByClients" resultType="com.alibaba.fastjson.JSONObject">
         <include refid="tradelog_list_keys"/>
-        ,i.incremental_rate as rate_value
+        ,ifnull(i.incremental_rate,0.00) as rate_value
         FROM pmt_orders o
         INNER JOIN sys_clients p ON p.client_id=o.client_id and p.is_valid=1
         <if test="client_ids!=null">

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

@@ -49,10 +49,21 @@
         group by token
     </select>
 
+    <select id="getTestTokens" resultType="com.alibaba.fastjson.JSONObject">
+        select
+        scdt.*,
+        scd.client_type
+        from
+        sys_clients_devices_token scdt
+        left join sys_clients_devices scd on scdt.dev_id = scd.dev_id
+        where scdt.dev_token_id = 'e6b3cd0c-f728-4ef0-a443-84536ca8b8a2'
+        group by token
+    </select>
+
     <select id="findByDevId" resultType="com.alibaba.fastjson.JSONObject">
         SELECT *
         FROM sys_clients_devices_token
         where dev_id = #{dev_id}
         limit 1
     </select>
-</mapper>
+</mapper>

src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html

@@ -395,7 +395,8 @@
                                        ng-click="showRefundLog(trade.order_id)">(-{{trade.refund_fee}})</a>
                                 </td>
                                 <td ng-bind="trade.display_amount|currency:trade.currency"></td>
-                                <td><span ng-if="trade.surcharge_rate">{{(trade.surcharge_rate * 100 - trade.rate_value)| number : 2}}%</span></td>
+                                <td>{{(((trade.surcharge_rate * 100) > trade.rate_value)?(trade.surcharge_rate * 100-trade.rate_value):trade.surcharge_rate)| number : 2}}%
+                                </td>
                                 <td>{{(trade.total_surcharge-trade.incremental_surcharge) | number : 2 | currency:trade.currency}}</td>
                                 <td>
                                     <span ng-if="trade.rate_value">{{trade.source}}:{{(trade.rate_value) | number : 2}}%</span>

src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html

@@ -348,7 +348,7 @@
                                      <a ng-if="trade.refund_fee" class="text-danger" role="button">(-{{trade.refund_fee}})</a>
                                  </td>
                                  <td ng-bind="trade.display_amount|currency:trade.currency"></td>
-                                 <td>{{(trade.surcharge_rate * 100 - trade.rate_value)| number : 2}}<span ng-if="trade.surcharge_rate">%</span></td>
+                                 <td>{{(((trade.surcharge_rate * 100) > trade.rate_value)?(trade.surcharge_rate * 100-trade.rate_value):trade.surcharge_rate)| number : 2}}%</td>
                                  <td>{{(trade.total_surcharge-trade.incremental_surcharge) | number : 2 | currency:trade.currency}}</td>
                                  <td>
                                      <span ng-if="trade.rate_value">{{trade.source}}:{{(trade.rate_value) | number : 2}}%</span>