sgd

app/data/controller/api/Goods.php

@@ -7,6 +7,7 @@ use app\data\model\ShopGoodsCart;
 use app\data\model\ShopGoodsCate;
 use app\data\model\ShopGoodsCollection;
 use app\data\model\ShopGoodsMark;
+use app\data\model\ShopOrderItem;
 use app\data\service\ExpressService;
 use app\data\service\GoodsService;
 use think\admin\Controller;
@@ -112,13 +113,22 @@ class Goods extends Auth
      */
     public function goods_cart_list(){
         $user = $this->getUser();
-        $cart_list = ShopGoodsCart::mk()->alias('cart')
-            ->join('shop_goods_item item','cart.item_id=item.id')
-            ->join('shop_goods goods','item.goods_code=goods.code')
-            ->join('system_user admin','admin.id=item.admin_id')
+        $query = ShopGoodsCart::mQuery()->alias('cart');
+        $cart_list = $query ->join('system_user admin','admin.id=cart.admin_id')
             ->where('cart.user_id',$user['id'])
-            ->field('cart.*,item.goods_spec,goods.cover')
-            ->paginate();
+            ->group('cart.admin_id')
+            ->field('cart.admin_id,admin.nickname')
+            ->page(true, false, false, 10);
+        foreach ($cart_list['list'] as $k=>$v){
+            $cart_list['list'][$k]['goods_item']= ShopGoodsCart::mk()->alias('cart')
+                ->join('shop_goods goods','cart.goods_id=goods.id')
+                ->join('shop_goods_item item','cart.item_id=item.id')
+                ->join('system_user admin','admin.id=cart.admin_id')
+                ->where('cart.user_id',$user['id'])
+                ->where('cart.admin_id',$cart_list['list'][$k]['admin_id'])
+                ->field('cart.*,goods.cover,item.price_selling')
+                ->select();
+        }
         $this->success('我的购物车列表',$cart_list);
     }
 

app/data/controller/api/Order.php

@@ -101,6 +101,10 @@ class Order extends Auth
         $list = $query ->where('uuid',$user['id'])
             ->whereIn('status',$array)->order('id desc')->page(true, false, false, 10);
         foreach ($list['list'] as $k=>$v){
+            $list['list'][$k]['time']=0;
+            if($list['list'][$k]['status']==2){
+                $list['list'][$k]['time'] = strtotime($list['list'][$k]['create_at'])+30*60-time();
+            }
             $list['list'][$k]['goods_item']=ShopOrderItem::mk()->where('order_no',$list['list'][$k]['order_no'])->select();
         }
         $this->success('我的订单列表',$list);