补字段

app/admin/controller/client/PointsController.php

@@ -2,9 +2,11 @@
 
 namespace app\admin\controller\client;
 
+use app\admin\service\member\MemberService;
 use app\controller\Curd;
 use app\model\ClientFavorite;
 use app\model\ClientPoints;
+use app\model\MemberRole;
 use support\Request;
 use support\Response;
 
@@ -36,7 +38,7 @@ class PointsController extends Curd
             ->leftJoin('member_info', 'member_info.join_info_member_id', '=', 'client_points.join_client_points_member_id')
             ->leftJoin('member_cert', 'member_cert.join_cert_member_id', '=', 'client_points.join_client_points_member_id')
             ->leftJoin('order', 'order.order_id', '=', 'client_points.join_client_points_order_id')
-            ->select('member.member_id', 'member.member_mobile','member_info.member_info_nickname','member_cert.member_cert_name', 'order.order_id', 'order.order_name', 'client_points.*');
+            ->select('member.member_id', 'member.member_mobile', 'member_info.member_info_nickname', 'member_cert.member_cert_name', 'order.order_id', 'order.order_name', 'client_points.*');
 
         foreach ($where as $column => $value) {
             if (is_array($value)) {
@@ -84,8 +86,32 @@ class PointsController extends Curd
     public function info(Request $request): Response
     {
         $pointsId = $request->get('points_id');
-        if (!$pointsId){
+        if (!$pointsId) {
             return json_fail('参数异常');
         }
+
+        $points = ClientPoints::with([
+            'orders',
+            'goods',
+            'member' => function ($query) {
+                $query->select('member_id','join_member_role_id', 'member_mobile', 'member_is_owner', 'member_is_vip', 'member_is_partner', 'member_is_referrer');
+            },
+            'memberInfo' => function ($query) {
+                $query->select('join_info_member_id', 'member_info_nickname','member_info_headimg');
+            },
+            'memberCert' => function ($query) {
+                $query->select('join_cert_member_id', 'member_cert_name');
+            },
+        ])->where('client_points_id', $pointsId)
+            ->first();
+
+        $mobile = !empty($points->member) && !empty($points->member->member_mobile) ? $points->member->member_mobile : '';
+        $nickname = !empty($points->memberInfo) && !empty($points->memberInfo->member_info_nickname) ? $points->memberInfo->member_info_nickname : '';
+        $certname = !empty($points->memberCert) && !empty($points->memberCert->member_cert_name) ? $points->memberCert->member_cert_name : '';
+        $points->member_name = MemberService::getMemberName($mobile, $certname, $nickname);
+        $points->member_info_headimg = MemberService::getAvatarUrl(!empty($points->memberInfo) ? $points->memberInfo->member_info_headimg : '');
+        $points->role_name = !empty($points->member) && !empty($points->member_name->join_member_role_id) ? MemberRole::where('member_role_id',$points->member_name->join_member_role_id)->value('member_role_name') : '';
+
+        return json_success("success", $points);
     }
 }

app/admin/controller/goods/NewCustomerController.php

@@ -30,12 +30,10 @@ class NewCustomerController
      */
     public function info(Request $request)
     {
-        dump(1);
         $validate = new GoodsValidate();
         if (!$validate->scene('info')->check($request->get())) {
             return json_fail($validate->getError());
         }
-        dump(2);
 
         return NewCustomerService::info($request->get('goods_id'));
     }
@@ -49,13 +47,11 @@ class NewCustomerController
      */
     public function update(Request $request): Response
     {
-        dump(1);
         $validate = new GoodsValidate();
         if (!$validate->scene('update')->check($request->post())) {
             return json_fail($validate->getError());
         }
 
-        dump(1);
         return NewCustomerService::update($request->post());
     }
 }

app/admin/controller/member/BenefitController.php

@@ -330,6 +330,8 @@ class BenefitController extends Curd
             if (!empty($quota['appointment_done_json'])) {
                 $doneJson = json_decode($quota['appointment_done_json'], true);
                 $quota['premises'] = $doneJson['charge']['charge_premises'] ?? '';
+                $quota['remark'] = $doneJson['charge']['charge_content'] ?? '';
+                $quota['charge_waiter'] = $doneJson['charge']['charge_waiter'] ?? '';
                 if (isset($doneJson['charge']['charge_user_id'])) {
                     $user = SysUser::where('user_id', $doneJson['charge']['charge_user_id'])
                         ->select('user_id', 'user_name')

app/admin/controller/member/QuotaController.php

@@ -49,7 +49,11 @@ class QuotaController extends Curd
         }
 
         if (!empty($memberId)) {
-            $memberIds = $memberId;
+            if (is_array($memberId)) {
+                $memberIds = $memberId;
+            }else{
+                $memberIds = [$memberId];
+            }
         }
 
         foreach ($memberIds as &$id) {
@@ -57,10 +61,6 @@ class QuotaController extends Curd
         }
 
         $rows = MemberQuota::select('join_quota_member_id', 'join_member_rule_added_component_id', Db::raw('MAX(`member_quota_addtimes`) as `new_addtimes`'))
-
-//            ->when(!empty($memberIds), function ($query) use ($placeholders,$pars) {
-//                $query->whereRaw("join_quota_member_id in ($placeholders))", $pars);
-//            })
             ->when(!empty($memberIds), function ($query) use ($memberIds) {
                 $query->whereIn('join_quota_member_id', $memberIds);
             })
@@ -231,6 +231,7 @@ class QuotaController extends Curd
                 $usedJson = json_decode($quota['member_quota_used_json'], true);
                 $quota['premises'] = $usedJson['charge']['charge_premises'] ?? '';
                 $quota['remark'] = $usedJson['charge']['charge_content'] ?? '';
+                $quota['charge_waiter'] = $usedJson['charge']['charge_waiter'] ?? '';
                 if (isset($usedJson['charge']['charge_user_id'])) {
                     $user = SysUser::where('user_id', $usedJson['charge']['charge_user_id'])
                         ->select('user_id', 'user_name')
@@ -288,7 +289,6 @@ class QuotaController extends Curd
         if ($redisCode != $code) {
             return json_fail("验证码错误，请重新输入");
         }
-        Redis::del($key);
 
         if (!$times) {
             $params['times'] = date('Y-m-d H:i:s');
@@ -319,6 +319,8 @@ class QuotaController extends Curd
                     MemberQuota::insert($quota);
                 }
             }
+            // 清除验证码
+            Redis::del($key);
 
             _syslog("核销", "核销成功");
 

app/admin/controller/order/PayDetailController.php

@@ -53,11 +53,11 @@ class PayDetailController extends Curd
         //     $where['pay_category'] = 'RECHARGE';
         //     $where['pay_prepayid'] = ['in','WXPAY,ALIPAY'];
         // }
-        $query = $this->doSelect($where, $field, $order,$request->get());
+        $query = $this->doSelect($where, $field, $order, $request->get());
         return $this->doFormat($query, $format, $limit);
     }
 
-    protected function doSelect(array $where, string $field = null, string $order = 'desc',$params=[])
+    protected function doSelect(array $where, string $field = null, string $order = 'desc', $params = [])
     {
         $model = $this->model->with(['member', 'cert', 'memberAccount']);
         foreach ($where as $column => $value) {
@@ -89,19 +89,19 @@ class PayDetailController extends Curd
                 $model = $model->where($column, $value);
             }
         }
-        if (empty($params['type'])){
+        if (empty($params['type'])) {
             $model = $model->where(function ($query) {
-                $query->whereIn('pay_prepayid', ['ALIPAY', 'WXPAY','OFFLINE_WXPAY','OFFLINE_ALIPAY','MONEY'])
+                $query->whereIn('pay_prepayid', ['ALIPAY', 'WXPAY', 'OFFLINE_WXPAY', 'OFFLINE_ALIPAY', 'MONEY'])
                     ->orWhere('pay_prepayid', 'like', '%CASH%')
                     ->orWhere('pay_prepayid', 'like', '%WELFARE%');
             });
-        }else{
-            if ($params['type'] == 'NORMAL'){
+        } else {
+            if ($params['type'] == 'NORMAL') {
                 $model = $model->where(function ($query) {
-                    $query->whereIn('pay_prepayid', ['ALIPAY', 'WXPAY','OFFLINE_WXPAY','OFFLINE_ALIPAY','MONEY'])
+                    $query->whereIn('pay_prepayid', ['ALIPAY', 'WXPAY', 'OFFLINE_WXPAY', 'OFFLINE_ALIPAY', 'MONEY'])
                         ->orWhere('pay_prepayid', 'like', '%CASH%');
                 });
-            }else{
+            } else {
                 $model = $model->where(function ($query) {
                     $query->orWhere('pay_prepayid', 'like', '%WELFARE%');
                 });
@@ -184,7 +184,7 @@ class PayDetailController extends Curd
                 $item->pay_prepayid = $prepayId[1];
             }
             $item->type = 'NORMAL';
-            if (isset($prepayId[1]) && $prepayId[1] == 'WELFARE'){
+            if (isset($prepayId[1]) && $prepayId[1] == 'WELFARE') {
                 $item->type = 'WELFARE';
             }
             $memberAccount = [];
@@ -204,6 +204,12 @@ class PayDetailController extends Curd
                     $item->premises_name = $payExtendJson['remark']['premises_name'] ?? '';
                 }
             }
+
+            if (in_array($item['join_pay_order_id'], ['COMBINE', 'PARTNER'])) {
+                $item->pay_amount = PayDetail::where('join_pay_member_id',$item->join_pay_member_id)
+                    ->where('pay_category',$item['join_pay_order_id'])
+                    ->value('pay_amount');
+            }
         }
 
         return $items;
@@ -336,14 +342,14 @@ class PayDetailController extends Curd
             $memberAccount = MemberAccount::where('join_account_member_id', $data['join_pay_member_id'])
                 ->where('member_account_classify', 'WELFARE')
                 ->first();
-            if ($memberAccount->member_account_status != 'ACTIVED'){
+            if ($memberAccount->member_account_status != 'ACTIVED') {
                 throw new BusinessException('福利账户未开启');
             }
 
             $this->doInsert($data);
 
             // 金额累加到福利账户
-           $memberAccount->member_account_income = $memberAccount->member_account_income + $data['pay_amount'];
+            $memberAccount->member_account_income = $memberAccount->member_account_income + $data['pay_amount'];
             $memberAccount->member_account_surplus = $memberAccount->member_account_surplus + $data['pay_amount'];
             $memberAccount->save();
 

app/admin/service/added/AddedService.php

@@ -39,7 +39,8 @@ class AddedService{
                 'charge_content'=>$params['remark'] ?? '',
                 'charge_user_id'=>$params['write_off_member_id'],
                 'charge_premises'=>$params['dept_premises_id'],
-                'charge_write_off_time'=>$params['times']
+                'charge_write_off_time'=>$params['times'],
+                'charge_waiter' => $params['charge_waiter'] ?? ''
             ],
             'member_id'=>$params['member_id'],
             'quota_code'=>random_string(10,'number'),

app/admin/service/goods/GoodsService.php

@@ -182,9 +182,12 @@ class GoodsService
             },
             'user' => function ($query) {
                 $query->select('user_id', 'user_name');
-            }
+            },
+            'updateUser' => function ($query) {
+                $query->select('user_id', 'user_name');
+            },
         ])->leftJoin('goods_running', 'goods_running.join_running_goods_id', '=', 'goods.goods_id')
-            ->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'creator_user_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_attribute_json', 'goods_addtimes', 'goods_updatetimes')
+            ->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'creator_user_id','updator_user_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_attribute_json', 'goods_addtimes', 'goods_updatetimes')
             ->when($goodsName != '', function ($query) use ($goodsName) {
                 $query->where(function ($q) use ($goodsName) {
                     $q->where('goods_name', 'like', '%' . $goodsName . '%');
@@ -283,8 +286,11 @@ class GoodsService
             },
             'user' => function ($query) {
                 $query->select('user_id', 'user_name');
+            },
+            'updateUser' => function ($query) {
+                $query->select('user_id', 'user_name');
             }
-        ])->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'creator_user_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_addtimes', 'goods_updatetimes')
+        ])->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'creator_user_id','updator_user_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_addtimes', 'goods_updatetimes')
             ->when($goodsName != '', function ($query) use ($goodsName) {
                 $query->where(function ($q) use ($goodsName) {
                     $q->where('goods_name', 'like', '%' . $goodsName . '%');
@@ -347,8 +353,11 @@ class GoodsService
             },
             'user' => function ($query) {
                 $query->select('user_id', 'user_name');
+            },
+            'updateUser' => function ($query) {
+                $query->select('user_id', 'user_name');
             }
-        ])->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'creator_user_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_addtimes', 'goods_updatetimes')
+        ])->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'creator_user_id','updator_user_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_addtimes', 'goods_updatetimes')
             ->when($goodsName != '', function ($query) use ($goodsName) {
                 $query->where(function ($q) use ($goodsName) {
                     $q->where('goods_name', 'like', '%' . $goodsName . '%')
@@ -397,8 +406,11 @@ class GoodsService
             },
             'user' => function ($query) {
                 $query->select('user_id', 'user_name');
+            },
+            'updateUser' => function ($query) {
+                $query->select('user_id', 'user_name');
             }
-        ])->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'creator_user_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_addtimes', 'goods_updatetimes')
+        ])->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'creator_user_id','updator_user_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_addtimes', 'goods_updatetimes')
             ->when($goodsName != '', function ($query) use ($goodsName) {
                 $query->where(function ($q) use ($goodsName) {
                     $q->where('goods_name', 'like', '%' . $goodsName . '%')
@@ -820,6 +832,10 @@ class GoodsService
             if (!empty($data['creator_user_id'])) {
                 $data['creator_username'] = SysUser::where('user_id', $data['creator_user_id'])->value('user_name');
             }
+            $data['updator_username'] = '';
+            if (!empty($data['updator_user_id'])) {
+                $data['updator_username'] = SysUser::where('user_id', $data['updator_user_id'])->value('user_name');
+            }
 
             if (!empty($data['goods_detail_slider_json'])) {
                 $data['goods_detail_slider_json'] = json_decode($data['goods_detail_slider_json'], true);
@@ -1388,6 +1404,8 @@ class GoodsService
             $goods->goods_status = $params['goods_status'];
             $goods->goods_sku_json = json_encode(['规格' => [$params['goods_sales_price'] . '元']]);
             $goods->goods_sort = $params['goods_sort'];
+            $goods->goods_updatetimes = time();
+            $goods->updator_user_id = JwtToken::getCurrentId();
             if (!empty($goods->goods_attribute_json)) {
                 $attributeJson = json_decode($goods->goods_attribute_json, true);
                 $attributeJson['added']['nbr'] = $params['goods_rate'] / 100;
@@ -2426,6 +2444,7 @@ class GoodsService
                 $row->{$key} = $val;
             }
             $row->goods_updatetimes = time();
+            $row->updator_user_id = JwtToken::getCurrentId();
             $row->save();
         } catch (BusinessException $e) {
             throw new BusinessException($e->getMessage());

app/admin/service/goods/NewCustomerService.php

@@ -1769,6 +1769,7 @@ class NewCustomerService
                 $row->{$key} = $val;
             }
             $row->goods_updatetimes = time();
+            $row->updator_user_id = JwtToken::getCurrentId();
             $row->save();
         } catch (BusinessException $e) {
             throw new BusinessException($e->getMessage());

app/admin/service/goods/PartnerService.php

@@ -1769,6 +1769,7 @@ class PartnerService
                 $row->{$key} = $val;
             }
             $row->goods_updatetimes = time();
+            $row->updator_user_id = JwtToken::getCurrentId();
             $row->save();
         } catch (BusinessException $e) {
             throw new BusinessException($e->getMessage());

app/admin/service/goods/ReferrerService.php

@@ -1769,6 +1769,7 @@ class ReferrerService
                 $row->{$key} = $val;
             }
             $row->goods_updatetimes = time();
+            $row->updator_user_id = JwtToken::getCurrentId();
             $row->save();
         } catch (BusinessException $e) {
             throw new BusinessException($e->getMessage());

app/admin/service/goods/TravelService.php

@@ -707,6 +707,7 @@ class TravelService
                 $row->{$key} = $val;
             }
             $row->goods_updatetimes = time();
+            $row->updator_user_id = JwtToken::getCurrentId();
             $row->save();
         } catch (BusinessException $e) {
             throw new BusinessException($e->getMessage());

app/model/ClientPoints.php

@@ -33,6 +33,17 @@ class ClientPoints extends Model
         return $this->hasOne(Member::class, 'member_id', 'join_client_points_member_id');
     }
 
+
+    public function memberInfo()
+    {
+        return $this->hasOne(MemberInfo::class, 'join_info_member_id', 'join_client_points_member_id');
+    }
+
+    public function memberCert()
+    {
+        return $this->hasOne(MemberCert::class,'join_cert_member_id','join_client_points_member_id');
+    }
+
     /**
      * @Desc 关联商品
      * @Author Gorden

app/model/Goods.php

@@ -77,4 +77,8 @@ class Goods extends Model
     public function user(){
         return $this->hasOne(SysUser::class,'user_id','creator_user_id');
     }
+
+    public function updateUser(){
+        return $this->hasOne(SysUser::class,'user_id','updator_user_id');
+    }
 }