待办

addons/longbing_company/inc/wxapp/gtasks.inc.php

@@ -29,6 +29,8 @@ $collage_overtime = 172800;
 $info = pdo_get('longbing_company_config', array('uniacid' => $_W['uniacid']), array('collage_overtime'));
 $collage_overtime = $info['collage_overtime'];
 $tu = pdo_get('longbing_company_user_info',array('fans_id'=>$uid));
+$t = $tu['company_id'];
+//print_r($tu);die;
 $com =pdo_get('longbing_company_company',array('id'=>$tu['company_id']));
 if (!$collage_overtime) {
     $collage_overtime = 172800;
@@ -43,28 +45,26 @@ if($time==''){
         case 1:
             $where['pay_status'] = 1;
             $where['order_status'] = 0;
-            $where['company_id'] = $tu['company_id'];
-            $where['trip_time'] = $time;
+            $where['company_id'] = $t;
+           // $where['trip_time'] = $time;
             break;
         //已上车
         case 2:
             $where['pay_status'] = 1;
             $where['order_status'] = 3;
-            $where['company_id'] = $tu['company_id'];
-            $where['trip_time'] = $time;
+            //$where['company_id'] = $tu['company_id'];
+            //$where['trip_time'] = $time;
             break;
         //总计
         case 3:
             $where['pay_status'] = 1;
-            $where['company_id'] = $tu['company_id'];
-            $where['trip_time'] = $time;
+            //$where['company_id'] = $tu['company_id'];
+            //$where['trip_time'] = $time;
             break;
 
     }
 
-
-    $list = pdo_getslice('longbing_company_shop_order', $where, $limit, $count, array(), '', array('id desc'));
-//print_r($list);die;
+    $list = pdo_getslice('longbing_company_shop_order', $where, $limit, $count,  array(),'', array('id desc'));
 
     foreach ($list as $k => $v) {
         $sql = 'SELECT a.id,a.order_id,a.goods_id,a.name,a.cover,a.number,a.total_price,a.price,a.content,a.qr_code,a.company_name,b.id,b.unit FROM ' . tablename('longbing_company_shop_order_item') . ' a LEFT JOIN ' . tablename('longbing_company_goods') . (' b ON a.goods_id = b.id WHERE a.order_id = ' . $v['id'] . ' && a.uniacid = ' . $uniacid);
@@ -78,10 +78,8 @@ if($time==''){
         foreach ($goods_info as $k2 => $v2) {
             $goods_info[$k2]['cover_true'] = tomedia($v2['cover']);
         }
-
         $list[$k]['goods_info'] = $goods_info;
         $list[$k]['user_company'] = $com['short_name'];
-
     }
 
     $data = array('page' => $curr, 'count' => $count, 'total_page' => ceil($count / 5), 'list' => $list,'company_name'=>$com['short_name']);

addons/longbing_company/inc/wxapp/shopgoodsdetail.inc.php

@@ -151,7 +151,7 @@ $is_member = $_GPC['is_member'];
 $u = pdo_get('longbing_company_user',array("id"=>$uid));
 
 $level = $u['level_id'];
-$goods = pdo_get('longbing_company_goods', array('id' => $goods_id), array('id', 'name', 'cover', 'images', 'price', 'view_count', 'sale_count', 'desc', 'content', 'collage_count', 'is_collage', 'freight', 'recommend', 'stock', 'image_url', 'unit','start_time','end_time','is_free_card','is_discount','leve_id'));
+$goods = pdo_get('longbing_company_goods', array('id' => $goods_id), array('id', 'name', 'cover', 'images', 'price', 'view_count', 'sale_count', 'desc', 'content', 'collage_count', 'is_collage', 'freight', 'recommend', 'stock', 'image_url', 'unit','start_time','end_time','is_free_card','is_discount','leve_id','is_make'));
 $goods_price  = $goods['price'];
 $goods_stock = $goods['stock'];
 $is_discount=$goods['is_discount'];

addons/longbing_company/inc/wxapp/shopmyorderdetail.inc.php

@@ -59,7 +59,7 @@ if ($info['pay_status'] == 0 && $info['order_status'] != 1) {
 
 
 
-$sql = 'SELECT a.id,a.order_id,a.goods_id,a.name,a.cover,a.number,a.price,a.trip_time,a.person,a.phone,a.company_id,a.company_name,a.spe_price_id,a.qr_code,b.id FROM ' . tablename('longbing_company_shop_order_item') . ' a LEFT JOIN ' . tablename('longbing_company_goods') . (' b ON a.goods_id = b.id WHERE a.order_id = ' . $id . ' && a.uniacid = ' . $uniacid);
+$sql = 'SELECT a.id,a.order_id,a.goods_id,a.name,a.cover,a.number,a.price,a.trip_time,a.person,a.phone,a.company_id,a.company_name,a.spe_price_id,a.qr_code,b.id,b.is_make FROM ' . tablename('longbing_company_shop_order_item') . ' a LEFT JOIN ' . tablename('longbing_company_goods') . (' b ON a.goods_id = b.id WHERE a.order_id = ' . $id . ' && a.uniacid = ' . $uniacid);
 $goods_info = pdo_fetchall($sql);
 $fg = pdo_get('longbing_company_shop_order_item',array('order_id'=>$id));