优惠券详情异常

app/admin/controller/coupon/CouponController.php

@@ -771,55 +771,41 @@ class CouponController extends Curd
      */
     public function info(Request $request): Response
     {
-        $couponId = $request->get('coupon_id', '');
-        if (!$couponId) {
-            return json_fail('参数异常');
-        }
-        $coupon = Coupon::where('coupon_id', $couponId)->first();
-        if (!$coupon) {
-            return json_fail('数据异常');
-        }
-        /*
-         * "goods_sku_id" => 2411
-          "join_sku_goods_id" => "GD2411050835FM9S"
-          "goods_sku_status" => "ON"
-          "goods_sku_specs_json" => "{"规格": "体验"}"
-          "goods_sku_title" => "体验颂钵疗愈课"
-          "goods_sku_images_json" => null
-          "goods_sku_content" => ""
-          "goods_sku_market_price" => "358.00"
-          "goods_sku_sales_price" => "99.00"
-          "goods_sku_storage_json" => "{"storage": 500}"
-          "goods_sku_config_json" => null
-          "goods_sku_extend_json" => null
-
-         */
-        // 拼选择的商品
-        $couponGoods = CouponGoods::with([
-            'goods' => function ($query) {
-                $query->select('goods_id', 'goods_id as id', 'goods_name as name', 'join_goods_category_id as pid', 'goods_classify', 'goods_sales_price', 'goods_cover');
-            },
-            'skus'=>function($query){
-                $query->select('goods_sku_id','join_sku_goods_id','goods_sku_specs_json','goods_sku_sales_price');
-            },
-            'sku'
-        ])->where('join_goods_coupon_id', $couponId)
-            ->get()
-            ->toArray();
-        $goodsIds = [];
-        $goodsContent = [];
-        foreach ($couponGoods as $couponGood) {
-            $goodsIds[] = $couponGood['join_coupon_goods_id'];
-            $content = [
-                'goods_id' => $couponGood['join_coupon_goods_id'],
-                'sku_id' => $couponGood['join_coupon_goods_sku_id'],
-            ];
-            if (isset($couponGood['goods'])) {
-                $content['goods_name'] = $couponGood['goods']['name'];
-                $content['goods_classify'] = $couponGood['goods']['goods_classify'];
-                $content['goods_cover'] = getenv('STORAGE_DOMAIN') . $couponGood['goods']['goods_cover'];
+        try {
+            $couponId = $request->get('coupon_id', '');
+            if (!$couponId) {
+                return json_fail('参数异常');
+            }
+            $coupon = Coupon::where('coupon_id', $couponId)->first();
+            if (!$coupon) {
+                return json_fail('数据异常');
             }
-            if (isset($couponGood['sku']) && isset($couponGood['sku']['goods_sku_specs_json'])) {
+            // 拼选择的商品
+            $couponGoods = CouponGoods::with([
+                'goods' => function ($query) {
+                    $query->select('goods_id', 'goods_id as id', 'goods_name as name', 'join_goods_category_id as pid', 'goods_classify', 'goods_sales_price', 'goods_cover');
+                },
+                'skus'=>function($query){
+                    $query->select('goods_sku_id','join_sku_goods_id','goods_sku_specs_json','goods_sku_sales_price');
+                },
+                'sku'
+            ])->where('join_goods_coupon_id', $couponId)
+                ->get()
+                ->toArray();
+            $goodsIds = [];
+            $goodsContent = [];
+            foreach ($couponGoods as $couponGood) {
+                $goodsIds[] = $couponGood['join_coupon_goods_id'];
+                $content = [
+                    'goods_id' => $couponGood['join_coupon_goods_id'],
+                    'sku_id' => $couponGood['join_coupon_goods_sku_id'],
+                ];
+                if (isset($couponGood['goods'])) {
+                    $content['goods_name'] = $couponGood['goods']['name'];
+                    $content['goods_classify'] = $couponGood['goods']['goods_classify'];
+                    $content['goods_cover'] = getenv('STORAGE_DOMAIN') . $couponGood['goods']['goods_cover'];
+                }
+                if (isset($couponGood['sku']) && isset($couponGood['sku']['goods_sku_specs_json'])) {
 //                $skuSpecsJson = json_decode($couponGood['sku']['goods_sku_specs_json'], true);
 //                $skuName = '';
 //                foreach ($skuSpecsJson as $item) {
@@ -829,78 +815,84 @@ class CouponController extends Curd
 //                    $skuName .= $item . '，';
 //                }
 //                $content['sku_name'] = rtrim($skuName, '，');
-                $content['goods_sales_price'] = $couponGood['sku']['goods_sku_sales_price'];
-            }
-            if (isset($couponGood['skus'])) {
-                foreach ($couponGood['skus'] as $key => $skus) {
-                    if (!empty($skus['goods_sku_specs_json'])) {
-                        $skuSpecsJson = json_decode($skus['goods_sku_specs_json'], true);
-                        $skuName = '';
-                        foreach ($skuSpecsJson as $item) {
-                            if (is_array($item)) {
-                                $item = implode('', $item);
+                    $content['goods_sales_price'] = $couponGood['sku']['goods_sku_sales_price'];
+                }
+                if (isset($couponGood['skus'])) {
+                    foreach ($couponGood['skus'] as $key => $skus) {
+                        if (!empty($skus['goods_sku_specs_json'])) {
+                            $skuSpecsJson = json_decode($skus['goods_sku_specs_json'], true);
+                            $skuName = '';
+                            foreach ($skuSpecsJson as $item) {
+                                if (is_array($item)) {
+                                    $item = implode('', $item);
+                                }
+                                $skuName .= $item . ',';
                             }
-                            $skuName .= $item . '，';
+                            $couponGood['skus'][$key]['sku_name'] = rtrim($skuName, ',');
                         }
-                        $couponGood['skus'][$key]['sku_name'] = rtrim($skuName, ', ');
                     }
+                    $content['skus'] = $couponGood['skus'];
                 }
-                $content['skus'] = $couponGood['skus'];
+                $goodsContent[] = $content;
             }
-            $goodsContent[] = $content;
-        }
-        // 选中的会员
-        $memberLists = [];
-        // 可用门店
-        $premises = [];
-        if (!empty($coupon->coupon_json)) {
-            $couponJson = json_decode($coupon->coupon_json, true);
-            if (isset($couponJson['member']) && isset($couponJson['member']['list']) && !empty($couponJson['member']['list'])) {
-                $res = Db::table('member')
-                    ->leftjoin('member_cert', 'member.member_id', '=', 'member_cert.join_cert_member_id')
-                    ->leftjoin('member_info', 'member.member_id', '=', 'member_info.join_info_member_id')
-                    ->select('member.member_id', 'member.member_mobile', 'member_cert.member_cert_name', 'member_info.member_info_nickname')
-                    ->where('member_status', 'ACTIVED')
-                    ->whereIn('member_id', $couponJson['member']['list'])
-                    ->get();
-                $memberLists = [];
-                foreach ($res as $item) {
-                    $name = '';
-                    if (!empty($item->member_cert_name)) {
-                        $name = $item->member_cert_name;
-                    } else if (!empty($item->member_info_nickname)) {
-                        $name = $item->member_info_nickname;
-                    }
-                    $value = !empty($name) ? $name . '-' : '';
-                    if ($item->member_mobile != '0000') {
-                        $value .= $item->member_mobile;
-                    }
-                    if (empty($value)) {
-                        $value = $item->member_mobile;
+            // 选中的会员
+            $memberLists = [];
+            // 可用门店
+            $premises = [];
+            if (!empty($coupon->coupon_json)) {
+                $couponJson = json_decode($coupon->coupon_json, true);
+                if (isset($couponJson['member']) && isset($couponJson['member']['list']) && !empty($couponJson['member']['list'])) {
+                    $res = Db::table('member')
+                        ->leftjoin('member_cert', 'member.member_id', '=', 'member_cert.join_cert_member_id')
+                        ->leftjoin('member_info', 'member.member_id', '=', 'member_info.join_info_member_id')
+                        ->select('member.member_id', 'member.member_mobile', 'member_cert.member_cert_name', 'member_info.member_info_nickname')
+                        ->where('member_status', 'ACTIVED')
+                        ->whereIn('member_id', $couponJson['member']['list'])
+                        ->get();
+                    $memberLists = [];
+                    foreach ($res as $item) {
+                        $name = '';
+                        if (!empty($item->member_cert_name)) {
+                            $name = $item->member_cert_name;
+                        } else if (!empty($item->member_info_nickname)) {
+                            $name = $item->member_info_nickname;
+                        }
+                        $value = !empty($name) ? $name . '-' : '';
+                        if ($item->member_mobile != '0000') {
+                            $value .= $item->member_mobile;
+                        }
+                        if (empty($value)) {
+                            $value = $item->member_mobile;
+                        }
+                        $value = rtrim($value, '-');
+                        $memberLists[] = [
+                            'key' => $item->member_id,
+                            'value' => $value,
+                        ];
                     }
-                    $value = rtrim($value, '-');
-                    $memberLists[] = [
-                        'key' => $item->member_id,
-                        'value' => $value,
-                    ];
+                }
+                if (isset($couponJson['premises']) && !empty($couponJson['premises'])) {
+                    $premises = SysDept::whereIn('dept_id', $couponJson['premises'])
+                        ->select('dept_id', 'dept_name')
+                        ->get()
+                        ->toArray();
                 }
             }
-            if (isset($couponJson['premises']) && !empty($couponJson['premises'])) {
-                $premises = SysDept::whereIn('dept_id', $couponJson['premises'])
-                    ->select('dept_id', 'dept_name')
-                    ->get()
-                    ->toArray();
-            }
-        }
 
-        $data = [
-            'goods_ids' => $goodsIds,
-            'goods_content' => $goodsContent,
-            'member_lists' => $memberLists,
-            'premises_list' => $premises
-        ];
+            $data = [
+                'goods_ids' => $goodsIds,
+                'goods_content' => $goodsContent,
+                'member_lists' => $memberLists,
+                'premises_list' => $premises
+            ];
+
+            Log::info("查询优惠券详情成功");
+            return json_success('', $data);
 
-        return json_success('', $data);
+        } catch (\Exception $e) {
+            Log::error("查询优惠券详情失败", ['msg' => $e->getMessage()]);
+            return json_fail('查询失败');
+        }
     }
 
     /**

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();
             }
 

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)

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);
                 }
             }

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();
                 }
             }
@@ -1864,7 +1883,8 @@ class GoodsController extends Curd
                     'order_config_json' => $params['order_config_json'] ?? '[]',
                     'order_express_json' => $params['order_express_json'] ?? '[]',
                     'order_extend_json' => $params['order_extend_json'] ? json_encode($params['order_extend_json']) : '[]',
-                    'order_addtimes' => time()
+                    'order_addtimes' => time(),
+                    'order_add_user_id'=>JwtToken::getCurrentId()
                 ];
 
                 Order::insert($data);
@@ -1904,6 +1924,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("下单扣款", "扣款失败");

app/admin/controller/order/KangyangCityController.php

@@ -33,6 +33,7 @@ use support\exception\BusinessException;
 use support\Redis;
 use support\Request;
 use support\Response;
+use Tinywan\Jwt\JwtToken;
 use Webman\Event\Event;
 
 class KangyangCityController extends Curd
@@ -683,7 +684,8 @@ class KangyangCityController extends Curd
                 'order_config_json' => $params['order_config_json'] ?? '[]',
                 'order_express_json' => $params['order_express_json'] ?? '[]',
                 'order_extend_json' => $params['order_extend_json'] ? json_encode($params['order_extend_json']) : '[]',
-                'order_addtimes' => time()
+                'order_addtimes' => time(),
+                'order_add_user_id'=>JwtToken::getCurrentId()
             ];
 
             Order::insert($data);

app/admin/controller/order/NewCustomerController.php

@@ -34,6 +34,7 @@ use support\exception\BusinessException;
 use support\Redis;
 use support\Request;
 use support\Response;
+use Tinywan\Jwt\JwtToken;
 use Webman\Event\Event;
 use Yansongda\Pay\Pay;
 
@@ -627,7 +628,8 @@ class NewCustomerController extends Curd
                 'order_config_json' => $params['order_config_json'] ?? '[]',
                 'order_express_json' => $params['order_express_json'] ?? '[]',
                 'order_extend_json' => $params['order_extend_json'] ? json_encode($params['order_extend_json']) : '[]',
-                'order_addtimes' => time()
+                'order_addtimes' => time(),
+                'order_add_user_id'=>JwtToken::getCurrentId()
             ];
 
             Order::insert($data);

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;
@@ -2007,7 +2012,8 @@ class PackagesController extends Curd
                     'order_config_json' => $params['order_config_json'] ?? '[]',
                     'order_express_json' => $params['order_express_json'] ?? '[]',
                     'order_extend_json' => $params['order_extend_json'] ? json_encode($params['order_extend_json']) : '[]',
-                    'order_addtimes' => time()
+                    'order_addtimes' => time(),
+                    'order_add_user_id'=>JwtToken::getCurrentId()
                 ];
 
                 Order::insert($data);

app/admin/controller/order/PartnerController.php

@@ -33,6 +33,7 @@ use support\exception\BusinessException;
 use support\Redis;
 use support\Request;
 use support\Response;
+use Tinywan\Jwt\JwtToken;
 use Webman\Event\Event;
 use Yansongda\Pay\Pay;
 
@@ -647,7 +648,8 @@ class PartnerController extends Curd
                 'order_config_json' => $params['order_config_json'] ?? '[]',
                 'order_express_json' => $params['order_express_json'] ?? '[]',
                 'order_extend_json' => $params['order_extend_json'] ? json_encode($params['order_extend_json']) : '[]',
-                'order_addtimes' => time()
+                'order_addtimes' => time(),
+                'order_add_user_id'=>JwtToken::getCurrentId()
             ];
 
             Order::insert($data);

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) {

app/admin/controller/order/RechargeController.php

@@ -34,6 +34,7 @@ use support\exception\BusinessException;
 use support\Redis;
 use support\Request;
 use support\Response;
+use Tinywan\Jwt\JwtToken;
 use Webman\Event\Event;
 use Yansongda\Pay\Pay;
 
@@ -316,7 +317,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 +492,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']);
@@ -568,7 +569,8 @@ class RechargeController extends Curd
                 'order_config_json' => json_encode(['order_category' => 'RECHARGE']),
                 'order_express_json' => $params['order_express_json'] ?? '[]',
                 'order_extend_json' => $params['order_extend_json'] ? json_encode($params['order_extend_json']) : '[]',
-                'order_addtimes' => time()
+                'order_addtimes' => time(),
+                'order_add_user_id'=>JwtToken::getCurrentId()
             ];
 
             Order::insert($data);
@@ -1113,7 +1115,7 @@ class RechargeController extends Curd
                 }
                 // 入收支明细表
                 $params['orderId'] = $order['order_id'];
-                $params['inout_category'] = '会员充值订单';
+                $params['inout_category'] = '会员充值';
                 Event::dispatch('statistics.inout.in', $params);
 
                 // 充值回调

app/admin/controller/order/ReferrerController.php

@@ -33,6 +33,7 @@ use support\exception\BusinessException;
 use support\Redis;
 use support\Request;
 use support\Response;
+use Tinywan\Jwt\JwtToken;
 use Webman\Event\Event;
 use Yansongda\Pay\Pay;
 
@@ -642,7 +643,8 @@ class ReferrerController extends Curd
                 'order_config_json' => $params['order_config_json'] ?? '[]',
                 'order_express_json' => $params['order_express_json'] ?? '[]',
                 'order_extend_json' => $params['order_extend_json'] ? json_encode($params['order_extend_json']) : '[]',
-                'order_addtimes' => time()
+                'order_addtimes' => time(),
+                'order_add_user_id'=>JwtToken::getCurrentId()
             ];
 
             Order::insert($data);

app/admin/controller/order/RefundController.php

@@ -553,7 +553,7 @@ class RefundController extends Curd
                     $response = $this->refundToAlipay($payDetail0, $amount);
                 } elseif ($payWay[0] == 'MONEY') {
                     $prepayid = 'MONEY';
-                    $response = $this->refundToCash($payDetail0, $amount);
+                    // $response = $this->refundToCash($order->join_order_member_id, $amount);
                 } elseif (isset($payWay[1]) && $payWay[1] == 'CASH') {
                     $prepayid = $order->join_order_member_id . '-CASH';
                     $this->refundToCash($order->join_order_member_id, $amount);
@@ -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)

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();
                 }
             }
@@ -1973,7 +1992,8 @@ class ServicesController extends Curd
                     'order_config_json' => $params['order_config_json'] ?? '[]',
                     'order_express_json' => $params['order_express_json'] ?? '[]',
                     'order_extend_json' => $params['order_extend_json'] ? json_encode($params['order_extend_json']) : '[]',
-                    'order_addtimes' => time()
+                    'order_addtimes' => time(),
+                    'order_add_user_id'=>JwtToken::getCurrentId()
                 ];
 
                 Order::insert($data);

app/admin/controller/order/WholeController.php

@@ -493,7 +493,7 @@ class WholeController extends Curd
                     $query->whereJsonContains('join_pay_object_json->order_id', $orderId)->orWhere('join_pay_object_json', '')->orWhereNull('join_pay_object_json');
                 })->where('pay_category', '<>', 'REFUND')
                 ->where('pay_status', 'SUCCESS')
-                ->where('pay_prepayid','<>','')
+                ->where('pay_prepayid', '<>', '')
                 ->select('pay_id', 'pay_category', 'pay_prepayid', 'pay_paytimes', 'pay_status', 'pay_amount', 'pay_extend_json')
                 ->get();
             if (count($payDetails) > 1) {
@@ -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;
@@ -1049,6 +1053,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();
             } else if ($params['pay_category'] == 'CARD') {  // 储值卡账户
                 $cardNbr = $params['card_nbr'];
@@ -1078,6 +1084,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;
@@ -1581,6 +1589,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();
                 // 生成支付记录
                 OrderService::createPayConstituteDetail($params, $payDetail);
@@ -1622,6 +1632,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();
                 // 生成支付记录
                 OrderService::createPayConstituteDetail($params, $payDetail);
@@ -1865,6 +1877,8 @@ class WholeController extends Curd
                         ->first();
                     $memberAccount->member_account_expend = $memberAccount->member_account_expend - $payDetail->pay_amount;
                     $memberAccount->member_account_surplus = $memberAccount->member_account_surplus + $payDetail->pay_amount;
+                    $memberAccount->member_account_update_user_id = JwtToken::getCurrentId();
+                    $memberAccount->member_account_updatetimes = time();
                     $memberAccount->save();
                 }
                 // 员工福利支付
@@ -1874,6 +1888,8 @@ class WholeController extends Curd
                         ->first();
                     $memberAccount->member_account_expend = $memberAccount->member_account_expend - $payDetail->pay_amount;
                     $memberAccount->member_account_surplus = $memberAccount->member_account_surplus + $payDetail->pay_amount;
+                    $memberAccount->member_account_update_user_id = JwtToken::getCurrentId();
+                    $memberAccount->member_account_updatetimes = time();
                     $memberAccount->save();
                 }
                 // 删支付记录
@@ -2108,6 +2124,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') {
                     $params['order_status_system'] = $systemStatus;
@@ -2137,6 +2155,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') {
                     $params['order_status_system'] = $systemStatus;
@@ -2235,6 +2255,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();
             } else if ($params['settlement_now'] == 'Y' && $params['pay_category'] == 'CARD') {  // 储值卡账户
                 $cardNbr = $params['card_nbr'];
@@ -2265,6 +2287,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') {
@@ -2812,6 +2836,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();
 
                 $params['order_status_system'] = $systemStatus;
@@ -2857,6 +2883,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();
 
 
@@ -3197,7 +3225,8 @@ class WholeController extends Curd
                 'order_config_json' => $params['order_config_json'] ?? '[]',
                 'order_express_json' => $params['order_express_json'] ?? '[]',
                 'order_extend_json' => $params['order_extend_json'] ? json_encode($params['order_extend_json']) : '[]',
-                'order_addtimes' => time()
+                'order_addtimes' => time(),
+                'order_add_user_id' => JwtToken::getCurrentId()
             ];
 
             Order::insert($data);
@@ -3687,6 +3716,8 @@ class WholeController extends Curd
             }
 
             // 该订单状态
+            $orderData['order_update_user_id'] = JwtToken::getCurrentId();
+            $orderData['order_updatetimes'] = time();
             Order::where('order_id', $request->post('order_id'))->update($orderData);
             // 该订单Sheet状态
             OrderSheet::where('join_sheet_order_id', $request->post('order_id'))->update($orderSheetData);
@@ -4081,6 +4112,12 @@ class WholeController extends Curd
                         Event::dispatch('order.write_off', $params);
                     }
                 }
+
+                // 写核销人
+                Order::where('order_id', $benefit['join_benefit_order_id'])->update([
+                    'order_update_user_id' => JwtToken::getCurrentId(),
+                    'order_updatetimes' => time()
+                ]);
             }
 
 //            Redis::del($key);
@@ -4091,7 +4128,7 @@ class WholeController extends Curd
             return json_success('核销成功');
         } catch (\Exception $e) {
             unset($appointmentIds);
-            dump($e->getMessage() . $e->getLine());
+            Log::error('核销失败', ['msg' => $e->getMessage()]);
             Db::rollBack();
             _syslog("订单", "核销失败");
             return json_fail('核销失败');
@@ -4320,6 +4357,8 @@ class WholeController extends Curd
                     ->first();
                 $account->member_account_expend = $account->member_account_expend - $amount;
                 $account->member_account_surplus = $account->member_account_surplus + $amount;
+                $account->member_account_update_user_id = JwtToken::getCurrentId();
+                $account->member_account_updatetimes = time();
                 $account->save();
 
                 $data = [
@@ -4338,6 +4377,8 @@ class WholeController extends Curd
                     ->first();
                 $account->member_account_expend = $account->member_account_expend - $amount;
                 $account->member_account_surplus = $account->member_account_surplus + $amount;
+                $account->member_account_update_user_id = JwtToken::getCurrentId();
+                $account->member_account_updatetimes = time();
                 $account->save();
 
                 $data = [
@@ -5136,6 +5177,8 @@ class WholeController extends Curd
             } else {
                 $account->member_account_surplus = $account->member_account_surplus - $amount;
             }
+            $account->member_account_update_user_id = JwtToken::getCurrentId();
+            $account->member_account_updatetimes = time();
             $account->save();
 
             PayDetail::where('pay_prepayid', $accountNbr)
@@ -5249,7 +5292,7 @@ class WholeController extends Curd
                     $this->insertMemberBenefit($params, $goods);
                 }
 
-                $this->sendCoupon($params, ['goods_id'=>$params['packageId']], $params['orderId']);
+                $this->sendCoupon($params, ['goods_id' => $params['packageId']], $params['orderId']);
             }
         } catch (\Exception $e) {
             _syslog("下单", '权益设置失败');
@@ -5272,6 +5315,7 @@ class WholeController extends Curd
         }
 
     }
+
     public function deductAccount($orderId, $orderGroup, $payWay)
     {
         $payDetails = PayDetail::where('join_pay_order_id', $orderGroup)
@@ -5293,6 +5337,8 @@ class WholeController extends Curd
                 $account = MemberAccount::where('member_account_nbr', $key)->first();
                 $account->member_account_expend = $account->member_account_expend + $amount;
                 $account->member_account_surplus = $account->member_account_surplus - $amount;
+                $account->member_account_update_user_id = JwtToken::getCurrentId();
+                $account->member_account_updatetimes = time();
                 $account->save();
             }
         }