Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/third/service/impl/TaThirdPartyMiniappConfigServiceImpl.java

@@ -528,14 +528,7 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
         TaRedPacketMoney taRedPacketMoney = taRedPacketmonetMapper.selectById(taRedPacketHelp.getActivityId());
         //总账户金额
         TaOrgAccount taOrgAccount = taOrgAccountMapper.selectOne(new QueryWrapper<TaOrgAccount>().eq("org_id", orgId).eq("status", CommConstant.STATUS_NORMAL));
-        //金额不足直接返回
-        if (taRedPacketMoney.getBalance() == 0) {
-            return;
-        }
-        //账户余额不足
-        if (taOrgAccount.getRealBalance() == 0) {
-            return;
-        }
+
         //发送红包已达上限
         if (taRedPacketMoney.getPacketSendedNum() + 1 > taRedPacketMoney.getLimitPacketNum()) {
             return;
@@ -544,6 +537,15 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
         int redPackageMoney = getRedPackageMoney(taRedPacketMoney.getMaxPacket(), taRedPacketMoney.getMinPacket());
         redPackageMoney = taOrgAccount.getRealBalance() < redPackageMoney ? taOrgAccount.getRealBalance() : redPackageMoney;
 
+        //金额不足直接返回
+        if (taRedPacketMoney.getBalance()  < redPackageMoney) {
+            return;
+        }
+        //账户余额不足
+        if (taOrgAccount.getRealBalance() < redPackageMoney) {
+            return;
+        }
+
         //获取红包支付相关的配置
         TaRedPacketClient taRedPacketClient = taRedPacketClientMapper.selectById(taRedPacketHelp.getActivityId());
         //获取收红包人的openid