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

inspiry设备管理

Browse Source
master
taylor.dang 6 years ago
parent 68ce23af11
commit 3db0c13c7d
3 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File

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

@ -2117,7 +2117,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
if (deviceInfo.getIntValue("client_id") != client.getIntValue("client_id")) { if (deviceInfo.getIntValue("client_id") != client.getIntValue("client_id")) {
throw new NotFoundException("设备不存在"); throw new NotFoundException("设备不存在");
} }
if (StringUtils.equals(InspiryPOSFinder.INSPIRY_DEVICE_TYPE, deviceInfo.getString("dev_type"))) { if (StringUtils.equals(InspiryPOSFinder.INSPIRY_DEVICE_TYPE, deviceInfo.getString("client_type")) && enable) {
JSONObject inspiryDevice = clientDeviceMapper.findDeviceInfoByDeviceNo(deviceInfo.getString("client_dev_id"), InspiryPOSFinder.INSPIRY_DEVICE_TYPE); JSONObject inspiryDevice = clientDeviceMapper.findDeviceInfoByDeviceNo(deviceInfo.getString("client_dev_id"), InspiryPOSFinder.INSPIRY_DEVICE_TYPE);
if (inspiryDevice != null) { if (inspiryDevice != null) {
throw new ServerErrorException("当前设备已被使用"); throw new ServerErrorException("当前设备已被使用");

4
src/main/ui/static/payment/partner/partner-manage.js
Unescape View File

@ -2989,9 +2989,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}]); }]);
app.controller('newDeviceDialogCtrl', ['$scope', '$http', 'clientMoniker', function ($scope, $http,clientMoniker) { app.controller('newDeviceDialogCtrl', ['$scope', '$http', 'clientMoniker', function ($scope, $http,clientMoniker) {
$scope.params = {};
$scope.manager = {};
$scope.save = function (form) { $scope.save = function (form) {
$scope.errmsg = null; $scope.errmsg = null;
if (form.$invalid) { if (form.$invalid) {
@ -3002,6 +2999,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}); });
return; return;
} }
alert($scope.device);
$http.post('/sys/partners/' + clientMoniker + '/add_device', $scope.device).then(function () { $http.post('/sys/partners/' + clientMoniker + '/add_device', $scope.device).then(function () {
$scope.$close(); $scope.$close();
}, function (resp) { }, function (resp) {

79
src/main/ui/static/payment/partner/templates/add_device.html
Unescape View File

@ -2,49 +2,52 @@
<h4>New Manager Device</h4> <h4>New Manager Device</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="row"> <form novalidate name="deviceForm">
<form novalidate name="deviceForm"> <div class="form-group"
<div class="form-group" ng-class="{'has-error':deviceForm.client_dev_id.$invalid && deviceForm.client_dev_id.$dirty}">
ng-class="{'has-error':deviceForm.client_dev_id.$invalid && deviceForm.client_dev_id.$dirty}"> <label class="control-label" for="client_dev_id-input">* Device No</label>
<label class="control-label" for="client_dev_id-input">* 设备编号</label> <input required class="form-control text-lowercase" id="client_dev_id-input" name="client_dev_id"
<input required class="form-control text-lowercase" id="client_dev_id-input" name="client_dev_id" ng-model="device.client_dev_id" maxlength="25">
ng-model="device.client_dev_id" maxlength="50"> <div ng-messages="deviceForm.client_dev_id.$error" ng-if="deviceForm.client_dev_id.$dirty">
<div ng-messages="deviceForm.client_dev_id.$error" ng-if="deviceForm.client_dev_id.$dirty"> <p class="small text-danger" ng-message="required">Device No Cannot Be Empty</p>
<p class="small text-danger" ng-message="required">client_dev_id field is required</p>
</div>
</div> </div>
<div class="form-group" </div>
ng-class="{'has-error':deviceForm.auth_code.$invalid && deviceForm.auth_code.$dirty}"> <div class="form-group"
<label class="control-label" for="auth_code-input">* 设备密钥</label> ng-class="{'has-error':deviceForm.auth_code.$invalid && deviceForm.auth_code.$dirty}">
<input required class="form-control" id="auth_code-input" name="auth_code" <label class="control-label" for="auth_code-input">* Device Key</label>
ng-model="device.auth_code" maxlength="50"> <input required class="form-control" id="auth_code-input" name="auth_code"
<div ng-messages="deviceForm.auth_code.$error" ng-if="deviceForm.auth_code.$dirty"> ng-model="device.auth_code" maxlength="50">
<p class="small text-danger" ng-message="required">设备密钥 field is required</p> <div ng-messages="deviceForm.auth_code.$error" ng-if="deviceForm.auth_code.$dirty">
</div> <p class="small text-danger" ng-message="required">Device Key Cannot Be Empty</p>
</div>
<div class="form-group">
<label class="control-label" for="client_type-input">设备类型</label>
<input class="form-control" id="client_type-input" name="client_type"
ng-model="device.client_type" ng-init="inspiry" readonly>
</div> </div>
</div>
<div class="form-group">
<label class="control-label" for="client_type-input">Device Type</label>
<input class="form-control" id="client_type-input" name="client_type"
ng-init="device.client_type='inspiry'" placeholder="inspiry"
ng-model="device.client_type" readonly>
</div>
<div class="form-group" <div class="form-group"
ng-class="{'has-error':deviceForm.version.$invalid && deviceForm.version.$dirty}"> ng-class="{'has-error':deviceForm.version.$invalid && deviceForm.version.$dirty}">
<label class="control-label" for="version-input">* version</label> <label class="control-label" for="version-input">* version</label>
<input required class="form-control" id="version-input" name="version" <input required class="form-control" id="version-input" name="version"
ng-model="device.version"> ng-model="device.version" maxlength="10">
<div ng-messages="deviceForm.version.$error" ng-if="deviceForm.version.$dirty"> <div ng-messages="deviceForm.version.$error" ng-if="deviceForm.version.$dirty">
<p class="small text-danger" ng-message="required">version field is required</p> <p class="small text-danger" ng-message="required">Version No Cannot Be Empty</p>
</div>
</div> </div>
<div class="form-group"> </div>
<label class="control-label" for="remark-input">Remark</label> <div class="form-group"
<input class="form-control" id="remark-input" name="version" ng-class="{'has-error':deviceForm.remark.$invalid && deviceForm.remark.$dirty}">
ng-model="device.remark"> <label class="control-label" for="remark-input">* Remark</label>
<input required class="form-control" id="remark-input" name="remark"
ng-model="device.remark" maxlength="50">
<div ng-messages="deviceForm.remark.$error" ng-if="deviceForm.remark.$dirty">
<p class="small text-danger" ng-message="required">Remark Cannot Be Empty</p>
</div> </div>
</form> </div>
</div> <div class="alert alert-danger" ng-if="errmsg" ng-bind="errmsg"></div>
</div> </form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<div class="btn-group"> <div class="btn-group">

Write Preview
Loading…
Cancel
Save