Merge remote-tracking branch 'origin/develop' into develop

pom.xml

@@ -5,11 +5,11 @@
     <parent>
         <groupId>au.com.royalpay.payment</groupId>
         <artifactId>payment-parent</artifactId>
-        <version>2.3.2</version>
+        <version>2.3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.4.1</version>
+    <version>2.4.2-SNAPSHOT</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -6164,7 +6164,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         JSONObject result = null;
         JSONObject expireInfo = clientContractService.getClientContractExpire(client_id, channel);
         JSONObject account = clientAccountMapper.findById(account_id);
-        if (PartnerRole.getRole(account.getIntValue("role")) == PartnerRole.CASHIER) {
+        if (account == null || PartnerRole.getRole(account.getIntValue("role")) == PartnerRole.CASHIER) {
             return result;
         } else {
             if (expireInfo.getBooleanValue("alert")) {

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

@@ -51,10 +51,10 @@ define(['angular', 'uiRouter'], function () {
                 const dateStr = date.replace(/\//g, '')
                 if (filterItem.length) {
                     if (filterItem[0].isOld) {
-            $state.go('order_valid.report', { date: dateStr })
+                        $state.go('order_valid.report', {date: dateStr})
                     } else {
                         sessionStorage.setItem('warningLevel', filterItem[0].warning_level)
-            $state.go('order_valid.report_new', { date: dateStr })
+                        $state.go('order_valid.report_new', {date: dateStr})
                     }
                 } else {
                     commonDialog
@@ -93,7 +93,7 @@ define(['angular', 'uiRouter'], function () {
         function ($scope, $http, $filter, $stateParams, commonDialog) {
             $scope.date = $stateParams.date
             $scope.startValid = function (forceRebuild) {
-        $scope.report = { loading: true }
+                $scope.report = {loading: true}
                 $http
                     .get('/sys/financial/order_validations/' + $scope.date, {
                         params: {
@@ -122,7 +122,7 @@ define(['angular', 'uiRouter'], function () {
                             })
                         },
                         function (resp) {
-              commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
+                            commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
                             $scope.report = null
                         }
                     )
@@ -140,10 +140,10 @@ define(['angular', 'uiRouter'], function () {
                     })
                     .then(
                         function (resp) {
-              commonDialog.alert({ title: 'Success', content: '修复完毕', type: 'success' })
+                            commonDialog.alert({title: 'Success', content: '修复完毕', type: 'success'})
                         },
                         function (resp) {
-              commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
+                            commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
                         }
                     )
             }
@@ -153,10 +153,11 @@ define(['angular', 'uiRouter'], function () {
     app.controller('orderValidationNewCtrl', [
         '$scope',
         '$http',
+        '$sce',
         '$stateParams',
         'commonDialog',
         '$uibModal',
-    function ($scope, $http, $stateParams, commonDialog, $uibModal) {
+        function ($scope, $http, $sce, $stateParams, commonDialog, $uibModal) {
             // 清除sessionStorage
             $scope.$on('$destroy', function () {
                 sessionStorage.clear()
@@ -217,7 +218,7 @@ define(['angular', 'uiRouter'], function () {
                             console.log($scope.channelList)
                         },
                         function (resp) {
-              commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
+                            commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
                         }
                     )
             }
@@ -228,12 +229,15 @@ define(['angular', 'uiRouter'], function () {
             }
             // 是否清除缓存
             $scope.clear = function (channelName, flag) {
-        $http.post('/sys/financial/redo_channel_validation/' + $stateParams.date, { channel: channelName, cache: flag }).then(
+                $http.post('/sys/financial/redo_channel_validation/' + $stateParams.date, {
+                    channel: channelName,
+                    cache: flag
+                }).then(
                     function () {
                         $scope.startValid()
                     },
                     function (resp) {
-            commonDialog.alert({ title: 'failed', content: resp.data.message, type: 'error' })
+                        commonDialog.alert({title: 'failed', content: resp.data.message, type: 'error'})
                     }
                 )
             }
@@ -253,12 +257,19 @@ define(['angular', 'uiRouter'], function () {
                                     $scope.message = merchantInfo.resolve_msg
                                 }
                                 $scope.confirm = function () {
-                  $http.post('/sys/financial/mark/resolve/message', { log_id: merchantInfo.log_id, message: $scope.message }).then(
+                                    $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' })
+                                            commonDialog.alert({
+                                                title: 'failed',
+                                                content: resp.data.message,
+                                                type: 'error'
+                                            })
                                         }
                                     )
                                 }
@@ -304,10 +315,10 @@ define(['angular', 'uiRouter'], function () {
             $scope.checkStatus = function (transactionId) {
                 $http.get('/sys/financial/get/transaction/status/' + transactionId, {}).then(
                     function (resp) {
-            commonDialog.alert({ title: resp.data.statusInfo, content: '', type: 'success' })
+                        commonDialog.alert({title: resp.data.statusInfo, content: '', type: 'success'})
                     },
                     function (resp) {
-            commonDialog.alert({ title: 'failed', content: resp.data.message, type: 'error' })
+                        commonDialog.alert({title: 'failed', content: resp.data.message, type: 'error'})
                     }
                 )
             }