From 9bd674275f4a302b571a9dd33726c38da79aa3b7 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Wed, 21 Mar 2018 15:50:08 +0800
Subject: [PATCH] update

---
 .../appclient/web/RetailAppController.java    |  1 -
 .../mappers/system/ClientsContractMapper.java |  2 +
 .../merchants/web/PartnerViewController.java  |  1 +
 .../core/impl/ClientContractServiceImpl.java  |  2 +-
 .../mappers/system/ClientsContractMapper.xml  |  6 ++
 .../static/sys/templates/contract_sign.html   | 58 +++----------------
 6 files changed, 17 insertions(+), 53 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
index 701ba9cdc..63cbccee5 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
@@ -407,7 +407,6 @@ public class RetailAppController {
         }
     }
 
-
     @RequestMapping(value = "/client/manual_settle", method = RequestMethod.PUT)
     public void confirmSourceAgreeFile(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device,@RequestParam boolean manual_settle) {
         retailAppService.changeManualSettle(device,manual_settle);
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.java
index 17c9620d1..873ad7b61 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.java
@@ -27,4 +27,6 @@ public interface ClientsContractMapper {
     @AutoSql(type = SqlType.SELECT)
     List<JSONObject> list();
 
+    List<JSONObject> listWithClientInfo();
+
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java
index 223dc2858..a903936f6 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java
@@ -362,6 +362,7 @@ public class PartnerViewController {
     @PartnerMapping(value = "/manual_settle", method = RequestMethod.PUT, roles = PartnerRole.ADMIN)
     @ResponseBody
     public void manualSettle(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject account, @RequestParam boolean manual_settle) {
+        clientManager.changeManualSettle(account.getIntValue("client_id"),manual_settle,account.getString("account_id"),1,"商户"+(manual_settle?"打开":"关闭")+"手动清算");
     }
 
 
diff --git a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java
index d85e0ecfe..14e259675 100644
--- a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java
@@ -218,6 +218,6 @@ public class ClientContractServiceImpl implements ClientContractService {
 
     @Override
     public List<JSONObject> list() {
-        return clientsContractMapper.list();
+        return clientsContractMapper.listWithClientInfo();
     }
 }
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.xml
index f0b8b14c7..8530d41d2 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.xml
@@ -7,4 +7,10 @@
         order by create_time desc
         limit 1
     </select>
+    <select id="listWithClientInfo" resultType="com.alibaba.fastjson.JSONObject">
+        select c.client_moniker client_moniker,cc.create_time create_time,cc.confirm_time confirm_time,a.display_name display_name from
+        sys_clients_contract cc left join sys_clients c on c.client_id = cc.client_id
+        left join sys_accounts a on a.account_id = cc.sign_account_id
+
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/ui/static/sys/templates/contract_sign.html b/src/main/ui/static/sys/templates/contract_sign.html
index ca4349457..c8f55c464 100644
--- a/src/main/ui/static/sys/templates/contract_sign.html
+++ b/src/main/ui/static/sys/templates/contract_sign.html
@@ -1,70 +1,26 @@
 <div class="modal-header">Contract</div>
 <div class="modal-body">
     <div class="box box-danger">
-        <div class="box-header">费率已过期商户({{warning.no_rate.length}}家)</div>
+        <div class="box-header">商户合同情况</div>
         <div class="box-body table-responsive">
             <table class="table table-bordered table-striped table-hover">
                 <thead>
                 <tr>
                     <th>Client Moniker</th>
-                    <th>Short Name</th>
-                    <th>Channel</th>
-                    <th>BD</th>
-                    <th>Latest Rate</th>
-                    <th>Expire Date</th>
+                    <th>Create Time</th>
+                    <th>Confirm Time</th>
+                    <th>Account Name</th>
                 </tr>
                 </thead>
                 <tbody>
                 <tr ng-repeat="contract in contract_analysis">
-                    <td>
-                        <a ui-sref="partners.detail.rates({clientMoniker:client.client_moniker})" ng-bind="client.client_moniker"></a>
-                    </td>
-                    <td ng-bind="contract.client_id"></td>
+                    <td ng-bind="contract.client_moniker"></td>
                     <td ng-bind="contract.create_time|date:'dd/MMM/yyyy'"></td>
-                    <td ng-bind="contract.has_sign"></td>
-                    <td ng-bind="contract.sign_channel"></td>
-                    <td ng-bind="contract.signatory"></td>
+                    <td ng-bind="contract.confirm_time|date:'dd/MMM/yyyy'"></td>
+                    <td ng-bind="contract.display_name"></td>
                 </tr>
                 </tbody>
             </table>
         </div>
     </div>
-    <div class="box box-warning">
-        <div class="box-header">费率即将过期商户({{warning.rate_warning.length}}家)</div>
-        <div class="box-body table-responsive">
-            <table class="table table-bordered table-striped table-hover">
-                <thead>
-                <tr>
-                    <th>Client Moniker</th>
-                    <th>Short Name</th>
-                    <th>Channel</th>
-                    <th>BD</th>
-                    <th>Rate</th>
-                    <th>Expire Date</th>
-                    <th>Operation</th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr ng-repeat="client in warning.rate_warning">
-                    <td>
-                        <a ui-sref="partners.detail.rates({clientMoniker:client.client_moniker})" ng-bind="client.client_moniker"></a>
-                    </td>
-                    <td ng-bind="client.short_name"></td>
-                    <td ng-bind="client.rate_name"></td>
-                    <td ng-bind="client.bd_user_name"></td>
-                    <td ng-bind="client.rate_value"></td>
-                    <td ng-bind="client.expiry_time|date:'dd/MMM/yyyy'"></td>
-                    <td>
-                        <button class="btn btn-primary" ng-if="client.generatable" type="button" ng-click="generateRate(client)">
-                            <i class="fa fa-cogs"></i> 根据浮动费率生成
-                        </button>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-    </div>
-</div>
-<div class="modal-footer">
-    <button class="btn btn-danger" ng-click="$dismiss()">Close</button>
 </div>
\ No newline at end of file