|
|
@@ -67,17 +67,21 @@ class RechargeController
|
|
|
$payDetail->save();
|
|
|
// 赠送比例
|
|
|
$objectJson = json_decode($payDetail->join_pay_object_json, true);
|
|
|
- if (!isset($objectJson['order_id'])){
|
|
|
+ if (!isset($objectJson['order_id'])) {
|
|
|
return json_fail("支付数据异常");
|
|
|
}
|
|
|
$addedNbr = RechargeService::disposeOrder($objectJson['order_id']);
|
|
|
// 赠送金额累加到 账户表 member_account_added
|
|
|
- MemberAccount::where('join_account_member_id', $payDetail->join_pay_member_id)
|
|
|
+ $memberAccount = MemberAccount::where('join_account_member_id', $payDetail->join_pay_member_id)
|
|
|
->where('member_account_classify', 'CASH')
|
|
|
- ->increment('member_account_added', $payDetail->pay_amount * $addedNbr);
|
|
|
- MemberAccount::where('join_account_member_id', $payDetail->join_pay_member_id)
|
|
|
- ->where('member_account_classify', 'CASH')
|
|
|
- ->increment('member_account_income', floatval($payDetail->pay_amount));
|
|
|
+ ->first();
|
|
|
+ $payAmount = floatval($payDetail->pay_amount);
|
|
|
+ $added = $memberAccount->member_account_added + $payAmount * $addedNbr;
|
|
|
+ $income = $memberAccount->member_account_income + $payAmount;
|
|
|
+ $memberAccount->member_account_added = $added;
|
|
|
+ $memberAccount->member_account_income = $income;
|
|
|
+ $memberAccount->member_account_surplus = $income - $memberAccount->member_account_expend;
|
|
|
+ $memberAccount->save();
|
|
|
// 根据最新的数据，更新用户等级
|
|
|
$member = Member::find($payDetail->join_pay_member_id);
|
|
|
$roleId = RechargeService::disposeRole($payDetail->join_pay_member_id, $payDetail->pay_amount);
|
gorden