diff --git a/application/goods/service/ProductService.php b/application/goods/service/ProductService.php index 2eec57c0a..2aee73770 100644 --- a/application/goods/service/ProductService.php +++ b/application/goods/service/ProductService.php @@ -36,8 +36,8 @@ class ProductService $cateWhere = ['status' => '1', 'is_deleted' => '0']; $cateList = Db::name('GoodsCate')->where($cateWhere)->order('sort asc,id desc')->column($cateField); // 产品品牌处理 - $brandField = 'id,brand_logo,brand_cover,brand_title,brand_desc,brand_detail'; $brandWhere = ['status' => '1', 'is_deleted' => '0']; + $brandField = 'id,brand_logo,brand_cover,brand_title,brand_desc,brand_detail'; $brandList = Db::name('GoodsBrand')->where($brandWhere)->order('sort asc,id desc')->column($brandField); // 无产品列表时 if (empty($goodsList)) { diff --git a/application/store/controller/Express.php b/application/store/controller/Express.php new file mode 100644 index 000000000..f4b16b38d --- /dev/null +++ b/application/store/controller/Express.php @@ -0,0 +1,126 @@ + + * @date 2017/03/27 14:43 + */ +class Express extends BasicAdmin +{ + + /** + * 定义当前操作表名 + * @var string + */ + public $table = 'StoreExpress'; + + /** + * 快递公司列表 + * @return array|string + * @throws \think\Exception + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + */ + public function index() + { + $this->title = '快递公司管理'; + list($get, $db) = [$this->request->get(), Db::name($this->table)]; + foreach (['express_title', 'express_code'] as $field) { + (isset($get[$field]) && $get[$field] !== '') && $db->whereLike($field, "%{$get[$field]}%"); + } + if (isset($get['date']) && $get['date'] !== '') { + list($start, $end) = explode(' - ', $get['date']); + $db->whereBetween('create_at', ["{$start} 00:00:00", "{$end} 23:59:59"]); + } + return parent::_list($db->where(['is_deleted' => '0'])->order('status desc,sort asc,id desc')); + } + + /** + * 添加快递公司 + * @return array|string + * @throws \think\Exception + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + */ + public function add() + { + $this->title = '添加快递公司'; + return $this->_form($this->table, 'form'); + } + + /** + * 编辑快递公司 + * @return array|string + * @throws \think\Exception + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + */ + public function edit() + { + $this->title = '编辑快递公司'; + return $this->_form($this->table, 'form'); + } + + /** + * 删除快递公司 + * @throws \think\Exception + * @throws \think\exception\PDOException + */ + public function del() + { + if (DataService::update($this->table)) { + $this->success("快递公司删除成功！", ''); + } + $this->error("快递公司删除失败，请稍候再试！"); + } + + /** + * 快递公司禁用 + * @throws \think\Exception + * @throws \think\exception\PDOException + */ + public function forbid() + { + if (DataService::update($this->table)) { + $this->success("快递公司禁用成功！", ''); + } + $this->error("快递公司禁用失败，请稍候再试！"); + } + + /** + * 快递公司禁用 + * @throws \think\Exception + * @throws \think\exception\PDOException + */ + public function resume() + { + if (DataService::update($this->table)) { + $this->success("快递公司启用成功！", ''); + } + $this->error("快递公司启用失败，请稍候再试！"); + } + +} diff --git a/application/store/controller/Order.php b/application/store/controller/Order.php new file mode 100644 index 000000000..11f9afd5e --- /dev/null +++ b/application/store/controller/Order.php @@ -0,0 +1,157 @@ + + * @date 2017/03/27 14:43 + */ +class Order extends BasicAdmin +{ + + /** + * 定义当前操作表名 + * @var string + */ + public $table = 'StoreOrder'; + + /** + * 订单列表 + * @return array|string + * @throws \think\Exception + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + */ + public function index() + { + $this->title = '订单管理'; + $db = Db::name($this->table); + $get = $this->request->get(); + // 会员信息查询过滤 + $memberWhere = []; + foreach (['phone', 'nickname'] as $field) { + if (isset($get[$field]) && $get[$field] !== '') { + $memberWhere[] = [$field, 'like', "%{$get[$field]}%"]; + } + } + if (!empty($memberWhere)) { + $memberWhere['status'] = '1'; + $sql = Db::name('Member')->field('id')->where($memberWhere)->buildSql(true); + $db->where("mid in {$sql}"); + } + // =============== 商品信息查询过滤 =============== + $goodsWhere = []; + foreach (['goods_title'] as $field) { + if (isset($get[$field]) && $get[$field] !== '') { + $goodsWhere[] = [$field, 'like', "%{$get[$field]}%"]; + } + } + if (!empty($goodsWhere)) { + $sql = Db::name('StoreOrderList')->field('order_no')->where($goodsWhere)->buildSql(true); + $db->where("order_no in {$sql}"); + } + // =============== 收货地址过滤 =============== + $expressWhere = []; + if (isset($get['express_title']) && $get['express_title'] !== '') { + $expressWhere[] = ['real_express_title|express_title', 'like', "%{$get['express_title']}%"]; + } + foreach (['real_express_no', 'express_province', 'express_city', 'express_area', 'express_username', 'express_phone'] as $field) { + if (isset($get[$field]) && $get[$field] !== '') { + $expressWhere[] = [$field, 'like', "%{$get[$field]}%"]; + } + } + if (isset($get['send_status']) && $get['send_status'] !== '') { + $expressWhere[] = empty($get['send_status']) ? ['real_express_no', 'eq', ''] : ['real_express_no', 'neq', '']; + } + if (!empty($expressWhere)) { + $sql = Db::name('StoreOrderExpress')->field('order_no')->where($expressWhere)->buildSql(true); + $db->where("order_no in {$sql}"); + } + // =============== 主订单过滤 =============== + foreach (['order_no', 'desc'] as $field) { + (isset($get[$field]) && $get[$field] !== '') && $db->whereLike($field, "%{$get[$field]}%"); + } + (isset($get['status']) && $get['status'] !== '') && $db->where('status', $get['status']); + // 订单是否包邮状态检索 + if (isset($get['express_zero']) && $get['express_zero'] !== '') { + empty($get['express_zero']) ? $db->where('freight_price', '>', '0') : $db->where('freight_price', '0'); + } + // 订单时间过滤 + foreach (['create_at', 'pay_at'] as $field) { + if (isset($get[$field]) && $get[$field] !== '') { + list($start, $end) = explode(' - ', $get[$field]); + $db->whereBetween($field, ["{$start} 00:00:00", "{$end} 23:59:59"]); + } + } + return parent::_list($db); + } + + /** + * 订单列表数据处理 + * @param array $data + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + */ + protected function _data_filter(&$data) + { + OrderService::buildOrderList($data); + } + + /** + * 订单地址修改 + * @return string + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + * @throws \think\Exception + */ + public function address() + { + $order_no = $this->request->get('order_no'); + if ($this->request->isGet()) { + $order = Db::name('StoreOrder')->where(['order_no' => $order_no])->find(); + empty($order) && $this->error('该订单无法进行地址修改，订单数据不存在！'); + $orderExpress = Db::name('StoreOrderExpress')->where(['order_no' => $order_no])->find(); + empty($orderExpress) && $this->error('该订单无法进行地址修改！'); + return $this->fetch('', $orderExpress); + } + $data = [ + 'order_no' => $order_no, + 'express_username' => $this->request->post('express_username'), + 'express_phone' => $this->request->post('express_phone'), + 'express_province' => $this->request->post('form_express_province'), + 'express_city' => $this->request->post('form_express_city'), + 'express_area' => $this->request->post('form_express_area'), + 'express_address' => $this->request->post('express_address'), + 'express_desc' => $this->request->post('express_desc'), + ]; + if (DataService::save('StoreOrderExpress', $data, 'order_no')) { + $this->success('收货地址修改成功！', ''); + } + $this->error('收货地址修改失败，请稍候再试！'); + } + + +} diff --git a/application/store/service/OrderService.php b/application/store/service/OrderService.php new file mode 100644 index 000000000..84dca73de --- /dev/null +++ b/application/store/service/OrderService.php @@ -0,0 +1,185 @@ +where(['id' => $mid])->find())) { + return ['code' => 0, 'msg' => '会员数据处理异常，请刷新重试！']; + } + // 订单数据生成 + list($order_no, $orderList) = [[], DataService::createSequence(10, 'ORDER'), []]; + $order = ['mid' => $mid, 'order_no' => $order_no, 'real_price' => 0, 'total_price' => 0, 'desc' => $orderDesc, 'type' => $orderType, 'from' => $from,]; + foreach (explode(';', trim($params, ',;@')) as $param) { + list($goods_id, $goods_spec, $number) = explode('@', "{$param}@@"); + $item = ['mid' => $mid, 'type' => $orderType, 'order_no' => $order_no, 'goods_id' => $goods_id, 'goods_spec' => $goods_spec, 'goods_number' => $number,]; + $goodsResult = self::buildOrderData($item, $order, $orderList, 'selling_price'); + if (empty($goodsResult['code'])) { + return $goodsResult; + } + } + // 生成快递信息 + $expressResult = self::buildExpressData($order, $addressId, $expressId); + if (empty($expressResult['code'])) { + return $expressResult; + } + try { + // 写入订单信息 + Db::transaction(function () use ($order, $orderList, $expressResult) { + Db::name('StoreOrder')->insert($order); // 主订单信息 + Db::name('StoreOrderGoods')->insertAll($orderList); // 订单关联的商品信息 + Db::name('storeOrderExpress')->insert($expressResult['data']); // 快递信息 + }); + // @todo 同步相关商品库存 + } catch (\Exception $e) { + return ['code' => 0, 'msg' => '商城订单创建失败，请稍候再试！' . $e->getLine() . $e->getFile() . $e->getMessage()]; + } + return ['code' => 1, 'msg' => '商城订单创建成功！', 'order_no' => $order_no]; + } + + /** + * 生成订单快递数据 + * @param array $order 订单主表记录 + * @param int $address_id 会员地址ID + * @param int $express_id 快递信息ID + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + */ + public static function buildExpressData(&$order, $address_id, $express_id) + { + // 收货地址处理 + $addressWhere = ['mid' => $order['mid'], 'id' => $address_id, 'status' => '1', 'is_deleted' => '0']; + $addressField = 'username express_username,phone express_phone,province express_province,city express_city,area express_area,address express_address'; + if (!($address = Db::name('StoreMemberAddress')->field($addressField)->where($addressWhere)->find())) { + return ['code' => 0, 'msg' => '收货地址数据异常！']; + } + // 物流信息查询 + $expressField = 'express_title,express_code'; + $expressWhere = ['id' => $express_id, 'status' => '1', 'is_deleted' => '0']; + if (!($express = Db::name('StoreExpress')->field($expressField)->where($expressWhere)->find())) { + return ['code' => 0, 'msg' => '快递公司数据异常！']; + } + // @todo 运费计算处理 + // $order['freight_price'] = '0.00'; + // $order['real_price'] += floatval($order['freight_price']); + $extend = ['mid' => $order['mid'], 'order_no' => $order['order_no'], 'type' => $order['type']]; + return ['code' => 1, 'data' => array_merge($address, $express, $extend), 'msg' => '生成快递信息成功！']; + } + + /** + * 订单数据生成 + * @param array $item 订单单项参数 + * (mid,type,order_no,goods_id,goods_spec,goods_number) + * @param array $order 订单主表 + * @param array $orderList 订单详细表 + * @param string $price_field 实际计算单价字段 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + */ + private static function buildOrderData($item, &$order, &$orderList, $price_field = 'selling_price') + { + list($mid, $type, $order_no, $goods_id, $goods_spec, $number) = [ + $item['mid'], $item['type'], $item['order_no'], $item['goods_id'], $item['goods_spec'], $item['goods_number'], + ]; + // 商品主体信息 + $goodsField = 'goods_title,goods_logo,goods_image'; + $goodsWhere = ['id' => $goods_id, 'status' => '1', 'is_deleted' => '0']; + if (!($goods = Db::name('StoreGoods')->field($goodsField)->where($goodsWhere)->find())) { + return ['code' => 0, 'msg' => "无效的商品信息！", 'data' => "{$goods_id}, {$goods_spec}, {$number}"]; + } + // 商品规格信息 + $specField = 'goods_id,goods_spec,market_price,selling_price,goods_stock,goods_sale'; + $specWhere = ['status' => '1', 'is_deleted' => '0', 'package_id' => '0', 'goods_id' => $goods_id, 'goods_spec' => $goods_spec]; + if (!($goodsSpec = Db::name('StoreGoodsList')->field($specField)->where($specWhere)->find())) { + return ['code' => 0, 'msg' => '无效的商品规格信息！', 'data' => "{$goods_id}, {$goods_spec}, {$number}"]; + } + if ($goodsSpec['goods_stock'] - $goodsSpec['goods_sale'] < $number) { + return ['code' => 0, 'msg' => '商品库存不足，请更换其它商品！', 'data' => "{$goods_id}, {$goods_spec}, {$number}"]; + } + $goodsSpec['price_field'] = $price_field; + $orderList[] = array_merge($goods, $goodsSpec, ['mid' => $mid, 'number' => $number, 'order_no' => $order_no, 'type' => $type]); + $order['goods_price'] += floatval($goodsSpec[$price_field]) * $number; + $order['real_price'] += floatval($goodsSpec[$price_field]) * $number; + return ['code' => 1, 'msg' => '商品添加到订单成功！']; + } + + /** + * 订单主表数据处理 + * @param array $list + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + */ + public static function buildOrderList(&$list) + { + $mids = array_unique(array_column($list, 'mid')); + $orderNos = array_unique(array_column($list, 'order_no')); + $memberList = Db::name("StoreMember")->whereIn('id', $mids)->select(); + $goodsList = Db::name('StoreOrderGoods')->whereIn('order_no', $orderNos)->select(); + $expressList = Db::name('StoreOrderExpress')->whereIn('order_no', $orderNos)->select(); + foreach ($list as $key => $vo) { + list($list[$key]['member'], $list[$key]['goods'], $list[$key]['express']) = [[], [], []]; + foreach ($memberList as $member) { + $member['nickname'] = ToolsService::emojiDecode($member['nickname']); + ($vo['mid'] === $member['id']) && $list[$key]['member'] = $member; + } + foreach ($expressList as $express) { + ($vo['order_no'] === $express['order_no']) && $list[$key]['express'] = $express; + } + foreach ($goodsList as $goods) { + if ($goods['goods_spec'] === 'default:default') { + $goods['goods_spec_alias'] = '默认规格'; + } else { + $goods['goods_spec_alias'] = str_replace([':', ','], ['：', '，'], $goods['goods_spec']); + } + ($vo['order_no'] === $goods['order_no']) && $list[$key]['goods'][] = $goods; + } + } + return $list; + } + +} \ No newline at end of file diff --git a/application/store/view/express/form.html b/application/store/view/express/form.html new file mode 100644 index 000000000..9a96c102e --- /dev/null +++ b/application/store/view/express/form.html @@ -0,0 +1,36 @@ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ {if isset($vo['id'])}{/if} + + +
+ + +
diff --git a/application/store/view/express/index.html b/application/store/view/express/index.html new file mode 100644 index 000000000..f87a5567c --- /dev/null +++ b/application/store/view/express/index.html @@ -0,0 +1,117 @@ +{extend name='admin@public/content'} + +{block name="button"} + + + + + + + + + +{/block} + +{block name="content"} + + +
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+ + + + +
+ + {if empty($list)} +

没 有 记 录 哦！

+ {else} + + + + + + + + + + + + + + {foreach $list as $key=>$vo} + + + + + + + + + + {/foreach} + +
+ + + + 快递公司快递代码添加时间快递状态操作
+ + + + {$vo.express_title}{$vo.express_code}{$vo.create_at|format_datetime} + {if $vo.status eq 0}已禁用{elseif $vo.status eq 1}使用中{/if} + + + + | + 编辑 + + + + | + 禁用 + + | + 启用 + + + {if auth("$classuri/del")} + | + 删除 + {/if} + +
+ {if isset($page)}

{$page|raw}

{/if} + {/if} +
+{/block} \ No newline at end of file diff --git a/application/store/view/order/address.html b/application/store/view/order/address.html new file mode 100644 index 000000000..1260c3f40 --- /dev/null +++ b/application/store/view/order/address.html @@ -0,0 +1,60 @@ +
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ {if isset($order_no)}{/if} + + +
+ + +
diff --git a/application/store/view/order/index.html b/application/store/view/order/index.html new file mode 100644 index 000000000..802fec81f --- /dev/null +++ b/application/store/view/order/index.html @@ -0,0 +1,280 @@ +{extend name='admin@public/content'} + +{block name="content"} + +
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ + +
+ +
+ +
+ + + +
+ {if empty($list)} +

没 有 记 录 哦！

+ {else} + + + + + + + + + + + + {foreach $list as $key=>$vo} + + + + + + + + {/foreach} + +
+ + 会员信息订单信息 + + + + + + + + +
商品信息 + 价格 ဆ 数量 +
+ 		发货信息
+ + + 会员昵称：{$vo.member.nickname|default='未设置会员昵称'}
+ 会员手机：{$vo.member.phone|default='未设置会员手机'} + 		+ 订单单号：{$vo.order_no} {if $vo.type eq 3}套餐 {/if} + {switch name='vo.status'} + {case value='0'}已取消{/case} + {case value='1'}待付款{/case} + {case value='2'}待发货{/case} + {case value='3'}已发货{/case} + {case value='4'}已完成{/case} + {case value='5'}已退单{/case} + {case value='6'}退款审核中（{if($vo.refund_type == 1)}退款申请{/if}{if($vo.refund_type == 2)}退货申请{/if}） + 审核{/case} + {case value='7'}退款处理中{/case} + {/switch} +
+ 		+ + + + + {foreach $vo.goods as $goods} + + + + + {/foreach} +
[{$goods.goods_id}] {$goods.goods_title}（{$goods.goods_spec_alias}） + + {if in_array($vo.type,['1','3'])} + ￥ {$goods[$goods['price_field']]} + {else} + {$goods.selling_integral} 积分 + {/if} + ဆ + {$goods.number} + +
+ 		+ {if empty($vo.express)} + 无发货信息 + {else} + 快递公司：{$vo.express.real_express_title|default=$vo.express.express_title} + {if !empty($vo.express.real_express_title)} + + {if $vo.express.real_express_title neq $vo.express.express_title} + {$vo.express.express_title} + {/if} + {/if} +
+ 快递单号：{$vo.express.real_express_no|default='未发货'|raw} + + 查看 + + 快速发货 + +
+ 收货信息：{$vo.express.express_username} {$vo.express.express_phone}
+ 收货地址：{$vo.express.express_province}{$vo.express.express_city}{$vo.express.express_area}{$vo.express.express_address} + {if auth('store/order/address')}修改{/if} + {/if} + {if !empty($vo.express.real_express_at)}
发货时间：{$vo.express.real_express_at|format_datetime}{/if} +
+ {if isset($page)}

{$page|raw}

{/if} + {/if} +
+ +{/block} \ No newline at end of file diff --git a/extend/controller/BasicAdmin.php b/extend/controller/BasicAdmin.php index 99ae2835d..46f02a672 100644 --- a/extend/controller/BasicAdmin.php +++ b/extend/controller/BasicAdmin.php @@ -115,7 +115,7 @@ class BasicAdmin extends Controller $rows = intval($this->request->get('rows', cookie('page-rows'))); cookie('page-rows', $rows = $rows >= 10 ? $rows : 20); // 分页数据处理 - $query = $this->request->get('', '', 'urlencode'); + $query = $this->request->get(); $page = $db->paginate($rows, $total, ['query' => $query]); if (($totalNum = $page->total()) > 0) { list($rowsHTML, $pageHTML, $maxNum) = [[], [], $page->lastPage()];