From d215a7fa8af86de7b63e381ff09951a66a066401 Mon Sep 17 00:00:00 2001 From: kira <164851225@qq.com> Date: Tue, 18 Sep 2018 16:10:42 +0800 Subject: [PATCH 1/9] fix --- .../static/payment/partner/templates/partner_bankaccounts.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html index 49679a2f3..f1e00b160 100644 --- a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html +++ b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html @@ -171,6 +171,7 @@
  • Bestpay
  • JDpay
  • HFpay
    • +
  • Rpay+
    • From 8667dbee0ef602fc70b79114638a0268c00841f3 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 18 Sep 2018 16:20:59 +0800 Subject: [PATCH 2/9] fix rpay clearing html --- .../partner/templates/partner_new_rate.html | 24 +++++++++++++++++++ .../templates/sub_merchant_id_apply.html | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/main/ui/static/payment/partner/templates/partner_new_rate.html b/src/main/ui/static/payment/partner/templates/partner_new_rate.html index 02f7c1875..ee45ccec7 100644 --- a/src/main/ui/static/payment/partner/templates/partner_new_rate.html +++ b/src/main/ui/static/payment/partner/templates/partner_new_rate.html @@ -160,6 +160,30 @@ +
    + +
    +
    + +
    %
    +
    +
    +
    + No more than 2.2% +
    +
    + No less than 0.6% +
    +
    + Required Field +
    +
    + +
    +
    +
    diff --git a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html index 40fc8c119..95381f8dd 100644 --- a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html +++ b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html @@ -95,7 +95,7 @@
    -

    +

    Rpay+ Sub Merchant Id : {{partner.rpay_enterprise_id}}

    From 6929fa2ebbbe32acecd7615a25fe64c01b34dbc6 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 18 Sep 2018 16:34:03 +0800 Subject: [PATCH 3/9] fix rpay clearing html --- .../static/payment/partner/templates/sub_merchant_id_apply.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html index 95381f8dd..66ebd8403 100644 --- a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html +++ b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html @@ -95,7 +95,7 @@
    -

    +

    Rpay+ Sub Merchant Id : {{partner.rpay_enterprise_id}}

    From 6a368f7b658d4fc9fac2ebdb5d54e4e3d1bc3cf4 Mon Sep 17 00:00:00 2001 From: kira <164851225@qq.com> Date: Tue, 18 Sep 2018 17:48:59 +0800 Subject: [PATCH 4/9] add customerId --- src/main/ui/static/templates/rpay/v1/payment.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/ui/static/templates/rpay/v1/payment.js b/src/main/ui/static/templates/rpay/v1/payment.js index 74397a9c1..dfc96b138 100644 --- a/src/main/ui/static/templates/rpay/v1/payment.js +++ b/src/main/ui/static/templates/rpay/v1/payment.js @@ -255,6 +255,7 @@ $(function () { } data.coupons = dataCache.coupons; data.qrcodeVersion = window.qrcodeVersion; + data.customerId = window.customerId; dataCache.remark = ''; @@ -424,7 +425,7 @@ $(function () { function getUserId(){ window.RPayPlus.send("getUserId", null, function(data){ - window.Rpay.userInfo = data; + window.customerId = data; }); } From de55f0b10c85d3debc883d280f201900a12b6d72 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 18 Sep 2018 18:31:43 +0800 Subject: [PATCH 5/9] fix merchant --- .../payment/manage/mappers/system/ClientMapper.java | 3 +++ .../mappers/system/SysRpayMerchantApplyMapper.java | 2 +- .../payment/manage/merchants/core/ClientManager.java | 2 +- .../manage/merchants/core/impls/ClientManagerImpl.java | 9 ++++----- .../manage/merchants/web/PartnerManageController.java | 4 ++-- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java index da095448a..f42b842c5 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java @@ -99,4 +99,7 @@ public interface ClientMapper { List findByhfPayUrlNotNull(); + @AutoSql(type = SqlType.UPDATE) + void updateRpayEnterpriseId(@Param("client_id") int clientId, @Param("rpay_enterprise_id") String rpayEnterpriseId); + } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java index 9aa1cdbff..06664dc14 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java @@ -21,6 +21,6 @@ public interface SysRpayMerchantApplyMapper { void insertRpayMerchantApply(JSONObject params); @AutoSql(type = SqlType.SELECT) - List selectByShortName(@Param("client_id") int client_id,@Param("merchant_shortname") String shortName); + List listByShortName(@Param("client_id") int client_id,@Param("merchant_shortname") String shortName); } diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java index 7808c732b..3e03074d9 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java @@ -336,7 +336,7 @@ public interface ClientManager { void sendHfEmailNotice(JSONObject order); - String subRpayMerchantApplication(String clientMoniker, JSONObject manager); + void subRpayMerchantApplication(String clientMoniker, JSONObject manager); void updateAllPartnerPassword(String clientMoniker, List emails); } 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 9636537e8..01d570fc5 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 @@ -3598,16 +3598,16 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid } @Override - public String subRpayMerchantApplication(String clientMoniker, JSONObject manager) { + public void subRpayMerchantApplication(String clientMoniker, JSONObject manager) { JSONObject client = getClientInfoByMoniker(clientMoniker); if (client == null) { throw new InvalidShortIdException(); } checkOrgPermission(manager, client); - List selectByshortName = sysRpayMerchantApplyMapper.selectByShortName(client.getIntValue("client_id"),client.getString("short_name")); + List listByshortName = sysRpayMerchantApplyMapper.listByShortName(client.getIntValue("client_id"),client.getString("short_name")); - if (selectByshortName.size()>0) { + if (listByshortName.size()>0) { throw new BadRequestException("请修改【" + clientMoniker + "】的Company shortName信息（请避免和Rpay+商务号列表内的Company Short Name重复）"); } @@ -3625,11 +3625,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid merchantApply.put("business_category", client.getString("royalpayindustry")); merchantApply.put("merchant_shortname", client.getString("short_name")); sysRpayMerchantApplyMapper.insertRpayMerchantApply(merchantApply); + clientMapper.updateRpayEnterpriseId(client.getIntValue("client_id"), rpayMerchantInfo.getString("merchantId")); }else { throw new BadRequestException("请求失败"); } - - return null; } @Override diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java index 768b1ebcb..6d186abbe 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java @@ -582,8 +582,8 @@ public class PartnerManageController { clientManager.switchPermission(manager, clientMoniker, "enable_hf_email_notice", pass.getBooleanValue("allow")); } @ManagerMapping(value = "/{clientMoniker}/registRpaySubMerchantId", method = RequestMethod.POST, role = {ManagerRole.OPERATOR, ManagerRole.ADMIN}) - public String subRpayMerchantApplication(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { - return clientManager.subRpayMerchantApplication(clientMoniker, manager); + public void subRpayMerchantApplication(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { + clientManager.subRpayMerchantApplication(clientMoniker, manager); } } From 0b70366c7ef1964cef3e90cf28ce67fcf175d17d Mon Sep 17 00:00:00 2001 From: yangkai Date: Tue, 18 Sep 2018 18:44:46 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0app=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../support/cms/core/AppStyleService.java | 15 ++ .../cms/core/Impl/AppStyleServiceImpl.java | 101 ++++++++ .../support/cms/web/AppStyleController.java | 42 ++++ src/main/ui/static/cms/cms.js | 233 +++++++++++++++++- .../ui/static/cms/templates/app_style.html | 65 +++++ .../cms/templates/app_style_config.html | 67 +++++ .../cms/templates/app_style_preview.html | 46 ++++ .../ui/static/cms/templates/cms_root.html | 3 + .../risk/templates/attention_merchants.html | 2 +- 9 files changed, 572 insertions(+), 2 deletions(-) create mode 100644 src/main/java/au/com/royalpay/payment/manage/support/cms/core/AppStyleService.java create mode 100644 src/main/java/au/com/royalpay/payment/manage/support/cms/core/Impl/AppStyleServiceImpl.java create mode 100644 src/main/java/au/com/royalpay/payment/manage/support/cms/web/AppStyleController.java create mode 100644 src/main/ui/static/cms/templates/app_style.html create mode 100644 src/main/ui/static/cms/templates/app_style_config.html create mode 100644 src/main/ui/static/cms/templates/app_style_preview.html 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 new file mode 100644 index 000000000..3b83a79f5 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/support/cms/core/AppStyleService.java @@ -0,0 +1,15 @@ +package au.com.royalpay.payment.manage.support.cms.core; + +import com.alibaba.fastjson.JSONObject; + +public interface AppStyleService { + JSONObject listAppStyleGroup(int page, int limit); + + JSONObject getAppStyleByStyleId(String style_id); + + void switchGroupByStyleId(String style_id); + + void addAppStyle(String style_id, JSONObject appStyleGroup); + + void updateAppStyleByStyleId(String style_id, String originStyleId, JSONObject appStyleGroup); +} 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 new file mode 100644 index 000000000..60aa24644 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/support/cms/core/Impl/AppStyleServiceImpl.java @@ -0,0 +1,101 @@ +package au.com.royalpay.payment.manage.support.cms.core.Impl; + +import au.com.royalpay.payment.manage.support.cms.core.AppStyleService; +import au.com.royalpay.payment.tools.exceptions.ServerErrorException; +import cn.yixblog.platform.http.HttpRequestGenerator; +import cn.yixblog.platform.http.HttpRequestResult; +import com.alibaba.fastjson.JSONObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestMethod; + +import java.io.IOException; +import java.net.URISyntaxException; + +@Service +public class AppStyleServiceImpl implements AppStyleService { + + @Value("http://127.0.0.1:9533") + private String cmsHost; + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Override + public JSONObject listAppStyleGroup(int page, int limit) { + String url = concatUrl("/app/style_group"); + HttpRequestGenerator gen = new HttpRequestGenerator(url, RequestMethod.GET).addQueryString("page", page + "").addQueryString("limit", limit + ""); + try { + HttpRequestResult res = gen.execute(); + if (res.isSuccess()) { + return res.getResponseContentJSONObj(); + } + } catch (URISyntaxException | IOException e) { + logger.error(e.getMessage(), e); + } + throw new ServerErrorException("Failed to request CMS"); + } + + @Override + public JSONObject getAppStyleByStyleId(String style_id) { + String url = concatUrl("/app/style_group/" + style_id); + HttpRequestGenerator gen = new HttpRequestGenerator(url, RequestMethod.GET); + try { + HttpRequestResult res = gen.execute(); + if (res.isSuccess()) { + return res.getResponseContentJSONObj(); + } + } catch (URISyntaxException | IOException e) { + logger.error(e.getMessage(), e); + } + throw new ServerErrorException("Failed to request CMS"); + } + + @Override + public void switchGroupByStyleId(String style_id) { + String url = concatUrl("/app/style_group/" + style_id); + try { + HttpRequestResult res = new HttpRequestGenerator(url, RequestMethod.PUT).execute(); + if (res.isSuccess()) { + return; + } + } catch (URISyntaxException e) { + logger.error(e.getMessage(), e); + } + throw new ServerErrorException("Failed to request CMS"); + } + + @Override + public void addAppStyle(String style_id, JSONObject appStyleGroup) { + String url = concatUrl("/app/style_group"); + try { + HttpRequestResult gen = new HttpRequestGenerator(url, RequestMethod.POST).addQueryString("style_id", style_id).setJSONEntity(appStyleGroup).execute(); + if (gen.isSuccess()) { + return; + } + } catch (URISyntaxException e) { + logger.error(e.getMessage(), e); + } + throw new ServerErrorException("Failed to request CMS"); + } + + @Override + public void updateAppStyleByStyleId(String style_id, String originStyleId, JSONObject appStyleGroup) { + String url = concatUrl("/app/style_group/" + style_id + "/style"); + try { + HttpRequestResult gen = new HttpRequestGenerator(url, RequestMethod.PUT).addQueryString("originStyleId", originStyleId).setJSONEntity(appStyleGroup).execute(); + if (gen.isSuccess()) { + return; + } + } catch (URISyntaxException e) { + logger.error(e.getMessage(), e); + } + throw new ServerErrorException("Failed to request CMS"); + } + + private String concatUrl(String uri) { + String host = cmsHost.endsWith("/") ? cmsHost.substring(0, cmsHost.length() - 1) : cmsHost; + uri = uri.startsWith("/") ? uri.substring(1) : uri; + return host + "/" + uri; + } +} 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 new file mode 100644 index 000000000..2ea0a87e0 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/support/cms/web/AppStyleController.java @@ -0,0 +1,42 @@ +package au.com.royalpay.payment.manage.support.cms.web; + + +import au.com.royalpay.payment.manage.permission.manager.ManagerMapping; +import au.com.royalpay.payment.manage.support.cms.core.AppStyleService; +import au.com.royalpay.payment.tools.permission.enums.ManagerRole; +import com.alibaba.fastjson.JSONObject; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@RestController +@ManagerMapping(value = "/app/cms/app_style", role = {ManagerRole.SITE_MANAGER}) +public class AppStyleController { + @Resource + private AppStyleService appStyleService; + + @RequestMapping(value = "/style_group", method = RequestMethod.GET) + public JSONObject listAppStyleGroup(@RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "10") int limit) { + return appStyleService.listAppStyleGroup(page, limit); + } + + @RequestMapping(value = "/style_group/{style_id}", method = RequestMethod.GET) + public JSONObject getAppStyleByStyleId(@PathVariable String style_id) { + return appStyleService.getAppStyleByStyleId(style_id); + } + + @RequestMapping(value = "/style_group/{style_id}", method = RequestMethod.PUT) + public void switchGroupByStyleId(@PathVariable String style_id) { + appStyleService.switchGroupByStyleId(style_id); + } + + @RequestMapping(value = "/style_group", method = RequestMethod.POST) + public void addOneGroupAppStyle(@RequestParam String style_id, @RequestBody JSONObject appStyleGroup) { + appStyleService.addAppStyle(style_id, appStyleGroup); + } + + @RequestMapping(value = "/style_group/{style_id}/style", method = RequestMethod.PUT) + public void updateAppStyleByStyleId(@PathVariable String style_id,@RequestParam String originStyleId, @RequestBody JSONObject appStyleGroup) { + appStyleService.updateAppStyleByStyleId(style_id, originStyleId, appStyleGroup); + } +} diff --git a/src/main/ui/static/cms/cms.js b/src/main/ui/static/cms/cms.js index 3ab730034..156cda39b 100644 --- a/src/main/ui/static/cms/cms.js +++ b/src/main/ui/static/cms/cms.js @@ -4,6 +4,67 @@ define(['angular', 'uiRouter', 'static/commons/angular-ueditor'], function (angular) { 'use strict'; var app = angular.module('cms', ['ui.router','ng.uditor']); + var style = [ + { + "style_key":"settlement", + "style_value":"" + }, + { + "style_key":"home_select", + "style_value":"" + }, + { + "style_key":"activity_gray", + "style_value":"" + }, + { + "style_key":"activity_select", + "style_value":"" + }, + { + "style_key":"mess_gray", + "style_value":"" + }, + { + "style_key":"mess_select", + "style_value":"" + }, + { + "style_key":"my_select", + "style_value":"" + }, + { + "style_key":"transaction", + "style_value":"" + }, + { + "style_key":"statistics", + "style_value":"" + }, + { + "style_key":"marketing_account", + "style_value":"" + }, + { + "style_key":"usergroup", + "style_value":"" + }, + { + "style_key":"coupon", + "style_value":"" + }, + { + "style_key":"rpbill", + "style_value":"" + }, + { + "style_key":"invoice_assistant", + "style_value":"" + }, + { + "style_key":"home_gray", + "style_value":"" + }]; app.config(['$stateProvider', function ($stateProvider) { $stateProvider.state('cms', { url: '/cms', @@ -38,7 +99,41 @@ define(['angular', 'uiRouter', 'static/commons/angular-ueditor'], function (angu }).state('cms.phone_top_up', { url: '/phone_top_up', controller: 'CmsPhonetopupCtrl', - templateUrl: '/static/cms/templates/phone_top_up.html' + templateUrl: '/static/cms/templates/phone_top_up.html', + }).state('cms.app_style',{ + url: '/app_style', + controller: 'cmsAppStyleListCtrl', + templateUrl: '/static/cms/templates/app_style.html', + }).state('cms.app_style.app_style_preview',{ + url: '/{style_id}/preview', + controller: 'cmsAppStylePreviewCtrl', + templateUrl: '/static/cms/templates/app_style_preview.html', + resolve: { + appStyles: ['$http', '$stateParams', function ($http, $stateParams) { + return $http.get('/app/cms/app_style/style_group/' + $stateParams.style_id); + }] + } + }).state('cms.app_style.app_style_save',{ + url: '/save', + controller: 'cmsAppStyleSaveCtrl', + templateUrl: '/static/cms/templates/app_style_config.html', + resolve: { + style: function () { + return angular.copy(style); + } + } + }).state('cms.app_style.app_style_edit',{ + url: '/{style_id}/edit', + controller: 'cmsAppStyleEditCtrl', + templateUrl: '/static/cms/templates/app_style_config.html', + resolve: { + appStyles: ['$http', '$stateParams', function ($http, $stateParams) { + return $http.get('/app/cms/app_style/style_group/' + $stateParams.style_id); + }], + style: function () { + return angular.copy(style); + } + } }) }]); app.controller('cmsRootCtrl', ['$scope', function ($scope) { @@ -140,6 +235,142 @@ define(['angular', 'uiRouter', 'static/commons/angular-ueditor'], function (angu $scope.article = article.data; }]); + app.controller('cmsAppStyleListCtrl', ['$scope', '$http', '$uibModal', function ($scope, $http, $uibModal) { + $scope.pagination = {}; + $scope.appStyleGroupList = function (page) { + var params = $scope.queryParams || {}; + params.page = page || $scope.pagination.page || 1; + $http.get('/app/cms/app_style/style_group', {params: params}).then(function (resp) { + $scope.appStyleGroups = resp.data.data; + $scope.pagination = resp.data.pagination; + }) + }; + $scope.appStyleGroupList(1); + }]); + + app.controller('cmsAppStylePreviewCtrl', ['$scope', '$http', 'appStyles', function ($scope, $http, appStyles) { + $scope.appStyles = appStyles.data.data; + }]); + + app.controller('cmsAppStyleEditCtrl', ['$scope', '$http', '$state','commonDialog', 'appStyles', 'style', function ($scope, $http, $state, commonDialog, appStyles, style) { + $scope.ctrl = {sending: false, flag: false, originStyleId: angular.copy(appStyles.data.data[0].style_id)}; + $scope.entity={}; + $scope.style = angular.copy(style); + $scope.entity.appStyle = angular.copy(appStyles.data.data); + $scope.params = {style_id: angular.copy(appStyles.data.data[0].style_id)}; + $scope.appStyleList = function() { + var styleKeyStr = ""; + $scope.entity.appStyle.forEach(function(item){ + styleKeyStr += item.style_key + ","; + }); + $scope.style.forEach(function(item){ + if (styleKeyStr.indexOf(item.style_key) < 0) { + $scope.entity.appStyle.push({"style_key": item.style_key,"style_value":""}); + } + }) + }; + $scope.appStyleList(); + $scope.addSpecOption = function() { + $scope.entity.appStyle.push({}); + + }; + + // 删除规格选项 + $scope.delSpecOption = function(index) { + $scope.entity.appStyle.splice(index, 1); + + }; + + $scope.saveOneGroupAppStyle = function() { + if ($scope.params.style_id == "" || $scope.params.style_id == null) { + $scope.errmsg = "title不能为空"; + return; + } + var item = ""; + for (var i=0;i<$scope.entity.appStyle.length;i++) { + item = $scope.entity.appStyle[i]; + if (item.style_value == "" || item.style_value == null) { + $scope.errmsg = "value不能为空"; + return; + } + if (item.style_value.substr(0,4).toLowerCase() != "http" && + item.style_value.substr(0,5).toLowerCase() != "https") { + $scope.errmsg = "value必须以http或者https开头"; + return; + } + + } + $scope.ctrl.sending = true; + $http.put('/app/cms/app_style/style_group/' + $scope.params.style_id + '/style?originStyleId=' + $scope.ctrl.originStyleId, $scope.entity).then(function(){ + $scope.ctrl.sending = false; + $state.go('cms.app_style.app_style_preview',{style_id: $scope.params.style_id}); + }, function (resp) { + $scope.ctrl.sending = false; + $scope.errmsg = resp.data.message; + }) + } + $scope.toggleAppStyleIsValid = function(styleId) { + if (styleId) { + commonDialog.confirm({ + title: '确认操作', + content: '当前操作将发布title为：' +styleId +"的app图标，是否确认？" + }).then(function () { + $http.put('/app/cms/app_style/style_group/' + styleId).then(function () { + $state.reload(); + }) + }) + } + } + }]); + app.controller('cmsAppStyleSaveCtrl', ['$scope', '$http', '$state', 'style', function ($scope, $http, $state, style) { + $scope.ctrl = {sending: false, flag: true}; + $scope.entity={}; + $scope.entity.appStyle = angular.copy(style); + $scope.params = {style_id: ""}; + $scope.addSpecOption = function() { + $scope.entity.appStyle.push({}); + + }; + + // 删除规格选项 + $scope.delSpecOption = function(index) { + console.log(index) + $scope.entity.appStyle.splice(index, 1); + + }; + + $scope.saveOneGroupAppStyle = function() { + if ($scope.params.style_id == "" || $scope.params.style_id == null) { + $scope.errmsg = "title不能为空"; + return; + } + var item = ""; + for (var i=0;i<$scope.entity.appStyle.length;i++) { + item = $scope.entity.appStyle[i]; + if (item.style_value == "" || item.style_value == null) { + $scope.errmsg = "value不能为空"; + return; + } + if (item.style_value.substr(0,4).toLowerCase() != "http" && + item.style_value.substr(0,5).toLowerCase() != "https") { + $scope.errmsg = "value必须以http或者https开头"; + return; + } + + } + $scope.ctrl.sending = true; + $http.post('/app/cms/app_style/style_group?style_id=' + $scope.params.style_id, $scope.entity).then(function(){ + $scope.ctrl.sending = false; + $state.go('cms.app_style.app_style_preview', {style_id: $scope.params.style_id}); + }, function (resp) { + $scope.ctrl.sending = false; + $scope.errmsg = resp.data.message; + }) + }; + $scope.checkStyleValue = function () { + + } + }]); app.filter('topUpType', function () { return function (status) { switch (status + '') { diff --git a/src/main/ui/static/cms/templates/app_style.html b/src/main/ui/static/cms/templates/app_style.html new file mode 100644 index 000000000..613b0f19d --- /dev/null +++ b/src/main/ui/static/cms/templates/app_style.html @@ -0,0 +1,65 @@ +
    +
    +

    APP_STYLE

    +
      +
    1. 网站管理
      2. +
    2. app图标
      3. +
    +
    +
    +
    +
    +
    +
    + + New App Style + +
    +
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + +
    TitlePublishedOperation
    + + + + + + +
    +
    +
    + +
    +
    Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}
    +
    +
    + + + \ No newline at end of file diff --git a/src/main/ui/static/cms/templates/app_style_config.html b/src/main/ui/static/cms/templates/app_style_config.html new file mode 100644 index 000000000..694d761c9 --- /dev/null +++ b/src/main/ui/static/cms/templates/app_style_config.html @@ -0,0 +1,67 @@ +
    +
    +

    APP_STYLE

    +
      +
    1. 网站管理
      2. +
    2. app图标
      3. +
    3. +
    +
    +
    +
    +
    +
    +
    +
    + + +
    + +
    +
    + + + + + +
    +
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + +
    KeyValue
    + + + +
    +
    +
    + + Cancel +
    +
    +
    +
    \ No newline at end of file diff --git a/src/main/ui/static/cms/templates/app_style_preview.html b/src/main/ui/static/cms/templates/app_style_preview.html new file mode 100644 index 000000000..7ab0f756a --- /dev/null +++ b/src/main/ui/static/cms/templates/app_style_preview.html @@ -0,0 +1,46 @@ +
    +
    +

    APP_STYLE

    +
      +
    1. 网站管理
      2. +
    2. app图标
      3. +
    3. app图标详情
      4. +
    +
    +
    +
    +
    +
    +
    + + New App Style + + + Edit App Style + +
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + +
    TitleStyle_KeyStyle_Value
    +
    +
    +
    +
    \ No newline at end of file diff --git a/src/main/ui/static/cms/templates/cms_root.html b/src/main/ui/static/cms/templates/cms_root.html index 69e7b8911..0040caa6b 100644 --- a/src/main/ui/static/cms/templates/cms_root.html +++ b/src/main/ui/static/cms/templates/cms_root.html @@ -26,6 +26,9 @@
    App广告页
    +
    + App图标 +
    话费充值
    diff --git a/src/main/ui/static/risk/templates/attention_merchants.html b/src/main/ui/static/risk/templates/attention_merchants.html index b618f4f6b..d3ddfdf66 100644 --- a/src/main/ui/static/risk/templates/attention_merchants.html +++ b/src/main/ui/static/risk/templates/attention_merchants.html @@ -67,7 +67,7 @@ {{client.bank_account_no}} {{client.contact_person}} {{client.contact_phone}} - {{client.last_update_date}} + {{client.creation_date}} {{client.remark}} Date: Tue, 18 Sep 2018 18:48:09 +0800 Subject: [PATCH 7/9] =?UTF-8?q?app=E5=9B=BE=E6=A0=87cmsHost=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/support/cms/core/Impl/AppStyleServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 60aa24644..dee97a580 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 @@ -17,7 +17,7 @@ import java.net.URISyntaxException; @Service public class AppStyleServiceImpl implements AppStyleService { - @Value("http://127.0.0.1:9533") + @Value("${app.cms.host}") private String cmsHost; private Logger logger = LoggerFactory.getLogger(getClass()); From f826867191f879c5692544597daaf44ea281e262 Mon Sep 17 00:00:00 2001 From: yangkai Date: Tue, 18 Sep 2018 20:46:56 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E7=BC=A9=E5=B0=8F=E6=8A=BD=E5=A5=96?= =?UTF-8?q?=E5=A5=96=E5=8A=B1=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/static/templates/payment/success.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/ui/static/templates/payment/success.css b/src/main/ui/static/templates/payment/success.css index ab5abda7a..5dc8ef94b 100644 --- a/src/main/ui/static/templates/payment/success.css +++ b/src/main/ui/static/templates/payment/success.css @@ -351,10 +351,10 @@ } .points-dialog .dialog-content{ margin: auto; - width: 90%; + width: 80%; display: block; position: relative; - margin-top: 130px; + margin-top: 100px; padding-top: 25px; padding-bottom: 19px; border-radius: 5px; @@ -386,8 +386,8 @@ } .points-content .coin{ - width: 100px; - height: 100px; + width: 80px; + height: 80px; position: relative; background: url(/static/images/star.png) no-repeat; background-size: contain; From f3bfd8d0ecd9eedd2a3278a63edd3594e1a77a71 Mon Sep 17 00:00:00 2001 From: yixian Date: Wed, 19 Sep 2018 09:10:09 +0800 Subject: [PATCH 9/9] img --- src/main/ui/static/images/Group@1x.png | Bin 0 -> 6303 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/ui/static/images/Group@1x.png diff --git a/src/main/ui/static/images/Group@1x.png b/src/main/ui/static/images/Group@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..6fd90323f8095463eab3cd49390d9be251a3b117 GIT binary patch literal 6303 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 VH$8{n_woP$002ovPDHLkV1i#-e=7h0 literal 0 HcmV?d00001