diff --git a/app/cart/controller/ZjCartController.php b/app/cart/controller/ZjCartController.php index 3115361..4606155 100644 --- a/app/cart/controller/ZjCartController.php +++ b/app/cart/controller/ZjCartController.php @@ -108,74 +108,75 @@ class ZjCartController extends HomeBaseController //订单确认页 public function orderConfirm() { - if(session('cart.id') && session('goods.id')) { + if (session('cart.id') == null && session('goods.id') == null) { $this->redirect(url('index/Index/index')); - } - $total_num = 0; - $total_price = 0; - if (session('cart.id') != null && session('goods.id') == null) { - $data = Db::name('zj_cart')->alias('c') - ->join('zj_goods g', 'c.gid=g.id') - ->join('zj_category t', 't.id=g.cid') - ->field('c.num,g.name,g.price,g.price_num,g.price_cash,g.thumb,g.is_type,g.intro,t.cid as caid') - ->where(['c.uid' => session('user.id'), 'c.id' => ['in', session('cart.id')]]) - ->select(); - } elseif (session('cart.id') == null && session('goods.id') != null) { - $data = Db::name('zj_goods')->alias('g') - ->join('zj_category t', 't.id=g.cid') - ->field('g.name,g.price,g.price_num,g.price_cash,g.thumb,g.is_type,g.intro,t.cid as caid') - ->where(['g.id'=>session('goods.id')]) - ->select(); } else { - return false; - } - foreach ($data as $k => $item) { - if ($item['caid'] == 2) { - $item['integral'] = '购买可获得' . $item['price'] * 2 . '积分'; + $total_num = 0; + $total_price = 0; + if (session('cart.id') != null && session('goods.id') == null) { + $data = Db::name('zj_cart')->alias('c') + ->join('zj_goods g', 'c.gid=g.id') + ->join('zj_category t', 't.id=g.cid') + ->field('c.num,g.name,g.price,g.price_num,g.price_cash,g.thumb,g.is_type,g.intro,t.cid as caid') + ->where(['c.uid' => session('user.id'), 'c.id' => ['in', session('cart.id')]]) + ->select(); + } elseif (session('cart.id') == null && session('goods.id') != null) { + $data = Db::name('zj_goods')->alias('g') + ->join('zj_category t', 't.id=g.cid') + ->field('g.name,g.price,g.price_num,g.price_cash,g.thumb,g.is_type,g.intro,t.cid as caid') + ->where(['g.id' => session('goods.id')]) + ->select(); } else { - $item['integral'] = '该商品无积分奖励'; + return false; } - if (session('cart.id') == null && session('goods.id') != null) { - $item['num'] = 1; + foreach ($data as $k => $item) { + if ($item['caid'] == 2) { + $item['integral'] = '购买可获得' . $item['price'] * 2 . '积分'; + } else { + $item['integral'] = '该商品无积分奖励'; + } + if (session('cart.id') == null && session('goods.id') != null) { + $item['num'] = 1; + } + $total_num += $item['num']; + $total_price += $item['price'] * $item['num']; + $data[$k] = $item; } - $total_num += $item['num']; - $total_price += $item['price'] * $item['num']; - $data[$k] = $item; - } - $address = Db::name('zj_user_place') - ->field('id,name,province,city,county,mobile,place,is_sta') - ->where(['uid' => session('user.id')]) - ->select() - ->toArray(); - $default_address_id = ''; - $default_name = '请选择地址'; - $default_mobile = ''; - $default_address = ''; - if (!empty($address)) { - foreach ($address as $item) { - if ($item['is_sta'] == 2) { - $default_address_id = $item['id']; - $default_name = $item['name']; - $default_mobile = $item['mobile']; - $default_address = $item['province'] . $item['city'] . $item['county'] . $item['place']; - break; + $address = Db::name('zj_user_place') + ->field('id,name,province,city,county,mobile,place,is_sta') + ->where(['uid' => session('user.id')]) + ->select() + ->toArray(); + $default_address_id = ''; + $default_name = '请选择地址'; + $default_mobile = ''; + $default_address = ''; + if (!empty($address)) { + foreach ($address as $item) { + if ($item['is_sta'] == 2) { + $default_address_id = $item['id']; + $default_name = $item['name']; + $default_mobile = $item['mobile']; + $default_address = $item['province'] . $item['city'] . $item['county'] . $item['place']; + break; + } } } + require_once EXTEND_PATH . '/WeChatCommon.php'; + $wx = new \WeChatCommon(); + return $this->fetch('order_confirm', [ + 'data' => $data, + 'address' => $address, + 'default_address_id' => $default_address_id, + 'default_name' => $default_name, + 'default_mobile' => $default_mobile, + 'default_address' => $default_address, + 'total_num' => $total_num, + 'total_price' => $total_price, + 'caid' => $data[0]['caid'], + 'js_sdk' => $wx->js_sdk() + ]); } - require_once EXTEND_PATH . '/WeChatCommon.php'; - $wx = new \WeChatCommon(); - return $this->fetch('order_confirm', [ - 'data' => $data, - 'address' => $address, - 'default_address_id' => $default_address_id, - 'default_name' => $default_name, - 'default_mobile' => $default_mobile, - 'default_address' => $default_address, - 'total_num' => $total_num, - 'total_price' => $total_price, - 'caid' => $data[0]['caid'], - 'js_sdk' => $wx->js_sdk() - ]); } } \ No newline at end of file