diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index 30558b12f..410c93a4e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -2784,6 +2784,13 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid client.put("account_name", account.getString("account_name")); String start_date = DateFormatUtils.format(new Date(), "dd/MM/yyyy"); client.put("start_date", start_date); + JSONObject clientLegal = sysClientLegalPersonMapper.findRepresentativeInfo(client.getIntValue("client_id")); + if (clientLegal != null) { + client.put("legal_person", clientLegal.getString("representative_person")); + client.put("legal_job_title", clientLegal.getString("job_title")); + client.put("legal_phone", clientLegal.getString("phone")); + client.put("legal_email", clientLegal.getString("email")); + } PdfUtils pdu = new PdfUtils(); pdu.setTemplatePdfPath(aggregateAgreetemplatePdfPath); pdu.setPdfTemplate(client); @@ -3370,11 +3377,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid logger.error("上传合规文件失败", e); throw new BadRequestException("合同制作出现问题:" + e.getMessage()); } - // boolean clientSource = client.getIntValue("source") == 4 ? true : false; - // if (filesInfo.getAuthStatus() == 1 && clientSource) { - // client.put("approve_result", 3); - // clientMapper.update(client); - // } return fileResult; } diff --git a/src/main/java/au/com/royalpay/payment/manage/support/cms/core/AppStyleService.java b/src/main/java/au/com/royalpay/payment/manage/support/cms/core/AppStyleService.java index 3b83a79f5..c42dab906 100644 --- a/src/main/java/au/com/royalpay/payment/manage/support/cms/core/AppStyleService.java +++ b/src/main/java/au/com/royalpay/payment/manage/support/cms/core/AppStyleService.java @@ -12,4 +12,6 @@ public interface AppStyleService { void addAppStyle(String style_id, JSONObject appStyleGroup); void updateAppStyleByStyleId(String style_id, String originStyleId, JSONObject appStyleGroup); + + void updateAppStyleStatus(String style_id, boolean is_valid); } diff --git a/src/main/java/au/com/royalpay/payment/manage/support/cms/core/Impl/AppStyleServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/support/cms/core/Impl/AppStyleServiceImpl.java index e189061a9..9434262eb 100644 --- a/src/main/java/au/com/royalpay/payment/manage/support/cms/core/Impl/AppStyleServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/support/cms/core/Impl/AppStyleServiceImpl.java @@ -44,4 +44,9 @@ public class AppStyleServiceImpl implements AppStyleService { public void updateAppStyleByStyleId(String style_id, String originStyleId, JSONObject appStyleGroup) { royalPayCMSSupport.updateAppStyleByStyleId(style_id,originStyleId,appStyleGroup); } + + @Override + public void updateAppStyleStatus(String style_id, boolean is_valid) { +// royalPayCMSSupport.updateAppStyleStatus(style_id, is_valid); + } } diff --git a/src/main/java/au/com/royalpay/payment/manage/support/cms/web/AppStyleController.java b/src/main/java/au/com/royalpay/payment/manage/support/cms/web/AppStyleController.java index 2ea0a87e0..b88aaa489 100644 --- a/src/main/java/au/com/royalpay/payment/manage/support/cms/web/AppStyleController.java +++ b/src/main/java/au/com/royalpay/payment/manage/support/cms/web/AppStyleController.java @@ -39,4 +39,9 @@ public class AppStyleController { public void updateAppStyleByStyleId(@PathVariable String style_id,@RequestParam String originStyleId, @RequestBody JSONObject appStyleGroup) { appStyleService.updateAppStyleByStyleId(style_id, originStyleId, appStyleGroup); } + + @RequestMapping(value = "/style_group/{style_id}/{is_valid}", method = RequestMethod.PUT) + public void updateAppStyleStatus(@PathVariable String style_id,@PathVariable Boolean is_valid) { + appStyleService.updateAppStyleStatus(style_id, is_valid); + } } diff --git a/src/main/ui/static/cms/cms.js b/src/main/ui/static/cms/cms.js index 6d6f80671..693ca0581 100644 --- a/src/main/ui/static/cms/cms.js +++ b/src/main/ui/static/cms/cms.js @@ -288,7 +288,7 @@ define(['angular', 'uiRouter', 'static/commons/angular-ueditor'], function (angu $scope.article = article.data; }]); - app.controller('cmsAppStyleListCtrl', ['$scope', '$http', '$uibModal', function ($scope, $http, $uibModal) { + app.controller('cmsAppStyleListCtrl', ['$scope', '$http', '$uibModal', 'commonDialog', function ($scope, $http, $uibModal, commonDialog) { $scope.pagination = {}; $scope.appStyleGroupList = function (page) { var params = $scope.queryParams || {}; @@ -298,6 +298,13 @@ define(['angular', 'uiRouter', 'static/commons/angular-ueditor'], function (angu $scope.pagination = resp.data.pagination; }) }; + $scope.updateStyleIdStatus = function (style_id, is_valid) { + $http.put('/app/cms/app_style/style_group/' + style_id + "/" + is_valid).then(function (resp) { + commonDialog.alert({type: 'success', title: 'success', content: "切换状态成功!"}) + }, function (resp) { + commonDialog.alert({type: 'error', title: 'Error', content: resp.data.message}) + }) + }; $scope.appStyleGroupList(1); }]); diff --git a/src/main/ui/static/cms/templates/app_style.html b/src/main/ui/static/cms/templates/app_style.html index 613b0f19d..2cb2ff48d 100644 --- a/src/main/ui/static/cms/templates/app_style.html +++ b/src/main/ui/static/cms/templates/app_style.html @@ -33,7 +33,10 @@