| @@ -44,6 +44,6 @@ public class WxPayAccount extends BaseEntity { | |||||
| return notifyUrl + "/subsidyPay"; | return notifyUrl + "/subsidyPay"; | ||||
| } | } | ||||
| public boolean isShare() { return share > 0; } | |||||
| public boolean checkShare() { return share > 0; } | |||||
| } | } | ||||
| @@ -241,7 +241,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { | |||||
| } | } | ||||
| } | } | ||||
| if (payAccount.isShare()) { | |||||
| if (payAccount.checkShare()) { | |||||
| // 9. 分账 | // 9. 分账 | ||||
| try { | try { | ||||
| shareForCardPay(record.getTenantId(), record.getCardId(), record.getOrderId(), record.getId()); | shareForCardPay(record.getTenantId(), record.getCardId(), record.getOrderId(), record.getId()); | ||||
| @@ -169,7 +169,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| return new ResultData(ErrorCode.PAY_ORDER_IS_NOT_PAYMENT); | return new ResultData(ErrorCode.PAY_ORDER_IS_NOT_PAYMENT); | ||||
| } | } | ||||
| WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); | WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); | ||||
| if (payAccount.getShare().intValue() > 0) { | |||||
| if (payAccount.checkShare()) { | |||||
| isShare = EnumPayShare.YES; | isShare = EnumPayShare.YES; | ||||
| } | } | ||||
| @@ -433,7 +433,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| return new ResultData(ErrorCode.PAY_ORDER_IS_NOT_PAYMENT); | return new ResultData(ErrorCode.PAY_ORDER_IS_NOT_PAYMENT); | ||||
| } | } | ||||
| WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); | WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); | ||||
| if (payAccount.getShare().intValue() > 0) { | |||||
| if (payAccount.checkShare()) { | |||||
| isShare = EnumPayShare.YES; | isShare = EnumPayShare.YES; | ||||
| } | } | ||||
| @@ -91,7 +91,7 @@ public class WxSubsidyServiceImpl implements WxSubsidyService { | |||||
| WxAppinfo appInfo = wxAppinfoService.getCAppInfo(user.getTenantId()); | WxAppinfo appInfo = wxAppinfoService.getCAppInfo(user.getTenantId()); | ||||
| // 2. 获取payAccount | // 2. 获取payAccount | ||||
| WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); | WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); | ||||
| if (payAccount.getShare().intValue() > 0) { | |||||
| if (payAccount.checkShare()) { | |||||
| isShare = EnumPayShare.YES; | isShare = EnumPayShare.YES; | ||||
| } | } | ||||
| // 3. 补贴订单 | // 3. 补贴订单 | ||||