diff --git a/app/admin/controller/CouponReceive.php b/app/admin/controller/CouponReceive.php index f6f8fea..a671dd4 100755 --- a/app/admin/controller/CouponReceive.php +++ b/app/admin/controller/CouponReceive.php @@ -22,11 +22,15 @@ class CouponReceive extends Base { $keyword = trim(input('get.keyword')); $status = trim(input('get.status')); + $user_id = trim(input('get.user_id')); $whe = []; if (!empty($keyword)) { $whe[] = ['title', 'like', '%' . $keyword . '%']; } - + if ($user_id) { + $user_id = $user_id - 1260; + $whe[] = ['user_id', '=', $user_id]; + } if (!empty($status)) { $whe[] = ['status', '=', $status - 1]; } @@ -34,6 +38,7 @@ class CouponReceive extends Base $order = "addtime desc"; $data = CouponReceiveModel::getList($whe, $field, $order, $this->page); foreach ($data['list'] as $key => $val) { + $user_info = User::getInfo(['id' => $val['user_id']]); if (empty($user_info)) { $user_info['nickname'] = ''; @@ -41,6 +46,7 @@ class CouponReceive extends Base $user_info['mobile'] = ''; } $data['list'][$key]['nickname'] = $user_info['nickname']; + // $val['user_id']= } View::assign('list', $data['list']); View::assign('count', $data['count']); diff --git a/app/admin/controller/Profit.php b/app/admin/controller/Profit.php new file mode 100644 index 0000000..b106964 --- /dev/null +++ b/app/admin/controller/Profit.php @@ -0,0 +1,127 @@ +page); + View::assign('list', $data['list']); + View::assign('count', $data['count']); + View::assign('page', $data['page']); + return View::fetch("Profit/index"); + } + + /** + * 添加盒子 + */ + public function profit_add(Request $request) + { + if (!$request->isPost()) { + View::assign('profit_date', date('Y-m-d')); + return View::fetch("Profit/add"); + } else { + $data = input('post.'); + if (empty($data['profit_date'])) { + return $this->renderError("请选择时间"); + } + if (RegMoney($data['amount'])) { + return $this->renderError("支出金额输出不规范"); + } + $dd = ProfitExpenses::insert($data); + if ($dd) { + return $this->renderSuccess("添加成功"); + } else { + return $this->renderError("网络繁忙,请稍后"); + } + } + } + + /** + * 编辑盒子 + */ + public function profit_edit(Request $request) + { + if (!$request->isPost()) { + $id = $request->param('id/d', 0); + $info = ProfitExpenses::where(['id' => $id])->find(); + if (!$info) { + return $this->renderError("请求参数错误"); + } + View::assign('info', $info); + return View::fetch("Profit/edit"); + } else { + $data = input('post.'); + if (empty($data['profit_date'])) { + return $this->renderError("请选择时间"); + } + if (RegMoney($data['amount'])) { + return $this->renderError("支出金额输出不规范"); + } + ProfitExpenses::startTrans(); + $id = $data['id']; + unset($data['id']); + $dd = ProfitExpenses::where(['id' => $id])->update($data); + + if ($dd) { + ProfitExpenses::commit(); + return $this->renderSuccess("编辑成功"); + } else { + ProfitExpenses::rollback(); + return $this->renderError("网络繁忙,请稍后"); + } + + + } + } + + /** + * 上、下架,删除盒子 + */ + public function profit_del(Request $request) + { + $id = $request->post('id/d'); + + $data = ProfitExpenses::where(['id' => $id])->field('id')->find(); + if (!$data) { + return $this->renderError("数据不存在"); + } + $result = ProfitExpenses::where(['id' => $id])->delete(); + if ($result) { + return $this->renderSuccess("操作成功"); + } else { + return $this->renderError("网络繁忙,请稍后"); + } + } + +} diff --git a/app/admin/controller/Statistics.php b/app/admin/controller/Statistics.php index d3fe641..0d51df7 100644 --- a/app/admin/controller/Statistics.php +++ b/app/admin/controller/Statistics.php @@ -14,7 +14,7 @@ use app\common\model\Goods as GoodsModel; use app\common\model\GoodsList; use think\facade\Db; use app\common\model\Shang; - +use app\common\model\ProfitExpenses; class Statistics extends Base { @@ -169,7 +169,10 @@ class Statistics extends Base public function DataStand(Request $request) { $userCount = User::count("id"); - + $userList = User::where('istest', '=', 1)->field('id')->select(); + $userArray = $userList->toArray(); + // 本日充值金额 + // $order_today = OrderModel::whereNotIn('user_id', $userArray)->where('status', '=', 1)->whereBetweenTime('addtime', $ranges['today_start'], $ranges['today_end'])->sum('price'); // 今日时间 $ranges['today_start'] = strtotime('today'); $ranges['today_end'] = strtotime('tomorrow') - 1; @@ -213,73 +216,79 @@ class Statistics extends Base $user_last_month = User::whereBetweenTime('addtime', $ranges['last_month_start'], $ranges['last_month_end'])->count('id'); // 本日充值金额 - $order_today = OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['today_start'], $ranges['today_end'])->sum('price'); + $order_today = OrderModel::where('status', '=', 1)->whereNotIn('user_id', $userArray)->whereBetweenTime('addtime', $ranges['today_start'], $ranges['today_end'])->sum('price'); // 昨日充值金额 - $order_yesterday = OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['yesterday_start'], $ranges['yesterday_end'])->sum('price'); + $order_yesterday = OrderModel::where('status', '=', 1)->whereNotIn('user_id', $userArray)->whereBetweenTime('addtime', $ranges['yesterday_start'], $ranges['yesterday_end'])->sum('price'); // 本周充值金额 - $order_this_week = OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['this_week_start'], $ranges['this_week_end'])->sum('price'); + $order_this_week = OrderModel::where('status', '=', 1)->whereNotIn('user_id', $userArray)->whereBetweenTime('addtime', $ranges['this_week_start'], $ranges['this_week_end'])->sum('price'); // 上周充值金额 - $order_last_week = OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['last_week_start'], $ranges['last_week_end'])->sum('price'); + $order_last_week = OrderModel::where('status', '=', 1)->whereNotIn('user_id', $userArray)->whereBetweenTime('addtime', $ranges['last_week_start'], $ranges['last_week_end'])->sum('price'); // 本月充值金额 - $order_this_month = OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['this_month_start'], $ranges['this_month_end'])->sum('price'); + $order_this_month = OrderModel::where('status', '=', 1)->whereNotIn('user_id', $userArray)->whereBetweenTime('addtime', $ranges['this_month_start'], $ranges['this_month_end'])->sum('price'); // 上月充值金额 - $order_last_month = OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['last_month_start'], $ranges['last_month_end'])->sum('price'); + $order_last_month = OrderModel::where('status', '=', 1)->whereNotIn('user_id', $userArray)->whereBetweenTime('addtime', $ranges['last_month_start'], $ranges['last_month_end'])->sum('price'); // 消费人数统计 - $consume_today = OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['today_start'], $ranges['today_end'])->field('user_id')->group('user_id')->count('user_id'); - $consume_yesterday = OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['yesterday_start'], $ranges['yesterday_end'])->field('user_id')->group('user_id')->count('user_id'); - $consume_this_week = OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['this_week_start'], $ranges['this_week_end'])->field('user_id')->group('user_id')->count('user_id'); - $consume_last_week = OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['last_week_start'], $ranges['last_week_end'])->field('user_id')->group('user_id')->count('user_id'); - $consume_this_month = OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['this_month_start'], $ranges['this_month_end'])->field('user_id')->group('user_id')->count('user_id'); - $consume_last_month = OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['last_month_start'], $ranges['last_month_end'])->field('user_id')->group('user_id')->count('user_id'); + $consume_today = OrderModel::where('status', '=', 1)->whereNotIn('user_id', $userArray)->whereBetweenTime('addtime', $ranges['today_start'], $ranges['today_end'])->field('user_id')->group('user_id')->count('user_id'); + $consume_yesterday = OrderModel::where('status', '=', 1)->whereNotIn('user_id', $userArray)->whereBetweenTime('addtime', $ranges['yesterday_start'], $ranges['yesterday_end'])->field('user_id')->group('user_id')->count('user_id'); + $consume_this_week = OrderModel::where('status', '=', 1)->whereNotIn('user_id', $userArray)->whereBetweenTime('addtime', $ranges['this_week_start'], $ranges['this_week_end'])->field('user_id')->group('user_id')->count('user_id'); + $consume_last_week = OrderModel::where('status', '=', 1)->whereNotIn('user_id', $userArray)->whereBetweenTime('addtime', $ranges['last_week_start'], $ranges['last_week_end'])->field('user_id')->group('user_id')->count('user_id'); + $consume_this_month = OrderModel::where('status', '=', 1)->whereNotIn('user_id', $userArray)->whereBetweenTime('addtime', $ranges['this_month_start'], $ranges['this_month_end'])->field('user_id')->group('user_id')->count('user_id'); + $consume_last_month = OrderModel::where('status', '=', 1)->whereNotIn('user_id', $userArray)->whereBetweenTime('addtime', $ranges['last_month_start'], $ranges['last_month_end'])->field('user_id')->group('user_id')->count('user_id'); // RMB消费人数统计 - $rmb_consume_today = OrderModel::where('status', '=', 1)->where('price', '>', 0)->whereBetweenTime('addtime', $ranges['today_start'], $ranges['today_end'])->field('user_id')->group('user_id')->count('user_id'); - $rmb_consume_yesterday = OrderModel::where('status', '=', 1)->where('price', '>', 0)->whereBetweenTime('addtime', $ranges['yesterday_start'], $ranges['yesterday_end'])->field('user_id')->group('user_id')->count('user_id'); - $rmb_consume_this_week = OrderModel::where('status', '=', 1)->where('price', '>', 0)->whereBetweenTime('addtime', $ranges['this_week_start'], $ranges['this_week_end'])->field('user_id')->group('user_id')->count('user_id'); - $rmb_consume_last_week = OrderModel::where('status', '=', 1)->where('price', '>', 0)->whereBetweenTime('addtime', $ranges['last_week_start'], $ranges['last_week_end'])->field('user_id')->group('user_id')->count('user_id'); - $rmb_consume_this_month = OrderModel::where('status', '=', 1)->where('price', '>', 0)->whereBetweenTime('addtime', $ranges['this_month_start'], $ranges['this_month_end'])->field('user_id')->group('user_id')->count('user_id'); - $rmb_consume_last_month = OrderModel::where('status', '=', 1)->where('price', '>', 0)->whereBetweenTime('addtime', $ranges['last_month_start'], $ranges['last_month_end'])->field('user_id')->group('user_id')->count('user_id'); + $rmb_consume_today = OrderModel::where('status', '=', 1)->whereNotIn('user_id', $userArray)->where('price', '>', 0)->whereBetweenTime('addtime', $ranges['today_start'], $ranges['today_end'])->field('user_id')->group('user_id')->count('user_id'); + $rmb_consume_yesterday = OrderModel::where('status', '=', 1)->whereNotIn('user_id', $userArray)->where('price', '>', 0)->whereBetweenTime('addtime', $ranges['yesterday_start'], $ranges['yesterday_end'])->field('user_id')->group('user_id')->count('user_id'); + $rmb_consume_this_week = OrderModel::where('status', '=', 1)->whereNotIn('user_id', $userArray)->where('price', '>', 0)->whereBetweenTime('addtime', $ranges['this_week_start'], $ranges['this_week_end'])->field('user_id')->group('user_id')->count('user_id'); + $rmb_consume_last_week = OrderModel::where('status', '=', 1)->whereNotIn('user_id', $userArray)->where('price', '>', 0)->whereBetweenTime('addtime', $ranges['last_week_start'], $ranges['last_week_end'])->field('user_id')->group('user_id')->count('user_id'); + $rmb_consume_this_month = OrderModel::where('status', '=', 1)->whereNotIn('user_id', $userArray)->where('price', '>', 0)->whereBetweenTime('addtime', $ranges['this_month_start'], $ranges['this_month_end'])->field('user_id')->group('user_id')->count('user_id'); + $rmb_consume_last_month = OrderModel::where('status', '=', 1)->whereNotIn('user_id', $userArray)->where('price', '>', 0)->whereBetweenTime('addtime', $ranges['last_month_start'], $ranges['last_month_end'])->field('user_id')->group('user_id')->count('user_id'); //今日余额消费 - $money_today = OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['today_start'], $ranges['today_end'])->sum('use_money'); - $money_yesterday = OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['yesterday_start'], $ranges['yesterday_end'])->sum('use_money'); + $money_today = OrderModel::where('status', '=', 1)->whereNotIn('user_id', $userArray)->whereBetweenTime('addtime', $ranges['today_start'], $ranges['today_end'])->sum('use_money'); + $money_yesterday = OrderModel::where('status', '=', 1)->whereNotIn('user_id', $userArray)->whereBetweenTime('addtime', $ranges['yesterday_start'], $ranges['yesterday_end'])->sum('use_money'); //今日积分抵扣 - $score_yesterday = OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['yesterday_start'], $ranges['yesterday_end'])->sum('use_score'); - $score_today = OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['today_start'], $ranges['today_end'])->sum('use_score'); + $score_yesterday = OrderModel::where('status', '=', 1)->whereNotIn('user_id', $userArray)->whereBetweenTime('addtime', $ranges['yesterday_start'], $ranges['yesterday_end'])->sum('use_score'); + $score_today = OrderModel::where('status', '=', 1)->whereNotIn('user_id', $userArray)->whereBetweenTime('addtime', $ranges['today_start'], $ranges['today_end'])->sum('use_score'); //今日余额发放 - $money_recovery_today = OrderListRecovery::whereBetweenTime('addtime', $ranges['today_start'], $ranges['today_end'])->sum('money'); - $money_recovery_yesterday = OrderListRecovery::whereBetweenTime('addtime', $ranges['yesterday_start'], $ranges['yesterday_end'])->sum('money'); + $money_recovery_today = OrderListRecovery::whereBetweenTime('addtime', $ranges['today_start'], $ranges['today_end'])->whereNotIn('user_id', $userArray)->sum('money'); + $money_recovery_yesterday = OrderListRecovery::whereBetweenTime('addtime', $ranges['yesterday_start'], $ranges['yesterday_end'])->whereNotIn('user_id', $userArray)->sum('money'); //今日优惠卷消费 - $coupon_today = OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['today_start'], $ranges['today_end'])->sum('use_coupon'); + $coupon_today = OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['today_start'], $ranges['today_end'])->whereNotIn('user_id', $userArray)->sum('use_coupon'); //今日收入 - $order_zhe_total = OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['today_start'], $ranges['today_end'])->sum('order_zhe_total'); - $order_goodslist_money = OrderList::whereBetweenTime('addtime', $ranges['today_start'], $ranges['today_end'])->sum('goodslist_money'); - $order_goodslist_count = OrderList::whereBetweenTime('addtime', $ranges['today_start'], $ranges['today_end'])->count(); - $order_count = OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['today_start'], $ranges['today_end'])->count(); + $order_zhe_total = OrderModel::where('status', '=', 1)->whereNotIn('user_id', $userArray)->whereBetweenTime('addtime', $ranges['today_start'], $ranges['today_end'])->sum('order_zhe_total'); + $order_goodslist_money = OrderList::whereBetweenTime('addtime', $ranges['today_start'], $ranges['today_end'])->whereNotIn('user_id', $userArray)->sum('goodslist_money'); + $order_goodslist_count = OrderList::whereBetweenTime('addtime', $ranges['today_start'], $ranges['today_end'])->whereNotIn('user_id', $userArray)->count(); + $order_count = OrderModel::where('status', '=', 1)->whereNotIn('user_id', $userArray)->whereBetweenTime('addtime', $ranges['today_start'], $ranges['today_end'])->count(); - $order_zhe_total_yester = round(OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['yesterday_start'], $ranges['yesterday_end'])->sum('order_zhe_total'), 2); - $order_goodslist_money_yester = round( OrderList::whereBetweenTime('addtime', $ranges['yesterday_start'], $ranges['yesterday_end'])->sum('goodslist_money'), 2); + $order_zhe_total_yester = round(OrderModel::where('status', '=', 1)->whereNotIn('user_id', $userArray)->whereBetweenTime('addtime', $ranges['yesterday_start'], $ranges['yesterday_end'])->sum('order_zhe_total'), 2); + $order_goodslist_money_yester = round(OrderList::whereBetweenTime('addtime', $ranges['yesterday_start'], $ranges['yesterday_end'])->whereNotIn('user_id', $userArray)->sum('goodslist_money'), 2); - $order_zhe_total_week = round(OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['this_week_start'], $ranges['this_week_end'])->sum('order_zhe_total'), 2); - $order_goodslist_money_week = round(OrderList::whereBetweenTime('addtime', $ranges['this_week_start'], $ranges['this_week_end'])->sum('goodslist_money'), 2); + $order_zhe_total_week = round(OrderModel::where('status', '=', 1)->whereNotIn('user_id', $userArray)->whereBetweenTime('addtime', $ranges['this_week_start'], $ranges['this_week_end'])->sum('order_zhe_total'), 2); + $order_goodslist_money_week = round(OrderList::whereBetweenTime('addtime', $ranges['this_week_start'], $ranges['this_week_end'])->whereNotIn('user_id', $userArray)->sum('goodslist_money'), 2); - $order_zhe_total_last_week = round(OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['last_week_start'], $ranges['last_week_end'])->sum('order_zhe_total'), 2); - $order_goodslist_money__last_week = round(OrderList::whereBetweenTime('addtime', $ranges['last_week_start'], $ranges['last_week_end'])->sum('goodslist_money'), 2); + $order_zhe_total_last_week = round(OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['last_week_start'], $ranges['last_week_end'])->whereNotIn('user_id', $userArray)->sum('order_zhe_total'), 2); + $order_goodslist_money__last_week = round(OrderList::whereBetweenTime('addtime', $ranges['last_week_start'], $ranges['last_week_end'])->whereNotIn('user_id', $userArray)->sum('goodslist_money'), 2); - $order_zhe_total_month = round(OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['this_month_start'], $ranges['this_month_end'])->sum('order_zhe_total'), 2); - $order_goodslist_money_month = round(OrderList::whereBetweenTime('addtime', $ranges['this_month_start'], $ranges['this_month_end'])->sum('goodslist_money'), 2); - - $order_zhe_total_last_month = round( OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['last_month_start'], $ranges['last_month_end'])->sum('order_zhe_total'), 2); - $order_goodslist_money__last_month = round(OrderList::whereBetweenTime('addtime', $ranges['last_month_start'], $ranges['last_month_end'])->sum('goodslist_money'), 2); + $order_zhe_total_month = round(OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['this_month_start'], $ranges['this_month_end'])->whereNotIn('user_id', $userArray)->sum('order_zhe_total'), 2); + $order_goodslist_money_month = round(OrderList::whereBetweenTime('addtime', $ranges['this_month_start'], $ranges['this_month_end'])->whereNotIn('user_id', $userArray)->sum('goodslist_money'), 2); + $order_zhe_total_last_month = round(OrderModel::where('status', '=', 1)->whereBetweenTime('addtime', $ranges['last_month_start'], $ranges['last_month_end'])->whereNotIn('user_id', $userArray)->sum('order_zhe_total'), 2); + $order_goodslist_money__last_month = round(OrderList::whereBetweenTime('addtime', $ranges['last_month_start'], $ranges['last_month_end'])->whereNotIn('user_id', $userArray)->sum('goodslist_money'), 2); + $profit_expenses = ProfitExpenses::getTotalAmountByDate(date('Y-m-d')); + $profit_expenses_yester = ProfitExpenses::getTotalAmountByDate(date('Y-m-d', strtotime('-1 day'))); + $profit_expenses_week = ProfitExpenses::getTotalAmountByDates(date('Y-m-d', $ranges['this_week_start']), date('Y-m-d', $ranges['this_week_end'])); + $profit_expenses_last_week = ProfitExpenses::getTotalAmountByDates(date('Y-m-d', $ranges['last_week_start']), date('Y-m-d', $ranges['last_week_end'])); + $profit_expenses_money = ProfitExpenses::getTotalAmountByDates(date('Y-m-d', $ranges['this_month_start']), date('Y-m-d', $ranges['this_month_end'])); + $profit_expenses_last_money = ProfitExpenses::getTotalAmountByDates(date('Y-m-d', $ranges['last_month_start']), date('Y-m-d', $ranges['last_month_end'])); + View::assign('profit_expenses', $profit_expenses); View::assign('money_today', $money_today); View::assign('money_yesterday', $money_yesterday); View::assign('coupon_today', $coupon_today); @@ -292,12 +301,12 @@ class Statistics extends Base View::assign('order_goodslist_money', $order_goodslist_money); View::assign('order_goodslist_count', $order_goodslist_count); View::assign('order_count', $order_count); - View::assign('order_lirun', round($order_zhe_total - $order_goodslist_money, 2)); - View::assign('order_lirun_yester', round($order_zhe_total_yester - $order_goodslist_money_yester, 2) . " ($order_zhe_total_yester - $order_goodslist_money_yester)"); - View::assign('order_lirun_week', round($order_zhe_total_week - $order_goodslist_money_week, 2) . " ({$order_zhe_total_week} - $order_goodslist_money_week)"); - View::assign('order_lirun_last_week', round($order_zhe_total_last_week - $order_goodslist_money__last_week, 2) . " ($order_zhe_total_last_week - $order_goodslist_money__last_week)"); - View::assign('order_zhe_total_month', round($order_zhe_total_month - $order_goodslist_money_month, 2). " ($order_zhe_total_month - $order_goodslist_money_month)"); - View::assign('order_lirun_last_month', round($order_zhe_total_last_month - $order_goodslist_money__last_month, 2). " ($order_zhe_total_last_month - $order_goodslist_money__last_month)"); + View::assign('order_lirun', round($order_zhe_total - $order_goodslist_money - $profit_expenses, 2)); + View::assign('order_lirun_yester', round($order_zhe_total_yester - $order_goodslist_money_yester - $profit_expenses_yester, 2) . " ($order_zhe_total_yester - $order_goodslist_money_yester - $profit_expenses_yester)"); + View::assign('order_lirun_week', round($order_zhe_total_week - $order_goodslist_money_week - $profit_expenses_week, 2) . " ({$order_zhe_total_week} - $order_goodslist_money_week - $profit_expenses_week)"); + View::assign('order_lirun_last_week', round($order_zhe_total_last_week - $order_goodslist_money__last_week - $profit_expenses_last_week, 2) . " ($order_zhe_total_last_week - $order_goodslist_money__last_week - $profit_expenses_last_week)"); + View::assign('order_zhe_total_month', round($order_zhe_total_month - $order_goodslist_money_month - $profit_expenses_money, 2) . " ($order_zhe_total_month - $order_goodslist_money_month - $profit_expenses_money)"); + View::assign('order_lirun_last_month', round($order_zhe_total_last_month - $order_goodslist_money__last_month -$profit_expenses_last_money, 2) . " ($order_zhe_total_last_month - $order_goodslist_money__last_month- $profit_expenses_last_money)"); // 赋值给模板 View::assign('userCount', $userCount); diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php index edff308..898d1e7 100755 --- a/app/admin/controller/User.php +++ b/app/admin/controller/User.php @@ -199,6 +199,28 @@ class User extends Base } } + /** + * 封号、解封处理 + */ + public function usertest(Request $request) + { + $id = request()->post('id/d', 0); + $type = request()->post('type/d', 0); + if ($type != 1 && $type != 0) { + return $this->renderError('请求参数错误'); + } + $user = UserModel::getInfo(['id' => $id]); + if (!$user) { + return $this->err('数据不存在'); + } + $result = $user->save(["istest" => $type]); + if ($result) { + return $this->renderSuccess('操作成功'); + } else { + return $this->renderError('操作失败'); + } + } + /* ip转换 */ diff --git a/app/admin/route/app.php b/app/admin/route/app.php index 9a7c130..88a2b73 100755 --- a/app/admin/route/app.php +++ b/app/admin/route/app.php @@ -34,6 +34,8 @@ Route::post('picture', 'Upload/picture'); Route::rule('user', 'User/index', 'GET|POST'); Route::rule('chongzhi', 'User/chongzhi', 'GET|POST'); Route::rule('userdel', 'User/userdel', 'GET|POST'); +Route::rule('usertest', 'User/usertest', 'GET|POST'); + Route::rule('user_profit_loss', 'User/user_profit_loss', 'GET|POST'); Route::rule('user_shangdai', 'User/user_shangdai', 'GET|POST'); Route::rule('vip', 'User/vip', 'GET|POST'); @@ -265,6 +267,11 @@ Route::rule('productcate_del', 'ProductCate/del', 'GET|POST'); //利润统计 Route::rule('statistics_profit', 'Statistics/profit', 'GET'); - //数据看台 -Route::rule('statistics_dataStand', 'Statistics/DataStand', 'GET'); \ No newline at end of file +Route::rule('statistics_dataStand', 'Statistics/DataStand', 'GET'); + +//利润支出 +Route::rule('ProfitExpenses', 'Profit/index', 'GET'); +Route::rule('profit_add', 'Profit/profit_add', 'GET|POST'); +Route::rule('profit_edit', 'Profit/profit_edit', 'GET|POST'); +Route::rule('profit_del', 'Profit/profit_del', 'POST'); \ No newline at end of file diff --git a/app/admin/view/CouponReceive/index.html b/app/admin/view/CouponReceive/index.html index 66502de..ca18287 100755 --- a/app/admin/view/CouponReceive/index.html +++ b/app/admin/view/CouponReceive/index.html @@ -1,148 +1,158 @@ {include file="Public:header2"/} +
-