Merge branch 'master' into dev

biz-ghs/custom/classes/CustomRechargeClass.php

@@ -220,7 +220,9 @@ class CustomRechargeClass extends BaseClass
         if (self::isRechargeRefunded($customRecharge)) {
             util::fail('该充值已退款');
         }
-
+        if(!empty($customRecharge->clearId)){
+            util::fail('有结挂账单，此单不能退款');
+        }
         $amount = bcadd((string)($customRecharge->amount ?? '0'), '0', 2);
         if (bccomp($amount, '0', 2) <= 0) {
             util::fail('充值金额有误');
@@ -441,4 +443,4 @@ class CustomRechargeClass extends BaseClass
         }
     }
 
-}
+}