Merge branch 'develop'

# Conflicts:
#	pom.xml

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.4.30</version>
+    <version>1.4.31</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/management/clearing/core/impl/CleanServiceImpl.java

@@ -851,10 +851,6 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
         }
         List<JSONObject> transactions = transactionMapper.listTransactionsOfClearingOrder(clearClient.getIntValue("clear_detail_id"),
                 new PageBounds(Order.formString("order_id.asc")));
-
-        for (JSONObject transaction : transactions) {
-            transaction.put("rate_value", StringUtils.defaultString(clientIncrementalMapper.findByChannelAndClientId(transaction.getIntValue("client_id"), transaction.getString("source")), "0"));
-        }
         String timezone_client = client.getString("timezone");
         if (timezone_client != null) {
             transactions.parallelStream().forEach(p -> {

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

@@ -48,9 +48,6 @@ public interface ClientIncrementalMapper {
     @AutoSql(type = SqlType.UPDATE)
     void update(JSONObject saveIncrementalService);
 
-    @AutoSql(type = SqlType.SELECT)
-    String findByChannelAndClientId(@Param("client_id") int clientId,@Param("channel") String channel);
-
     @AutoSql(type = SqlType.SELECT)
     List<JSONObject> find(@Param("client_id") int clientId);
 }

src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java

@@ -270,9 +270,6 @@ public class TradeLogServiceImpl implements TradeLogService {
             }});
         }
         PageList<JSONObject> logs = orderMapper.listIncrementalOrders(params, new PageBounds(query.getPage(), query.getLimit(), Order.formString("create_time.desc")));
-        for (JSONObject log : logs) {
-            log.put("rate_value", clientIncrementalMapper.findByChannelAndClientId(log.getIntValue("client_id"), log.getString("source")));
-        }
         JSONObject result = PageListUtils.buildPageListResult(logs);
         JSONObject analysis = orderMapper.analysisOrders(params);
         result.put("analysis", analysis);

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

@@ -292,6 +292,7 @@
         <if test="!gateway">
             <include refid="tradelog_list_keys"/>
         </if>
+        ,ifnull(sci.incremental_rate_value,0) as rate_value
         FROM (
         select oo.order_id,oo.client_id,oo.total_amount,oo.display_amount,
         oo.customer_payment_amount,oo.coupon_payment_amount,oo.currency,
@@ -366,6 +367,7 @@
         ON t.order_id = o.order_id
         AND t.refund_id IS NULL
         AND t.transaction_type = 'Credit'
+        LEFT JOIN sys_client_incremental sci on sci.client_id = o.client_id
         <where>
             <if test="search_text != null">
                 <bind name="name_pattern" value="'%' + search_text + '%'"/>

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

@@ -1154,10 +1154,12 @@
                r.client_refund_id,
                o.order_detail,
                o.dev_id,
-               o.source
+               o.source,
+               ifnull(sci.incremental_rate_value,0) as rate_value
         FROM pmt_transactions t
                  LEFT JOIN pmt_orders o ON o.order_id = t.order_id
                  LEFT JOIN pmt_refunds r ON r.refund_id = t.refund_id
+                 LEFT JOIN sys_client_incremental sci on sci.client_id = t.client_id
         WHERE t.channel != 'Settlement'
           AND t.clearing_order = #{clearing_order}
         ]]>

src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html

@@ -380,8 +380,14 @@
                             <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.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></td>
-                            <td>{{trade.source}}:<span ng-if="trade.incremental_surcharge">{{trade.incremental_surcharge | currency:trade.currency}}</span><span ng-if="!trade.incremental_surcharge">{{0.00 | currency:trade.currency}}</span></td>
+                            <td>
+                                <span ng-if="trade.rate_value">{{trade.source}}:{{(trade.rate_value) | number : 2}}%</span>
+                                <span ng-if="!trade.rate_value">{{trade.source}}:0.00%</span>
+                            </td>
+                            <td>{{trade.source}}:
+                                <span ng-if="trade.incremental_surcharge">{{trade.incremental_surcharge | currency:trade.currency}}</span>
+                                <span ng-if="!trade.incremental_surcharge">{{0.00 | currency:trade.currency}}</span>
+                            </td>
                             <td ng-bind="trade.status|tradeStatus"></td>
                             <td ng-bind="trade.create_time"></td>
                             <td>

src/main/ui/static/menu/templates/main_menu.html

@@ -143,6 +143,16 @@
                     </div>
                     </a>
                 </div>
+                <div ng-if="'tradelog'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="incremental_trade" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/transaction_flow.png"/>
+                            <div class="description-text">
+                                <span class="description-text">增值服务交易流水</span>
+                            </div>
+                        </div>
+                    </a>
+                </div>
                 <div ng-if="('transAnalysis'|withModule) && (currentUser.org_id==null || currentUser.org_id==1)" class="col-sm-2 col-xs-6">
                     <a ui-sref="analysis_transanalysis" ui-sref-opts="{reload:true}">
                     <div class="description-block">

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

@@ -397,8 +397,14 @@
                                 <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.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></td>
-                                <td><span ng-if="trade.incremental_surcharge">{{trade.source}}:{{trade.incremental_surcharge | currency:trade.currency}}</span></td>
+                                <td>
+                                    <span ng-if="trade.rate_value">{{trade.source}}:{{(trade.rate_value) | number : 2}}%</span>
+                                    <span ng-if="!trade.rate_value">{{trade.source}}:0.00%</span>
+                                </td>
+                                <td>
+                                    <span ng-if="trade.incremental_surcharge">{{trade.source}}:{{trade.incremental_surcharge | currency:trade.currency}}</span>
+                                    <span ng-if="!trade.incremental_surcharge">{{0.00 | currency:trade.currency}}</span>
+                                </td>
                                 <td ng-bind="trade.status|tradeStatus"></td>
                                 <td ng-bind="trade.create_time"></td>
                                 <td>

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

@@ -350,8 +350,14 @@
                                  <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.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></td>
-                                 <td>{{trade.source}}:<span ng-if="trade.incremental_surcharge">{{trade.incremental_surcharge | currency:trade.currency}}</span><span ng-if="!trade.incremental_surcharge">{{0.00 | currency:trade.currency}}</span></td>
+                                 <td>
+                                     <span ng-if="trade.rate_value">{{trade.source}}:{{(trade.rate_value) | number : 2}}%</span>
+                                     <span ng-if="!trade.rate_value">{{trade.source}}:0.00%</span>
+                                 </td>
+                                 <td>{{trade.source}}:
+                                     <span ng-if="trade.incremental_surcharge">{{trade.incremental_surcharge | currency:trade.currency}}</span>
+                                     <span ng-if="!trade.incremental_surcharge">{{0.00 | currency:trade.currency}}</span>
+                                 </td>
                                  <td ng-bind="trade.status|tradeStatus"></td>
                                  <td ng-bind="trade.create_time"></td>
                                  <td>