ufo / yohoufo-fore · Commits

Go to a project

Authored by Lixiaodi
Commit 5738f45031a955b5bdcf719f27072c78c293999b 1 parent 0f10a9ff

支持再次入驻

Inline Side-by-side
Showing 1 changed file with 3 additions and 6 deletions
... ... @@ -136,7 +136,7 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService {
logger.error("重新入驻首次充值保证金={}，发现入驻状态异常，uid={}，times={}", amount, uid, sw.getJoinTimes());
return;
}
if (sw.getJoinTimes() != null && sw.getJoinTimes() >= RE_JOIN_MAX_TIMES) {
if (sw.getJoinTimes() == null || sw.getJoinTimes() >= RE_JOIN_MAX_TIMES) {
CommonAlarmEventPublisher.publish("重新入驻首次充值保证金失败", "ufo.order.recharge", "超过入最大驻次数:uid=" + uid + ",充值订单号为：" + orderCode+", 充值金额为："+amount);
logger.error("重新入驻首次充值保证金={}，发现已超过最大入驻次数，uid={}，times={}", amount, uid, sw.getJoinTimes());
return;
... ... @@ -258,13 +258,10 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService {
if (sw == null) {
return true;
}
if (sw.getStatus() == null || sw.getStatus() != 0) {
if (sw.getStatus() == null || sw.getStatus() != 0 || sw.getJoinTimes() == null) {
return false;
}
if (sw.getJoinTimes() == null || sw.getJoinTimes() < RE_JOIN_MAX_TIMES) {
return true;
}
return false;
return sw.getJoinTimes() < RE_JOIN_MAX_TIMES;
}
private void sellerDealAfterPay(Integer uid, long orderCode, BigDecimal allMoney) {
... ...