Merge branch 'master' of http://39.98.194.76:3000/txct/wanyue_app

app/admin/controller/content/SubjectController.php

@@ -4,8 +4,11 @@ namespace app\admin\controller\content;
 
 use app\controller\Curd;
 use app\model\Content;
+use app\model\Goods;
+use support\exception\BusinessException;
 use support\Request;
 use support\Response;
+use Tinywan\Jwt\JwtToken;
 
 class SubjectController extends Curd
 {
@@ -18,8 +21,133 @@ class SubjectController extends Curd
     {
         [$where, $format, $limit, $field, $order] = $this->selectInput($request);
         $where['content_category'] = 'SUBJECT';
+        $field = 'content_addtimes';
+        $order = 'DESC';
         $this->model = $this->model->with('user');
         $query = $this->doSelect($where, $field, $order);
         return $this->doFormat($query, $format, $limit);
     }
+
+    /**
+     * @Desc 详情
+     * @Author Gorden
+     * @Date 2024/11/8 13:24
+     *
+     * @param Request $request
+     * @return Response
+     */
+    public function info(Request $request): Response
+    {
+        $primaryKey = $this->model->getKeyName();
+
+        $data = $this->model->with('user')->where($primaryKey, $request->get('id'))->first();
+
+        if (method_exists($this, "afterInfoQuery")) {
+            $data = call_user_func([$this, "afterInfoQuery"], $data);
+        }
+
+        return json_success('', $data);
+    }
+
+    public function afterInfoQuery($item)
+    {
+        if (!empty($item->content_config_json)) {
+            $contentConfigJson = json_decode($item->content_config_json, true);
+            if (!empty($contentConfigJson['cate'])) {
+                $item->cate = $contentConfigJson['cate'];
+            }
+            if (!empty($contentConfigJson['goods'])) {
+                $goodsIds = array_column($contentConfigJson['goods'], 'goods_id');
+                $goodsList = Goods::whereIn('goods_id', $goodsIds)
+                    ->select('goods_cover', 'goods_id', 'goods_name', 'goods_market_price', 'goods_sales_price')
+                    ->get()
+                    ->toArray();
+                $formGoods = [];
+                foreach ($goodsList as $key => $goods){
+                    foreach ($contentConfigJson['goods'] as $cateGoods){
+                        if($cateGoods['goods_id'] == $goods['goods_id']){
+                            $goodsList[$key]['cate'] = $cateGoods['cate'];
+                            $formGoods[] = [
+                                'cate' => $cateGoods['cate'],
+                                'goods_id' => $cateGoods['goods_id'],
+                            ];
+                        }
+                    }
+                    $goodsList[$key]['goods_cover'] = getenv('STORAGE_DOMAIN').$goods['goods_cover'];
+                }
+                $item->goods = $formGoods;
+                $item->goodsList = $goodsList;
+            }
+            if (!empty($contentConfigJson['slider'])) {
+                $sliders = [];
+                $originSliders = [];
+                foreach ($contentConfigJson['slider'] as $slider) {
+                    $sliders[] = getenv('STORAGE_DOMAIN') . $slider['url'];
+                    $originSliders[] = getenv('STORAGE_DOMAIN').str_replace('/thumb','',$slider['url']);
+                }
+                $item->sliders = $sliders;
+                $item->originSliders = $originSliders;
+            }
+        }
+
+        return $item;
+    }
+
+    public function insertInput(Request $request): array
+    {
+        $params = $request->post();
+        $data = $this->inputFilter($request->post());
+        $contentConfigJson = [];
+        if (!empty($params['sliders'])) {
+            $sliders = explode(',', $params['sliders']);
+            foreach ($sliders as $slider) {
+                $contentConfigJson['slider'][] = ['url' => str_replace(getenv('STORAGE_DOMAIN'), '', $slider)];
+            }
+        }
+        if (!empty($params['cate'])) {
+            $contentConfigJson['cate'] = $params['cate'];
+        }
+        if (!empty($params['goods'])) {
+            $contentConfigJson['goods'] = $params['goods'];
+        }
+        $data['content_config_json'] = json_encode($contentConfigJson);
+        $data['creator_user_id'] = JwtToken::getCurrentId();
+        $data['join_content_category_id'] = 207;
+
+        return $data;
+    }
+
+    protected function updateInput(Request $request): array
+    {
+        $params = $request->post();
+        $primary_key = $this->model->getKeyName();
+        $id = $request->post($primary_key);
+        $data = $this->inputFilter($request->post());
+        $model = $this->model->find($id);
+        if (!$model) {
+            throw new BusinessException('记录不存在', 2);
+        }
+        $contentConfigJson = [];
+        if (!empty($model->content_config_json)){
+            $contentConfigJson = json_decode($model->content_config_json,true);
+        }
+        if (!empty($params['sliders'])) {
+            $contentConfigJson['slider'] = [];
+            $sliders = explode(',', $params['sliders']);
+            foreach ($sliders as $slider) {
+                $contentConfigJson['slider'][] = ['url' => str_replace(getenv('STORAGE_DOMAIN'), '', $slider)];
+            }
+        }
+        if (!empty($params['cate'])) {
+            $contentConfigJson['cate'] = $params['cate'];
+        }
+        if (!empty($params['goods'])) {
+            $contentConfigJson['goods'] = $params['goods'];
+        }
+        $data['content_config_json'] = json_encode($contentConfigJson);
+        $data['content_updatetimes'] = time();
+
+        unset($data[$primary_key]);
+        return [$id, $data];
+    }
 }

app/admin/controller/goods/EntityGoodsController.php

@@ -24,6 +24,19 @@ class EntityGoodsController
         return GoodsService::select($request, 'GOODS');
     }
 
+    /**
+     * @Desc 搜索产品
+     * @Author Gorden
+     * @Date 2024/11/8 10:12
+     *
+     * @param Request $request
+     * @return Response
+     */
+    public function selectIdNameList(Request $request)
+    {
+        return GoodsService::selectIdNameList($request);
+    }
+
     public function selectAll(Request $request)
     {
         $goodsIds = $request->get('goods_id', '');

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

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

app/admin/controller/sys_manage/LogsController.php

@@ -32,14 +32,17 @@ class LogsController extends Curd
         $order = $request->get('order', 'desc');
         $field = $field ?? 'log_create_time';
 
-        if(!empty($where['log_admin_id'])){
-            $userIds = SysUser::where('user_name','like','%'.$where['log_admin_id'].'%')->pluck('user_id')->toArray();
-            $where['log_admin_id'] = ['in',$userIds];
+        if (!empty($where['log_admin_id'])) {
+            $userIds = SysUser::where('user_name', 'like', '%' . $where['log_admin_id'] . '%')->pluck('user_id')->toArray();
+            $where['log_admin_id'] = ['in', $userIds];
         }
-        if(!empty($where['log_create_time'])){
+        if (!empty($where['log_create_time'])) {
             $where['log_create_time'][0] = strtotime($where['log_create_time'][0]);
             $where['log_create_time'][1] = strtotime($where['log_create_time'][1]);
         }
+        if (!empty($where['log_operation'])) {
+            $where['log_operation'] = ['like', $where['log_operation']];
+        }
 
         $query = $this->doSelect($where, $field, $order);
         return $this->doFormat($query, $format, $limit);

app/admin/service/goods/GoodsService.php

@@ -38,6 +38,29 @@ class GoodsService
         return json_success('', $goods);
     }
 
+    /**
+     * @Desc 产品搜索
+     * @Author Gorden
+     * @Date 2024/11/8 10:10
+     *
+     * @param Request $request
+     * @return Response
+     */
+    public static function selectIdNameList(Request $request)
+    {
+        $keywords = $request->get('keywords');
+        if (!$keywords) {
+            return json_fail('参数异常');
+        }
+
+        $goods = Goods::where('goods_name', 'like', '%' . $keywords . '%')
+            ->select('goods_id', 'goods_name')
+            ->get()
+            ->toArray();
+
+        return json_success('success', $goods);
+    }
+
     public static function selectAllByGoodsName($goodsName)
     {
         $goods = Goods::with('sku')
@@ -1924,13 +1947,13 @@ class GoodsService
                 $attributeJson['min-count'] = $params['min_count'];
                 $model->goods_attribute_json = json_encode($attributeJson);
             }
-            if (isset($params['max_limit'])){
+            if (isset($params['max_limit'])) {
                 $attributeJson = [];
                 if (!empty($model->goods_attribute_json) && !is_array($model->goods_attribute_json)) {
                     $attributeJson = json_decode($model->goods_attribute_json, true);
                 }
                 $attributeJson['max-limit'] = $params['max_limit'];
-                if ($attributeJson['max-limit'] == 0 || $attributeJson['max-limit'] == ''){
+                if ($attributeJson['max-limit'] == 0 || $attributeJson['max-limit'] == '') {
                     unset($attributeJson['max-limit']);
                 }
             }
@@ -2515,11 +2538,11 @@ class GoodsService
             if (isset($params['max_limit'])) {
                 if (!empty($data['goods_attribute_json']) && !is_array($data['goods_attribute_json'])) {
                     $data['goods_attribute_json'] = json_decode($data['goods_attribute_json'], true);
-                }elseif (empty($data['goods_attribute_json'])) {
+                } elseif (empty($data['goods_attribute_json'])) {
                     $data['goods_attribute_json'] = [];
                 }
                 $data['goods_attribute_json']['max-limit'] = $params['max_limit'];
-                if ($data['goods_attribute_json']['max-limit'] == 0 || $data['goods_attribute_json']['max-limit'] == ''){
+                if ($data['goods_attribute_json']['max-limit'] == 0 || $data['goods_attribute_json']['max-limit'] == '') {
                     unset($data['goods_attribute_json']['max-limit']);
                 }
                 $data['goods_attribute_json'] = json_encode($data['goods_attribute_json']);

route/admin.php

@@ -42,6 +42,7 @@ Route::group('/admin', function () {
         ]);
         Route::group('/subject', function () {
             Route::get('/list', [\app\admin\controller\content\SubjectController::class, 'select']);
+            Route::get('/info', [\app\admin\controller\content\SubjectController::class, 'info']);
             Route::post('/add', [\app\admin\controller\content\SubjectController::class, 'insert']);
             Route::post('/update', [\app\admin\controller\content\SubjectController::class, 'update']);
             Route::delete('/delete', [\app\admin\controller\content\SubjectController::class, 'delete']);
@@ -61,6 +62,7 @@ Route::group('/admin', function () {
         /* 实物商品管理 */
         Route::group('/entity', function () {
             Route::get('/selectAll', [\app\admin\controller\goods\EntityGoodsController::class, 'selectAll']);
+            Route::get('/selectIdNameList', [\app\admin\controller\goods\EntityGoodsController::class, 'selectIdNameList']);
             Route::get('/selectAllByGoodsName', [\app\admin\controller\goods\EntityGoodsController::class, 'selectAllByGoodsName']);
             Route::get('/selectAllByCategoryForRuleAddComponent', [\app\admin\controller\goods\EntityGoodsController::class, 'selectAllByCategoryForRuleAddComponent']);
             Route::get('/getPremises', [\app\admin\controller\goods\EntityGoodsController::class, 'selectPremisesByGoodsId']);