Merge remote-tracking branch 'origin/master'

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

@@ -1252,7 +1252,7 @@
         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
+                 LEFT JOIN sys_client_incremental sci on sci.client_id = t.client_id and sci.channel=o.source and sci.is_valid=1
                  INNER JOIN log_clearing_detail lcd ON t.clearing_order = lcd.clear_detail_id
         WHERE t.channel != 'Settlement'
           AND t.clearing_order = #{clearing_order}

src/main/ui/static/payment/partner/templates/partner_bankaccounts.html

@@ -281,10 +281,7 @@
                             <th>Transaction Fee</th>
                             <th>Active Time</th>
                             <th>Expire Time</th>
-                            <th
-                                    ng-if="bankCtrl.rate_name=='Wechat'">
-                                Clean Days
-                            </th>
+                            <th>Clean Days</th>
                             <th>Update Time</th>
                             <th>Operator</th>
                             <th>Remark</th>
@@ -299,10 +296,7 @@
                             <td ng-bind="'$ '+rate.transaction_fee"></td>
                             <td ng-bind="rate.active_time|date:'yyyy-MM-dd'"></td>
                             <td ng-bind="rate.expiry_time|date:'yyyy-MM-dd'"></td>
-                            <td
-                                    ng-if="rate.rate_name=='Wechat'">
-                                T+{{rate.clean_days}}
-                            </td>
+                            <td>T+{{rate.clean_days}}</td>
                             <td ng-bind="rate.update_time|date:'yyyy-MM-dd'"></td>
                             <td ng-bind="rate.operator_name||'系统生成'"></td>
                             <td ng-bind="rate.remark|limitTo:20" title="{{rate.remark}}"></td>

src/main/ui/static/payment/partner/templates/rate_config_dialog.html

@@ -104,9 +104,7 @@
                                datepicker-options="{minDate:rate.active_time}">
                     </div>
                 </div>
-                <div class="form-group" ng-if="rate.rate_name=='Wechat'
-                || rate.rate_name=='rpaypmt_card'
-                || rate.rate_name=='rpaypmt_dd'">
+                <div class="form-group">
                     <label class="control-label col-sm-4" for="clean_days_input">Clean Days</label>
                     <div class="col-sm-6">
                         <div class="input-group">