Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
This commit is contained in:
commit
28f434f0d7
@ -110,6 +110,7 @@ class UserLogic extends BaseLogic
|
|||||||
$data['return_money'] = Db::name('vip_flow')->
|
$data['return_money'] = Db::name('vip_flow')->
|
||||||
where(['user_id'=>$uid,'status'=>0])
|
where(['user_id'=>$uid,'status'=>0])
|
||||||
->sum('number');
|
->sum('number');
|
||||||
|
$data['return_money'] = bcadd($data['return_money'],0,2);
|
||||||
//小程序 未核销的订单
|
//小程序 未核销的订单
|
||||||
$data['no_writeoff'] = StoreOrder::where([
|
$data['no_writeoff'] = StoreOrder::where([
|
||||||
'is_writeoff'=>0,'uid'=>$uid
|
'is_writeoff'=>0,'uid'=>$uid
|
||||||
|
@ -425,6 +425,13 @@ class PayNotifyLogic extends BaseLogic
|
|||||||
$orderRe->refund_time = time();
|
$orderRe->refund_time = time();
|
||||||
$orderRe->remarks = '';
|
$orderRe->remarks = '';
|
||||||
$orderRe->save();
|
$orderRe->save();
|
||||||
|
$purchase_funds = User::where('id',$orderRe['uid'])->value('purchase_funds');
|
||||||
|
if($purchase_funds >= $orderRe['price']){
|
||||||
|
User::where('id',$orderRe['uid'])->dec('purchase_funds',$orderRe['price'])->update();
|
||||||
|
}else{
|
||||||
|
User::where('id',$orderRe['uid'])->dec('purchase_funds',$purchase_funds)->update();
|
||||||
|
}
|
||||||
|
|
||||||
self::descUserSing($orderRe);
|
self::descUserSing($orderRe);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user