msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
master
dalong306 3 years ago
parent 4f442a6dbf f485a440d0
commit 0a502cf356
3 changed files with 312 additions and 301 deletions
Show Stats Download Patch File Download Diff File

4
pom.xml
Unescape View File

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

2
src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
Unescape View File

@ -6164,7 +6164,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
JSONObject result = null; JSONObject result = null;
JSONObject expireInfo = clientContractService.getClientContractExpire(client_id, channel); JSONObject expireInfo = clientContractService.getClientContractExpire(client_id, channel);
JSONObject account = clientAccountMapper.findById(account_id); 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; return result;
} else { } else {
if (expireInfo.getBooleanValue("alert")) { if (expireInfo.getBooleanValue("alert")) {

39
src/main/ui/static/payment/validation/order-validation.js
Unescape View File

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

Write Preview
Loading…
Cancel
Save