Browse Source

账户变动

gorden 4 months ago
parent
commit
0573a844c9

+ 5 - 0
app/admin/controller/member/AccountController.php

@@ -7,6 +7,7 @@ use app\model\MemberAccount;
 use app\model\MemberBenefit;
 use support\exception\BusinessException;
 use support\Request;
+use Tinywan\Jwt\JwtToken;
 
 class AccountController extends Curd
 {
@@ -63,10 +64,14 @@ class AccountController extends Curd
             if (!empty($params['type']) && $params['type'] == 'income') {
                 $account->member_account_income = $account->member_account_income + $params['income'];
                 $account->member_account_surplus = $account->member_account_surplus + $params['income'];
+                $account->member_account_update_user_id = JwtToken::getCurrentId();
+                $account->member_account_updatetimes = time();
                 $account->save();
             } elseif (!empty($params['type']) && $params['type'] == 'expend') {
                 $account->member_account_expend = $account->member_account_expend + $params['expend'];
                 $account->member_account_surplus = $account->member_account_surplus - $params['expend'];
+                $account->member_account_update_user_id = JwtToken::getCurrentId();
+                $account->member_account_updatetimes = time();
                 $account->save();
             }
 

+ 2 - 0
app/admin/controller/member/MemberController.php

@@ -1276,6 +1276,8 @@ class MemberController
                 $memberAccount->member_account_added = $memberAccount->member_account_added - ($amount - $memberAccount->member_account_surplus);
                 $memberAccount->member_account_surplus = 0;
             }
+            $memberAccount->member_account_update_user_id = JwtToken::getCurrentId();
+            $memberAccount->member_account_updatetimes = time();
             $memberAccount->save();
             // 删除会员身份
             Member::where('member_id', $memberId)

+ 9 - 1
app/admin/controller/notify/RechargeController.php

@@ -12,6 +12,7 @@ use support\Db;
 use support\exception\BusinessException;
 use support\Log;
 use support\Request;
+use Tinywan\Jwt\JwtToken;
 use Webman\Event\Event;
 
 class RechargeController
@@ -107,6 +108,11 @@ class RechargeController
                 return json_success('处理完成');
             }
         }
+        try {
+            $updateUserId = JwtToken::getCurrentId();
+        }catch (\Exception $e){
+            $updateUserId = 1001;
+        }
 
         Db::beginTransaction();
         try {
@@ -138,6 +144,8 @@ class RechargeController
             $memberAccount->member_account_added = $added;
             $memberAccount->member_account_income = $income;
             $memberAccount->member_account_surplus = $memberAccount->member_account_surplus + $payAmount;
+            $memberAccount->member_account_update_user_id = $updateUserId ?? 1001;
+            $memberAccount->member_account_updatetimes = time();
             $memberAccount->save();
             if (!empty($goodsAttributeJson)){
                 // 根据最新的数据,更新用户等级
@@ -158,7 +166,7 @@ class RechargeController
 
                     // 入收支明细表
                     $params['orderId'] = $payObjectJson['order_id'];
-                    $params['inout_category'] = '会员充值订单';
+                    $params['inout_category'] = '会员充值';
                     Event::dispatch('statistics.inout.in', $params);
                 }
             }

+ 21 - 0
app/admin/controller/order/GoodsController.php

@@ -29,6 +29,7 @@ use support\Log;
 use support\Redis;
 use support\Request;
 use support\Response;
+use Tinywan\Jwt\JwtToken;
 use Webman\Event\Event;
 
 class GoodsController extends Curd
@@ -370,6 +371,8 @@ class GoodsController extends Curd
                     $account->member_account_surplus = $account->member_account_surplus - $params['order_amount_pay'];
                 }
                 $account->member_account_expend = $account->member_account_expend + $params['order_amount_pay'];
+                $account->member_account_update_user_id = JwtToken::getCurrentId();
+                $account->member_account_updatetimes = time();
                 $account->save();
                 if ($params['pay_constitute'] == 'N') {
                     $params['order_status_system'] = $systemStatus;
@@ -395,6 +398,8 @@ class GoodsController extends Curd
                     $account->member_account_surplus = $account->member_account_surplus - $params['order_amount_pay'];
                 }
                 $account->member_account_expend = $account->member_account_expend + $params['order_amount_pay'];
+                $account->member_account_update_user_id = JwtToken::getCurrentId();
+                $account->member_account_updatetimes = time();
                 $account->save();
                 if ($params['pay_constitute'] == 'N') {
                     $params['order_status_system'] = $systemStatus;
@@ -483,6 +488,8 @@ class GoodsController extends Curd
 
                 $account->member_account_surplus = $account->member_account_surplus - $params['order_amount_pay'];
                 $account->member_account_expend = $account->member_account_expend + $params['order_amount_pay'];
+                $account->member_account_update_user_id = JwtToken::getCurrentId();
+                $account->member_account_updatetimes = time();
                 $account->save();
             } else if ($params['settlement_now'] == 'Y' && $params['pay_category'] == 'CARD') {  // 储值卡账户
                 $cardNbr = $params['card_nbr'];
@@ -509,6 +516,8 @@ class GoodsController extends Curd
                     $account->member_account_surplus = $account->member_account_surplus - $params['order_amount_pay'];
                 }
                 $account->member_account_expend = $account->member_account_expend + $params['order_amount_pay'];
+                $account->member_account_update_user_id = JwtToken::getCurrentId();
+                $account->member_account_updatetimes = time();
                 $account->save();
 
                 if ($params['pay_constitute'] == 'N') {
@@ -1097,6 +1106,8 @@ class GoodsController extends Curd
                     $account->member_account_surplus = $account->member_account_surplus - $params['order_amount_pay'];
                 }
                 $account->member_account_expend = $account->member_account_expend + $params['order_amount_pay'];
+                $account->member_account_update_user_id = JwtToken::getCurrentId();
+                $account->member_account_updatetimes = time();
                 $account->save();
                 if ($params['pay_constitute'] == 'N' && (!$account || $params['order_amount_pay'] <= $amount)) {
                     $order->order_status_system = $systemStatus;
@@ -1126,6 +1137,8 @@ class GoodsController extends Curd
                     $account->member_account_surplus = $account->member_account_surplus - $params['order_amount_pay'];
                 }
                 $account->member_account_expend = $account->member_account_expend + $params['order_amount_pay'];
+                $account->member_account_update_user_id = JwtToken::getCurrentId();
+                $account->member_account_updatetimes = time();
                 $account->save();
                 if ($params['pay_constitute'] == 'N' && (!$account || $params['order_amount_pay'] <= $amount)) {
                     $order->order_status_system = $systemStatus;
@@ -1223,6 +1236,8 @@ class GoodsController extends Curd
                 }
                 $account->member_account_surplus = $account->member_account_surplus - $params['order_amount_pay'];
                 $account->member_account_expend = $account->member_account_expend + $params['order_amount_pay'];
+                $account->member_account_update_user_id = JwtToken::getCurrentId();
+                $account->member_account_updatetimes = time();
                 $account->save();
             } else if ($params['pay_category'] == 'CARD') {  // 储值卡账户
                 $cardNbr = $params['card_nbr'];
@@ -1252,6 +1267,8 @@ class GoodsController extends Curd
                     $account->member_account_surplus = $account->member_account_surplus - $params['order_amount_pay'];
                 }
                 $account->member_account_expend = $account->member_account_expend + $params['order_amount_pay'];
+                $account->member_account_update_user_id = JwtToken::getCurrentId();
+                $account->member_account_updatetimes = time();
                 $account->save();
                 if ($params['pay_constitute'] == 'N' && (!$account || $params['order_amount_pay'] <= $amount)) {
                     $order->order_status_system = $systemStatus;
@@ -1728,6 +1745,8 @@ class GoodsController extends Curd
                     } else {
                         $account->member_account_surplus = $account->member_account_surplus - $item['amount'];
                     }
+                    $account->member_account_update_user_id = JwtToken::getCurrentId();
+                    $account->member_account_updatetimes = time();
                     $account->save();
                 }
             }
@@ -1904,6 +1923,8 @@ class GoodsController extends Curd
                 $account->member_account_surplus = $account->member_account_surplus - $amount;
             }
 
+            $account->member_account_update_user_id = JwtToken::getCurrentId();
+            $account->member_account_updatetimes = time();
             $account->save();
         } catch (\Exception $e) {
             _syslog("下单扣款", "扣款失败");

+ 5 - 0
app/admin/controller/order/PackagesController.php

@@ -35,6 +35,7 @@ use support\Log;
 use support\Redis;
 use support\Request;
 use support\Response;
+use Tinywan\Jwt\JwtToken;
 use Webman\Event\Event;
 
 class PackagesController extends Curd
@@ -480,6 +481,8 @@ class PackagesController extends Curd
                     $account->member_account_surplus = $account->member_account_surplus - $params['order_amount_pay'];
                 }
                 $account->member_account_expend = $account->member_account_expend + $params['order_amount_pay'];
+                $account->member_account_update_user_id = JwtToken::getCurrentId();
+                $account->member_account_updatetimes = time();
                 $account->save();
                 if ($params['pay_constitute'] == 'N') {
                     $params['order_status_system'] = $systemStatus;
@@ -505,6 +508,8 @@ class PackagesController extends Curd
                     $account->member_account_surplus = $account->member_account_surplus - $params['order_amount_pay'];
                 }
                 $account->member_account_expend = $account->member_account_expend + $params['order_amount_pay'];
+                $account->member_account_update_user_id = JwtToken::getCurrentId();
+                $account->member_account_updatetimes = time();
                 $account->save();
                 if ($params['pay_constitute'] == 'N') {
                     $params['order_status_system'] = $systemStatus;

+ 13 - 3
app/admin/controller/order/PayDetailController.php

@@ -17,9 +17,11 @@ use app\model\PayDetail;
 use app\model\SysDept;
 use support\Db;
 use support\exception\BusinessException;
+use support\Log;
 use support\Request;
 use support\Response;
 
+use Tinywan\Jwt\JwtToken;
 use Webman\Event\Event;
 use function PHPSTORM_META\type;
 
@@ -509,12 +511,16 @@ class PayDetailController extends Curd
             Db::commit();
         } catch (BusinessException $customException) {
             Db::rollBack();
+            _syslog('充值', '后台充值失败', false, $request->all());
+            Log::error("后台充值失败", ['msg' => $customException->getMessage()]);
             return json_fail($customException->getMessage());
         } catch (\Exception $e) {
             Db::rollBack();
-            dump($e->getMessage());
-            return json_fail('数据写入失败11');
+            _syslog('充值', '后台充值失败', false, $request->all());
+            Log::error("后台充值失败", ['msg' => $e->getMessage()]);
+            return json_fail('数据写入失败');
         }
+        _syslog('充值', '后台充值成功', false, $request->all());
         return json_success('success');
     }
 
@@ -542,6 +548,8 @@ class PayDetailController extends Curd
             $memberAccount = MemberAccount::where('join_account_member_id', $data['join_pay_member_id'])->where('member_account_classify', 'CASH')->first();
             $memberAccount->member_account_income = $memberAccount->member_account_income + $data['pay_amount'];
             $memberAccount->member_account_surplus = $memberAccount->member_account_surplus + $data['pay_amount'];
+            $memberAccount->member_account_update_user_id = JwtToken::getCurrentId();
+            $memberAccount->member_account_updatetimes = time();
             $memberAccount->save();
 
             $data['pay_amount'] = 0;
@@ -591,13 +599,15 @@ class PayDetailController extends Curd
             // 金额累加到福利账户
             $memberAccount->member_account_income = $memberAccount->member_account_income + $data['pay_amount'];
             $memberAccount->member_account_surplus = $memberAccount->member_account_surplus + $data['pay_amount'];
+            $memberAccount->member_account_update_user_id = JwtToken::getCurrentId();
+            $memberAccount->member_account_updatetimes = time();
             $memberAccount->save();
 
             Db::commit();
 
             // 入收支明细表
             $params['orderId'] = $orderId;
-            $params['inout_category'] = '会员充值订单';
+            $params['inout_category'] = '会员充值';
             Event::dispatch('statistics.inout.in', $params);
 
         } catch (BusinessException $customException) {

+ 3 - 3
app/admin/controller/order/RechargeController.php

@@ -316,7 +316,7 @@ class RechargeController extends Curd
             Db::commit();
             if ($params['order_status_payment'] == 'SUCCESS') {
                 // 入收支明细表
-//                $params['inout_category'] = '会员充值订单';
+//                $params['inout_category'] = '会员充值';
 //                Event::dispatch('statistics.inout.in', $params);
 
                 // 充值回调
@@ -491,7 +491,7 @@ class RechargeController extends Curd
             Db::commit();
             if ($order->order_status_payment == 'SUCCESS') {
                 // 入收支明细表
-                $params['inout_category'] = '会员充值订单';
+                $params['inout_category'] = '会员充值';
                 Event::dispatch('statistics.inout.in', $params);
                 // 加销售量
                 OrderSheetService::addGoodsSales($params['orderId']);
@@ -1113,7 +1113,7 @@ class RechargeController extends Curd
                 }
                 // 入收支明细表
                 $params['orderId'] = $order['order_id'];
-                $params['inout_category'] = '会员充值订单';
+                $params['inout_category'] = '会员充值';
                 Event::dispatch('statistics.inout.in', $params);
 
                 // 充值回调

+ 10 - 0
app/admin/controller/order/RefundController.php

@@ -621,6 +621,8 @@ class RefundController extends Curd
         }
         $account->member_account_surplus = $account->member_account_surplus + $amount;
         $account->member_account_expend  = $account->member_account_expend - $amount;
+        $account->member_account_update_user_id = JwtToken::getCurrentId();
+        $account->member_account_updatetimes = time();
         $account->save();
     }
 
@@ -642,6 +644,8 @@ class RefundController extends Curd
         }
         $account->member_account_surplus = $account->member_account_surplus + $amount;
         $account->member_account_expend  = $account->member_account_expend - $amount;
+        $account->member_account_update_user_id = JwtToken::getCurrentId();
+        $account->member_account_updatetimes = time();
         $account->save();
     }
 
@@ -663,6 +667,8 @@ class RefundController extends Curd
         }
         $account->member_account_surplus = $account->member_account_surplus + $amount;
         $account->member_account_expend  = $account->member_account_expend - $amount;
+        $account->member_account_update_user_id = JwtToken::getCurrentId();
+        $account->member_account_updatetimes = time();
         $account->save();
     }
 
@@ -685,6 +691,8 @@ class RefundController extends Curd
         }
         $account->member_account_surplus = $account->member_account_surplus + $amount;
         $account->member_account_expend  = $account->member_account_expend - $amount;
+        $account->member_account_update_user_id = JwtToken::getCurrentId();
+        $account->member_account_updatetimes = time();
         $account->save();
     }
 
@@ -937,6 +945,8 @@ class RefundController extends Curd
             $memberAccount->member_account_surplus = $memberAccount->member_account_surplus - $amount;
             // 增值
             $memberAccount->member_account_added = $memberAccount->member_account_added - $addedAmount;
+            $memberAccount->member_account_update_user_id = JwtToken::getCurrentId();
+            $memberAccount->member_account_updatetimes = time();
             $memberAccount->save();
             // 删除会员身份
             Member::where('member_id', $memberId)

+ 19 - 0
app/admin/controller/order/ServicesController.php

@@ -27,6 +27,7 @@ use support\exception\BusinessException;
 use support\Redis;
 use support\Request;
 use support\Response;
+use Tinywan\Jwt\JwtToken;
 use Webman\Event\Event;
 
 class ServicesController extends Curd
@@ -349,6 +350,8 @@ class ServicesController extends Curd
                     $account->member_account_surplus = $account->member_account_surplus - $params['order_amount_pay'];
                 }
                 $account->member_account_expend = $account->member_account_expend + $params['order_amount_pay'];
+                $account->member_account_update_user_id = JwtToken::getCurrentId();
+                $account->member_account_updatetimes = time();
                 $account->save();
                 if ($params['pay_constitute'] == 'N') {
                     $params['order_status_system'] = $systemStatus;
@@ -374,6 +377,8 @@ class ServicesController extends Curd
                     $account->member_account_surplus = $account->member_account_surplus - $params['order_amount_pay'];
                 }
                 $account->member_account_expend = $account->member_account_expend + $params['order_amount_pay'];
+                $account->member_account_update_user_id = JwtToken::getCurrentId();
+                $account->member_account_updatetimes = time();
                 $account->save();
                 if ($params['pay_constitute'] == 'N') {
                     $params['order_status_system'] = $systemStatus;
@@ -462,6 +467,8 @@ class ServicesController extends Curd
 
                 $account->member_account_surplus = $account->member_account_surplus - $params['order_amount_pay'];
                 $account->member_account_expend = $account->member_account_expend + $params['order_amount_pay'];
+                $account->member_account_update_user_id = JwtToken::getCurrentId();
+                $account->member_account_updatetimes = time();
                 $account->save();
             } else if ($params['settlement_now'] == 'Y' && $params['pay_category'] == 'CARD') {  // 储值卡账户
                 $cardNbr = $params['card_nbr'];
@@ -488,6 +495,8 @@ class ServicesController extends Curd
                     $account->member_account_surplus = $account->member_account_surplus - $params['order_amount_pay'];
                 }
                 $account->member_account_expend = $account->member_account_expend + $params['order_amount_pay'];
+                $account->member_account_update_user_id = JwtToken::getCurrentId();
+                $account->member_account_updatetimes = time();
                 $account->save();
 
                 if ($params['pay_constitute'] == 'N') {
@@ -1065,6 +1074,8 @@ class ServicesController extends Curd
                     $account->member_account_surplus = $account->member_account_surplus - $params['order_amount_pay'];
                 }
                 $account->member_account_expend = $account->member_account_expend + $params['order_amount_pay'];
+                $account->member_account_update_user_id = JwtToken::getCurrentId();
+                $account->member_account_updatetimes = time();
                 $account->save();
                 if ($params['pay_constitute'] == 'N' && (!$account || $params['order_amount_pay'] <= $amount)) {
                     $order->order_status_system = $systemStatus;
@@ -1094,6 +1105,8 @@ class ServicesController extends Curd
                     $account->member_account_surplus = $account->member_account_surplus - $params['order_amount_pay'];
                 }
                 $account->member_account_expend = $account->member_account_expend + $params['order_amount_pay'];
+                $account->member_account_update_user_id = JwtToken::getCurrentId();
+                $account->member_account_updatetimes = time();
                 $account->save();
                 if ($params['pay_constitute'] == 'N' && (!$account || $params['order_amount_pay'] <= $amount)) {
                     $order->order_status_system = $systemStatus;
@@ -1191,6 +1204,8 @@ class ServicesController extends Curd
                 }
                 $account->member_account_surplus = $account->member_account_surplus - $params['order_amount_pay'];
                 $account->member_account_expend = $account->member_account_expend + $params['order_amount_pay'];
+                $account->member_account_update_user_id = JwtToken::getCurrentId();
+                $account->member_account_updatetimes = time();
                 $account->save();
             } else if ($params['pay_category'] == 'CARD') {  // 储值卡账户
                 $cardNbr = $params['card_nbr'];
@@ -1220,6 +1235,8 @@ class ServicesController extends Curd
                     $account->member_account_surplus = $account->member_account_surplus - $params['order_amount_pay'];
                 }
                 $account->member_account_expend = $account->member_account_expend + $params['order_amount_pay'];
+                $account->member_account_update_user_id = JwtToken::getCurrentId();
+                $account->member_account_updatetimes = time();
                 $account->save();
                 if ($params['pay_constitute'] == 'N' && (!$account || $params['order_amount_pay'] <= $amount)) {
                     $order->order_status_system = $systemStatus;
@@ -1765,6 +1782,8 @@ class ServicesController extends Curd
                     } else {
                         $account->member_account_surplus = $account->member_account_surplus - $item['amount'];
                     }
+                    $account->member_account_update_user_id = JwtToken::getCurrentId();
+                    $account->member_account_updatetimes = time();
                     $account->save();
                 }
             }

+ 6 - 0
app/admin/controller/order/WholeController.php

@@ -923,6 +923,8 @@ class WholeController extends Curd
                     $account->member_account_surplus = $account->member_account_surplus - $params['order_amount_pay'];
                 }
                 $account->member_account_expend = $account->member_account_expend + $params['order_amount_pay'];
+                $account->member_account_update_user_id = JwtToken::getCurrentId();
+                $account->member_account_updatetimes = time();
                 $account->save();
                 if ($params['pay_constitute'] == 'N' && (!$account || $params['order_amount_pay'] <= $amount)) {
                     $order->order_status_system = $systemStatus;
@@ -952,6 +954,8 @@ class WholeController extends Curd
                     $account->member_account_surplus = $account->member_account_surplus - $params['order_amount_pay'];
                 }
                 $account->member_account_expend = $account->member_account_expend + $params['order_amount_pay'];
+                $account->member_account_update_user_id = JwtToken::getCurrentId();
+                $account->member_account_updatetimes = time();
                 $account->save();
                 if ($params['pay_constitute'] == 'N' && (!$account || $params['order_amount_pay'] <= $amount)) {
                     $order->order_status_system = $systemStatus;
@@ -1078,6 +1082,8 @@ class WholeController extends Curd
                     $account->member_account_surplus = $account->member_account_surplus - $params['order_amount_pay'];
                 }
                 $account->member_account_expend = $account->member_account_expend + $params['order_amount_pay'];
+                $account->member_account_update_user_id = JwtToken::getCurrentId();
+                $account->member_account_updatetimes = time();
                 $account->save();
                 if ($params['pay_constitute'] == 'N' && (!$account || $params['order_amount_pay'] <= $amount)) {
                     $order->order_status_system = $systemStatus;