|
|
@@ -518,6 +518,7 @@ class SettleService extends BaseService
|
|
|
|
|
|
$data = [
|
|
|
'user_id' => $userId,
|
|
|
+ 'store_id' => 0,
|
|
|
'source_order_no' => $orderNo,
|
|
|
'user_type' => 1,
|
|
|
'account_type' => 4, // 绿色积分
|
|
|
@@ -555,6 +556,7 @@ class SettleService extends BaseService
|
|
|
|
|
|
$data = [
|
|
|
'user_id' => $userId,
|
|
|
+ 'store_id' => 0,
|
|
|
'source_order_no' => $orderNo,
|
|
|
'user_type' => 1,
|
|
|
'account_type' => 2, // 数字资产
|
|
|
@@ -596,6 +598,7 @@ class SettleService extends BaseService
|
|
|
if ($ptPool > 0) {
|
|
|
$data = [
|
|
|
'user_id' => 0,
|
|
|
+ 'store_id' => 0,
|
|
|
'source_order_no' => $orderNo,
|
|
|
'user_type' => 0,
|
|
|
'account_type' => 5, // 平台账户
|
|
|
@@ -626,11 +629,11 @@ class SettleService extends BaseService
|
|
|
}
|
|
|
|
|
|
// 订单结算状态更新
|
|
|
-// if(!OrderCommissionModel::where(['id'=>$commissionId])->update(['status'=>1,'arrival_at'=>date('Y-m-d H:i:s'),'update_time'=>time()])){
|
|
|
-// DB::rollBack();
|
|
|
-// $this->error = '订单结算状态更新失败';
|
|
|
-// return false;
|
|
|
-// }
|
|
|
+ if(!OrderCommissionModel::where(['id'=>$commissionId])->update(['status'=>1,'arrival_at'=>date('Y-m-d H:i:s'),'update_time'=>time()])){
|
|
|
+ DB::rollBack();
|
|
|
+ $this->error = '订单结算状态更新失败';
|
|
|
+ return false;
|
|
|
+ }
|
|
|
|
|
|
DB::commit();
|
|
|
$this->error = '订单结算完成';
|