Merge branch 'master' into dev

app/admin/controller/notify/RechargeController.php

@@ -139,7 +139,7 @@ class RechargeController
             $memberAccount->member_account_income = $income;
             $memberAccount->member_account_surplus = $memberAccount->member_account_surplus + $payAmount;
             $memberAccount->save();
-            if (!empty($goodsAttributeJson) && $addedNbr > 0){
+            if (!empty($goodsAttributeJson)){
                 // 根据最新的数据，更新用户等级
                 RechargeService::disposeRole($payDetail->join_pay_member_id, $payDetail->pay_amount);