|
@@ -66,12 +66,12 @@ class PublicController extends BaseController
|
|
|
|
|
|
foreach ($list as $v) {
|
|
|
|
|
|
- $this->dealOrderIntegral(StoreOrder::where('id', $v['link_id'])->find(), $v['price']);
|
|
|
+ $this->dealOrderIntegral(StoreOrder::where('id', $v['link_id'])->find(), $v['price'], $time);
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
- public function dealOrderIntegral($order, $price)
|
|
|
+ public function dealOrderIntegral($order, $price, $time)
|
|
|
{
|
|
|
/** @var UserAwardIntegralServices $awardIntegralService */
|
|
|
$awardIntegralService = app()->make(UserAwardIntegralServices::class);
|
|
@@ -82,7 +82,7 @@ class PublicController extends BaseController
|
|
|
$user = $userService->getUserInfo($order['uid']);
|
|
|
$integral_price = $price;
|
|
|
$total_price = $order['total_price'];
|
|
|
- return $awardIntegralService->transaction(function () use ($levelServices, $awardIntegralService, $userService, $user, $integral_price, $total_price, $order) {
|
|
|
+ return $awardIntegralService->transaction(function () use ($time, $levelServices, $awardIntegralService, $userService, $user, $integral_price, $total_price, $order) {
|
|
|
try {
|
|
|
//添加静态积分
|
|
|
$static_integral_ratio = sys_config('static_integral_ratio', 0);
|
|
@@ -91,7 +91,7 @@ class PublicController extends BaseController
|
|
|
$rate = sys_config('static_integral_rate', 3);
|
|
|
$extract_sum = bcmul($total_price, $rate, 2);
|
|
|
$mark = '购买商品,获得消费分';
|
|
|
- $awardIntegralService->incIntegralAdmin($order['uid'], $integral_price, $give_static_integral, $total_price, 0, $extract_sum, $order['id'], $mark);
|
|
|
+ $awardIntegralService->incIntegralAdmin($order['uid'], $integral_price, $give_static_integral, $total_price, 0, $extract_sum, $order['id'], $mark, $time);
|
|
|
// }
|
|
|
//TODO 加动态积分
|
|
|
//推荐奖
|
|
@@ -104,7 +104,7 @@ class PublicController extends BaseController
|
|
|
if ($give_action_integral > 0) {
|
|
|
$extract_sum = bcmul($give_action_integral, $rate, 2);
|
|
|
$mark = '推荐用户' . $user['nickname'] . "({$user['uid']})" . '购买商品,获得推荐积分';
|
|
|
- $awardIntegralService->incIntegralAdmin($spread['uid'], $integral_price, $give_action_integral, $total_price, 1, $extract_sum, $order['id'], $mark);
|
|
|
+ $awardIntegralService->incIntegralAdmin($spread['uid'], $integral_price, $give_action_integral, $total_price, 1, $extract_sum, $order['id'], $mark, $time);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -121,7 +121,7 @@ class PublicController extends BaseController
|
|
|
// if ($awardIntegralService->getHourExtractPaySum($spread['uid'], 24) > 0) {
|
|
|
$extract_sum = bcmul($real_send, $rate, 2);
|
|
|
$mark = '团队用户' . $user['nickname'] . "({$user['uid']})" . '购买商品,获得团队级差积分';
|
|
|
- $awardIntegralService->incIntegralAdmin($spread['uid'], $integral_price, $real_send, $total_price, 1, $extract_sum, $order['id'], $mark);
|
|
|
+ $awardIntegralService->incIntegralAdmin($spread['uid'], $integral_price, $real_send, $total_price, 1, $extract_sum, $order['id'], $mark, $time);
|
|
|
// }
|
|
|
$send = $give_action_integral;
|
|
|
}
|