From e0447575169a0cf3d3ae67cb1de2ae6f1626eae2 Mon Sep 17 00:00:00 2001 From: "ZLW-PC\\Administrator" <374861669@qq.com> Date: Fri, 25 May 2018 17:41:26 +0800 Subject: [PATCH] useraddress --- .../Controllers/Admin/OrderController.php | 10 +- app/Http/Controllers/Api/BonusController.php | 7 +- app/Http/Controllers/Api/GoodsController.php | 6 +- app/Http/Controllers/Api/OrderController.php | 161 +++++---- .../Controllers/Api/UserAddressController.php | 158 ++++----- .../Controllers/Weixin/OrderController.php | 10 +- app/Http/Logic/GoodsLogic.php | 6 +- app/Http/Logic/OrderLogic.php | 156 ++++++++- app/Http/Logic/UserAddressLogic.php | 114 ++++++- app/Http/Logic/UserLogic.php | 2 - app/Http/Model/Bonus.php | 71 +--- app/Http/Model/Cart.php | 10 +- app/Http/Model/Goods.php | 14 +- app/Http/Model/Order.php | 307 ++---------------- app/Http/Model/Region.php | 6 +- app/Http/Model/User.php | 8 + app/Http/Model/UserAddress.php | 205 +----------- app/Http/Requests/OrderRequest.php | 4 +- app/Http/Requests/UserAddressRequest.php | 115 +++++++ .../weixin/collect_goods/index.blade.php | 4 +- .../views/weixin/goods/goodsDetail.blade.php | 2 +- .../weixin/user/userGoodsHistory.blade.php | 2 +- 22 files changed, 625 insertions(+), 753 deletions(-) create mode 100644 app/Http/Requests/UserAddressRequest.php diff --git a/app/Http/Controllers/Admin/OrderController.php b/app/Http/Controllers/Admin/OrderController.php index 2da4b8c..ec24c16 100644 --- a/app/Http/Controllers/Admin/OrderController.php +++ b/app/Http/Controllers/Admin/OrderController.php @@ -23,8 +23,8 @@ class OrderController extends CommonController $where = function ($query) use ($res) { if(isset($_REQUEST["keyword"])) { - $query->where('order_sn', 'like', '%'.$_REQUEST['keyword'].'%')->orWhere("name", "like", '%'.$_REQUEST['keyword'].'%')->orWhere("mobile", "like", '%'.$_REQUEST['keyword'].'%'); - } + $query->where(function ($query2){$query2->where('order_sn', 'like', '%'.$_REQUEST['keyword'].'%')->orWhere("name", "like", '%'.$_REQUEST['keyword'].'%')->orWhere("mobile", "like", '%'.$_REQUEST['keyword'].'%');}); + } if(isset($_REQUEST["mobile"])) { @@ -76,9 +76,9 @@ class OrderController extends CommonController $posts[$key]->order_status_text = $order_status_arr?$order_status_arr['text']:''; $posts[$key]->order_status_num = $order_status_arr?$order_status_arr['num']:''; - $posts[$key]->province_name = Region::getRegionName($value->province); - $posts[$key]->city_name = Region::getRegionName($value->city); - $posts[$key]->district_name = Region::getRegionName($value->district); + $posts[$key]->province_name = model('Region')->getRegionName(['id'=>$value->province]); + $posts[$key]->city_name = model('Region')->getRegionName(['id'=>$value->city]); + $posts[$key]->district_name = model('Region')->getRegionName(['id'=>$value->district]); } $data['posts'] = $posts; diff --git a/app/Http/Controllers/Api/BonusController.php b/app/Http/Controllers/Api/BonusController.php index b0ef4d7..d606638 100644 --- a/app/Http/Controllers/Api/BonusController.php +++ b/app/Http/Controllers/Api/BonusController.php @@ -29,12 +29,9 @@ class BonusController extends CommonController $limit = $request->input('limit', 10); $offset = $request->input('offset', 0); $where = function ($query) use ($request) { - $query->where('delete_time', 0); - $query->where('status', Bonus::STATUS); - $query->where('num', '=', -1)->orWhere('num', '>', 0); - $query->where('start_time', '<', date('Y-m-d H:i:s'))->where('end_time', '>', date('Y-m-d H:i:s')); + $query->where('delete_time', 0)->where('status', Bonus::STATUS)->where('start_time', '<', date('Y-m-d H:i:s'))->where('end_time', '>', date('Y-m-d H:i:s'))->where(function ($query2){$query2->where('num', '=', -1)->orWhere('num', '>', 0);}); }; - + //var_dump(model('Bonus')->where($where)->toSql());exit; $res = $this->getLogic()->getList($where, '', '*', $offset, $limit); /* if($res['count']>0) diff --git a/app/Http/Controllers/Api/GoodsController.php b/app/Http/Controllers/Api/GoodsController.php index b439a79..c7931bf 100644 --- a/app/Http/Controllers/Api/GoodsController.php +++ b/app/Http/Controllers/Api/GoodsController.php @@ -42,7 +42,7 @@ class GoodsController extends CommonController if($request->input('keyword', null) != null) { - $query->where('title', 'like', '%'.$request->input('keyword').'%')->orWhere('sn', 'like', '%'.$request->input('keyword').'%'); + $query->where(function ($query2) use ($request) {$query2->where('title', 'like', '%'.$request->input('keyword').'%')->orWhere('sn', 'like', '%'.$request->input('keyword').'%');}); } //价格区间搜索 @@ -64,12 +64,14 @@ class GoodsController extends CommonController } }; + //var_dump(model('Goods')->where($where)->toSql());exit; + //关键词搜索 if($request->input('keyword', null) != null) { //添加搜索关键词 $goodssearchword = new GoodsSearchwordLogic(); - $goodssearchword->add(array('name'=>$keyword)); + $goodssearchword->add(array('name'=>$request->input('keyword'))); } //排序 diff --git a/app/Http/Controllers/Api/OrderController.php b/app/Http/Controllers/Api/OrderController.php index f2823ad..9f5ea13 100644 --- a/app/Http/Controllers/Api/OrderController.php +++ b/app/Http/Controllers/Api/OrderController.php @@ -1,12 +1,13 @@ input('limit', 10); - $data['offset'] = $request->input('offset', 0); + $limit = $request->input('limit', 10); + $offset = $request->input('offset', 0); - $data['user_id'] = Token::$uid; - $data['status'] = $request->input('status',-1); - - return Order::getList($data); + $where = function ($query) use ($request) { + $query->where('user_id', Token::$uid)->where('is_delete', 0); + + $status = $request->input('status',null); + if($status!=null && $status!=0) + { + //0或者不传表示全部，1待付款，2待发货,3待收货,4待评价(确认收货，交易成功),5退款/售后 + if($status == 1) + { + $query->where('order_status', 0)->where('pay_status', 0); + } + elseif($status == 2) + { + $query->where('order_status', 0)->where('shipping_status', 0)->where('pay_status', 1); + } + elseif($status == 3) + { + $query->where('order_status', 0)->where('shipping_status', 1)->where('pay_status', 1)->where('refund_status', 0); + } + elseif($status == 4) + { + $query->where('order_status', 3)->where('shipping_status', 2)->where('is_comment', 0)->where('refund_status', 0); + } + elseif($status == 5) + { + $query->where('order_status', 3)->where('refund_status', '<>', 0); + } + } + }; + //var_dump(model('Order')->where($where)->toSql());exit; + $res = $this->getLogic()->getList($where, array('id', 'desc'), '*', $offset, $limit); + + return ReturnData::create(ReturnData::SUCCESS,$res); } - //订单详情 public function orderDetail(Request $request) { //参数 - $data['user_id'] = Token::$uid; - $data['order_id'] = $request->input('order_id',''); - if($request->input('order_status','') != ''){$data['order_status'] = $request->input('order_status');} - if($request->input('pay_status','') != ''){$data['pay_status'] = $request->input('pay_status');} - if($request->input('refund_status','') != ''){$data['refund_status'] = $request->input('refund_status');} + if(!checkIsNumber($request->input('id',null))){return ReturnData::create(ReturnData::PARAMS_ERROR);} + $id = $request->input('id'); + $where['id'] = $id; + $where['user_id'] = Token::$uid; + if($request->input('order_status','') != ''){$where['order_status'] = $request->input('order_status');} + if($request->input('pay_status','') != ''){$where['pay_status'] = $request->input('pay_status');} + if($request->input('refund_status','') != ''){$where['refund_status'] = $request->input('refund_status');} - if($data['order_id']=='') + $res = $this->getLogic()->getOne($where); + if(!$res) { - return ReturnData::create(ReturnData::PARAMS_ERROR); - } + return ReturnData::create(ReturnData::RECORD_NOT_EXIST); + } - return Order::getOne($data); + return ReturnData::create(ReturnData::SUCCESS,$res); } - //生成订单 + //添加 public function orderAdd(Request $request) - { - //参数 + { $data['default_address_id'] = $request->input('default_address_id',''); - //$data['payid'] = $request->input('payid',''); $data['user_bonus_id'] = $request->input('user_bonus_id',''); $data['shipping_costs'] = $request->input('shipping_costs',''); $data['message'] = $request->input('message',''); @@ -60,52 +94,48 @@ class OrderController extends CommonController //获取商品列表 $data['cartids'] = $request->input('cartids',''); - if($data['cartids']=='') { return ReturnData::create(ReturnData::PARAMS_ERROR); } - return Order::add($data); + if(Helper::isPostRequest()) + { + $data['user_id'] = Token::$uid; + + return $this->getLogic()->add($data); + } } - //订单修改 + //修改 public function orderUpdate(Request $request) - { - if($request->input('id', '')!=''){$where['id'] = $request->input('id');} - if($request->input('order_sn', '')!=''){$where['order_sn'] = $request->input('order_sn');} - - if($request->input('order_amount', '')!=''){$data['order_amount'] = $request->input('order_amount');} - if($request->input('out_trade_no', '')!=''){$data['out_trade_no'] = $request->input('out_trade_no');} - if($request->input('shipping_name', '')!=''){$data['shipping_name'] = $request->input('shipping_name');} - if($request->input('shipping_id', '')!=''){$data['shipping_id'] = $request->input('shipping_id');} - if($request->input('shipping_sn', '')!=''){$data['shipping_sn'] = $request->input('shipping_sn');} - if($request->input('shipping_fee', '')!=''){$data['shipping_fee'] = $request->input('shipping_fee');} - if($request->input('shipping_time', '')!=''){$data['shipping_time'] = $request->input('shipping_time');} - if($request->input('name', '')!=''){$data['name'] = $request->input('name');} - if($request->input('province', '')!=''){$data['province'] = $request->input('province');} - if($request->input('city', '')!=''){$data['city'] = $request->input('city');} - if($request->input('district', '')!=''){$data['district'] = $request->input('district');} - if($request->input('address', '')!=''){$data['address'] = $request->input('address');} - if($request->input('zipcode', '')!=''){$data['zipcode'] = $request->input('zipcode');} - if($request->input('mobile', '')!=''){$data['mobile'] = $request->input('mobile');} - if($request->input('message', '')!=''){$data['message'] = $request->input('message');} - if($request->input('is_comment', '')!=''){$data['is_comment'] = $request->input('is_comment');} - if($request->input('is_delete', '')!=''){$data['is_delete'] = $request->input('is_delete');} - if($request->input('to_buyer', '')!=''){$data['to_buyer'] = $request->input('to_buyer');} - if($request->input('invoice', '')!=''){$data['invoice'] = $request->input('invoice');} - if($request->input('invoice_title', '')!=''){$data['invoice_title'] = $request->input('invoice_title');} - if($request->input('invoice_taxpayer_number', '')!=''){$data['invoice_taxpayer_number'] = $request->input('invoice_taxpayer_number');} + { + if(!checkIsNumber($request->input('id',null))){return ReturnData::create(ReturnData::PARAMS_ERROR);} + $id = $request->input('id'); - if(!isset($where)){return ReturnData::create(ReturnData::PARAMS_ERROR);} + if(Helper::isPostRequest()) + { + unset($_POST['id']); + $where['id'] = $id; + $where['user_id'] = Token::$uid; + + return $this->getLogic()->edit($_POST,$where); + } + } + + //删除 + public function orderDelete(Request $request) + { + if(!checkIsNumber($request->input('id',null))){return ReturnData::create(ReturnData::PARAMS_ERROR);} + $id = $request->input('id'); - if (isset($data)) - { + if(Helper::isPostRequest()) + { + $where['id'] = $id; $where['user_id'] = Token::$uid; - Order::modify($where,$data); + + return $this->getLogic()->del($where); } - - return ReturnData::create(ReturnData::SUCCESS); } //订单状态修改 @@ -126,7 +156,7 @@ class OrderController extends CommonController //判断订单是否存在或本人 $where['order_status'] = 0; $where['pay_status'] = 0; - $order = Order::where($where)->first(); + $order = model('Order')->getOne($where); if(!$order){return ReturnData::create(ReturnData::PARAMS_ERROR,null,'订单不存在');} //判断用户余额是否足够 @@ -210,19 +240,6 @@ class OrderController extends CommonController return ReturnData::create(ReturnData::SUCCESS); } - //删除订单 - public function orderDelete(Request $request) - { - $id = $request->input('id',''); - - if($id=='') - { - return ReturnData::create(ReturnData::PARAMS_ERROR); - } - - return Order::remove($id,Token::$uid); - } - //商城支付宝app支付 public function orderAlipayApp(Request $request) { diff --git a/app/Http/Controllers/Api/UserAddressController.php b/app/Http/Controllers/Api/UserAddressController.php index ca6bd17..a1a3922 100644 --- a/app/Http/Controllers/Api/UserAddressController.php +++ b/app/Http/Controllers/Api/UserAddressController.php @@ -1,12 +1,13 @@ input('limit', 10); - $data['offset'] = $request->input('offset', 0); - $data['user_id'] = Token::$uid; - - $res = UserAddress::getList($data); - - if(!$res) - { - return ReturnData::create(ReturnData::SYSTEM_FAIL); - } - - return ReturnData::create(ReturnData::SUCCESS,$res); + public function getLogic() + { + return logic('UserAddress'); } - //用户收货地址详情 - public function userAddressDetail(Request $request) + public function userAddressList(Request $request) { //参数 - $id = $request->input('id',null); + $limit = $request->input('limit', 10); + $offset = $request->input('offset', 0); - $res = UserAddress::getOne(Token::$uid,$id); - if($res === false) - { - return ReturnData::create(ReturnData::SYSTEM_FAIL); - } + $where['user_id'] = Token::$uid; + $res = $this->getLogic()->getList($where, array('id', 'desc'), '*', $offset, $limit); + return ReturnData::create(ReturnData::SUCCESS,$res); } - //设为默认地址 - public function userAddressSetDefault(Request $request) + public function userAddressDetail(Request $request) { //参数 - $id = $request->input('id',null); + if($request->input('id',null) != null){$where['id'] = $request->input('id');} + $where['user_id'] = Token::$uid; - $res = UserAddress::setDefault($id,Token::$uid); + $res = $this->getLogic()->getOne($where); if(!$res) { - return ReturnData::create(ReturnData::SYSTEM_FAIL); + return ReturnData::create(ReturnData::RECORD_NOT_EXIST); } return ReturnData::create(ReturnData::SUCCESS,$res); } - //添加收货地址 + //添加 public function userAddressAdd(Request $request) - { - //参数 - $data['user_id'] = Token::$uid; - $data['name'] = $request->input('name',null); - $data['mobile'] = $request->input('mobile',null); - $data['province'] = $request->input('province',null); - $data['city'] = $request->input('city',null); - $data['district'] = $request->input('district',null); - $data['address'] = $request->input('address',null); - if($request->input('country',null)!==null){$data['country'] = $request->input('country');} - if($request->input('telphone',null)!==null){$data['telphone'] = $request->input('telphone');} - if($request->input('zipcode',null)!==null){$data['zipcode'] = $request->input('zipcode');} - if($request->input('is_default',null)!==null){$data['is_default'] = $request->input('is_default');} - - if($data['name']===null || $data['mobile']===null || $data['address']===null || $data['province']===null || $data['city']===null || $data['district']===null) - { - return ReturnData::create(ReturnData::PARAMS_ERROR); + { + if(Helper::isPostRequest()) + { + $_POST['user_id'] = Token::$uid; + + return $this->getLogic()->add($_POST); } - - return UserAddress::add($data); } - //修改收货地址 + //修改 public function userAddressUpdate(Request $request) - { - //参数 - $data['user_id'] = Token::$uid; - $data['id'] = $request->input('id',null); - $data['name'] = $request->input('name',null); - $data['mobile'] = $request->input('mobile',null); - $data['province'] = $request->input('province',null); - $data['city'] = $request->input('city',null); - $data['district'] = $request->input('district',null); - $data['address'] = $request->input('address',null); - if($request->input('country',null)!==null){$data['country'] = $request->input('country');} - if($request->input('is_default',null)!==null){$data['is_default'] = $request->input('is_default');} - - if($data['id']===null || $data['name']===null || $data['mobile']===null || $data['address']===null || $data['province']===null || $data['city']===null || $data['district']===null) - { - return ReturnData::create(ReturnData::PARAMS_ERROR); + { + if(!checkIsNumber($request->input('id',null))){return ReturnData::create(ReturnData::PARAMS_ERROR);} + $id = $request->input('id'); + + if(Helper::isPostRequest()) + { + unset($_POST['id']); + $where['id'] = $id; + $where['user_id'] = Token::$uid; + + return $this->getLogic()->edit($_POST,$where); } - - $res = UserAddress::modify($data); - if(!$res) - { - return ReturnData::create(ReturnData::SYSTEM_FAIL); - } - - return ReturnData::create(ReturnData::SUCCESS,$res); } - //删除收货地址 + //删除 public function userAddressDelete(Request $request) + { + if(!checkIsNumber($request->input('id',null))){return ReturnData::create(ReturnData::PARAMS_ERROR);} + $id = $request->input('id'); + + if(Helper::isPostRequest()) + { + $where['id'] = $id; + $where['user_id'] = Token::$uid; + + return $this->getLogic()->del($where); + } + } + + //设为默认地址 + public function userAddressSetDefault(Request $request) { //参数 - $id = $request->input('id',''); - - if($id == '') - { - return ReturnData::create(ReturnData::PARAMS_ERROR); - } + if(!checkIsNumber($request->input('id',null))){return ReturnData::create(ReturnData::PARAMS_ERROR);} + $id = $request->input('id'); - $res = UserAddress::remove($id,Token::$uid); - if(!$res) + $where['id'] = $id; + $where['user_id'] = Token::$uid; + $res = $this->getLogic()->setDefault($where); + if($res) { - return ReturnData::create(ReturnData::SYSTEM_FAIL); + return ReturnData::create(ReturnData::SUCCESS,$res); } - return ReturnData::create(ReturnData::SUCCESS,$res); + return ReturnData::create(ReturnData::FAIL); } //获取用户默认地址 public function userDefaultAddress(Request $request) { - $res = UserAddress::userDefaultAddress(Token::$uid); - if(!$res) + $where['user_id'] = Token::$uid; + $res = $this->getLogic()->userDefaultAddress($where); + if($res) { - return ReturnData::create(ReturnData::SYSTEM_FAIL); + return ReturnData::create(ReturnData::SUCCESS,$res); } - return ReturnData::create(ReturnData::SUCCESS,$res); + return ReturnData::create(ReturnData::FAIL); } } \ No newline at end of file diff --git a/app/Http/Controllers/Weixin/OrderController.php b/app/Http/Controllers/Weixin/OrderController.php index 2db307d..d27f803 100644 --- a/app/Http/Controllers/Weixin/OrderController.php +++ b/app/Http/Controllers/Weixin/OrderController.php @@ -63,7 +63,7 @@ class OrderController extends CommonController $id = $request->input('id',''); $postdata = array( - 'order_id' => $id, + 'id' => $id, 'access_token' => $_SESSION['weixin_user_info']['access_token'] ); $url = env('APP_API_URL')."/order_detail"; @@ -117,7 +117,7 @@ class OrderController extends CommonController if($id==''){$this->error_jump('您访问的页面不存在或已被删除！');} $postdata = array( - 'order_id' => $id, + 'id' => $id, 'order_status' => 3, 'refund_status' => 0, 'access_token' => $_SESSION['weixin_user_info']['access_token'] @@ -135,7 +135,7 @@ class OrderController extends CommonController { //获取订单详情 $postdata = array( - 'order_id' => $id, //要支付的订单id + 'id' => $id, //要支付的订单id 'order_status' => 0, 'pay_status' => 0, 'access_token' => $_SESSION['weixin_user_info']['access_token'] @@ -202,7 +202,7 @@ class OrderController extends CommonController //获取订单详情 $postdata = array( - 'order_id' => $order_id, //要支付的订单id + 'id' => $order_id, //要支付的订单id 'order_status' => 0, 'pay_status' => 0, 'access_token' => $_SESSION['weixin_user_info']['access_token'] @@ -244,7 +244,7 @@ class OrderController extends CommonController //获取订单详情 $postdata = array( - 'order_id' => $order_id, //要支付的订单id + 'id' => $order_id, //要支付的订单id 'order_status' => 0, 'pay_status' => 0, 'access_token' => $_SESSION['weixin_user_info']['access_token'] diff --git a/app/Http/Logic/GoodsLogic.php b/app/Http/Logic/GoodsLogic.php index 3d2b60a..9cad4f7 100644 --- a/app/Http/Logic/GoodsLogic.php +++ b/app/Http/Logic/GoodsLogic.php @@ -38,6 +38,7 @@ class GoodsLogic extends BaseLogic $res['list'][$k]->price = $this->getModel()->get_goods_final_price($v); $res['list'][$k]->is_promote_goods = $this->getModel()->bargain_price($v->promote_price,$v->promote_start_date,$v->promote_end_date); //is_promote_goods等于0，说明不是促销商品 + $res['list'][$k]->goods_detail_url = route('weixin_goods_detail',array('id'=>$v->id)); } } @@ -65,6 +66,7 @@ class GoodsLogic extends BaseLogic $res['list'][$k]->price = $this->getModel()->get_goods_final_price($v); //商品最终价格 $res['list'][$k]->is_promote_goods = $this->getModel()->bargain_price($v->promote_price,$v->promote_start_date,$v->promote_end_date); //is_promote_goods等于0，说明不是促销商品 + $res['list'][$k]->goods_detail_url = route('weixin_goods_detail',array('id'=>$v->id)); } } @@ -80,7 +82,9 @@ class GoodsLogic extends BaseLogic $res = $this->getDataView($res); $res->price = $this->getModel()->get_goods_final_price($res); //商品最终价格 $res->is_promote_goods = $this->getModel()->bargain_price($res->promote_price,$res->promote_start_date,$res->promote_end_date); //is_promote_goods等于0，说明不是促销商品 - + $res->goods_detail_url = route('weixin_goods_detail',array('id'=>$res->id)); + $res->goods_img_list = model('GoodsImg')->getDb()->where(['goods_id'=>$res->id])->get(); + //商品评论数 $where2['comment_type'] = Comment::GOODS_COMMENT_TYPE; $where2['status'] = Comment::SHOW_COMMENT; diff --git a/app/Http/Logic/OrderLogic.php b/app/Http/Logic/OrderLogic.php index 6ae7a3d..970a660 100644 --- a/app/Http/Logic/OrderLogic.php +++ b/app/Http/Logic/OrderLogic.php @@ -34,6 +34,16 @@ class OrderLogic extends BaseLogic foreach($res['list'] as $k=>$v) { $res['list'][$k] = $this->getDataView($v); + + $order_status_arr = $this->getModel()->getOrderStatusAttr($v); + $res['list'][$k]->order_status_text = $order_status_arr?$order_status_arr['text']:''; + $res['list'][$k]->order_status_num = $order_status_arr?$order_status_arr['num']:''; + $res['list'][$k]->province_name = model('Region')->getRegionName(['id'=>$v->province]); + $res['list'][$k]->city_name = model('Region')->getRegionName(['id'=>$v->city]); + $res['list'][$k]->district_name = model('Region')->getRegionName(['id'=>$v->district]); + + $order_goods = model('OrderGoods')->getDb()->where(array('order_id'=>$v->id))->get(); + $res['list'][$k]->goods_list = $order_goods; } } @@ -72,21 +82,157 @@ class OrderLogic extends BaseLogic $res = $this->getDataView($res); + $order_status_arr = $this->getModel()->getOrderStatusAttr($res); + $res->order_status_text = $order_status_arr['text']; + $res->order_status_num = $order_status_arr['num']; + + $res->province_name = model('Region')->getRegionName(['id'=>$res->province]); + $res->city_name = model('Region')->getRegionName(['id'=>$res->city]); + $res->district_name = model('Region')->getRegionName(['id'=>$res->district]); + + $order_goods = model('OrderGoods')->getDb()->where(array('order_id'=>$res->id))->get(); + $res->goods_list = $order_goods; + return $res; } - //添加 + /** + * 生成订单 + * @param string $data['cartids'] 购物车商品id,格式：1_2_3 + * @param int $data['user_id'] 用户id + * @param int $data['user_bonus_id'] 用户优惠券id + * @param string $data['default_address_id'] 用户默认收货地址 + * @param float $data['shipping_costs'] 运费 + * @param string $data['message'] 备注 + * @param int $data['place_type'] 订单来源,1pc，2微信，3app + * @return array + */ public function add($data = array(), $type=0) { if(empty($data)){return ReturnData::create(ReturnData::PARAMS_ERROR);} - $validator = $this->getValidate($data, 'add'); + //总的验证规则 + $rules = [ + 'cartids' => 'required', + 'user_id' => 'required|integer', + 'user_bonus_id' => 'integer', + 'default_address_id' => 'required|integer', + 'shipping_costs' => ['regex:/^\d{0,10}(\.\d{0,2})?$/'], + 'message' => 'max:150', + 'place_type' => 'integer|between:0,5', + ]; + + //总的自定义错误信息 + $messages = [ + 'cartids.required' => '购物车商品id必填', + 'user_id.required' => '用户ID必填', + 'user_id.integer' => '用户ID必须为数字', + 'user_bonus_id.integer' => '优惠券ID必须为数字', + 'default_address_id.required' => '收货地址必填', + 'default_address_id.integer' => '收货地址必须为数字', + 'shipping_costs.regex' => '运费格式不正确，运费只能带2位小数的数字', + 'message.max' => '备注不能超过150个字符', + 'place_type.integer' => '订单来源必须是数字', + 'place_type.between' => '订单来源,1pc，2微信，3app', + ]; + + $validator = Validator::make($data, $rules, $messages); if ($validator->fails()){return ReturnData::create(ReturnData::PARAMS_ERROR, null, $validator->errors()->first());} - $res = $this->getModel()->add($data,$type); - if($res){return ReturnData::create(ReturnData::SUCCESS,$res);} + //获取订单商品列表 + $cartCheckoutGoods = logic('Cart')->cartCheckoutGoodsList(array('ids'=>$data['cartids'],'user_id'=>$data['user_id'])); + $order_goods = $cartCheckoutGoods['data']; + if(empty($order_goods['list'])){return ReturnData::create(ReturnData::SYSTEM_FAIL,null,'订单商品不存在');} - return ReturnData::create(ReturnData::FAIL); + //获取收货地址 + $user_address = model('UserAddress')->getOne(['user_id'=>$data['user_id'],'id'=>$data['default_address_id']]); + if(!$user_address){return ReturnData::create(ReturnData::SYSTEM_FAIL,null,'收货地址不存在');} + + //获取优惠券信息 + $user_bonus = logic('UserBonus')->getUserBonusByid(array('user_bonus_id'=>$data['user_bonus_id'],'user_id'=>$data['user_id'])); + + $discount = !empty($user_bonus)?$user_bonus['money']:0.00; //优惠金额=优惠券 + + $order_amount = $order_goods['total_price'] - $discount; + $pay_status = 0; //未付款 + + //如果各种优惠金额大于订单实际金额跟运费之和，则默认订单状态为已付款 + if($order_amount < 0) + { + $order_amount = 0; + $pay_status = 1; //已付款 + } + + //构造订单字段 + $order_info = array( + 'order_sn' => date('YmdHis').rand(1000,9999), + 'add_time' => time(), + 'pay_status' => $pay_status, + 'user_id' => $data['user_id'], + 'goods_amount' => $order_goods['total_price'], //商品的总金额 + 'order_amount' => $order_amount, //应付金额=商品总价+运费-优惠(积分、红包) + 'discount' => $discount, //优惠金额 + 'name' => $user_address->name, + //'country' => $user_address->country, + 'province' => $user_address->province, + 'city' => $user_address->city, + 'district' => $user_address->district, + 'address' => $user_address->address, + 'zipcode' => $user_address->zipcode, + 'mobile' => $user_address->mobile, + 'place_type' => $data['place_type'], //订单来源 + 'bonus_id' => $user_bonus?$user_bonus['id']:0, + 'bonus_money' => $user_bonus?$user_bonus['money']:0.00, + 'message' => $data['message'] ? $data['message'] : '', + ); + + //插入订单 + $order_id = $this->getModel()->add($order_info); + + if ($order_id) + { + //订单生成成功之后，扣除用户的积分和改变优惠券的使用状态 + //改变优惠券使用状态 + model('UserBonus')->getDb()->where(array('user_id'=>$data['user_id'],'id'=>$data['user_bonus_id']))->update(array('status'=>1,'used_time'=>time())); + //扣除用户积分，预留 + //$updateMember['validscore'] = $addressInfo['validscore']-$PointPay; + //M("Member")->where(array('id'=>$CustomerSysNo))->save($updateMember); + //增加一条积分支出记录，一条购物获取积分记录 + + //插入订单商品 + $order_goods_list = array(); + foreach($order_goods['list'] as $k=>$v) + { + $temp_order_goods = array( + 'order_id' => $order_id, + 'goods_id' => $v->goods_id, + 'goods_name' => $v->title, + 'goods_number' => $v->goods_number, + 'market_price' => $v->market_price, + 'goods_price' => $v->final_price, + //'goods_attr' => '', //商品属性，预留 + 'goods_img' => $v->litpic + ); + array_push($order_goods_list,$temp_order_goods); + + //订单商品直接减库存操作 + model('Goods')->changeGoodsStock(array('goods_id'=>$v->goods_id,'goods_number'=>$v->goods_number)); + } + $result = model('OrderGoods')->add($order_goods_list,1); + if($result) + { + //删除购物对应的记录 + model('Cart')->getDb()->where(array('user_id'=>$data['user_id']))->whereIn('id', explode("_",$data['cartids']))->delete(); + + return ReturnData::create(ReturnData::SUCCESS, $order_id); + } + else + { + return ReturnData::create(ReturnData::SYSTEM_FAIL,null,'订单商品添加失败'); + } + } + + return ReturnData::create(ReturnData::SYSTEM_FAIL,null,'生成订单失败'); } //修改 diff --git a/app/Http/Logic/UserAddressLogic.php b/app/Http/Logic/UserAddressLogic.php index f764223..9800d16 100644 --- a/app/Http/Logic/UserAddressLogic.php +++ b/app/Http/Logic/UserAddressLogic.php @@ -1,6 +1,7 @@ $v) { $res['list'][$k] = $this->getDataView($v); + $res['list'][$k] = $this->getProvinceCityDistrictText($res['list'][$k]); } } @@ -64,13 +66,30 @@ class UserAddressLogic extends BaseLogic return $res; } - //详情 + /** + * 获取一条记录，不传id表示获取默认地址 + * @param int $where['id'] user_address表id，选填 + * @param int $where['user_id'] 用户id + * @return array + */ public function getOne($where = array(), $field = '*') { + //获取默认地址 + if (isset($where['id']) && $where['id']!='' && $where['id']!=0) + { + + } + else + { + $user_address_id = model('User')->getDb()->where(['id'=>$where['user_id']])->value('address_id'); + if($user_address_id){$where['id'] = $user_address_id;}else{$where['is_default'] = UserAddress::IS_DEFAULT;} + } + $res = $this->getModel()->getOne($where, $field); if(!$res){return false;} $res = $this->getDataView($res); + $res = $this->getProvinceCityDistrictText($res); return $res; } @@ -83,8 +102,26 @@ class UserAddressLogic extends BaseLogic $validator = $this->getValidate($data, 'add'); if ($validator->fails()){return ReturnData::create(ReturnData::PARAMS_ERROR, null, $validator->errors()->first());} + if(model('UserAddress')->getDb()->where('user_id', $data['user_id'])->count() >= 10) + { + return ReturnData::create(ReturnData::PARAMS_ERROR,null,'最多10个收货地址'); + } + $res = $this->getModel()->add($data,$type); - if($res){return ReturnData::create(ReturnData::SUCCESS,$res);} + if($res) + { + $user_address = model('User')->getDb() + ->join('user_address', 'user.address_id', '=', 'user_address.id') + ->where('user.id',$data['user_id']) + ->first(); + + if (!$user_address || $data['is_default']==UserAddress::IS_DEFAULT) + { + $this->setDefault(['id'=>$res,'user_id'=>$data['user_id']]); + } + + return ReturnData::create(ReturnData::SUCCESS,$res); + } return ReturnData::create(ReturnData::FAIL); } @@ -98,7 +135,15 @@ class UserAddressLogic extends BaseLogic if ($validator->fails()){return ReturnData::create(ReturnData::PARAMS_ERROR, null, $validator->errors()->first());} $res = $this->getModel()->edit($data,$where); - if($res){return ReturnData::create(ReturnData::SUCCESS,$res);} + if($res) + { + if ($data['is_default']==UserAddress::IS_DEFAULT) + { + $this->setDefault(['id'=>$where['id'],'user_id'=>$where['user_id']]); + } + + return ReturnData::create(ReturnData::SUCCESS,$res); + } return ReturnData::create(ReturnData::FAIL); } @@ -112,7 +157,19 @@ class UserAddressLogic extends BaseLogic if ($validator->fails()){return ReturnData::create(ReturnData::PARAMS_ERROR, null, $validator->errors()->first());} $res = $this->getModel()->del($where); - if($res){return ReturnData::create(ReturnData::SUCCESS,$res);} + + if($res) + { + if ($address = $this->getModel()->getOne(['user_id'=>$where['user_id']])) + { + if(model('User')->getDb()->where(['id'=>$where['user_id'],'address_id'=>$where['id']])->update(['address_id'=>$address->id])) + { + $this->getModel()->edit(array('is_default' => UserAddress::IS_DEFAULT),['id'=>$address->id]); + } + } + + return ReturnData::create(ReturnData::SUCCESS,$res); + } return ReturnData::create(ReturnData::FAIL); } @@ -126,4 +183,53 @@ class UserAddressLogic extends BaseLogic { return getDataAttr($this->getModel(),$data); } + + /** + * 设为默认地址 + * @param int $where['id'] user_address表id + * @param int $where['user_id'] 用户id + * @return array + */ + public function setDefault($where) + { + if ($this->getModel()->edit(['is_default'=>UserAddress::IS_DEFAULT],$where)) + { + $this->getModel()->getDb()->where('user_id', $where['user_id'])->where('id', '<>', $where['id'])->update(['is_default'=>0]); + model('User')->edit(['address_id'=>$where['id']],['id'=>$where['user_id']]); + + return true; + } + + return false; + } + + // 获取默认地址 + public function userDefaultAddress($where) + { + $arr = []; + $arr = $this->getModel()->getOne(array('user_id'=>$where['user_id'],'is_default'=>UserAddress::IS_DEFAULT)); + + if (!$arr) + { + $arr = $this->getModel()->getOne(array('user_id'=>$where['user_id'])); + } + + if($arr) + { + $arr = $this->getProvinceCityDistrictText($arr); + } + + return $arr; + } + + // 获取省市区名称 + public function getProvinceCityDistrictText($data) + { + $data->country_name = isset($data->country) ? model('Region')->getRegionName(['id'=>$data->country]) : ''; + $data->province_name = isset($data->province) ? model('Region')->getRegionName(['id'=>$data->province]) : ''; + $data->city_name = isset($data->city) ? model('Region')->getRegionName(['id'=>$data->city]) : ''; + $data->district_name = isset($data->district) ? model('Region')->getRegionName(['id'=>$data->district]) : ''; + + return $data; + } } \ No newline at end of file diff --git a/app/Http/Logic/UserLogic.php b/app/Http/Logic/UserLogic.php index c895b7e..71efaf5 100644 --- a/app/Http/Logic/UserLogic.php +++ b/app/Http/Logic/UserLogic.php @@ -228,6 +228,4 @@ class UserLogic extends BaseLogic return ReturnData::create(ReturnData::SUCCESS,$token, '注册成功'); } - - } \ No newline at end of file diff --git a/app/Http/Model/Bonus.php b/app/Http/Model/Bonus.php index c157aac..da20844 100644 --- a/app/Http/Model/Bonus.php +++ b/app/Http/Model/Bonus.php @@ -171,72 +171,11 @@ class Bonus extends BaseModel return $res; } - /* - //获取列表 - public static function getList(array $param) - { - extract($param); //参数：limit，offset - - $limit = isset($limit) ? $limit : 10; - $offset = isset($offset) ? $offset : 0; - $where['status'] = self::STATUS; - - $model = new Bonus; - - $model = $model->where($where); - - $model = $model->where(function ($query) { - $query->where('num', '=', -1)->orWhere('num', '>', 0); - }); - - $model = $model->where(function ($query) { - $query->where('start_time', '<', date('Y-m-d H:i:s'))->where('end_time', '>', date('Y-m-d H:i:s')); - }); - - $res['count'] = $model->count(); - $res['list'] = array(); - - if($res['count']>0) - { - $res['list'] = $model->skip($offset)->take($limit)->orderBy('money','desc')->get(); - } - - return $res; - } - - public static function getOne($id) - { - return self::where('id', $id)->first(); - } - - public static function add(array $data) - { - if ($id = self::insertGetId($data)) - { - return true; - } - - return false; - } - - public static function modify($where, array $data) + /** + * 打印sql + */ + public function toSql($where) { - if (self::where($where)->update($data)!==false) - { - return true; - } - - return false; + return $this->getDb()->where($where)->toSql(); } - - //删除一条记录 - public static function remove($id) - { - if (!self::whereIn('id', explode(',', $id))->delete()) - { - return false; - } - - return true; - } */ } \ No newline at end of file diff --git a/app/Http/Model/Cart.php b/app/Http/Model/Cart.php index fd1bc91..5df9693 100644 --- a/app/Http/Model/Cart.php +++ b/app/Http/Model/Cart.php @@ -190,6 +190,14 @@ class Cart extends BaseModel */ public function TotalGoodsCount($where) { - return self::where($where)->sum('goods_number'); + return $this->getDb()->where($where)->sum('goods_number'); + } + + /** + * 打印sql + */ + public function toSql($where) + { + return $this->getDb()->where($where)->toSql(); } } \ No newline at end of file diff --git a/app/Http/Model/Goods.php b/app/Http/Model/Goods.php index 4d83db3..36c04bc 100644 --- a/app/Http/Model/Goods.php +++ b/app/Http/Model/Goods.php @@ -318,14 +318,14 @@ class Goods extends BaseModel */ public function changeGoodsStock($where) { - if($where['type']==1) + if(isset($where['type']) && $where['type']==1) { //增加库存 - return $this->getDb()->where($where)->increment('goods_number', $goods_number); + return $this->getDb()->where(array('id'=>$where['goods_id']))->increment('goods_number', $where['goods_number']); } //减少库存 - return $this->getDb()->where($where)->decrement('goods_number', $goods_number); + return $this->getDb()->where(array('id'=>$where['goods_id']))->decrement('goods_number', $where['goods_number']); } //获取栏目名称 @@ -333,4 +333,12 @@ class Goods extends BaseModel { return DB::table('goods_type')->where(array('id'=>$data['typeid']))->value('name'); } + + /** + * 打印sql + */ + public function toSql($where) + { + return $this->getDb()->where($where)->toSql(); + } } \ No newline at end of file diff --git a/app/Http/Model/Order.php b/app/Http/Model/Order.php index d8255d9..e154b69 100644 --- a/app/Http/Model/Order.php +++ b/app/Http/Model/Order.php @@ -168,273 +168,40 @@ class Order extends BaseModel return $res; } - /* - //获取订单列表 - public static function getList(array $param) - { - extract($param); - - $limit = isset($limit) ? $limit : 10; - $offset = isset($offset) ? $offset : 0; - - $model = new self(); - - if(isset($user_id)){$where['user_id'] = $user_id;} - $where['is_delete'] = 0; - - //0或者不传表示全部，1待付款，2待发货,3待收货,4待评价(确认收货，交易成功),5退款/售后 - if($status == 1) - { - $where['order_status'] = 0; - $where['pay_status'] = 0; - } - elseif($status == 2) - { - $where['order_status'] = 0; - $where['shipping_status'] = 0; - $where['pay_status'] = 1; - } - elseif($status == 3) - { - $where['order_status'] = 0; - $where['refund_status'] = 0; - $where['shipping_status'] = 1; - $where['pay_status'] = 1; - } - elseif($status == 4) - { - $where['order_status'] = 3; - $where['refund_status'] = 0; - $where['shipping_status'] = 2; - $where['is_comment'] = 0; - } - elseif($status == 5) - { - $where['order_status'] = 3; - $model = $model->where('refund_status','<>',0); - } - - $model = $model->where($where); - - $res['count'] = $model->count(); - $res['list'] = array(); - - if($res['count']>0) - { - $order_list = $model->orderBy('id', 'desc')->skip($offset)->take($limit)->get(); - - if($order_list) - { - foreach($order_list as $k=>$v) - { - $order_status_arr = self::getOrderStatusText($v); - $order_list[$k]['order_status_text'] = $order_status_arr?$order_status_arr['text']:''; - $order_list[$k]['order_status_num'] = $order_status_arr?$order_status_arr['num']:''; - - $order_list[$k]['province_name'] = Region::getRegionName($v['province']); - $order_list[$k]['city_name'] = Region::getRegionName($v['city']); - $order_list[$k]['district_name'] = Region::getRegionName($v['district']); - - $order_goods = OrderGoods::where(array('order_id'=>$v['id']))->get(); - $order_list[$k]['goods_list'] = $order_goods; - } - } - - $res['list'] = $order_list; - } - - return ReturnData::create(ReturnData::SUCCESS,$res); - } - - public static function getOne(array $param) - { - extract($param); - - $where['id'] = $order_id; - $where['user_id'] = $user_id; - - if(isset($order_status)){$where['order_status'] = $order_status;} - if(isset($pay_status)){$where['pay_status'] = $pay_status;} - - $res = self::where($where)->first(); - - if(!$res) - { - return ReturnData::create(ReturnData::SYSTEM_FAIL); - } - - $order_status_arr = self::getOrderStatusText($res); - $res['order_status_text'] = $order_status_arr['text']; - $res['order_status_num'] = $order_status_arr['num']; - - $res['province_name'] = Region::getRegionName($res['province']); - $res['city_name'] = Region::getRegionName($res['city']); - $res['district_name'] = Region::getRegionName($res['district']); - - $order_goods = OrderGoods::where(array('order_id'=>$res['id']))->get(); - $res['goods_list'] = $order_goods; - - return ReturnData::create(ReturnData::SUCCESS,$res); - } - - //生成订单 - public static function add(array $param) - { - extract($param); - - //获取订单商品列表 - $cartCheckoutGoods = Cart::cartCheckoutGoodsList(array('ids'=>$cartids,'user_id'=>$user_id)); - $order_goods = $cartCheckoutGoods['data']; - if(empty($order_goods['list'])){return ReturnData::create(ReturnData::SYSTEM_FAIL,null,'订单商品不存在');} - - //获取收货地址 - $user_address = UserAddress::getOne($user_id,$default_address_id); - if(!$user_address){return ReturnData::create(ReturnData::SYSTEM_FAIL,null,'收货地址不存在');} - - //获取优惠券信息 - $user_bonus = UserBonus::getUserBonusByid(array('user_bonus_id'=>$user_bonus_id,'user_id'=>$user_id)); - - $discount = !empty($user_bonus)?$user_bonus['money']:0.00; //优惠金额=优惠券 - - $order_amount = $order_goods['total_price'] - $discount; - $pay_status = 0; //未付款 - - //如果各种优惠金额大于订单实际金额跟运费之和，则默认订单状态为已付款 - if($order_amount < 0) - { - $order_amount = 0; - $pay_status = 1; //已付款 - } - - //构造订单字段 - $order_info = array( - 'order_sn' => date('YmdHis').rand(1000,9999), - 'add_time' => time(), - 'pay_status' => $pay_status, - 'user_id' => $user_id, - 'goods_amount' => $order_goods['total_price'], //商品的总金额 - 'order_amount' => $order_amount, //应付金额=商品总价+运费-优惠(积分、红包) - 'discount' => $discount, //优惠金额 - 'name' => $user_address['name'], - //'country' => $user_address['country'], - 'province' => $user_address['province'], - 'city' => $user_address['city'], - 'district' => $user_address['district'], - 'address' => $user_address['address'], - 'zipcode' => $user_address['zipcode'], - 'mobile' => $user_address['mobile'], - 'place_type' => $place_type, //订单来源 - 'bonus_id' => !empty($user_bonus)?$user_bonus['id']:0, - 'bonus_money' => !empty($user_bonus)?$user_bonus['money']:0.00, - 'message' => !empty($message)?$message:'', - ); - - //插入订单 - $order_id = self::insertGetId($order_info); - - if ($order_id) - { - //订单生成成功之后，扣除用户的积分和改变优惠券的使用状态 - //改变优惠券使用状态 - UserBonus::where(array('user_id'=>$user_id,'id'=>$user_bonus_id))->update(array('status'=>1,'used_time'=>time())); - //扣除用户积分，预留 - //$updateMember['validscore'] = $addressInfo['validscore']-$PointPay; - //M("Member")->where(array('id'=>$CustomerSysNo))->save($updateMember); - //增加一条积分支出记录，一条购物获取积分记录 - - //插入订单商品 - $order_goods_list = array(); - foreach($order_goods['list'] as $k=>$v) - { - $temp_order_goods = array( - 'order_id' => $order_id, - 'goods_id' => $v['goods_id'], - 'goods_name' => $v['title'], - 'goods_number' => $v['goods_number'], - 'market_price' => $v['market_price'], - 'goods_price' => $v['final_price'], - //'goods_attr' => '', //商品属性，预留 - 'goods_img' => $v['litpic'] - ); - array_push($order_goods_list,$temp_order_goods); - - //订单商品直接减库存操作 - Goods::changeGoodsStock(array('goods_id'=>$v['goods_id'],'goods_number'=>$v['goods_number'])); - } - $result = DB::table('order_goods')->insert($order_goods_list); - if($result) - { - //删除购物对应的记录 - Cart::where(array('user_id'=>$user_id))->whereIn('id', explode("_",$cartids))->delete(); - - return ReturnData::create(ReturnData::SUCCESS,$order_id); - } - else - { - return ReturnData::create(ReturnData::SYSTEM_FAIL,null,'订单商品添加失败'); - } - } - else - { - return ReturnData::create(ReturnData::SYSTEM_FAIL,null,'生成订单失败'); - } - } - - public static function modify($where, array $data) - { - if (self::where($where)->update($data) === false) - { - return false; - } - - return true; - } - - //删除一条记录 - public static function remove($id,$user_id) - { - if(!is_array($id)){$id = explode(',', $id);} - if (self::whereIn('id', $id)->where('user_id',$user_id)->delete() === false) - { - return false; - } - - return true; - } */ //获取订单状态文字:1待付款，2待发货,3待收货,4待评价(确认收货，交易成功),5退款/售后,6已取消,7无效 - public function getOrderStatusAttr($where) + public function getOrderStatusAttr($data) { $res = ''; - if($where['order_status'] == 0 && $where['pay_status'] ==0) + if($data->order_status == 0 && $data->pay_status ==0) { $res = array('text'=>'待付款','num'=>1); } - elseif($where['order_status'] == 0 && $where['shipping_status'] == 0 && $where['pay_status'] == 1) + elseif($data->order_status == 0 && $data->shipping_status == 0 && $data->pay_status == 1) { $res = array('text'=>'待发货','num'=>2); } - elseif($where['order_status'] == 0 && $where['refund_status'] == 0 && $where['shipping_status'] == 1 && $where['pay_status'] == 1) + elseif($data->order_status == 0 && $data->refund_status == 0 && $data->shipping_status == 1 && $data->pay_status == 1) { $res = array('text'=>'待收货','num'=>3); } - elseif($where['order_status'] == 3 && $where['refund_status'] == 0) + elseif($data->order_status == 3 && $data->refund_status == 0) { $res = array('text'=>'交易成功','num'=>4); } - elseif($where['order_status'] == 3 && $where['refund_status'] == 1) + elseif($data->order_status == 3 && $data->refund_status == 1) { $res = array('text'=>'售后中','num'=>5); } - elseif($where['order_status'] == 1) + elseif($data->order_status == 1) { $res = array('text'=>'已取消','num'=>6); } - elseif($where['order_status'] == 2) + elseif($data->order_status == 2) { $res = array('text'=>'无效','num'=>7); } - elseif($where['order_status'] == 3 && $where['refund_status'] == 2) + elseif($data->order_status == 3 && $data->refund_status == 2) { $res = array('text'=>'退款成功','num'=>8); } @@ -443,59 +210,29 @@ class Order extends BaseModel } //获取发票类型文字：0不索要发票，1个人，2企业 - public function getInvoiceAttr($where) + public function getInvoiceAttr($data) { - $res = ''; - if($where['invoice'] == 0) - { - $res = '不索要发票'; - } - elseif($where['invoice'] == 1) - { - $res = '个人'; - } - elseif($where['invoice'] == 2) - { - $res = '企业'; - } - - return $res; + $arr = array(0 => '不索要发票', 1 => '个人', 2 => '企业'); + return $arr[$data->invoice]; } //获取订单来源文字：1pc，2weixin，3app，4wap - public function getPlaceTypeAttr($where) + public function getPlaceTypeAttr($data) { - $res = ''; - if($where['place_type'] === 1) - { - $res = 'pc'; - } - elseif($where['place_type'] === 2) - { - $res = 'weixin'; - } - elseif($where['place_type'] === 3) - { - $res = 'app'; - } - elseif($where['place_type'] === 4) - { - $res = 'wap'; - } - - return $res; + $arr = array(0 => '未知', 1 => 'pc', 2 => 'weixin', 3 => 'app', 4 => 'wap'); + return $arr[$data->place_type]; } //根据订单id返库存 public function returnStock($order_id) { - $order_goods = OrderGoods::where(array('order_id'=>$order_id))->get(); + $order_goods = model('OrderGoods')->getDb()->where(array('order_id'=>$order_id))->get(); if(!$order_goods){return false;} foreach($order_goods as $k=>$v) { //订单商品直接返库存 - Goods::changeGoodsStock(array('goods_id'=>$v['goods_id'],'goods_number'=>$v['goods_number'],'type'=>1)); + model('Goods')->changeGoodsStock(array('goods_id'=>$v->goods_id,'goods_number'=>$v->goods_number,'type'=>1)); } return true; @@ -508,8 +245,16 @@ class Order extends BaseModel if(!$order){return false;} //返库存 - self::returnStock($order_id); + $this->returnStock($order_id); return true; } + + /** + * 打印sql + */ + public function toSql($where) + { + return $this->getDb()->where($where)->toSql(); + } } \ No newline at end of file diff --git a/app/Http/Model/Region.php b/app/Http/Model/Region.php index fec7c54..8a79b7b 100644 --- a/app/Http/Model/Region.php +++ b/app/Http/Model/Region.php @@ -170,10 +170,10 @@ class Region extends BaseModel } //根据id获取地区中文名称 - public static function getRegionName($id) + public function getRegionName($where) { - if(empty($id) || $id==0){return '';} + if(empty($where)){return '';} - return self::where('id', $id)->value('name'); + return $this->getDb()->where($where)->value('name'); } } \ No newline at end of file diff --git a/app/Http/Model/User.php b/app/Http/Model/User.php index 007e533..03cd460 100644 --- a/app/Http/Model/User.php +++ b/app/Http/Model/User.php @@ -192,4 +192,12 @@ class User extends BaseModel $arr = [1 => '正常', 2 => '删除', 3 => '锁定']; return $arr[$data->status]; } + + /** + * 打印sql + */ + public function toSql($where) + { + return $this->getDb()->where($where)->toSql(); + } } \ No newline at end of file diff --git a/app/Http/Model/UserAddress.php b/app/Http/Model/UserAddress.php index ffa0cf9..6c3ea58 100644 --- a/app/Http/Model/UserAddress.php +++ b/app/Http/Model/UserAddress.php @@ -170,207 +170,12 @@ class UserAddress extends BaseModel return $res; } - /* - //获取列表 - public static function getList(array $param) - { - extract($param); //参数：limit，offset - - $limit = isset($limit) ? $limit : 10; - $offset = isset($offset) ? $offset : 0; - - $model = self::where(array('user_id'=>$user_id)); - - $res['count'] = $model->count(); - $res['list'] = array(); - - if($res['count']>0) - { - $res['list'] = $model->skip($offset)->take($limit)->get(); - - if($res['list']) - { - foreach($res['list'] as $k=>$v) - { - $res['list'][$k]['country_name'] = Region::getRegionName($v['country']); - $res['list'][$k]['province_name'] = Region::getRegionName($v['province']); - $res['list'][$k]['city_name'] = Region::getRegionName($v['city']); - $res['list'][$k]['district_name'] = Region::getRegionName($v['district']); - } - } - } - else - { - return false; - } - - return $res; - } - - //获取一条记录，不传address_id表示获取默认地址 - public static function getOne($user_id,$address_id='') - { - $arr = ''; - - if ($address_id) - { - $arr = self::where(array('id'=>$address_id,'user_id'=>$user_id))->first(); - return $arr; - } - - if ($user_id > 0) - { - // 取默认地址 - $arr = self::join('user','user_address.id', '=', 'user.address_id') - ->where('user.id',$user_id)->select('user_address.id','user_address.name','country','province','city','district','address','user_address.mobile','zipcode') - ->first(); - } - - if($arr) - { - $arr->country_name = Region::getRegionName($arr->country); - $arr->province_name = Region::getRegionName($arr->province); - $arr->city_name = Region::getRegionName($arr->city); - $arr->district_name = Region::getRegionName($arr->district); - } - - return $arr; - } - - public static function add(array $param) - { - extract($param); - - if(UserAddress::where('user_id', $user_id)->count() >= 10) - { - return ReturnData::create(ReturnData::PARAMS_ERROR,null,'最多10个收货地址'); - } - - $model = new UserAddress; - $model->user_id = $user_id; - $model->name = $name; - $model->address = $address; - $model->mobile = $mobile; - $model->is_default = isset($is_default) ? $is_default : 0; - - if(isset($country)){$model->country = isset($country) ? $country : 0;} - if(isset($province)){$model->province = isset($province) ? $province : 0;} - if(isset($city)){$model->city = isset($city) ? $city : 0;} - if(isset($district)){$model->district = isset($district) ? $district : 0;} - if(isset($telphone)){$model->telphone = isset($telphone) ? $telphone : '';} - if(isset($zipcode)){$model->zipcode = isset($zipcode) ? $zipcode : '';} - - if ($model->save()) - { - $user = User::where('id', $user_id)->first(); - - if (!UserAddress::where('id', $user->address_id)->first() || $model->is_default!=0) - { - self::setDefault($model->id,$user_id); - } - - return ReturnData::create(ReturnData::SUCCESS,$model); - } - - return ReturnData::create(ReturnData::SYSTEM_FAIL); - } - - public static function modify(array $param) - { - extract($param); - - if ($model = UserAddress::where('id', $id)->where('user_id', $user_id)->first()) - { - $model->user_id = $user_id; - $model->is_default = isset($is_default) ? $is_default : 0; - - if(isset($name)){$model->name = $name;} - if(isset($country)){$model->country = $country;} - if(isset($province)){$model->province = $province;} - if(isset($city)){$model->city = $city;} - if(isset($district)){$model->district = $district;} - if(isset($address)){$model->address = $address;} - if(isset($mobile)){$model->mobile = $mobile;} - if(isset($telphone)){$model->telphone = $telphone;} - if(isset($zipcode)){$model->zipcode = $zipcode;} - - if ($model->save()) - { - if ($model->is_default!=0) - { - self::setDefault($model->id,$user_id); - } - - return $model->toArray(); - } - } - - return false; - } - - //删除一条记录 - public static function remove($id,$user_id) - { - if (UserAddress::where('id', $id)->where('user_id', $user_id)->delete()) - { - if ($address = UserAddress::where('user_id', $user_id)->first()) - { - $user = User::where('id', $user_id)->first(); - - if($user->address_id == $id) - { - $user->address_id = $address->id; - $user->save(); - - self::where('id',$address->id)->update(array('is_default' => 1)); - } - } - } - - return true; - } - //设为默认地址 - public static function setDefault($address_id,$user_id) + /** + * 打印sql + */ + public function toSql($where) { - if ($user_address = UserAddress::where('id', $address_id)->where('user_id', $user_id)->first()) - { - $user_address->is_default = 1; - $user_address->save(); - - UserAddress::where('user_id', $user_id)->where('id', '<>', $address_id)->update(['is_default'=>0]); - - if($user = User::where('id', $user_id)->first()) - { - $user->address_id = $address_id; - $user->save(); - - return true; - } - } - - return false; + return $this->getDb()->where($where)->toSql(); } - - // 获取默认地址 - public static function userDefaultAddress($user_id) - { - $arr = ''; - $arr = self::where(array('user_id'=>$user_id,'is_default'=>self::IS_DEFAULT))->first(); - - if (!$arr) - { - $arr = self::where(array('user_id'=>$user_id))->first(); - } - - if($arr) - { - $arr->country_name = Region::getRegionName($arr->country); - $arr->province_name = Region::getRegionName($arr->province); - $arr->city_name = Region::getRegionName($arr->city); - $arr->district_name = Region::getRegionName($arr->district); - } - - return $arr; - } */ } \ No newline at end of file diff --git a/app/Http/Requests/OrderRequest.php b/app/Http/Requests/OrderRequest.php index ef9d7bf..add4240 100644 --- a/app/Http/Requests/OrderRequest.php +++ b/app/Http/Requests/OrderRequest.php @@ -44,7 +44,7 @@ class OrderRequest extends BaseRequest 'title.required' => '标题必填', 'title.max' => '标题不能超过150个字符', 'typeid.required' => '栏目ID必填', - 'typeid.integer' => '栏目ID必须为数字符', + 'typeid.integer' => '栏目ID必须为数字', 'click.integer' => '点击必须为数字', 'tuijian.integer' => '推荐等级必须是数字', 'sn.max' => '货号不能超过60个字符', @@ -88,7 +88,7 @@ class OrderRequest extends BaseRequest //场景验证规则 protected $scene = [ - 'add' => ['typeid', 'title', 'tuijian', 'click', 'sn', 'price', 'litpic', 'pubdate', 'add_time', 'keywords', 'seotitle', 'description', 'status', 'shipping_fee', 'market_price', 'goods_number', 'user_id', 'sale', 'cost_price', 'goods_weight', 'point', 'comments', 'promote_start_date', 'promote_price', 'promote_end_date', 'goods_img', 'warn_number', 'listorder', 'brand_id'], + 'add' => ['message', 'warn_number', 'listorder', 'brand_id'], 'edit' => ['typeid', 'title', 'tuijian', 'click', 'sn', 'price', 'litpic', 'pubdate', 'add_time', 'keywords', 'seotitle', 'description', 'status', 'shipping_fee', 'market_price', 'goods_number', 'user_id', 'sale', 'cost_price', 'goods_weight', 'point', 'comments', 'promote_start_date', 'promote_price', 'promote_end_date', 'goods_img', 'warn_number', 'listorder', 'brand_id'], 'del' => ['id'], ]; diff --git a/app/Http/Requests/UserAddressRequest.php b/app/Http/Requests/UserAddressRequest.php new file mode 100644 index 0000000..4cf7b08 --- /dev/null +++ b/app/Http/Requests/UserAddressRequest.php @@ -0,0 +1,115 @@ + 'required|integer', + 'user_id' => 'required|integer', + 'name' => 'required|max:60', + 'country' => 'required|integer', + 'province' => 'required|integer', + 'city' => 'required|integer', + 'district' => 'required|integer', + 'address' => 'required|max:120', + 'zipcode' => 'integer', + 'telphone' => 'max:60', + 'mobile' => 'required|max:60', + 'is_default' => 'required|integer|between:0,1', + ]; + + //总的自定义错误信息 + protected $messages = [ + 'id.required' => 'ID必填', + 'id.integer' => 'ID必须为数字', + 'user_id.required' => '用户ID必填', + 'user_id.integer' => '用户ID必须为数字', + 'name.required' => '收货人名字必填', + 'name.max' => '收货人名字不能超过60个字符', + 'country.required' => '国家ID必填', + 'country.integer' => '国家ID必须为数字', + 'province.required' => '省份ID必填', + 'province.integer' => '省份ID必须为数字', + 'city.required' => '城市ID必填', + 'city.integer' => '城市ID必须为数字', + 'district.required' => '地区ID必填', + 'district.integer' => '地区ID必须为数字', + 'address.required' => '收货人的详细地址必填', + 'address.max' => '收货人的详细地址不能超过120个字符', + 'zipcode.integer' => '收货人邮编必须为数字', + 'telphone.max' => '固定电话不能超过60个字符', + 'mobile.required' => '收货人手机号必填', + 'mobile.max' => '收货人手机号不能超过20个字符', + 'is_default.required' => '是否默认必填', + 'is_default.integer' => '是否默认必须是数字', + 'is_default.between' => '是否默认,0:为非默认,1:默认', + ]; + + //场景验证规则 + protected $scene = [ + 'add' => ['user_id', 'name', 'province', 'city', 'district', 'address', 'zipcode', 'telphone', 'mobile', 'is_default'], + 'edit' => ['zipcode', 'telphone', 'is_default'], + 'del' => ['user_id', 'id'], + ]; + + /** + * Determine if the user is authorized to make this request. + * + * @return bool + */ + public function authorize() + { + return true; //修改为true + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules() + { + return $this->rules; + } + + /** + * 获取被定义验证规则的错误消息. + * + * @return array + */ + public function messages() + { + return $this->messages; + } + + //获取场景验证规则 + public function getSceneRules($name, $fields = null) + { + $res = array(); + + if(!isset($this->scene[$name])) + { + return false; + } + + $scene = $this->scene[$name]; + if($fields != null && is_array($fields)) + { + $scene = $fields; + } + + foreach($scene as $k=>$v) + { + if(isset($this->rules[$v])){$res[$v] = $this->rules[$v];} + } + + return $res; + } + + //获取场景验证规则自定义错误信息 + public function getSceneRulesMessages() + { + return $this->messages; + } +} \ No newline at end of file diff --git a/resources/views/weixin/collect_goods/index.blade.php b/resources/views/weixin/collect_goods/index.blade.php index 9f28a5b..198d700 100644 --- a/resources/views/weixin/collect_goods/index.blade.php +++ b/resources/views/weixin/collect_goods/index.blade.php @@ -12,8 +12,8 @@