|
@@ -10,6 +10,7 @@ use app\model\Order;
|
|
|
use app\model\PayDetail;
|
|
|
use support\Db;
|
|
|
use support\exception\BusinessException;
|
|
|
+use support\Log;
|
|
|
use support\Request;
|
|
|
use Webman\Event\Event;
|
|
|
|
|
@@ -93,6 +94,7 @@ class RechargeController
|
|
|
*/
|
|
|
public function disposePaySuccess($payId)
|
|
|
{
|
|
|
+ Log::info("开始充值", ['pay_id' => $payId]);
|
|
|
$payDetail = PayDetail::find($payId);
|
|
|
if (!$payDetail || $payDetail->pay_status != 'SUCCESS') {
|
|
|
throw new BusinessException("支付状态异常");
|
|
@@ -129,7 +131,7 @@ class RechargeController
|
|
|
$added = $memberAccount->member_account_added + $addedAmount;
|
|
|
$income = $memberAccount->member_account_income + $payAmount;
|
|
|
// 保留原数据
|
|
|
- RechargeService::saveOriginData($memberAccount, $payAmount,$addedNbr, $addedAmount);
|
|
|
+ RechargeService::saveOriginData($memberAccount, $payAmount, $addedNbr, $addedAmount);
|
|
|
|
|
|
$memberAccount->member_account_added = $added;
|
|
|
$memberAccount->member_account_income = $income;
|
|
@@ -140,21 +142,7 @@ class RechargeController
|
|
|
RechargeService::disposeRole($payDetail->join_pay_member_id, $payDetail->pay_amount);
|
|
|
|
|
|
// 发券
|
|
|
- RechargeService::disposeRoleCoupon($goodsAttributeJson,$payDetail->join_pay_member_id);
|
|
|
-
|
|
|
- // 临时屏蔽该会员升级
|
|
|
-// if (!in_array($payDetail->join_pay_member_id, ['MR2409132254Z9VW'])) {
|
|
|
-// $member = Member::find($payDetail->join_pay_member_id);
|
|
|
-// $roleId = RechargeService::disposeRole($payDetail->join_pay_member_id, $payDetail->pay_amount);
|
|
|
-// if ($roleId && $member->join_member_role_id != $roleId) {
|
|
|
-// $member->join_member_role_id = $roleId;
|
|
|
-// $member->save();
|
|
|
-// // 处理增值套包、组件
|
|
|
-// RechargeService::disposeAdded($roleId, $payDetail->join_pay_member_id);
|
|
|
-// }
|
|
|
-// }
|
|
|
-
|
|
|
-
|
|
|
+ RechargeService::disposeRoleCoupon($goodsAttributeJson, $payDetail->join_pay_member_id);
|
|
|
|
|
|
// 计算充值提成
|
|
|
if (!empty($payDetail->join_pay_object_json)) {
|
|
@@ -173,21 +161,19 @@ class RechargeController
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ Log::info("充值成功", ['pay_id' => $payId]);
|
|
|
|
|
|
Db::commit();
|
|
|
|
|
|
return json_success('success');
|
|
|
} catch (BusinessException $e) {
|
|
|
- dump($e->getMessage());
|
|
|
Db::rollBack();
|
|
|
-
|
|
|
+ Log::error("充值失败", ['msg' => $e->getMessage()]);
|
|
|
throw new BusinessException("处理失败");
|
|
|
-// return json_fail('处理失败');
|
|
|
} catch (\Exception $e) {
|
|
|
- dump($e->getMessage());
|
|
|
Db::rollBack();
|
|
|
+ Log::error("充值失败", ['msg' => $e->getMessage()]);
|
|
|
throw new BusinessException("处理失败");
|
|
|
-// return json_fail('处理失败');
|
|
|
}
|
|
|
}
|
|
|
}
|