From 67fa59d27c1bac0609361b56fe24d6b45932a46d Mon Sep 17 00:00:00 2001 From: devil_gong Date: Tue, 16 Oct 2018 18:33:01 +0800 Subject: [PATCH] order --- .../Home/Controller/UserController.class.php | 18 ++++++ .../Home/View/Default/Order/Detail.html | 2 +- .../Home/View/Default/User/Index.html | 58 +++++++++++++++++-- .../Application/Service/BuyService.class.php | 4 +- .../Service/OrderService.class.php | 26 ++++----- 5 files changed, 87 insertions(+), 21 deletions(-) diff --git a/service/Application/Home/Controller/UserController.class.php b/service/Application/Home/Controller/UserController.class.php index ae81fb9b4..cdec18ac4 100755 --- a/service/Application/Home/Controller/UserController.class.php +++ b/service/Application/Home/Controller/UserController.class.php @@ -77,6 +77,24 @@ class UserController extends CommonController $user_order_status = OrderService::OrderStatusStepTotal(['user_type'=>'user', 'user'=>$this->user, 'is_comments'=>1]); $this->assign('user_order_status', $user_order_status['data']); + // 参数 + $params = array_merge($_POST, $_GET); + $params['user'] = $this->user; + + // 条件 + $where = OrderService::UserOrderListWhere($params); + + // 获取列表 + $order_params = array( + 'limit_start' => 0, + 'limit_number' => 6, + 'is_items' => 0, + 'where' => $where, + ); + $order = OrderService::OrderList($order_params); + $this->assign('order_list', $order['data']); + + $this->display('Index'); } diff --git a/service/Application/Home/View/Default/Order/Detail.html b/service/Application/Home/View/Default/Order/Detail.html index 545494dd8..04db864de 100755 --- a/service/Application/Home/View/Default/Order/Detail.html +++ b/service/Application/Home/View/Default/Order/Detail.html @@ -211,7 +211,7 @@
- +
{{$goods.title}} diff --git a/service/Application/Home/View/Default/User/Index.html b/service/Application/Home/View/Default/User/Index.html index a445d0269..3ee46429e 100755 --- a/service/Application/Home/View/Default/User/Index.html +++ b/service/Application/Home/View/Default/User/Index.html @@ -110,12 +110,60 @@
交易提醒
-
-
- {{:L('common_not_data_tips')}} + + + + + + + + + + + + +
+
+ + + +
+ {{$v.title}} + +
    + +
  • {{$attr.attr_type_name}}：{{$attr.attr_name}}
    • +     +
+ +
+
+
+ + ￥{{$v.original_price}} + + ￥{{$v.price}} + x{{$v.buy_number}} +
+ 		+ +

￥{{$v.original_price}}

+ +

￥{{$v.price}}

+ 		+ x{{$v.buy_number}} + + ￥{{$v.total_price}} +
+ + +
+

+ {{:L('common_not_data_tips')}} +

+ 查看全部订单
- 查看全部订单 -
+
diff --git a/service/Application/Service/BuyService.class.php b/service/Application/Service/BuyService.class.php index 0468a1e7e..0cb0897d5 100755 --- a/service/Application/Service/BuyService.class.php +++ b/service/Application/Service/BuyService.class.php @@ -682,9 +682,9 @@ class BuyService * @version 1.0.0 * @date 2018-09-29 * @desc description - * @param [array] $params [输入参数] + * @param [array] $where [条件] */ - public static function CartTotal($params = []) + public static function CartTotal($where = []) { return (int) M('Cart')->where($where)->count(); } diff --git a/service/Application/Service/OrderService.class.php b/service/Application/Service/OrderService.class.php index b0e7d62a9..25545cdb3 100755 --- a/service/Application/Service/OrderService.class.php +++ b/service/Application/Service/OrderService.class.php @@ -514,6 +514,7 @@ class OrderService $limit_start = max(0, intval($params['limit_start'])); $limit_number = max(1, intval($params['limit_number'])); $order_by = empty($params['order_by']) ? 'id desc' : I('order_by', '', '', $params); + $is_items = isset($params['is_items']) ? intval($params['is_items']) : 1; // 获取订单 $data = M('Order')->where($params['where'])->limit($limit_start, $limit_number)->order($order_by)->select(); @@ -527,7 +528,6 @@ class OrderService foreach($data as &$v) { // 订单基础 - $total_price = 0; $v['payment_name'] = ''; // 状态 @@ -545,22 +545,22 @@ class OrderService $v['receive_county_name'] = ResourcesService::RegionName(['region_id'=>$v['receive_county']]); // 订单详情 - $items = $detail_m->where(['order_id'=>$v['id']])->field($detail_field)->select(); - if(!empty($items)) + if($is_items == 1) { - foreach($items as &$vs) + $items = $detail_m->where(['order_id'=>$v['id']])->field($detail_field)->select(); + if(!empty($items)) { - $vs['images'] = empty($vs['images']) ? null : $images_host.$vs['images']; - $vs['attribute'] = empty($vs['attribute']) ? null : json_decode($vs['attribute'], true); - $vs['goods_url'] = HomeUrl('Goods', 'Index', ['id'=>$vs['goods_id']]); - $vs['total_price'] = $vs['buy_number']*$vs['price']; - - $total_price += $vs['total_price']; + foreach($items as &$vs) + { + $vs['images'] = empty($vs['images']) ? null : $images_host.$vs['images']; + $vs['attribute'] = empty($vs['attribute']) ? null : json_decode($vs['attribute'], true); + $vs['goods_url'] = HomeUrl('Goods', 'Index', ['id'=>$vs['goods_id']]); + $vs['total_price'] = $vs['buy_number']*$vs['price']; + } } + $v['items'] = $items; + $v['items_count'] = count($items); } - $v['items'] = $items; - $v['items_count'] = count($items); - $v['total_price'] = $total_price; } } return DataReturn('处理成功', 0, $data);