|
@@ -97,14 +97,16 @@ class RechargeController
|
|
|
$payDetail->save();
|
|
|
// 赠送比例
|
|
|
$objectJson = json_decode($payDetail->join_pay_object_json, true);
|
|
|
- if (!isset($objectJson['order_id'])) {
|
|
|
+ $addedNbr = 0;
|
|
|
+ if (isset($objectJson['order_id'])) {
|
|
|
+ // 对应订单设置已完成
|
|
|
+ Order::where('order_groupby',$payDetail->join_pay_order_id)->update(['order_status_system'=>'DONE','order_is_complete'=>'Y']);
|
|
|
+ $addedNbr = RechargeService::disposeOrder($objectJson['order_id']);
|
|
|
+
|
|
|
|
|
|
- throw new BusinessException("支付数据异常");
|
|
|
+ // throw new BusinessException("支付数据异常");
|
|
|
// return json_fail("");
|
|
|
}
|
|
|
- // 对应订单设置已完成
|
|
|
- Order::where('order_groupby',$payDetail->join_pay_order_id)->update(['order_status_system'=>'DONE','order_is_complete'=>'Y']);
|
|
|
- $addedNbr = RechargeService::disposeOrder($objectJson['order_id']);
|
|
|
// 赠送金额累加到 账户表 member_account_added
|
|
|
$memberAccount = MemberAccount::where('join_account_member_id', $payDetail->join_pay_member_id)
|
|
|
->where('member_account_classify', 'CASH')
|
|
@@ -116,6 +118,7 @@ class RechargeController
|
|
|
$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);
|