From c63da8fed1401e34633ea5b70140880f7838dd8c Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Wed, 31 Jan 2018 11:55:36 +0800 Subject: [PATCH 1/3] fixbug --- .../core/impls/RetailAppServiceImp.java | 42 +++++++++++-------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index 8bc77c27c..ef3a07c5a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -495,7 +495,7 @@ public class RetailAppServiceImp implements RetailAppService { } catch (Exception e) { logger.error("出错了：" + e.getMessage()); appMessageLogMapper.updateStatus(log.getString("send_id"), 1, e.getMessage()); - throw new ServerErrorException("Send App "+devToken.getString("client_type")+" Failed", e); + throw new ServerErrorException("Send App " + devToken.getString("client_type") + " Failed", e); } }; sendingAppleMsgPool.execute(task); @@ -640,7 +640,7 @@ public class RetailAppServiceImp implements RetailAppService { } catch (Exception e) { logger.error("出错了：" + e.getMessage()); appMessageLogMapper.updateStatus(log.getString("send_id"), 1, e.getMessage()); - throw new ServerErrorException("Send App "+devToken.getString("client_type")+" Failed", e); + throw new ServerErrorException("Send App " + devToken.getString("client_type") + " Failed", e); } } }); @@ -687,7 +687,7 @@ public class RetailAppServiceImp implements RetailAppService { } catch (Exception e) { logger.error("出错了：" + e.getMessage()); appMessageLogMapper.updateStatus(log.getString("send_id"), 1, e.getMessage()); - throw new ServerErrorException("Send App "+devToken.getString("client_type")+" Failed", e); + throw new ServerErrorException("Send App " + devToken.getString("client_type") + " Failed", e); } } } @@ -719,24 +719,21 @@ public class RetailAppServiceImp implements RetailAppService { return; } JSONObject managerMsg = new JSONObject(); - managerMsg.put("title", LocaleSupport.localeMessage("app.message.title.daily_notice")); - managerMsg.put("body", trade_date + ": 总交易额 " - + PlatformEnvironment.getEnv().getForeignCurrency() + total_amount + ", 订单数：" + total_orders + ", 付款人数：" + customers); + managerMsg.put("title", LocaleSupport.localeMessage("app.message.title.daily_notice")); + managerMsg.put("body", trade_date + ": 总交易额 " + PlatformEnvironment.getEnv().getForeignCurrency() + total_amount + ", 订单数：" + total_orders + + ", 付款人数：" + customers); managerMsg.put("type", type); managerMsg.put("data", tradeInfo); managerMsg.put("msgType", "daily_notice"); AppMessage appMessage = new AppManagerMessageBuilder(managerMsg).buildMessage(); sender.sendMessage(appMessage, devToken); - - - log.put("status", 2); appMessageLogMapper.update(log); } catch (Exception e) { logger.error("出错了：" + e.getMessage()); appMessageLogMapper.updateStatus(log.getString("send_id"), 1, e.getMessage()); - throw new ServerErrorException("Send App "+devToken.getString("client_type")+" Failed", e); + throw new ServerErrorException("Send App " + devToken.getString("client_type") + " Failed", e); } } } @@ -845,9 +842,18 @@ public class RetailAppServiceImp implements RetailAppService { res.put("customer_surcharge_rate", client.getBigDecimal("customer_surcharge_rate")); } res.put("max_customer_surcharge_rate", PlatformEnvironment.getEnv().getMaxCustomerSurchargeRate()); - channels.add(getChannel(clientId, now, "Wechat")); - channels.add(getChannel(clientId, now, "Alipay")); - channels.add(getChannel(clientId, now, "Bestpay")); + JSONObject wechat = getChannel(clientId, now, "Wechat"); + if (wechat.containsKey("channel")) { + channels.add(wechat); + } + JSONObject alipay = getChannel(clientId, now, "Alipay"); + if (wechat.containsKey("channel")) { + channels.add(alipay); + } + JSONObject bestpay = getChannel(clientId, now, "Bestpay"); + if (wechat.containsKey("channel")) { + channels.add(bestpay); + } JSONObject jd = getChannel(clientId, now, "jd"); if (jd.containsKey("channel")) { channels.add(jd); @@ -958,15 +964,15 @@ public class RetailAppServiceImp implements RetailAppService { Boolean isUpdate = PlatformEnvironment.getEnv().isAppUpdate(clientType); String updateContent = PlatformEnvironment.getEnv().getAppUpdateContent(clientType); int update_type = 0;// 0:不更新 1：更新 2：强制更新 - String [] versionArr = version.split("\\."); - String [] newVersionArr = newAppVersion.split("\\."); + String[] versionArr = version.split("\\."); + String[] newVersionArr = newAppVersion.split("\\."); for (int i = 0; i < newVersionArr.length; i++) { - if(Integer.valueOf(newVersionArr[i])>Integer.valueOf(versionArr[i])){ + if (Integer.valueOf(newVersionArr[i]) > Integer.valueOf(versionArr[i])) { update_type = 1; if (isUpdate) { update_type = 2; } - i=newVersionArr.length+1; + i = newVersionArr.length + 1; } } JSONObject res = new JSONObject(); @@ -1193,7 +1199,7 @@ public class RetailAppServiceImp implements RetailAppService { } catch (Exception e) { logger.error("出错了：" + e.getMessage()); appMessageLogMapper.updateStatus(log.getString("send_id"), 1, e.getMessage()); - throw new ServerErrorException("Send App "+params.getString("client_type")+" Failed", e); + throw new ServerErrorException("Send App " + params.getString("client_type") + " Failed", e); } } From 143d19247e8c4ba31fd36ade119ad439ad526446 Mon Sep 17 00:00:00 2001 From: Tayl0r <519104047@qq.com> Date: Wed, 31 Jan 2018 17:12:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?Revert=20"[Y]=20=E5=95=86=E6=88=B7=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=80=BC=EF=BC=88?= =?UTF-8?q?6=E4=BD=8D=E6=95=B0=E5=AD=97=E5=AD=97=E6=AF=8D=E7=BB=84?= =?UTF-8?q?=E5=90=88=EF=BC=89=E4=B8=94=E4=B8=8D=E5=8F=AF=E4=BF=AE=E6=94=B9?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e134c27 --- .../manage/mappers/system/ClientMapper.java | 3 --- .../merchants/beans/ClientRegisterInfo.java | 2 +- .../manage/merchants/core/ClientManager.java | 2 -- .../merchants/core/impls/ClientManagerImpl.java | 10 ---------- .../merchants/web/PartnerManageController.java | 4 ---- .../manage/mappers/system/ClientMapper.xml | 3 --- .../ui/static/payment/partner/partner-manage.js | 17 +---------------- .../payment/partner/templates/add_partner.html | 3 ++- .../templates/add_sub_partner_dialog.html | 2 +- 9 files changed, 5 insertions(+), 41 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 e39445f5a..3be51a159 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 @@ -72,7 +72,4 @@ public interface ClientMapper { List listCityClientIds(@Param("city") String city, @Param("date") Date date); List listClientByCleanDays(@Param("clean_days") int clean_days); - - @AutoSql(type = SqlType.SELECT) - int getPartnercode(@Param("codes") String codes); } diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java index 03d5d20f3..be305c8fc 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java @@ -13,7 +13,7 @@ import javax.validation.constraints.Pattern; public class ClientRegisterInfo { @JSONField(name = "client_moniker") @NotEmpty(message = "error.payment.valid.param_missing") - @Pattern(regexp = "^[a-zA-Z0-9]{6}$", message = "Parameter error(partner code):Only letters or numbers are allowed") + @Pattern(regexp = "^[a-zA-Z0-9]{4}$", message = "Parameter error(partner code):Only letters or numbers are allowed") private String clientMoniker; @NotEmpty(message = "error.payment.valid.param_missing") @JSONField(name = "company_name") 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 b3e06c72e..7f29c5718 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 @@ -264,6 +264,4 @@ public interface ClientManager { void validRefundPwd(JSONObject account, String pwd); void setWeekendDelay(int clientId, boolean delay); - - String initMerchantCode(); } 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 504598dc0..a2814d7ee 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 @@ -2084,16 +2084,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid clientMapper.update(clientUpdate); } - @Override - public String initMerchantCode() { - String code = RandomStringUtils.randomAlphanumeric(6).toUpperCase(); - if (clientMapper.getPartnercode(code) > 0) { - return initMerchantCode(); - } - return code; - } - - @Override public void setClientQRCodePaySurCharge(String clientMoniker, boolean paySurcharge) { JSONObject client = getClientInfoByMoniker(clientMoniker); 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 83c9a785c..f9d090a2c 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 @@ -482,8 +482,4 @@ public class PartnerManageController { public void localMerchantPermission(@PathVariable String clientMoniker, @RequestBody JSONObject pass, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { clientManager.switchPermission(manager, clientMoniker, "local_merchant", pass.getBooleanValue("allow")); } - @RequestMapping(value = "/init/merchant_code", method = RequestMethod.GET) - public String initMerchantCode() { - return clientManager.initMerchantCode(); - } } diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml index a1efe9f01..7995aa37b 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml @@ -272,7 +272,4 @@ - \ No newline at end of file diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 92f6e47c2..a4fab9761 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -40,12 +40,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }).state('partners.new', { url: '/new', templateUrl: '/static/payment/partner/templates/add_partner.html', - controller: 'addPartnerCtrl', - resolve: { - merchant_code: ['$http', function ($http) { - return $http.get('/sys/partners/init/merchant_code'); - }] - } + controller: 'addPartnerCtrl' }).state('partners.detail', { url: '/{clientMoniker}/detail', templateUrl: '/static/payment/partner/templates/partner_detail.html', @@ -229,9 +224,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter } $scope.partner.company_phone_c = 61; $scope.partner.contact_phone_c = 61; - $http.get('/sys/partners/init/merchant_code').then(function (response) { - $scope.partner.client_moniker = response.data; - }); function remove(arr, val) { if (angular.isArray(arr)) { @@ -1249,10 +1241,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter controller: 'partnerNewSubPartnerDialogCtrl', size: 'lg', resolve: { - merchant_code: ['$http', function ($http) { - return $http.get('/sys/partners/init/merchant_code'); - }], - clientMoniker: function () { return $scope.partner.client_moniker; } @@ -1546,9 +1534,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter app.controller('partnerNewSubPartnerDialogCtrl', ['$rootScope', '$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', 'clientMoniker', 'industryMap', 'businessStructuresMap', 'stateMap', 'countryMap', function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone, clientMoniker, industryMap, businessStructuresMap, stateMap, countryMap) { - $http.get('/sys/partners/init/merchant_code').then(function (response) { - $scope.partner.client_moniker = response.data; - }); if ($scope.partner_application) { $scope.partner = angular.copy($scope.partner_application); delete $rootScope.partner_application; diff --git a/src/main/ui/static/payment/partner/templates/add_partner.html b/src/main/ui/static/payment/partner/templates/add_partner.html index 5f3c3f649..eaeb79dd6 100644 --- a/src/main/ui/static/payment/partner/templates/add_partner.html +++ b/src/main/ui/static/payment/partner/templates/add_partner.html @@ -27,7 +27,8 @@ ng-model="partner.client_moniker" type="text" name="client_moniker" - id="short-id-input" readonly> + id="short-id-input" required maxlength="4" + ng-pattern="/^[a-zA-Z0-9]+$/">

No further changeable!

diff --git a/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html b/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html index a27e39df7..64d9f7be1 100644 --- a/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html +++ b/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html @@ -20,7 +20,7 @@ + id="short-id-input" required maxlength="4" ng-pattern="/^[a-zA-Z0-9]+$/">

No further changeable!

From 6f390ad15e90a227e9037e2dcad8096277f1c8c2 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Wed, 31 Jan 2018 17:18:08 +0800 Subject: [PATCH 3/3] update --- .../notice/core/impls/NoticePartnerImpl.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticePartnerImpl.java b/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticePartnerImpl.java index 317862d47..27c13e86e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticePartnerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticePartnerImpl.java @@ -1,20 +1,21 @@ package au.com.royalpay.payment.manage.notice.core.impls; -import au.com.royalpay.payment.manage.mappers.notice.NoticePartnerMapper; -import au.com.royalpay.payment.manage.notice.core.NoticePartner; -import au.com.royalpay.payment.tools.utils.PageListUtils; +import java.util.Collections; +import java.util.Date; +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.Order; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; - -import javax.annotation.Resource; +import au.com.royalpay.payment.manage.mappers.notice.NoticePartnerMapper; +import au.com.royalpay.payment.manage.notice.core.NoticePartner; +import au.com.royalpay.payment.tools.utils.PageListUtils; /** * Created by yishuqian on 29/09/2016. @@ -39,6 +40,9 @@ public class NoticePartnerImpl implements NoticePartner { PageList partnerNotices =noticePartnerMapper.listNoticesByClientId(params, new PageBounds(params.getIntValue("page"), params.getIntValue("limit"), Order.formString("status.asc,send_time.desc"))); JSONObject res = PageListUtils.buildPageListResult(partnerNotices); + if(partnerNotices.size()<1){ + res.put("data", Collections.EMPTY_LIST); + } res.put("unReadCounts",counts); return res; }