qifengquan 1 year ago
parent
commit
cf9f0cea0b

+ 1 - 1
app/data/controller/api/Login.php

@@ -44,7 +44,7 @@ class Login extends Auth
         $map = ['deleted' => 0, 'phone|username' => $data['phone']];
         $user = DataUser::mk()->where($map)->findOrEmpty();
         if ($user->isEmpty()) $this->error('该手机号还没有注册哦!');
-        if (empty($user['status'])) $this->error('该用户账号状态异常!');
+        if (empty($user['status'])) $this->error('账号不存在!');
         if (md5($data['password']) === $user['password']) {
             $user->openid1 = $data['openid'];
             $user->update_at = date('Y-m-d H:i:s');

+ 2 - 2
app/data/controller/api/auth/Purchase.php

@@ -191,8 +191,8 @@ class Purchase extends Auth
 
         $user=$this->getUser();
         foreach ($model['items'] as $item){
-            $item['user_order']=$item->offers()->with(['amounts'=>function($q)use($item){
-                $q->where('user_id',$this->getUser()['id'])->where('id',$item['offer_id']);
+            $item['user_order']=$item->offers()->with(['amounts'=>function($q)use($user){
+                $q->where('user_id',$user['id']);//            }])->where('id',$item['offer_id'])
 
             }])->where('user_id',$user['id'])
                 ->find();

+ 4 - 1
app/data/controller/api/business/Purchase.php

@@ -468,7 +468,10 @@ class Purchase extends Controller
                 ->with(['items','items.offers','items.offers.user'])
                 ->findOrFail($data['id']);
             foreach ($model['items'] as &$v){
-                foreach ($v['offers'] as &$a){
+                foreach ($v['offers'] as $aa=>&$a){
+                    if($a['id']!=$v['offer_id']){
+                        unset($v['offers'][$aa]);
+                    }
                     $a['amounts'] = ShopPurchaseOfferAmount::mk()
                         ->where('user_id',$a['user_id'])
                         ->where('offer_id',$a['id'])