|
|
@@ -160,8 +160,8 @@ class RechargeClass extends BaseClass
|
|
|
$rechargeWeal = $shop->rechargeWeal ?? 0;
|
|
|
$addGiveAmount = 0;
|
|
|
|
|
|
- //如果客户有欠款和结账充值，不参与优惠
|
|
|
- if ($custom->balance >= 0 && $recharge->settleId == 0) {
|
|
|
+ //如果客户有欠款、结账充值、售后付款充值，不参与优惠
|
|
|
+ if ($custom->balance >= 0 && $recharge->settleId == 0 && $recharge->shOrderId == 0) {
|
|
|
if ($rechargeWeal == 1 || $rechargeWeal == 2) {
|
|
|
$weal = MemberWealClass::getAllByCondition(['shopId' => $shopId], null, '*');
|
|
|
if (!empty($weal)) {
|
