Kirin il y a 1 an
Parent
commit
b7e4ccc835

+ 2 - 1
app/services/user/AwardIntegralServices.php

@@ -273,7 +273,7 @@ class AwardIntegralServices extends BaseServices
             $this->dao->update($v['id'], $update);
             $this->dao->update($v['id'], $update);
             /** @var UserBillServices $billService */
             /** @var UserBillServices $billService */
             $billService = app()->make(UserBillServices::class);
             $billService = app()->make(UserBillServices::class);
-            $billService->income('integral_day_send', $v['uid'], $real_send, $update['num'] - $update['sent_num'], $v['id']);
+            $billService->income('integral_day_send', $v['uid'], $real_send, $this->getIntegralSum(['uid' => $v['uid']], 'extract_num') + $real_send, $v['id']);
             if (($update['status'] ?? 0) == 1) {
             if (($update['status'] ?? 0) == 1) {
                 $this->extract($v['id'], $update['extract_num'], true);
                 $this->extract($v['id'], $update['extract_num'], true);
             }
             }
@@ -304,6 +304,7 @@ class AwardIntegralServices extends BaseServices
         $moneyService = app()->make(UserMoneyServices::class);
         $moneyService = app()->make(UserMoneyServices::class);
         /** @var UserServices $userService */
         /** @var UserServices $userService */
         $userService = app()->make(UserServices::class);
         $userService = app()->make(UserServices::class);
+        $billService->income('extract_award_integral', $origin['uid'], $num, $this->getIntegralSum(['uid' => $origin['uid']], 'extract_num') - $num, $id);
         $uid = $origin['uid'];
         $uid = $origin['uid'];
         $user = $userService->getUserInfo($uid);
         $user = $userService->getUserInfo($uid);
         $reorder_set = sys_config('reorder_times', 2);
         $reorder_set = sys_config('reorder_times', 2);

+ 9 - 1
app/services/user/UserBillServices.php

@@ -53,11 +53,19 @@ class UserBillServices extends BaseServices
         'integral_day_send' => [
         'integral_day_send' => [
             'title' => '参考分每日释放',
             'title' => '参考分每日释放',
             'category' => 'award_integral',
             'category' => 'award_integral',
-            'type' => 'gain',
+            'type' => 'day_send',
             'mark' => '每日释放{%num%}参考分',
             'mark' => '每日释放{%num%}参考分',
             'status' => 1,
             'status' => 1,
             'pm' => 1
             'pm' => 1
         ],
         ],
+        'extract_award_integral' => [
+            'title' => '参考分提取',
+            'category' => 'award_integral',
+            'type' => 'extract',
+            'mark' => '提取{%num%}参考分',
+            'status' => 1,
+            'pm' => 0
+        ],
         'order_promotions_give_integral' => [
         'order_promotions_give_integral' => [
             'title' => '下单优惠活动赠送消费分',
             'title' => '下单优惠活动赠送消费分',
             'category' => 'integral',
             'category' => 'integral',