update

src/main/java/au/com/royalpay/payment/manage/risk/core/impl/RiskMerchantServiceImpl.java

@@ -53,11 +53,6 @@ public class RiskMerchantServiceImpl implements RiskMerchantService {
         detail.put("auditor_id", account.getString("manager_id"));
         detail.put("create_time", new Date());
         riskMerchantDetailLogMapper.save(detail);
-        record.put("status", 2);
-        JSONObject recordUpdate = new JSONObject();
-        recordUpdate.put("record_id", record.getString("record_id"));
-        recordUpdate.put("status", 2);
-        riskMerchantRecordMapper.update(recordUpdate);
     }
 
     @Override
@@ -140,6 +135,7 @@ public class RiskMerchantServiceImpl implements RiskMerchantService {
     }
 
     @Override
+    @Transactional
     public void dealRiskRecordDirectly(JSONObject account, String record_id) {
         JSONObject record = riskMerchantRecordMapper.findById(record_id);
         if (record == null) {
@@ -157,9 +153,9 @@ public class RiskMerchantServiceImpl implements RiskMerchantService {
         detail.put("create_time", new Date());
         riskMerchantDetailLogMapper.save(detail);
         JSONObject recordUpdate = new JSONObject();
-        recordUpdate.put("record_id",record_id);
+        recordUpdate.put("id",record_id);
         recordUpdate.put("status", 1);
-        riskMerchantRecordMapper.update(record);
+        riskMerchantRecordMapper.update(recordUpdate);
     }
 
     @Override

src/main/ui/static/risk/risk.js

@@ -148,8 +148,6 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
             })
         };
         $scope.listDetail(1);
-
-
         $scope.addRemark = function () {
             $uibModal.open({
                                templateUrl: '/static/risk/templates/risk_remark.html',
@@ -158,6 +156,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
                                        return record.id;
                                    }}
                            }).result.then(function () {
+                $scope.listDetail(1);
                 commonDialog.alert({
                                        title: 'Success',
                                        type: 'success'
@@ -176,6 +175,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
                                            type: 'Success'
                                        });
                     $scope.listDetail(1);
+                    $scope.record.status=1;
                 }).then(function (resp) {
                     commonDialog.alert({
                                            title: 'Error',

src/main/ui/static/risk/templates/risk_detail.html

@@ -21,8 +21,10 @@
         </ul>
         <div class="box box-default">
             <div class="box-header">Risk Details</div>
-            <div><button type="button" class="btn btn-danger" ng-click="addRemark()">Add Remark</button></div>
+            <div class="box-header" ng-if="record.status==0" style="text-align: right;">
-            <div><button type="button" class="btn btn-danger" ng-click="dealDirectly()">Close record</button></div>
+                <button type="button" class="btn btn-info"  ng-click="addRemark()">Add Remark</button>
+                <button type="button" class="btn btn-info"  ng-click="dealDirectly()">Close record</button>
+            </div>
             <div class="box-body table-responsive">
                 <table class="table table-hover">
                     <thead>

src/main/ui/static/risk/templates/risk_edit.html

@@ -1,5 +1,5 @@
 <section class="content-header">
-    <h1>Phone Top Up</h1>
+    <h1>Add Remark</h1>
 </section>
 
 <div class="content">