🐞fix(royalpay): 修复交易对账handle为带入已有信息

src/main/ui/static/payment/validation/order-validation.js

@@ -219,17 +219,37 @@ define(['angular', 'uiRouter'], function () {
         )
       }
       // 处理
-      $scope.handle = function (logId) {
+      $scope.handle = function (merchant) {
         sessionStorage.setItem('channel', JSON.stringify($scope.channelList))
         $uibModal
           .open({
             templateUrl: '/static/payment/validation/templates/handle_desc.html',
-            controller: 'handleCtrl',
+            controller: [
+              '$scope',
+              '$http',
+              'commonDialog',
+              'merchantInfo',
+              function ($scope, $http, commonDialog, merchantInfo) {
+                if (merchantInfo.resolve_msg) {
+                  $scope.message = merchantInfo.resolve_msg
+                }
+                $scope.confirm = function () {
+                  $http.post('/sys/financial/mark/resolve/message', { log_id: merchantInfo.log_id, message: $scope.message }).then(
+                    function () {
+                      $scope.$close()
+                    },
+                    function (resp) {
+                      commonDialog.alert({ title: 'failed', content: resp.data.message, type: 'error' })
+                    }
+                  )
+                }
+              },
+            ],
             resolve: {
-              logId: [
+              merchantInfo: [
                 '$stateParams',
                 function () {
-                  return logId
+                  return merchant
                 },
               ],
             },

src/main/ui/static/payment/validation/templates/handle_desc.html

@@ -17,9 +17,9 @@
 </div>
 <div class="modal-footer">
     <div class="btn-group">
-        <button class="btn btn-success" type="button" ng-click="confirm()">{{'in_common_use.submit'|translate}}</button>
+        <button class="btn btn-success" type="button" ng-click="confirm()">OK</button>
     </div>
     <div class="btn-group">
-        <button class="btn btn-danger" type="button" ng-click="$dismiss()">{{'in_common_use.cancel'|translate}}</button>
+        <button class="btn btn-danger" type="button" ng-click="$dismiss()">Cancel</button>
     </div>
 </div>

src/main/ui/static/payment/validation/templates/valid_new.html

@@ -50,7 +50,7 @@
                             <small>(Transaction Time Range :
                                 {{merchant.valid_from_time}} ~ {{merchant.valid_to_time}})</small>
                         </h4>
-                        <a role="button" ng-click="handle(merchant.log_id)">handle</a>
+                        <a role="button" ng-click="handle(merchant)">handle</a>
                     </div>
                     <div class="table-download">
                         <table class="table table-bordered table-hover">