一些功能

app/models/store/StoreOrder.php

@@ -1156,9 +1156,12 @@ class StoreOrder extends BaseModel
         $order['_status'] = $status;
         $order['_pay_time'] = isset($order['pay_time']) && $order['pay_time'] != null ? date('Y-m-d H:i:s', $order['pay_time']) : date('Y-m-d H:i:s', $order['add_time']);
         $order['_add_time'] = isset($order['add_time']) ? (strstr($order['add_time'], '-') === false ? date('Y-m-d H:i:s', $order['add_time']) : $order['add_time']) : '';
+        $order['_arrive_time'] = isset($order['arrive_time']) ? (strstr($order['arrive_time'], '-') === false ? date('Y-m-d H:i:s', $order['arrive_time']) : $order['arrive_time']) : '';
         $order['status_pic'] = '';
         $order['gift_user'] = User::get($order['gift_uid']);
         $order['user'] = User::get($order['uid']);
+        $order['store'] = SystemStore::get($order['store_id']);
+        $order['point'] = SystemStorePoint::get($order['point_id']);
         //获取产品状态图片
         if ($isPic) {
             $order_details_images = sys_data('order_details_images') ?: [];
@@ -1225,10 +1228,10 @@ class StoreOrder extends BaseModel
     public static function getUserOrderList($uid, $status = '', $page = 0, $limit = 8)
     {
         if ($page) $list = self::statusByWhere($status, $uid)->where('is_del', 0)->where('uid|gift_uid', $uid)
-            ->field('pay_postage_sh,uid,add_time,seckill_id,bargain_id,combination_id,id,order_id,pay_price,total_num,total_price,pay_postage,total_postage,paid,status,refund_status,pay_type,coupon_price,deduction_price,pink_id,delivery_type,is_del,shipping_type,gift_uid,store_id')
+//            ->field('pay_postage_sh,uid,add_time,seckill_id,bargain_id,combination_id,id,order_id,pay_price,total_num,total_price,pay_postage,total_postage,paid,status,refund_status,pay_type,coupon_price,deduction_price,pink_id,delivery_type,is_del,shipping_type,gift_uid,store_id')
             ->order('add_time DESC')->page((int)$page, (int)$limit)->select()->toArray();
         else  $list = self::statusByWhere($status, $uid)->where('is_del', 0)->where('uid|gift_uid', $uid)
-            ->field('pay_postage_sh,uid,add_time,seckill_id,bargain_id,combination_id,id,order_id,pay_price,total_num,total_price,pay_postage,total_postage,paid,status,refund_status,pay_type,coupon_price,deduction_price,pink_id,delivery_type,is_del,shipping_type,gift_uid,store_id')
+//            ->field('pay_postage_sh,uid,add_time,seckill_id,bargain_id,combination_id,id,order_id,pay_price,total_num,total_price,pay_postage,total_postage,paid,status,refund_status,pay_type,coupon_price,deduction_price,pink_id,delivery_type,is_del,shipping_type,gift_uid,store_id')
             ->order('add_time DESC')->page((int)$page, (int)$limit)->select()->toArray();
         foreach ($list as $k => $order) {
             $list[$k] = self::tidyOrder($order, true);
@@ -1260,7 +1263,7 @@ class StoreOrder extends BaseModel
      */
     public static function searchUserOrder($uid, $order_id)
     {
-        $order = self::where('uid|gift_uid', $uid)->where('order_id', $order_id)->where('is_del', 0)->field('pay_postage_sh,seckill_id,bargain_id,combination_id,id,order_id,pay_price,total_num,total_price,pay_postage,total_postage,paid,status,refund_status,pay_type,coupon_price,deduction_price,delivery_type,shipping_type')
+        $order = self::where('uid|gift_uid', $uid)->where('order_id', $order_id)->where('is_del', 0)->field('*')
             ->order('add_time DESC')->find();
         if (!$order)
             return false;
@@ -1972,6 +1975,8 @@ class StoreOrder extends BaseModel
                     $item['status_name'] = '已完成';
                 }
             }
+            $order['store'] = SystemStore::get($item['store_id']);
+            $order['point'] = SystemStorePoint::get($item['point_id']);
 //            unset($item['refund_status']);
 //            else if($item['paid']==1 && $item['refund_status']==1){
 //                $item['status_name']=<<<HTML