wesmiler 抢表商城

app/Services/Common/MemberService.php

@@ -102,8 +102,8 @@ class MemberService extends BaseService
                 $shopInfo['snap_time'] = $snapTime;
                 $shopInfo['time_lock'] = 0;
                 $shopInfo['trade_status'] = 2;
-                if($timeLock ){
-//                if($timeLock && $timeLock<= $snapTime*60){
+//                if($timeLock ){
+                if($timeLock && $timeLock<= $snapTime*60){
                     $shopInfo['time_lock'] = $timeLock;
                     $shopInfo['timeData']['hours'] = intval($timeLock/3600);
                     $shopInfo['timeData']['minutes'] = intval($timeLock%3600/60);
@@ -160,9 +160,11 @@ class MemberService extends BaseService
             $info['mobile'] = $info['mobile']? format_mobile($info['mobile']):'';
             $info['show_bonus'] = GoodsService::make()->checkNewGoods($info['id']);
 
-            // 二维码
-            $qrcode = $this->makeQrcode(env('WEB_URL').'h5/#/pages/register/index?code='.$info['code']);
-            $info['qrcode'] = $qrcode? get_image_url($qrcode):'';
+            $info['shop_info'] = [];
+            if(isset($info['login_shop_id']) && $info['login_shop_id']) {
+                $shopInfo = ShopService::make()->getInfo($info['login_shop_id']);
+                $info['shop_info'] = $shopInfo;
+            }
 
             // 团队人数
             $info['team_num'] = MemberService::make()->getInviteNums($info['id']);

app/Services/Common/TradeService.php

@@ -105,7 +105,7 @@ class TradeService extends BaseService
             ->where(function ($query) use ($userId,$sellUid, $status) {
 
                 if ($sellUid && $userId) {
-                    $query->where('a.user_id', $userId)->where(function($query) use($sellUid){
+                    $query->where('a.user_id', $userId)->orWhere(function($query) use($sellUid){
                         $query->where('a.sell_uid', $sellUid)->whereIn('a.status', [1,2]);
                     });
                 }else if($userId){
@@ -293,7 +293,7 @@ class TradeService extends BaseService
                     $query->where('pay_time', '>=', strtotime(date('Y-m-d')));
                 }
             })
-            ->sum('price');
+            ->sum('real_price');
     }
 
     /**
@@ -320,7 +320,7 @@ class TradeService extends BaseService
                     $query->where('a.pay_time', '>=', strtotime(date('Y-m-d')));
                 }
             })
-            ->sum('a.price');
+            ->sum('a.real_price');
     }
 
     /**
@@ -635,7 +635,7 @@ class TradeService extends BaseService
         }
 
         $this->error = 2055;
-        return false;
+        return true;
     }
 
     /**
@@ -695,6 +695,10 @@ class TradeService extends BaseService
                 DB::rollBack();
                 return false;
             }
+
+            $this->error = 2064;
+            DB::commit();
+            return false;
         }
 
         // 满足拆分
@@ -707,7 +711,7 @@ class TradeService extends BaseService
 
             $this->error = 2059;
             DB::commit();
-            return false;
+            return true;
         }