|
@@ -288,7 +288,7 @@ class SettleService extends BaseService
|
|
|
public function commissionSettle($orderId)
|
|
public function commissionSettle($orderId)
|
|
|
{
|
|
{
|
|
|
try {
|
|
try {
|
|
|
- $info = OrderModel::with(['commission'])
|
|
|
|
|
|
|
+ $info = OrderModel::with(['commission','user'])
|
|
|
->where(['id' => $orderId, 'mark' => 1])
|
|
->where(['id' => $orderId, 'mark' => 1])
|
|
|
->select(['id', 'order_no', 'type', 'user_id', 'total', 'pay_total', 'bd_score', 'pay_status', 'status', 'refund_status'])
|
|
->select(['id', 'order_no', 'type', 'user_id', 'total', 'pay_total', 'bd_score', 'pay_status', 'status', 'refund_status'])
|
|
|
->first();
|
|
->first();
|
|
@@ -310,7 +310,9 @@ class SettleService extends BaseService
|
|
|
|
|
|
|
|
$orderType = isset($info['type']) ? $info['type'] : 1;
|
|
$orderType = isset($info['type']) ? $info['type'] : 1;
|
|
|
$orderNo = isset($info['order_no']) ? $info['order_no'] : '';
|
|
$orderNo = isset($info['order_no']) ? $info['order_no'] : '';
|
|
|
|
|
+ $user = isset($info['user']) ? $info['user'] : [];
|
|
|
$orderUserId = isset($info['user_id']) ? $info['user_id'] : 0;
|
|
$orderUserId = isset($info['user_id']) ? $info['user_id'] : 0;
|
|
|
|
|
+ $mobile = isset($user['mobile'])?$user['mobile']: '';
|
|
|
$commission = isset($info['commission']) ? $info['commission'] : [];
|
|
$commission = isset($info['commission']) ? $info['commission'] : [];
|
|
|
$commissionId = isset($commission['id']) ? $commission['id'] : 0;
|
|
$commissionId = isset($commission['id']) ? $commission['id'] : 0;
|
|
|
if (empty($commission) || $commissionId <= 0) {
|
|
if (empty($commission) || $commissionId <= 0) {
|
|
@@ -365,7 +367,7 @@ class SettleService extends BaseService
|
|
|
'date' => date('Y-m-d'),
|
|
'date' => date('Y-m-d'),
|
|
|
'create_time' => time(),
|
|
'create_time' => time(),
|
|
|
'remark' => '直推奖',
|
|
'remark' => '直推奖',
|
|
|
- 'remark1' => "用户ID:{$orderUserId}购买礼包直推奖励",
|
|
|
|
|
|
|
+ 'remark1' => "用户[ID:{$orderUserId}-{$mobile}]购买礼包直推奖励",
|
|
|
'status' => 1,
|
|
'status' => 1,
|
|
|
'mark' => 1
|
|
'mark' => 1
|
|
|
];
|
|
];
|
|
@@ -424,7 +426,7 @@ class SettleService extends BaseService
|
|
|
'date' => date('Y-m-d'),
|
|
'date' => date('Y-m-d'),
|
|
|
'create_time' => time() + $i,
|
|
'create_time' => time() + $i,
|
|
|
'remark' => '见单奖',
|
|
'remark' => '见单奖',
|
|
|
- 'remark1' => "下{$i}级用户ID:{$orderUserId}购买礼包见单奖",
|
|
|
|
|
|
|
+ 'remark1' => "下{$i}级用户[ID:{$orderUserId}-{$mobile}]购买礼包见单奖",
|
|
|
'status' => 1,
|
|
'status' => 1,
|
|
|
'mark' => 1
|
|
'mark' => 1
|
|
|
];
|
|
];
|
|
@@ -446,7 +448,7 @@ class SettleService extends BaseService
|
|
|
'date' => date('Y-m-d'),
|
|
'date' => date('Y-m-d'),
|
|
|
'create_time' => time() + $i,
|
|
'create_time' => time() + $i,
|
|
|
'remark' => '分红收益',
|
|
'remark' => '分红收益',
|
|
|
- 'remark1' => "下{$i}级用户ID:{$orderUserId}购买礼包等级[{$levelName}]分红收益",
|
|
|
|
|
|
|
+ 'remark1' => "下{$i}级用户[ID:{$orderUserId}-{$mobile}]购买礼包等级[{$levelName}]分红收益",
|
|
|
'status' => 1,
|
|
'status' => 1,
|
|
|
'mark' => 1
|
|
'mark' => 1
|
|
|
];
|
|
];
|
|
@@ -489,7 +491,7 @@ class SettleService extends BaseService
|
|
|
'date' => date('Y-m-d'),
|
|
'date' => date('Y-m-d'),
|
|
|
'create_time' => time(),
|
|
'create_time' => time(),
|
|
|
'remark' => '商家提成结算',
|
|
'remark' => '商家提成结算',
|
|
|
- 'remark1' => "用户ID:{$orderUserId}购买商品提成结算",
|
|
|
|
|
|
|
+ 'remark1' => "用户[ID:{$orderUserId}-{$mobile}]购买商品提成结算",
|
|
|
'status' => 1,
|
|
'status' => 1,
|
|
|
'mark' => 1
|
|
'mark' => 1
|
|
|
];
|
|
];
|
|
@@ -527,7 +529,7 @@ class SettleService extends BaseService
|
|
|
'date' => date('Y-m-d'),
|
|
'date' => date('Y-m-d'),
|
|
|
'create_time' => time(),
|
|
'create_time' => time(),
|
|
|
'remark' => '绿色积分奖励',
|
|
'remark' => '绿色积分奖励',
|
|
|
- 'remark1' => "用户ID:{$orderUserId}购买商品绿色积分奖励",
|
|
|
|
|
|
|
+ 'remark1' => "用户[ID:{$orderUserId}-{$mobile}]购买商品绿色积分奖励",
|
|
|
'status' => 1,
|
|
'status' => 1,
|
|
|
'mark' => 1
|
|
'mark' => 1
|
|
|
];
|
|
];
|
|
@@ -564,7 +566,7 @@ class SettleService extends BaseService
|
|
|
'date' => date('Y-m-d'),
|
|
'date' => date('Y-m-d'),
|
|
|
'create_time' => time(),
|
|
'create_time' => time(),
|
|
|
'remark' => '数字资产奖励',
|
|
'remark' => '数字资产奖励',
|
|
|
- 'remark1' => "用户ID:{$orderUserId}购买商品数字资产奖励",
|
|
|
|
|
|
|
+ 'remark1' => "用户[ID:{$orderUserId}-{$mobile}]购买商品数字资产奖励",
|
|
|
'status' => 1,
|
|
'status' => 1,
|
|
|
'mark' => 1
|
|
'mark' => 1
|
|
|
];
|
|
];
|
|
@@ -605,7 +607,7 @@ class SettleService extends BaseService
|
|
|
'date' => date('Y-m-d'),
|
|
'date' => date('Y-m-d'),
|
|
|
'create_time' => time(),
|
|
'create_time' => time(),
|
|
|
'remark' => '返回底池',
|
|
'remark' => '返回底池',
|
|
|
- 'remark1' => "用户ID:{$orderUserId}购买商品返回底池",
|
|
|
|
|
|
|
+ 'remark1' => "用户[ID:{$orderUserId}-{$mobile}]购买商品返回底池",
|
|
|
'status' => 1,
|
|
'status' => 1,
|
|
|
'mark' => 1
|
|
'mark' => 1
|
|
|
];
|
|
];
|
