Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
This commit is contained in:
commit
776ee99b54
@ -428,7 +428,7 @@ class PayNotifyLogic extends BaseLogic
|
|||||||
$orderRe->refund_time = time();
|
$orderRe->refund_time = time();
|
||||||
$orderRe->remarks = '';
|
$orderRe->remarks = '';
|
||||||
$orderRe->save();
|
$orderRe->save();
|
||||||
|
self::descUserSing($orderRe);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
$order->status = OrderEnum::REFUND_PAY;
|
$order->status = OrderEnum::REFUND_PAY;
|
||||||
@ -477,8 +477,9 @@ class PayNotifyLogic extends BaseLogic
|
|||||||
return true;
|
return true;
|
||||||
// self::afterPay($order,$extra['transaction_id']);
|
// self::afterPay($order,$extra['transaction_id']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//退积分
|
//退积分-->订单
|
||||||
public static function descUserSing($order)
|
public static function descUserSing($order)
|
||||||
{
|
{
|
||||||
$user_sing = new UserSign();
|
$user_sing = new UserSign();
|
||||||
@ -498,12 +499,12 @@ class PayNotifyLogic extends BaseLogic
|
|||||||
'order_id'=>$order['order_id'],
|
'order_id'=>$order['order_id'],
|
||||||
'financial_pm'=>1,
|
'financial_pm'=>1,
|
||||||
])->update(['delete_time'=>time()]);
|
])->update(['delete_time'=>time()]);
|
||||||
$now_int = User::where('id',$order['uid'])->find();
|
$now_int = User::where('id',$order['uid'])->withTrashed()->find();
|
||||||
if($now_int){
|
if($now_int){
|
||||||
if($now_int['integral'] > $user_number){
|
if($now_int['integral'] > $user_number){
|
||||||
User::where('id',$order['uid'])->dec('integral',$user_number)->update();
|
User::where('id',$order['uid'])->withTrashed()->dec('integral',$user_number)->update();
|
||||||
}else{
|
}else{
|
||||||
User::where('id',$order['uid'])->dec('integral',$now_int['integral'])->update();
|
User::where('id',$order['uid'])->withTrashed()->dec('integral',$now_int['integral'])->update();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user