Commit 85087095 authored by renjie's avatar renjie

Merge branch 'dev-zrj' into 'staging'

店铺bug

See merge request !79
parents 8b3b5f3d cf54679b
...@@ -365,9 +365,10 @@ public class PaymentServiceImpl implements PaymentService { ...@@ -365,9 +365,10 @@ public class PaymentServiceImpl implements PaymentService {
public String alipayPutPayOrder(String username, int amount, String by) { public String alipayPutPayOrder(String username, int amount, String by) {
Account byName = accountService.findByName(username); Account byName = accountService.findByName(username);
if (byName == null || byName.getPermission() < 8) if (byName == null )
throw new ClientRequestException(AccountErrorCode.NAMENOTEXIST, "account does not exist: " + username); throw new ClientRequestException(AccountErrorCode.NAMENOTEXIST, "account does not exist: " + username);
if (byName.getPermission() < 8)
throw new ClientRequestException(AccountErrorCode.NOPERMISSION, "account does not have permission: " + username);
boolean isVpsClient = true; boolean isVpsClient = true;
UserPayment internalOrder = new UserPayment(); UserPayment internalOrder = new UserPayment();
...@@ -418,8 +419,10 @@ public class PaymentServiceImpl implements PaymentService { ...@@ -418,8 +419,10 @@ public class PaymentServiceImpl implements PaymentService {
public UserPaymentDto wxPutPayOrder(String username, int amount) { public UserPaymentDto wxPutPayOrder(String username, int amount) {
Account byName = accountService.findByName(username); Account byName = accountService.findByName(username);
if (byName == null || byName.getPermission() < 8) if (byName == null)
throw new ClientRequestException(AccountErrorCode.NAMENOTEXIST, "account does not exist: " + username); throw new ClientRequestException(AccountErrorCode.NAMENOTEXIST, "account does not exist: " + username);
if (byName.getPermission() < 8)
throw new ClientRequestException(AccountErrorCode.NOPERMISSION, "account does not have permission: " + username);
boolean isVpsClient = true; boolean isVpsClient = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment