Wesmiler 最后更新

app/Http/Controllers/Api/v1/LoginController.php

@@ -21,18 +21,23 @@ class LoginController extends webApp
      */
     public function login(MemberValidator $validator)
     {
-        $params = request()->all();
-        $code = request()->post('code','');
-        $params = $validator->check($params, 'login');
-        if (!is_array($params)) {
-            return showJson($params, false);
-        }
+        try {
+            $params = request()->all();
+            $code = request()->post('code', '');
+            $params = $validator->check($params, 'login');
+            if (!is_array($params)) {
+                return showJson($params, false);
+            }
 
-        if(!$result = MemberService::make()->login($code,$params)){
-            return showJson(MemberService::make()->getError(), false);
-        }
+            if (!$result = MemberService::make()->login($code, $params)) {
+                return showJson(MemberService::make()->getError(), false);
+            }
 
-        return showJson(MemberService::make()->getError(), true, $result);
+            return showJson(MemberService::make()->getError(), true, $result);
+        }catch (\Exception $exception) {
+            $error = ['data' => $exception->getTrace(), 'err' => $exception->getMessage()];
+            return showJson(1046, false, $error);
+        }
     }
 
     /**

app/Http/Controllers/Api/v1/MemberController.php

@@ -24,7 +24,8 @@ class MemberController extends webApp
         try {
             $params = request()->all();
             $userId = isset($params['pid']) && $params['pid']>0?$params['pid']:0;
-            $datas = MemberService::make()->getTeamList($userId?$userId:$this->userId,$params);
+            $userId = $userId?$userId:$this->userId;
+            $datas = MemberService::make()->getTeamList($userId,$params);
             if ($datas) {
                 return showJson(1010, true, $datas);
             } else {
@@ -49,10 +50,16 @@ class MemberController extends webApp
                 return showJson(MemberService::make()->getError(), false);
             }
 
+            $date = isset($params['date']) ? $params['date'] : [];
+            $start = isset($date[0]) && $date[0]? $date[0] : date('Y-m-d 00:00:00', time() - 30 *3 *86400);
+            if($start < date('Y-m-d', time() - 365 * 86400)){
+                return showJson('只能查询最近1年的记录', false);
+            }
+
             if ($datas = OrderService::make()->getCommissionBill($userId?$userId:$this->userId,$params)) {
                 return showJson(1010, true, $datas);
             } else {
-                return showJson(1004, false);
+                return showJson( 1009, false);
             }
         } catch (\Exception $exception){
             $error = ['data'=>$exception->getTrace(),'err'=>$exception->getMessage()];

app/Models/OrderModel.php

@@ -58,6 +58,16 @@ class OrderModel extends BaseModel
     }
 
     /**
+     * 关联佣金明细
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function commissions()
+    {
+        return $this->hasMany(OrderCommissionModel::class, 'order_id', 'id')
+            ->with(['user','orderUser']);
+    }
+
+    /**
      * 店铺
      * @return \Illuminate\Database\Eloquent\Relations\HasOne
      */

app/Services/Api/MemberService.php

@@ -149,7 +149,6 @@ class MemberService extends BaseService
         else if ($mark == 0 || !RedisService::get("caches:members:login_{$userId}")) {
             $updateData = [
                 'login_ip' => get_client_ip(),
-                'create_time' => time(),
                 'login_time' => time(),
                 'app_uuid' => $uuid,
                 'login_count' => DB::raw("login_count+1"),
@@ -159,6 +158,7 @@ class MemberService extends BaseService
             ];
 
             if ($mark == 0) {
+                $data['create_time'] = time();
                 $data['nickname'] = '';
                 $data['avatar'] = '';
                 $data['mobile'] = '';
@@ -173,7 +173,7 @@ class MemberService extends BaseService
 
         // 如果未生成佣金账户则创建
         if(!$accountId = AccountStatisticsModel::where(['user_id'=>$userId])->value('id')){
-            AccountStatisticsModel::insert(['user_id'=>$userId]);
+            AccountStatisticsModel::insert(['user_id'=>$userId,'created_at'=>date('Y-m-d H:i:s')]);
         }
 
         // 获取登录授权token
@@ -650,7 +650,9 @@ class MemberService extends BaseService
                     });
                 }
             })
-            ->select(['a.id','a.realname','a.mobile','a.nickname','a.parent_id','a.avatar','a.is_auth','a.status'])
+            ->select(['a.id','a.realname','a.mobile','a.nickname','a.parent_id','a.avatar','a.is_auth','a.create_time','a.status'])
+            ->groupBy('a.id')
+            ->orderBy('a.create_time','desc')
             ->orderBy('a.id','desc')
             ->paginate($pageSize > 0 ? $pageSize : 9999999);
         $list = $list? $list->toArray() :[];
@@ -710,7 +712,7 @@ class MemberService extends BaseService
     {
         $parents = $this->model->where(['id'=>$actId])->value('parents');
         $parents = $parents? explode(',',$parents) : [];
-        if(!in_array($userId,$parents)){
+        if(!in_array($userId,$parents) && $actId != $userId){
             $this->error = '信息错误，权限不足';
             return false;
         }
@@ -719,7 +721,6 @@ class MemberService extends BaseService
         return true;
     }
 
-
     /**
      * 账号注销
      * @param $userId

app/Services/Api/OrderService.php

@@ -125,7 +125,7 @@ class OrderService extends BaseService
             ->where(function($query) use($params){
                 // 日期
                 $date = isset($params['date']) ? $params['date'] : [];
-                $start = isset($date[0]) && $date[0]? $date[0] : date('Y-m-d 00:00:00');
+                $start = isset($date[0]) && $date[0]? $date[0] : date('Y-m-d 00:00:00', time() - 30 *3 *86400);
                 $end = isset($date[1]) && $date[1]? $date[1] : date('Y-m-d 23:59:59');
                 $end = $start>=$end? '' : $end;
                 if ($start) {
@@ -328,7 +328,7 @@ class OrderService extends BaseService
         // 检查是否关联为会议订单，先签到的会议先关联
         $record = MeetingRecordsModel::with(['meeting'])->where(['user_id'=>$userId,'mark'=>1])
             ->where('expired_at','>=', date('Y-m-d H:i:s'))
-            ->orderBy('id', 'asc')
+            ->orderBy('create_time', 'desc')
             ->first();
         $recordMeetingId = isset($record['meeting_id'])? $record['meeting_id'] : 0;
         $meeting = isset($record['meeting'])?$record['meeting'] : [];

app/Services/Common/GoodsService.php

@@ -158,7 +158,7 @@ class GoodsService extends BaseService
             $storeName = isset($params['store_name']) ? trim($params['store_name']) : '';
             if ($storeName) {
                 $query->whereHas('store', function ($q) use ($storeName) {
-                    $q->where('nickname', 'like', "%{$storeName}%")->orWhere('mobile', 'like', "%{$storeName}%");
+                    $q->where('nickname', 'like', "%{$storeName}%");
                 });
             }
         });

app/Services/Common/OrderService.php

@@ -175,7 +175,7 @@ class OrderService extends BaseService
     public function getInfo($id)
     {
         $info = $this->model->where('id', $id)->where('mark', 1)
-            ->with(['user', 'orderGoods', 'store','meeting'])
+            ->with(['user', 'orderGoods', 'store','meeting','commissions'])
             ->first();
 
         if (!$info) {

app/Services/PaymentService.php

@@ -573,9 +573,11 @@ class PaymentService extends BaseService
                         'expend'=>DB::raw("expend + {$payTotal}"),
                         'updated_at'=>date('Y-m-d H:i:s')
                     ];
-                    if($id && !AccountStatisticsModel::where(['id'=>$id])->update($updateData)){
-                        Db::rollBack();
-                        $this->error = '统计处理失败';
+                    if($id){
+                        if(!AccountStatisticsModel::where(['id'=>$id])->update($updateData)){
+                            Db::rollBack();
+                            $this->error = '统计处理失败';
+                        }
                     }else{
                         $updateData['expend'] = $payTotal;
                         $updateData['user_id'] = $orderUserId;

routes/web.php

@@ -97,6 +97,7 @@ Route::post('/configgroup/delete', [ConfigGroupController::class, 'delete']);
 Route::get('/config/index', [ConfigController::class, 'index']);
 Route::get('/config/info', [ConfigController::class, 'info']);
 Route::post('/config/edit', [ConfigController::class, 'edit']);
+Route::post('/config/status', [ConfigController::class, 'status']);
 Route::post('/config/delete', [ConfigController::class, 'delete']);
 
 // 通知公告管理
@@ -288,7 +289,6 @@ Route::post('/supervisors/consultRecord/delete', [\App\Http\Controllers\Admin\Su
 Route::post('/supervisors/consultRecord/status', [\App\Http\Controllers\Admin\SupervisorConsultRecordController::class, 'status']);
 
 
-
 // 行业咨询记录
 Route::match(['post','get'],'/article/consultRecord/index', [\App\Http\Controllers\Admin\ArticleConsultRecordController::class, 'index']);
 Route::get('/article/consultRecord/info', [\App\Http\Controllers\Admin\ArticleConsultRecordController::class, 'info']);