From 9050f2c7451769b46434d5c18d74854fb6a70083 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Wed, 19 Jun 2024 19:02:14 +0800 Subject: [PATCH 01/31] =?UTF-8?q?feat(trade):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BA=86=E4=BA=A4=E6=98=93=E6=A8=A1=E5=9D=97=E7=9A=84API?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/WorkbenchController.php | 535 +-------- .../logic/statistic/TradeStatisticLogic.php | 1004 +++++++++++++++++ app/functions.php | 48 +- 3 files changed, 1055 insertions(+), 532 deletions(-) create mode 100644 app/admin/logic/statistic/TradeStatisticLogic.php diff --git a/app/admin/controller/WorkbenchController.php b/app/admin/controller/WorkbenchController.php index 20335665..6611e853 100644 --- a/app/admin/controller/WorkbenchController.php +++ b/app/admin/controller/WorkbenchController.php @@ -14,6 +14,7 @@ namespace app\admin\controller; +use app\admin\logic\statistic\TradeStatisticLogic; use app\admin\logic\WorkbenchLogic; use DateInterval; use DateTime; @@ -617,530 +618,30 @@ class WorkbenchController extends BaseAdminController //当日订单金额 public function top_trade() { - $dates = []; - $today = new DateTime(); - - $thirtyDaysAgo = new DateTime($today->format('Y-m-d')); - $thirtyDaysAgo->modify('-30 days'); - - for ($i = 0; $i < 31; $i++) { - $date = new DateTime($thirtyDaysAgo->format('Y-m-d')); - $date->modify('+' . $i . ' days'); - $dates[] = $date->format('Y-m-d'); + $logic=(new TradeStatisticLogic()); + $leftToday = $logic->getTopLeftTrade(['create_time' => 'today']); + $leftyestoday = $logic->getTopLeftTrade(['create_time' => 'yestoday']); + $rightOne = $logic->getTopRightOneTrade(); + $rightTwo = $logic->getTopRightTwoTrade(); + $right = ['today' => $rightOne, 'month' => $rightTwo]; + $totalleft = [$leftToday, $leftyestoday]; + $left = []; + foreach ($totalleft as $k => $v) { + $left['name'] = "当日订单金额"; + $left['x'] = $v['curve']['x']; + $left['series'][$k]['money'] = round($v['total_money'], 2); + $left['series'][$k]['value'] = array_values($v['curve']['y']); } - $times = date('Y-m-d'); - $yesterday= date('Y-m-d', strtotime('-1 day')); - $dates_two=[]; - for ($i = 0; $i < 24; $i++) { - $dates_two[]=[$times." ".$i.":00:00",$times." ".$i.":59:59"]; - } - $data = [ - "left" => [ - "name" => "当日订单金额", - "x" => [ - "00", - "01", - "02", - "03", - "04", - "05", - "06", - "07", - "08", - "09", - "10", - "11", - "12", - "13", - "14", - "15", - "16", - "17", - "18", - "19", - "20", - "21", - "22", - "23", - "24" - ], - "series" => [ - WorkbenchLogic::day_order_pay_price($dates_two,$times), - WorkbenchLogic::day_order_pay_price($dates_two,$yesterday), - ] - ], - "right" => [ - "today" => [ - "x" => [ - "00", - "01", - "02", - "03", - "04", - "05", - "06", - "07", - "08", - "09", - "10", - "11", - "12", - "13", - "14", - "15", - "16", - "17", - "18", - "19", - "20", - "21", - "22", - "23", - "24" - ], - "series" => [ - WorkbenchLogic::day_order_count($dates_two,'今日订单数'), - WorkbenchLogic::day_order_user($dates_two,'今日支付人数'), - ] - ], - "month" => [ - WorkbenchLogic::month_order_count('本月订单数'), - WorkbenchLogic::month_order_count('本月支付人数') - ] - ] - ]; + + $data['left'] = $left; + $data['right'] = $right; return $this->data($data); } //交易趋势 public function bottom_trade() { - $data = [ - "x" => [ - "2024-05-06", - "2024-05-07", - "2024-05-08", - "2024-05-09", - "2024-05-10", - "2024-05-11", - "2024-05-12", - "2024-05-13", - "2024-05-14", - "2024-05-15", - "2024-05-16", - "2024-05-17", - "2024-05-18", - "2024-05-19", - "2024-05-20", - "2024-05-21", - "2024-05-22", - "2024-05-23", - "2024-05-24", - "2024-05-25", - "2024-05-26", - "2024-05-27", - "2024-05-28", - "2024-05-29", - "2024-05-30", - "2024-05-31", - "2024-06-01", - "2024-06-02", - "2024-06-03", - "2024-06-04" - ], - "series" => [ - [ - "name" => "营业额", - "desc" => "商品支付金额、充值金额、购买付费会员金额、线下收银金额", - "money" => "3538021.24", - "type" => 1, - "rate" => 353802124, - "value" => [ - "85.61", - "161.06", - "1215.65", - "38.96", - "324.79", - "214.88", - "228.82", - "34.24", - "8249.85", - "573.35", - "8586.24", - "10.19", - "90.19", - "105.40", - "62.59", - "1051.34", - "160.66", - "241651.20", - "111325.41", - "2085393.05", - "267.40", - "1063972.04", - "1217.31", - "582.40", - "757.02", - "597.00", - "0.08", - "609.40", - "10175.64", - "279.47" - ] - ], - [ - "name" => "交易毛利金额", - "desc" => "交易毛利金额 = 营业额 - 支出金额", - "money" => "3408415.79", - "type" => 1, - "rate" => 340841579, - "value" => [ - "32.01", - "79.21", - "194.81", - "38.16", - "324.79", - "204.88", - "228.82", - "31.88", - "330.64", - "553.64", - "545.58", - "1.28", - "90.19", - "105.40", - "44.00", - "1043.16", - "45.94", - "240254.48", - "10346.41", - "2080946.30", - "189.00", - "1060654.82", - "629.30", - "398.10", - "91.70", - "597.00", - "0.08", - "0.10", - "10151.63", - "262.48" - ] - ], - [ - "name" => "商品支付金额", - "desc" => "选定条件下，用户购买商品的实际支付金额，包括微信支付、余额支付、支付宝支付、线下支付金额（拼团商品在成团之后计入，线下支付订单在后台确认支付后计入）", - "money" => 157433.34, - "type" => 1, - "rate" => 15743334, - "value" => [ - "85.61", - "161.06", - "1215.65", - "38.96", - "324.69", - "214.88", - "228.82", - "34.24", - "8249.85", - "573.35", - "8586.24", - "10.19", - "90.19", - "105.40", - "62.59", - "1051.34", - "160.66", - "1693.20", - "111325.41", - "5365.05", - "189.00", - "3448.64", - "1217.31", - "582.40", - "757.02", - "597.00", - "0.08", - "609.40", - "10175.64", - "279.47" - ] - ], - [ - "name" => "购买会员金额", - "desc" => "选定条件下，用户成功购买付费会员的金额", - "money" => 0, - "type" => 1, - "rate" => 0, - "value" => [ - 0, - "0.00", - "0.00", - 0, - 0, - 0, - 0, - 0, - "0.00", - "0.00", - 0, - "0.00", - 0, - 0, - 0, - 0, - 0, - "0.00", - "0.00", - "0.00", - 0, - "0.00", - "0.00", - 0, - 0, - "0.00", - 0, - "0.00", - "0.00", - 0 - ] - ], - [ - "name" => "充值金额", - "desc" => "选定条件下，用户成功充值的金额", - "money" => "3380587.90", - "type" => 1, - "rate" => 338058790, - "value" => [ - "0.00", - "0.00", - "0.00", - "0.00", - "0.10", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "239958.00", - "0.00", - "2080028.00", - "78.40", - "1060523.40", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00" - ] - ], - [ - "name" => "线下收银金额", - "desc" => "选定条件下，用户在线下扫码支付的金额", - "money" => 0, - "type" => 0, - "rate" => 0, - "value" => [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ] - ], - [ - "name" => "支出金额", - "desc" => "余额支付金额、支付佣金金额", - "money" => "129605.45", - "type" => 1, - "rate" => 12960545, - "value" => [ - "53.60", - "81.85", - "1020.84", - "0.80", - "0.00", - "10.00", - "0.00", - "2.36", - "7919.21", - "19.71", - "8040.66", - "8.91", - "0.00", - "0.00", - "18.59", - "8.18", - "114.72", - "1396.72", - "100979.00", - "4446.75", - "78.40", - "3317.22", - "588.01", - "184.30", - "665.32", - "0.00", - "0.00", - "609.30", - "24.01", - "16.99" - ] - ], - [ - "name" => "余额支付金额", - "desc" => "用户下单时使用余额实际支付的金额", - "money" => "128943.25", - "type" => 0, - "rate" => 1289432500, - "value" => [ - "53.60", - "81.85", - "1020.84", - "0.80", - "0.00", - "10.00", - "0.00", - "2.36", - "7919.21", - "19.71", - "8040.66", - "8.91", - "0.00", - "0.00", - "18.59", - "8.18", - "114.72", - "1396.72", - "100979.00", - "4416.75", - "0.00", - "2763.42", - "588.01", - "184.30", - "665.32", - "0.00", - "0.00", - "609.30", - "24.01", - "16.99" - ] - ], - [ - "name" => "支付佣金金额", - "desc" => "后台给推广员支付的推广佣金，以实际支付为准", - "money" => 662.2, - "type" => 0, - "rate" => 66220, - "value" => [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - "30.00", - "78.40", - "553.80", - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ] - ], - [ - "name" => "商品退款金额", - "desc" => "用户成功退款的商品金额", - "money" => 2321.81, - "type" => 0, - "rate" => 232181, - "value" => [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - "0.00", - 0, - 0, - 0, - 0, - 0, - "0.00", - "730.80", - "49.00", - "219.00", - 0, - "1323.01", - "0.00", - 0, - "0.00", - 0, - 0, - 0, - 0, - "0.00" - ] - ] - ], - ]; + $data=(new TradeStatisticLogic())->getBottomTrade(['data'=>'2024/05/21-2024/06/19']); return $this->data($data); } } diff --git a/app/admin/logic/statistic/TradeStatisticLogic.php b/app/admin/logic/statistic/TradeStatisticLogic.php new file mode 100644 index 00000000..d326871f --- /dev/null +++ b/app/admin/logic/statistic/TradeStatisticLogic.php @@ -0,0 +1,1004 @@ +tradeTotalMoney($where, $selectType); + + //交易曲线 + $selectType = "group"; + $hourTotalMoney = $this->tradeGroupMoney($where, $selectType); + return ['total_money' => $tradeTotalMoney, 'curve' => $hourTotalMoney]; + } + + public function getTopRightOneTrade() + { + $storeOrder = new StoreOrder(); + /** day订单数 */ + //今日订单数 + $orderCountWhere['paid'] = 1; + $timeKey = $this->TimeConvert("today"); + $todayOrderCount = $storeOrder->where($orderCountWhere)->whereDay('create_time')->count(); + $where['timeKey'] = [ + "start_time" => strtotime($timeKey['start_time']), + "end_time" => strtotime($timeKey['end_time']), + "days" => $timeKey['days'] + ]; + + //今日订单数曲线 + $todayHourOrderCount = $storeOrder->where($orderCountWhere) + ->when(isset($where['timeKey']), function ($query) use ($where) { + $query->whereBetweenTime('create_time', $where['timeKey']['start_time'], $where['timeKey']['end_time']); + if ($where['timeKey']['days'] == 1) { + $timeUinx = "%H"; + } elseif ($where['timeKey']['days'] == 30) { + $timeUinx = "%Y-%m-%d"; + } elseif ($where['timeKey']['days'] == 365) { + $timeUinx = "%Y-%m"; + } elseif ($where['timeKey']['days'] > 1 && $where['timeKey']['days'] < 30) { + $timeUinx = "%Y-%m-%d"; + } elseif ($where['timeKey']['days'] > 30 && $where['timeKey']['days'] < 365) { + $timeUinx = "%Y-%m"; + } else { + $timeUinx = "%Y-%m"; + } + $query->field("count(*) as number,FROM_UNIXTIME(create_time, '$timeUinx') as time"); + $query->group("FROM_UNIXTIME(create_time, '$timeUinx')"); + }) + ->order('create_time ASC')->select()->toArray(); + $todayHourOrderCount = $this->trendYdata((array)$todayHourOrderCount, $timeKey); + + //昨日订单数 + $yesTodayOrderCount = $storeOrder->where($orderCountWhere)->whereDay('create_time', 'yesterday')->count(); + + //昨日订单曲线 + // $yestodayHourOrderCount = $orderService->getOrderGroupCountByWhere($yestodayWhere); + // $yestodayHourOrderCount = $this->trendYdata((array)$yestodayHourOrderCount, 'day'); + //订单数环比增长率 + + $orderCountDayChain = countRate($todayOrderCount, $yesTodayOrderCount); + $data[] = [ + 'name' => "今日订单数", + 'now_value' => $todayOrderCount, + 'last_value' => $yesTodayOrderCount, + 'rate' => $orderCountDayChain, + 'curve' => $todayHourOrderCount + ]; + /** day支付人数 */ + //今日支付人数 + $todayPayOrderPeople = $storeOrder->where($orderCountWhere)->whereDay('create_time')->group('uid')->count(); + + //今日支付人数曲线 + $todayHourOrderPeople = $storeOrder->where($orderCountWhere) + ->when(isset($where['timeKey']), function ($query) use ($where) { + $query->whereBetweenTime('create_time', $where['timeKey']['start_time'], $where['timeKey']['end_time']); + if ($where['timeKey']['days'] == 1) { + $timeUinx = "%H"; + } elseif ($where['timeKey']['days'] == 30) { + $timeUinx = "%Y-%m-%d"; + } elseif ($where['timeKey']['days'] == 365) { + $timeUinx = "%Y-%m"; + } elseif ($where['timeKey']['days'] > 1 && $where['timeKey']['days'] < 30) { + $timeUinx = "%Y-%m-%d"; + } elseif ($where['timeKey']['days'] > 30 && $where['timeKey']['days'] < 365) { + $timeUinx = "%Y-%m"; + } else { + $timeUinx = "%Y-%m"; + } + $query->field("count(distinct uid) as number,FROM_UNIXTIME(create_time, '$timeUinx') as time"); + $query->group("FROM_UNIXTIME(create_time, '$timeUinx')"); + }) + ->order('create_time ASC')->select()->toArray(); + + $todayHourOrderPeople = $this->trendYdata((array)$todayHourOrderPeople, $where['timeKey']); + //昨日支付人数 + $yestodayPayOrderPeople = $storeOrder->where($orderCountWhere)->whereDay('create_time', 'yesterday')->group('uid')->count(); + //昨日支付曲线 + // $yestodayHourOrderPeople = $orderService->getPayOrderGroupPeopleByWhere($yestodayOrderPeopleWhere); + // $yestodayHourOrderPeople = $this->trendYdata((array)$yestodayHourOrderPeople, 'day'); + //订单支付人数环比 + $orderPeopleDayChain = countRate($todayPayOrderPeople, $yestodayPayOrderPeople); + $data[] = [ + 'name' => "今日支付人数", + 'now_value' => $todayPayOrderPeople, + 'last_value' => $yestodayPayOrderPeople, + 'rate' => $orderPeopleDayChain, + 'curve' => $todayHourOrderPeople + ]; + $new_data = []; + foreach ($data as $k => $v) { + $new_data['x'] = $v['curve']['x']; + $new_data['series'][$k]['name'] = $v['name']; + $new_data['series'][$k]['now_money'] = $v['now_value']; + $new_data['series'][$k]['last_money'] = $v['last_value']; + $new_data['series'][$k]['rate'] = $v['rate']; + $new_data['series'][$k]['value'] = array_values($v['curve']['y']); + } + + return $new_data; + } + + public function getTopRightTwoTrade() + { + $storeOrder = new StoreOrder(); + /** month订单数 */ + $monthOrderCountWhere['paid'] = 1; + $timeKey = $this->TimeConvert("month"); + $where['timeKey'] = [ + "start_time" => strtotime($timeKey['start_time']), + "end_time" => strtotime($timeKey['end_time']), + "days" => $timeKey['days'] + ]; + $monthOrderCount = $storeOrder->where($monthOrderCountWhere)->whereBetweenTime('create_time', $where['timeKey']['start_time'], $where['timeKey']['end_time'])->count(); + //本月订单数曲线 + $monthCurveOrderCount = $storeOrder->where($monthOrderCountWhere) + ->when(isset($where['timeKey']), function ($query) use ($where) { + $query->whereBetweenTime('create_time', $where['timeKey']['start_time'], $where['timeKey']['end_time']); + if ($where['timeKey']['days'] == 1) { + $timeUinx = "%H"; + } elseif ($where['timeKey']['days'] == 30) { + $timeUinx = "%Y-%m-%d"; + } elseif ($where['timeKey']['days'] == 365) { + $timeUinx = "%Y-%m"; + } elseif ($where['timeKey']['days'] > 1 && $where['timeKey']['days'] < 30) { + $timeUinx = "%Y-%m-%d"; + } elseif ($where['timeKey']['days'] > 30 && $where['timeKey']['days'] < 365) { + $timeUinx = "%Y-%m"; + } else { + $timeUinx = "%Y-%m"; + } + $query->field("count(*) as number,FROM_UNIXTIME(create_time, '$timeUinx') as time"); + $query->group("FROM_UNIXTIME(create_time, '$timeUinx')"); + }) + ->order('create_time ASC')->select()->toArray(); + $monthCurveOrderCount = $this->trendYdata((array)$monthCurveOrderCount, $where['timeKey']); + //上月订单数 + $lastOrderCountWhere['timeKey'] = $this->TimeConvert("last_month"); + $where['timeKey'] = [ + "start_time" => strtotime($timeKey['start_time']), + "end_time" => strtotime($timeKey['end_time']), + "days" => $timeKey['days'] + ]; + $lastOrderCount = $storeOrder->where($monthOrderCountWhere)->whereBetweenTime('create_time', $where['timeKey']['start_time'], $where['timeKey']['end_time'])->count(); + + //上月订单曲线 + // $lastCurveOrderCount = $orderService->getOrderGroupCountByWhere($lastOrderCountWhere); + // $lastCurveOrderCount = $this->trendYdata((array)$lastCurveOrderCount, 'month'); + //订单数环比增长率 + // $orderCountMonthChain = (($monthOrderCount - $lastOrderCount) / $lastOrderCount) * 100; + $orderCountMonthChain = countRate($monthOrderCount, $lastOrderCount); + $data[] = [ + 'name' => "本月订单数", + 'now_value' => $monthOrderCount, + 'last_value' => $lastOrderCount, + 'rate' => $orderCountMonthChain, + 'curve' => $monthCurveOrderCount + ]; + /** month下单人数 */ + //本月支付人数 + $timeKey = $this->TimeConvert("month"); + $monthOrderPeopleWhere['paid'] = 1; + $where['timeKey'] = [ + "start_time" => strtotime($timeKey['start_time']), + "end_time" => strtotime($timeKey['end_time']), + "days" => $timeKey['days'] + ]; + $monthPayOrderPeople = $storeOrder->where($monthOrderPeopleWhere)->whereMonth('create_time')->group('uid')->count(); + + //本月支付人数曲线 + $monthCurveOrderPeople = $storeOrder->where($monthOrderPeopleWhere) + ->when(isset($where['timeKey']), function ($query) use ($where) { + $query->whereBetweenTime('create_time', $where['timeKey']['start_time'], $where['timeKey']['end_time']); + if ($where['timeKey']['days'] == 1) { + $timeUinx = "%H"; + } elseif ($where['timeKey']['days'] == 30) { + $timeUinx = "%Y-%m-%d"; + } elseif ($where['timeKey']['days'] == 365) { + $timeUinx = "%Y-%m"; + } elseif ($where['timeKey']['days'] > 1 && $where['timeKey']['days'] < 30) { + $timeUinx = "%Y-%m-%d"; + } elseif ($where['timeKey']['days'] > 30 && $where['timeKey']['days'] < 365) { + $timeUinx = "%Y-%m"; + } else { + $timeUinx = "%Y-%m"; + } + $query->field("count(distinct uid) as number,FROM_UNIXTIME(create_time, '$timeUinx') as time"); + $query->group("FROM_UNIXTIME(create_time, '$timeUinx')"); + }) + ->order('create_time ASC')->select()->toArray(); + + $monthCurveOrderPeople = $this->trendYdata((array)$monthCurveOrderPeople, $where['timeKey']); + //上月支付人数 + $timeKey = $this->TimeConvert("last_month"); + $where['timeKey'] = [ + "start_time" => strtotime($timeKey['start_time']), + "end_time" => strtotime($timeKey['end_time']), + "days" => $timeKey['days'] + ]; + $lastPayOrderPeople = $storeOrder->where($monthOrderPeopleWhere)->whereMonth('create_time')->group('uid')->count(); + + //上月支付曲线 + // $lastCurveOrderPeople = $orderService->getPayOrderGroupPeopleByWhere($lastOrderPeopleWhere); + // $lastCurveOrderPeople = $this->trendYdata((array)$lastCurveOrderPeople, 'month'); + //订单支付人数环比 + $orderPeopleDayChain = countRate($monthPayOrderPeople, $lastPayOrderPeople); + $data[] = [ + 'name' => "本月支付人数", + 'now_value' => $monthPayOrderPeople, + 'last_value' => $lastPayOrderPeople, + 'rate' => $orderPeopleDayChain, + 'curve' => $monthCurveOrderPeople + ]; + $new_data = []; + foreach ($data as $k => $v) { + $new_data[$k]['name'] = $v['name']; + $new_data[$k]['now_money'] = $v['now_value']; + $new_data[$k]['last_money'] = $v['last_value']; + $new_data[$k]['rate'] = $v['rate']; + $new_data[$k]['value'] = $v['curve']['y']; + } + + return $new_data; + } + /** + * 底部数据 + * @param $where + * @return array + * @throws \Exception + */ + public function getBottomTrade($where) + { + + if (!$where['data']) { + $where['create_time'] = ['start_time' => date('Y-m-d 00:00:00', time()), "end_time" => date('Y-m-d 23:59:59', time())]; + } else { + $time = explode("-", $where['data']); + $where['create_time'] = ['start_time' => date('Y-m-d 00:00:00', strtotime($time[0])), "end_time" => date('Y-m-d 23:59:59', strtotime($time[1]))]; + } + unset($where['data']); + // /** @var ExportServices $exportService */ + // $exportService = app()->make(ExportServices::class); + $chainTime = $this->chainTime($where['create_time']); + $isNum = false; + if ($chainTime == "other") $isNum = true; + $dateWhere['create_time'] = $isNum ? $where['create_time'] : $chainTime; + $topData = array(); + $Chain = array(); + + /** 商品支付金额 */ + $OrderMoney = $this->getOrderTotalMoney($where, "sum"); + $lastOrderMoney = $this->getOrderTotalMoney($dateWhere, "sum", "", $isNum); + $OrderCurve = $this->getOrderTotalMoney($where, "group", "create_time"); + $OrderChain = countRate($OrderMoney, $lastOrderMoney); + $topData[2] = [ + 'title' => '商品支付金额', + 'desc' => '选定条件下，用户购买商品的实际支付金额，包括微信支付、余额支付、支付宝支付、线下支付金额（拼团商品在成团之后计入，线下支付订单在后台确认支付后计入）', + 'total_money' => $OrderMoney, + 'rate' => $OrderChain, + 'value' => $OrderCurve['y'], + 'type' => 1, + 'sign' => 'goods', + ]; + + $Chain['goods'] = $OrderCurve; + + /** 购买会员金额 */ + // $memberMoney = $this->getMemberTotalMoney($where, 'sum'); + // $lastMemberMoney = $this->getMemberTotalMoney($dateWhere, 'sum', "", $isNum); + // $memberCurve = $this->getMemberTotalMoney($where, 'group', "create_time"); + // $MemberChain = countRate($memberMoney, $lastMemberMoney); + // $topData[3] = [ + // 'title' => '购买会员金额', + // 'desc' => '选定条件下，用户成功购买付费会员的金额', + // 'total_money' => $memberMoney, + // 'rate' => $MemberChain, + // 'value' => $memberCurve['y'], + // 'type' => 1, + // 'sign' => 'member', + // ]; + // $Chain['member'] = $memberCurve; + + /** 充值金额 */ + $rechgeMoneyHome = $this->getRechargeTotalMoney($where, 'sum'); + $rechgeMoneyAdmin = $this->getBillYeTotalMoney($where, 'sum'); + $rechgeMoneyTotal = bcadd($rechgeMoneyHome, $rechgeMoneyAdmin, 2); + $lastRechgeMoneyHome = $this->getRechargeTotalMoney($dateWhere, 'sum', "", $isNum); + $lastRechgeMoneyAdmin = $this->getBillYeTotalMoney($dateWhere, 'sum', "", $isNum); + $lastRechgeMoneyTotal = bcadd($lastRechgeMoneyHome, $lastRechgeMoneyAdmin, 2); + $RechgeHomeCurve = $this->getRechargeTotalMoney($where, 'group', "create_time"); + $RechgeAdminCurve = $this->getBillYeTotalMoney($where, 'group', "create_time"); + $RechgeTotalCurve = $this->totalArrData([$RechgeHomeCurve, $RechgeAdminCurve]); + $RechgeChain = countRate($rechgeMoneyTotal, $lastRechgeMoneyTotal); + $topData[4] = [ + 'title' => '充值金额', + 'desc' => '选定条件下，用户成功充值的金额', + 'total_money' => $rechgeMoneyTotal, + 'rate' => $RechgeChain, + 'value' => $RechgeTotalCurve['y'], + 'type' => 1, + 'sign' => 'rechge', + ]; + $Chain['rechage'] = $RechgeTotalCurve; + + /** 线下收银 */ + $offlineMoney = $this->getOfflineTotalMoney($where, 'sum'); + $lastOfflineMoney = $this->getOfflineTotalMoney($dateWhere, 'sum', "", $isNum); + $offlineCurve = $this->getOfflineTotalMoney($where, 'group', "create_time"); + $offlineChain = countRate($offlineMoney, $lastOfflineMoney); + $topData[5] = [ + 'title' => '线下收银金额', + 'desc' => '选定条件下，用户在线下扫码支付的金额', + 'total_money' => $offlineMoney, + 'rate' => $offlineChain, + 'value' => $offlineCurve['y'], + 'type' => 0, + 'sign' => 'offline', + ]; + $Chain['offline'] = $offlineCurve; + + /** 支出*/ + //余额支付商品 + $outYeOrderMoney = $this->getOrderTotalMoney(['pay_type' => 3, 'create_time' => $where['create_time']], 'sum'); + $lastOutYeOrderMoney = $this->getOrderTotalMoney(['pay_type' => 3, 'create_time' => $dateWhere['create_time']], 'sum', "", $isNum); + $outYeOrderCurve = $this->getOrderTotalMoney(['pay_type' => 3, 'create_time' => $where['create_time']], 'group', 'create_time'); + $outYeOrderChain = countRate($outYeOrderMoney, $lastOutYeOrderMoney); + //余额购买会员 + // $outYeMemberMoney = $this->getMemberTotalMoney(['pay_type' => "yue", 'time' => $where['time']], 'sum'); + // $lastOutYeMemberMoney = $this->getMemberTotalMoney(['pay_type' => "yue", 'time' => $dateWhere['time']], 'sum', "", $isNum); + // $outYeMemberCurve = $this->getMemberTotalMoney(['pay_type' => "yue", 'time' => $where['time']], 'group', "pay_time"); + // $outYeMemberChain = countRate($outYeMemberMoney, $lastOutYeMemberMoney); + //余额支付 + // $outYeMoney = bcadd($outYeOrderMoney, $outYeMemberMoney, 2); + // $lastOutYeMoney = bcadd($lastOutYeOrderMoney, $lastOutYeMemberMoney, 2); + // $outYeCurve = $this->totalArrData([$outYeOrderCurve, $outYeMemberCurve]); + // $outYeChain = countRate($outYeOrderChain, $outYeMemberChain); + $outYeMoney = $outYeOrderMoney; + $lastOutYeMoney = $lastOutYeOrderMoney; + $outYeCurve = $this->totalArrData([$outYeOrderCurve, 0]); + $outYeChain = countRate($outYeOrderChain, 0); + $topData[7] = [ + 'title' => '余额支付金额', + 'desc' => '用户下单时使用余额实际支付的金额', + 'total_money' => $outYeMoney, + 'rate' => $outYeChain, + 'value' => $outYeCurve['y'], + 'type' => 0, + 'sign' => 'yue', + ]; + $Chain['out_ye'] = $outYeCurve; + + + //支付佣金金额 + // $outExtractMoney = $this->getExtractTotalMoney($where, 'sum'); + // $lastOutExtractMoney = $this->getExtractTotalMoney($dateWhere, 'sum', "", $isNum); + // $OutExtractCurve = $this->getExtractTotalMoney($where, 'group', "add_time"); + // $OutExtractChain = countRate($outExtractMoney, $lastOutExtractMoney); + // $topData[8] = [ + // 'title' => '支付佣金金额', + // 'desc' => '后台给推广员支付的推广佣金，以实际支付为准', + // 'total_money' => $outExtractMoney, + // 'rate' => $OutExtractChain, + // 'value' => $OutExtractCurve['y'], + // 'type' => 0, + // 'sign' => 'yong', + // ]; + // $Chain['extract'] = $OutExtractCurve; + + //商品退款金额 + $outOrderRefund = $this->getOrderRefundTotalMoney(['refund_type' => 6, 'create_time' => $where['create_time']], 'sum'); + $lastOutOrderRefund = $this->getOrderRefundTotalMoney(['refund_type' => 6, 'create_time' => $dateWhere['create_time']], 'sum', "", $isNum); + $outOrderRefundCurve = $this->getOrderRefundTotalMoney(['refund_type' => 6, 'create_time' => $where['create_time']], 'group', 'create_time'); + $orderRefundChain = countRate($outOrderRefund, $lastOutOrderRefund); + $topData[9] = [ + 'title' => '商品退款金额', + 'desc' => '用户成功退款的商品金额', + 'total_money' => $outOrderRefund, + 'rate' => $orderRefundChain, + 'value' => $outOrderRefundCurve['y'], + 'type' => 0, + 'sign' => 'refund', + ]; + $Chain['refund'] = $outOrderRefundCurve; + + //支出金额 + // $outTotalMoney = bcadd($outYeMoney, $outExtractMoney, 2); + // $lastOutTotalMoney = bcadd($lastOutYeMoney, $lastOutExtractMoney, 2); + // $outTotalCurve = $this->totalArrData([$outYeCurve, $OutExtractCurve]); + $outTotalMoney = bcadd($outYeMoney, 0, 2); + $lastOutTotalMoney = bcadd($lastOutYeMoney, 0, 2); + $outTotalCurve = $this->totalArrData([$outYeCurve, 0]); + $outTotalChain = countRate($outTotalMoney, $lastOutTotalMoney); + $topData[6] = [ + 'title' => '支出金额', + 'desc' => '余额支付金额、支付佣金金额', + 'total_money' => $outTotalMoney, + 'rate' => $outTotalChain, + 'value' => $outTotalCurve['y'], + 'type' => 1, + 'sign' => 'out', + ]; + $Chain['out'] = $outTotalCurve; + + /** 交易毛利金额*/ + // $jiaoyiMoney = $this->tradeTotalMoney($where, "sum"); + + // $jiaoyiMoney = bcsub($jiaoyiMoney, $outTotalMoney, 2); + // $lastJiaoyiMoney = $this->tradeTotalMoney($dateWhere, "sum", $isNum); + // $lastJiaoyiMoney = bcsub($lastJiaoyiMoney, $lastOutTotalMoney, 2); + // $jiaoyiCurve = $this->tradeGroupMoney($where, "group"); + // $jiaoyiCurve = $this->subdutionArrData($jiaoyiCurve, $outTotalCurve); + // $jiaoyiChain = countRate($jiaoyiMoney, $lastJiaoyiMoney); + // $topData[1] = [ + // 'title' => '交易毛利金额', + // 'desc' => '交易毛利金额 = 营业额 - 支出金额', + // 'total_money' => $jiaoyiMoney, + // 'rate' => $jiaoyiChain, + // 'value' => $jiaoyiCurve['y'], + // 'type' => 1, + // 'sign' => 'jiaoyi', + // ]; + // $Chain['jiaoyi'] = $jiaoyiCurve; + + /** @var 营业额 $inTotalMoney */ + $inTotalMoney = $this->tradeTotalMoney($where, "sum"); + $lastInTotalMoney = $this->tradeTotalMoney($dateWhere, "sum", $isNum); + $inTotalCurve = $this->tradeGroupMoney($where, "group"); + $inTotalChain = countRate($inTotalMoney, $lastInTotalMoney); + $topData[0] = [ + 'title' => '营业额', + 'desc' => '商品支付金额、充值金额、购买付费会员金额、线下收银金额', + 'total_money' => $inTotalMoney, + 'rate' => $inTotalChain, + 'value' => $inTotalCurve['y'], + 'type' => 1, + 'sign' => 'in', + ]; + ksort($topData); + $data = []; + foreach ($topData as $k => $v) { + $data['x'] = $Chain['out']['x']; + $data['series'][$k]['name'] = $v['title']; + $data['series'][$k]['desc'] = $v['desc']; + $data['series'][$k]['money'] = $v['total_money']; + $data['series'][$k]['type'] = $v['type']; + $data['series'][$k]['rate'] = $v['rate']; + $data['series'][$k]['value'] = array_values($v['value']); + } + // $export = $exportService->tradeData($data, '交易统计', 2); + // $data['export'] = $export[0]; + return $data; + } + + /** + * 交易总额 + * @param $where + * @param $selectType + * @return array|float|int|mixed + */ + public function tradeTotalMoney($where, $selectType, $isNum = false) + { + /** 收入营业额 */ + //商品订单收入 + $inOrderMoney = $this->getOrderTotalMoney($where, $selectType, "", $isNum); + + //用户充值收入 + $inRechargeMoneyHome = $this->getRechargeTotalMoney($where, $selectType, "", $isNum); + + $inrechgeMoneyAdmin = $this->getBillYeTotalMoney($where, $selectType, '', $isNum); + $inRechargeMoney = bcadd($inRechargeMoneyHome, $inrechgeMoneyAdmin, 2); + + //购买会员收入 + $inMemberMoney = $this->getMemberTotalMoney($where, $selectType, "", $isNum); + //线下收款收入 + $inOfflineMoney = $this->getOfflineTotalMoney($where, $selectType, "", $isNum); + //总交易额 + $inTotalMoney = bcadd(bcadd($inOrderMoney, $inRechargeMoney, 2), bcadd($inMemberMoney, $inOfflineMoney, 2), 2);/* - $outExtractUserMoney*/ + return $inTotalMoney; + } + + /** + * 交易额曲线图 + * @param $where + * @param $selectType + * @return array + */ + public function tradeGroupMoney($where, $selectType) + { + + //商品订单收入 + $orderGroup = "create_time"; + $OrderMoney = $this->getOrderTotalMoney($where, $selectType, $orderGroup); + //用户充值收入 + $rechargeGroup = "create_time"; + $RechargeMoneyHome = $this->getRechargeTotalMoney($where, $selectType, $rechargeGroup); + $RechargeMoneyAdmin = $this->getBillYeTotalMoney($where, $selectType, $rechargeGroup); + $RechargeMoney = $this->totalArrData([$RechargeMoneyHome, $RechargeMoneyAdmin]); + //购买会员收入 + $memberGroup = "create_time"; + $MemberMoney = $this->getMemberTotalMoney($where, $selectType, $memberGroup); + //线下收款收入 + $offlineGroup = "create_time"; + $OfflineMoney = $this->getOfflineTotalMoney($where, $selectType, $offlineGroup); + return $this->totalArrData([$OrderMoney, $RechargeMoney, $MemberMoney, $OfflineMoney]); + } + + + /** + * 获取订单退款 + * @param $where + * @param string $selectType + * @param string $group + * @param bool $isNum + * @return array|float|int + * @throws \Exception + */ + public function getOrderRefundTotalMoney($where, string $selectType, string $group = '', bool $isNum = false) + { + $storeOrder = new StoreOrder(); + $orderSumField = "pay_price"; + $where[] = ['refund_status', '>', 0]; + // $where['is_cancel'] = 0; + switch ($selectType) { + case "sum": + $totalMoney = $storeOrder->where($where)->when(isset($where['timeKey']), function ($query) use ($where) { + $query->whereBetweenTime('create_time', strtotime($where['timeKey']['start_time']), strtotime($where['timeKey']['end_time'])); + })->sum($orderSumField); + break; + case "group": + $totalMoney = $storeOrder->where($where)->when(isset($where['timeKey']), function ($query) use ($where) { + $query->whereBetweenTime('create_time', strtotime($where['timeKey']['start_time']), strtotime($where['timeKey']['end_time'])); + })->count($orderSumField); + break; + default: + throw new \Exception('getOrderTotalMoney:selectType参数错误'); + } + if ($group) { + $totalMoney = $this->trendYdata((array)$totalMoney, $this->TimeConvert($where['create_time'], $isNum)); + } + return $totalMoney; + } + + /** + * 获取商品营收 + * @param $where + * @param string $selectType + * @param string $group + * @param bool $isNum + * @return array|float|int + * @throws \Exception + */ + public function getOrderTotalMoney($where, string $selectType, string $group = "", bool $isNum = false) + { + /** 普通商品订单支付金额 */ + $storeOrder = new StoreOrder(); + $whereOrderMoner['refund_status'] = isset($where['refund_status']) ? $where['refund_status'] : [0, 3]; + $whereOrderMoner['paid'] = 1; + + $timeKey = $this->TimeConvert($where['create_time'], $isNum); + switch ($selectType) { + case "sum": + $totalMoney = $storeOrder->where($whereOrderMoner)->when(isset($whereOrderMoner['create_time']), function ($query) use ($whereOrderMoner) { + $query->whereBetweenTime('create_time', strtotime($whereOrderMoner['create_time']['start_time']), strtotime($whereOrderMoner['create_time']['end_time'])); + })->sum('pay_price'); + break; + case "group": + $where['timeKey'] = $timeKey; + $totalMoney = $storeOrder->where($whereOrderMoner)->when(isset($where['timeKey']), function ($query) use ($where, $group) { + $query->whereBetweenTime('create_time', $where['timeKey']['start_time'], $where['timeKey']['end_time']); + if ($where['timeKey']['days'] == 1) { + $timeUinx = "%H"; + } elseif ($where['timeKey']['days'] == 30) { + $timeUinx = "%Y-%m-%d"; + } elseif ($where['timeKey']['days'] == 365) { + $timeUinx = "%Y-%m"; + } elseif ($where['timeKey']['days'] > 1 && $where['timeKey']['days'] < 30) { + $timeUinx = "%Y-%m-%d"; + } elseif ($where['timeKey']['days'] > 30 && $where['timeKey']['days'] < 365) { + $timeUinx = "%Y-%m"; + } else { + $timeUinx = "%Y-%m"; + } + $query->field("sum(pay_price) as number,FROM_UNIXTIME($group, '$timeUinx') as time"); + $query->group("FROM_UNIXTIME($group, '$timeUinx')"); + }) + ->order('create_time ASC')->select()->toArray(); + break; + default: + throw new \Exception('getOrderTotalMoney:selectType参数错误'); + } + + if ($group) { + $totalMoney = $this->trendYdata((array)$totalMoney, $timeKey); + } + return $totalMoney; + } + + + /** + * 获取用户充值营收 + * @param array $where + * @param string $selectType + * @param string $group + * @param bool $isNum + * @return array|float|int + * @throws \Exception + */ + public function getRechargeTotalMoney(array $where, string $selectType, string $group = "", bool $isNum = false) + { + /** 用户充值金额 */ + $userRechage = new UserRecharge(); + $rechargeSumField = "price"; + $timeKey = $this->TimeConvert($where['create_time'], $isNum); + $where['timeKey'] = $timeKey; + + switch ($selectType) { + case "sum": + $totalMoney = $userRechage->where(['paid' => 1]) + ->when(isset($where['create_time']), function ($query) use ($where) { + $query->whereBetweenTime('create_time', strtotime($where['timeKey']['start_time']), strtotime($where['timeKey']['end_time'])); + }) + ->sum($rechargeSumField); + break; + case "group": + $totalMoney = $userRechage->where(['paid' => 1]) + ->when(isset($where['create_time']), function ($query) use ($where, $rechargeSumField, $group) { + $query->whereBetweenTime('create_time', strtotime($where['timeKey']['start_time']), strtotime($where['timeKey']['end_time'])); + if ($where['timeKey']['days'] == 1) { + $timeUinx = "%H"; + } elseif ($where['timeKey']['days'] == 30) { + $timeUinx = "%Y-%m-%d"; + } elseif ($where['timeKey']['days'] == 365) { + $timeUinx = "%Y-%m"; + } elseif ($where['timeKey']['days'] > 1 && $where['timeKey']['days'] < 30) { + $timeUinx = "%Y-%m-%d"; + } elseif ($where['timeKey']['days'] > 30 && $where['timeKey']['days'] < 365) { + $timeUinx = "%Y-%m"; + } else { + $timeUinx = "%Y-%m"; + } + $query->field("sum($rechargeSumField) as number,FROM_UNIXTIME($group, '$timeUinx') as time"); + $query->group("FROM_UNIXTIME($group, '$timeUinx')"); + }) + ->order('time ASC')->select()->toArray(); + break; + default: + $totalMoney = 0.00; + break; + } + if ($group) { + $totalMoney = $this->trendYdata((array)$totalMoney, $timeKey); + } + return $totalMoney; + } + + /** + * 购买会员总额 + * @param array $where + * @param string $selectType + * @param string $group + * @param bool $isNum + * @return array|mixed + * @throws \Exception + */ + public function getMemberTotalMoney(array $where, string $selectType, string $group = "", bool $isNum = false) + { + + /** 购买会员 */ + // /** @var OtherOrderServices $otherOrderService */ + // $otherOrderService = app()->make(OtherOrderServices::class); + // $memberSumField = "pay_price"; + // $whereInMember['type'] = 1; + // $whereInMember['paid'] = 1; + // $whereInMember['store_id'] = 0; + + // $whereInMember['timeKey'] = $this->TimeConvert($where['time'], $isNum); + // $totalMoney = $otherOrderService->getMemberMoneyByWhere($whereInMember, $memberSumField, $selectType, $group); + // if ($group) { + // $totalMoney = $this->trendYdata((array)$totalMoney, $whereInMember['timeKey']); + // } + return 0; + } + /** + * 后台手动充值 + * @param array $where + * @param string $selectType + * @param string $group + * @param bool $isNum + * @return array|float|int + * @throws \Exception + */ + public function getBillYeTotalMoney(array $where, string $selectType, string $group = "", bool $isNum = false) + { + /** 后台用户充值金额 */ + // $rechargeSumField = "number"; + // $whereInRecharge['pm'] = 1; + // $whereInRecharge['type'] = 'system_add'; + // $whereInRecharge['timeKey'] = $this->TimeConvert($where['time'], $isNum); + // $whereInRecharge['store_id'] = 0; + // /** @var UserMoneyServices $userMoneyServices */ + // $userMoneyServices = app()->make(UserMoneyServices::class); + // $totalMoney = $userMoneyServices->getRechargeMoneyByWhere($whereInRecharge, $rechargeSumField, $selectType, $group); + // if ($group) { + // $totalMoney = $this->trendYdata((array)$totalMoney, $whereInRecharge['timeKey']); + // } + return 0; + } + + /** + * 线下付款总额 + * @param array $where + * @param string $selectType + * @param string $group + * @param bool $isNum + * @return array|mixed + * @throws \Exception + */ + public function getOfflineTotalMoney(array $where, string $selectType, string $group = "", bool $isNum = false) + { + /** 线下付款总额 */ + $storeOrder = new StoreOrder(); + $offlineSumField = "pay_price"; + // $whereOffline['type'] = 3; + // $whereOffline['paid'] = 1; + // $whereOffline['store_id'] = 0; + // // $whereOffline['pay_type_no'] = 'yue'; + $where['timeKey'] = $this->TimeConvert($where['create_time'], $isNum); + // $totalMoney = $otherOrderService->getMemberMoneyByWhere($whereOffline, $offlineSumField, $selectType, $group); + // if ($group) { + // $totalMoney = $this->trendYdata((array)$totalMoney, $whereOffline['timeKey']); + // } + switch ($selectType) { + case "sum": + $totalMoney = $storeOrder->where('pay_type', 'in', [9, 13, 17])->when(isset($where['timeKey']), function ($query) use ($where) { + $query->whereBetweenTime('create_time', strtotime($where['timeKey']['start_time']), strtotime($where['timeKey']['end_time'])); + })->sum($offlineSumField); + break; + case "group": + $totalMoney = $storeOrder->where('pay_type', 'in', [9, 13, 17])->when(isset($where['timeKey']), function ($query) use ($where, $group) { + $query->whereBetweenTime('create_time', $where['timeKey']['start_time'], $where['timeKey']['end_time']); + if ($where['timeKey']['days'] == 1) { + $timeUinx = "%H"; + } elseif ($where['timeKey']['days'] == 30) { + $timeUinx = "%Y-%m-%d"; + } elseif ($where['timeKey']['days'] == 365) { + $timeUinx = "%Y-%m"; + } elseif ($where['timeKey']['days'] > 1 && $where['timeKey']['days'] < 30) { + $timeUinx = "%Y-%m-%d"; + } elseif ($where['timeKey']['days'] > 30 && $where['timeKey']['days'] < 365) { + $timeUinx = "%Y-%m"; + } else { + $timeUinx = "%Y-%m"; + } + $query->field("sum(pay_price) as number,FROM_UNIXTIME($group, '$timeUinx') as time"); + $query->group("FROM_UNIXTIME($group, '$timeUinx')"); + }) + ->order('time ASC')->select()->toArray(); + break; + default: + throw new \Exception('getOrderTotalMoney:selectType参数错误'); + } + if ($group) { + $totalMoney = $this->trendYdata((array)$totalMoney, $this->TimeConvert($where['create_time'], $isNum)); + } + return $totalMoney; + } + + /** + * 处理Y坐标数据 + * @param array $data + * @param array $timeKey + * @return array + * @throws \Exception + */ + public function trendYdata(array $data, array $timeKey) + { + $hourMoney = array(); + $timeData = array(); + //获取日期之间的天数 + $getDayRange = function ($date, $timeKey) { + $datearr = []; + $stime = strtotime($timeKey['start_time']); + $etime = strtotime($timeKey['end_time']); + while ($stime <= $etime) { + $datearr['x'][] = date($date, $stime); + $datearr['y'][] = date($date, $stime); + $stime = $stime + 86400; + } + return $datearr; + }; + //获取日期之间的月份 + $getMonthRange = function ($date, $timeKey) { + $datearr = []; + $stime = date('Y-m-d', strtotime($timeKey['start_time'])); + $etime = date('Y-m-d', strtotime($timeKey['end_time'])); + $start = new \DateTime($stime); + $end = new \DateTime($etime); + $interval = \DateInterval::createFromDateString('1 month'); + $period = new \DatePeriod($start, $interval, $end); + foreach ($period as $dt) { + $datearr['x'][] = $dt->format($date); + $datearr['y'][] = $dt->format($date); + } + return $datearr; + }; + if ($timeKey['days'] == 1) { + for ($i = 0; $i <= 24; $i++) { + $timeData['x'][] = (string)($i < 10 ? ('0' . $i) : $i); + $timeData['y'][] = $i < 10 ? ('0' . $i) : $i; + //$timeData['y'][] = $i < 10 ? ('0' . $i . ":00") : $i . ":00"; + //$timeData['x'][] = $i < 10 ? ('0' . $i . ":00") : $i . ":00"; + } + } elseif ($timeKey['days'] == 30) { + $timeData = $getDayRange('Y-m-d', $timeKey); + } elseif ($timeKey['days'] == 365) { + $timeData = $getMonthRange('Y-m', $timeKey); + } elseif ($timeKey['days'] > 1 && $timeKey['days'] < 30) { + $timeData = $getDayRange('Y-m-d', $timeKey); + } elseif ($timeKey['days'] > 30 && $timeKey['days'] < 365) { + $timeData = $getMonthRange('Y-m', $timeKey); + } + if ($data) { + $hourMoney = array_column($data, 'number', 'time'); + } + $y = array(); + foreach ($timeData['y'] as $k => $v) { + if (array_key_exists($v, $hourMoney)) { + $y[$v] = $hourMoney[$v]; + } else { + $y[$v] = 0; + } + } + return ['x' => $timeData['x'], 'y' => $y]; + } + + + /** + * 获取环比时间类型 + * @param $timeKey + * @return string + */ + public function chainTime($timeKey) + { + switch ($timeKey) { + case "today": + return "yestoday"; + case "month": + return "last_month"; + case "year": + return "last_year"; + default: + return "other"; + } + } + /** + * 多个数组相加 + * @param array $arr + * @return array|false + */ + public function totalArrData(array $arr) + { + if (!$arr || !is_array($arr)) return false; + $item = array(); + $y = array_column($arr, "y"); + $x = array_column($arr, "x")[0]; + foreach ($y as $key => $value) { + foreach ($value as $k => $v) { + if (isset($item[$k])) { + $item[$k] = bcadd($item[$k], $v, 2); + } else { + $item[$k] = $v; + } + } + } + return ['x' => $x, 'y' => $item]; + } + + /** + * 数组相减 + * @param array $arr1 + * @param array $arr2 + * @return array + */ + public function subdutionArrData(array $arr1, array $arr2) + { + $item = array(); + foreach ($arr1['y'] as $key => $value) { + $item['y'][$key] = bcsub($value, $arr2['y'][$key], 2); + } + $item['x'] = $arr1['x']; + return $item; + } + + /** + * 搜索时间转换 + * @param $timeKey + * @param false $isNum + * @return array + * @throws \Exception + */ + public function TimeConvert($timeKey, $isNum = false) + { + switch ($timeKey) { + case "today": + $data['start_time'] = date('Y-m-d 00:00:00', time()); + $data['end_time'] = date('Y-m-d 23:59:59', time()); + $data['days'] = 1; + break; + case "yestoday": + $data['start_time'] = date('Y-m-d 00:00:00', strtotime('-1 day')); + $data['end_time'] = date('Y-m-d 23:59:59', strtotime('-1 day')); + $data['days'] = 1; + break; + case "last_month": + $data['start_time'] = date('Y-m-01 00:00:00', strtotime('-1 month')); + $data['end_time'] = date('Y-m-t 23:59:59', strtotime('-1 month')); + $data['days'] = 30; + break; + case "month": + $data['start_time'] = $month_start_time = date('Y-m-01 00:00:00', strtotime(date("Y-m-d"))); + $data['end_time'] = date('Y-m-d 23:59:59', strtotime("$month_start_time +1 month -1 day")); + $data['days'] = 30; + break; + case "year": + $data['start_time'] = date('Y-01-01 00:00:00', time()); + $data['end_time'] = date('Y-12-t 23:59:59', time()); + $data['days'] = 365; + break; + case "last_year": + $data['start_time'] = date('Y-01-01 00:00:00', strtotime('-1 year')); + $data['end_time'] = date('Y-12-t 23:59:59', strtotime('-1 year')); + $data['days'] = 365; + break; + case 30: + case 15: + case 7: + if (!$isNum) { + $data['start_time'] = date("Y-m-d 00:00:00", strtotime("-$timeKey day")); + $data['end_time'] = date('Y-m-d 23:59:59', time()); + $data['days'] = $timeKey; + } else { + $day = $timeKey * 2; + $data['start_time'] = date("Y-m-d 00:00:00", strtotime("-$day day")); + $data['end_time'] = date("Y-m-d 23:59:59", strtotime("-$timeKey day")); + $data['days'] = $timeKey; + } + break; + default: + $datetime_start = new \DateTime($timeKey['start_time']); + $datetime_end = new \DateTime($timeKey['end_time']); + $days = $datetime_start->diff($datetime_end)->days; + $days = $days > 0 ? $days : 1; + if (!$isNum) { + $data['start_time'] = $timeKey['start_time']; + $data['end_time'] = $timeKey['end_time']; + $data['days'] = $days; + } else { + $data['start_time'] = date("Y-m-d 00:00:00", strtotime("-$days day")); + $data['end_time'] = $timeKey['start_time']; + $data['days'] = $days; + } + } + return $data; + } +} diff --git a/app/functions.php b/app/functions.php index 0aacbdc0..2eb20b6e 100644 --- a/app/functions.php +++ b/app/functions.php @@ -340,12 +340,12 @@ if (!function_exists('setUnique')) { { return substr(md5($sku . $id), 12, 11) . $type; } - } if (!function_exists('generateUniqueVerificationCode')) { - function generateUniqueVerificationCode() { + function generateUniqueVerificationCode() + { // 获取当前时间的毫秒部分 list($msec, $sec) = explode(' ', microtime()); $msectime = number_format((floatval($msec) + floatval($sec)) * 1000, 0, '', ''); @@ -355,20 +355,20 @@ if (!function_exists('generateUniqueVerificationCode')) { // 将前缀、毫秒时间戳和随机数连接起来 $type = rand(1, 10); // 生成一个1-10之间的随机数作为前缀 - return $type .'-'. $msectime . $randomNumber; + return $type . '-' . $msectime . $randomNumber; } - } if (!function_exists('verificationCode')) { - function verificationCode() { + function verificationCode() + { $sec = time(); // 将前缀、秒时间戳和随机数连接起来 $type = rand(1, 10); // 生成一个1-10之间的随机数作为前缀 - $code = $type .'-'. $sec; - $check = \app\common\model\store_order\StoreOrder::where('verify_code',$code)->count(); - if($check){ + $code = $type . '-' . $sec; + $check = \app\common\model\store_order\StoreOrder::where('verify_code', $code)->count(); + if ($check) { verificationCode(); } return $code; @@ -376,10 +376,11 @@ if (!function_exists('verificationCode')) { } if (!function_exists('createCode')) { - function createCode($code) { - $check = \app\common\model\store_order\StoreOrder::where('verify_code',$code)->count(); - if($check){ - $orderPickupCode = rand(1,10).'-'.str_pad(rand(0, 99999), 5, '0', STR_PAD_LEFT); + function createCode($code) + { + $check = \app\common\model\store_order\StoreOrder::where('verify_code', $code)->count(); + if ($check) { + $orderPickupCode = rand(1, 10) . '-' . str_pad(rand(0, 99999), 5, '0', STR_PAD_LEFT); return createCode($orderPickupCode); } return $code; @@ -387,7 +388,8 @@ if (!function_exists('createCode')) { } if (!function_exists('haversineDistance')) { - function haversineDistance($latitude1, $longitude1, $latitude2, $longitude2) { + function haversineDistance($latitude1, $longitude1, $latitude2, $longitude2) + { $earthRadius = 6371; // 地球平均半径，单位是千米 // 将角度转换为弧度 @@ -400,7 +402,7 @@ if (!function_exists('haversineDistance')) { $lonDelta = $lonTo - $lonFrom; $angle = 2 * asin(sqrt(pow(sin($latDelta / 2), 2) + - cos($latFrom) * cos($latTo) * pow(sin($lonDelta / 2), 2))); + cos($latFrom) * cos($latTo) * pow(sin($lonDelta / 2), 2))); return $angle * $earthRadius; } } @@ -409,7 +411,8 @@ if (!function_exists('haversineDistance')) { * 随机验证码 */ if (!function_exists('generateRandomCode')) { - function generateRandomCode($length = 4) { + function generateRandomCode($length = 4) + { $code = ''; for ($i = 0; $i < $length; $i++) { $code .= random_int(0, 9); @@ -458,3 +461,18 @@ if (!function_exists('append_to_array')) { } } +if (!function_exists('countRate')) { + /** + * 计算环比增长率 + * @param $nowValue + * @param $lastValue + * @return float|int|string + */ + function countRate($nowValue, $lastValue) + { + if ($lastValue == 0 && $nowValue == 0) return 0; + if ($lastValue == 0) return round(bcmul(bcdiv($nowValue, 1, 4), 100, 2), 2); + if ($nowValue == 0) return -round(bcmul(bcdiv($lastValue, 1, 4), 100, 2), 2); + return bcmul(bcdiv((bcsub($nowValue, $lastValue, 2)), $lastValue, 4), 100, 2); + } +} From 947b0a72fb737adff4f6eecb512c778023452f62 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Thu, 20 Jun 2024 10:09:15 +0800 Subject: [PATCH 02/31] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9B=B8=E5=85=B3=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/lists/user/UserLists.php | 20 +++++++++++++- app/api/lists/product/ProductLists.php | 38 ++++++-------------------- app/common/model/user/User.php | 11 ++++++-- app/common/model/vip_flow/VipFlow.php | 14 ++++++++++ 4 files changed, 50 insertions(+), 33 deletions(-) create mode 100644 app/common/model/vip_flow/VipFlow.php diff --git a/app/admin/lists/user/UserLists.php b/app/admin/lists/user/UserLists.php index e57ae5f0..2a55422a 100644 --- a/app/admin/lists/user/UserLists.php +++ b/app/admin/lists/user/UserLists.php @@ -6,8 +6,11 @@ namespace app\admin\lists\user; use app\admin\lists\BaseAdminDataLists; use app\common\enum\user\UserTerminalEnum; +use app\common\enum\YesNoEnum; use app\common\lists\ListsExcelInterface; use app\common\model\user\User; +use app\common\model\user\UserAddress; +use app\common\model\vip_flow\VipFlow; class UserLists extends BaseAdminDataLists implements ListsExcelInterface { @@ -49,8 +52,10 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface if(isset($params['is_disable']) && $params['is_disable'] != ''){ $where[] = ['is_disable','=', $params['is_disable']]; } - $field = "id,nickname,real_name,sex,avatar,account,mobile,channel,create_time"; + $field = "id,nickname,real_name,sex,avatar,account,mobile,channel,create_time,purchase_funds,user_ship, + label_id,integral"; $lists = User::withSearch($this->setSearch(), $this->params)->where($where) + ->with(['user_ship','user_label']) ->limit($this->limitOffset, $this->limitLength) ->field($field) ->order('id desc') @@ -58,7 +63,20 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface $data['sex_text'] = $data->sex_text; })->toArray(); foreach ($lists as &$item) { + //返还金，采购款明细、余额明细、礼品券明细、返还金明细 $item['channel'] = UserTerminalEnum::getTermInalDesc($item['channel']); + $item['user_address'] = UserAddress::where([ + 'uid'=>$item['id'],'is_default'=>YesNoEnum::YES + ])->value('detail'); + if($item['vip_name']== null){ + $item['vip_name'] = '普通会员'; + } + if($item['label_name']== null){ + $item['label_name'] = '无'; + } + $item['return_money'] = VipFlow:: + where(['user_id'=>$item['id'],'status'=>0]) + ->sum('number')??0; } return $lists; diff --git a/app/api/lists/product/ProductLists.php b/app/api/lists/product/ProductLists.php index ddd95cc0..b79c0608 100644 --- a/app/api/lists/product/ProductLists.php +++ b/app/api/lists/product/ProductLists.php @@ -105,25 +105,12 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface, L $this->searchWhere[] = ['status', '=', 1]; $this->searchWhere[] = ['stock', '>', 0]; - $data = StoreBranchProduct::where($this->searchWhere) + return StoreBranchProduct::where($this->searchWhere) ->field(['id', 'product_id', 'cate_id', 'store_name', 'cost', 'store_id', 'price', 'bar_code', 'image', 'sales', 'store_info', 'delete_time', 'unit', 'batch']) ->limit($this->limitOffset, $this->limitLength) ->with(['className', 'unitName']) ->order($this->sortOrder) ->select()?->toArray(); - // $check = DictType::where('type','activities')->find(); - // foreach ($data as &$value){ - // if(isset($check) && $check['status'] == 1){ - // // $value['price'] = StoreProduct::where('id',$value['product_id'])->value('ot_price'); - // $value['ot_price'] = $value['price']; - // $value['price'] = $value['cost']; - // } - // $value['is_default'] = 0; - // if($store_id == 2){ - // $value['is_default'] = 1; - // } - // } - return $data; } @@ -149,29 +136,20 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface, L $this->searchWhere[] = ['store_id', '=', $store_id]; } $class_all = $this->request->get('class_all'); - $where = []; if ($class_all) { + //查3级别的 $arr = Cate::where('pid', $class_all)->column('id'); if ($arr) { $arr2 = Cate::where('pid', 'in', $arr)->column('id'); - $where[] = ['cate_id', 'in', array_merge($arr, $arr2)]; + $this->searchWhere[] = ['cate_id', 'in', array_merge($arr, $arr2)]; + }else{ + $this->searchWhere[] = ['cate_id','=',$class_all]; } } - if (empty($where) && $class_all) { - //2或者1 - $where[] = ['cate_id', '=', $class_all]; - } - $M_store_id = $this->request->__get('store_id'); + $this->searchWhere[] = ['status', '=', 1]; $this->searchWhere[] = ['stock', '>', 0]; - if ($M_store_id) { - $where[] = ['store_id', '=', $M_store_id]; - $data = StoreBranchProduct::where($this->searchWhere)->where($where) - ->count(); - } else { - $data = StoreBranchProduct::where($this->searchWhere)->where($where) - ->count(); - } - return $data; + return StoreBranchProduct::where($this->searchWhere) + ->count(); } } diff --git a/app/common/model/user/User.php b/app/common/model/user/User.php index 6917e0c4..f2a6a4fd 100644 --- a/app/common/model/user/User.php +++ b/app/common/model/user/User.php @@ -6,6 +6,7 @@ namespace app\common\model\user; use app\common\enum\user\UserEnum; use app\common\model\BaseModel; +use app\common\model\user_label\UserLabel; use app\common\service\FileService; use think\model\concern\SoftDelete; @@ -20,14 +21,20 @@ class User extends BaseModel protected $deleteTime = 'delete_time'; - + //会员类型 public function userShip() { return $this->hasOne(UserShip::class,'id','user_ship') -// return $this->hasOne(UserShip::class,'user_ship','id') ->bind(['vip_name'=>'title','discount','limit']); } + public function userLabel() + { + return $this->hasOne(UserLabel::class,'label_id','label_id') + ->bind(['label_name']); + + } + /** * @notes 关联用户授权模型 * @return \think\model\relation\HasOne diff --git a/app/common/model/vip_flow/VipFlow.php b/app/common/model/vip_flow/VipFlow.php new file mode 100644 index 00000000..9cc49847 --- /dev/null +++ b/app/common/model/vip_flow/VipFlow.php @@ -0,0 +1,14 @@ + Date: Thu, 20 Jun 2024 11:08:06 +0800 Subject: [PATCH 03/31] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=BA=86?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E7=BB=9F=E8=AE=A1=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E4=BA=A4=E6=98=93=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/WorkbenchController.php | 327 ++---------------- .../lists/system_store/SystemStoreLists.php | 2 +- .../logic/statistic/ProductStatisticLogic.php | 46 +++ .../logic/statistic/TradeStatisticLogic.php | 8 +- .../logic/statistic/UserStatisticLogic.php | 172 +++++++++ .../logic/system_store/SystemStoreLogic.php | 3 + app/common/model/store_order/StoreOrder.php | 30 +- .../store_product_log/StoreProductLog.php | 23 ++ app/common/model/user/User.php | 31 +- app/common/model/user/UserVisit.php | 21 ++ .../model/user_recharge/UserRecharge.php | 25 +- 11 files changed, 376 insertions(+), 312 deletions(-) create mode 100644 app/admin/logic/statistic/ProductStatisticLogic.php create mode 100644 app/admin/logic/statistic/UserStatisticLogic.php create mode 100644 app/common/model/store_product_log/StoreProductLog.php diff --git a/app/admin/controller/WorkbenchController.php b/app/admin/controller/WorkbenchController.php index 6611e853..fb19d3f3 100644 --- a/app/admin/controller/WorkbenchController.php +++ b/app/admin/controller/WorkbenchController.php @@ -14,7 +14,9 @@ namespace app\admin\controller; +use app\admin\logic\statistic\ProductStatisticLogic; use app\admin\logic\statistic\TradeStatisticLogic; +use app\admin\logic\statistic\UserStatisticLogic; use app\admin\logic\WorkbenchLogic; use DateInterval; use DateTime; @@ -300,28 +302,10 @@ class WorkbenchController extends BaseAdminController */ public function get_product_ranking() { - $data = [ - [ - "product_id" => 1661, - "visit" => "1331", - "user" => 119, - "cart" => "26", - "orders" => "22", - "pay" => "11", - "price" => "690.02", - "cost" => "0.00", - "profit" => "1.00", - "collect" => "4", - "changes" => "0.06", - "repeats" => "0.28", - "store_name" => "瞌睡兔 美式复古圆领卫衣外套女春秋款小个子宽松百搭休闲上衣", - "image" => "https://multi-store.crmeb.net/uploads/attach/2024/02/19/2f3f938d720fc4212216ab855808bf85.jpg", - "product_price" => "100.00", - "stock" => 16777213, - "is_show" => 1 - ], - ]; - return $this->data($data); + $date=$this->request->get('date',''); + $where['create_time'] = $this->getDay($date); + $data=(new ProductStatisticLogic())->get_product_ranking($where); + return $this->success('',$data); } //-------------------------------用户统计---------------------------------------// @@ -331,68 +315,9 @@ class WorkbenchController extends BaseAdminController */ public function get_user_basic() { - $data = [ - "people" => [ - "num" => 1086, - "last_num" => 20904, - "percent" => "-94.80" - ], - "browse" => [ - "num" => 11296, - "last_num" => 363632, - "percent" => "-96.89" - ], - "newUser" => [ - "num" => 391, - "last_num" => 21790, - "percent" => "-98.20" - ], - "payPeople" => [ - "num" => 84, - "last_num" => 1314, - "percent" => "-93.60" - ], - "payPercent" => [ - "num" => "7.73", - "last_num" => "6.28", - "percent" => "23.08" - ], - "payUser" => [ - "num" => 27, - "last_num" => 431, - "percent" => "-93.73" - ], - "rechargePeople" => [ - "num" => 13, - "last_num" => 121, - "percent" => "-89.25" - ], - "payPrice" => [ - "num" => 2042.04, - "last_num" => 10352.37, - "percent" => "-80.27" - ], - "cumulativeUser" => [ - "num" => 22852, - "last_num" => 21790, - "percent" => "4.87" - ], - "cumulativePayUser" => [ - "num" => 552, - "last_num" => 521, - "percent" => "5.95" - ], - "cumulativeRechargePeople" => [ - "num" => 134, - "last_num" => 121, - "percent" => "10.74" - ], - "cumulativePayPeople" => [ - "num" => 1380, - "last_num" => 1314, - "percent" => "5.02" - ] - ]; + $date=$this->request->get('date',''); + $where['create_time'] = $this->getDay($date); + $data=(new UserStatisticLogic())->getBasic($where); return $this->data($data); } @@ -401,217 +326,10 @@ class WorkbenchController extends BaseAdminController */ public function get_user_trend() { - $data = [ - "xAxis" => [ - "2024-05-06", - "2024-05-07", - "2024-05-08", - "2024-05-09", - "2024-05-10", - "2024-05-11", - "2024-05-12", - "2024-05-13", - "2024-05-14", - "2024-05-15", - "2024-05-16", - "2024-05-17", - "2024-05-18", - "2024-05-19", - "2024-05-20", - "2024-05-21", - "2024-05-22", - "2024-05-23", - "2024-05-24", - "2024-05-25", - "2024-05-26", - "2024-05-27", - "2024-05-28", - "2024-05-29", - "2024-05-30", - "2024-05-31", - "2024-06-01", - "2024-06-02", - "2024-06-03", - "2024-06-04" - ], - "series" => [ - [ - "name" => "新增用户数", - "value" => [ - 13, - 15, - 11, - 20, - 9, - 8, - 1, - 6, - 15, - 20, - 9, - 13, - 5, - 2, - 17, - 19, - 8, - 12, - 12, - 22, - 9, - 32, - 17, - 16, - 14, - 17, - 10, - 5, - 20, - 7 - ] - ], - [ - "name" => "访客数", - "value" => [ - 44, - 69, - 59, - 82, - 58, - 37, - 27, - 44, - 43, - 57, - 54, - 49, - 24, - 17, - 42, - 68, - 55, - 72, - 52, - 130, - 45, - 213, - 108, - 97, - 84, - 78, - 54, - 45, - 94, - 52 - ] - ], - [ - "name" => "成交用户数", - "value" => [ - 3, - 4, - 5, - 5, - 3, - 3, - 1, - 3, - 4, - 7, - 9, - 5, - 1, - 1, - 4, - 4, - 7, - 6, - 7, - 8, - 2, - 14, - 5, - 5, - 8, - 3, - 1, - 4, - 8, - 4 - ] - ], - [ - "name" => "充值用户", - "value" => [ - 0, - 0, - 0, - 1, - 2, - 0, - 0, - 0, - 0, - 2, - 1, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 1, - 2, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1 - ] - ], - [ - "name" => "新增付费用户数", - "value" => [ - 0, - 3, - 2, - 1, - 0, - 0, - 0, - 0, - 1, - 4, - 4, - 1, - 1, - 1, - 0, - 0, - 0, - 3, - 3, - 1, - 0, - 3, - 2, - 0, - 1, - 3, - 1, - 2, - 3, - 0 - ] - ] - ] - ]; + $date=$this->request->get('date',''); + $where['create_time'] = $this->getDay($date); + $data=(new UserStatisticLogic())->getTrend($where); + return $this->data($data); } //-------------------------------交易统计---------------------------------------// @@ -644,4 +362,23 @@ class WorkbenchController extends BaseAdminController $data=(new TradeStatisticLogic())->getBottomTrade(['data'=>'2024/05/21-2024/06/19']); return $this->data($data); } + + /** + * 格式化时间 + * @param $time + * @return string + */ + public function getDay($time) + { + if (strstr($time, '-') !== false) { + [$startTime, $endTime] = explode('-', $time); + if (!$startTime && !$endTime) { + return date("Y/m/d", strtotime("-30 days", time())) . '-' . date("Y/m/d", time()); + } else { + return $startTime . '-' . $endTime; + } + } else { + return date("Y/m/d", strtotime("-30 days", time())) . '-' . date("Y/m/d", time()); + } + } } diff --git a/app/admin/lists/system_store/SystemStoreLists.php b/app/admin/lists/system_store/SystemStoreLists.php index d961fcce..d2f94c1b 100644 --- a/app/admin/lists/system_store/SystemStoreLists.php +++ b/app/admin/lists/system_store/SystemStoreLists.php @@ -45,7 +45,7 @@ class SystemStoreLists extends BaseAdminDataLists implements ListsSearchInterfac { return SystemStore::where($this->searchWhere) ->field(['id', 'name', 'phone', 'detailed_address', 'image', 'is_show','day_start','day_end' - ,'bank','bank_code','bank_address','realname' + ,'bank','bank_code','bank_address','realname,paid_deposit,security_deposit' ]) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) diff --git a/app/admin/logic/statistic/ProductStatisticLogic.php b/app/admin/logic/statistic/ProductStatisticLogic.php new file mode 100644 index 00000000..51dc3f67 --- /dev/null +++ b/app/admin/logic/statistic/ProductStatisticLogic.php @@ -0,0 +1,46 @@ +with('storeName') + ->field([ + 'product_id', + 'SUM(visit_num) as visit', + 'COUNT(distinct(uid)) as user', + 'SUM(cart_num) as cart', + 'SUM(order_num) as orders', + 'SUM(pay_num) as pay', + 'SUM(pay_price * pay_num) as price', + 'SUM(cost_price) as cost', + 'ROUND((SUM(pay_price)-SUM(cost_price))/SUM(pay_price),2) as profit', + 'SUM(collect_num) as collect', + 'ROUND((COUNT(distinct(pay_uid))-1)/COUNT(distinct(uid)),2) as changes', + 'COUNT(distinct(pay_uid))-1 as repeats' + ])->group('product_id')->order('pay' . ' desc')->limit(20)->select()->toArray(); + foreach ($list as $key => &$item) { + if (!$item['store_name'] || !$item['image']) { + unset($list[$key]); + } + if ($item['profit'] == null) $item['profit'] = 0; + if ($item['changes'] == null) $item['changes'] = 0; + if ($item['repeats'] == null) { + $item['repeats'] = 0; + } else { + $item['repeats'] = bcdiv(count(StoreProductLog::where($where)->where('type', 'pay')->where('product_id', $item['product_id'])->field('count(pay_uid) as p')->group('pay_uid')->having('p>1')->select()), $item['repeats'], 2); + } + } + return array_merge($list); + } +} diff --git a/app/admin/logic/statistic/TradeStatisticLogic.php b/app/admin/logic/statistic/TradeStatisticLogic.php index d326871f..3cd3e963 100644 --- a/app/admin/logic/statistic/TradeStatisticLogic.php +++ b/app/admin/logic/statistic/TradeStatisticLogic.php @@ -8,7 +8,7 @@ use app\common\model\user_recharge\UserRecharge; use tidy; /** - * Class 交易底部数据 + * Class 交易数据 * @package app\services\statistic */ class TradeStatisticLogic extends BaseLogic @@ -596,14 +596,14 @@ class TradeStatisticLogic extends BaseLogic $whereOrderMoner['paid'] = 1; $timeKey = $this->TimeConvert($where['create_time'], $isNum); + $where['timeKey'] = $timeKey; switch ($selectType) { case "sum": - $totalMoney = $storeOrder->where($whereOrderMoner)->when(isset($whereOrderMoner['create_time']), function ($query) use ($whereOrderMoner) { - $query->whereBetweenTime('create_time', strtotime($whereOrderMoner['create_time']['start_time']), strtotime($whereOrderMoner['create_time']['end_time'])); + $totalMoney = $storeOrder->where($whereOrderMoner)->when(isset($where['timeKey']), function ($query) use ($where) { + $query->whereBetweenTime('create_time', strtotime($where['timeKey']['start_time']), strtotime($where['timeKey']['end_time'])); })->sum('pay_price'); break; case "group": - $where['timeKey'] = $timeKey; $totalMoney = $storeOrder->where($whereOrderMoner)->when(isset($where['timeKey']), function ($query) use ($where, $group) { $query->whereBetweenTime('create_time', $where['timeKey']['start_time'], $where['timeKey']['end_time']); if ($where['timeKey']['days'] == 1) { diff --git a/app/admin/logic/statistic/UserStatisticLogic.php b/app/admin/logic/statistic/UserStatisticLogic.php new file mode 100644 index 00000000..e6f45ed2 --- /dev/null +++ b/app/admin/logic/statistic/UserStatisticLogic.php @@ -0,0 +1,172 @@ +make(UserRechargeServices::class); + // /** @var OtherOrderServices $otherOrder */ + // $otherOrder = app()->make(OtherOrderServices::class); + + $now['people'] = $userVisit->where('create_time', 'between', $time)->group('uid')->count(); //访客数 + $now['browse'] = $userVisit->where('create_time', 'between', $time)->sum('id'); //访问量 + $now['newUser'] = $user->where('create_time', 'between', $time)->count(); //新增用户数 + $now['payPeople'] = $order->where('create_time', 'between', $time)->group('uid')->count(); //成交用户数 + $now['payPercent'] = bcmul((string)($now['people'] > 0 ? bcdiv($now['payPeople'], $now['people'], 4) : 0), '100', 2); //访问-付款转化率 + $now['payUser'] = $user->where('create_time', 'between', $time)->where('user_ship', 1)->count(); //激活付费会员数 + $now['rechargePeople'] = $user_recharge->where('create_time', 'between', $time)->where('paid', 1)->group('uid')->count(); //充值用户数 + $totalPayPrice = $order->where('create_time', 'between', $time)->where('paid', 1)->sum('pay_price'); + $now['payPrice'] = floatval($now['payPeople'] > 0 ? bcdiv($totalPayPrice, $now['payPeople'], 2) : 0); //客单价 + $now['cumulativeUser'] = $user->count(); //累计用户数 + $now['cumulativePayUser'] = 0; //count($otherOrder->getPayUserCount(strtotime($time[1]), $where['channel_type']));//到截至日期有付费会员状态的会员数 + $now['cumulativeRechargePeople'] = $user_recharge->where('paid', 1)->group('uid')->count(); //累计充值用户数 + $now['cumulativePayPeople'] = $order->where('paid', 1)->group('uid')->count(); //累计成交用户数 + + + $dayNum = ($time[1] - $time[0]) / 86400 + 1; + $time = [ + strtotime("-$dayNum days", $time[0]), + strtotime("-1 days", $time[0]) + ]; + // $where['time'] = implode('-', $lastTime); + // $toEndtime = implode('-', [0, $lastTime[1]]); + $last['people'] = $userVisit->where('create_time', 'between', $time)->group('uid')->count(); //访客数 + $last['browse'] = $userVisit->where('create_time', 'between', $time)->sum('id'); //访问量 + $last['newUser'] = $user->where('create_time', 'between', $time)->count(); //新增用户数 + $last['payPeople'] = $order->where('create_time', 'between', $time)->group('uid')->count(); //成交用户数 + $last['payPercent'] = bcmul((string)($last['people'] > 0 ? bcdiv($last['payPeople'], $last['people'], 4) : 0), '100', 2); //访问-付款转化率 + $last['payUser'] = $user->where('create_time', 'between', $time)->where('user_ship', 1)->count(); //激活付费会员数 + $last['rechargePeople'] = $user_recharge->where('create_time', 'between', $time)->where('paid', 1)->group('uid')->count(); //充值用户数 + $totalPayPrice = $order->where('create_time', 'between', $time)->where('paid', 1)->sum('pay_price'); + $last['payPrice'] = floatval($last['payPeople'] > 0 ? bcdiv($totalPayPrice, $last['payPeople'], 2) : 0); //客单价 + $last['cumulativeUser'] = $user->count(); //累计用户数 + $last['cumulativePayUser'] = 0; //count($otherOrder->getPayUserCount(strtotime($lastTime[1]) + 86400, $where['channel_type']));//到截至日期有付费会员状态的会员数 + $last['cumulativeRechargePeople'] = $user_recharge->where('paid', 1)->group('uid')->count(); //累计充值用户数 + $last['cumulativePayPeople'] = $order->where('paid', 1)->group('uid')->count(); //累计成交用户数 + + //组合数据，计算环比 + $data = []; + foreach ($now as $key => $item) { + $data[$key]['num'] = $item; + $data[$key]['last_num'] = $last[$key]; + $num = $last[$key] > 0 ? $last[$key] : 1; + $data[$key]['percent'] = bcmul((string)bcdiv((string)($item - $last[$key]), (string)$num, 4), 100, 2); + } + return $data; + } + + /** + * 用户趋势 + * @param $where + * @param $excel + * @return mixed + */ + public function getTrend($where, $excel = false) + { + $time = explode('-', $where['create_time']); + $time = [strtotime($time[0]), strtotime($time[1])]; + + $channelType = ''; //$where['channel_type']; + if (count($time) != 2) throw new Exception('参数错误'); + $dayCount = ($time[1] - $time[0]) / 86400 + 1; + $data = []; + if ($dayCount == 1) { + $data = $this->trend($time, $channelType, 0, $excel); + } elseif ($dayCount > 1 && $dayCount <= 31) { + $data = $this->trend($time, $channelType, 1, $excel); + } elseif ($dayCount > 31 && $dayCount <= 92) { + $data = $this->trend($time, $channelType, 3, $excel); + } elseif ($dayCount > 92) { + $data = $this->trend($time, $channelType, 30, $excel); + } + return $data; + } + + /** + * 用户趋势 + * @param $time + * @param $channelType + * @param $num + * @param $excel + * @return array + */ + public function trend($time, $channelType, $num, $excel) + { + $user = new User(); + $userVisit = new UserVisit(); + $order = new StoreOrder(); + $recharge = new UserRecharge(); + + $newPeople = $visitPeople = $paidPeople = $rechargePeople = $vipPeople = []; + $newPeople['name'] = '新增用户数'; + $visitPeople['name'] = '访客数'; + $paidPeople['name'] = '成交用户数'; + $rechargePeople['name'] = '充值用户'; + $vipPeople['name'] = '新增付费用户数'; + if ($num == 0) { + $xAxis = ['00', '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23']; + $timeType = '%H'; + } elseif ($num != 0) { + $dt_start = strtotime($time[0]); + $dt_end = strtotime($time[1]); + while ($dt_start <= $dt_end) { + if ($num == 30) { + $xAxis[] = date('Y-m', $dt_start); + $dt_start = strtotime("+1 month", $dt_start); + $timeType = '%Y-%m'; + } else { + $xAxis[] = date('Y-m-d', $dt_start); + $dt_start = strtotime("+$num day", $dt_start); + $timeType = '%Y-%m-%d'; + } + } + } + + $visitPeople = array_column($userVisit->getTrendData($time, $channelType, $timeType, 'count(distinct(uid))'), 'num', 'days'); + $newPeople = array_column($user->getTrendData($time, $channelType, $timeType), 'num', 'days'); + $paidPeople = array_column($order->getTrendData($time, $channelType, $timeType, 'count(distinct(uid))'), 'num', 'days'); + $rechargePeople = array_column($recharge->getTrendData(['paid'=>1],$time, $channelType, $timeType, 'count(distinct(uid))'), 'num', 'days'); + $vipPeople = array_column($recharge->getTrendData(['paid'=>1,'price'=>1000],$time, $channelType, $timeType, 'count(distinct(uid))'), 'num', 'days'); + + $data = $series = []; + foreach ($xAxis as $item) { + $data['新增用户数'][] = isset($newPeople[$item]) ? intval($newPeople[$item]) : 0; + $data['访客数'][] = isset($visitPeople[$item]) ? intval($visitPeople[$item]) : 0; + $data['成交用户数'][] = isset($paidPeople[$item]) ? intval($paidPeople[$item]) : 0; + $data['充值用户'][] = isset($rechargePeople[$item]) ? intval($rechargePeople[$item]) : 0; + $data['新增付费用户数'][] = isset($vipPeople[$item]) ? intval($vipPeople[$item]) : 0; + } + foreach ($data as $key => $item) { + $series[] = ['name' => $key, 'value' => $item]; + } + return compact('xAxis', 'series'); + } +} diff --git a/app/admin/logic/system_store/SystemStoreLogic.php b/app/admin/logic/system_store/SystemStoreLogic.php index 695ea00b..4e68384b 100644 --- a/app/admin/logic/system_store/SystemStoreLogic.php +++ b/app/admin/logic/system_store/SystemStoreLogic.php @@ -52,6 +52,7 @@ class SystemStoreLogic extends BaseLogic 'street' => $params['street_code'], 'is_store' => $params['is_store'] ?? 0, 'is_send' => $params['is_send'] ?? 0, + 'security_deposit' => $params['security_deposit'] ?? 0, ]); $taff = [ 'store_id' => $store['id'], @@ -111,6 +112,8 @@ class SystemStoreLogic extends BaseLogic 'bank_address' => $params['bank_address']??'', 'realname' => $params['realname']??'', 'default_delivery' => $params['default_delivery'] ?? 2, + 'security_deposit' => $params['security_deposit'] ?? 0, + ]); $res=SystemStoreStaff::where('store_id', $params['id'])->where('is_admin', 1)->where('account', $params['phone'])->find(); if($params['password']!=''&&$res){ diff --git a/app/common/model/store_order/StoreOrder.php b/app/common/model/store_order/StoreOrder.php index 1b375309..69cc6a36 100644 --- a/app/common/model/store_order/StoreOrder.php +++ b/app/common/model/store_order/StoreOrder.php @@ -25,19 +25,19 @@ class StoreOrder extends BaseModel public function store() { - return $this->hasOne(SystemStore::class, 'id','store_id') - ->bind(['store_name'=>'name', 'store_phone'=>'phone','store_detailed_address'=>'detailed_address','store_simple_address'=>'address']); + return $this->hasOne(SystemStore::class, 'id', 'store_id') + ->bind(['store_name' => 'name', 'store_phone' => 'phone', 'store_detailed_address' => 'detailed_address', 'store_simple_address' => 'address']); } public function getPayTypeNameTextAttr($value, $data) { - $status = PayEnum::getPaySceneDesc($value)??''; + $status = PayEnum::getPaySceneDesc($value) ?? ''; return $status; } public function getStatusNameTextAttr($value, $data) { - $status = OrderEnum::getOrderType($data['status'])??''; + $status = OrderEnum::getOrderType($data['status']) ?? ''; return $status; } @@ -55,5 +55,25 @@ class StoreOrder extends BaseModel { return $this->hasOne(SystemStoreStaff::class, 'id', 'staff_id')->bind(['staff_name']); } - + /** + * 用户趋势数据 + * @param $time + * @param $type + * @param $timeType + * @return mixed + */ + public function getTrendData($time, $type, $timeType, $str) + { + return $this->when($type != '', function ($query) use ($type) { + $query->where('channel_type', $type); + })->where('paid', 1)->where('paid', '>=', 0)->where(function ($query) use ($time) { + if ($time[0] == $time[1]) { + $query->whereDay('create_time', $time[0]); + } else { + $time[1] = $time[1] + 86400; + $query->whereTime('create_time', 'between', $time); + } + })->field("FROM_UNIXTIME(create_time,'$timeType') as days,$str as num") + ->group('days')->select()->toArray(); + } } diff --git a/app/common/model/store_product_log/StoreProductLog.php b/app/common/model/store_product_log/StoreProductLog.php new file mode 100644 index 00000000..7d94bde8 --- /dev/null +++ b/app/common/model/store_product_log/StoreProductLog.php @@ -0,0 +1,23 @@ +hasOne(UserShip::class,'id','user_ship') -// return $this->hasOne(UserShip::class,'user_ship','id') - ->bind(['vip_name'=>'title','discount','limit']); + return $this->hasOne(UserShip::class, 'id', 'user_ship') + // return $this->hasOne(UserShip::class,'user_ship','id') + ->bind(['vip_name' => 'title', 'discount', 'limit']); } /** @@ -113,7 +113,7 @@ class User extends BaseModel */ public function getAvatarAttr($value) { - if($value){ + if ($value) { return trim($value) ? FileService::getFileUrl($value) : ''; } } @@ -168,4 +168,25 @@ class User extends BaseModel // } return $sn; } -} \ No newline at end of file + + /** + * 获取用户统计数据 + * @param $time + * @param $type + * @param $timeType + * @return mixed + */ + public function getTrendData($time, $type, $timeType) + { + return $this->when($type != '', function ($query) use ($type) { + $query->where('user_type', $type); + })->where(function ($query) use ($time) { + if ($time[0] == $time[1]) { + $query->whereDay('create_time', $time[0]); + } else { + $time[1] = $time[1] + 86400; + $query->whereTime('create_time', 'between', $time); + } + })->field("FROM_UNIXTIME(create_time,'$timeType') as days,count(id) as num")->group('days')->select()->toArray(); + } +} diff --git a/app/common/model/user/UserVisit.php b/app/common/model/user/UserVisit.php index 7fb9710c..5310683e 100644 --- a/app/common/model/user/UserVisit.php +++ b/app/common/model/user/UserVisit.php @@ -19,4 +19,25 @@ class UserVisit extends BaseModel protected $deleteTime = 'delete_time'; + /** + * 用户趋势数据 + * @param $time + * @param $type + * @param $timeType + * @param $str + * @return mixed + */ + public function getTrendData($time, $type, $timeType, $str) + { + return $this->when($type != '', function ($query) use ($type) { + $query->where('channel_type', $type); + })->where(function ($query) use ($time) { + if ($time[0] == $time[1]) { + $query->whereDay('create_time', $time[0]); + } else { + $time[1] = $time[1] + 86400; + $query->whereTime('create_time', 'between', $time); + } + })->field("FROM_UNIXTIME(create_time,'$timeType') as days,$str as num")->group('days')->select()->toArray(); + } } \ No newline at end of file diff --git a/app/common/model/user_recharge/UserRecharge.php b/app/common/model/user_recharge/UserRecharge.php index a90d160a..2f9132c9 100644 --- a/app/common/model/user_recharge/UserRecharge.php +++ b/app/common/model/user_recharge/UserRecharge.php @@ -18,5 +18,26 @@ class UserRecharge extends BaseModel protected $name = 'user_recharge'; protected $deleteTime = 'delete_time'; - -} \ No newline at end of file + /** + * 获取充值统计曲线 + * @param $time + * @param $type + * @param $timeType + * @param string $str + * @return mixed + */ + public function getTrendData($where,$time, $type, $timeType, $str = 'count(id)') + { + return $this->when($type != '', function ($query) use ($type) { + $query->where('channel_type', $type); + })->where($where)->where(function ($query) use ($time) { + if ($time[0] == $time[1]) { + $query->whereDay('create_time', $time[0]); + } else { + $time[1] = $time[1] + 86400; + $query->whereTime('create_time', 'between', $time); + } + })->field("FROM_UNIXTIME(create_time,'$timeType') as days, " . $str . "as num") + ->group('days')->select()->toArray(); + } +} From 4339cf481ebc238b534fe9190f1b7f1f5a7be7b9 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 20 Jun 2024 11:27:14 +0800 Subject: [PATCH 04/31] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E7=BB=9F=E8=AE=A1=E9=80=BB=E8=BE=91=E4=BB=A5=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=8C=89=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/WorkbenchController.php | 3 ++- app/admin/logic/statistic/TradeStatisticLogic.php | 12 ++++-------- app/admin/logic/statistic/UserStatisticLogic.php | 5 ++--- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/app/admin/controller/WorkbenchController.php b/app/admin/controller/WorkbenchController.php index fb19d3f3..53f0fdfc 100644 --- a/app/admin/controller/WorkbenchController.php +++ b/app/admin/controller/WorkbenchController.php @@ -359,7 +359,8 @@ class WorkbenchController extends BaseAdminController //交易趋势 public function bottom_trade() { - $data=(new TradeStatisticLogic())->getBottomTrade(['data'=>'2024/05/21-2024/06/19']); + $date=$this->request->get('date',''); + $data=(new TradeStatisticLogic())->getBottomTrade(['data'=>$this->getDay($date)]); return $this->data($data); } diff --git a/app/admin/logic/statistic/TradeStatisticLogic.php b/app/admin/logic/statistic/TradeStatisticLogic.php index 3cd3e963..e362f401 100644 --- a/app/admin/logic/statistic/TradeStatisticLogic.php +++ b/app/admin/logic/statistic/TradeStatisticLogic.php @@ -172,7 +172,7 @@ class TradeStatisticLogic extends BaseLogic $query->group("FROM_UNIXTIME(create_time, '$timeUinx')"); }) ->order('create_time ASC')->select()->toArray(); - $monthCurveOrderCount = $this->trendYdata((array)$monthCurveOrderCount, $where['timeKey']); + $monthCurveOrderCount = $this->trendYdata((array)$monthCurveOrderCount, $timeKey); //上月订单数 $lastOrderCountWhere['timeKey'] = $this->TimeConvert("last_month"); $where['timeKey'] = [ @@ -228,14 +228,10 @@ class TradeStatisticLogic extends BaseLogic }) ->order('create_time ASC')->select()->toArray(); - $monthCurveOrderPeople = $this->trendYdata((array)$monthCurveOrderPeople, $where['timeKey']); + $monthCurveOrderPeople = $this->trendYdata((array)$monthCurveOrderPeople, $timeKey); //上月支付人数 - $timeKey = $this->TimeConvert("last_month"); - $where['timeKey'] = [ - "start_time" => strtotime($timeKey['start_time']), - "end_time" => strtotime($timeKey['end_time']), - "days" => $timeKey['days'] - ]; + // $timeKey = $this->TimeConvert("last_month"); + $lastPayOrderPeople = $storeOrder->where($monthOrderPeopleWhere)->whereMonth('create_time')->group('uid')->count(); //上月支付曲线 diff --git a/app/admin/logic/statistic/UserStatisticLogic.php b/app/admin/logic/statistic/UserStatisticLogic.php index e6f45ed2..b725b857 100644 --- a/app/admin/logic/statistic/UserStatisticLogic.php +++ b/app/admin/logic/statistic/UserStatisticLogic.php @@ -135,8 +135,8 @@ class UserStatisticLogic extends BaseLogic $xAxis = ['00', '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23']; $timeType = '%H'; } elseif ($num != 0) { - $dt_start = strtotime($time[0]); - $dt_end = strtotime($time[1]); + $dt_start = $time[0]; + $dt_end = $time[1]; while ($dt_start <= $dt_end) { if ($num == 30) { $xAxis[] = date('Y-m', $dt_start); @@ -149,7 +149,6 @@ class UserStatisticLogic extends BaseLogic } } } - $visitPeople = array_column($userVisit->getTrendData($time, $channelType, $timeType, 'count(distinct(uid))'), 'num', 'days'); $newPeople = array_column($user->getTrendData($time, $channelType, $timeType), 'num', 'days'); $paidPeople = array_column($order->getTrendData($time, $channelType, $timeType, 'count(distinct(uid))'), 'num', 'days'); From 6cbffc01a8cf7dd1f5d31b3a3a1cf17a3b01050b Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Thu, 20 Jun 2024 11:41:14 +0800 Subject: [PATCH 05/31] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BA=97=E9=93=BA?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/user/UserController.php | 12 ++++ app/admin/lists/user/UserLists.php | 1 - app/admin/logic/user/UserLogic.php | 58 +++++++++++++++++++ app/admin/validate/user/UserValidate.php | 6 ++ .../store_finance_flow/StoreFinanceFlow.php | 6 ++ app/common/model/vip_flow/VipFlow.php | 6 ++ 6 files changed, 88 insertions(+), 1 deletion(-) diff --git a/app/admin/controller/user/UserController.php b/app/admin/controller/user/UserController.php index b2046e78..0a8b8503 100644 --- a/app/admin/controller/user/UserController.php +++ b/app/admin/controller/user/UserController.php @@ -65,4 +65,16 @@ class UserController extends BaseAdminController } return $this->fail(UserLogic::getError()); } + + //采购款明细、余额明细、礼品券明细、返还金明细 + public function fundList() + { + $params = (new UserValidate())->goCheck('fund'); + $res = UserLogic::dealDetails($params); + $res['page_no'] = $params['page_no']; + $res['page_size'] = $params['page_size']; + return $this->success('ok', $res); + + } + } \ No newline at end of file diff --git a/app/admin/lists/user/UserLists.php b/app/admin/lists/user/UserLists.php index 2a55422a..c2c4471c 100644 --- a/app/admin/lists/user/UserLists.php +++ b/app/admin/lists/user/UserLists.php @@ -63,7 +63,6 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface $data['sex_text'] = $data->sex_text; })->toArray(); foreach ($lists as &$item) { - //返还金，采购款明细、余额明细、礼品券明细、返还金明细 $item['channel'] = UserTerminalEnum::getTermInalDesc($item['channel']); $item['user_address'] = UserAddress::where([ 'uid'=>$item['id'],'is_default'=>YesNoEnum::YES diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index ff86b002..0f0afc31 100644 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -13,13 +13,18 @@ // +---------------------------------------------------------------------- namespace app\admin\logic\user; +use app\common\enum\OrderEnum; use app\common\enum\user\UserTerminalEnum; +use app\common\enum\YesNoEnum; use app\common\logic\BaseLogic; +use app\common\model\finance\CapitalFlow; use app\common\model\store_finance_flow\StoreFinanceFlow; use app\common\model\user\User; use app\common\model\user\UserAddress; use app\common\model\user\UserRecharge; use app\common\model\user_label\UserLabel; +use app\common\model\user_sign\UserSign; +use app\common\model\vip_flow\VipFlow; use think\facade\Db; use app\common\service\FileService; use Webman\Config; @@ -178,4 +183,57 @@ class UserLogic extends BaseLogic $params['field'] => $params['value'] ]); } + + public static function dealDetails($params) + { + switch ($params['type']){ + case 1: + //采购款明细 + $query =CapitalFlow::where(['uid'=>$params['id']]); + $count = $query->count(); + $data = $query + ->page($params['page_no'],$params['page_size']) + ->select()->toArray(); + break; + case 2: + //余额明细 + + $query = StoreFinanceFlow::with(['store']) + ->where([ + 'other_uid'=>$params['id'],'financial_type'=> OrderEnum::VIP_ORDER_OBTAINS, + 'financial_pm'=>YesNoEnum::YES + ]); + $count = $query->count(); + $data = $query + ->page($params['page_no'],$params['page_size']) + ->select()->toArray(); + + break; + case 3: + //礼品券明细 + $query = UserSign::where(['uid'=>$params['id']]); + $count = $query->count(); + $data =$query + ->page($params['page_no'],$params['page_size']) + ->select()->toArray(); + break; + case 4: + //返还金明细 -todo back + $query = VipFlow::with('store')->where(['user_id'=>$params['id']]); + $count = $query->count(); + $data = $query + ->page($params['page_no'],$params['page_size']) + ->select()->toArray(); + break; + default: + $data = []; + $count = 0; + } + return [ + 'list' => $data, + 'count' => $count + ]; + + + } } diff --git a/app/admin/validate/user/UserValidate.php b/app/admin/validate/user/UserValidate.php index 90911234..f08c1518 100644 --- a/app/admin/validate/user/UserValidate.php +++ b/app/admin/validate/user/UserValidate.php @@ -34,6 +34,7 @@ class UserValidate extends BaseValidate 'village' => 'require', 'brigade' => 'require', 'user_ship' => 'require', + 'type' => 'require|number', ]; @@ -57,9 +58,14 @@ class UserValidate extends BaseValidate 'village' => '村', 'brigade' => ' 队', 'user_ship' => ' 会员类型', + 'type' => '查询类型', ]; + public function sceneFund() + { + return $this->only(['type','id']); + } /** * @notes 添加场景 * @return UserValidate diff --git a/app/common/model/store_finance_flow/StoreFinanceFlow.php b/app/common/model/store_finance_flow/StoreFinanceFlow.php index cbe88609..c3d44962 100644 --- a/app/common/model/store_finance_flow/StoreFinanceFlow.php +++ b/app/common/model/store_finance_flow/StoreFinanceFlow.php @@ -4,6 +4,7 @@ namespace app\common\model\store_finance_flow; use app\common\model\BaseModel; +use app\common\model\system_store\SystemStore; use app\common\model\system_store\SystemStoreStaff; use app\common\model\user\User; use think\model\concern\SoftDelete; @@ -20,6 +21,11 @@ class StoreFinanceFlow extends BaseModel protected $name = 'store_finance_flow'; protected $deleteTime = 'delete_time'; + public function store() + { + return $this->hasOne(SystemStore::class, 'id','store_id') + ->bind(['store_name'=>'name', 'store_phone'=>'phone','store_detailed_address'=>'detailed_address','store_simple_address'=>'address']); + } public function user() { return $this->hasOne(User::class, 'id', 'user_id')->bind(['nickname']); diff --git a/app/common/model/vip_flow/VipFlow.php b/app/common/model/vip_flow/VipFlow.php index 9cc49847..9c62aa87 100644 --- a/app/common/model/vip_flow/VipFlow.php +++ b/app/common/model/vip_flow/VipFlow.php @@ -3,6 +3,7 @@ namespace app\common\model\vip_flow; use app\common\model\BaseModel; +use app\common\model\system_store\SystemStore; use think\model\concern\SoftDelete; class VipFlow extends BaseModel @@ -11,4 +12,9 @@ class VipFlow extends BaseModel protected $name = 'vip_flow'; protected $deleteTime = 'delete_time'; + public function store() + { + return $this->hasOne(SystemStore::class, 'id','store_id') + ->bind(['store_name'=>'name', 'store_phone'=>'phone','store_detailed_address'=>'detailed_address','store_simple_address'=>'address']); + } } \ No newline at end of file From 5e9a77d38cf905347ae3415f557a1e3a5f2f74a5 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Thu, 20 Jun 2024 11:44:16 +0800 Subject: [PATCH 06/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/user/UserController.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/admin/controller/user/UserController.php b/app/admin/controller/user/UserController.php index 0a8b8503..d8649e36 100644 --- a/app/admin/controller/user/UserController.php +++ b/app/admin/controller/user/UserController.php @@ -69,7 +69,12 @@ class UserController extends BaseAdminController //采购款明细、余额明细、礼品券明细、返还金明细 public function fundList() { - $params = (new UserValidate())->goCheck('fund'); + (new UserValidate())->goCheck('fund'); + $page_no = (int)$this->request->post('page_no', 1); + $page_size = (int)$this->request->post('page_size', 15); + $params = $this->request->post(); + $params['page_no'] = $page_no > 0 ? $page_no : 1; + $params['page_size'] = $page_size > 0 ? $page_size : 15; $res = UserLogic::dealDetails($params); $res['page_no'] = $params['page_no']; $res['page_size'] = $params['page_size']; From bc16d06bb64a7b5cc26798b0a794fba63a04a19b Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Thu, 20 Jun 2024 11:50:46 +0800 Subject: [PATCH 07/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=9E=E9=80=80?= =?UTF-8?q?=E5=95=86=E6=88=B7=E7=AB=AF=E6=97=B6=E9=97=B4=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/store/logic/WorkbenchLogic.php | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/app/store/logic/WorkbenchLogic.php b/app/store/logic/WorkbenchLogic.php index ea4e9de5..5b7f8872 100644 --- a/app/store/logic/WorkbenchLogic.php +++ b/app/store/logic/WorkbenchLogic.php @@ -45,21 +45,24 @@ class WorkbenchLogic extends BaseLogic public static function index($params) { $data = []; - $startTimeDefault = date('Y-m-d',time()); - $endTimeDefault =date('Y-m-d', strtotime($startTimeDefault) + 86400); + $startTime = $params['start_time']; + $endTime = $params['end_time']; + $endTime = date('Y-m-d', strtotime($endTime) + 86400); + $dateDiff = (new \DateTime($endTime))->diff(new \DateTime($startTime)); + $orderLogic = new StoreOrderLogic(); //订单总金额 - $data['order_amount'] = $orderLogic->storeOrderSumByDate($params['store_id'], $startTimeDefault, $endTimeDefault); + $data['order_amount'] = $orderLogic->storeOrderSumByDate($params['store_id'], $startTime, $endTime); //余额支付总金额 - $data['balance_amount'] = $orderLogic->storeOrderSumByDate($params['store_id'], $startTimeDefault, $endTimeDefault, ['pay_type' => PayEnum::BALANCE_PAY]); + $data['balance_amount'] = $orderLogic->storeOrderSumByDate($params['store_id'], $startTime, $endTime, ['pay_type' => PayEnum::BALANCE_PAY]); //线下收银总金额 - $data['cashier_amount'] = $orderLogic->storeOrderSumByDate($params['store_id'], $startTimeDefault, $endTimeDefault, ['shipping_type' => 3]); + $data['cashier_amount'] = $orderLogic->storeOrderSumByDate($params['store_id'], $startTime, $endTime, ['shipping_type' => 3]); //现金收银总金额 - $data['cash_amount'] = StoreCashFinanceFlow::where('store_id', $params['store_id'])->whereBetweenTime('create_time', $startTimeDefault, $endTimeDefault)->sum('cash_price'); + $data['cash_amount'] = StoreCashFinanceFlow::where('store_id', $params['store_id'])->whereBetweenTime('create_time', $startTime, $endTime)->sum('cash_price'); //核销订单金额 - $data['verify_amount'] = $orderLogic->storeOrderSumByDate($params['store_id'], $startTimeDefault, $endTimeDefault, ['shipping_type' => 2]); + $data['verify_amount'] = $orderLogic->storeOrderSumByDate($params['store_id'], $startTime, $endTime, ['shipping_type' => 2]); //门店收益金额 - $data['income_amount'] = $orderLogic->storeOrderSumByDate($params['store_id'], $startTimeDefault, $endTimeDefault, [], 'profit'); + $data['income_amount'] = $orderLogic->storeOrderSumByDate($params['store_id'], $startTime, $endTime, [], 'profit'); //门店收款金额 $data['receipt_amount'] = UserRecharge::where([ 'store_id'=>$params['store_id'], @@ -68,14 +71,10 @@ class WorkbenchLogic extends BaseLogic //门店成交用户数 $data['user_number'] = StoreOrder::where('store_id', $params['store_id']) ->where('paid', 1) - ->whereBetweenTime('pay_time', $startTimeDefault, $endTimeDefault) + ->whereBetweenTime('pay_time', $startTime, $endTime) ->group('uid') ->count(); - $startTime = $params['start_time']; - $endTime = $params['end_time']; - $endTime = date('Y-m-d', strtotime($endTime) + 86400); - $dateDiff = (new \DateTime($endTime))->diff(new \DateTime($startTime)); if ($dateDiff->days == 1) { $group = 'HOUR(pay_time)'; $i = 0; From 5df4f2d569c4343518e9b9ccba4741b9358d0d10 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Thu, 20 Jun 2024 13:39:29 +0800 Subject: [PATCH 08/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/user/UserController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/admin/controller/user/UserController.php b/app/admin/controller/user/UserController.php index d8649e36..d7a0e5bc 100644 --- a/app/admin/controller/user/UserController.php +++ b/app/admin/controller/user/UserController.php @@ -69,7 +69,7 @@ class UserController extends BaseAdminController //采购款明细、余额明细、礼品券明细、返还金明细 public function fundList() { - (new UserValidate())->goCheck('fund'); + (new UserValidate())->post()->goCheck('fund'); $page_no = (int)$this->request->post('page_no', 1); $page_size = (int)$this->request->post('page_size', 15); $params = $this->request->post(); From 4e6c195d43c65ce0a7987dbf7b88a048effde61d Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Thu, 20 Jun 2024 13:44:11 +0800 Subject: [PATCH 09/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/user/UserController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/admin/controller/user/UserController.php b/app/admin/controller/user/UserController.php index d7a0e5bc..2f83ae7b 100644 --- a/app/admin/controller/user/UserController.php +++ b/app/admin/controller/user/UserController.php @@ -69,10 +69,10 @@ class UserController extends BaseAdminController //采购款明细、余额明细、礼品券明细、返还金明细 public function fundList() { - (new UserValidate())->post()->goCheck('fund'); - $page_no = (int)$this->request->post('page_no', 1); - $page_size = (int)$this->request->post('page_size', 15); - $params = $this->request->post(); + (new UserValidate())->get()->goCheck('fund'); + $page_no = (int)$this->request->get('page_no', 1); + $page_size = (int)$this->request->get('page_size', 15); + $params = $this->request->get(); $params['page_no'] = $page_no > 0 ? $page_no : 1; $params['page_size'] = $page_size > 0 ? $page_size : 15; $res = UserLogic::dealDetails($params); From 304f5fddce92f34cdf02d994929485036586cc45 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Thu, 20 Jun 2024 13:46:20 +0800 Subject: [PATCH 10/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/user/UserLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index 0f0afc31..3cf62ac2 100644 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -230,7 +230,7 @@ class UserLogic extends BaseLogic $count = 0; } return [ - 'list' => $data, + 'lists' => $data, 'count' => $count ]; From aafe828da740702994e1a2106cad712ab9418ccb Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Thu, 20 Jun 2024 14:05:35 +0800 Subject: [PATCH 11/31] =?UTF-8?q?=E9=97=A8=E5=BA=97=E5=95=86=E5=93=81?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/store/controller/WorkbenchController.php | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/app/store/controller/WorkbenchController.php b/app/store/controller/WorkbenchController.php index 6617466c..92188eed 100644 --- a/app/store/controller/WorkbenchController.php +++ b/app/store/controller/WorkbenchController.php @@ -102,9 +102,21 @@ class WorkbenchController extends BaseAdminController // ] public function get_basic(\app\admin\controller\WorkbenchController $workbench) { - $params = $this->request->get(); - $params['store_id'] = $this->request->adminInfo['store_id']; - return $workbench->get_basic(); + $dateRange = $this->request->get('date'); + // 拆分日期范围 + list($startDate, $endDate) = explode('-', $dateRange); + $startTime = str_replace('/', '-', $startDate); + $endTime = str_replace('/', '-', $endDate); + if (empty($startTime)) { //如果没有传开始时间，则默认获取最近7天的数据 + $startTime = strtotime(date('Y-m-d')); + $endTime = $startTime + 86400; + } + $where = [ + ['create_time', 'between', [$startTime, $endTime]], + ['store_id','=',$this->request->adminInfo['store_id']] + ]; + $data = \app\admin\logic\WorkbenchLogic::get_basic($where); + return $this->data($data); } // #[ From 13a5b9bb0e289fd1d67fa7f50aebbac764a76b25 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 20 Jun 2024 14:19:09 +0800 Subject: [PATCH 12/31] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E5=8F=B0=E5=8A=9F=E8=83=BD=E5=92=8C=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/WorkbenchController.php | 33 ++ .../SystemStoreStatisticsController.php | 282 ------------------ app/admin/logic/WorkbenchLogic.php | 30 +- .../logic/statistic/TradeStatisticLogic.php | 1 - app/common/model/store_order/StoreOrder.php | 9 + 5 files changed, 66 insertions(+), 289 deletions(-) delete mode 100644 app/admin/controller/system_store/SystemStoreStatisticsController.php diff --git a/app/admin/controller/WorkbenchController.php b/app/admin/controller/WorkbenchController.php index 53f0fdfc..ac6070e2 100644 --- a/app/admin/controller/WorkbenchController.php +++ b/app/admin/controller/WorkbenchController.php @@ -18,6 +18,7 @@ use app\admin\logic\statistic\ProductStatisticLogic; use app\admin\logic\statistic\TradeStatisticLogic; use app\admin\logic\statistic\UserStatisticLogic; use app\admin\logic\WorkbenchLogic; +use app\store\logic\WorkbenchLogic as LogicWorkbenchLogic; use DateInterval; use DateTime; @@ -39,7 +40,39 @@ class WorkbenchController extends BaseAdminController $result = WorkbenchLogic::index(); return $this->data($result); } + /** + * @notes 工作台 + * @author 乔峰 + * @date 2021/12/29 17=>01 + */ + public function store_index() + { + $params = $this->request->get(); + if(!isset($params['store_id']) ||$params['store_id']==''){ + $params['store_id'] =1; + } + if(!isset($params['start_time']) ||$params['start_time']==''){ + $time=explode('-', $this->getDay('')); + $params['start_time'] =$time[0]; + $params['end_time'] =$time[1]; + } + $result = LogicWorkbenchLogic::index($params); + return $this->data($result); + } + /** + * @notes 工作台 + * @author 乔峰 + * @date 2021/12/29 17=>01 + */ + public function store_index_new() + { + $params['store_id'] = $this->request->adminInfo['store_id']; + $result = WorkbenchLogic::index($params); + return $this->data($result); + } + + //首页订单 public function order() { diff --git a/app/admin/controller/system_store/SystemStoreStatisticsController.php b/app/admin/controller/system_store/SystemStoreStatisticsController.php deleted file mode 100644 index 8f639f64..00000000 --- a/app/admin/controller/system_store/SystemStoreStatisticsController.php +++ /dev/null @@ -1,282 +0,0 @@ -45 - */ - public function header() - { - - $data = [ - 'card_count' => 0, - 'cashier_order_price' => 28762.69, - 'recharge_price' => 2004402.08, - 'store_income' => 34974.53, - 'store_order_price' => 1681.30, - 'store_pay_user_count' => 48, - 'store_use_yue' => 6734.52, - 'store_user_count' => 76, - 'store_writeoff_order_price' => 4530.54, - 'vip_price' => 1000.00, - ]; - return $this->data($data); - } - - /** - * 交易/类型数据 - */ - public function orderChart() - { - $order_list = [ - [ - "id" => 11127, - "order_id" => "wx529263627312562176", - "uid" => 0, - "pay_price" => "257.20", - "pay_time" => 1717472682, - "avatar" => null, - "nickname" => null, - "phone" => null, - "now_money" => null, - "integral" => null, - "delete_time" => null, - "refund" => [] - ], - [ - "id" => 11120, - "order_id" => "wx529242351697133568", - "uid" => 0, - "pay_price" => "4.48", - "pay_time" => 1717467609, - "avatar" => null, - "nickname" => null, - "phone" => null, - "now_money" => null, - "integral" => null, - "delete_time" => null, - "refund" => [] - ] - ]; - $bing_xdata = [ - "收银订单", - "充值订单", - "分配订单", - "核销订单", - "付费会员订单" - ]; - $bing_data = [ - [ - "name" => "收银订单", - "value" => 29019.89, - "itemStyle" => [ - "color" => "#2EC479" - ] - ], - [ - "name" => "充值订单", - "value" => 2004402.08, - "itemStyle" => [ - "color" => "#7F7AE5" - ] - ], - [ - "name" => "分配订单", - "value" => 1681.3, - "itemStyle" => [ - "color" => "#FFA21B" - ] - ], - - [ - "name" => "核销订单", - "value" => 4530.54, - "itemStyle" => [ - "color" => "#46A3FF" - ] - ], - [ - "name" => "付费会员订单", - "value" => 1000, - "itemStyle" => [ - "color" => "#FF6046" - ] - ] - ]; - $data = [ - 'order_list' => $order_list, - 'bing_xdata' => $bing_xdata, - 'bing_data' => $bing_data, - ]; - return $this->data($data); - } - - /** - * 营业趋势 - */ - public function operate(){ - $xAxis=[ - "05-06", - "05-07", - "05-08", - "05-09", - "05-10", - "05-11", - "05-12", - "05-13", - "05-14", - "05-15", - "05-16", - "05-17", - "05-18", - "05-19", - "05-20", - "05-21", - "05-22", - "05-23", - "05-24", - "05-25", - "05-26", - "05-27", - "05-28", - "05-29", - "05-30", - "05-31", - "06-01", - "06-02", - "06-03", - "06-04" - ]; - $series=[ - [ - "name"=> "门店收款", - "data"=> [ - 171.29, - 167.46, - 1455.65, - 45.47, - 542.69, - 216.58, - 228.82, - 34.24, - 8249.85, - 664.23, - 8586.24, - 10.19, - 90.19, - 105.4, - 62.59, - 1051.34, - 160.84, - 2437.68, - 111374.41, - 12161.05, - 189, - 4831.65, - 1276.31, - 582.4, - 906.02, - 597, - 0.08, - 771.16, - 10262.64, - 261.68 - ], - "type"=> "line", - "smooth"=> "true", - "yAxisIndex"=> 1 - ], - [ - "name"=> "新增用户数", - "data"=> [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "type"=> "line", - "smooth"=> "true", - "yAxisIndex"=> 1 - ] - ]; - $data = [ - 'xAxis' => $xAxis, - 'series' => $series, - ]; - return $this->data($data); - } - - /** - * 门店业绩 - */ - public function store(){ - $data=[ - [ - "id"=> 46, - "name"=> "王多鱼的商超", - "image"=> "https:multi-store.crmeb.net/uploads/attach/2024/05/20240527/f9b8b3c3cd5f1113bd7d374dc55d320a.jpg", - "store_price"=> 797.88, - "store_product_count"=> 18, - "store_order_price"=> 1275.16, - "store_user_count"=> 6 - ], - [ - "id"=> 43, - "name"=> "这是直营店", - "image"=> "https:multi-store.crmeb.net/uploads/attach/2024/05/20240524/9066528e73e2db60d31a704d321ba4a5.jpeg", - "store_price"=> 203.11, - "store_product_count"=> 10, - "store_order_price"=> 579.01, - "store_user_count"=> 8 - ], - ]; - return $this->data($data); - } -} diff --git a/app/admin/logic/WorkbenchLogic.php b/app/admin/logic/WorkbenchLogic.php index f5b85c16..503255a7 100644 --- a/app/admin/logic/WorkbenchLogic.php +++ b/app/admin/logic/WorkbenchLogic.php @@ -14,11 +14,13 @@ namespace app\admin\logic; - +use app\admin\logic\statistic\TradeStatisticLogic; use app\common\logic\BaseLogic; use app\common\model\order\Cart; use app\common\model\store_order\StoreOrder; use app\common\model\store_visit\StoreVisit; +use app\common\model\user\User; +use app\common\model\user\UserVisit; use app\common\service\ConfigService; use app\common\service\FileService; @@ -34,15 +36,31 @@ class WorkbenchLogic extends BaseLogic * @notes 工作套 * @param $adminInfo * @return array - * @author 乔峰 * @date 2021/12/29 15:58 */ public static function index() - { + { + $logic=(new TradeStatisticLogic()); + $storeOrder=(new StoreOrder()); + $user=(new User()); + $userVisit=(new UserVisit()); + $today = $logic->tradeTotalMoney(['create_time' => 'today'], 'sum'); + $month = $logic->tradeTotalMoney(['create_time'=>'month'], 'sum'); + $todayOrder = $storeOrder->where(['paid'=>1])->whereDay('create_time')->count(); + $MonthOrder = $storeOrder->where(['paid'=>1])->whereMonth('create_time')->count(); + $todayUser = $user->whereDay('create_time')->count(); + $MonthUser = $user->whereMonth('create_time')->count(); + $todayUserVisit = $userVisit->whereDay('create_time')->group('uid')->count(); + $MonthUserVisit = $userVisit->whereMonth('create_time')->group('uid')->count(); return [ - - // 常用功能 - + 'today' => $today, //今日销售额 + 'month' => $month, //本月销售额 + 'todayOrder' => $todayOrder, //今日订单量 + 'MonthOrder' => $MonthOrder, //本月订单量 + 'todayUser' => $todayUser, //今日新增用户量 + 'MonthUser' => $MonthUser, //本月新增用户量 + 'todayUserVisit' => $todayUserVisit, //今日活跃用户量 + 'MonthUserVisit' => $MonthUserVisit, //本月活跃用户量 ]; } diff --git a/app/admin/logic/statistic/TradeStatisticLogic.php b/app/admin/logic/statistic/TradeStatisticLogic.php index e362f401..6bc80db5 100644 --- a/app/admin/logic/statistic/TradeStatisticLogic.php +++ b/app/admin/logic/statistic/TradeStatisticLogic.php @@ -5,7 +5,6 @@ namespace app\admin\logic\statistic; use app\common\logic\BaseLogic; use app\common\model\store_order\StoreOrder; use app\common\model\user_recharge\UserRecharge; -use tidy; /** * Class 交易数据 diff --git a/app/common/model/store_order/StoreOrder.php b/app/common/model/store_order/StoreOrder.php index 69cc6a36..9d0fdfb9 100644 --- a/app/common/model/store_order/StoreOrder.php +++ b/app/common/model/store_order/StoreOrder.php @@ -54,6 +54,15 @@ class StoreOrder extends BaseModel public function staff() { return $this->hasOne(SystemStoreStaff::class, 'id', 'staff_id')->bind(['staff_name']); + } + /** + * 总销售额 + * @param $time + * @return float + */ + public function totalSales($where) + { + return $this->where($where)->sum('pay_price'); } /** * 用户趋势数据 From 69cce893c6837161347ff101df4b7c4706dcbde3 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Thu, 20 Jun 2024 14:34:13 +0800 Subject: [PATCH 13/31] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=BF=94=E5=9B=9E=E4=BB=B7=E6=A0=BC=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/lists/product/ProductLists.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/lists/product/ProductLists.php b/app/api/lists/product/ProductLists.php index b79c0608..2b449a45 100644 --- a/app/api/lists/product/ProductLists.php +++ b/app/api/lists/product/ProductLists.php @@ -106,7 +106,7 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface, L $this->searchWhere[] = ['status', '=', 1]; $this->searchWhere[] = ['stock', '>', 0]; return StoreBranchProduct::where($this->searchWhere) - ->field(['id', 'product_id', 'cate_id', 'store_name', 'cost', 'store_id', 'price', 'bar_code', 'image', 'sales', 'store_info', 'delete_time', 'unit', 'batch']) + ->field(['id', 'product_id', 'cate_id', 'store_name', 'cost', 'store_id','vip_price','purchase', 'price', 'bar_code', 'image', 'sales', 'store_info', 'delete_time', 'unit', 'batch']) ->limit($this->limitOffset, $this->limitLength) ->with(['className', 'unitName']) ->order($this->sortOrder) From 67532a536aa3099ecd19125aa263924abce2e884 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 20 Jun 2024 14:37:06 +0800 Subject: [PATCH 14/31] =?UTF-8?q?feat:=20=E9=87=8D=E6=9E=84=E4=BA=86?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9B=B8=E5=85=B3=E7=9A=84=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=92=8C=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/WorkbenchController.php | 191 ------------------ .../logic/statistic/TradeStatisticLogic.php | 93 +-------- app/common/model/store_order/StoreOrder.php | 30 +++ 3 files changed, 39 insertions(+), 275 deletions(-) diff --git a/app/admin/controller/WorkbenchController.php b/app/admin/controller/WorkbenchController.php index ac6070e2..b535b0c8 100644 --- a/app/admin/controller/WorkbenchController.php +++ b/app/admin/controller/WorkbenchController.php @@ -72,197 +72,6 @@ class WorkbenchController extends BaseAdminController return $this->data($result); } - - //首页订单 - public function order() - { - $data = [ - "yAxis" => [ - "maxnum" => 35, - "maxprice" => "111374.41" - ], - "legend" => [ - "订单金额", - "订单数" - ], - "xAxis" => [ - "2024-05-06", - "2024-05-07", - "2024-05-08", - "2024-05-09", - "2024-05-10", - "2024-05-11", - "2024-05-12", - "2024-05-13", - "2024-05-14", - "2024-05-15", - "2024-05-16", - "2024-05-17", - "2024-05-18", - "2024-05-19", - "2024-05-20", - "2024-05-21", - "2024-05-22", - "2024-05-23", - "2024-05-24", - "2024-05-25", - "2024-05-26", - "2024-05-27", - "2024-05-28", - "2024-05-29", - "2024-05-30", - "2024-05-31", - "2024-06-01", - "2024-06-02", - "2024-06-03", - "2024-06-04" - ], - "series" => [ - [ - "name" => "订单金额", - "type" => "bar", - "itemStyle" => [ - "normal" => [ - "color" => [ - "x" => 0, - "y" => 0, - "x2" => 0, - "y2" => 1, - "colorStops" => [ - [ - "offset" => 0, - "color" => "#69cdff" - ], - [ - "offset" => 0.5, - "color" => "#3eb3f7" - ], - [ - "offset" => 1, - "color" => "#1495eb" - ] - ] - ] - ] - ], - "data" => [ - 171.29, - 167.46, - 1455.65, - 45.47, - 542.69, - 216.58, - 228.82, - 34.24, - 8249.85, - 664.23, - 8586.24, - 10.19, - 90.19, - 105.4, - 62.59, - 1051.34, - 160.84, - 2437.68, - 111374.41, - 12161.05, - 189, - 4831.65, - 1276.31, - 582.4, - 906.02, - 597, - 0.08, - 771.16, - 10262.64, - 278.67 - ] - ], - [ - "name" => "订单数", - "type" => "line", - "itemStyle" => [ - "normal" => [ - "color" => [ - "x" => 0, - "y" => 0, - "x2" => 0, - "y2" => 1, - "colorStops" => [ - [ - "offset" => 0, - "color" => "#6fdeab" - ], - [ - "offset" => 0.5, - "color" => "#44d693" - ], - [ - "offset" => 1, - "color" => "#2cc981" - ] - ] - ] - ] - ], - "data" => [ - 5, - 8, - 15, - 6, - 13, - 5, - 3, - 4, - 7, - 14, - 12, - 6, - 2, - 2, - 6, - 8, - 19, - 18, - 13, - 30, - 2, - 35, - 12, - 5, - 20, - 2, - 2, - 7, - 13, - 6 - ], - "yAxisIndex" => 1 - ] - ], - "pre_cycle" => [ - "count" => [ - "data" => 170 - ], - "price" => [ - "data" => "1333354.63" - ] - ], - "cycle" => [ - "count" => [ - "data" => 268, - "percent" => 57.65, - "is_plus" => 1 - ], - "price" => [ - "data" => "157451.54", - "percent" => 88.19, - "is_plus" => -1 - ] - ] - ]; - return $this->data($data); - } //-------------------------------商品统计---------------------------------------// /** diff --git a/app/admin/logic/statistic/TradeStatisticLogic.php b/app/admin/logic/statistic/TradeStatisticLogic.php index 6bc80db5..f49e0949 100644 --- a/app/admin/logic/statistic/TradeStatisticLogic.php +++ b/app/admin/logic/statistic/TradeStatisticLogic.php @@ -24,7 +24,7 @@ class TradeStatisticLogic extends BaseLogic //总交易额 $selectType = "sum"; $tradeTotalMoney = $this->tradeTotalMoney($where, $selectType); - + //交易曲线 $selectType = "group"; $hourTotalMoney = $this->tradeGroupMoney($where, $selectType); @@ -46,26 +46,7 @@ class TradeStatisticLogic extends BaseLogic ]; //今日订单数曲线 - $todayHourOrderCount = $storeOrder->where($orderCountWhere) - ->when(isset($where['timeKey']), function ($query) use ($where) { - $query->whereBetweenTime('create_time', $where['timeKey']['start_time'], $where['timeKey']['end_time']); - if ($where['timeKey']['days'] == 1) { - $timeUinx = "%H"; - } elseif ($where['timeKey']['days'] == 30) { - $timeUinx = "%Y-%m-%d"; - } elseif ($where['timeKey']['days'] == 365) { - $timeUinx = "%Y-%m"; - } elseif ($where['timeKey']['days'] > 1 && $where['timeKey']['days'] < 30) { - $timeUinx = "%Y-%m-%d"; - } elseif ($where['timeKey']['days'] > 30 && $where['timeKey']['days'] < 365) { - $timeUinx = "%Y-%m"; - } else { - $timeUinx = "%Y-%m"; - } - $query->field("count(*) as number,FROM_UNIXTIME(create_time, '$timeUinx') as time"); - $query->group("FROM_UNIXTIME(create_time, '$timeUinx')"); - }) - ->order('create_time ASC')->select()->toArray(); + $todayHourOrderCount = $storeOrder->getCurveData($orderCountWhere, $where, 'count(*)'); $todayHourOrderCount = $this->trendYdata((array)$todayHourOrderCount, $timeKey); //昨日订单数 @@ -87,29 +68,10 @@ class TradeStatisticLogic extends BaseLogic /** day支付人数 */ //今日支付人数 $todayPayOrderPeople = $storeOrder->where($orderCountWhere)->whereDay('create_time')->group('uid')->count(); - + //今日支付人数曲线 - $todayHourOrderPeople = $storeOrder->where($orderCountWhere) - ->when(isset($where['timeKey']), function ($query) use ($where) { - $query->whereBetweenTime('create_time', $where['timeKey']['start_time'], $where['timeKey']['end_time']); - if ($where['timeKey']['days'] == 1) { - $timeUinx = "%H"; - } elseif ($where['timeKey']['days'] == 30) { - $timeUinx = "%Y-%m-%d"; - } elseif ($where['timeKey']['days'] == 365) { - $timeUinx = "%Y-%m"; - } elseif ($where['timeKey']['days'] > 1 && $where['timeKey']['days'] < 30) { - $timeUinx = "%Y-%m-%d"; - } elseif ($where['timeKey']['days'] > 30 && $where['timeKey']['days'] < 365) { - $timeUinx = "%Y-%m"; - } else { - $timeUinx = "%Y-%m"; - } - $query->field("count(distinct uid) as number,FROM_UNIXTIME(create_time, '$timeUinx') as time"); - $query->group("FROM_UNIXTIME(create_time, '$timeUinx')"); - }) - ->order('create_time ASC')->select()->toArray(); - + $todayHourOrderPeople = $storeOrder->getCurveData($orderCountWhere, $where, 'count(distinct uid)'); + $todayHourOrderPeople = $this->trendYdata((array)$todayHourOrderPeople, $where['timeKey']); //昨日支付人数 $yestodayPayOrderPeople = $storeOrder->where($orderCountWhere)->whereDay('create_time', 'yesterday')->group('uid')->count(); @@ -151,26 +113,8 @@ class TradeStatisticLogic extends BaseLogic ]; $monthOrderCount = $storeOrder->where($monthOrderCountWhere)->whereBetweenTime('create_time', $where['timeKey']['start_time'], $where['timeKey']['end_time'])->count(); //本月订单数曲线 - $monthCurveOrderCount = $storeOrder->where($monthOrderCountWhere) - ->when(isset($where['timeKey']), function ($query) use ($where) { - $query->whereBetweenTime('create_time', $where['timeKey']['start_time'], $where['timeKey']['end_time']); - if ($where['timeKey']['days'] == 1) { - $timeUinx = "%H"; - } elseif ($where['timeKey']['days'] == 30) { - $timeUinx = "%Y-%m-%d"; - } elseif ($where['timeKey']['days'] == 365) { - $timeUinx = "%Y-%m"; - } elseif ($where['timeKey']['days'] > 1 && $where['timeKey']['days'] < 30) { - $timeUinx = "%Y-%m-%d"; - } elseif ($where['timeKey']['days'] > 30 && $where['timeKey']['days'] < 365) { - $timeUinx = "%Y-%m"; - } else { - $timeUinx = "%Y-%m"; - } - $query->field("count(*) as number,FROM_UNIXTIME(create_time, '$timeUinx') as time"); - $query->group("FROM_UNIXTIME(create_time, '$timeUinx')"); - }) - ->order('create_time ASC')->select()->toArray(); + $monthCurveOrderCount = $storeOrder->getCurveData($monthOrderCountWhere, $where, 'count(*)'); + $monthCurveOrderCount = $this->trendYdata((array)$monthCurveOrderCount, $timeKey); //上月订单数 $lastOrderCountWhere['timeKey'] = $this->TimeConvert("last_month"); @@ -206,26 +150,7 @@ class TradeStatisticLogic extends BaseLogic $monthPayOrderPeople = $storeOrder->where($monthOrderPeopleWhere)->whereMonth('create_time')->group('uid')->count(); //本月支付人数曲线 - $monthCurveOrderPeople = $storeOrder->where($monthOrderPeopleWhere) - ->when(isset($where['timeKey']), function ($query) use ($where) { - $query->whereBetweenTime('create_time', $where['timeKey']['start_time'], $where['timeKey']['end_time']); - if ($where['timeKey']['days'] == 1) { - $timeUinx = "%H"; - } elseif ($where['timeKey']['days'] == 30) { - $timeUinx = "%Y-%m-%d"; - } elseif ($where['timeKey']['days'] == 365) { - $timeUinx = "%Y-%m"; - } elseif ($where['timeKey']['days'] > 1 && $where['timeKey']['days'] < 30) { - $timeUinx = "%Y-%m-%d"; - } elseif ($where['timeKey']['days'] > 30 && $where['timeKey']['days'] < 365) { - $timeUinx = "%Y-%m"; - } else { - $timeUinx = "%Y-%m"; - } - $query->field("count(distinct uid) as number,FROM_UNIXTIME(create_time, '$timeUinx') as time"); - $query->group("FROM_UNIXTIME(create_time, '$timeUinx')"); - }) - ->order('create_time ASC')->select()->toArray(); + $monthCurveOrderPeople = $storeOrder->getCurveData($monthOrderPeopleWhere, $where, 'count(distinct uid)'); $monthCurveOrderPeople = $this->trendYdata((array)$monthCurveOrderPeople, $timeKey); //上月支付人数 @@ -496,7 +421,7 @@ class TradeStatisticLogic extends BaseLogic /** 收入营业额 */ //商品订单收入 $inOrderMoney = $this->getOrderTotalMoney($where, $selectType, "", $isNum); - + //用户充值收入 $inRechargeMoneyHome = $this->getRechargeTotalMoney($where, $selectType, "", $isNum); diff --git a/app/common/model/store_order/StoreOrder.php b/app/common/model/store_order/StoreOrder.php index 9d0fdfb9..da627b07 100644 --- a/app/common/model/store_order/StoreOrder.php +++ b/app/common/model/store_order/StoreOrder.php @@ -85,4 +85,34 @@ class StoreOrder extends BaseModel })->field("FROM_UNIXTIME(create_time,'$timeType') as days,$str as num") ->group('days')->select()->toArray(); } + /** + * 曲线统计 + * @param $time + * @param $type + * @param $timeType + * @return mixed + */ + public function getCurveData($where,$time,$str) + { + return $this->where($where) + ->when(isset($where['timeKey']), function ($query) use ($time,$str) { + $query->whereBetweenTime('create_time', $time['timeKey']['start_time'], $time['timeKey']['end_time']); + if ($time['timeKey']['days'] == 1) { + $timeUinx = "%H"; + } elseif ($time['timeKey']['days'] == 30) { + $timeUinx = "%Y-%m-%d"; + } elseif ($time['timeKey']['days'] == 365) { + $timeUinx = "%Y-%m"; + } elseif ($time['timeKey']['days'] > 1 && $time['timeKey']['days'] < 30) { + $timeUinx = "%Y-%m-%d"; + } elseif ($time['timeKey']['days'] > 30 && $time['timeKey']['days'] < 365) { + $timeUinx = "%Y-%m"; + } else { + $timeUinx = "%Y-%m"; + } + $query->field("$str as number,FROM_UNIXTIME(create_time, '$timeUinx') as time"); + $query->group("FROM_UNIXTIME(create_time, '$timeUinx')"); + }) + ->order('create_time ASC')->select()->toArray(); + } } From 1051e0c7a9a3c749bdeac53e3fa02d9dbd625741 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Thu, 20 Jun 2024 14:41:04 +0800 Subject: [PATCH 15/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E5=95=86=E5=93=81=E6=8E=92=E8=A1=8C=E7=9B=B8=E5=85=B3=E7=9A=84?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/store/controller/WorkbenchController.php | 31 ++++-- app/store/logic/WorkbenchLogic.php | 111 +++++++++++++++++++ 2 files changed, 134 insertions(+), 8 deletions(-) diff --git a/app/store/controller/WorkbenchController.php b/app/store/controller/WorkbenchController.php index 92188eed..1e6fab09 100644 --- a/app/store/controller/WorkbenchController.php +++ b/app/store/controller/WorkbenchController.php @@ -130,11 +130,12 @@ class WorkbenchController extends BaseAdminController // ApiDoc\Header(ref: [Definitions::class, "token"]), // ApiDoc\ResponseSuccess("data", type: "array"), // ] - public function get_trend(\app\admin\controller\WorkbenchController $workbench) + public function get_trend() { - $params = $this->request->get(); - $params['store_id'] = $this->request->adminInfo['store_id']; - return $workbench->get_trend(); +// $params = $this->request->get(); + $store_id = $this->request->adminInfo['store_id']; + $workbench = WorkbenchLogic::get_trend($store_id); + return $this->data($workbench); } // #[ @@ -148,11 +149,25 @@ class WorkbenchController extends BaseAdminController // ApiDoc\Header(ref: [Definitions::class, "token"]), // ApiDoc\ResponseSuccess("data", type: "array"), // ] - public function get_product_ranking(\app\admin\controller\WorkbenchController $workbench) + public function get_product_ranking() { - $params = $this->request->get(); - $params['store_id'] = $this->request->adminInfo['store_id']; - return $workbench->get_product_ranking(); +// $params = $this->request->get(); + $dateRange = $this->request->get('date'); + // 拆分日期范围 + list($startDate, $endDate) = explode('-', $dateRange); + $startTime = str_replace('/', '-', $startDate); + $endTime = str_replace('/', '-', $endDate); + if (empty($startTime)) { + $startTime = strtotime(date('Y-m-d')); + $endTime = $startTime + 86400; + } + $where = [ + ['create_time', 'between', [$startTime, $endTime]], + ['store_id','=',$this->request->adminInfo['store_id']] + ]; + + $workbench = WorkbenchLogic::get_product_ranking($where); + return $this->data($workbench); } diff --git a/app/store/logic/WorkbenchLogic.php b/app/store/logic/WorkbenchLogic.php index 5b7f8872..e887a4f7 100644 --- a/app/store/logic/WorkbenchLogic.php +++ b/app/store/logic/WorkbenchLogic.php @@ -15,6 +15,7 @@ namespace app\store\logic; +use app\admin\logic\statistic\ProductStatisticLogic; use app\common\enum\OrderEnum; use app\common\enum\PayEnum; use app\common\enum\YesNoEnum; @@ -725,6 +726,116 @@ class WorkbenchLogic extends BaseLogic + /** + * 商品趋势 + */ + public static function get_trend($store_id) + { + $dates = []; + $today = new \DateTime(); + $thirtyDaysAgo = new \DateTime($today->format('Y-m-d')); + $thirtyDaysAgo->modify('-30 days'); + + for ($i = 0; $i < 31; $i++) { + $date = new \DateTime($thirtyDaysAgo->format('Y-m-d')); + $date->modify('+' . $i . ' days'); + $dates[] = $date->format('Y-m-d'); + } + $data = [ + "xAxis" => $dates, + "series" => [ + [ + "name" => "商品浏览量", + "data" => self::store_visit_count($dates,$store_id), + "type" => "line", + "smooth" => "true", + "yAxisIndex" => 1 + ], + [ + "name" => "商品访客量", + "data" => self::store_visit_user($dates,$store_id), + "type" => "line", + "smooth" => "true", + "yAxisIndex" => 1 + ], + [ + "name" => "支付金额", + "data" => self::payPrice($dates,$store_id), + "type" => "bar" + ], + [ + "name" => "退款金额", + "data" => self::refundPrice($dates,$store_id), + "type" => "bar" + ] + ] + ]; + return $data; + + } + + + + /** + * 商品浏览量 + */ + public static function store_visit_count($dates,$store_id) + { + $data = []; + foreach ($dates as $date) { + $data[] = StoreVisit::whereDay('create_time', $date)->where('store_id',$store_id)->cache('store_visit_count_' . $date, 300)->sum('count'); + } + return $data; + } + + + /** + * 商品浏览量 + */ + public static function store_visit_user($dates,$store_id) + { + $data = []; + foreach ($dates as $date) { + $data[] = StoreVisit::whereDay('create_time', $date)->where('store_id',$store_id)->cache('store_visit_user_' . $date, 300)->count('uid'); + } + return $data; + } + + + /** + * 支付金额 + */ + public static function payPrice($dates,$store_id) + { + $data = []; + foreach ($dates as $date) { + $data[] = StoreOrder::whereDay('create_time', $date)->where('store_id',$store_id)->cache('payPrice_' . $date, 300)->where('paid', 1)->where('refund_status', 0)->sum('pay_price'); + } + return $data; + } + + + /** + * 退款金额 + */ + public static function refundPrice($dates,$store_id) + { + $data = []; + foreach ($dates as $date) { + $data[] = StoreOrder::whereDay('create_time', $date)->where('store_id',$store_id)->where('status', 'in', [-1, -2])->cache('refundPrice_' . $date, 300)->where('paid', 1)->sum('pay_price'); + } + return $data; + } + + + + /** + * 获取商品排名数据 + */ + public static function get_product_ranking($where) + { + return (new ProductStatisticLogic())->get_product_ranking($where); + } } From b8038b820af883a1d96ec9b4cbfbe804b9b6ed8a Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 20 Jun 2024 14:45:24 +0800 Subject: [PATCH 16/31] =?UTF-8?q?feat(TradeStatisticLogic):=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9TradeStatisticLogic=EF=BC=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=9C=AC=E6=9C=88=E6=94=AF=E4=BB=98=E4=BA=BA=E6=95=B0=E6=9B=B2?= =?UTF-8?q?=E7=BA=BF=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/statistic/TradeStatisticLogic.php | 1 - app/common/model/store_order/StoreOrder.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/admin/logic/statistic/TradeStatisticLogic.php b/app/admin/logic/statistic/TradeStatisticLogic.php index f49e0949..3f12eb7c 100644 --- a/app/admin/logic/statistic/TradeStatisticLogic.php +++ b/app/admin/logic/statistic/TradeStatisticLogic.php @@ -151,7 +151,6 @@ class TradeStatisticLogic extends BaseLogic //本月支付人数曲线 $monthCurveOrderPeople = $storeOrder->getCurveData($monthOrderPeopleWhere, $where, 'count(distinct uid)'); - $monthCurveOrderPeople = $this->trendYdata((array)$monthCurveOrderPeople, $timeKey); //上月支付人数 // $timeKey = $this->TimeConvert("last_month"); diff --git a/app/common/model/store_order/StoreOrder.php b/app/common/model/store_order/StoreOrder.php index da627b07..f057b50c 100644 --- a/app/common/model/store_order/StoreOrder.php +++ b/app/common/model/store_order/StoreOrder.php @@ -95,7 +95,7 @@ class StoreOrder extends BaseModel public function getCurveData($where,$time,$str) { return $this->where($where) - ->when(isset($where['timeKey']), function ($query) use ($time,$str) { + ->when(isset($time['timeKey']), function ($query) use ($time,$str) { $query->whereBetweenTime('create_time', $time['timeKey']['start_time'], $time['timeKey']['end_time']); if ($time['timeKey']['days'] == 1) { $timeUinx = "%H"; From 6170e98fecca7c2660712c931e986cb9484a396a Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Thu, 20 Jun 2024 15:37:53 +0800 Subject: [PATCH 17/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=9A=84=E6=A0=87=E8=AF=86=E5=92=8C=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=9A=84=E7=9B=B8=E5=85=B3=E6=95=B0=E6=8D=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/user/UserLogic.php | 23 ++++++++++++++++------- app/common/logic/PayNotifyLogic.php | 2 +- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index 3cf62ac2..96d197bb 100644 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -19,6 +19,7 @@ use app\common\enum\YesNoEnum; use app\common\logic\BaseLogic; use app\common\model\finance\CapitalFlow; use app\common\model\store_finance_flow\StoreFinanceFlow; +use app\common\model\store_order\StoreOrder; use app\common\model\user\User; use app\common\model\user\UserAddress; use app\common\model\user\UserRecharge; @@ -189,24 +190,32 @@ class UserLogic extends BaseLogic switch ($params['type']){ case 1: //采购款明细 - $query =CapitalFlow::where(['uid'=>$params['id']]); + $categories = ['user_balance_recharge', 'user_order_purchase_pay']; + $query = CapitalFlow::where('uid', $params['id']) + ->whereIn('category', $categories); $count = $query->count(); $data = $query ->page($params['page_no'],$params['page_size']) ->select()->toArray(); + foreach ($data as &$value){ + if($value['category'] == 'user_order_purchase_pay'){ + $value['order_sn'] = StoreOrder::where('id',$value['link_id'])->value('order_id'); + }elseif($value['category'] == 'user_balance_recharge'){ + $value['order_sn'] = UserRecharge::where('id',$value['link_id'])->value('order_id'); + } + } break; case 2: //余额明细 - - $query = StoreFinanceFlow::with(['store']) - ->where([ - 'other_uid'=>$params['id'],'financial_type'=> OrderEnum::VIP_ORDER_OBTAINS, - 'financial_pm'=>YesNoEnum::YES - ]); + $query = CapitalFlow::where('uid', $params['id']) + ->where('category', 'user_order_balance_pay'); $count = $query->count(); $data = $query ->page($params['page_no'],$params['page_size']) ->select()->toArray(); + foreach ($data as &$value){ + $value['order_sn'] = StoreOrder::where('id',$value['link_id'])->value('order_id'); + } break; case 3: diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index a7aa5945..4db3e083 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -86,7 +86,7 @@ class PayNotifyLogic extends BaseLogic } } $capitalFlowDao = new CapitalFlowLogic($user); - $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order['pay_price'],'',0,$order['store_id']); + $capitalFlowDao->userExpense('user_order_balance_pay', 'order', $order['id'], $order['pay_price'],'',0,$order['store_id']); // self::afterPay($order); // Redis::send('push-platform-print', ['id' => $order['id']], 60); // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); From 6b29a324703653ac67b8dac792e11b1fe6f66152 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Thu, 20 Jun 2024 15:54:01 +0800 Subject: [PATCH 18/31] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/validate/CartValidate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/validate/CartValidate.php b/app/api/validate/CartValidate.php index cf9a3661..bc84fc75 100644 --- a/app/api/validate/CartValidate.php +++ b/app/api/validate/CartValidate.php @@ -19,7 +19,7 @@ class CartValidate extends BaseValidate * @var string[] */ protected $rule = [ - 'cart_num' => 'require|number', + 'cart_num' => 'require', 'product_attr_unique' => 'require', 'store_id' => 'require|number', 'staff_id' => 'require|number', From 85a8d1809fc41d43db08658c6d44d9db0f84e1a8 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Thu, 20 Jun 2024 15:55:41 +0800 Subject: [PATCH 19/31] =?UTF-8?q?=E9=99=90=E5=88=B6=E6=9C=80=E4=BD=8E?= =?UTF-8?q?=E4=BB=98=E6=AC=BE=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/order/OrderLogic.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index dcfa9efa..260b9ad2 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -134,6 +134,9 @@ class OrderLogic extends BaseLogic }else{ $pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额 } + if($pay_price < 500){ + throw new Exception('金额低于500'); + } $vipPrice = 0; //成本价 收益 From 3ab512f49d0028810990c3270974dcd2cdde3994 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Thu, 20 Jun 2024 16:35:33 +0800 Subject: [PATCH 20/31] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=B4=AD=E7=89=A9?= =?UTF-8?q?=E8=BD=A6=E9=99=84=E5=8A=A0=E5=95=86=E5=93=81=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/order/CartLogic.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/api/logic/order/CartLogic.php b/app/api/logic/order/CartLogic.php index ad3ee17c..8afb470b 100644 --- a/app/api/logic/order/CartLogic.php +++ b/app/api/logic/order/CartLogic.php @@ -5,6 +5,7 @@ namespace app\api\logic\order; use app\common\model\order\Cart; use app\common\logic\BaseLogic; +use app\common\model\store_product_log\StoreProductLog; use think\facade\Db; @@ -32,7 +33,7 @@ class CartLogic extends BaseLogic } Db::startTrans(); try { - Cart::create([ + $cart = Cart::create([ 'uid' => $params['uid'], 'type' => $params['type']??'', 'product_id' => $params['product_id'], @@ -42,6 +43,15 @@ class CartLogic extends BaseLogic 'cart_num' => $params['cart_num'], 'is_new' => $params['is_new']??0, ]); + StoreProductLog::create([ + 'type'=>'cart', + 'uid' => $params['uid'], + 'cart_id' => $cart['id'], + 'store_id' => $params['store_id']??0, + 'visit_num' => 1, + 'product_id' => $params['product_id'], + 'cart_num' => $params['cart_num'], + ]); Db::commit(); return true; } catch (\Exception $e) { From 8fadc9fdd776272f640da49dc5f18eae68486672 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 20 Jun 2024 17:27:50 +0800 Subject: [PATCH 21/31] =?UTF-8?q?feat(OrderEnum):=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9E=9A=E4=B8=BE=E7=B1=BB=E5=9E=8B=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StoreFinanceFlowLists.php | 45 ++++-- app/common/enum/OrderEnum.php | 4 +- .../controller/finance/FinanceController.php | 33 +---- .../StoreFinanceFlowLists.php | 129 ++++++++++++++++++ 4 files changed, 173 insertions(+), 38 deletions(-) create mode 100644 app/store/lists/store_finance_flow/StoreFinanceFlowLists.php diff --git a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php index fd996b83..a78400e8 100644 --- a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php +++ b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php @@ -32,8 +32,8 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt { return [ '=' => ['store_id', 'user_id', 'create_time', 'staff_id'], - 'between_time'=>'create_time', - '%pipe_like%' => ['keyword'=>'order_sn'], + 'between_time' => 'create_time', + '%pipe_like%' => ['keyword' => 'order_sn'], ]; } @@ -49,7 +49,13 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt */ public function lists(): array { - return StoreFinanceFlow::where($this->searchWhere) + $field = [ + 'id','order_id', 'order_sn', 'create_time', 'other_uid', 'user_id', 'store_id', 'staff_id', 'financial_type', 'financial_pm', 'pay_type', 'type', 'number', 'status' + ]; + $this->searchWhere[] = ['financial_type', '=', 1]; + $this->searchWhere[] = ['financial_pm', '=', 1]; + $data = StoreFinanceFlow::where($this->searchWhere) + ->field($field) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function ($item) { @@ -64,16 +70,40 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt } if ($item['financial_pm'] == 0) { $item['number'] = '-' . $item['number']; - $item['financial_type_name'] = '订单支出:'.OrderEnum::getFinancialType($item['financial_type']); + $item['financial_type_name'] = '订单支出:' . OrderEnum::getFinancialType($item['financial_type']); } else { - $item['financial_type_name'] = OrderEnum::getFinancialType($item['financial_type']).'获得'; + $item['financial_type_name'] = OrderEnum::getFinancialType($item['financial_type']) . '获得'; $item['number'] = '+' . $item['number']; } $item['staff_name'] = SystemStoreStaff::where('id', $item['staff_id'])->value('staff_name'); $item['store_name'] = $item['store_id'] > 0 ? SystemStore::where('id', $item['store_id'])->value('name') : ''; $item['pay_type_name'] = PayEnum::getPaySceneDesc($item['pay_type']); - }) - ->toArray(); + })->toArray(); + + foreach ($data as $key => $item) { + $data[$key]['list'] = StoreFinanceFlow::where('order_id' ,$item['order_id'])->where('financial_type','>', 1)->field($field)->order('financial_pm','desc')->select()->each(function ($item) { + if ($item['user_id'] <= 0) { + $item['nickname'] = '游客'; + } else { + $id = $item['user_id']; + $item['nickname'] = User::where('id', $item['user_id'])->value('nickname') . "|$id"; + } + if (!empty($this->request->adminInfo['store_id'])) { + $item['financial_pm'] = $item['financial_pm'] == 0 ? 1 : 0; + } + if ($item['financial_pm'] == 0) { + $item['number'] = '-' . $item['number']; + $item['financial_type_name'] = '订单支出:' . OrderEnum::getFinancialType($item['financial_type']); + } else { + $item['financial_type_name'] = OrderEnum::getFinancialType($item['financial_type']) . '获得'; + $item['number'] = '+' . $item['number']; + } + $item['staff_name'] = SystemStoreStaff::where('id', $item['staff_id'])->value('staff_name'); + $item['store_name'] = $item['store_id'] > 0 ? SystemStore::where('id', $item['store_id'])->value('name') : ''; + $item['pay_type_name'] = PayEnum::getPaySceneDesc($item['pay_type']); + }); + } + return $data; } @@ -87,5 +117,4 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt { return StoreFinanceFlow::where($this->searchWhere)->count(); } - } diff --git a/app/common/enum/OrderEnum.php b/app/common/enum/OrderEnum.php index 8a5ca32e..e1179447 100644 --- a/app/common/enum/OrderEnum.php +++ b/app/common/enum/OrderEnum.php @@ -146,13 +146,13 @@ class OrderEnum public static function getFinancialType($value = true) { $data = [ - self::USER_ORDER_PAY => '用户订单支付', + self::USER_ORDER_PAY => '订单支付', self::MERCHANT_ORDER_PAY => '商户订单支付', self::PLATFORM_ORDER_PAY => '平台订单支付', self::MERCHANT_ORDER_OBTAINS => '商户', self::ORDER_HANDLING_FEES => '手续费', self::PLATFORM_ORDER_OBTAINS => '平台', - self::SUPPLIER_ORDER_OBTAINS => '供应商', + self::SUPPLIER_ORDER_OBTAINS => '成本', self::SYSTEM_SET => '平台设置', self::VILLAGE_ORDER_OBTAINS => '村长', self::BRIGADE_ORDER_OBTAINS=>'队长', diff --git a/app/store/controller/finance/FinanceController.php b/app/store/controller/finance/FinanceController.php index fb0e2f2e..54eee312 100644 --- a/app/store/controller/finance/FinanceController.php +++ b/app/store/controller/finance/FinanceController.php @@ -2,41 +2,18 @@ namespace app\store\controller\finance; -use app\admin\lists\store_finance_flow\StoreFinanceFlowLists; -use app\common\controller\Definitions; + use app\common\logic\StoreFinanceFlowLogic; use app\store\controller\BaseAdminController; +use app\store\lists\store_finance_flow\StoreFinanceFlowLists; // #[ApiDoc\title('财务')] class FinanceController extends BaseAdminController { - // #[ - // ApiDoc\Title('财务流水'), - // ApiDoc\url('/store/finance/finance/lists'), - // ApiDoc\Method('GET'), - // ApiDoc\NotHeaders(), - // ApiDoc\Author('中国队长'), - // ApiDoc\Query(name: 'keyword', type: 'string', require: false, desc: '订单编号'), - // ApiDoc\Query(name: 'staff_id', type: 'int', require: false, desc: '店员id'), - // ApiDoc\Query(name: 'start_time', type: 'string', require: false, desc: '开始时间'), - // ApiDoc\Query(name: 'end_time', type: 'string', require: false, desc: '结束时间'), - // ApiDoc\Header(ref: [Definitions::class, "token"]), - // ApiDoc\Query(ref: [Definitions::class, "page"]), - // ApiDoc\ResponseSuccess("data", type: "array", children: [ - // ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], - // ['name' => 'financial_record_sn', 'desc' => '流水号', 'type' => 'string'], - // ['name' => 'order_sn', 'desc' => '订单号', 'type' => 'string'], - // ['name' => 'number', 'desc' => '金额', 'type' => 'float'], - // ['name' => 'create_time', 'desc' => '创建时间', 'type' => 'string'], - // ['name' => 'nickname', 'desc' => '用户昵称', 'type' => 'string'], - // ['name' => 'staff_name', 'desc' => '店员', 'type' => 'string'], - // ['name' => 'store_name', 'desc' => '店铺名称', 'type' => 'string'], - // ['name' => 'pay_type_name', 'desc' => '支付方式', 'type' => 'string'], - // ['name' => 'financial_type_name', 'desc' => '流水类型', 'type' => 'string'], - // ['name' => 'remark', 'desc' => '备注', 'type' => 'string'], - // ]), - // ] + /** + * 门店流水 + */ public function lists() { return $this->dataLists(new StoreFinanceFlowLists()); diff --git a/app/store/lists/store_finance_flow/StoreFinanceFlowLists.php b/app/store/lists/store_finance_flow/StoreFinanceFlowLists.php new file mode 100644 index 00000000..f8b385e7 --- /dev/null +++ b/app/store/lists/store_finance_flow/StoreFinanceFlowLists.php @@ -0,0 +1,129 @@ + ['store_id', 'user_id', 'create_time', 'staff_id'], + 'between_time' => 'create_time', + '%pipe_like%' => ['keyword' => 'order_sn'], + ]; + } + + + /** + * @notes 获取门店流水列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author admin + * @date 2024/05/31 16:56 + */ + public function lists(): array + { + $field = [ + 'id', 'order_id', 'order_sn', 'create_time', 'other_uid', 'user_id', 'store_id', 'staff_id', 'financial_type', 'financial_pm', 'pay_type', 'type', 'number', 'status' + ]; + $this->searchWhere[] = ['financial_type', '=', 1]; + $this->searchWhere[] = ['financial_pm', '=', 1]; + $data = StoreFinanceFlow::where($this->searchWhere) + ->field($field) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function ($item) { + if ($item['user_id'] <= 0) { + $item['nickname'] = '游客'; + } else { + $id = $item['user_id']; + $item['nickname'] = User::where('id', $item['user_id'])->value('nickname') . "|$id"; + } + if (!empty($this->request->adminInfo['store_id'])) { + $item['financial_pm'] = $item['financial_pm'] == 0 ? 1 : 0; + } + if ($item['financial_pm'] == 0) { + $item['number'] = '-' . $item['number']; + $item['financial_type_name'] = '订单支出:' . OrderEnum::getFinancialType($item['financial_type']); + } else { + $item['financial_type_name'] = OrderEnum::getFinancialType($item['financial_type']) . '获得'; + $item['number'] = '+' . $item['number']; + } + $item['staff_name'] = SystemStoreStaff::where('id', $item['staff_id'])->value('staff_name'); + $item['store_name'] = $item['store_id'] > 0 ? SystemStore::where('id', $item['store_id'])->value('name') : ''; + $item['pay_type_name'] = PayEnum::getPaySceneDesc($item['pay_type']); + })->toArray(); + + foreach ($data as $key => $item) { + $list1= StoreFinanceFlow::where('order_id', $item['order_id'])->where('financial_type', '>', 1) + ->where('financial_pm', 0) + ->field($field)->order('financial_pm', 'desc')->select()->each(function ($item) { + if ($item['user_id'] <= 0) { + $item['nickname'] = '游客'; + } else { + $id = $item['user_id']; + $item['nickname'] = User::where('id', $item['user_id'])->value('nickname') . "|$id"; + } + $item['number'] = '-' . $item['number']; + $item['financial_type_name'] = '订单支出:' . OrderEnum::getFinancialType($item['financial_type']); + $item['staff_name'] = SystemStoreStaff::where('id', $item['staff_id'])->value('staff_name'); + $item['store_name'] = $item['store_id'] > 0 ? SystemStore::where('id', $item['store_id'])->value('name') : ''; + $item['pay_type_name'] = PayEnum::getPaySceneDesc($item['pay_type']); + }); + $list2= StoreFinanceFlow::where('order_id', $item['order_id'])->where('financial_type' ,2) + ->where('financial_pm', 1) + ->field($field)->order('financial_pm', 'desc')->select()->each(function ($item) { + if ($item['user_id'] <= 0) { + $item['nickname'] = '游客'; + } else { + $id = $item['user_id']; + $item['nickname'] = User::where('id', $item['user_id'])->value('nickname') . "|$id"; + } + $item['financial_type_name'] = OrderEnum::getFinancialType($item['financial_type']) . '获得'; + $item['number'] = '+' . $item['number']; + $item['staff_name'] = SystemStoreStaff::where('id', $item['staff_id'])->value('staff_name'); + $item['store_name'] = $item['store_id'] > 0 ? SystemStore::where('id', $item['store_id'])->value('name') : ''; + $item['pay_type_name'] = PayEnum::getPaySceneDesc($item['pay_type']); + }); + $data[$key]['list'] = array_merge($list1->toArray(), $list2->toArray()); + } + return $data; + } + + + /** + * @notes 获取门店流水数量 + * @return int + * @author admin + * @date 2024/05/31 16:56 + */ + public function count(): int + { + return StoreFinanceFlow::where($this->searchWhere)->count(); + } +} From 36d1131c3e6c11bdd099ff2353caf485a1b4fac7 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Thu, 20 Jun 2024 17:30:23 +0800 Subject: [PATCH 22/31] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=90=8E=E9=80=9A=E7=94=A8=E5=95=86=E5=93=81?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/order/OrderLogic.php | 2 +- app/common/logic/PayNotifyLogic.php | 46 +++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 260b9ad2..23cd8673 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -192,7 +192,7 @@ class OrderLogic extends BaseLogic } $_order = $orderInfo['order']; $_order['uid'] = $user['id']; - $_order['spread_uid'] =$params['spread_uid']??0;// UserSpreadLog::where('uid',request()->userId)->value('old_spread_uid')??0;//预留分享关系 + $_order['spread_uid'] =$params['spread_uid']??0; $_order['real_name'] = $user['real_name']; $_order['mobile'] = $user['mobile']; $_order['pay_type'] = $orderInfo['order']['pay_type']; diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 4db3e083..7581ad44 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -12,6 +12,7 @@ use app\common\model\pay\PayNotify; use app\common\model\store_finance_flow\StoreFinanceFlow; use app\common\model\store_order\StoreOrder; use app\common\model\store_order_cart_info\StoreOrderCartInfo; +use app\common\model\store_product_log\StoreProductLog; use app\common\model\system_store\SystemStore; use app\common\model\user\User; use app\common\model\user\UserAddress; @@ -87,6 +88,7 @@ class PayNotifyLogic extends BaseLogic } $capitalFlowDao = new CapitalFlowLogic($user); $capitalFlowDao->userExpense('user_order_balance_pay', 'order', $order['id'], $order['pay_price'],'',0,$order['store_id']); + self::dealProductLog($order); // self::afterPay($order); // Redis::send('push-platform-print', ['id' => $order['id']], 60); // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); @@ -133,6 +135,7 @@ class PayNotifyLogic extends BaseLogic ]; OrderLogic::writeOff($params); } + self::dealProductLog($order); // self::afterPay($order); // Redis::send('push-platform-print', ['id' => $order['id']], 60); @@ -171,6 +174,7 @@ class PayNotifyLogic extends BaseLogic $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order->pay_price, '', 1,$order['store_id']); } + self::dealProductLog($order); // if ($order->pay_type == 9) { // $extra['create_time'] = $order['create_time']; @@ -268,6 +272,7 @@ class PayNotifyLogic extends BaseLogic self::afterPay($order); $cashFlowLogic = new CashFlowLogic(); $cashFlowLogic->insert($order['store_id'], $order['pay_price']); + self::dealProductLog($order); // Redis::send('push-platform-print', ['id' => $order['id']]); } @@ -298,6 +303,7 @@ class PayNotifyLogic extends BaseLogic $order->status = 2; self::afterPay($order); } + self::dealProductLog($order); // if ($order->pay_type == 9) { // $extra['create_time'] = $order['create_time']; @@ -552,4 +558,44 @@ class PayNotifyLogic extends BaseLogic return true; } + /** + * 商品统计逻辑 + * @param $order + * @return true + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + */ + public static function dealProductLog($order) + { + $store_id = $order['store_id']; + $cart_id = $order['cart_id']; + $uid = $order['uid']; + if($uid && $cart_id && $store_id){ + $cart_id = explode(',',$cart_id); + $productLog = StoreProductLog::where([ + 'uid'=>$uid + ])->whereIn('cart_id',$cart_id) + ->select()->toArray(); + + foreach ($productLog as &$value){ + $value['pay_uid'] = $uid; + $value['oid'] = $order['id']; + $cart_info = StoreOrderCartInfo::where([ + 'uid'=>$uid,'old_cart_id'=>$value['cart_id'],'store_id'=>$store_id + ])->find(); + $value['order_num'] = $cart_info['cart_num']??1; + $value['pay_num'] = $cart_info['cart_num']??1; + $value['pay_price'] = $cart_info['price']??0; + $value['cost_price'] = $cart_info['cart_info']['cost']??0; + $value['update_time'] = time(); + unset($value['create_time'],$value['delete_time']); + } + + (new StoreProductLog())->saveAll($productLog); + } + return true; + + } + } From 7d56ff9fbd0bb4fd6d429da2557d89f176ec7ad3 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Thu, 20 Jun 2024 17:32:31 +0800 Subject: [PATCH 23/31] =?UTF-8?q?=E6=94=B6=E9=93=B6=E6=9C=BA=E4=B8=8B?= =?UTF-8?q?=E5=8D=95=E9=87=91=E9=A2=9D=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/store_order/StoreOrderLogic.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/common/logic/store_order/StoreOrderLogic.php b/app/common/logic/store_order/StoreOrderLogic.php index b5e6bf98..b892b808 100644 --- a/app/common/logic/store_order/StoreOrderLogic.php +++ b/app/common/logic/store_order/StoreOrderLogic.php @@ -118,6 +118,10 @@ class StoreOrderLogic extends BaseLogic $pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额 $activity_string = '减免'; } + + if($pay_price < 500){ + throw new \think\Exception('金额低于500'); + } $vipPrice = 0; //成本价 收益 From 1c524f97b96b6130ea89eebe3cc3c978b5ebbc21 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 20 Jun 2024 17:34:51 +0800 Subject: [PATCH 24/31] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E6=89=8B=E7=BB=AD=E8=B4=B9=E6=94=B6=E5=85=A5=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/PayNotifyLogic.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 4db3e083..0d568900 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -378,6 +378,7 @@ class PayNotifyLogic extends BaseLogic if ($deposit > $store_profit) { if ($store_profit > 0) { $financeLogic->out($transaction_id, $store_profit, OrderEnum::ORDER_MARGIN, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + $financeLogic->in($transaction_id, 0, OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); //平台手续费 } } else { $money = bcsub($store_profit, $deposit, 2); From d61932c7fd11e806d1f1feab93a6184403ac10c5 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Thu, 20 Jun 2024 17:35:52 +0800 Subject: [PATCH 25/31] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lists/store_branch_product/StoreBranchProductLists.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/admin/lists/store_branch_product/StoreBranchProductLists.php b/app/admin/lists/store_branch_product/StoreBranchProductLists.php index c5b70125..ff127b72 100644 --- a/app/admin/lists/store_branch_product/StoreBranchProductLists.php +++ b/app/admin/lists/store_branch_product/StoreBranchProductLists.php @@ -63,7 +63,7 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI } return StoreBranchProduct::where($this->searchWhere)->where($where) - ->field(['id','store_id','product_id', 'image', 'store_name', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost','purchase', 'status']) + ->field(['id','store_id','product_id', 'image', 'store_name', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost','purchase', 'status','batch','vip_price']) ->when(!empty($this->adminInfo['store_id']), function ($query) { $query->where('store_id', $this->adminInfo['store_id']); }) From a8e0cd003a23e4f6310fccd53904c50745a3dc9b Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 20 Jun 2024 17:43:51 +0800 Subject: [PATCH 26/31] =?UTF-8?q?feat(system=5Fstore=5Fstorage):=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=B9=E6=8D=AE=E7=8A=B6=E6=80=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system_store_storage/SystemStoreStorageController.php | 1 + .../lists/system_store_storage/SystemStoreStorageLists.php | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/store/controller/system_store_storage/SystemStoreStorageController.php b/app/store/controller/system_store_storage/SystemStoreStorageController.php index b910e9a4..be310492 100644 --- a/app/store/controller/system_store_storage/SystemStoreStorageController.php +++ b/app/store/controller/system_store_storage/SystemStoreStorageController.php @@ -28,6 +28,7 @@ class SystemStoreStorageController extends BaseAdminController // ] public function lists() { + $this->request->__set('status',-1); return $this->dataLists(new SystemStoreStorageLists()); } diff --git a/app/store/lists/system_store_storage/SystemStoreStorageLists.php b/app/store/lists/system_store_storage/SystemStoreStorageLists.php index c31918b0..bf3f6a85 100644 --- a/app/store/lists/system_store_storage/SystemStoreStorageLists.php +++ b/app/store/lists/system_store_storage/SystemStoreStorageLists.php @@ -46,10 +46,13 @@ class SystemStoreStorageLists extends BaseAdminDataLists implements ListsSearchI public function lists(): array { $this->searchWhere[] = ['store_id','=',$this->adminInfo['store_id']];//只显示当前门店的入库记录 + if($this->request->__get('status')==-1){ + $this->searchWhere[] = ['status','>',0]; + } return SystemStoreStorage::where($this->searchWhere) ->field(['id', 'store_id', 'admin_id', 'staff_id', 'product_id', 'nums','mark', 'status']) ->limit($this->limitOffset, $this->limitLength) - ->order(['id' => 'desc']) + ->order(['status' => 'aes']) ->select()->each(function ($item) { $item['system_store_name'] = SystemStore::where('id', $item['store_id'])->value('name'); $item['admin_name'] = Admin::where('id', $item['admin_id'])->value('name'); From 9e3033739947c3cebbb3e2a91cdc12cbe2f0a879 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Thu, 20 Jun 2024 17:45:36 +0800 Subject: [PATCH 27/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/statistic/ProductStatisticLogic.php | 5 +++-- app/common/model/store_product_log/StoreProductLog.php | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/admin/logic/statistic/ProductStatisticLogic.php b/app/admin/logic/statistic/ProductStatisticLogic.php index 51dc3f67..04e7f95c 100644 --- a/app/admin/logic/statistic/ProductStatisticLogic.php +++ b/app/admin/logic/statistic/ProductStatisticLogic.php @@ -14,8 +14,9 @@ class ProductStatisticLogic extends BaseLogic public function get_product_ranking($where) { - $list = StoreProductLog::where($where)->with('storeName') + $list = StoreProductLog::where($where)->with('store') ->field([ + 'store_id', 'product_id', 'SUM(visit_num) as visit', 'COUNT(distinct(uid)) as user', @@ -30,7 +31,7 @@ class ProductStatisticLogic extends BaseLogic 'COUNT(distinct(pay_uid))-1 as repeats' ])->group('product_id')->order('pay' . ' desc')->limit(20)->select()->toArray(); foreach ($list as $key => &$item) { - if (!$item['store_name'] || !$item['image']) { + if (!$item['store_name']) { unset($list[$key]); } if ($item['profit'] == null) $item['profit'] = 0; diff --git a/app/common/model/store_product_log/StoreProductLog.php b/app/common/model/store_product_log/StoreProductLog.php index 7d94bde8..6c17971e 100644 --- a/app/common/model/store_product_log/StoreProductLog.php +++ b/app/common/model/store_product_log/StoreProductLog.php @@ -4,6 +4,7 @@ namespace app\common\model\store_product_log; use app\common\model\BaseModel; +use app\common\model\system_store\SystemStore; use think\model\concern\SoftDelete; @@ -18,6 +19,11 @@ class StoreProductLog extends BaseModel protected $name = 'store_product_log'; protected $deleteTime = 'delete_time'; + public function store() + { + return $this->hasOne(SystemStore::class, 'id', 'store_id') + ->bind(['store_name' => 'name', 'store_phone' => 'phone', 'store_detailed_address' => 'detailed_address', 'store_simple_address' => 'address']); + } } \ No newline at end of file From adbfdbd61882d1a0bcde9e67bf62c154bf7c5ccf Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Thu, 20 Jun 2024 18:02:20 +0800 Subject: [PATCH 28/31] =?UTF-8?q?=E8=B5=B7=E6=89=B9=E4=BB=B7=E9=99=90?= =?UTF-8?q?=E5=88=B6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/order/CartController.php | 10 ++++++++++ app/store/controller/cart/CartController.php | 9 +++++++++ 2 files changed, 19 insertions(+) diff --git a/app/api/controller/order/CartController.php b/app/api/controller/order/CartController.php index 7c74e03f..0f0346d9 100644 --- a/app/api/controller/order/CartController.php +++ b/app/api/controller/order/CartController.php @@ -25,6 +25,16 @@ class CartController extends BaseApiController $params = (new CartValidate())->post()->goCheck('add'); $params['uid'] = $this->request->userId; $result = Cart::where(['uid' => $params['uid'], 'store_id' => $params['store_id'], 'product_id' => $params['product_id'], 'is_fail' => 0, 'is_pay' => 0,'delete_time' => null])->find(); + + //判断起批发价 + $batch = StoreBranchProduct::where( + ['product_id'=>$params['product_id'], + 'store_id' => $params['store_id'] + ] + )->value('batch'); + if($params['cart_num'] < $batch){ + return $this->fail('起批发量低于最低值'.$batch); + } $count = Cart::where(['uid' => $params['uid'], 'delete_time' => null, 'is_pay' => 0])->count(); if ($count > 100) { return $this->fail('购物车商品不能大于100个，请先结算'); diff --git a/app/store/controller/cart/CartController.php b/app/store/controller/cart/CartController.php index 1e3ae32f..ae4587ee 100644 --- a/app/store/controller/cart/CartController.php +++ b/app/store/controller/cart/CartController.php @@ -28,6 +28,15 @@ class CartController extends BaseAdminController $params['staff_id'] = $adminInfo['admin_id']; $params['store_id'] = $adminInfo['store_id']; $result = Cart::where(['uid' => 0,'staff_id'=>$adminInfo['admin_id'], 'store_id' => $adminInfo['store_id'], 'product_id' => $params['product_id'], 'is_fail' => 0, 'is_pay' => 0])->find(); + //判断起批发价 + $batch = StoreBranchProduct::where( + ['product_id'=>$params['product_id'], + 'store_id' => $adminInfo['store_id'] + ] + )->value('batch'); + if($params['cart_num'] < $batch){ + return $this->fail('起批发量低于最低值'.$batch); + } $count = Cart::where(['uid' => $params['uid'], 'is_pay' => 0])->count(); if ($count > 100) { return $this->fail('购物车商品不能大于100个，请先结算'); From 6db0b6fc47c29c5831038e706da01fdb84a17f32 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 20 Jun 2024 18:13:20 +0800 Subject: [PATCH 29/31] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E8=AE=B0=E5=BD=95=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=B4=A2=E5=8A=A1=E6=B5=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StoreFinanceFlowLists.php | 16 +++++++++++++- app/common/logic/PayNotifyLogic.php | 22 +++++++++++++++++++ app/common/model/user_sign/UserSign.php | 2 +- 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php index a78400e8..3bf1fb6b 100644 --- a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php +++ b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php @@ -11,6 +11,7 @@ use app\common\lists\ListsSearchInterface; use app\common\model\system_store\SystemStore; use app\common\model\system_store\SystemStoreStaff; use app\common\model\user\User; +use app\common\model\user_sign\UserSign; use think\db\Query; /** @@ -81,7 +82,7 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt })->toArray(); foreach ($data as $key => $item) { - $data[$key]['list'] = StoreFinanceFlow::where('order_id' ,$item['order_id'])->where('financial_type','>', 1)->field($field)->order('financial_pm','desc')->select()->each(function ($item) { + $list1= StoreFinanceFlow::where('order_id' ,$item['order_id'])->where('financial_type','>', 1)->field($field)->order('financial_pm','desc')->select()->each(function ($item) { if ($item['user_id'] <= 0) { $item['nickname'] = '游客'; } else { @@ -102,6 +103,19 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt $item['store_name'] = $item['store_id'] > 0 ? SystemStore::where('id', $item['store_id'])->value('name') : ''; $item['pay_type_name'] = PayEnum::getPaySceneDesc($item['pay_type']); }); + $list2=UserSign::where('order_id',$item['order_sn'])->whereIn('user_ship',[2,3])->select(); + foreach($list2 as $k=>$v){ + $list2[$k]['id']='jf'.$v['id']; + $list2[$k]['order_sn']=$item['order_sn']; + $list2[$k]['store_name']=$item['store_name']; + $list2[$k]['financial_pm']=0; + $list2[$k]['nickname']=$v['uid']>0?User::where('id', $v['uid'])->value('nickname') . '|'.$v['uid']:'游客'; + $list2[$k]['number']='+'.$v['number']; + $list2[$k]['financial_type_name']=$v['title']; + $list2[$k]['pay_type_name'] = PayEnum::getPaySceneDesc($item['pay_type']); + + } + $data[$key]['list']=array_merge($list1->toArray(),$list2->toArray()); } return $data; } diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 181ce6c1..68923404 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -453,6 +453,8 @@ class PayNotifyLogic extends BaseLogic 'title' => '村长订单获得兑换券', 'store_id' => $order['store_id'], 'number' => $fees, + 'financial_pm' => 1, + 'user_ship' => 2, ]; $sing[] = [ 'uid' => $brigade_uid, @@ -460,6 +462,26 @@ class PayNotifyLogic extends BaseLogic 'title' => '队长订单获得兑换券', 'store_id' => $order['store_id'], 'number' => $fees, + 'financial_pm' => 1, + 'user_ship' => 3, + ]; + $sing[] = [ + 'uid' => $village_uid, + 'order_id' => $order['order_id'], + 'title' => '订单扣除兑换券', + 'store_id' => $order['store_id'], + 'number' => $fees, + 'financial_pm' => 0, + 'user_ship' => 2, + ]; + $sing[] = [ + 'uid' => $brigade_uid, + 'order_id' => $order['order_id'], + 'title' => '订单扣除兑换券', + 'store_id' => $order['store_id'], + 'number' => $fees, + 'financial_pm' => 0, + 'user_ship' => 3, ]; // if ($village_uid > 0) { // $financeLogic->other_arr['vip_uid'] = $village_uid; diff --git a/app/common/model/user_sign/UserSign.php b/app/common/model/user_sign/UserSign.php index db0ade17..70fcef24 100644 --- a/app/common/model/user_sign/UserSign.php +++ b/app/common/model/user_sign/UserSign.php @@ -8,7 +8,7 @@ use think\model\concern\SoftDelete; /** - * 计量单位 + * 积分记录 * Class UserSign * @package app\common\model\user_sign */ From 19d4d0478b39442f3f61318ed97e30e886943d1d Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Thu, 20 Jun 2024 18:30:07 +0800 Subject: [PATCH 30/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/lists/product/ProductLists.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/api/lists/product/ProductLists.php b/app/api/lists/product/ProductLists.php index 2b449a45..8a124d66 100644 --- a/app/api/lists/product/ProductLists.php +++ b/app/api/lists/product/ProductLists.php @@ -107,10 +107,12 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface, L $this->searchWhere[] = ['stock', '>', 0]; return StoreBranchProduct::where($this->searchWhere) ->field(['id', 'product_id', 'cate_id', 'store_name', 'cost', 'store_id','vip_price','purchase', 'price', 'bar_code', 'image', 'sales', 'store_info', 'delete_time', 'unit', 'batch']) - ->limit($this->limitOffset, $this->limitLength) ->with(['className', 'unitName']) ->order($this->sortOrder) - ->select()?->toArray(); +// ->limit($this->limitOffset, $this->limitLength) + ->page($this->limitOffset +1,$this->limitLength) + ->select()->toArray(); + } From aeb74daca9e8a6dec406f4bbf9a1eea157b61a77 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Thu, 20 Jun 2024 18:47:22 +0800 Subject: [PATCH 31/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=95=86=E5=93=81?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/lists/product/ProductLists.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/api/lists/product/ProductLists.php b/app/api/lists/product/ProductLists.php index 8a124d66..f8e21993 100644 --- a/app/api/lists/product/ProductLists.php +++ b/app/api/lists/product/ProductLists.php @@ -63,7 +63,7 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface, L */ public function setDefaultOrder(): array { - return ['sales' => 'desc', 'price' => 'asc']; + return [ 'price' => 'asc','id' => 'desc']; } /** @@ -108,9 +108,9 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface, L return StoreBranchProduct::where($this->searchWhere) ->field(['id', 'product_id', 'cate_id', 'store_name', 'cost', 'store_id','vip_price','purchase', 'price', 'bar_code', 'image', 'sales', 'store_info', 'delete_time', 'unit', 'batch']) ->with(['className', 'unitName']) + ->limit($this->limitOffset, $this->limitLength) ->order($this->sortOrder) -// ->limit($this->limitOffset, $this->limitLength) - ->page($this->limitOffset +1,$this->limitLength) +// ->page($this->limitOffset +1,$this->limitLength) ->select()->toArray(); }