傅行帆 преди 5 години
родител
ревизия
7834e9392e
променени са 1 файла, в които са добавени 3 реда и са изтрити 2 реда
  1. 3
    2
      src/main/java/com/huiju/estateagents/third/service/impl/TaThirdPartyMiniappConfigServiceImpl.java

+ 3
- 2
src/main/java/com/huiju/estateagents/third/service/impl/TaThirdPartyMiniappConfigServiceImpl.java Целия файл

530
         TaOrgAccount taOrgAccount = taOrgAccountMapper.selectOne(new QueryWrapper<TaOrgAccount>().eq("org_id", orgId).eq("status", CommConstant.STATUS_NORMAL));
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
             return;
534
             return;
535
         }
535
         }
536
         //获取红包的随机数
536
         //获取红包的随机数
542
             return;
542
             return;
543
         }
543
         }
544
         //账户余额不足
544
         //账户余额不足
545
-        if (taOrgAccount.getRealBalance() < redPackageMoney) {
545
+        if (taOrgAccount.getAvailableBalance() < redPackageMoney) {
546
             return;
546
             return;
547
         }
547
         }
548
 
548
 
595
         //先扣钱
595
         //先扣钱
596
         TaOrgAccount taOrgAccount = taOrgAccountMapper.selectOne(new QueryWrapper<TaOrgAccount>().eq("org_id", orgId).eq("status", CommConstant.STATUS_NORMAL));
596
         TaOrgAccount taOrgAccount = taOrgAccountMapper.selectOne(new QueryWrapper<TaOrgAccount>().eq("org_id", orgId).eq("status", CommConstant.STATUS_NORMAL));
597
         taOrgAccount.setRealBalance(taOrgAccount.getRealBalance() - wxPaySendRedpackResult.getTotalAmount());
597
         taOrgAccount.setRealBalance(taOrgAccount.getRealBalance() - wxPaySendRedpackResult.getTotalAmount());
598
+        taOrgAccount.setAvailableBalance(taOrgAccount.getAvailableBalance() - wxPaySendRedpackResult.getTotalAmount());
598
         taOrgAccount.setPurchaseAmount(taOrgAccount.getPurchaseAmount() + wxPaySendRedpackResult.getTotalAmount());
599
         taOrgAccount.setPurchaseAmount(taOrgAccount.getPurchaseAmount() + wxPaySendRedpackResult.getTotalAmount());
599
         taOrgAccountMapper.updateById(taOrgAccount);
600
         taOrgAccountMapper.updateById(taOrgAccount);
600
         TaRedPacketMoney taRedPacketMoney = taRedPacketmonetMapper.selectById(taRedPacketHelp.getActivityId());
601
         TaRedPacketMoney taRedPacketMoney = taRedPacketmonetMapper.selectById(taRedPacketHelp.getActivityId());