|
@@ -530,7 +530,7 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
|
530
|
530
|
TaOrgAccount taOrgAccount = taOrgAccountMapper.selectOne(new QueryWrapper<TaOrgAccount>().eq("org_id", orgId).eq("status", CommConstant.STATUS_NORMAL));
|
531
|
531
|
|
532
|
532
|
//发送红包已达上限
|
533
|
|
- if (taRedPacketMoney.getPacketSendedNum() + 1 > taRedPacketMoney.getLimitPacketNum()) {
|
|
533
|
+ if (taRedPacketMoney.getLimitPacketNum() != -1 && taRedPacketMoney.getPacketSendedNum() + 1 > taRedPacketMoney.getLimitPacketNum()) {
|
534
|
534
|
return;
|
535
|
535
|
}
|
536
|
536
|
//获取红包的随机数
|
|
@@ -542,7 +542,7 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
|
542
|
542
|
return;
|
543
|
543
|
}
|
544
|
544
|
//账户余额不足
|
545
|
|
- if (taOrgAccount.getRealBalance() < redPackageMoney) {
|
|
545
|
+ if (taOrgAccount.getAvailableBalance() < redPackageMoney) {
|
546
|
546
|
return;
|
547
|
547
|
}
|
548
|
548
|
|
|
@@ -595,6 +595,7 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
|
595
|
595
|
//先扣钱
|
596
|
596
|
TaOrgAccount taOrgAccount = taOrgAccountMapper.selectOne(new QueryWrapper<TaOrgAccount>().eq("org_id", orgId).eq("status", CommConstant.STATUS_NORMAL));
|
597
|
597
|
taOrgAccount.setRealBalance(taOrgAccount.getRealBalance() - wxPaySendRedpackResult.getTotalAmount());
|
|
598
|
+ taOrgAccount.setAvailableBalance(taOrgAccount.getAvailableBalance() - wxPaySendRedpackResult.getTotalAmount());
|
598
|
599
|
taOrgAccount.setPurchaseAmount(taOrgAccount.getPurchaseAmount() + wxPaySendRedpackResult.getTotalAmount());
|
599
|
600
|
taOrgAccountMapper.updateById(taOrgAccount);
|
600
|
601
|
TaRedPacketMoney taRedPacketMoney = taRedPacketmonetMapper.selectById(taRedPacketHelp.getActivityId());
|