diff --git a/.gitignore b/.gitignore index 57564041..a0a855bf 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,6 @@ .env /tests/tmp /tests/.phpunit.result.cache -public/uploads \ No newline at end of file +public/uploads +public/image/barcode +public/image \ No newline at end of file diff --git a/.htaccess b/.htaccess new file mode 100644 index 00000000..e69de29b diff --git a/app/admin/controller/LoginController.php b/app/admin/controller/LoginController.php index 01b37fd0..89c51f54 100644 --- a/app/admin/controller/LoginController.php +++ b/app/admin/controller/LoginController.php @@ -37,7 +37,8 @@ class LoginController extends BaseAdminController */ public function account() { - $params = (new LoginValidate())->post()->goCheck(); + $params = $this->request->post(); +// $params = (new LoginValidate())->post()->goCheck(); return $this->data((new LoginLogic())->login($params)); } diff --git a/app/admin/controller/WorkbenchController.php b/app/admin/controller/WorkbenchController.php index fdf23eb0..b535b0c8 100644 --- a/app/admin/controller/WorkbenchController.php +++ b/app/admin/controller/WorkbenchController.php @@ -14,7 +14,13 @@ 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 app\store\logic\WorkbenchLogic as LogicWorkbenchLogic; +use DateInterval; +use DateTime; /** * 工作台 @@ -34,197 +40,38 @@ class WorkbenchController extends BaseAdminController $result = WorkbenchLogic::index(); return $this->data($result); } - - //首页订单 - public function order() + /** + * @notes 工作台 + * @author 乔峰 + * @date 2021/12/29 17=>01 + */ + public function store_index() { - $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); + $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); + } + //-------------------------------商品统计---------------------------------------// /** @@ -232,16 +79,16 @@ class WorkbenchController extends BaseAdminController */ public function get_basic() { - $startTime=$this->request->get('start_time');//开始时间 - $endTime=$this->request->get('end_time');//结束时间 - if(empty($startTime)){//如果没有传开始时间，则默认获取最近7天的数据 - $startTime=strtotime(date('Y-m-d')); - $endTime=$startTime+86400; + $startTime = $this->request->get('start_time'); //开始时间 + $endTime = $this->request->get('end_time'); //结束时间 + if (empty($startTime)) { //如果没有传开始时间，则默认获取最近7天的数据 + $startTime = strtotime(date('Y-m-d')); + $endTime = $startTime + 86400; } - $where=[ - ['create_time','between',[$startTime,$endTime]] + $where = [ + ['create_time', 'between', [$startTime, $endTime]] ]; - $data=WorkbenchLogic::get_basic($where); + $data = WorkbenchLogic::get_basic($where); return $this->data($data); } @@ -250,186 +97,41 @@ class WorkbenchController extends BaseAdminController */ public function get_trend() { + $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" => [ - "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" - ], + "xAxis" => $dates, "series" => [ [ "name" => "商品浏览量", - "data" => [ - 131, - 275, - 137, - 100, - 221, - 76, - 64, - 83, - 161, - 125, - 120, - 971, - 169, - 84, - 68, - 153, - 470, - 1310, - 621, - 827, - 113, - 595, - 485, - 484, - 535, - 227, - 714, - 144, - 1159, - 731 - ], + "data" => WorkbenchLogic::store_visit_count($dates), "type" => "line", "smooth" => "true", "yAxisIndex" => 1 ], [ "name" => "商品访客量", - "data" => [ - 21, - 26, - 26, - 32, - 26, - 14, - 6, - 13, - 17, - 26, - 24, - 18, - 7, - 6, - 23, - 23, - 23, - 33, - 29, - 61, - 25, - 103, - 55, - 45, - 45, - 30, - 28, - 25, - 41, - 21 - ], + "data" => WorkbenchLogic::store_visit_user($dates), "type" => "line", "smooth" => "true", "yAxisIndex" => 1 ], [ "name" => "支付金额", - "data" => [ - 53.6, - 0.25, - 1231.84, - 0.8, - 0, - 10, - 0, - 0.66, - 7919.2, - 0, - 8040.38, - 0.01, - 0, - 0, - 10.49, - 0, - 0.01, - 599.01, - 100100, - 908.81, - 0, - 1887.06, - 588, - 184.3, - 665.11, - 0, - 0, - 219.2, - 24.09, - 16.99 - ], + "data" => WorkbenchLogic::payPrice($dates), "type" => "bar" ], [ "name" => "退款金额", - "data" => [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 730.8, - 49, - 219, - 0, - 1323.01, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], + "data" => WorkbenchLogic::refundPrice($dates), "type" => "bar" ] ] @@ -442,66 +144,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 - ], - [ - "product_id" => 1670, - "visit" => "949", - "user" => 161, - "cart" => "20", - "orders" => "47", - "pay" => "34", - "price" => "4347.45", - "cost" => "0.00", - "profit" => "1.00", - "collect" => "2", - "changes" => "0.13", - "repeats" => "0.14", - "store_name" => "ECOK2024年春秋季美式复古美拉德风高级感撞色领拉链夹克外套女潮", - "image" => "https://multi-store.crmeb.net/uploads/attach/2024/02/19/5bf089c30da5bdddd815fbf2cba148e6.jpg", - "product_price" => "169.90", - "stock" => 2980, - "is_show" => 1 - ], - [ - "product_id" => 2033, - "visit" => "743", - "user" => 139, - "cart" => "30", - "orders" => "52", - "pay" => "20", - "price" => "3930.50", - "cost" => "0.00", - "profit" => "1.00", - "collect" => "1", - "changes" => "0.04", - "repeats" => "0.50", - "store_name" => "【618抢先购】CT四色眼影盘新色枕边话哑光亮片粉棕彩妆官方正品", - "image" => "https://multi-store.crmeb.net/uploads/attach/2024/05/24/fc63ee052b9dc66bd70a1e013510ded2.jpg", - "product_price" => "490.00", - "stock" => 139994, - "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); } //-------------------------------用户统计---------------------------------------// @@ -511,68 +157,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); } @@ -581,926 +168,60 @@ 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); } //-------------------------------交易统计---------------------------------------// //当日订单金额 public function top_trade() { - $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" => [ - [ - "money" => 279.47, - "value" => [ - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "4.48", - "257.20", - "0.00", - "16.99", - "0.80", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00" - ] - ], - [ - "money" => 10175.64, - "value" => [ - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "0.00", - "0.01", - "0.00", - "0.00", - "40.00", - "0.10", - "9938.00", - "0.08", - "30.16", - "0.00", - "0.00", - "0.00", - "163.20", - "4.09", - "0.00", - "0.00" - ] - ] - ] - ], - "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" => [ - [ - "name" => "今日订单数", - "now_money" => 8, - "last_money" => 13, - "rate" => "-38.46", - "value" => [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 4, - 1, - 0, - 1, - 2, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ] - ], - [ - "name" => "今日支付人数", - "now_money" => 5, - "last_money" => 8, - "rate" => "-37.50", - "value" => [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 2, - 1, - 0, - 1, - 2, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ] - ] - ] - ], - "month" => [ - [ - "name" => "本月订单数", - "now_money" => 30, - "last_money" => 285, - "rate" => "-89.47", - "value" => [ - "2024-06-01" => 2, - "2024-06-02" => 7, - "2024-06-03" => 13, - "2024-06-04" => 8, - "2024-06-05" => 0, - "2024-06-06" => 0, - "2024-06-07" => 0, - "2024-06-08" => 0, - "2024-06-09" => 0, - "2024-06-10" => 0, - "2024-06-11" => 0, - "2024-06-12" => 0, - "2024-06-13" => 0, - "2024-06-14" => 0, - "2024-06-15" => 0, - "2024-06-16" => 0, - "2024-06-17" => 0, - "2024-06-18" => 0, - "2024-06-19" => 0, - "2024-06-20" => 0, - "2024-06-21" => 0, - "2024-06-22" => 0, - "2024-06-23" => 0, - "2024-06-24" => 0, - "2024-06-25" => 0, - "2024-06-26" => 0, - "2024-06-27" => 0, - "2024-06-28" => 0, - "2024-06-29" => 0, - "2024-06-30" => 0 - ] - ], - [ - "name" => "本月支付人数", - "now_money" => 15, - "last_money" => 79, - "rate" => "-81.01", - "value" => [ - "2024-06-01" => 1, - "2024-06-02" => 4, - "2024-06-03" => 8, - "2024-06-04" => 5, - "2024-06-05" => 0, - "2024-06-06" => 0, - "2024-06-07" => 0, - "2024-06-08" => 0, - "2024-06-09" => 0, - "2024-06-10" => 0, - "2024-06-11" => 0, - "2024-06-12" => 0, - "2024-06-13" => 0, - "2024-06-14" => 0, - "2024-06-15" => 0, - "2024-06-16" => 0, - "2024-06-17" => 0, - "2024-06-18" => 0, - "2024-06-19" => 0, - "2024-06-20" => 0, - "2024-06-21" => 0, - "2024-06-22" => 0, - "2024-06-23" => 0, - "2024-06-24" => 0, - "2024-06-25" => 0, - "2024-06-26" => 0, - "2024-06-27" => 0, - "2024-06-28" => 0, - "2024-06-29" => 0, - "2024-06-30" => 0 - ] - ] - ] - ] - ]; + $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']); + } + + $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" - ] - ] - ], - ]; + $date=$this->request->get('date',''); + $data=(new TradeStatisticLogic())->getBottomTrade(['data'=>$this->getDay($date)]); 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/controller/financial_transfers/FinancialTransfersController.php b/app/admin/controller/financial_transfers/FinancialTransfersController.php new file mode 100644 index 00000000..9f98930d --- /dev/null +++ b/app/admin/controller/financial_transfers/FinancialTransfersController.php @@ -0,0 +1,136 @@ +dataLists(new FinancialTransfersLists()); + } + + //确认 + public function send_transfers() + { + $params = (new FinancialTransfersValidate())->post()->goCheck('send'); + $result = FinancialTransfersLogic::dealsend($params); + + if (true === $result) { + return $this->success('发送成功', [],1,1 ); + } + return $this->fail(FinancialTransfersLogic::getError()); + + } + + //财务上传凭证 + public function success_send() + { + $params = (new FinancialTransfersValidate())->post()->goCheck('success'); + $update = [ + 'transfer_picture'=>$params['transfer_picture'] + ]; + $update['status'] = -1; + if($params['status']){ + $update['status'] = 3; + $update['pay_status'] = 1; + } + $update['fail_msg'] = $params['fail_msg']??''; + $result = FinancialTransfersLogic::dealchange($update,$params['id']); + + if (true === $result) { + return $this->success('转账成功',[],1,1); + } + return $this->fail(FinancialTransfersLogic::getError()); + + } + + + + + + + + + /** + * @notes 添加 + * @return \think\response\Json + * @author admin + * @date 2024/06/14 10:10 + */ + public function add() + { + $params = (new FinancialTransfersValidate())->post()->goCheck('add'); + $result = FinancialTransfersLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(FinancialTransfersLogic::getError()); + } + + + /** + * @notes 编辑 + * @return \think\response\Json + * @author admin + * @date 2024/06/14 10:10 + */ + public function edit() + { + $params = (new FinancialTransfersValidate())->post()->goCheck('edit'); + $result = FinancialTransfersLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(FinancialTransfersLogic::getError()); + } + + + /** + * @notes 删除 + * @return \think\response\Json + * @author admin + * @date 2024/06/14 10:10 + */ + public function delete() + { + $params = (new FinancialTransfersValidate())->post()->goCheck('delete'); + FinancialTransfersLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取详情 + * @return \think\response\Json + * @author admin + * @date 2024/06/14 10:10 + */ + public function detail() + { + $params = (new FinancialTransfersValidate())->goCheck('detail'); + $result = FinancialTransfersLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/admin/controller/store_branch_product/StoreBranchProductController.php b/app/admin/controller/store_branch_product/StoreBranchProductController.php index c26452cb..8b97950e 100644 --- a/app/admin/controller/store_branch_product/StoreBranchProductController.php +++ b/app/admin/controller/store_branch_product/StoreBranchProductController.php @@ -5,6 +5,7 @@ namespace app\admin\controller\store_branch_product; use app\admin\controller\BaseAdminController; use app\admin\lists\store_branch_product\StoreBranchProductLists; +use app\admin\lists\store_branch_product_exchange\StoreBranchProductExchangeLists; use app\admin\logic\store_branch_product\StoreBranchProductLogic; use app\admin\logic\store_product\StoreProductLogic; use app\admin\validate\store_product\StoreProductValidate; @@ -27,7 +28,11 @@ class StoreBranchProductController extends BaseAdminController */ public function lists() { - return $this->dataLists(new StoreBranchProductLists()); + if($this->request->get('exchange',0)==1){ + return $this->dataLists(new StoreBranchProductExchangeLists()); + }else{ + return $this->dataLists(new StoreBranchProductLists()); + } } diff --git a/app/admin/controller/store_product/StoreProductController.php b/app/admin/controller/store_product/StoreProductController.php index 0bfbb0d3..4e9046b0 100644 --- a/app/admin/controller/store_product/StoreProductController.php +++ b/app/admin/controller/store_product/StoreProductController.php @@ -98,15 +98,16 @@ class StoreProductController extends BaseAdminController { $product_arr = $this->request->post('product_arr'); $store_arr = $this->request->post('store_arr'); + $stock_type = $this->request->post('stock_type',1); if (count($store_arr) == 1) { $store_id = $store_arr[0]; foreach ($product_arr as $key => $arr) { - Redis::send('store-storage', ['product_arr' => $arr, 'store_id' => $store_id, 'admin_id' => $this->adminId]); + Redis::send('store-storage', ['product_arr' => $arr, 'store_id' => $store_id,'stock_type'=>$stock_type, 'admin_id' => $this->adminId]); } } else { foreach ($product_arr as $key => $arr) { foreach ($store_arr as $k => $store_id) { - Redis::send('store-storage', ['product_arr' => $arr, 'store_id' => $store_id, 'admin_id' => $this->adminId]); + Redis::send('store-storage', ['product_arr' => $arr, 'store_id' => $store_id,'stock_type'=>$stock_type, 'admin_id' => $this->adminId]); } } } 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/controller/user/UserController.php b/app/admin/controller/user/UserController.php index 2b55bb1f..2f83ae7b 100644 --- a/app/admin/controller/user/UserController.php +++ b/app/admin/controller/user/UserController.php @@ -57,11 +57,29 @@ class UserController extends BaseAdminController */ public function edit() { - $params = (new UserValidate())->post()->goCheck('edit'); + // $params = (new UserValidate())->post()->goCheck('edit'); + $params = $this->request->post(); $result = UserLogic::edit($params); if (true === $result) { return $this->success('编辑成功', [], 1, 1); } return $this->fail(UserLogic::getError()); } + + //采购款明细、余额明细、礼品券明细、返还金明细 + public function fundList() + { + (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); + $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/controller/user_label/UserLabelController.php b/app/admin/controller/user_label/UserLabelController.php new file mode 100644 index 00000000..b0367382 --- /dev/null +++ b/app/admin/controller/user_label/UserLabelController.php @@ -0,0 +1,95 @@ +dataLists(new UserLabelLists()); + } + + + /** + * @notes 添加用户标签 + * @return \think\response\Json + * @author admin + * @date 2024/06/17 17:02 + */ + public function add() + { + $params = (new UserLabelValidate())->post()->goCheck('add'); + $result = UserLabelLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(UserLabelLogic::getError()); + } + + + /** + * @notes 编辑用户标签 + * @return \think\response\Json + * @author admin + * @date 2024/06/17 17:02 + */ + public function edit() + { + $params = (new UserLabelValidate())->post()->goCheck('edit'); + $result = UserLabelLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(UserLabelLogic::getError()); + } + + + /** + * @notes 删除用户标签 + * @return \think\response\Json + * @author admin + * @date 2024/06/17 17:02 + */ + public function delete() + { + $params = (new UserLabelValidate())->post()->goCheck('delete'); + UserLabelLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取用户标签详情 + * @return \think\response\Json + * @author admin + * @date 2024/06/17 17:02 + */ + public function detail() + { + $params = (new UserLabelValidate())->goCheck('detail'); + $result = UserLabelLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/admin/lists/financial_transfers/FinancialTransfersLists.php b/app/admin/lists/financial_transfers/FinancialTransfersLists.php new file mode 100644 index 00000000..8c989e28 --- /dev/null +++ b/app/admin/lists/financial_transfers/FinancialTransfersLists.php @@ -0,0 +1,77 @@ + ['store_id', 'admin_id', 'uid', 'status', 'initiation_time', 'confirmation_time', 'mark', 'money', 'remark_time','create_time'], + 'between_time' => 'create_time', + ]; + } + + + /** + * @notes 获取列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author admin + * @date 2024/06/14 10:10 + */ + public function lists(): array + { + $data = FinancialTransfers::with(['store','staff','admin'])->where($this->searchWhere) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + foreach ($data as &$value){ + if($value['initiation_time']){ + $value['initiation_time'] = date('Y-m-d H:i:s',$value['initiation_time']); + } + + if($value['confirmation_time']){ + $value['confirmation_time'] = date('Y-m-d H:i:s',$value['confirmation_time']); + + } + + } + return $data; + } + + + /** + * @notes 获取数量 + * @return int + * @author admin + * @date 2024/06/14 10:10 + */ + public function count(): int + { + return FinancialTransfers::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/admin/lists/store_branch_product exchange/StoreBranchProductExchangeLists.php b/app/admin/lists/store_branch_product exchange/StoreBranchProductExchangeLists.php new file mode 100644 index 00000000..f4144ab4 --- /dev/null +++ b/app/admin/lists/store_branch_product exchange/StoreBranchProductExchangeLists.php @@ -0,0 +1,125 @@ + ['product_id', 'cate_id','store_id','status'], + '%pipe_like%' => ['store_name_code'=>'store_name|bar_code'], + '%like%' => ['store_name'], + ]; + } + + + /** + * @notes 获取门店列表列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author admin + * @date 2024/05/31 17:45 + */ + public function lists(): array + { + $status = $this->params['status'] ?? ''; + $class_all=$this->request->get('class_all'); + $where=[]; + if($class_all){ + $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)]; + } + } + return StoreBranchProductExchange::where($this->searchWhere)->where($where) + ->field(['id','store_id','product_id', 'image', 'store_name', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost', 'status']) + ->when(!empty($this->adminInfo['store_id']), function ($query) { + $query->where('store_id', $this->adminInfo['store_id']); + }) + ->when(!empty($status), function ($query) use ($status) { + if ($status == 1) { + $query->where('status', $status); + } elseif ($status == 2) { + $query->where('status', 0); + } elseif ($status == 3) { + $query->where('stock', '<=', 0); + } elseif ($status == 4) { + $query->where('stock', '<', 10)->where('stock', '>', 0); + } + }) + ->limit($this->limitOffset, $this->limitLength) + ->order(['sort' => 'desc','stock'=>'desc','id' => 'desc']) + ->select() + ->each(function ($item) { + $item['system_store_name']=SystemStore::where('id',$item['store_id'])->value('name'); + $item['unit_name'] = StoreProductUnit::where('id', $item['unit'])->value('name'); + $item['cate_name'] = StoreCategory::where('id', $item['cate_id'])->value('name'); + return $item; + }) + ->toArray(); + } + + + /** + * @notes 获取门店列表数量 + * @return int + * @author admin + * @date 2024/05/31 17:45 + */ + public function count(): int + { + $status = $this->params['status'] ?? ''; + $class_all=$this->request->get('class_all'); + $where=[]; + if($class_all){ + $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)]; + } + } + return StoreBranchProductExchange::where($this->searchWhere)->where($where) + ->when(!empty($this->adminInfo['store_id']), function ($query) { + $query->where('store_id', $this->adminInfo['store_id']); + }) + ->when(!empty($status), function ($query) use ($status) { + if ($status == 1) { + $query->where('status', $status); + } elseif ($status == 2) { + $query->where('status', 0); + } elseif ($status == 3) { + $query->where('stock', '<=', 0); + } elseif ($status == 4) { + $query->where('stock', '<', 10)->where('stock', '>', 0); + } + }) + ->count(); + } + +} diff --git a/app/admin/lists/store_branch_product/StoreBranchProductLists.php b/app/admin/lists/store_branch_product/StoreBranchProductLists.php index 59bb61b7..ff127b72 100644 --- a/app/admin/lists/store_branch_product/StoreBranchProductLists.php +++ b/app/admin/lists/store_branch_product/StoreBranchProductLists.php @@ -4,6 +4,7 @@ namespace app\admin\lists\store_branch_product; use app\admin\lists\BaseAdminDataLists; +use app\common\model\cate\Cate; use app\common\model\store_category\StoreCategory; use app\common\model\store_product_unit\StoreProductUnit; use app\common\model\system_store\SystemStore; @@ -47,8 +48,22 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI public function lists(): array { $status = $this->params['status'] ?? ''; - return StoreBranchProduct::where($this->searchWhere) - ->field(['id','store_id','product_id', 'image', 'store_name', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost', 'status']) + $class_all=$this->request->get('class_all'); + $where=[]; + if($class_all){ + $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)]; + } + } + if(empty($where) && $class_all){ + //2或者1 + $where[]=['cate_id','=',$class_all]; + } + + 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','batch','vip_price']) ->when(!empty($this->adminInfo['store_id']), function ($query) { $query->where('store_id', $this->adminInfo['store_id']); }) @@ -85,7 +100,16 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI public function count(): int { $status = $this->params['status'] ?? ''; - return StoreBranchProduct::where($this->searchWhere) + $class_all=$this->request->get('class_all'); + $where=[]; + if($class_all){ + $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)]; + } + } + return StoreBranchProduct::where($this->searchWhere)->where($where) ->when(!empty($this->adminInfo['store_id']), function ($query) { $query->where('store_id', $this->adminInfo['store_id']); }) diff --git a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php index c3ef1689..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; /** @@ -32,7 +33,8 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt { return [ '=' => ['store_id', 'user_id', 'create_time', 'staff_id'], - 'between_time'=>'create_time', + 'between_time' => 'create_time', + '%pipe_like%' => ['keyword' => 'order_sn'], ]; } @@ -48,7 +50,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) { @@ -63,15 +71,53 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt } 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']); - $item['financial_type_name'] = OrderEnum::getFinancialType($item['financial_type']); - }) - ->toArray(); + })->toArray(); + + foreach ($data as $key => $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 { + $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']); + }); + $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; } @@ -85,5 +131,4 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt { return StoreFinanceFlow::where($this->searchWhere)->count(); } - } diff --git a/app/admin/lists/store_product/StoreProductLists.php b/app/admin/lists/store_product/StoreProductLists.php index e8f58ed1..8d2d6969 100644 --- a/app/admin/lists/store_product/StoreProductLists.php +++ b/app/admin/lists/store_product/StoreProductLists.php @@ -46,7 +46,7 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa public function lists(): array { return StoreProduct::where($this->searchWhere) - ->field(['id', 'image', 'store_name', 'cate_id', 'price', 'sales', 'stock', 'is_show', 'unit', 'cost','rose','purchase','bar_code']) + ->field(['id', 'image', 'store_name','swap', 'cate_id','batch', 'price','vip_price','sales', 'stock', 'is_show', 'unit', 'cost','rose','purchase','bar_code']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function ($item) { diff --git a/app/admin/lists/system_store/SystemStoreLists.php b/app/admin/lists/system_store/SystemStoreLists.php index 40b3804e..d2f94c1b 100644 --- a/app/admin/lists/system_store/SystemStoreLists.php +++ b/app/admin/lists/system_store/SystemStoreLists.php @@ -44,7 +44,9 @@ class SystemStoreLists extends BaseAdminDataLists implements ListsSearchInterfac public function lists(): array { return SystemStore::where($this->searchWhere) - ->field(['id', 'name', 'phone', 'detailed_address', 'image', 'is_show','day_start','day_end']) + ->field(['id', 'name', 'phone', 'detailed_address', 'image', 'is_show','day_start','day_end' + ,'bank','bank_code','bank_address','realname,paid_deposit,security_deposit' + ]) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function ($item){ diff --git a/app/admin/lists/system_store_storage/SystemStoreStorageLists.php b/app/admin/lists/system_store_storage/SystemStoreStorageLists.php index 900eb1e3..59cfcd95 100644 --- a/app/admin/lists/system_store_storage/SystemStoreStorageLists.php +++ b/app/admin/lists/system_store_storage/SystemStoreStorageLists.php @@ -29,7 +29,7 @@ class SystemStoreStorageLists extends BaseAdminDataLists implements ListsSearchI public function setSearch(): array { return [ - '=' => ['store_id', 'admin_id', 'staff_id', 'status'], + '=' => ['store_id', 'admin_id', 'staff_id', 'status','type'], ]; } diff --git a/app/admin/lists/user/UserLists.php b/app/admin/lists/user/UserLists.php index e57ae5f0..c2c4471c 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') @@ -59,6 +64,18 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface })->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/admin/lists/user_label/UserLabelLists.php b/app/admin/lists/user_label/UserLabelLists.php new file mode 100644 index 00000000..4e142b64 --- /dev/null +++ b/app/admin/lists/user_label/UserLabelLists.php @@ -0,0 +1,65 @@ + ['label_name'], + ]; + } + + + /** + * @notes 获取用户标签列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author admin + * @date 2024/06/17 17:02 + */ + public function lists(): array + { + return UserLabel::where($this->searchWhere) + ->field(['label_id', 'label_name']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['label_id' => 'desc']) + ->select() + ->toArray(); + } + + + /** + * @notes 获取用户标签数量 + * @return int + * @author admin + * @date 2024/06/17 17:02 + */ + public function count(): int + { + return UserLabel::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/admin/logic/WorkbenchLogic.php b/app/admin/logic/WorkbenchLogic.php index 8bf3df71..503255a7 100644 --- a/app/admin/logic/WorkbenchLogic.php +++ b/app/admin/logic/WorkbenchLogic.php @@ -14,10 +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; @@ -33,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, //本月活跃用户量 ]; } @@ -52,27 +71,175 @@ class WorkbenchLogic extends BaseLogic */ public static function get_basic($where) { - $browse=StoreVisit::where($where)->count(); - $user=0; - $cart=0; - $order=StoreOrder::where($where)->count(); - $pay=StoreOrder::where($where)->where('paid',1)->count(); - $payPrice=StoreOrder::where($where)->where('paid',1)->count('pay_price'); - $cost=StoreOrder::where($where)->where('paid',1)->sum('cost'); - $refundPrice=StoreOrder::where($where)->where('status','in',[-1,-2])->sum('refund_price'); - $refund=StoreOrder::where($where)->where('status','in',[-1,-2])->count(); - $payPercent=0; + $browse = StoreVisit::where($where)->count(); + $user = 0; + $cart = Cart::where($where)->where('is_fail', 0)->sum('cart_num'); + $order = StoreOrder::where($where)->count(); + $pay = StoreOrder::where($where)->where('paid', 1)->where('refund_status', 0)->count(); + $payPrice = StoreOrder::where($where)->where('paid', 1)->where('refund_status', 0)->sum('pay_price'); + $cost = StoreOrder::where($where)->where('paid', 1)->sum('cost'); + $refundPrice = StoreOrder::where($where)->where('status', 'in', [-1, -2])->sum('refund_price'); + $refund = StoreOrder::where($where)->where('status', 'in', [-1, -2])->count(); + $payPercent = 0; return [ - 'browse'=>['num'=>$browse,'title'=>'浏览量'],//浏览量 - 'user'=>['num'=>$user,'title'=>'访客数'],//访客数 - 'cart'=>['num'=>$cart,'title'=>'加购人数'],//加购人数 - 'order'=>['num'=>$order,'title'=>'订单量'],//订单量 - 'pay'=>['num'=>$pay,'title'=>'支付订单量'],//支付订单量 - 'payPrice'=>['num'=>$payPrice,'title'=>'支付金额'],//支付金额 - 'cost'=>['num'=>$cost,'title'=>'成本'],//成本 - 'refundPrice'=>['num'=>$refundPrice,'title'=>'退款金额'],//退款金额 - 'refund'=>['num'=>$refund,'title'=>'退款订单量'],//退款订单量 - 'payPercent'=>['num'=>$payPercent,'title'=>'支付转化率'],//支付转化率 + 'browse' => ['num' => $browse, 'title' => '浏览量'], //浏览量 + 'user' => ['num' => $user, 'title' => '访客数'], //访客数 + 'cart' => ['num' => $cart, 'title' => '加购人数'], //加购人数 + 'order' => ['num' => $order, 'title' => '订单量'], //订单量 + 'pay' => ['num' => $pay, 'title' => '支付订单量'], //支付订单量 + 'payPrice' => ['num' => $payPrice, 'title' => '支付金额'], //支付金额 + 'cost' => ['num' => $cost, 'title' => '成本'], //成本 + 'refundPrice' => ['num' => $refundPrice, 'title' => '退款金额'], //退款金额 + 'refund' => ['num' => $refund, 'title' => '退款订单量'], //退款订单量 + 'payPercent' => ['num' => $payPercent, 'title' => '支付转化率'], //支付转化率 ]; } + + /** + * 商品浏览量 + */ + public static function store_visit_count($dates) + { + $data = []; + foreach ($dates as $date) { + $data[] = StoreVisit::whereDay('create_time', $date)->cache('store_visit_count_' . $date, 300)->sum('count'); + } + return $data; + } + + /** + * 商品浏览量 + */ + public static function store_visit_user($dates) + { + $data = []; + foreach ($dates as $date) { + $data[] = StoreVisit::whereDay('create_time', $date)->cache('store_visit_user_' . $date, 300)->count('uid'); + } + return $data; + } + /** + * 支付金额 + */ + public static function payPrice($dates) + { + $data = []; + foreach ($dates as $date) { + $data[] = StoreOrder::whereDay('create_time', $date)->cache('payPrice_' . $date, 300)->where('paid', 1)->where('refund_status', 0)->sum('pay_price'); + } + return $data; + } + /** + * 退款金额 + */ + public static function refundPrice($dates) + { + $data = []; + foreach ($dates as $date) { + $data[] = StoreOrder::whereDay('create_time', $date)->where('status', 'in', [-1, -2])->cache('refundPrice_' . $date, 300)->where('paid', 1)->sum('pay_price'); + } + return $data; + } + + /** + * 当日订单金额 + */ + public static function day_order_pay_price($where, $time) + { + $money = StoreOrder::whereDay('create_time', $time)->where('paid', 1)->where('refund_status', 0)->sum('pay_price'); + $data = []; + foreach ($where as $date) { + $data[] = StoreOrder::where('create_time','between', $date)->cache('day_order_pay_price_' . $date[0], 300)->where('paid', 1)->where('refund_status', 0)->sum('pay_price'); + } + + return ['money' => $money, 'value' => $data]; + } + + /** + * 今日订单数 + */ + public static function day_order_count($where,$name) + { + $now_money = StoreOrder::whereDay('create_time')->where('paid', 1)->where('refund_status', 0)->count(); + $last_money = StoreOrder::whereDay('create_time', 'yesterday')->where('paid', 1)->where('refund_status', 0)->count(); + $data = []; + foreach ($where as $date) { + $data[] = StoreOrder::where('create_time','between', $date)->cache('day_order_count' . $date[0], 300)->where('paid', 1)->where('refund_status', 0)->count(); + } + if ($now_money > $last_money) { + if($last_money == 0){ + $rate = bcmul($now_money, '100'); + }else{ + $rate = bcmul(bcmul($now_money, '100'), bcdiv($last_money, $now_money, 2), 2); + } + } else { + + $rate = bcmul(bcmul($last_money, '100'), bcdiv($now_money, $last_money, 2), 2); + } + return ['name' => $name, 'now_money' => $now_money, 'last_money' => $last_money, 'rate' => $rate, 'value' => $data]; + } + + /** + * 今日支付人数 + */ + public static function day_order_user($where,$name) + { + $now_money = StoreOrder::whereDay('create_time')->where('paid', 1)->where('refund_status', 0)->count('uid'); + $last_money = StoreOrder::whereDay('create_time', 'yesterday')->where('paid', 1)->where('refund_status', 0)->count('uid'); + $data = []; + foreach ($where as $date) { + $data[] = StoreOrder::where('create_time','between', $date)->cache('day_order_count' . $date[0], 300)->where('paid', 1)->where('refund_status', 0)->count('uid'); + } + if ($now_money > $last_money) { + if($last_money == 0){ + $rate = bcmul($now_money, '100'); + }else{ + $rate = bcmul(bcmul($now_money, '100'), bcdiv($last_money, $now_money, 2), 2); + } + } else { + + $rate = bcmul(bcmul($last_money, '100'), bcdiv($now_money, $last_money, 2), 2); + } + return ['name' => $name, 'now_money' => $now_money, 'last_money' => $last_money, 'rate' => $rate, 'value' => $data]; + } + /** + * 本月订单数 + */ + public static function month_order_count($name) + { + $now_money = StoreOrder::whereMonth('create_time')->where('paid', 1)->where('refund_status', 0)->count(); + $last_money = StoreOrder::whereMonth('create_time', 'last month')->where('paid', 1)->where('refund_status', 0)->count(); + $data = []; + if ($now_money > $last_money) { + if($last_money == 0){ + $rate = bcmul($now_money, '100'); + }else{ + $rate = bcmul(bcmul($now_money, '100'), bcdiv($last_money, $now_money, 2), 2); + } + } else { + $rate = bcmul(bcmul($last_money, '100'), bcdiv($now_money, $last_money, 2), 2); + } + return ['name' => $name, 'now_money' => $now_money, 'last_money' => $last_money, 'rate' => $rate, 'value' => $data]; + } + + /** + * 本月支付人数 + */ + public static function month_order_user($name) + { + $now_money = StoreOrder::whereMonth('create_time')->where('paid', 1)->where('refund_status', 0)->count('uid'); + $last_money = StoreOrder::whereMonth('create_time','last month')->where('paid', 1)->where('refund_status', 0)->count('uid'); + $data = []; + if ($now_money > $last_money) { + if($last_money == 0){ + $rate = bcmul($now_money, '100'); + }else{ + $rate = bcmul(bcmul($now_money, '100'), bcdiv($last_money, $now_money, 2), 2); + } + } else { + + $rate = bcmul(bcmul($last_money, '100'), bcdiv($now_money, $last_money, 2), 2); + } + return ['name' => $name, 'now_money' => $now_money, 'last_money' => $last_money, 'rate' => $rate, 'value' => $data]; + } } diff --git a/app/admin/logic/financial_transfers/FinancialTransfersLogic.php b/app/admin/logic/financial_transfers/FinancialTransfersLogic.php new file mode 100644 index 00000000..8a571e70 --- /dev/null +++ b/app/admin/logic/financial_transfers/FinancialTransfersLogic.php @@ -0,0 +1,156 @@ + $params['store_id'], + 'admin_id' => $params['admin_id'], + 'uid' => $params['uid'], + 'status' => $params['status'], + 'initiation_time' => $params['initiation_time'], + 'confirmation_time' => $params['confirmation_time'], + 'mark' => $params['mark'], + 'money' => $params['money'], + 'remark_time' => $params['remark_time'] + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 编辑 + * @param array $params + * @return bool + * @author admin + * @date 2024/06/14 10:05 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + FinancialTransfers::where('id', $params['id'])->update([ + 'store_id' => $params['store_id'], + 'admin_id' => $params['admin_id'], + 'uid' => $params['uid'], + 'status' => $params['status'], + 'initiation_time' => $params['initiation_time'], + 'confirmation_time' => $params['confirmation_time'], + 'mark' => $params['mark'], + 'money' => $params['money'], + 'remark_time' => $params['remark_time'] + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 删除 + * @param array $params + * @return bool + * @author admin + * @date 2024/06/14 10:05 + */ + public static function delete(array $params): bool + { + return FinancialTransfers::destroy($params['id']); + } + + + /** + * @notes 获取详情 + * @param $params + * @return array + * @author admin + * @date 2024/06/14 10:05 + */ + public static function detail($params): array + { + return FinancialTransfers::findOrEmpty($params['id'])->toArray(); + } + + public static function dealsend($params) + { + Db::startTrans(); + try { + FinancialTransfers::where('id',$params['id']) + ->update( + [ + 'status'=>1, + 'initiation_time'=>time() + ] + ); + + Db::commit(); + return true; + }catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + + + } + + + public static function dealchange($params,$id) + { + Db::startTrans(); + try { + FinancialTransfers::where('id',$id) + ->update( + $params + ); + + Db::commit(); + return true; + }catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + + + } + + +} \ No newline at end of file diff --git a/app/admin/logic/statistic/ProductStatisticLogic.php b/app/admin/logic/statistic/ProductStatisticLogic.php new file mode 100644 index 00000000..04e7f95c --- /dev/null +++ b/app/admin/logic/statistic/ProductStatisticLogic.php @@ -0,0 +1,47 @@ +with('store') + ->field([ + 'store_id', + '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']) { + 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 new file mode 100644 index 00000000..3f12eb7c --- /dev/null +++ b/app/admin/logic/statistic/TradeStatisticLogic.php @@ -0,0 +1,923 @@ +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->getCurveData($orderCountWhere, $where, 'count(*)'); + $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->getCurveData($orderCountWhere, $where, 'count(distinct uid)'); + + $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->getCurveData($monthOrderCountWhere, $where, 'count(*)'); + + $monthCurveOrderCount = $this->trendYdata((array)$monthCurveOrderCount, $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->getCurveData($monthOrderPeopleWhere, $where, 'count(distinct uid)'); + $monthCurveOrderPeople = $this->trendYdata((array)$monthCurveOrderPeople, $timeKey); + //上月支付人数 + // $timeKey = $this->TimeConvert("last_month"); + + $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); + $where['timeKey'] = $timeKey; + switch ($selectType) { + case "sum": + $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": + $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/admin/logic/statistic/UserStatisticLogic.php b/app/admin/logic/statistic/UserStatisticLogic.php new file mode 100644 index 00000000..b725b857 --- /dev/null +++ b/app/admin/logic/statistic/UserStatisticLogic.php @@ -0,0 +1,171 @@ +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 = $time[0]; + $dt_end = $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/store_branch_product/StoreBranchProductLogic.php b/app/admin/logic/store_branch_product/StoreBranchProductLogic.php index 7222a920..ce3508e3 100644 --- a/app/admin/logic/store_branch_product/StoreBranchProductLogic.php +++ b/app/admin/logic/store_branch_product/StoreBranchProductLogic.php @@ -67,9 +67,9 @@ class StoreBranchProductLogic extends BaseLogic } $data['cate_id']=$params['cate_id']; }else{ - if($params['statis']!=$StoreProduct['statis']){ - if($params['statis']==1){ - StoreProductLogic::updateGoodsclass($params['cate_id']); + if($params['status']!=$StoreProduct['status']){ + if($params['status']==1){ + StoreProductLogic::updateGoodsclass($StoreProduct['cate_id'],$StoreProduct['store_id']); }else{ self::store_product_cate_update($params['id'], $StoreProduct['cate_id'], $StoreProduct['store_id'],0); @@ -92,7 +92,7 @@ class StoreBranchProductLogic extends BaseLogic public static function store_product_cate_update($id,$cate_id,$store_id,$type=1) { $find=Db::name('store_product_cate')->where(['cate_id'=>$cate_id,'store_id'=>$store_id])->find(); - if($find['pid']>0){ + if($find &&$find['pid']>0){ $two=Db::name('store_product_cate')->where(['cate_id'=>$find['pid'],'store_id'=>$store_id])->find(); Db::name('store_product_cate')->where('id',$find['id'])->dec('count',1)->update(); Db::name('store_product_cate')->where('id',$two['id'])->dec('count',1)->update(); @@ -101,7 +101,7 @@ class StoreBranchProductLogic extends BaseLogic } } if($type==1){ - StoreProductLogic::updateGoodsclass($cate_id); + StoreProductLogic::updateGoodsclass($cate_id,$store_id); } } /** diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php index 1e95deed..6aee0d22 100644 --- a/app/admin/logic/store_product/StoreProductLogic.php +++ b/app/admin/logic/store_product/StoreProductLogic.php @@ -9,6 +9,7 @@ use app\common\model\store_branch_product\StoreBranchProduct; use app\common\model\store_branch_product_attr_value\StoreBranchProductAttrValue; use app\common\model\store_category\StoreCategory; use app\common\model\store_product_attr_value\StoreProductAttrValue; +use app\common\model\store_product_cate\StoreProductCate; use app\common\model\system_store\SystemStore; use app\common\model\system_store_storage\SystemStoreStorage; use app\Request; @@ -42,25 +43,30 @@ class StoreProductLogic extends BaseLogic 'cate_id' => $params['cate_id'], 'unit' => $params['unit'], 'stock' => $params['stock'], + 'price' => $params['price'], + 'vip_price' => $params['vip_price'], 'cost' => $params['cost'], 'purchase' => $params['purchase'], 'rose' => $params['rose'], 'is_return' => $params['is_return'], + 'swap' => $params['swap'] ?? 0, + 'batch' => $params['batch'] ?? 0, ]; - if ($params['rose'] > 0) { - $rose_price = bcmul($params['cost'], $params['rose'], 2); - $data['price'] = bcadd($params['cost'], $rose_price, 2); - } else { - $data['price'] = 0; - } + // if ($params['rose'] > 0) { + // $rose_price = bcmul($params['cost'], $params['rose'], 2); + // $data['price'] = bcadd($params['cost'], $rose_price, 2); + // } else { + // $data['price'] = 0; + // } $res = StoreProduct::create($data); StoreProductAttrValue::create([ "bar_code" => $params["bar_code"] ?? '', "image" => $params["image"] ?? '', + "price" => $params['price'], + 'vip_price' => $params['vip_price'], "cost" => $params['cost'], "purchase" => $params['purchase'], "unit" => $params["unit"], - "price" => $data['price'], "stock" => $params['stock'], "product_id" => $res['id'], "unique" => setUnique($res['id'], '', 0), @@ -90,6 +96,33 @@ class StoreProductLogic extends BaseLogic } } + public static function deleteRelatedData($cate_id) + { + $data_to_delete = StoreProductCate::where('cate_id', $cate_id)->select(); + foreach ($data_to_delete as $item) { + + if ($item['pid'] != 0) { + self::deleteRelatedData($item['pid']); + StoreProductCate::where('id', $item['id'])->update(['delete_time' => time()]); + } + + if ($item['pid'] == 0 && in_array($item['count'], [0, 1])) { + StoreProductCate::where('id', $item['id'])->update(['delete_time' => time()]); + } + } + } + + // 递归减少分类数据的count值 + public static function decreaseCount($cate_id) + { + $data_to_decrease = StoreProductCate::where('cate_id', $cate_id)->select(); + foreach ($data_to_decrease as $item) { + if ($item['pid'] != 0) { + self::decreaseCount($item['pid']); + } + StoreProductCate::where('id', $item['id'])->update(['count' => $item['count'] - 1]); + } + } /** * @notes 编辑商品列表 @@ -113,16 +146,40 @@ class StoreProductLogic extends BaseLogic 'purchase' => $params['purchase'], 'rose' => $params['rose'], 'is_return' => $params['is_return'], + 'price' => $params['price'], + 'vip_price' => $params['vip_price'], + 'batch' => $params['batch'], + 'swap' => $params['swap'] ?? 0, ]; - if ($params['rose'] > 0) { - $rose_price = bcmul($params['cost'], bcdiv($params['rose'], 100, 2), 2); - $data['price'] = bcadd($params['cost'], $rose_price, 2); - } else { - $data['price'] = 0; - } + StoreProduct::where('id', $params['id'])->update($data); + /*$old_cate = StoreBranchProduct::where('product_id', $params['id'])->field('cate_id,store_id') + ->select(); + // 获取分类ID + foreach ($old_cate as $vv) { + $related_data = Db::name('store_product_cate')->where('cate_id', $vv['cate_id'])->select(); + //删除之前的分类 + foreach ($related_data as $value) { + if ($value['count'] == 1) { + self::deleteRelatedData($value['cate_id']); + } elseif ($value['count'] > 1) { + self::decreaseCount($value['cate_id']); + } + //新增对应的分类 + self::updateGoodsclass($params['cate_id'], $value['store_id']); + } + }*/ + + + //修改 + StoreBranchProduct::where('product_id', $params['id'])->update([ + 'price' => $params['price'], 'vip_price' => $params['vip_price'], + 'cost' => $params['cost'], + 'batch'=>$params['batch'],'store_name'=>$params['store_name'] + ]); + Db::commit(); return true; } catch (\Exception $e) { @@ -142,7 +199,9 @@ class StoreProductLogic extends BaseLogic */ public static function delete(array $params): bool { - return StoreProduct::destroy($params['id']); + $res = StoreProduct::destroy($params['id']); + StoreBranchProduct::where('product_id', $params['id'])->update(['delete_time' => time()]); + return $res; } @@ -174,7 +233,7 @@ class StoreProductLogic extends BaseLogic /** * 更新商品分类 */ - public static function updateGoodsclass($cate_id, $type = 0) + public static function updateGoodsclass($cate_id, $store_id = 0, $type = 0) { $one = StoreCategory::where('id', $cate_id)->find(); if ($one) { @@ -182,23 +241,31 @@ class StoreProductLogic extends BaseLogic $two = StoreCategory::where('id', $one['pid'])->find(); if ($two) { if ($two['pid'] != 0) { - self::cate_update($cate_id,$two['id'],0,3); - self::cate_update($two['id'],$two['pid'],0,2); - self::cate_update($two['pid'],0,0,1); + self::cate_update($cate_id, $two['id'], $store_id, 3); + self::cate_update($two['id'], $two['pid'], $store_id, 2); + self::cate_update($two['pid'], 0, $store_id, 1); + } else { + if ($one['pid'] == 0) { + self::cate_update($one['id'], 0, $store_id, 1); + } else { + self::cate_update($one['id'], $one['pid'], $store_id, 2); + self::cate_update($one['pid'], 0, $store_id, 1); + } } } } } - public static function cate_update($cate_id = 0,$pid=0, $product_id = 0, $level = 1) + public static function cate_update($cate_id = 0, $pid = 0, $store_id = 0, $level = 1) { - $find = Db::name('store_product_cate')->where(['store_id' => 1, 'cate_id' => $cate_id, 'level' => $level])->find(); + $find = Db::name('store_product_cate')->where(['store_id' => $store_id, 'cate_id' => $cate_id, 'level' => $level])->find(); if ($find) { Db::name('store_product_cate')->where('id', $find['id'])->inc('count', 1)->update(); } else { - Db::name('store_product_cate')->insert(['pid'=>$pid,'store_id' => 1, 'cate_id' => $cate_id, 'count' => 1, 'level' => $level, 'create_time' => time(), 'update_time' => time()]); + Db::name('store_product_cate')->insert(['pid' => $pid, 'store_id' => $store_id, 'cate_id' => $cate_id, 'count' => 1, 'level' => $level, 'create_time' => time(), 'update_time' => time()]); } } + /** * 复制商品到门店 */ diff --git a/app/admin/logic/system_store/SystemStoreLogic.php b/app/admin/logic/system_store/SystemStoreLogic.php index 85324743..4e68384b 100644 --- a/app/admin/logic/system_store/SystemStoreLogic.php +++ b/app/admin/logic/system_store/SystemStoreLogic.php @@ -45,9 +45,14 @@ class SystemStoreLogic extends BaseLogic 'province' => $params['province_code'], 'city' => $params['city_code'], 'area' => $params['area_code'], + 'bank' => $params['bank']??'', + 'bank_code' => $params['bank_code']??'', + 'bank_address' => $params['bank_address']??'', + 'realname' => $params['realname']??'', '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'], @@ -102,7 +107,13 @@ class SystemStoreLogic extends BaseLogic 'day_time' => $params['day_time'] ?? 0, 'is_store' => $params['is_store'] ?? 0, 'is_send' => $params['is_send'] ?? 0, + 'bank' => $params['bank']??'', + 'bank_code' => $params['bank_code']??'', + '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/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index aaa9bf58..96d197bb 100644 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -13,9 +13,19 @@ // +---------------------------------------------------------------------- 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\store_order\StoreOrder; 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; @@ -52,7 +62,6 @@ class UserLogic extends BaseLogic 'mobile' => $params['mobile'], 'sex' => $params['sex'], 'is_disable' => $params['is_disable'], - 'user_money' => $params['user_money'] ]); Db::commit(); @@ -63,6 +72,47 @@ class UserLogic extends BaseLogic return false; } } + + public static function StoreAdd(array $params) + { + $passwordSalt = Config::get('project.unique_identification'); + $password = create_password(123456, $passwordSalt); + $defaultAvatar = config('project.default_image.admin_avatar'); + $avatar = !empty($params['avatar']) ? FileService::setFileUrl($params['avatar']) : $defaultAvatar; + + Db::startTrans(); + try { + $data=[ + 'avatar' => $avatar, + 'real_name' => $params['real_name']??"", + 'nickname' => '用户'.time(), + 'account' => $params['mobile'], + 'password' => $password, + 'mobile' => $params['mobile'], + 'user_ship' => $params['user_ship']??0, + + ]; + $res=User::create($data); + UserAddress::create([ + 'uid' => $res['id'], + 'real_name' => $params['real_name']??"", + 'mobile' => $params['mobile'], + 'province' => $params['province'], + 'city' => $params['city'], + 'area' => $params['area'], + 'street' => $params['street'], + 'village' => $params['village'], + 'brigade' => $params['brigade'], + 'is_default' => 1, + ]); + Db::commit(); + return $res; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } /** * @notes 编辑用户列表 * @param array $params @@ -75,15 +125,15 @@ class UserLogic extends BaseLogic Db::startTrans(); try { User::where('id', $params['id'])->update([ - 'avatar' => $params['avatar'] ?? '', - 'real_name' => $params['real_name'], - 'nickname' => $params['nickname'], - 'account' => $params['account'], - 'password' => $params['password'] ?? '', - 'mobile' => $params['mobile'] ?? '', - 'sex' => $params['sex'] ?? 0, - 'is_disable' => $params['is_disable'] ?? 0, - 'user_money' => $params['user_money'] ?? 0 + // 'avatar' => $params['avatar'] ?? '', + // 'real_name' => $params['real_name'], + // 'nickname' => $params['nickname'], + // 'account' => $params['account'], + // 'password' => $params['password'] ?? '', + // 'mobile' => $params['mobile'] ?? '', + // 'sex' => $params['sex'] ?? 0, + // 'is_disable' => $params['is_disable'] ?? 0, + 'label_id'=>$params['label_id'] ]); Db::commit(); @@ -105,8 +155,8 @@ class UserLogic extends BaseLogic public static function detail(int $userId): array { $field = [ - 'id', 'account', 'nickname', 'avatar', 'real_name', - 'sex', 'mobile', 'create_time', 'login_time', 'channel' + 'id', 'account', 'nickname', 'avatar', 'real_name','integral','label_id', + 'sex', 'mobile', 'create_time', 'login_time', 'channel','now_money','purchase_funds' ]; $user = User::where(['id' => $userId])->field($field) @@ -114,6 +164,8 @@ class UserLogic extends BaseLogic $user['channel'] = UserTerminalEnum::getTermInalDesc($user['channel']); $user->sex = $user->getData('sex'); + $user['number']=StoreFinanceFlow::where('other_uid',$userId)->where(['status'=>0,'financial_pm'=>1,'type'=>1])->sum('number'); + $user['label_name']=$user->label_id?UserLabel::where('label_id',$user->label_id)->value('label_name'):""; return $user->toArray(); } @@ -132,4 +184,65 @@ class UserLogic extends BaseLogic $params['field'] => $params['value'] ]); } + + public static function dealDetails($params) + { + switch ($params['type']){ + case 1: + //采购款明细 + $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 = 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: + //礼品券明细 + $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 [ + 'lists' => $data, + 'count' => $count + ]; + + + } } diff --git a/app/admin/logic/user_label/UserLabelLogic.php b/app/admin/logic/user_label/UserLabelLogic.php new file mode 100644 index 00000000..d8a766b7 --- /dev/null +++ b/app/admin/logic/user_label/UserLabelLogic.php @@ -0,0 +1,94 @@ + $params['label_name'] + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 编辑用户标签 + * @param array $params + * @return bool + * @author admin + * @date 2024/06/17 17:02 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + UserLabel::where('label_id', $params['label_id'])->update([ + 'label_name' => $params['label_name'] + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 删除用户标签 + * @param array $params + * @return bool + * @author admin + * @date 2024/06/17 17:02 + */ + public static function delete(array $params): bool + { + return UserLabel::destroy($params['label_id']); + } + + + /** + * @notes 获取用户标签详情 + * @param $params + * @return array + * @author admin + * @date 2024/06/17 17:02 + */ + public static function detail($params): array + { + return UserLabel::findOrEmpty($params['label_id'])->toArray(); + } +} \ No newline at end of file diff --git a/app/admin/validate/financial_transfers/FinancialTransfersValidate.php b/app/admin/validate/financial_transfers/FinancialTransfersValidate.php new file mode 100644 index 00000000..ff106e15 --- /dev/null +++ b/app/admin/validate/financial_transfers/FinancialTransfersValidate.php @@ -0,0 +1,108 @@ + 'require', + 'store_id' => 'require', + 'money' => 'require', + 'status' => 'require|number', + 'transfer_picture' => 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'store_id' => '店铺id', + 'money' => '金额', + 'status' => '状态', + 'transfer_picture' => '财务上传凭证', + ]; + + + public function sceneSend() + { + return $this->only(['id']); + } + + + public function sceneConfirm() + { + return $this->only(['id','status']); + } + + public function sceneSuccess() + { + return $this->only(['id','transfer_picture','status']); + } + + + + /** + * @notes 添加场景 + * @return FinancialTransfersValidate + * @author admin + * @date 2024/06/14 10:10 + */ + public function sceneAdd() + { + return $this->only(['store_id','money']); + } + + + /** + * @notes 编辑场景 + * @return FinancialTransfersValidate + * @author admin + * @date 2024/06/14 10:10 + */ + public function sceneEdit() + { + return $this->only(['id','store_id','money']); + } + + + /** + * @notes 删除场景 + * @return FinancialTransfersValidate + * @author admin + * @date 2024/06/14 10:10 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return FinancialTransfersValidate + * @author admin + * @date 2024/06/14 10:10 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file diff --git a/app/admin/validate/user/UserValidate.php b/app/admin/validate/user/UserValidate.php index b6a91c8e..f08c1518 100644 --- a/app/admin/validate/user/UserValidate.php +++ b/app/admin/validate/user/UserValidate.php @@ -24,10 +24,17 @@ class UserValidate extends BaseValidate 'nickname' => 'require', 'account' => 'require', 'password' => 'require', - 'mobile' => 'require|mobile', + 'mobile' => 'require|unique:user', 'is_disable' => 'in:0,1', 'sex' => 'in:1,2', - 'user_money' => 'float' + 'province' => 'require', + 'city' => 'require', + 'area' => 'require', + 'street' => 'require', + 'village' => 'require', + 'brigade' => 'require', + 'user_ship' => 'require', + 'type' => 'require|number', ]; @@ -44,10 +51,21 @@ class UserValidate extends BaseValidate 'mobile' => '用户电话', 'is_disable' => '是否禁用', 'sex' => '用户性别', - 'user_money' => '用户余额', + 'province' => '省', + 'city' => '市', + 'area' => '区', + 'street' => '街道', + 'village' => '村', + 'brigade' => ' 队', + 'user_ship' => ' 会员类型', + 'type' => '查询类型', ]; + public function sceneFund() + { + return $this->only(['type','id']); + } /** * @notes 添加场景 * @return UserValidate @@ -59,6 +77,10 @@ class UserValidate extends BaseValidate return $this->remove('id',true); } + public function scenestoreAdd() + { + return $this->only(['mobile','province','city','district','street','village','brigade','user_ship']); + } /** * @notes 编辑场景 @@ -68,7 +90,7 @@ class UserValidate extends BaseValidate */ public function sceneEdit() { - return $this->only(['id','avatar','real_name','nickname','account','password','mobile','is_disable','sex','user_money'])->remove('password','require'); + return $this->only(['id','avatar','real_name','nickname','account','password','mobile','is_disable','sex'])->remove('password','require'); } diff --git a/app/admin/validate/user_label/UserLabelValidate.php b/app/admin/validate/user_label/UserLabelValidate.php new file mode 100644 index 00000000..2289e563 --- /dev/null +++ b/app/admin/validate/user_label/UserLabelValidate.php @@ -0,0 +1,84 @@ + 'require', + 'label_name' => 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'label_id' => 'label_id', + 'label_name' => '标签名称', + ]; + + + /** + * @notes 添加场景 + * @return UserLabelValidate + * @author admin + * @date 2024/06/17 17:02 + */ + public function sceneAdd() + { + return $this->only(['label_name']); + } + + + /** + * @notes 编辑场景 + * @return UserLabelValidate + * @author admin + * @date 2024/06/17 17:02 + */ + public function sceneEdit() + { + return $this->only(['label_id','label_name']); + } + + + /** + * @notes 删除场景 + * @return UserLabelValidate + * @author admin + * @date 2024/06/17 17:02 + */ + public function sceneDelete() + { + return $this->only(['label_id']); + } + + + /** + * @notes 详情场景 + * @return UserLabelValidate + * @author admin + * @date 2024/06/17 17:02 + */ + public function sceneDetail() + { + return $this->only(['label_id']); + } + +} \ No newline at end of file diff --git a/app/api/controller/BaseApiController.php b/app/api/controller/BaseApiController.php index e3d9026a..516bf8be 100644 --- a/app/api/controller/BaseApiController.php +++ b/app/api/controller/BaseApiController.php @@ -2,8 +2,7 @@ namespace app\api\controller; use app\common\controller\BaseLikeController; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + class BaseApiController extends BaseLikeController { diff --git a/app/api/controller/DataController.php b/app/api/controller/DataController.php new file mode 100644 index 00000000..d3abee45 --- /dev/null +++ b/app/api/controller/DataController.php @@ -0,0 +1,62 @@ +find(); + if ($one) { + //查二级分类 + $two = StoreCategory::where('id', $one['pid'])->find(); + if ($two) { + if ($two['pid'] != 0) { + self::cate_update($cate_id, $two['id'], $store_id, 3); + self::cate_update($two['id'], $two['pid'], $store_id, 2); + self::cate_update($two['pid'], 0, $store_id, 1); + } else { + if ($one['pid'] == 0) { + self::cate_update($one['id'], 0, $store_id, 1); + } else { + self::cate_update($one['id'], $one['pid'], $store_id, 2); + self::cate_update($one['pid'], 0, $store_id, 1); + } + } + } + } + } + + public static function cate_update($cate_id = 0, $pid = 0, $store_id = 0, $level = 1) + { + $find = Db::name('store_product_cate')->where(['store_id' => $store_id, 'cate_id' => $cate_id, 'level' => $level])->find(); + if ($find) { + Db::name('store_product_cate')->where('id', $find['id'])->inc('count', 1)->update(); + } else { + Db::name('store_product_cate')->insert(['pid' => $pid, 'store_id' => $store_id, 'cate_id' => $cate_id, 'count' => 1, 'level' => $level, 'create_time' => time(), 'update_time' => time()]); + } + } + + + public static function show() + { + //处理分类缺失 + $store_id = 23; + $data = StoreBranchProduct::where('store_id', $store_id) + ->field('cate_id,store_id') + ->select()->toArray(); + foreach ($data as $value){ + self::updateGoodsclass($value['cate_id'], $value['store_id']); + } + + d($data); + + + } + +} \ No newline at end of file diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index 1205aadb..5ccf2795 100644 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -2,57 +2,61 @@ namespace app\api\controller; +use app\admin\logic\store_product\StoreProductLogic; use app\admin\validate\tools\GenerateTableValidate; use app\admin\logic\tools\GeneratorLogic; use app\common\logic\store_order\StoreOrderLogic; +use app\common\model\store_branch_product\StoreBranchProduct; +use app\common\model\system_store\SystemStore; use app\common\service\pay\PayService; use app\common\service\wechat\WechatTemplate; use Exception; use support\Cache; use think\facade\Db; use Webman\Config; -use hg\apidoc\annotation as ApiDoc; use support\Log; use Yansongda\Pay\Exception\InvalidSignException; use Monolog\Handler\RotatingFileHandler; use Webman\RedisQueue\Redis; -#[ApiDoc\NotParse()] + class IndexController extends BaseApiController { - public $notNeedLogin = ['index', 'app_update', 'express_list', 'province', 'city', 'area', 'street']; + public $notNeedLogin = ['index', 'app_update', 'express_list', 'province', 'city', 'area', 'street', 'village', 'brigade', 'config']; public function index() { - Redis::send('push-platform-print', ['order_id' => 119]); - d(2); - + $arr = StoreBranchProduct::select(); + foreach ($arr as $item) { + StoreProductLogic::updateGoodsclass($item['cate_id'], $item['store_id']); + } + d(1); try { - $wechat = new PayService(1); - $time = time(); - $order = [ - 'out_trade_no' => 'PF1717558027664507', - 'out_refund_no' => 'BO'.$time, - 'amount' => [ - 'refund' => 1, - 'total' => 1, - 'currency' => 'CNY', - ], - // '_action' => 'jsapi', // jsapi 退款，默认 - // '_action' => 'app', // app 退款 - // '_action' => 'combine', // 合单退款 - // '_action' => 'h5', // h5 退款 - // '_action' => 'miniapp', // 小程序退款 - // '_action' => 'native', // native 退款 + $wechat = new PayService(1); + $time = time(); + $order = [ + 'out_trade_no' => 'PF1717558027664507', + 'out_refund_no' => 'BO' . $time, + 'amount' => [ + 'refund' => 1, + 'total' => 1, + 'currency' => 'CNY', + ], + // '_action' => 'jsapi', // jsapi 退款，默认 + // '_action' => 'app', // app 退款 + // '_action' => 'combine', // 合单退款 + // '_action' => 'h5', // h5 退款 + // '_action' => 'miniapp', // 小程序退款 + // '_action' => 'native', // native 退款 - ]; + ]; - $res = $wechat->wechat->refund($order); - Cache::set('kk',json_decode($res,true)); + $res = $wechat->wechat->refund($order); + Cache::set('kk', json_decode($res, true)); } catch (Exception $e) { - \support\Log::info($e->extra['message']?? $e->getMessage()); - throw new \Exception($e->extra['message']?? $e->getMessage()); + \support\Log::info($e->extra['message'] ?? $e->getMessage()); + throw new \Exception($e->extra['message'] ?? $e->getMessage()); } d(1); @@ -63,15 +67,15 @@ class IndexController extends BaseApiController - try{ - $a=new WechatTemplate(); - $a->NewQuotationNotification(['openid'=>'ocqhF6UfFQXE-SbzbP5YVQJlQAh0','data1'=>'阿萨','data2'=>date('Y-m-d H:i:s'),'data3'=>'占山','data3'=>18982406440]); - }catch (Exception $e){ + try { + $a = new WechatTemplate(); + $a->NewQuotationNotification(['openid' => 'ocqhF6UfFQXE-SbzbP5YVQJlQAh0', 'data1' => '阿萨', 'data2' => date('Y-m-d H:i:s'), 'data3' => '占山', 'data3' => 18982406440]); + } catch (Exception $e) { d($e); } -d(22); + d(22); $auth_code = $this->request->get('code'); $pay = (new PayService()); $order = [ @@ -81,7 +85,7 @@ d(22); 'auth_code' => (string)$auth_code ], 'amount' => [ - 'total' =>1, + 'total' => 1, ], 'scene_info' => [ "store_info" => [ @@ -89,14 +93,13 @@ d(22); ] ], ]; - - try{ - $a= $pay->wechat->pos($order); - }catch (\Exception $th) { - d($th); + try { + $a = $pay->wechat->pos($order); + } catch (\Exception $th) { + d($th); } -d($a); + d($a); $params = ['store_id' => 2, 'pay_type' => 17]; $a = StoreOrderLogic::createOrder([1], 0, null, $params); d($a); @@ -139,7 +142,7 @@ d($a); */ public function city() { - $province_code = $this->request->get('code'); + $province_code = $this->request->get('province_code'); $list = Db::name('geo_city')->where('province_code', $province_code)->select()?->toArray(); return $this->success('ok', $list); } @@ -148,7 +151,7 @@ d($a); */ public function area() { - $city_code = $this->request->get('code'); + $city_code = $this->request->get('city_code'); $list = Db::name('geo_area')->where('city_code', $city_code)->select()?->toArray(); return $this->success('ok', $list); } @@ -161,4 +164,36 @@ d($a); $list = Db::name('geo_street')->where('area_code', $area_code)->select()?->toArray(); return $this->success('ok', $list); } + + /** + * @notes 获取村列表 + */ + public function village() + { + $area_code = $this->request->get('street_code'); + $list = Db::name('geo_village')->where('street_code', $area_code)->select()?->toArray(); + return $this->success('ok', $list); + } + /** + * @notes 获取队列表 + */ + public function brigade() + { + $list = Db::name('geo_brigade')->select()?->toArray(); + return $this->success('ok', $list); + } + + /** + * @notes 获取队列表 + */ + public function config() + { + $store_id = getenv('STORE_ID') ?? 1; + $find = SystemStore::where('id', $store_id)->find(); + $list = [ + 'id' => $find['id'], + 'store_name' => $find['name'], + ]; + return $this->success('ok', $list); + } } diff --git a/app/api/controller/LiuController.php b/app/api/controller/LiuController.php new file mode 100644 index 00000000..b7005658 --- /dev/null +++ b/app/api/controller/LiuController.php @@ -0,0 +1,1368 @@ +=', $startTime) + ->where('create_time', '<', $endTime) + ->where('pay_type',$pay_type)->select()->toArray(); + if($pay_type == 18){ + $category_title = 'system_purchase_add'; + $title ='系统增加采购款'; + $mark ='系统增加采购款'; + $filed = 'purchase_funds'; + }else{ + $category_title = 'system_balance_add'; + $title ='系统增加余额'; + $mark ='系统反余额冻结'; + $filed = 'now_money'; + } + + $newArr = []; + foreach ($vipFrozen as $k =>$value){ + $user_funds = User::where('id',$value['user_id'])->value($filed); + $newArr[$k]['uid'] = $value['user_id']; + $newArr[$k]['category'] = $category_title; + $newArr[$k]['link_type'] = 'order'; + $newArr[$k]['link_id'] = $value['order_id']; + $newArr[$k]['amount'] = $value['number']; + $newArr[$k]['before_balance'] =$user_funds; + $newArr[$k]['balance'] = bcadd($user_funds, $value['number'], 2); + $newArr[$k]['create_time'] = date('Y-m-d H:i:s'); + $newArr[$k]['type'] = 'in'; + $newArr[$k]['title'] = $title."{$value['number']}元"; + $newArr[$k]['mark'] = $mark; + } + (new CapitalFlow())->saveAll($newArr); + + } + + + public function test() + { + + + $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,20); + $res['page_no'] = $params['page_no']; + $res['page_size'] = $params['page_size']; + return $this->success('ok', $res); + + + + + + +// $res = (new StoreOrderLogic)->refund('PF1719023023405552',180,180); +// d($res); + /** + * 加入确认表 + */ + /* $startTime = 1717171200; // 开始时间 + $endTime = 1719676800; // 结束时间 + //对平台来说 + $data = StoreFinanceFlow:: + whereBetween('create_time', [$startTime, $endTime]) + ->field(' + CONCAT("第", LPAD(YEAR(FROM_UNIXTIME(create_time, "%Y-%m-%d")), 4, "0"), "-", LPAD(WEEK(FROM_UNIXTIME(create_time, "%Y-%m-%d"), 3), 2, "0"), "周(", LPAD(MONTH(FROM_UNIXTIME(create_time, "%Y-%m-%d")), 2, "0"), "月)") as remark_time, + SUM(CASE WHEN financial_pm = 1 THEN number ELSE 0 END) as income, + SUM(CASE WHEN financial_pm = 0 THEN number ELSE 0 END) as money, + store_id + ') + ->where('financial_pm', 0) + ->group('remark_time,store_id') + ->order('remark_time', 'desc') + ->select() + // ->each(function ($item) { + // $item['name'] = '周账单'; + // $item['enter']=bcdiv($item['income'],$item['expenditure'],2); + // return $item; + // }) + ->toArray(); + // foreach ($data as &$v) { + // $v['admin_id'] =$this->adminId; + // } + + (new FinancialTransfers())->saveAll($data); + + + d($data);*/ + + + //反钱 + //读取前3天的值 按照用户id和类型分下 加到对应的钱 + $startTime = strtotime(date('Y-m-d', strtotime('-3 days'))); + $endTime = strtotime(date('Y-m-d')); + + // 使用模型查询 + $result = VipFlow::where('create_time', '>=', $startTime) + ->where('create_time', '<', $endTime) + ->group('user_id, pay_type') + ->field('user_id, pay_type, COUNT(*) as transaction_count, SUM(number) as total_amount') + ->select()->toArray(); + + // 遍历查询结果并分类 现金不进入反的逻辑 + //3余额 18采购款 7微信小程序 9微信条码 13 支付宝条码支付 + $Balance = []; + $Procurement = []; + $WechatMiniPay = []; + $WechatBarcodePay = []; + $AliBarcodePay = []; + foreach ($result as $row) { + $payType = $row['pay_type']; + $userId = $row['user_id']; + $totalAmount = $row['total_amount']; + switch ($payType) { + case 3: + $user_now_money =User::where( + [ + 'id'=>$userId + ] + )->withTrashed()->value('now_money'); + $Balance[] = [ + 'id' => $userId, + 'now_money' => bcadd($user_now_money,$totalAmount,2), + ]; + break; + case 7: + $WechatMiniPay[] = [ + 'id' => $userId, + 'total_amount' => $totalAmount, + ]; + break; + case 9: + $WechatBarcodePay[] = [ + 'id' => $userId, + 'total_amount' => $totalAmount, + ]; + break; + case 13: + $AliBarcodePay[] = [ + 'id' => $userId, + 'total_amount' => $totalAmount, + ]; + break; + case 18: + $purchase_funds_money =User::where( + [ + 'id'=>$userId + ] + )->withTrashed()->value('purchase_funds'); + $Procurement[] = [ + 'id' => $userId, +// '111' => $totalAmount, + 'purchase_funds' => bcadd($purchase_funds_money,$totalAmount,2), + ]; + break; + } +// // 如果分类数组中还没有这个 pay_type，初始化一个空数组 +// if (!isset($classifiedResult[$payType])) { +// $classifiedResult[$payType] = []; +// } +// +// // 将用户信息添加到对应的 pay_type 分类中 +// $classifiedResult[$payType][] = [ +// 'uid' => $userId, +// 'total_amount' => $totalAmount, +// ]; + } + + //入记录表的话查询后便利入 3余额 18采购款 +// if($Balance){ + //记录 +// (new User())->saveAll($Balance); +// $this->dealCapital($startTime,$endTime,3); +// } +// if($Procurement){ +// (new User())->saveAll($Procurement); +// $this->dealCapital($startTime,$endTime,18); +// } + //7微信小程序 9微信条码 13 支付宝条码支付 + d($Balance,$Procurement,$WechatMiniPay,$WechatBarcodePay,$AliBarcodePay); + + + + + $result = array_reduce($result, function ($carry, $item) { + $user_id = $item['user_id']; + $pay_type = $item['pay_type']; + $total_amount = $item['total_amount']; + + if (!isset($carry[$user_id])) { + $carry[$user_id] = []; + } + + if (!isset($carry[$user_id][$pay_type])) { + $carry[$user_id][$pay_type] = [ + 'uid' => $user_id, + 'transaction_count' => 0, + 'total_amount' => 0 + ]; + } + + $carry[$user_id][$pay_type]['transaction_count'] += $item['transaction_count']; + $carry[$user_id][$pay_type]['total_amount'] += $item['total_amount']; + + return $carry; + }, []); + d($result); + + //3余额 17现金 18采购款 7微信小程序 9微信条码 13 支付宝条码支付 + foreach ($result as $value) { + switch ($value['pay_type']) { + + case 3: + echo 2; + break; + + case 7: + case 9: + echo 1; + break; + + case 13: + echo 13; + break; + + case 17: + echo 17; + break; + + case 18: + echo 18; + break; + } + d($value); + } + + d($result); + + + $params = (new \app\api\validate\UserValidate())->post()->goCheck('setPayPassword'); + + //匹配验证码正确 + + if ($params['repassword'] !== $params['password']) + return $this->fail('两次密码不一致'); + + $password = payPassword($params['password']); + + User::where('id', $params['id'])->update(['pay_password' => $password]); + + + d($params); + + + d(password_hash(123456, PASSWORD_BCRYPT)); +// $updateData = []; +// $goods_list = StoreOrderCartInfo::where('oid',473)->select()->toArray(); +// +// foreach ($goods_list as $v) { +// $StoreBranchProduct =StoreBranchProduct::where( +// [ +// 'store_id'=>$v['store_id'], +// 'product_id'=>$v['product_id'], +// ] +// )->withTrashed()->find(); +// $updateData[] = [ +// 'id' => $StoreBranchProduct['id'], +// 'stock' => $StoreBranchProduct['stock']-$v['cart_num'], +// 'sales' => ['inc', $v['cart_num']] +// ]; +// +// } +// +// (new StoreBranchProduct())->saveAll($updateData); +// +// +// d($updateData); + + + $dateRange = $this->request->get('date'); + // 拆分日期范围 + if ($dateRange) { + list($startDate, $endDate) = explode('-', $dateRange); + $startTime = str_replace('/', '-', $startDate); + $endTime = str_replace('/', '-', $endDate); + } else { + $startTime = ''; + } + + if (empty($startTime)) { + $startTime = strtotime(date('Y-m-d')); + $endTime = $startTime + 86400; + } + $where = [ + ['create_time', 'between', [$startTime, $endTime]], + ['store_id', '=', 23] + ]; + + $workbench = WorkbenchLogic::get_product_ranking($where); + return $this->data($workbench); + + + $order = StoreOrder::where('order_id', 'PF1718873590826700')->findOrEmpty(); +// +// $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); +// } + + +// foreach ($cart_id as &$value){ +// +// } + + + d($store_id, $cart_id, $uid); + + + $cart = Cart::create([ + 'uid' => 777, + 'type' => $params['type'] ?? '', + 'product_id' => 12, + 'store_id' => 2 ?? 0, + 'staff_id' => $params['staff_id'] ?? 0, + 'product_attr_unique' => '', + 'cart_num' => 1, + 'is_new' => 1 ?? 0, + ]); + + d($cart, $cart['id']); + + + //处理类型变更 + $order = StoreOrder::where('pay_type', 3)->field('id')->select()->toArray(); + $new = array_column($order, 'id'); +// d($new,$order); + + $dd = CapitalFlow::where('category', 'user_order_pay') + ->whereIn('link_id', $new) + ->select()->toArray(); + + foreach ($dd as $value) { + CapitalFlow::where('id', $value['id'])->update(['category' => 'user_order_balance_pay']); + } + + + d($dd); + + + $categories = ['user_balance_recharge', 'user_order_purchase_pay']; + $query = CapitalFlow::where('uid', 17) + ->whereIn('category', $categories); + $count = $query->count(); + $data = $query + ->page(1, 15) + ->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'); + } + } + + + d($data); + + + // + (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(); + $params['page_no'] = $page_no > 0 ? $page_no : 1; + $params['page_size'] = $page_size > 0 ? $page_size : 15; + + 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; + } +// d($data,$count); + + $res = [ + 'list' => $data, + 'count' => $count + ]; + +// d($params); + + $res['page_no'] = $params['page_no']; + $res['page_size'] = $params['page_size']; + return $this->success('ok', $res); + + $field = "id,nickname,real_name,sex,avatar,account,mobile,channel,create_time,purchase_funds,user_ship, + label_id,integral"; + $lists = User:: + with(['user_ship', 'user_label']) + ->field($field) + ->page(1, 50) + ->order('id desc') + ->select()->each(function ($data) { + $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; + + + } + + d($lists); + + + $params = [ + 'id' => 460 + ]; + + $order = StoreOrder::with(['user', 'staff', 'product' => function ($query) { + $query->field(['id', 'oid', 'product_id', 'cart_info']); + }])->where($params)->find(); + if (empty($order)) { + throw new \Exception('订单不存在'); + } + $order['pay_time'] = $order['pay_time'] > 0 ? date('Y-m-d H:i:s', $order['pay_time']) : ''; + $order['status_name'] = OrderEnum::getOrderType($order['status']) ?? ''; + $order['refund_status_name'] = OrderEnum::refundStatus($order['refund_status']) ?? ''; + $order['refund_type_name'] = OrderEnum::refundType($order['refund_type']) ?? ''; + $order['pay_type_name'] = PayEnum::getPaySceneDesc($order['pay_type']) ?? ''; + + $detail = StoreOrderCartInfo::where('oid', $order['id'])->find()->toArray(); + $vip = 0; + if (isset($detail['cart_info']['vip']) && $detail['cart_info']['vip'] == 1) { + $vip = 1; + } + $order['vip'] = $vip; + $a = $order->toArray(); + + d($a); + + + $detail = StoreOrderCartInfo::where('oid', 460)->find()->toArray(); + $vip = 0; + if (isset($detail['cart_info']['vip']) && $detail['cart_info']['vip'] == 1) { + $vip = 1; + } + + + d($detail, $vip); + + + PayNotifyLogic::cash_pay('PF1718775365804124'); + d(222); + + + $params = [ + 'verify_code' => '4-00347', + 'store_id' => 5, + 'staff_id' => 2, + ]; + + $res = OrderLogic::writeOff($params); + d($res); + + + return $this->dataLists(new StoreOrderLists()); + + + $order = StoreOrder::where('id', 428)->find(); + + + if ($order['spread_uid'] > 0) { + $oldUser = User::where('id', $order['spread_uid'])->field('purchase_funds,user_ship')->find(); + if ($oldUser && $oldUser['user_ship'] == 1) { + if ($oldUser['purchase_funds'] < $order['pay_price']) { + $order['pay_price'] = $oldUser['purchase_funds']; + } + } + } + d($order['pay_price']); + + + PayNotifyLogic::afterPay($order); + + $order_id = (int)$this->request->get('order_id'); + $lat = $this->request->get('lat', ''); + $lng = $this->request->get('long', ''); + $where = [ + 'id' => $order_id, + 'uid' => $this->userId, + ]; + $url = 'https://' . $this->request->host(true); + $parm = [ + 'lat' => $lat, + 'long' => $lng + ]; + $order = OrderLogic::detail($where, $url, $parm); + if ($order) { + return $this->data($order); + } else { + return $this->fail('订单不存在'); + } + + + $order = StoreOrder::where('id', 392)->find(); + $vipFrozenAmount = 0; + if ($order['uid'] > 0) { + // 结算金额 要支付的钱减去冻结得钱去走后面得逻辑 发得兑换券也要去减去 + $vipFrozenAmount = self::dealFrozenPrice($order['id']); + $order['pay_price'] = bcsub($order['pay_price'], $vipFrozenAmount, 2); + $user_number = bcmul($order['pay_price'], '0.10', 2); + $sing = [ + 'uid' => $order['uid'], + 'order_id' => $order['order_id'], + 'title' => '购买商品获得兑换券', + 'store_id' => $order['store_id'], + 'number' => $user_number, + ]; +// d($sing); +// $user_sing->save($sing); +// User::where('id', $order['uid'])->inc('integral', $user_number)->update(); + } + + d($vipFrozenAmount, $order['pay_price'], $sing); + + + d($order); + if ($order['uid'] > 0) { + // 结算金额 要支付的钱减去冻结得钱去走后面得逻辑 发得兑换券也要去减去 + $vipFrozenAmount = self::dealFrozenPrice($order['id']); + $order['pay_price'] = bcsub($order['pay_price'], $vipFrozenAmount, 2); + //用户下单该用户等级为1得时候才处理冻结金额 + $user = User::where('id', $order['uid'])->find(); + if ($user['user_ship'] == 1) { + self::dealVipAmount($order, $order['pay_type']); + } + $user_number = bcmul($order['pay_price'], '0.10', 2); + $sing = [ + 'uid' => $order['uid'], + 'order_id' => $order['order_id'], + 'title' => '购买商品获得兑换券', + 'store_id' => $order['store_id'], + 'number' => $user_number, + ]; + $user_sing->save($sing); + User::where('id', $order['uid'])->inc('integral', $user_number)->update(); + } + + + // 使用聚合函数直接计算总和 +// $total_vip = StoreOrderCartInfo::where('oid', 334) +// ->sum(DB::raw('cart_info->>"$.vip_frozen_price"')); + +// $total_vip = StoreOrderCartInfo::where('oid', 334) +// ->sum(DB::raw('json_extract(cart_info, "$.vip_frozen_price")')); + + $total_vip = StoreOrderCartInfo::where('oid', 334) + ->field('cart_info->vip_frozen_price as vip_frozen_price') +// ->find() + ->pluck('vip_frozen_price') + ->sum(); + + d($total_vip); + + d($total_vip); + + + // 假设 cart_info 是一个 JSON 字段 + $detail = StoreOrderCartInfo::where('oid', $order['id']) + ->select('cart_info->vip_frozen_price as vip_frozen_price') + ->get() + ->pluck('vip_frozen_price') + ->sum(); + + + $redis = local_redis(1); + + $luaScript = <<= quantity then + redis.call('decrby', product_key, quantity) + return 1 -- 成功 +else + return 0 -- 失败 +end +LUA; + $productKey = 'kk'; + $quantity = 1; // 假设每次抢购一个商品 + + $result = $redis->eval($luaScript, [$productKey, $quantity], 1); + + if ($result == 1) { + d("抢购成功！"); + } else { + d("抢购失败，库存不足。"); + } + + +// Lua脚本，原子操作增加值 + $luaScript = <<eval($luaScript, $args, $numKeys); + + + d("Incremented value for '{$key}': {$result}"); + + + $redis->set('kk', 111); + d(1); + + $cost_all = CapitalFlow:: + where(['category' => 'user_order_balance_pay']) + ->sum('amount'); + + + //查询数据 +// $dd =Db::name('store_cash_finance_flow') + + $startTimeDefault = date('Y-m-d', time()); + $endTimeDefault = date('Y-m-d', strtotime($startTimeDefault) + 86400); + + $data = StoreCashFinanceFlow:: + where(['store_id' => 5])->order('id', 'desc') +// ->whereBetweenTime('create_time',$startTimeDefault,$endTimeDefault) + ->whereDay('create_time') + ->sum('receivable'); + d($data); + +// ->select()->toArray(); +// $sum = array_sum(array_column($data, 'receivable')); +// d($sum); + $cash_today = StoreCashFinanceFlow::where('store_id', 5) + ->whereDay('create_time') + ->where('status', YesNoEnum::YES) + ->fetchSql() + ->sum('receipts'); + d($cash_today); + + + d(StoreFinanceFlow:: + where(['other_uid' => 17, 'type' => 0, 'status' => 0]) + ->sum('number')); + $user = User::where('id', 15)->find()->toArray(); + $data = OrderLogic::cartIdByOrderInfo([1], 0, $user, ['store_id' => 2]); + d($data); + + + $data = StoreBranchProduct::field('id,product_id,cost,purchase')->withTrashed()->select()->toArray(); + + foreach ($data as $value) { + $one = StoreProduct::where('id', $value['product_id'])->field('cost,purchase')->withTrashed() + ->find()->toArray(); + + StoreBranchProduct::where('id', $value['id']) + ->update([ + 'cost' => $one['cost'], + 'purchase' => $one['purchase'], + ]); + } + + + d($data); + + + $template = getenv('SMS_TEMPLATE'); + + $check = (new SmsService())->client(18715753257, $template, 9527); + + + d($check); + + + $cartId = (array)$this->request->post('cart_id', []); + if (empty($cartId)) { + return $this->fail('缺失购物车数据'); + } + $uid = Cart::where('id', $cartId[0])->value('uid'); + d($uid); + + + $params = (new StoreOrderValidate())->post()->goCheck('check'); + $res = (new StoreOrderLogic())->dealSendSms($params); + if ($res) { + return $this->success('发送成功', [], 1, 1); + } else { + return $this->fail('发送失败'); + } + + + $template = getenv('SMS_TEMPLATE'); + d($template); + + $params = $this->request->post(); + $remark = '5_smsPay1'; + $code = Cache::get($remark); + + if ($code && isset($params['code']) && $code !== $params['code']) { + throw new Exception('验证码错误'); + } + + + d($code); + + + //发短信 + $phone = 18715753257; + $code = generateRandomCode(); + + Cache::set($remark, $code, 5 * 60); + d($code); + + $config = [ + // HTTP 请求的超时时间（秒） + 'timeout' => 5.0, + // 默认发送配置 + 'default' => [ + // 网关调用策略，默认：顺序调用 + 'strategy' => \Overtrue\EasySms\Strategies\OrderStrategy::class, + // 默认可用的发送网关 + 'gateways' => [ + 'aliyun', + ], + ], + // 可用的网关配置 + 'gateways' => [ + 'errorlog' => [ +// 'file' => '/tmp/easy-sms.log', + 'file' => runtime_path() . '/logs/alipay.log', + ], + 'aliyun' => [ + 'access_key_id' => 'LTAI5t7mhH3ij2cNWs1zhPmv', + 'access_key_secret' => 'gqo2wMpvi8h5bDBmCpMje6BaiXvcPu', + 'sign_name' => '里海科技', + ], + ], + ]; + + + try { + $easySms = new EasySms($config); + $res = $easySms->send($phone, [ + 'content' => '您的验证码为:' . $code, + 'template' => 'SMS_263810014', + 'data' => [ + 'code' => $code + ], + ]); + + if ($res && $res['aliyun']['status'] == 'success') { + return true; + } + + } catch (\Overtrue\EasySms\Exceptions\NoGatewayAvailableException $exception) { + throw new \Exception(json_encode($exception->getExceptions())); +// return false; + } + + + d($res); + + + $user = User::where('id', \request()->userId)->find(); + + +// $wechat = new PayService(1); +// $order = [ +// 'out_trade_no' => time().'', +// 'description' => 'subject-测试', +// 'amount' => [ +// 'total' => 1, +// ], +// ]; +// +// $res = $wechat->wechat->scan($order); + + + $startTime = 1714492800; // 开始时间 + $endTime = 1717171199; // 结束时间 + //对平台来说 + $data = StoreFinanceFlow:: + whereBetween('create_time', [$startTime, $endTime]) + ->field(' + CONCAT("第", LPAD(YEAR(FROM_UNIXTIME(create_time, "%Y-%m-%d")), 4, "0"), "-", LPAD(WEEK(FROM_UNIXTIME(create_time, "%Y-%m-%d"), 3), 2, "0"), "周(", LPAD(MONTH(FROM_UNIXTIME(create_time, "%Y-%m-%d")), 2, "0"), "月)") as remark_time, + SUM(CASE WHEN financial_pm = 1 THEN number ELSE 0 END) as income, + SUM(CASE WHEN financial_pm = 0 THEN number ELSE 0 END) as money, + store_id + ') + ->where('financial_pm', 0) + ->group('remark_time,store_id') + ->order('remark_time', 'desc') + ->select() +// ->each(function ($item) { +// $item['name'] = '周账单'; +// $item['enter']=bcdiv($item['income'],$item['expenditure'],2); +// return $item; +// }) + ->toArray(); + +// foreach ($data as &$v) { +// $v['admin_id'] =$this->adminId; +// } + + (new FinancialTransfers())->saveAll($data); + + + d($data); + + + $data = SystemStore::where('store_money', '>', 0) + ->field('id store_id,name,store_money money') + ->select()->toArray(); + + + $now = new \DateTime(); + $lastMonth = $now->modify('first day of last month'); + foreach ($data as &$v) { + $v['remark_time'] = $lastMonth->format('Y-m'); + } + + (new FinancialTransfers())->saveAll($data); + + + d($data); + + + return StoreFinanceFlow::whereBetweenTime('create_time', ['1714492800', '1717171199']) + ->field(' + CONCAT("第", LPAD(YEAR(FROM_UNIXTIME(create_time, "%Y-%m-%d")), 4, "0"), "-", LPAD(WEEK(FROM_UNIXTIME(create_time, "%Y-%m-%d"), 3), 2, "0"), "周(", LPAD(MONTH(FROM_UNIXTIME(create_time, "%Y-%m-%d")), 2, "0"), "月)") as date, + SUM(CASE WHEN financial_pm = 1 THEN number ELSE 0 END) as income, + SUM(CASE WHEN financial_pm = 0 THEN number ELSE 0 END) as expenditure,store_id + ') +// ->limit($this->limitOffset, $this->limitLength) + ->where('financial_pm', 0) + ->group('date,store_id') + ->order('date', 'desc') + ->select()->each(function ($item) { + $item['name'] = '周账单'; +// $item['enter']=bcdiv($item['income'],$item['expenditure'],2); + return $item; + }) + ->toArray(); + + + $wechat = new PayService(1); + $order = [ + 'out_trade_no' => 'PF1717729550406928', + 'out_refund_no' => time(), + 'amount' => [ + 'refund' => 1, + 'total' => 1, + 'currency' => 'CNY', + ], + // '_action' => 'jsapi', // jsapi 退款，默认 + // '_action' => 'app', // app 退款 + // '_action' => 'combine', // 合单退款 + // '_action' => 'h5', // h5 退款 + // '_action' => 'miniapp', // 小程序退款 + // '_action' => 'native', // native 退款 + + ]; + + $res = $wechat->wechat->transfer($order); + + + //生成条形码 + $generator = new BarcodeGeneratorPNG(); + $barcode = $generator->getBarcode('9-11476', $generator::TYPE_CODE_128); +// 指定保存路径 +// $savePath = 'qr/barcode.png'; + $savePath = 'public/image/barcode/barcode2.png'; +// 保存条形码到文件 + file_put_contents($savePath, $barcode); + +// echo ''; + d(111); + + + $user = new StoreBranchProduct(); + $list = [ + [ + 'id' => 14, + 'stock' => ['dec', 2], + 'sales' => ['inc', 2] +// 'stock' => 1017, + ], + [ + 'id' => 15, + 'stock' => ['dec', 1], + 'sales' => ['inc', 1] +// 'stock' => 10, + ] + ]; +// +// $updateData[] = [ +// 'id' => 14, +//// 'stock' => ['dec', $v['cart_num']] +// 'stock' => 10186 +// ]; + + + $user->withTrashed()->saveAll($list); + + d(1); + + + $code = '8-1717845671'; + $verify_code = createCode($code); + + d($verify_code); + $orderPickupCode = str_pad(rand(0, 99999), 5, '0', STR_PAD_LEFT); + + d($orderPickupCode); + $order_id = getNewOrderId('PF'); + + + d($order_id); + + + /*$order['pay_price'] = 0.01; + $order['store_id'] = 2; + $order['profit'] = "0.00"; + $fees = bcdiv(bcmul($order['pay_price'], '0.02', 2), 1, 2); + + + + $frozen = bcsub($order['profit'] , $fees, 2); + + + $money_limt = SystemStore::where('id', $order['store_id'])->field('paid_deposit,security_deposit')->find(); + $deposit = bcsub($money_limt['security_deposit'], $money_limt['paid_deposit'], 2); + d($fees,$frozen,$deposit); + + + + $a = 'PF1717494034927974-1'; + $check = StoreOrder::where('order_id',$a)->count(); + d($check);*/ + //付款 + $j = '{"id":"12c29662-eba0-532a-832e-12ddc30aa5ac","create_time":"2024-06-06T15:47:20+08:00","resource_type":"encrypt-resource","event_type":"TRANSACTION.SUCCESS","summary":"\u652f\u4ed8\u6210\u529f","resource":{"original_type":"transaction","algorithm":"AEAD_AES_256_GCM","ciphertext":{"mchid":"1654274867","appid":"wxdee751952c8c2027","out_trade_no":"PF1718073229145240","transaction_id":"4200002220202406064425693065","trade_type":"JSAPI","trade_state":"SUCCESS","trade_state_desc":"\u652f\u4ed8\u6210\u529f","bank_type":"ABC_DEBIT","attach":"wechat_common","success_time":"2024-06-06T15:47:20+08:00","payer":{"openid":"onoIP7c1qgjfIr2ce7GJAAmVGcL0"},"amount":{"total":1,"payer_total":1,"currency":"CNY","payer_currency":"CNY"}},"associated_data":"transaction","nonce":"blQOXyAUGK4K"}}'; + + + //退款 + /* $j = '{"id":"1841a014-0829-5c12-82d0-ab211d6c06e3","create_time":"2024-06-06T09:53:59+08:00","resource_type":"encrypt-resource","event_type":"REFUND.SUCCESS","summary":"\u9000\u6b3e\u6210\u529f","resource":{"original_type":"refund","algorithm":"AEAD_AES_256_GCM","ciphertext":{"mchid":"1654274867","out_trade_no":"PF1717558027664507","transaction_id":"4200002211202406058608104458","out_refund_no":"BO1717638826","refund_id":"50303409732024060648234415101","refund_status":"SUCCESS","success_time":"2024-06-06T09:53:59+08:00","amount":{"total":1,"refund":1,"payer_total":1,"payer_refund":1},"user_received_account":"\u652f\u4ed8\u7528\u6237\u96f6\u94b1"},"associated_data":"refund","nonce":"yteRBBbAwfdE"}}';*/ + + + $result = json_decode($j, true); + $ciphertext = $result['resource']['ciphertext']; + + PayNotifyLogic::handle('wechat_common', $ciphertext['out_trade_no'], $ciphertext); + + + d(1); + + + $order = StoreOrder::where('id', 80)->findOrEmpty(); +// d($order); + + $transaction_id = 12121212121212; + $financeLogic = new StoreFinanceFlowLogic(); + $financeLogic->order = $order; + $financeLogic->user = ['uid' => $order['uid']]; + if ($order->pay_type != 9 || $order->pay_type != 10) { + + $financeLogic->in($transaction_id, $order['pay_price'], OrderEnum::USER_ORDER_PAY); //用户单入账 + //商户应该获得的钱 每个商品的price-ot_price 利润 + if ($order->profit !== "0.00") { + //手续费 + $fees = bcdiv(bcmul($order['pay_price'], '0.02', 2), 1, 2); + $financeLogic->in($transaction_id, $fees, OrderEnum::ORDER_COMMITION, $order['store_id']); //手续费入账 + + $financeLogic->out($transaction_id, $order['profit'], OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0);//商户获得的 + //冻结金额的 + $frozen = bcsub($order->profit, $fees, 2); + //缴纳齐全了就加商户没有就加到平台 + $money_limt = SystemStore::where('id', $order['store_id'])->field('paid_deposit,security_deposit')->find(); + $deposit = bcsub($money_limt['security_deposit'], $money_limt['paid_deposit'], 2);//剩余额度 + if ($deposit > 0 && $frozen > 0) { + $amount = min($deposit, $frozen); + $financeLogic->in($transaction_id, $amount, OrderEnum::ORDER_MARGIN, $order['store_id'], $order['staff_id']); + } + + //当前商户得冻结金额如果缴纳满足了就加到商户余额中 + + } + $financeLogic->save(); + } + d(1); + + + $result = json_decode($j, true); + $ciphertext = $result['resource']['ciphertext']; + PayNotifyLogic::handle('refund', $ciphertext['out_trade_no'], $ciphertext); + + d($result); + + + if ($result && $result->event_type == 'REFUND.SUCCESS') { + $ciphertext = $result->resource['ciphertext']; + if ($ciphertext['refund_status'] === 'SUCCESS') { + //处理订单 -1判断是退的一单还是拆分的订单 + PayNotifyLogic::handle('refund', $ciphertext['out_trade_no'], $ciphertext); + $app->wechat->success(); + + } + } + + +// d(1511); + + //退款 + $wechat = new PayService(1); + $order = [ + 'out_trade_no' => 'PF1717729550406928', + 'out_refund_no' => time(), + 'amount' => [ + 'refund' => 1, + 'total' => 1, + 'currency' => 'CNY', + ], + // '_action' => 'jsapi', // jsapi 退款，默认 + // '_action' => 'app', // app 退款 + // '_action' => 'combine', // 合单退款 + // '_action' => 'h5', // h5 退款 + // '_action' => 'miniapp', // 小程序退款 + // '_action' => 'native', // native 退款 + + ]; + + $res = $wechat->wechat->refund($order); + d($res); + + //支付 + + $j = '{"id":"89b226d6-e305-5a83-9e7e-29b688cc3b10","create_time":"2024-06-05T11:27:21+08:00","resource_type":"encrypt-resource","event_type":"TRANSACTION.SUCCESS","summary":"\u652f\u4ed8\u6210\u529f","resource":{"original_type":"transaction","algorithm":"AEAD_AES_256_GCM","ciphertext":{"mchid":"1654274867","appid":"wxdee751952c8c2027","out_trade_no":"PF1717556761663487","transaction_id":"4200002211202406058608104458","trade_type":"JSAPI","trade_state":"SUCCESS","trade_state_desc":"\u652f\u4ed8\u6210\u529f","bank_type":"OTHERS","attach":"recharge","success_time":"2024-06-05T11:27:21+08:00","payer":{"openid":"onoIP7TFXN_106JkCMInwOTPCsD4"},"amount":{"total":1,"payer_total":1,"currency":"CNY","payer_currency":"CNY"}},"associated_data":"transaction","nonce":"4i7rmOABdwV3"}}'; + $result = json_decode($j, true); + $ciphertext = $result['resource']['ciphertext']; + + PayNotifyLogic::handle('wechat_common', $ciphertext['out_trade_no'], $ciphertext); + d(1); + + + $all = UserShip::field('id,title,limit')->select()->toArray(); + + $new = $this->getNextArrayByID($all, 1); + d($new); + d($all); + + + \support\Log::info('fasfsaf'); +// Log::info('fdadsdadasd'); + + d(6323); +// d($this->getAccessToken()); + $a = (new WeChatMnpService())->getAccessToken(); +// $a = (new WeChatMnpService())->getUserPhoneNumber('a5c44554ce7caf35d3cf2196da96f7ab735deaf674d639ecb482ce618fa82ee6'); + + d($a); + + + throw new MyBusinessException('缺失经纬度'); + + return $this->success('success', UserLogic::info(8)); + throw new Exception('缺失经纬度'); + $params = [ + 'pay_type' => 1, + 'mer_id' => 1, + ]; + self::$total = 0; + $order = [ + 'add_time' => time(), + 'create_time' => time(), + 'order_id' => getNewOrderId('PF'), + 'total_price' => self::$total,//总价 + 'total_num' => 1,//总数 + 'pay_type' => $params['pay_type'] ?? 0, + 'cart_id' => implode(',', [1, 2, 3]), +// 'delivery_msg'=>' 预计48小时发货 ' + ]; + + $_order = $order; + $_order['deduction_price'] = 0; + $_order['merchant'] = $params['mer_id']; + $_order['uid'] = request()->userId; + $_order['money'] = 0; + $_order['user'] = request()->userId; + $_order['account'] = 0; + $_order['payinfo'] = ''; + $_order['type'] = 0; + $_order['source'] = 0; + $_order['actual'] = $_order['total_price']; +// d($_order); +// if($addressId>0){ +// $address=UserAddress::where(['address_id'=>$addressId,'uid'=>Request()->userId])->find(); +// if($address){ +// $_order['real_name'] = $address['real_name']; +// $_order['user_phone'] = $address['phone']; +// $_order['user_address'] = $address['detail']; +// $_order['address_id'] = $addressId; +// } +// } + + +// if($params['pay_type']==PayEnum::WECHAT_PAY_BARCODE){ +// $_order['source']=1; +// } +// if($params['pay_type']==PayEnum::CASH_PAY){ +// $_order['money']=$_order['total']; +// } + + $order = StoreOrder::create($_order); + + + d($order); + + + } + + + public static function show() + { + //处理分类缺失 + $store_id = 23; + $data = StoreBranchProduct::where('store_id', $store_id) + ->field('cate_id,store_id') + ->select()->toArray(); + foreach ($data as $value) { + self::updateGoodsclass($value['cate_id'], $value['store_id']); + } + + d($data); + + + } + + + public static function dealFrozenPrice($oid) + { + $detail = StoreOrderCartInfo::where('oid', $oid)->select()->toArray(); + $total_vip = 0; + foreach ($detail as $value) { + $total_vip += $value['cart_info']['vip_frozen_price']; + } + return $total_vip; + } + + + public function getAccessToken() + { + // 微信接口地址 + $url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=wxdee751952c8c2027&secret=2c46d77df53cd942a7ff608247ea0ccd"; + + // 发送 HTTP GET 请求 + $response = file_get_contents($url); + + // 解析 JSON 响应 + $responseData = json_decode($response, true); + + // 检查是否成功获取 access_token + if (isset($responseData['access_token'])) { + return $responseData['access_token']; + } else { + // 获取 access_token 失败，可以记录错误信息 + error_log("Failed to get access_token: " . $response); + return null; + } + } + + + function getNextArrayByID($arr, $id) + { + // 遍历数组 + foreach ($arr as $key => $value) { + // 检查当前数组的id是否与传入的id匹配 + if ($value['id'] == $id) { + // 如果当前数组不是最后一个，则返回下一个数组 + if ($key + 1 < count($arr)) { + return $arr[$key + 1]; + } + // 如果当前数组是最后一个，则返回null或空数组 + return null; + } + } + // 如果没有找到匹配的id，则返回null或空数组 + return null; + } + + + public static function updateGoodsclass($cate_id, $store_id = 0, $type = 0) + { + $one = StoreCategory::where('id', $cate_id)->find(); + if ($one) { + //查二级分类 + $two = StoreCategory::where('id', $one['pid'])->find(); + if ($two) { + if ($two['pid'] != 0) { + self::cate_update($cate_id, $two['id'], $store_id, 3); + self::cate_update($two['id'], $two['pid'], $store_id, 2); + self::cate_update($two['pid'], 0, $store_id, 1); + } else { + if ($one['pid'] == 0) { + self::cate_update($one['id'], 0, $store_id, 1); + } else { + self::cate_update($one['id'], $one['pid'], $store_id, 2); + self::cate_update($one['pid'], 0, $store_id, 1); + } + } + } + } + } + + public static function cate_update($cate_id = 0, $pid = 0, $store_id = 0, $level = 1) + { + $find = Db::name('store_product_cate')->where(['store_id' => $store_id, 'cate_id' => $cate_id, 'level' => $level])->find(); + if ($find) { + Db::name('store_product_cate')->where('id', $find['id'])->inc('count', 1)->update(); + } else { + Db::name('store_product_cate')->insert(['pid' => $pid, 'store_id' => $store_id, 'cate_id' => $cate_id, 'count' => 1, 'level' => $level, 'create_time' => time(), 'update_time' => time()]); + } + } + + +} \ No newline at end of file diff --git a/app/api/controller/LoginController.php b/app/api/controller/LoginController.php index d58b2ab1..2e1ba315 100644 --- a/app/api/controller/LoginController.php +++ b/app/api/controller/LoginController.php @@ -6,8 +6,7 @@ use app\api\logic\LoginLogic; use app\common\model\system_store\SystemStore; use app\api\validate\{LoginAccountValidate, WechatLoginValidate}; use app\common\model\user\UserAuth; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + class LoginController extends BaseApiController { @@ -19,7 +18,7 @@ class LoginController extends BaseApiController public function account() { $params=$this->request->post(); - $params = (new LoginAccountValidate())->post()->goCheck(); +// $params = (new LoginAccountValidate())->post()->goCheck(); $result = LoginLogic::login($params); if (false === $result) { return $this->fail(LoginLogic::getError()); diff --git a/app/api/controller/PayController.php b/app/api/controller/PayController.php index bcff5cf6..90e6bfce 100644 --- a/app/api/controller/PayController.php +++ b/app/api/controller/PayController.php @@ -9,8 +9,7 @@ use app\common\model\store_order\StoreOrder; use app\common\service\pay\PayService; use support\Cache; use support\Log; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + /** * 支付 @@ -69,6 +68,7 @@ class PayController extends BaseApiController public function wechatQuery() { $order_no = $this->request->get('order_no'); + $recharge = $this->request->get('recharge',0); $order = [ 'out_trade_no' => $order_no, ]; @@ -76,7 +76,11 @@ class PayController extends BaseApiController $res = $app->wechat->query($order); if ($res['trade_state'] == 'SUCCESS' && $res['trade_state_desc'] == '支付成功') { - PayNotifyLogic::handle('wechat_common', $res['out_trade_no'], $res); + if($recharge==0){ + PayNotifyLogic::handle('wechat_common', $res['out_trade_no'], $res); + }else{ + PayNotifyLogic::handle('recharge', $res['out_trade_no'], $res); + } return $this->success('支付成功'); } else { return $this->fail('订单支付中'); diff --git a/app/api/controller/UploadController.php b/app/api/controller/UploadController.php index 6ca02620..dc299346 100644 --- a/app/api/controller/UploadController.php +++ b/app/api/controller/UploadController.php @@ -4,8 +4,7 @@ use app\common\service\UploadService; use Exception; - use hg\apidoc\annotation as ApiDoc; - #[ApiDoc\NotParse()] + class UploadController extends BaseApiController { diff --git a/app/api/controller/cate/CateController.php b/app/api/controller/cate/CateController.php index 17e573af..5f6e4bb8 100644 --- a/app/api/controller/cate/CateController.php +++ b/app/api/controller/cate/CateController.php @@ -5,8 +5,7 @@ namespace app\api\controller\cate; use app\api\controller\BaseApiController; use app\api\lists\cate\CateLists; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + /** * 商品分类控制器 diff --git a/app/api/controller/order/CartController.php b/app/api/controller/order/CartController.php index 06ad4b0d..0f0346d9 100644 --- a/app/api/controller/order/CartController.php +++ b/app/api/controller/order/CartController.php @@ -8,9 +8,8 @@ use app\api\controller\BaseApiController; use app\api\lists\order\CartList; use app\common\model\order\Cart; use app\common\model\store_branch_product\StoreBranchProduct; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + class CartController extends BaseApiController { public function list() @@ -26,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/api/controller/order/OrderController.php b/app/api/controller/order/OrderController.php index 894f1833..27553902 100644 --- a/app/api/controller/order/OrderController.php +++ b/app/api/controller/order/OrderController.php @@ -13,11 +13,10 @@ use app\common\logic\PayNotifyLogic; use app\common\model\dict\DictData; use app\common\model\store_order\StoreOrder; use app\common\model\system_store\SystemStoreStaff; +use app\common\model\user\User; use app\common\model\user\UserAddress; use Webman\RedisQueue\Redis; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\title('订单')] class OrderController extends BaseApiController { public $notNeedLogin = ['refund_reason']; @@ -31,15 +30,15 @@ class OrderController extends BaseApiController return $this->dataLists(new OrderList()); } - #[ - ApiDoc\Title('核销码查数据'), - ApiDoc\url('/api/order/order/write_code'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "code", type: "string", require: false, desc: "核销码"), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('核销码查数据'), + // ApiDoc\url('/api/order/order/write_code'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "code", type: "string", require: false, desc: "核销码"), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function write_code() { $code = $this->request->post('code'); @@ -53,18 +52,18 @@ class OrderController extends BaseApiController return $this->success('ok', $res); } - #[ - ApiDoc\Title('核销订单列表'), - ApiDoc\url('/api/order/order/write_list'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "status", type: "int", require: true, desc: "1：待核销；2：已核销"), - ApiDoc\Param(name: "name", type: "string", require: false, desc: "搜商品或者订单id"), - ApiDoc\Param(name: "page_no", type: "int", require: true, desc: "默认1页数"), - ApiDoc\Param(name: "page_size", type: "int", require: false, desc: "条数默认15"), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('核销订单列表'), + // ApiDoc\url('/api/order/order/write_list'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "status", type: "int", require: true, desc: "1：待核销；2：已核销"), + // ApiDoc\Param(name: "name", type: "string", require: false, desc: "搜商品或者订单id"), + // ApiDoc\Param(name: "page_no", type: "int", require: true, desc: "默认1页数"), + // ApiDoc\Param(name: "page_size", type: "int", require: false, desc: "条数默认15"), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function write_list() { $status = (int)$this->request->post('status', 1); @@ -82,15 +81,15 @@ class OrderController extends BaseApiController return $this->success('ok', $res); } - #[ - ApiDoc\Title('核销数量'), - ApiDoc\url('/api/order/order/write_count'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "name", type: "string", require: false, desc: "搜商品或者订单id"), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('核销数量'), + // ApiDoc\url('/api/order/order/write_count'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "name", type: "string", require: false, desc: "搜商品或者订单id"), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function write_count() { $info = $this->userInfo; @@ -99,41 +98,41 @@ class OrderController extends BaseApiController return $this->success('ok', $res); } - #[ - ApiDoc\Title('订单校验'), - ApiDoc\url('/api/order/order/checkOrder'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "cart_id", type: "int", require: true, desc: "购物车id"), - ApiDoc\Param(name: "address_id", type: "int", require: true, desc: "地址id"), - ApiDoc\Param(name: "store_id", type: "int", require: true, desc: "店铺id"), - ApiDoc\Param(name: "verify_code", type: "int", require: true, desc: "校验码"), - ApiDoc\Param(name: "shipping_type", type: "int", require: true, desc: "配送方式"), - ApiDoc\Param(name: "pay_type", type: "int", require: true, desc: "支付类型"), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array", children: [ - ['name' => 'order', 'desc' => '订单信息', 'type' => 'array', 'children' => [ - ['name' => 'create_time', 'desc' => '订单创建时间', 'type' => 'int'], - ['name' => 'order_id', 'desc' => '订单id', 'type' => 'int'], - ['name' => 'total_price', 'desc' => '订单总金额', 'type' => 'float'], - ['name' => 'pay_price', 'desc' => '实际支付金额', 'type' => 'float'], - ['name' => 'total_num', 'desc' => '订单总数量', 'type' => 'int'], - ['name' => 'pay_type', 'desc' => '支付方式', 'type' => 'int'], - ['name' => 'cart_id', 'desc' => '购物车id', 'type' => 'string'], - ['name' => 'store_id', 'desc' => '店铺id', 'type' => 'int'], - ['name' => 'shipping_type', 'desc' => '配送方式', 'type' => 'int'], - ]], - ['name' => 'cart_list', 'desc' => '购物车商品列表', 'type' => 'array', 'children' => [ - ['name' => 'goods', 'desc' => '商品id', 'type' => 'int'], - ['name' => 'cart_num', 'desc' => '购买数量', 'type' => 'int'], - ['name' => 'total', 'desc' => '商品总价', 'type' => 'float'], - ['name' => 'price', 'desc' => '商品单价', 'type' => 'float'], - ['name' => 'product_id', 'desc' => '商品id', 'type' => 'int'], - ['name' => 'old_cart_id', 'desc' => '原购物车id', 'type' => 'string'], - ['name' => 'verify_code', 'desc' => '校验码', 'type' => 'string'], - ]], - ]), - ] + // #[ + // ApiDoc\Title('订单校验'), + // ApiDoc\url('/api/order/order/checkOrder'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "cart_id", type: "int", require: true, desc: "购物车id"), + // ApiDoc\Param(name: "address_id", type: "int", require: true, desc: "地址id"), + // ApiDoc\Param(name: "store_id", type: "int", require: true, desc: "店铺id"), + // ApiDoc\Param(name: "verify_code", type: "int", require: true, desc: "校验码"), + // ApiDoc\Param(name: "shipping_type", type: "int", require: true, desc: "配送方式"), + // ApiDoc\Param(name: "pay_type", type: "int", require: true, desc: "支付类型"), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array", children: [ + // ['name' => 'order', 'desc' => '订单信息', 'type' => 'array', 'children' => [ + // ['name' => 'create_time', 'desc' => '订单创建时间', 'type' => 'int'], + // ['name' => 'order_id', 'desc' => '订单id', 'type' => 'int'], + // ['name' => 'total_price', 'desc' => '订单总金额', 'type' => 'float'], + // ['name' => 'pay_price', 'desc' => '实际支付金额', 'type' => 'float'], + // ['name' => 'total_num', 'desc' => '订单总数量', 'type' => 'int'], + // ['name' => 'pay_type', 'desc' => '支付方式', 'type' => 'int'], + // ['name' => 'cart_id', 'desc' => '购物车id', 'type' => 'string'], + // ['name' => 'store_id', 'desc' => '店铺id', 'type' => 'int'], + // ['name' => 'shipping_type', 'desc' => '配送方式', 'type' => 'int'], + // ]], + // ['name' => 'cart_list', 'desc' => '购物车商品列表', 'type' => 'array', 'children' => [ + // ['name' => 'goods', 'desc' => '商品id', 'type' => 'int'], + // ['name' => 'cart_num', 'desc' => '购买数量', 'type' => 'int'], + // ['name' => 'total', 'desc' => '商品总价', 'type' => 'float'], + // ['name' => 'price', 'desc' => '商品单价', 'type' => 'float'], + // ['name' => 'product_id', 'desc' => '商品id', 'type' => 'int'], + // ['name' => 'old_cart_id', 'desc' => '原购物车id', 'type' => 'string'], + // ['name' => 'verify_code', 'desc' => '校验码', 'type' => 'string'], + // ]], + // ]), + // ] public function checkOrder() { $cartId = (array)$this->request->post('cart_id', []); @@ -141,7 +140,8 @@ class OrderController extends BaseApiController // $pay_type = (int)$this->request->post('pay_type'); // $auth_code = $this->request->post('auth_code'); //微信支付条码 $params = $this->request->post(); - $res = OrderLogic::cartIdByOrderInfo($cartId, $addressId, null, $params); + $user=User::where('id',$this->userId)->find(); + $res = OrderLogic::cartIdByOrderInfo($cartId, $addressId, $user, $params); if ($res == false) { $msg = OrderLogic::getError(); if ($msg == '购物车为空') { @@ -152,19 +152,19 @@ class OrderController extends BaseApiController return $this->data($res); } - #[ - ApiDoc\Title('创建订单'), - ApiDoc\url('/api/order/order/createOrder'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "cart_id", type: "int", require: true, desc: "id"), - ApiDoc\Param(name: "store_id", type: "int", require: true, desc: "店铺id"), - ApiDoc\Param(name: "address_id", type: "int", require: true, desc: "地址id"), - ApiDoc\Param(name: "auth_code", type: "string", require: true, desc: "付款码"), - ApiDoc\Param(name: "pay_type", type: "int", require: true, desc: "支付类型"), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('创建订单'), + // ApiDoc\url('/api/order/order/createOrder'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "cart_id", type: "int", require: true, desc: "id"), + // ApiDoc\Param(name: "store_id", type: "int", require: true, desc: "店铺id"), + // ApiDoc\Param(name: "address_id", type: "int", require: true, desc: "地址id"), + // ApiDoc\Param(name: "auth_code", type: "string", require: true, desc: "付款码"), + // ApiDoc\Param(name: "pay_type", type: "int", require: true, desc: "支付类型"), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function createOrder() { $cartId = (array)$this->request->post('cart_id', []); @@ -180,16 +180,19 @@ class OrderController extends BaseApiController return $this->fail('购物车商品不能超过100个'); } - // if ($pay_type == 9 || $pay_type == 17 ||$pay_type==13) { - // if (empty($this->request->userInfo['merchant'])) { - // return $this->fail('请先绑定商户'); - // } - // $mer_id = $this->request->userInfo['merchant']['mer_id']; - // $params['mer_id'] = $mer_id; - // } - $order = OrderLogic::createOrder($cartId, $addressId, null, $params); + $user=User::where('id',$this->userId)->find(); + + $order = OrderLogic::createOrder($cartId, $addressId, $user, $params); + if ($order != false) { + if($order['pay_price'] <= 0){ + $pay_type = 3; + } switch ($pay_type) { + case PayEnum::PURCHASE_FUNDS: + //采购款支付 + PayNotifyLogic::handle('purchase_funds', $order['order_id']); + return $this->success('采购款支付成功'); case PayEnum::BALANCE_PAY: //余额支付 PayNotifyLogic::handle('balancePay', $order['order_id']); @@ -263,18 +266,18 @@ class OrderController extends BaseApiController return $this->success('ok', ['no_pay' => $no_pay, 'waiting' => $waiting, 'receiving' => $receiving, 'all' => $all, 'applyRefund' => $applyRefund, 'refund' => $refund]); } - #[ - ApiDoc\Title('订单支付'), - ApiDoc\url('/api/order/order/pay'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "order_id", type: "int", require: true, desc: "订单id"), - ApiDoc\Param(name: "address_id", type: "int", require: true, desc: "地址id"), - ApiDoc\Param(name: "auth_code", type: "string", require: true, desc: "付款码"), - ApiDoc\Param(name: "pay_type", type: "int", require: true, desc: "支付类型"), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('订单支付'), + // ApiDoc\url('/api/order/order/pay'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "order_id", type: "int", require: true, desc: "订单id"), + // ApiDoc\Param(name: "address_id", type: "int", require: true, desc: "地址id"), + // ApiDoc\Param(name: "auth_code", type: "string", require: true, desc: "付款码"), + // ApiDoc\Param(name: "pay_type", type: "int", require: true, desc: "支付类型"), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function pay() { $order_id = (int)$this->request->post('order_id'); @@ -352,22 +355,29 @@ class OrderController extends BaseApiController } - #[ - ApiDoc\Title('订单详情'), - ApiDoc\url('/api/order/order/detail'), - ApiDoc\Method('GET'), - ApiDoc\Param(name: "order_id", type: "int", require: true, desc: "订单id"), - ApiDoc\NotHeaders(), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('订单详情'), + // ApiDoc\url('/api/order/order/detail'), + // ApiDoc\Method('GET'), + // ApiDoc\Param(name: "order_id", type: "int", require: true, desc: "订单id"), + // ApiDoc\NotHeaders(), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function detail() { $order_id = (int)$this->request->get('order_id'); + $lat = $this->request->get('lat',''); + $lng = $this->request->get('long',''); $where = [ 'id' => $order_id, 'uid' => $this->userId, ]; - $order = OrderLogic::detail($where); + $url = 'https://'.$this->request->host(true); + $parm = [ + 'lat'=>$lat, + 'long'=>$lng + ]; + $order = OrderLogic::detail($where,$url,$parm); if ($order) { return $this->data($order); } else { @@ -446,15 +456,15 @@ class OrderController extends BaseApiController } } - #[ - ApiDoc\Title('核销'), - ApiDoc\url('/api/order/order/writeoff_order'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "verify_code", type: "string", require: true, desc: "验证码"), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('核销'), + // ApiDoc\url('/api/order/order/writeoff_order'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "verify_code", type: "string", require: true, desc: "验证码"), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function writeoff_order() { $params = (new OrderValidate())->post()->goCheck('check'); @@ -486,19 +496,19 @@ class OrderController extends BaseApiController } - #[ - ApiDoc\Title('订单退款申请'), - ApiDoc\url('/api/order/order/apply_refund'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "refund_message", type: "string", require: true, desc: "退款原因"), - ApiDoc\Param(name: "refund_num", type: "int", require: true, desc: "退款数量"), - ApiDoc\Param(name: "id", type: "int", require: true, desc: "订单id"), - ApiDoc\Param(name: "old_cart_id", type: "int", require: true, desc: "购物车id"), - ApiDoc\Param(name: "refund_type", type: "int", require: true, desc: "退款申请类型"), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('订单退款申请'), + // ApiDoc\url('/api/order/order/apply_refund'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "refund_message", type: "string", require: true, desc: "退款原因"), + // ApiDoc\Param(name: "refund_num", type: "int", require: true, desc: "退款数量"), + // ApiDoc\Param(name: "id", type: "int", require: true, desc: "订单id"), + // ApiDoc\Param(name: "old_cart_id", type: "int", require: true, desc: "购物车id"), + // ApiDoc\Param(name: "refund_type", type: "int", require: true, desc: "退款申请类型"), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function apply_refund() { $params = (new OrderValidate())->post()->goCheck('add'); @@ -508,14 +518,14 @@ class OrderController extends BaseApiController return $this->success('申请成功'); } - #[ - ApiDoc\Title('订单退款原因'), - ApiDoc\url('/api/order/order/refund_reason'), - ApiDoc\Method('GET'), - ApiDoc\Param(), - ApiDoc\NotHeaders(), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('订单退款原因'), + // ApiDoc\url('/api/order/order/refund_reason'), + // ApiDoc\Method('GET'), + // ApiDoc\Param(), + // ApiDoc\NotHeaders(), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function refund_reason() { $data = DictData::where('type_value', 'reason')->where('status', YesNoEnum::YES) @@ -524,14 +534,14 @@ class OrderController extends BaseApiController } - #[ - ApiDoc\Title('取消售后'), - ApiDoc\url('/api/order/order/cancel_sale'), - ApiDoc\Method('GET'), - ApiDoc\Param(name: "order_id", type: "int", require: true, desc: "订单id"), - ApiDoc\NotHeaders(), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('取消售后'), + // ApiDoc\url('/api/order/order/cancel_sale'), + // ApiDoc\Method('GET'), + // ApiDoc\Param(name: "order_id", type: "int", require: true, desc: "订单id"), + // ApiDoc\NotHeaders(), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function cancel_sale() { $order_id = (int)$this->request->get('order_id'); diff --git a/app/api/controller/product/ProductController.php b/app/api/controller/product/ProductController.php index d1d54fa3..c10aeace 100644 --- a/app/api/controller/product/ProductController.php +++ b/app/api/controller/product/ProductController.php @@ -3,8 +3,7 @@ namespace app\api\controller\product; use app\api\controller\BaseApiController; use app\api\lists\product\ProductLists; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + class ProductController extends BaseApiController{ public $notNeedLogin = ['lists']; diff --git a/app/api/controller/shop/IndexController.php b/app/api/controller/shop/IndexController.php index 9f797da5..b1cf7779 100644 --- a/app/api/controller/shop/IndexController.php +++ b/app/api/controller/shop/IndexController.php @@ -9,8 +9,7 @@ use app\common\model\dict\DictData; use app\common\model\merchant\Merchant; use app\common\model\supplier\Supplier; use think\facade\Db; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + class IndexController extends BaseApiController{ public $notNeedLogin = ['apply','get_token','merchat_type','record','apply_detail']; diff --git a/app/api/controller/store/ProductRecordController.php b/app/api/controller/store/ProductRecordController.php index f9d1f6e4..660de6ee 100644 --- a/app/api/controller/store/ProductRecordController.php +++ b/app/api/controller/store/ProductRecordController.php @@ -3,8 +3,6 @@ namespace app\api\controller\store; use app\api\controller\BaseApiController; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\title('收银机商品统计')] class ProductRecordController extends BaseApiController { diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php index dde6ba98..97bd8068 100644 --- a/app/api/controller/store/StoreController.php +++ b/app/api/controller/store/StoreController.php @@ -2,20 +2,100 @@ namespace app\api\controller\store; +use app\admin\logic\user\UserLogic as UserUserLogic; use app\api\lists\store\SystemStoreLists; use app\api\controller\BaseApiController; -use app\common\service\pay\PayService; -use Webman\Config; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] +use app\api\logic\store\StoreLogic; +use app\api\logic\user\UserLogic; +use app\api\validate\UserValidate; +use app\common\enum\PayEnum; +use app\common\logic\PaymentLogic; +use app\common\logic\PayNotifyLogic; +use app\common\model\user\User; +use app\common\model\user_recharge\UserRecharge; +use Webman\RedisQueue\Redis; class StoreController extends BaseApiController { - + public $notNeedLogin = ['detail']; public function lists() { return $this->dataLists(new SystemStoreLists()); } + /** + * 门店信息 + */ + public function detail() + { + $store_id = (int)$this->request->get('store_id'); + $phone = (int)$this->request->get('phone'); + $where = []; + if($phone){ + $where['phone'] = $phone; + } + if($store_id){ + $where['id'] = $store_id; + } + + $info = StoreLogic::search($where); + if ($info) { + return $this->success('ok',$info??[]); + } else { + return $this->fail('店铺不存在'); + } + } + + /** + * 门店会员充值 + */ + public function recharge() + { + $params = (new UserValidate())->post()->goCheck('rechargeStoreMoney'); + $auth_code = $this->request->post('auth_code'); //微信支付条码 + $find=User::where('mobile',$params['mobile'])->find(); + if(!$find){ + $find=UserUserLogic::StoreAdd($params); + }else{ + $find['real_name']=$params['real_name']; + $find->save(); + } + $data=[ + 'store_id'=>$params['store_id'], + 'uid'=>$find['id'], + 'staff_id'=>0, + 'order_id'=>getNewOrderId('CZ'), + 'price'=>0.01, + 'recharge_type'=>'INDUSTRYMEMBERS', + ]; + $order = UserRecharge::create($data); + + $order['pay_price']=$order['price']; + $result = PaymentLogic::codepay($auth_code, $order,'条码支付'); + if (PaymentLogic::hasError()) { + return $this->fail(PaymentLogic::getError(), $params); + } + if (isset($result['trade_state_desc']) && $result['trade_state_desc'] == '支付成功') { + PayNotifyLogic::handle('recharge', $result['out_trade_no'], $result); + } else { + Redis::send('send-code-pay', ['order_id' => $order['order_id'],'pay_type'=>'recharge']); + return $this->success('用户支付中'); + } + return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::WECHAT_PAY_BARCODE, 'transaction_id' => $result['transaction_id']]); + } + + /** + * 门店会员充值数量 + */ + public function recharge_count() + { + $store_id = $this->request->get('store_id',0); + $count=0; + if($store_id){ + $count= UserRecharge::where(['store_id'=>$store_id,'recharge_type'=>'INDUSTRYMEMBERS','paid'=>1])->count(); + } + return $this->success('ok',['count'=>$count]); + + } } diff --git a/app/api/controller/store/TransactionRecordController.php b/app/api/controller/store/TransactionRecordController.php index c0b2bb02..37dd6b28 100644 --- a/app/api/controller/store/TransactionRecordController.php +++ b/app/api/controller/store/TransactionRecordController.php @@ -3,8 +3,7 @@ namespace app\api\controller\store; use app\api\controller\BaseApiController; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\title('收银机盈收统计')] + class TransactionRecordController extends BaseApiController { diff --git a/app/api/controller/user/AddressController.php b/app/api/controller/user/AddressController.php index 931446ad..781f6f9e 100644 --- a/app/api/controller/user/AddressController.php +++ b/app/api/controller/user/AddressController.php @@ -6,8 +6,7 @@ use app\api\controller\BaseApiController; use app\api\lists\user\UserAddressList; use app\api\logic\user\AddressLogic; use app\api\validate\UserAddressValidate; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + class AddressController extends BaseApiController { diff --git a/app/api/controller/user/UserController.php b/app/api/controller/user/UserController.php index 67c7efbd..2f2e921e 100644 --- a/app/api/controller/user/UserController.php +++ b/app/api/controller/user/UserController.php @@ -7,10 +7,7 @@ use app\api\logic\user\UserLogic; use app\api\validate\UserValidate; use app\common\enum\PayEnum; use app\common\logic\PaymentLogic; -use hg\apidoc\annotation as ApiDoc; -use taoser\Validate; -#[ApiDoc\title('用户')] /** * 用户控制器 @@ -19,15 +16,15 @@ use taoser\Validate; */ class UserController extends BaseApiController { - #[ - ApiDoc\Title('获取小程序手机号'), - ApiDoc\url('/api/user/user/getMobileByMnp'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "code", type: "string", require: true, desc: "换取手机的code"), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('获取小程序手机号'), + // ApiDoc\url('/api/user/user/getMobileByMnp'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "code", type: "string", require: true, desc: "换取手机的code"), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function getMobileByMnp() { $params = (new UserValidate())->post()->goCheck('getMobileByMnp'); @@ -41,45 +38,45 @@ class UserController extends BaseApiController } - #[ - ApiDoc\Title('用户个人信息'), - ApiDoc\url('/api/user/user/info'), - ApiDoc\Method('POST'), - ApiDoc\Param(), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('用户个人信息'), + // ApiDoc\url('/api/user/user/info'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function info() { return $this->success('success', UserLogic::info($this->userId)); } - #[ - ApiDoc\Title('充值金额'), - ApiDoc\url('/api/user/user/rechange_amount'), - ApiDoc\Method('Get'), - ApiDoc\Param(), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('充值金额'), + // ApiDoc\url('/api/user/user/rechange_amount'), + // ApiDoc\Method('Get'), + // ApiDoc\Param(), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function rechange_amount() { $res = UserLogic::rechange_level(); return $this->success('ok',$res); } - #[ - ApiDoc\Title('小程序充值'), - ApiDoc\url('/api/user/user/recharge'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "price", type: "string", require: true, desc: "金额"), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('小程序充值'), + // ApiDoc\url('/api/user/user/recharge'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "price", type: "string", require: true, desc: "金额"), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function recharge() { $params = (new UserValidate())->post()->goCheck('rechargeMoney'); @@ -92,19 +89,18 @@ class UserController extends BaseApiController return $this->fail(PaymentLogic::getError(), $params); } return $this->success('', $result); - } - #[ - ApiDoc\Title('会员账户详情'), - ApiDoc\url('/api/user/user/capital_flow'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "page_no", type: "int", require: true, desc: "默认1页数"), - ApiDoc\Param(name: "page_size", type: "int", require: false, desc: "条数默认15"), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('会员账户详情'), + // ApiDoc\url('/api/user/user/capital_flow'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "page_no", type: "int", require: true, desc: "默认1页数"), + // ApiDoc\Param(name: "page_size", type: "int", require: false, desc: "条数默认15"), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function capital_flow() { $page_no = (int)$this->request->post('page_no',1); @@ -122,15 +118,15 @@ class UserController extends BaseApiController return $this->success('ok',$res); } - #[ - ApiDoc\Title('会员账户统计'), - ApiDoc\url('/api/user/user/capital_count'), - ApiDoc\Method('POST'), - ApiDoc\Param(), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('会员账户统计'), + // ApiDoc\url('/api/user/user/capital_count'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function capital_count() { $res = UserLogic::capital_count($this->userId); diff --git a/app/api/controller/user/UserFeedbackController.php b/app/api/controller/user/UserFeedbackController.php index 3ad0f903..46cedd30 100644 --- a/app/api/controller/user/UserFeedbackController.php +++ b/app/api/controller/user/UserFeedbackController.php @@ -6,8 +6,7 @@ use app\api\logic\user\UserFeedbackLogic; use app\admin\validate\user\UserFeedbackValidate; use app\api\controller\BaseApiController; - use hg\apidoc\annotation as ApiDoc; - #[ApiDoc\NotParse()] + class UserFeedbackController extends BaseApiController { diff --git a/app/api/controller/user/UserRechargeController.php b/app/api/controller/user/UserRechargeController.php new file mode 100644 index 00000000..ba97d6a5 --- /dev/null +++ b/app/api/controller/user/UserRechargeController.php @@ -0,0 +1,24 @@ +dataLists(new UserRechargeLists()); + } + } diff --git a/app/api/controller/user/UserVisitController.php b/app/api/controller/user/UserVisitController.php index 5570e2ef..d777c094 100644 --- a/app/api/controller/user/UserVisitController.php +++ b/app/api/controller/user/UserVisitController.php @@ -5,25 +5,23 @@ namespace app\api\controller\user; use app\api\controller\BaseApiController; use app\api\logic\user\UserVisitLogic; use app\api\validate\VisitValidate; -use hg\apidoc\annotation as ApiDoc; use Illuminate\Support\Facades\Request; use support\Response; -#[ApiDoc\title('用户访问')] class UserVisitController extends BaseApiController { public $notNeedLogin = ['productLog']; - #[ - ApiDoc\Title('添加访问商品记录'), - ApiDoc\url('/api/user/UserVisit/productLog'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "product_id", type: "int", require: true, desc: "product_id商品id"), - ApiDoc\Param(name: "cate_id", type: "int", require: true, desc: "分类id"), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('添加访问商品记录'), + // ApiDoc\url('/api/user/UserVisit/productLog'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "product_id", type: "int", require: true, desc: "product_id商品id"), + // ApiDoc\Param(name: "cate_id", type: "int", require: true, desc: "分类id"), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function productLog(): Response { $params = (new VisitValidate())->post()->goCheck('add'); @@ -37,16 +35,16 @@ class UserVisitController extends BaseApiController } - #[ - ApiDoc\Title('用户访问页面记录'), - ApiDoc\url('/api/user/UserVisit/htmlLog'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "url", type: "string", require: true, desc: "路径"), - ApiDoc\Param(name: "stay_time", type: "int", require: true, desc: "停留时间"), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('用户访问页面记录'), + // ApiDoc\url('/api/user/UserVisit/htmlLog'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "url", type: "string", require: true, desc: "路径"), + // ApiDoc\Param(name: "stay_time", type: "int", require: true, desc: "停留时间"), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function htmlLog() { $ip = $this->request->getRealIp(); diff --git a/app/api/lists/cate/CateLists.php b/app/api/lists/cate/CateLists.php index 87a8fb73..e924419b 100644 --- a/app/api/lists/cate/CateLists.php +++ b/app/api/lists/cate/CateLists.php @@ -46,6 +46,7 @@ class CateLists extends BaseAdminDataLists implements ListsSearchInterface $level = Request()->get('level', 1); $this->searchWhere[] = ['level', '=', $level]; $this->searchWhere[] = ['count', '>', 0]; + $this->searchWhere[] = ['delete_time', '=', null]; $cate_arr = Db::name('store_product_cate')->where($this->searchWhere)->column('cate_id'); $lists = []; if ($cate_arr) { diff --git a/app/api/lists/order/CartList.php b/app/api/lists/order/CartList.php index d68559b7..ca28189b 100644 --- a/app/api/lists/order/CartList.php +++ b/app/api/lists/order/CartList.php @@ -63,7 +63,8 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists foreach ($list as $key => &$item) { $find = StoreBranchProduct::where(['product_id' => $item['product_id'],'store_id' => $item['store_id']]) - ->field('product_id,image,price,cost,store_name,unit') + ->field('product_id,image,price,cost,store_name,unit,delete_time') + ->withTrashed() ->find(); // if (isset($check) && $check['status'] == 1) { // $find['price'] = $find['cost']; diff --git a/app/api/lists/order/OrderList.php b/app/api/lists/order/OrderList.php index e779a853..f1ba4dd4 100644 --- a/app/api/lists/order/OrderList.php +++ b/app/api/lists/order/OrderList.php @@ -54,7 +54,7 @@ class OrderList extends BaseAdminDataLists implements ListsSearchInterface $item['goods_list'] = StoreOrderCartInfo::where('oid', $item['id']) ->field('product_id,cart_num,verify_code,is_writeoff,writeoff_time,old_cart_id')->limit(3)->select() ->each(function ($v) use ($item) { - $find = StoreBranchProduct::where('product_id', $v['product_id'])->where('store_id', $item['store_id'])->find(); + $find = StoreBranchProduct::where('product_id', $v['product_id'])->where('store_id', $item['store_id'])->withTrashed()->find(); $v['store_name'] = $find['store_name']; $v['image'] = $find['image']; $v['price'] = $find['price']; @@ -67,6 +67,9 @@ class OrderList extends BaseAdminDataLists implements ListsSearchInterface if ($item['pay_time']) { $item['pay_time'] = date('Y-m-d H:i:s', $item['pay_time']); } + if($item['verify_img']){ + $item['verify_img'] = 'https://'.$this->request->host(true).$item['verify_img']; + } }) ->toArray(); diff --git a/app/api/lists/product/ProductLists.php b/app/api/lists/product/ProductLists.php index f965cd7d..f8e21993 100644 --- a/app/api/lists/product/ProductLists.php +++ b/app/api/lists/product/ProductLists.php @@ -18,7 +18,7 @@ use think\facade\Db; * Class goods * @package app\api\goods */ -class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,ListsSortInterface +class ProductLists extends BaseAdminDataLists implements ListsSearchInterface, ListsSortInterface { @@ -30,18 +30,18 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li */ public function setSearch(): array { - $name=$this->request->get('store_name',''); + $name = $this->request->get('store_name', ''); // $where['%pipe_like%'] =['name'=>'store_name|bar_code']; - if($name){ - if(preg_match('/[\x{4e00}-\x{9fff}]+/u', $name)==1){ -// $where['%like%']=['name'=>'store_name']; - $where['%like%']=['store_name'=>'store_name']; - }else{ - $where['=']=['bar_code','cate_id']; + if ($name) { + if (preg_match('/[\x{4e00}-\x{9fff}]+/u', $name) == 1) { + $where['%like%'] = ['store_name' => 'store_name']; + } else { + $where['='] = ['bar_code', 'cate_id']; } - }else{ - $where['=']=['store_id','bar_code','cate_id']; + } else { + $where['='] = ['store_id', 'bar_code', 'cate_id']; } + return $where; } /** @@ -63,7 +63,7 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li */ public function setDefaultOrder(): array { - return ['sales' => 'desc','price' => 'asc']; + return [ 'price' => 'asc','id' => 'desc']; } /** @@ -79,7 +79,7 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li { $found = false; - if($this->searchWhere){ + if ($this->searchWhere) { foreach ($this->searchWhere as $subArray) { if (in_array('store_id', $subArray)) { $found = true; @@ -87,56 +87,31 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li } } } - if(!$found){ - $this->searchWhere[]=['store_id','=',2]; + if (!$found) { + $store_id = DictType::where('type', 'store')->value('remark') ?? 5; + $this->searchWhere[] = ['store_id', '=', $store_id]; } - $class_all=$this->request->get('class_all'); - $where=[]; - if($class_all){ - $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)]; + $class_all = $this->request->get('class_all'); + if ($class_all) { + //查3级别的 + $arr = Cate::where('pid', $class_all)->column('id'); + if ($arr) { + $arr2 = Cate::where('pid', 'in', $arr)->column('id'); + $this->searchWhere[] = ['cate_id', 'in', array_merge($arr, $arr2)]; + }else{ + $this->searchWhere[] = ['cate_id','=',$class_all]; } } - - $this->searchWhere[]=['status','=',1]; - $this->searchWhere[]=['stock','>',0]; - $M_store_id=$this->request->__get('store_id'); - if($M_store_id){ - $where[]=['store_id','=',$M_store_id]; - $data = StoreBranchProduct::where($this->searchWhere)->where($where) - ->field(['id', 'product_id','cate_id','store_name', 'cost','store_id','price', 'bar_code','image','sales','store_info','delete_time','unit']) - ->limit($this->limitOffset, $this->limitLength) - ->with(['className','unitName']) - ->order($this->sortOrder) - ->select() - ->toArray(); - - }else{ - $data = StoreBranchProduct::where($this->searchWhere)->where($where) - ->field(['id', 'product_id','cate_id','store_name','cost', 'store_id','price', 'bar_code','image','sales','store_info','delete_time','unit']) - ->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; + $this->searchWhere[] = ['status', '=', 1]; + $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']) + ->with(['className', 'unitName']) + ->limit($this->limitOffset, $this->limitLength) + ->order($this->sortOrder) +// ->page($this->limitOffset +1,$this->limitLength) + ->select()->toArray(); } @@ -150,7 +125,7 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li public function count(): int { $found = false; - if($this->searchWhere){ + if ($this->searchWhere) { foreach ($this->searchWhere as $subArray) { if (in_array('store_id', $subArray)) { $found = true; @@ -158,32 +133,25 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li } } } - if(!$found){ - $this->searchWhere[]=['store_id','=',2]; + if (!$found) { + $store_id = DictType::where('type', 'store')->value('remark') ?? 5; + $this->searchWhere[] = ['store_id', '=', $store_id]; } - $class_all=$this->request->get('class_all'); - $where=[]; - if($class_all){ - $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)]; + $class_all = $this->request->get('class_all'); + if ($class_all) { + //查3级别的 + $arr = Cate::where('pid', $class_all)->column('id'); + if ($arr) { + $arr2 = Cate::where('pid', 'in', $arr)->column('id'); + $this->searchWhere[] = ['cate_id', 'in', array_merge($arr, $arr2)]; + }else{ + $this->searchWhere[] = ['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; + $this->searchWhere[] = ['status', '=', 1]; + $this->searchWhere[] = ['stock', '>', 0]; + return StoreBranchProduct::where($this->searchWhere) + ->count(); } - -} \ No newline at end of file +} diff --git a/app/api/lists/store/SystemStoreLists.php b/app/api/lists/store/SystemStoreLists.php index 2688c24c..52bef323 100644 --- a/app/api/lists/store/SystemStoreLists.php +++ b/app/api/lists/store/SystemStoreLists.php @@ -49,7 +49,7 @@ class SystemStoreLists extends BaseAdminDataLists implements ListsSearchInterfac $latitude = $this->request->get('latitude',''); $longitude = $this->request->get('longitude',''); if(empty($longitude) || empty($latitude)){ - throw new MyBusinessException('缺失经纬度'); + throw new Exception('缺失经纬度'); } $where[]=['is_show','=',YesNoEnum::YES]; $data = SystemStore::where($this->searchWhere)->where($where) diff --git a/app/api/lists/user/UserRechargeLists.php b/app/api/lists/user/UserRechargeLists.php new file mode 100644 index 00000000..2090f642 --- /dev/null +++ b/app/api/lists/user/UserRechargeLists.php @@ -0,0 +1,62 @@ + ['store_id','recharge_type'], + ]; + } + + + /** + * @notes 获取用户充值表列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/05/13 16:56 + */ + public function lists(): array + { + return UserRecharge::where($this->searchWhere) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function($data){ + $data['real_name'] =User::where('id',$data['uid'])->value('real_name'); + }) + ->toArray(); + } + + + /** + * @notes 获取用户充值表数量 + * @return int + * @author likeadmin + * @date 2024/05/13 16:56 + */ + public function count(): int + { + return UserRecharge::where($this->searchWhere)->count(); + } + + } \ No newline at end of file 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) { diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index f41874a8..23cd8673 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -8,6 +8,7 @@ use app\common\enum\UserShipEnum; use app\common\enum\YesNoEnum; use app\common\logic\BaseLogic; use app\common\logic\CapitalFlowLogic; +use app\common\logic\PayNotifyLogic; use app\common\logic\StoreFinanceFlowLogic; use app\common\model\dict\DictData; use app\common\model\dict\DictType; @@ -23,6 +24,9 @@ use app\common\model\system_store\SystemStoreStaff; use app\common\model\user\User; use app\common\model\user\UserAddress; use app\common\model\user\UserShip; +use app\common\model\user_spread_log\UserSpreadLog; +use Picqer\Barcode\BarcodeGeneratorJPG; +use Picqer\Barcode\BarcodeGeneratorPNG; use support\exception\BusinessException; use support\Log; use taoser\exception\ValidateException; @@ -43,6 +47,7 @@ class OrderLogic extends BaseLogic public static $pay_price; public static $cost; public static $profit; + public static $store_price;//门店零售价 public static $activity_price; /** @@ -62,48 +67,55 @@ class OrderLogic extends BaseLogic try { self::$total_price = 0; self::$pay_price = 0; - self::$cost = 0; //成本 + self::$cost = 0; //成本由采购价替代原成本为门店零售价 self::$profit = 0; //利润 self::$activity_price = 0; //活动减少 - + self::$store_price = 0; //门店零售价 /** 计算价格 */ - $check = DictType::where('type', 'activities')->find(); + foreach ($cart_select as $k => $v) { - $find = StoreBranchProduct::where(['product_id' => $v['product_id'], 'store_id' => $params['store_id']])->field('id branch_product_id,store_name,image,unit,price,cost,product_id')->find(); + $find = StoreBranchProduct::where(['product_id' => $v['product_id'], 'store_id' => $params['store_id']])->field('id branch_product_id,store_name,image,unit,price,vip_price,cost,purchase,product_id')->withTrashed()->find(); if (!$find) { continue; } unset($cart_select[$k]['id']); $cart_select[$k]['price'] = $find['price']; + $cart_select[$k]['cost'] = $find['cost']; $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价 $cart_select[$k]['deduction_price'] =self::$activity_price;//抵扣金额 - if (isset($check) && $check['status'] == 1) { - //零售价*折扣率 - $activity_price = bcmul($find['price'], 0.9, 2); - $deduction_price_count=bcmul(bcsub($find['price'], $activity_price, 2),$v['cart_num'], 2); + $cart_select[$k]['vip'] = 0; + if ($user && $user['user_ship'] == 1) { + //更新 会员为1的时候原价减去会员价 + $deduction_price_count=bcmul(bcsub($find['price'], $find['vip_price'], 2),$v['cart_num'],2); $cart_select[$k]['deduction_price'] =$deduction_price_count; self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2); - $find['price'] = $activity_price; + $cart_select[$k]['vip'] =1; } + if ($user && $user['user_ship'] == 4) { + //更新 为4商户的时候减去商户价格 + $deduction_price_count=bcmul(bcsub($find['price'], $find['cost'], 2),$v['cart_num'],2); + $cart_select[$k]['deduction_price'] =$deduction_price_count; + self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2); + } + //利润 - $onePrice = bcsub($find['price'], $find['cost'], 2); - $cart_select[$k]['profit'] = bcmul($v['cart_num'], $onePrice, 2); //利润 - $cart_select[$k]['cost'] = bcmul($v['cart_num'], $find['cost'], 2) ?? 0; //成本 + // $cart_select[$k]['profit'] = bcmul($v['cart_num'], $onePrice, 2); //利润 + $cart_select[$k]['purchase'] = bcmul($v['cart_num'], $find['purchase'], 2) ?? 0; //成本 $cart_select[$k]['pay_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单支付金额 + $cart_select[$k]['store_price'] = bcmul($v['cart_num'], $find['cost'], 2)??0; //门店零售价 + $cart_select[$k]['vip_price'] = bcmul($v['cart_num'], $find['vip_price'], 2)??0; //vip售价 + $cart_select[$k]['product_id'] = $find['product_id']; $cart_select[$k]['old_cart_id'] = $v['id']; $cart_select[$k]['cart_num'] = $v['cart_num']; $cart_select[$k]['verify_code'] = $params['verify_code'] ?? ''; + //vip1待返回金额 + $cart_select[$k]['vip_frozen_price'] = bcsub($cart_select[$k]['pay_price'],$cart_select[$k]['vip_price'],2); +// d($cart_select[$k]['pay_price'],$cart_select[$k]['store_price'],$cart_select[$k]['vip_price'] ); $cartInfo = $cart_select[$k]; $cartInfo['name'] = $find['store_name']; $cartInfo['image'] = $find['image']; - //计算好vip价格 - // $vipPrice = self::dealVip($find['price']); - // if ($vipPrice) { - // $cartInfo['price'] = $vipPrice; - // } - $cartInfo['vip_price'] = 0; //$cart_select[$k]['total'] - $vipPrice ?? 0; $cart_select[$k]['cart_info'] = json_encode($cartInfo); $cart_select[$k]['branch_product_id'] = $find['branch_product_id']; //理论上每笔都是拆分了 @@ -113,57 +125,27 @@ class OrderLogic extends BaseLogic $cart_select[$k]['unit_name'] = StoreProductUnit::where(['id' => $find['unit']])->value('name'); self::$total_price = bcadd(self::$total_price, $cart_select[$k]['total_price'], 2); self::$pay_price = bcadd(self::$pay_price, $cart_select[$k]['pay_price'], 2); - self::$cost = bcadd(self::$cost, $cart_select[$k]['cost'], 2); - self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2); + self::$cost = bcadd(self::$cost, $cart_select[$k]['purchase'], 2); + self::$store_price = bcadd(self::$store_price, $cart_select[$k]['store_price'], 2);//门店零售价格 + // self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2); + } + if ($user && $user['user_ship'] == 1) { + $pay_price = self::$pay_price; + }else{ + $pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额 + } + if($pay_price < 500){ + throw new Exception('金额低于500'); } - //TODO 收单打9.9折 会员按照比例打折 等级按照充值去升级 - $pay_price = self::$pay_price; - // $check = StoreOrder::where('uid',\request()->userId)->count();//首单逻辑 - $vipPrice = 0; - // if (isset($check) && $check['status'] == 1) { - // $discountRate = '0.99';//首单逻辑 - // $pay_price 是价格 - // $discountRate = $check['remark'];//折扣 - // $discountRate = bcdiv($discountRate, '10', 2); - // $pay_price = bcdiv(bcmul($pay_price, $discountRate, 4), '1', 2); - // } else { - /* $userVip = User::where('id', \request()->userId)->value('user_ship'); - if ($userVip) { - switch ($userVip) { - case UserShipEnum::VIP1: - $discountRate = UserShip::where('id', UserShipEnum::VIP1)->value('discount'); - break; - case UserShipEnum::VIP2: - $discountRate = UserShip::where('id', UserShipEnum::VIP2)->value('discount'); - break; - case UserShipEnum::VIP3: - $discountRate = UserShip::where('id', UserShipEnum::VIP3)->value('discount'); - break; - case UserShipEnum::VIP4: - $discountRate = UserShip::where('id', UserShipEnum::VIP4)->value('discount'); - break; - case UserShipEnum::VIP5: - $discountRate = UserShip::where('id', UserShipEnum::VIP5)->value('discount'); - break; - default: - $discountRate = 1; - } - $discountRate = bcdiv($discountRate, '100', 2); - $pay_price = bcdiv(bcmul($pay_price, $discountRate, 4), '1', 2); - }*/ - // } - // if (!empty(self::$total) && !empty($pay_price)) { - // bcscale(2); - // $vipPrice = bcsub(self::$total, $pay_price, 2); - // } + $vipPrice = 0; //成本价 收益 $order = [ 'create_time' => time(), 'order_id' => $params['order_id'] ?? getNewOrderId('PF'), 'total_price' => self::$total_price, //总价 'cost' => self::$cost, //成本价1- - 'profit' => self::$profit, //利润 + 'profit' =>0, //利润 'pay_price' => $pay_price, //后期可能有降价抵扣 'vip_price' => $vipPrice, 'total_num' => count($cart_select), //总数 @@ -174,14 +156,18 @@ class OrderLogic extends BaseLogic 'shipping_type' => $params['shipping_type'] ?? 2, //配送方式 1=快递 ，2=门店自提 'activity' => '减免', 'activity_price' => self::$activity_price, - 'activities' => $check['status'], - 'deduction_price' => self::$activity_price - + 'activities' => self::$activity_price>0?1:0, + 'deduction_price' => self::$activity_price, + 'is_vip' => 0, ]; $order['default_delivery'] = 0; if ($params['store_id']) { $order['default_delivery'] = SystemStore::where('id', $params['store_id'])->value('is_send'); } + if($user && $user['user_ship']>=1 &&$user['user_ship']<=3){ + $order['is_vip'] = 1; + + } } catch (\Exception $e) { self::setError($e->getMessage()); return false; @@ -205,8 +191,8 @@ class OrderLogic extends BaseLogic return false; } $_order = $orderInfo['order']; - $_order['uid'] = request()->userId; - $user = User::where('id', \request()->userId)->find(); + $_order['uid'] = $user['id']; + $_order['spread_uid'] =$params['spread_uid']??0; $_order['real_name'] = $user['real_name']; $_order['mobile'] = $user['mobile']; $_order['pay_type'] = $orderInfo['order']['pay_type']; @@ -217,7 +203,7 @@ class OrderLogic extends BaseLogic $_order['reservation'] = YesNoEnum::YES; } if ($addressId > 0) { - $address = UserAddress::where(['id' => $addressId, 'uid' => Request()->userId])->find(); + $address = UserAddress::where(['id' => $addressId, 'uid' => $user['id']])->find(); if ($address) { $_order['real_name'] = $address['real_name']; $_order['user_phone'] = $address['phone']; @@ -227,7 +213,13 @@ class OrderLogic extends BaseLogic if ($params['shipping_type'] == 2) { $_order['status'] = 1; } - + //生成核销码 + $generator = new BarcodeGeneratorPNG(); + $barcode = $generator->getBarcode($verify_code, $generator::TYPE_CODE_128); + $findPath = '/image/barcode/'.time().'.png'; + $savePath = public_path().$findPath; + file_put_contents($savePath, $barcode); + $_order['verify_img'] = $findPath; Db::startTrans(); try { $order = StoreOrder::create($_order); @@ -235,15 +227,18 @@ class OrderLogic extends BaseLogic $updateData = []; foreach ($goods_list as $k => $v) { $goods_list[$k]['oid'] = $order->id; - $goods_list[$k]['uid'] = request()->userId; + $goods_list[$k]['uid'] = $user['id']; $goods_list[$k]['cart_id'] = implode(',', $cartId); $goods_list[$k]['delivery_id'] = $params['store_id']; //商家id - $stock = StoreBranchProduct::where('id',$v['branch_product_id'])->value('stock'); + $StoreBranchProduct = StoreBranchProduct::where('id',$v['branch_product_id'])->withTrashed()->find(); $updateData[] = [ 'id' => $v['branch_product_id'], - 'stock' => $stock-$v['cart_num'], + 'stock' => $StoreBranchProduct['stock']-$v['cart_num'], 'sales' => ['inc', $v['cart_num']] ]; + if($StoreBranchProduct['stock']-$v['cart_num']<=0){ + Db::name('store_product_cate')->where(['cate_id'=>$StoreBranchProduct['cate_id'],'store_id'=>$params['store_id']])->update(['count'=>0]); + } } (new StoreOrderCartInfo())->saveAll($goods_list); (new StoreBranchProduct())->saveAll($updateData); @@ -322,17 +317,16 @@ class OrderLogic extends BaseLogic public static function purchaseAgain($order_id) { - $arr = StoreOrderCartInfo::where('oid', $order_id)->field('product_id,cart_num,staff_id')->select(); + $arr = StoreOrderCartInfo::where('oid', $order_id)->field('product_id,cart_num,staff_id,store_id')->select(); $data = []; foreach ($arr as $k => $v) { $data[$k]['product_id'] = $v['product_id']; - $unique = StoreProductAttrValue::where('product_id', $v['product_id'])->value('v'); - $data[$k]['product_attr_unique'] = $unique; +// $unique = StoreProductAttrValue::where('product_id', $v['product_id'])->value('v'); + $data[$k]['product_attr_unique'] = ''; $data[$k]['cart_num'] = $v['cart_num']; $data[$k]['type'] = ''; $data[$k]['uid'] = Request()->userId; - $store_id = StoreProduct::where('id', $v['product_id'])->value('store_id'); - $data[$k]['store_id'] = $store_id; + $data[$k]['store_id'] = $v['store_id']; $data[$k]['staff_id'] = $v['staff_id']; $data[$k]['combination_id'] = 0; $data[$k]['seckill_id'] = 0; @@ -352,7 +346,7 @@ class OrderLogic extends BaseLogic } - public static function detail($params): array + public static function detail($params,$url='',$param=[]): array { $find = StoreOrder::where($params)->findOrEmpty()->toArray(); if ($find) { @@ -370,6 +364,28 @@ class OrderLogic extends BaseLogic $store = SystemStore::where('id', $find['store_id'])->field('id,name,phone,address,detailed_address')->find(); $find['store_info'] = $store; + + if($find['verify_img']){ + $find['verify_img'] = $url.$find['verify_img']; + } + //处理返回最近的店铺 + if($param['lat'] && $param['long']){ + $storeAll = SystemStore::field('id,name,phone,address,detailed_address,latitude,longitude')->select()->toArray(); + $nearestStore = null; + $minDistance = PHP_FLOAT_MAX; + foreach ($storeAll as $value){ + $value['distance'] = haversineDistance($value['latitude'],$value['longitude'],$param['lat'] ,$param['long']); + if ($value['distance'] < $minDistance) { + $minDistance = $value['distance']; + $nearestStore = $value; + } + } + if ($nearestStore) { + $find['near_store'] =$nearestStore; + + } + + } } return $find; } @@ -413,18 +429,24 @@ class OrderLogic extends BaseLogic 'status' => OrderEnum::RECEIVED_GOODS, 'is_writeoff' => OrderEnum::IS_OK, 'update_time' => time(), + 'store_id' => $params['store_id'], + 'staff_id' => $params['staff_id']??0, ], ['id' => $data['id']]); (new StoreOrderCartInfo())->update([ 'verify_code'=>$params['verify_code'].'-1', 'writeoff_time' => time(), 'is_writeoff' => YesNoEnum::YES, + 'store_id' => $params['store_id'], + 'staff_id' => $params['staff_id']??0, 'update_time' => time(), ], ['oid' => $data['id']]); - $financeFlow = (new StoreFinanceFlowLogic)->getStoreOrder($data['id'], $data['store_id']); - if (!empty($financeFlow)) { - $capitalFlowLogic = new CapitalFlowLogic($data->store, 'store'); - $capitalFlowLogic->storeIncome('store_order_income', 'order', $data['id'], $financeFlow['number']); - } + // $financeFlow = (new StoreFinanceFlowLogic)->getStoreOrder($data['id'], $data['store_id']); + // if (!empty($financeFlow)) { + // $capitalFlowLogic = new CapitalFlowLogic($data->store, 'store'); + // $capitalFlowLogic->storeIncome('store_order_income', 'order', $data['id'], $financeFlow['number']); + // } + $order=StoreOrder::where('id',$data['id'])->find(); + PayNotifyLogic::afterPay($order); Db::commit(); return true; } catch (\Exception $e) { diff --git a/app/api/logic/store/StoreLogic.php b/app/api/logic/store/StoreLogic.php new file mode 100644 index 00000000..f9fd3961 --- /dev/null +++ b/app/api/logic/store/StoreLogic.php @@ -0,0 +1,27 @@ +field(['id', 'name', 'phone', 'detailed_address', 'image', 'is_show', + 'day_time', 'is_store', 'latitude', 'longitude', 'day_start', 'day_end', 'is_store' + , 'is_send' + ]) + ->find() + ->toArray(); + + + } + + +} \ No newline at end of file diff --git a/app/api/logic/user/AddressLogic.php b/app/api/logic/user/AddressLogic.php index 068aa6f0..097204ab 100644 --- a/app/api/logic/user/AddressLogic.php +++ b/app/api/logic/user/AddressLogic.php @@ -67,8 +67,14 @@ class AddressLogic extends BaseLogic 'phone' => $params['phone'], 'detail' => $params['detail'], 'is_default' => $params['is_default'], + 'province' => $params['province'], + 'city' => $params['city'], + 'area' => $params['area'], + 'street' => $params['street'], + 'village' => $params['village'], + 'brigade' => $params['brigade'], ]; - UserAddress::where('uid', $params['uid'])->where('id', $params['address_id'])->update($data); + UserAddress::where('uid', $params['uid'])->where('id', $params['id'])->update($data); Db::commit(); return true; } catch (\Exception $e) { @@ -93,7 +99,7 @@ class AddressLogic extends BaseLogic /** - * @notes 获取购物车表详情 + * @notes 获取地址详情 * @param $params * @return array * @author likeadmin @@ -101,6 +107,6 @@ class AddressLogic extends BaseLogic */ public static function detail($params): array { - return UserAddress::field('id address_id,real_name,phone,detail,is_default')->where('id',$params['address_id'])->findOrEmpty()->toArray(); + return UserAddress::field('id,real_name,phone,province,city,area,street,village,brigade,detail,is_default')->where($params)->findOrEmpty()->toArray(); } } diff --git a/app/api/logic/user/UserLogic.php b/app/api/logic/user/UserLogic.php index 0428c03a..e6b49391 100644 --- a/app/api/logic/user/UserLogic.php +++ b/app/api/logic/user/UserLogic.php @@ -6,6 +6,7 @@ namespace app\api\logic\user; use app\common\{logic\BaseLogic, model\dict\DictData, model\finance\CapitalFlow, + model\store_finance_flow\StoreFinanceFlow, model\store_order\StoreOrder, model\system_store\DeliveryService, model\system_store\SystemStore, @@ -14,6 +15,8 @@ use app\common\{logic\BaseLogic, model\user\UserRecharge, model\user\UserShip, service\wechat\WeChatMnpService}; +use think\facade\Db; + /** * 会员逻辑层 @@ -66,7 +69,8 @@ class UserLogic extends BaseLogic public static function info($uid) { $data = User::with(['userShip'])->where('id',$uid) - ->field('id,avatar,real_name,nickname,account,mobile,sex,login_ip,now_money,total_recharge_amount,user_ship') + ->field('id,avatar,real_name,nickname,account,mobile,sex,login_ip,now_money,total_recharge_amount,user_ship + ,purchase_funds,integral') ->find(); //判断是不是员工 if($data){ @@ -88,6 +92,10 @@ class UserLogic extends BaseLogic $data['store_id'] = $check['store_id']; } } + $data['return_money'] = Db::name('vip_flow')-> + where(['user_id'=>$uid,'status'=>0]) + ->sum('number'); + }else{ $data = []; } 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', diff --git a/app/api/validate/UserAddressValidate.php b/app/api/validate/UserAddressValidate.php index 30a1360b..b7911da0 100644 --- a/app/api/validate/UserAddressValidate.php +++ b/app/api/validate/UserAddressValidate.php @@ -63,7 +63,7 @@ class UserAddressValidate extends BaseValidate */ public function sceneEdit() { - return $this->only(['real_name','phone','detail','address_id']); + return $this->only(['real_name','phone','id']); } diff --git a/app/api/validate/UserValidate.php b/app/api/validate/UserValidate.php index ddc907b2..d670e732 100644 --- a/app/api/validate/UserValidate.php +++ b/app/api/validate/UserValidate.php @@ -16,10 +16,14 @@ class UserValidate extends BaseValidate protected $rule = [ 'code' => 'require', + 'store_id' => 'require', + 'mobile' => 'require', ]; protected $message = [ 'code.require' => '参数缺失', + 'store_id.require' => '门店id', + 'mobile.require' => '手机', ]; @@ -57,5 +61,14 @@ class UserValidate extends BaseValidate { return $this->only(['price']); } + /** + * @notes 充值 + * @return UserValidate + * @Time: 2024/6/4 22:50 + */ + public function sceneRechargeStoreMoney() + { + return $this->only(['price']); + } } \ No newline at end of file diff --git a/app/common/controller/BaseLikeController.php b/app/common/controller/BaseLikeController.php index 79cf2b9f..13c07d9c 100644 --- a/app/common/controller/BaseLikeController.php +++ b/app/common/controller/BaseLikeController.php @@ -7,9 +7,8 @@ namespace app\common\controller; use app\BaseController; use app\common\lists\BaseDataLists; use app\common\service\JsonService; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + class BaseLikeController extends BaseController { public $notNeedLogin = []; @@ -47,7 +46,7 @@ class BaseLikeController extends BaseController * @author 令狐冲 * @date 2021/7/8 00:40 */ - protected function dataLists(BaseDataLists $lists = null) + protected function dataLists(BaseDataLists $lists = null,$remark = 0) { //列表类和控制器一一对应，"app/应用/controller/控制器的方法" =》"app\应用\lists\"目录下 //（例如："app/admin/controller/auth/AdminController.php的lists()方法" =》 "app/admin/lists/auth/AminLists.php") @@ -56,7 +55,7 @@ class BaseLikeController extends BaseController // $listName = str_replace('.', '\\', App::getNamespace() . '\\lists\\' . $this->request->controller() . ucwords($this->request->action())); // $lists = invoke($listName); } - return JsonService::dataLists($lists); + return JsonService::dataLists($lists,$remark); } @@ -74,10 +73,7 @@ class BaseLikeController extends BaseController return JsonService::fail($msg, $data, $code, $show); } - #[ApiDoc\NotParse()] - #[ - ApiDoc\Title('是否免登录验证'), - ] + public function isNotNeedLogin() : bool { $notNeedLogin = $this->notNeedLogin; diff --git a/app/common/controller/Definitions.php b/app/common/controller/Definitions.php index 8e1e8108..11d05359 100644 --- a/app/common/controller/Definitions.php +++ b/app/common/controller/Definitions.php @@ -2,22 +2,21 @@ namespace app\common\controller; -use hg\apidoc\annotation as ApiDoc; class Definitions { - #[ - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ] + // #[ + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ] public function token() { } - #[ - ApiDoc\Query("page_no", type: "int", require: false, default: 1, desc: "页码"), - ApiDoc\Query("page_size", type: "int", require: false, default: 25, desc: "每页条数"), - ] + // #[ + // ApiDoc\Query("page_no", type: "int", require: false, default: 1, desc: "页码"), + // ApiDoc\Query("page_size", type: "int", require: false, default: 25, desc: "每页条数"), + // ] public function page() { diff --git a/app/common/enum/OrderEnum.php b/app/common/enum/OrderEnum.php index b77115f5..e1179447 100644 --- a/app/common/enum/OrderEnum.php +++ b/app/common/enum/OrderEnum.php @@ -16,9 +16,15 @@ class OrderEnum * @MERCHANT_ORDER_PAY 商户订单支付 * @PLATFORM_ORDER_OBTAINS 平台订单获得 * @SUPPLIER_ORDER_OBTAINS 供应链订单获得 + * @VIP_ORDER_OBTAINS 会员订单获得 + * @VILLAGE_ORDER_OBTAINS 村长获得 + * @BRIGADE_ORDER_OBTAINS 队长获得 + * @OTHER_ORDER_OBTAINS 其他获得 * @PLATFORM_ORDER_PAY 平台订单支付 * @SYSTEM_SET 系统设置 * @OWN_GET 平台收入 + * @ORDER_MARGIN 商户保证金 + * @PURCHASE_FUNDS 采购款收银 */ const USER_ORDER_PAY = 1; const MERCHANT_ORDER_OBTAINS = 2; @@ -28,11 +34,18 @@ class OrderEnum const SUPPLIER_ORDER_OBTAINS = 6; const PLATFORM_ORDER_PAY = 7; const SYSTEM_SET = 8; - const CASHIER_ORDER_PAY = 9; + const CASHIER_ORDER_PAY = 9;//微信条码 const CASHIER_CASH_ORDER_PAY = 10; - const ORDER_MARGIN = 11; - const ORDER_COMMITION = 12; + const VIP_ORDER_OBTAINS = 12; + const CASHIER_ORDER_ALI_PAY = 13;//支付宝条码 + const VILLAGE_ORDER_OBTAINS = 14; + const BRIGADE_ORDER_OBTAINS = 15; + const OTHER_ORDER_OBTAINS = 16; + + const CASHIER_FACE_PAY = 17;//现金收银 + + const PURCHASE_FUNDS = 18;//采购款收银 /** @@ -85,6 +98,9 @@ class OrderEnum const PAY = 1; const BACK = 0; + /**小程序下单**/ + const ONLINE = [1,2]; + const OFFLINE = [3]; /** * 账户类型 * @USER 用户 @@ -116,6 +132,10 @@ class OrderEnum const REFUND_STATUS_FINISH = 2; const CANCEL_SALE = 3; + //判断资金流水是否余额支付 + const BALANCE_PAYMEN_NO = 1; + + /** * @notes 获取支付类型 * @param bool $value @@ -126,14 +146,23 @@ 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::MERCHANT_ORDER_OBTAINS => '商户', + self::ORDER_HANDLING_FEES => '手续费', + self::PLATFORM_ORDER_OBTAINS => '平台', + self::SUPPLIER_ORDER_OBTAINS => '成本', self::SYSTEM_SET => '平台设置', + self::VILLAGE_ORDER_OBTAINS => '村长', + self::BRIGADE_ORDER_OBTAINS=>'队长', + self::ORDER_MARGIN=>'保证金', + self::VIP_ORDER_OBTAINS=>'会员', + self::OTHER_ORDER_OBTAINS=>'其他', + + + + ]; diff --git a/app/common/enum/PayEnum.php b/app/common/enum/PayEnum.php index 8065e8fa..7cf6e236 100644 --- a/app/common/enum/PayEnum.php +++ b/app/common/enum/PayEnum.php @@ -31,6 +31,7 @@ class PayEnum * @GOODS_FIRST_PAYMENT_LATER 先货后款 * @CORPORATE_TRANSFER 对公转账 * @CASH_PAY 现金支付 + * @PURCHASE_FUNDS 采购款收银 */ const BALANCE_PAY = 3; const WECHAT_PAY = 1; @@ -49,7 +50,7 @@ class PayEnum const GOODS_FIRST_PAYMENT_LATER = 15; const CORPORATE_TRANSFER = 16; const CASH_PAY = 17; - + const PURCHASE_FUNDS = 18;//采购款收银 //支付状态 const UNPAID = 0; //未支付 const ISPAID = 1; //已支付 @@ -99,6 +100,7 @@ class PayEnum self::ALIPAY_QRCODE => '支付宝二维码', self::ALIPAY_BARCODE => '支付宝条码', self::BALANCE_PAY => '余额支付', + self::PURCHASE_FUNDS => '采购款收银', ]; if ($value === true) { diff --git a/app/common/enum/UserShipEnum.php b/app/common/enum/UserShipEnum.php index ea4b84cc..772a5445 100644 --- a/app/common/enum/UserShipEnum.php +++ b/app/common/enum/UserShipEnum.php @@ -8,9 +8,14 @@ class UserShipEnum * 会员等级 */ const VIP1 = 1; - const VIP2 = 7; - const VIP3 = 8; - const VIP4 = 9; - const VIP5 = 10; + const VIP2 = 2; + const VIP3 = 3; + const VIP4 = 4; + const VIP5 = 5; + + /** + * 切换折扣价 + */ + const DISCOUNT_ARRAY = [4,5,6]; } \ No newline at end of file diff --git a/app/common/lists/user/UserShipLists.php b/app/common/lists/user/UserShipLists.php new file mode 100644 index 00000000..e4ea3110 --- /dev/null +++ b/app/common/lists/user/UserShipLists.php @@ -0,0 +1,63 @@ +0,'title'=>'一般用户']; + + $lists = UserShip::where($this->searchWhere) + ->limit($this->limitOffset, $this->limitLength) + ->field($field) + ->order('sort desc') + ->select() + ->toArray(); + return array_merge($arr,$lists); + } + + + /** + * @notes 获取数量 + * @return int + * @author 乔峰 + * @date 2022/9/22 15:51 + */ + public function count(): int + { + return UserShip::where($this->searchWhere)->count(); + } +} \ No newline at end of file diff --git a/app/common/logic/CapitalFlowLogic.php b/app/common/logic/CapitalFlowLogic.php index e8ac3a51..1b6aea9b 100644 --- a/app/common/logic/CapitalFlowLogic.php +++ b/app/common/logic/CapitalFlowLogic.php @@ -2,6 +2,7 @@ namespace app\common\logic; +use app\common\enum\OrderEnum; use app\common\model\finance\CapitalFlow; class CapitalFlowLogic extends BaseLogic @@ -49,27 +50,29 @@ class CapitalFlowLogic extends BaseLogic /** * 用户支出 * @param $category + * @param $store_id * @param $linkType * @param $linkId * @param $amount * @param $mark * @return mixed */ - public function userExpense($category, $linkType, $linkId, $amount, $mark = '',$payType=0) + public function userExpense($category, $linkType, $linkId, $amount, $mark = '',$payType=0,$store_id=0) { $model = new CapitalFlow(); $model->uid = $this->user['id']; $model->category = $category; + $model->store_id = $store_id; $model->link_type = $linkType; $model->link_id = $linkId; $model->amount = $amount; - // if($payType == 1){ + if($payType == OrderEnum::BALANCE_PAYMEN_NO){ $model->before_balance = $this->user['now_money']; $model->balance = $this->user['now_money']; - // }else{ - // $model->before_balance = $this->user['now_money']; - // $model->balance = bcsub($this->user['now_money'], $amount, 2); - // } + }else{ + $model->before_balance = $this->user['now_money']; + $model->balance = bcsub($this->user['now_money'], $amount, 2); + } $model->create_time = date('Y-m-d H:i:s'); $model->type = 'out'; $model->title = $this->getTitle($category, $amount); diff --git a/app/common/logic/CashFlowLogic.php b/app/common/logic/CashFlowLogic.php index 9a1d0600..4f0a39bd 100644 --- a/app/common/logic/CashFlowLogic.php +++ b/app/common/logic/CashFlowLogic.php @@ -2,6 +2,7 @@ namespace app\common\logic; +use app\common\enum\YesNoEnum; use app\common\model\store_cash_finance_flow\StoreCashFinanceFlow; class CashFlowLogic extends BaseLogic @@ -13,6 +14,7 @@ class CashFlowLogic extends BaseLogic $model->store_id = $storeId; $model->cash_price = $amount; $model->receivable = $amount; + $model->status = YesNoEnum::YES;//收银台收了默认算完成了 $model->save(); } diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 5dbdc490..68923404 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -2,6 +2,7 @@ namespace app\common\logic; +use app\api\logic\order\OrderLogic; use app\common\enum\OrderEnum; use app\common\enum\PayEnum; use app\common\enum\user\UserShipEnum; @@ -10,10 +11,14 @@ use app\common\model\finance\PayNotifyLog; 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; use app\common\model\user\UserRecharge; use app\common\model\user\UserShip; +use app\common\model\user_sign\UserSign; use app\common\service\PushService; use support\Log; use think\facade\Db; @@ -27,11 +32,11 @@ use Webman\RedisQueue\Redis; class PayNotifyLogic extends BaseLogic { - public static function handle($action, $orderSn, $extra = []) + public static function handle($action, $orderSn, $extra = [], $type = 'wechat') { - // Db::startTrans(); - // try { - if ($action != 'cash_pay' && $action != 'balancePay') { + Db::startTrans(); + try { + if ($action != 'cash_pay' && $action != 'balancePay' && $action != 'purchase_funds') { $payNotifyLogLogic = new PayNotifyLogLogic(); if ($action == 'refund') { $payNotifyLogLogic->insert($action, $extra, PayNotifyLog::TYPE_REFUND); @@ -39,14 +44,14 @@ class PayNotifyLogic extends BaseLogic $payNotifyLogLogic->insert($action, $extra); } } - self::$action($orderSn, $extra); - // Db::commit(); + self::$action($orderSn, $extra, $type); + Db::commit(); return true; - // } catch (\Exception $e) { - // Db::rollback(); - // Log::error('支付回调处理失败' . $e->getMessage() . ',lien:' . $e->getLine() . ',file:' . $e->getFile()); - // throw new \Exception($e->getMessage()); - // } + } catch (\Exception $e) { + Db::rollback(); + Log::error('支付回调处理失败' . $e->getMessage() . ',lien:' . $e->getLine() . ',file:' . $e->getFile()); + throw new \Exception($e->getMessage()); + } } /** @@ -75,11 +80,66 @@ class PayNotifyLogic extends BaseLogic $user->now_money = bcsub($user['now_money'], $order['pay_price'], 2); $user->save(); + if ($order['spread_uid'] > 0 && $user['user_ship'] == 1) { + $oldUser = User::where('id',$order['spread_uid'])->value('purchase_funds'); + if ($oldUser < $order['pay_price']) { + $order['pay_price'] = $oldUser; + } + } $capitalFlowDao = new CapitalFlowLogic($user); - $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order['pay_price']); - self::afterPay($order); - Redis::send('push-platform-print', ['id' => $order['id']], 60); + $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' => '您有一笔新的订单']); + } + + /** + * 采购款支付 + * @param $orderSn + * @param $extra + * @return void + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + */ + public static function purchase_funds($orderSn, $extra = []) + { + $order = StoreOrder::where('order_id', $orderSn)->findOrEmpty(); + $user = User::where('id', $order['uid'])->find(); + if ($user['purchase_funds'] < $order['pay_price']) { + throw new \Exception('采购款不足'); + } + $order->money = $order['pay_price']; + $order->paid = 1; + $order->pay_time = time(); + if (!$order->save()) { + throw new \Exception('订单保存出错'); + } + // 减去采购款 + $user->purchase_funds = bcsub($user['purchase_funds'], $order['pay_price'], 2); + $user->save(); + + $capitalFlowDao = new CapitalFlowLogic($user); + $capitalFlowDao->userExpense('user_order_purchase_pay', 'order', $order['id'], $order['pay_price'],'',1,$order['store_id']); + if ($user['user_ship'] == 1) { + self::dealVipAmount($order, PayEnum::PURCHASE_FUNDS); + } + + if($extra && $extra['store_id']){ + $params = [ + 'verify_code'=>$order['verify_code'], + 'store_id'=>$extra['store_id'], + 'staff_id'=>$extra['staff_id'] + ]; + OrderLogic::writeOff($params); + } + 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' => '您有一笔新的订单']); } /** @@ -105,29 +165,26 @@ class PayNotifyLogic extends BaseLogic $extra['transaction_id'] = time(); } $user = User::where('id', $order['uid'])->find(); - if ($order->pay_type == 9) { + if ($order->pay_type == OrderEnum::CASHIER_ORDER_PAY || $order->pay_type == OrderEnum::CASHIER_ORDER_ALI_PAY) { //收银台支付 $order->status = 2; + self::afterPay($order, $extra['transaction_id']); } else { $capitalFlowDao = new CapitalFlowLogic($user); //微信支付和用户余额无关 - $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order->pay_price, '', 1); - } - self::afterPay($order, $extra['transaction_id']); - - //活动期间消费 - $check = DictType::where('type', 'activities')->find(); - if (isset($check) && $check['status'] == 1 && in_array($order->pay_type,[9,17])==false && $user['user_ship'] == 0) { - self::dealChange($order['uid']); + $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order->pay_price, '', 1,$order['store_id']); } - if ($order->pay_type == 9) { - $extra['create_time'] = $order['create_time']; - PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'cash_register', 'msg' => '您有一笔订单已支付', 'data' => $extra]); - } else { - PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); - Redis::send('push-platform-print', ['id' => $order['id']], 60); - // Db::name('order_middle')->insert(['c_order_id' => $order['id']]); - } + self::dealProductLog($order); + + // if ($order->pay_type == 9) { + // $extra['create_time'] = $order['create_time']; + // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'cash_register', 'msg' => '您有一笔订单已支付', 'data' => $extra]); + // Redis::send('push-platform-print', ['id' => $order['id']]); + // } + // else { + // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); + // Db::name('order_middle')->insert(['c_order_id' => $order['id']]); + // } if (!empty($extra['payer']['openid']) && $order->pay_type == 7) { Redis::send('push-delivery', ['order_id' => $order['order_id'], 'openid' => $extra['payer']['openid']], 5); } @@ -155,13 +212,17 @@ class PayNotifyLogic extends BaseLogic /** * 充值 */ - public static function recharge($orderSn, $extra = []) + public static function recharge($orderSn, $extra = [], $type = 'wechat') { $order = UserRecharge::where('order_id', $orderSn)->findOrEmpty(); if ($order->isEmpty() || $order->paid == PayEnum::ISPAID) { return true; } - $price = bcdiv($extra['amount']['payer_total'], 100, 2); + if ($type == 'wechat') { + $price = bcdiv($extra['amount']['payer_total'], 100, 2); + } else { + $price = $extra['buyer_pay_amount']; + } $order->price = $price; $order->paid = 1; $order->pay_time = time(); @@ -171,19 +232,23 @@ class PayNotifyLogic extends BaseLogic //用户的财务add $capitalFlowDao = new CapitalFlowLogic($user); $capitalFlowDao->userIncome('user_balance_recharge', 'user_recharge', $order['id'], $price); - + if ($user->isEmpty()) { return true; } bcscale(2); - $user->now_money = bcadd($user->now_money, $price, 2); + // $user->now_money = bcadd($user->now_money, $price, 2);//v.1 + //更新等级 + if ($price >= 0.01) { + $user->user_ship = 1; //v.1 + } + $user->purchase_funds = bcadd($user->purchase_funds, $price, 2); $user->total_recharge_amount = bcadd($user->total_recharge_amount, $price, 2); $user->save(); - //更新等级 - self::dealLevel($uid, $user->total_recharge_amount); - if (!empty($extra['payer']['openid']) ) { - Redis::send('push-delivery', ['order_id' => $order['order_id'], 'openid' => $extra['payer']['openid'],'logistics_type'=>3], 5); + + if (!empty($extra['payer']['openid'])) { + Redis::send('push-delivery', ['order_id' => $order['order_id'], 'openid' => $extra['payer']['openid'], 'logistics_type' => 3], 5); } return true; } @@ -204,8 +269,11 @@ class PayNotifyLogic extends BaseLogic if (!$order->save()) { throw new \Exception('订单保存出错'); } + 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']]); } /** @@ -233,16 +301,18 @@ class PayNotifyLogic extends BaseLogic } if ($order->pay_type == 9) { $order->status = 2; + self::afterPay($order); } - self::afterPay($order); + self::dealProductLog($order); - if ($order->pay_type == 9) { - $extra['create_time'] = $order['create_time']; - PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'cash_register', 'msg' => '您有一笔订单已支付', 'data' => $extra]); - } else { - PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); - Redis::send('push-platform-print', ['id' => $order['id']], 60); - } + // if ($order->pay_type == 9) { + // $extra['create_time'] = $order['create_time']; + // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'cash_register', 'msg' => '您有一笔订单已支付', 'data' => $extra]); + // Redis::send('push-platform-print', ['id' => $order['id']]); + // } + // else { + // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); + // } return true; } @@ -254,56 +324,194 @@ class PayNotifyLogic extends BaseLogic public static function afterPay($order, $transaction_id = 0) { $financeLogic = new StoreFinanceFlowLogic(); - $financeLogic->order = $order; - $financeLogic->user = ['uid' => $order['uid']]; - if ($order->pay_type != 9 || $order->pay_type != 10) { - $financeLogic->in($transaction_id, $order['pay_price'], OrderEnum::USER_ORDER_PAY); //用户单入账 - //商户应该获得的钱 每个商品的price-ot_price 利润 - if (isset($order->profit) && $order->profit > 0) { - //手续费 - $fees = bcdiv(bcmul($order['pay_price'], '0.02', 2), 1, 2); - $financeLogic->in($transaction_id, $fees, OrderEnum::ORDER_COMMITION, $order['store_id']); //手续费入账 - - $financeLogic->out($transaction_id, $order['profit'], OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0); //商户获得的 - //冻结金额的 - $frozen = bcsub($order->profit, $fees, 2); - //缴纳齐全了就加商户没有就加到平台 - $money_limt = SystemStore::where('id', $order['store_id'])->field('paid_deposit,security_deposit')->find(); - $deposit = bcsub($money_limt['security_deposit'], $money_limt['paid_deposit'], 2); //剩余额度 - if ($deposit > 0 && $frozen > 0) { - $amount = min($deposit, $frozen); - $financeLogic->in($transaction_id, $amount, OrderEnum::ORDER_MARGIN, $order['store_id'], $order['staff_id']); + $user_sing = new UserSign(); + $vipFen = 0; + if ($order['uid'] > 0) { + // 结算金额 要支付的钱减去冻结得钱去走后面得逻辑 发得兑换券也要去减去 + //用户下单该用户等级为1得时候才处理冻结金额 + $user = User::where('id', $order['uid'])->find(); + //纯在分销关系的时候要去判断分销出来的用户的采购款的额度 (只有会员按照这个逻辑拆分,其余的还是按照正常的支付金额) + if ($order['spread_uid'] > 0) { + $oldUser = User::where('id',$order['spread_uid'])->field('purchase_funds,user_ship')->find(); + if ($oldUser && $oldUser['user_ship'] == 1){ + if ($oldUser['purchase_funds'] < $order['pay_price']) { + $vipFen = $oldUser['purchase_funds']; + } } } - $financeLogic->save(); - } - } + elseif ($user['user_ship'] == 1){ + $vipFrozenAmount = self::dealFrozenPrice($order['id']); + //为1的时候要去减活动价 +// $final_price = bcsub($order['pay_price'],$order['deduction_price'],2); +// d($final_price,$vipFrozenAmount); + $order['pay_price'] = bcsub($order['pay_price'],$vipFrozenAmount,2); + self::dealVipAmount($order, $order['pay_type']); + } - //等级处理 - public static function dealLevel($uid, $total_money) - { - $userShip = UserShip::where('limit', '<=', $total_money) - ->field('id,title,limit') - ->order('limit', 'desc') - ->find(); - $info = User::where('id', $uid)->findOrEmpty(); - if ($info && $userShip) { - if ($info->user_ship != $userShip['id']) { - $info->user_ship = $userShip['id']; - $info->save(); + $user_number = bcmul($order['pay_price'], '0.10', 2); + $sing = [ + 'uid' => $order['uid'], + 'order_id' => $order['order_id'], + 'title' => '购买商品获得兑换券', + 'store_id' => $order['store_id'], + 'number' => $user_number, + ]; + $user_sing->save($sing); + User::where('id', $order['uid'])->inc('integral', $user_number)->update(); + } + + + $financeLogic->order = $order; + $financeLogic->user = ['uid' => $order['uid']]; + // if ($order->pay_type != 9 || $order->pay_type != 10) { + $financeLogic->in($transaction_id, $order['pay_price'], OrderEnum::USER_ORDER_PAY, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); //用户订单支付 + $count_frees = 0; + + //平台手续费 + $fees = bcdiv(bcmul($order['pay_price'], '0.02', 2), 1, 2); + $count_frees = bcadd($count_frees, $fees, 2); + if ($fees > 0) { + $financeLogic->in($transaction_id, $fees, OrderEnum::ORDER_HANDLING_FEES, $order['store_id'], 0, 0, $order['pay_type']); //平台手续费 + $financeLogic->out($transaction_id, $fees, OrderEnum::ORDER_HANDLING_FEES, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); //商户平台手续费支出 + } + // $frozen = bcsub($order->profit, $fees, 2); + //缴纳齐全了就加商户没有就加到平台 + $money_limt = SystemStore::where('id', $order['store_id'])->field('paid_deposit,security_deposit')->find(); + $deposit = bcsub($money_limt['security_deposit'], $money_limt['paid_deposit'], 2); //保证金剩余额度 + $store_profit = bcdiv(bcmul($order['pay_price'], '0.05', 2), 1, 2); + $count_frees = bcadd($count_frees, $store_profit, 2); + if ($deposit > 0) { + 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); + if ($deposit > 0) { + $financeLogic->out($transaction_id, $deposit, OrderEnum::ORDER_MARGIN, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + } + if ($money) { + SystemStore::where('id', $order['store_id'])->inc('store_money', $money)->update(); + $financeLogic->in($transaction_id, $money, OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); //平台手续费 + } + } + } else { + if ($store_profit > 0) { + SystemStore::where('id', $order['store_id'])->inc('store_money', $store_profit)->update(); + $financeLogic->in($transaction_id, $store_profit, OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); //平台手续费 } } - return true; - } + // if ($order['is_vip'] >= 1) { + if ($order['spread_uid'] > 0) { + $financeLogic->other_arr['vip_uid'] = $order['spread_uid']; + if($vipFen){ + $fees = bcdiv(bcmul($vipFen, '0.08', 2), 1, 2); + }else{ + $fees = bcdiv(bcmul($order['pay_price'], '0.08', 2), 1, 2); + } + $count_frees = bcadd($count_frees, $fees, 2); + if ($fees > 0) { + User::where('id', $order['spread_uid'])->inc('now_money', $fees)->update(); + $financeLogic->in($transaction_id, $fees, OrderEnum::VIP_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); //vip订单获得 + $financeLogic->out($transaction_id, $fees, OrderEnum::VIP_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + } + } + $fees = bcdiv(bcmul($order['pay_price'], '0.01', 2), 1, 2); + $count_frees = bcadd($count_frees, bcmul($fees, 3, 2), 2); + $village_uid = 0; + $brigade_uid = 0; + //查询用户对应的村长和队长 + if ($order['uid'] > 0) { + $address = UserAddress::where(['uid' => $order['uid'], 'is_default' => 1])->find(); + if ($address) { + $arr1 = UserAddress::where(['village' => $address['village'], 'is_default' => 1])->column('uid'); + if ($arr1) { + $uid = User::where('id', 'in', $arr1)->where('user_ship', 2)->value('id'); + if ($uid) { + User::where('id', $uid)->inc('integral', $fees)->update(); + $village_uid=$uid; + } + } + $arr2 = UserAddress::where(['village' => $address['village'], 'brigade' => $address['brigade'], 'is_default' => 1])->column('uid'); + if ($arr2) { + $uid = User::where('id', 'in', $arr1)->where('user_ship', 3)->value('id'); + if ($uid) { + User::where('id', $uid)->inc('integral', $fees)->update(); + $brigade_uid=$uid; + } + } + } + } + if ($fees > 0) { + //村长获得 + $sing = []; - //处理活动期间直接改用户的等级 - public static function dealChange($uid) - { - User::where('id', $uid)->update(['user_ship' => UserShipEnum::LEVEL_ONE]); - return true; + $sing[] = [ + 'uid' => $village_uid, + 'order_id' => $order['order_id'], + 'title' => '村长订单获得兑换券', + 'store_id' => $order['store_id'], + 'number' => $fees, + 'financial_pm' => 1, + 'user_ship' => 2, + ]; + $sing[] = [ + 'uid' => $brigade_uid, + 'order_id' => $order['order_id'], + '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; + // } + // $financeLogic->in($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); + // $financeLogic->out($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + //队长获得 + // if ($brigade_uid > 0) { + // $financeLogic->other_arr['vip_uid'] = $brigade_uid; + // } + // $financeLogic->in($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); + // $financeLogic->out($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + $user_sing->saveAll($sing); + //其他获得 + $financeLogic->other_arr['vip_uid'] = 0; + $financeLogic->in($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); + $financeLogic->out($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + } + // } + $fees = bcsub($order['pay_price'], $count_frees, 2); + //供应链订单获得 + if ($fees > 0) { + $financeLogic->in($transaction_id, $fees, OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); + $financeLogic->out($transaction_id, $fees, OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + } + // } + $financeLogic->save(); + // } } - /** * 回调日志 * @param $order @@ -323,4 +531,94 @@ class PayNotifyLogic extends BaseLogic ]; PayNotify::create($data); } + + /** + * 冻结金额 + * @param $oid + * @return int|mixed + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + */ + + public static function dealFrozenPrice($oid) + { + $detail = StoreOrderCartInfo::where('oid',$oid)->select()->toArray(); + $total_vip = 0; + foreach ($detail as $value){ + $total_vip +=$value['cart_info']['vip_frozen_price']; + } + return $total_vip; + } + + + /** + * 处理用户为vip1时得冻结资金 + * @param $order + * @param $pay_type + * @param $transaction_id + * @return true + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + */ + public static function dealVipAmount($order,$pay_type =1,$transaction_id = 0) + { + $total_vip = self::dealFrozenPrice($order['id']); + $data=[ + 'order_id' => $order['id'], + 'transaction_id' => $transaction_id??0, + 'order_sn' =>$order['order_id'], + 'user_id' => $order['uid'], + 'number' => $total_vip, + 'pay_type' => $pay_type??1, + 'status' => 0, + 'store_id' => $order['store_id'], + 'staff_id' => $order['staff_id'], + 'create_time'=>time() + ]; + Db::name('vip_flow')->insert($data); + 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; + + } + } diff --git a/app/common/logic/PaymentLogic.php b/app/common/logic/PaymentLogic.php index 98b0c7fb..51df608a 100644 --- a/app/common/logic/PaymentLogic.php +++ b/app/common/logic/PaymentLogic.php @@ -74,7 +74,7 @@ class PaymentLogic extends BaseLogic /** * 微信条码支付 */ - public static function codepay($auth_code, $order) + public static function codepay($auth_code, $order,$description='条码商品') { $pattern = '/^(10|11|12|13|14|15)\d{16}$/'; @@ -83,7 +83,7 @@ class PaymentLogic extends BaseLogic return false; } $order = [ - 'description' => '条码商品', + 'description' => $description, 'out_trade_no' => (string)$order['order_id'], 'payer' => [ 'auth_code' => (string)$auth_code diff --git a/app/common/logic/StoreFinanceFlowLogic.php b/app/common/logic/StoreFinanceFlowLogic.php index c1489abb..ac7d6607 100644 --- a/app/common/logic/StoreFinanceFlowLogic.php +++ b/app/common/logic/StoreFinanceFlowLogic.php @@ -11,6 +11,7 @@ class StoreFinanceFlowLogic extends BaseLogic public $order; public $user; + public $other_arr; public $index = 0; public $financeSn; public $list = []; @@ -24,9 +25,9 @@ class StoreFinanceFlowLogic extends BaseLogic * @param $staffId * @param $status */ - public function out($transaction_id,$number, $financialType, $storeId = 0, $staffId = 0, $status = 1) + public function out($transaction_id,$number, $financialType, $storeId = 0, $staffId = 0, $status = 1,$pay_type=7) { - $this->setData($number, $financialType, 0, $storeId, $staffId, $status,$transaction_id); + $this->setData($number, $financialType, 0, $storeId, $staffId, $status,$transaction_id,$pay_type); } /** @@ -38,31 +39,49 @@ class StoreFinanceFlowLogic extends BaseLogic * @param $staffId * @param $status */ - public function in($transaction_id,$number, $financialType, $storeId = 0, $staffId = 0, $status = 1) + public function in($transaction_id,$number, $financialType, $storeId = 0, $staffId = 0, $status = 1,$pay_type=7) { - $this->setData($number, $financialType, 1, $storeId, $staffId, $status,$transaction_id); + $this->setData($number, $financialType, 1, $storeId, $staffId, $status,$transaction_id,$pay_type); } - public function setData($number, $financialType, $pm, $storeId, $staffId, $status,$transaction_id) + public function setData($number, $financialType, $pm, $storeId, $staffId, $status,$transaction_id,$pay_type=7) { if (empty($this->financeSn)) { $this->financeSn = $this->getSn(); } - $this->list[] = [ + $data=[ 'order_id' => $this->order['id'], 'transaction_id' => $transaction_id, 'order_sn' => $this->order['order_id'], 'user_id' => $this->user['uid'], + 'other_uid' => $this->other_arr['vip_uid']??0, 'financial_type' => $financialType, 'financial_pm' => $pm, 'number' => $number, - 'pay_type' => PayEnum::WECHAT_PAY_MINI, - 'status' => $status, + 'pay_type' => $pay_type, + 'status' => 0, 'store_id' => $storeId !== '' ? $storeId : $this->order['store_id'], 'staff_id' => $staffId !== '' ? $staffId : $this->order['staff_id'], 'financial_record_sn' => $this->financeSn . ($this->index++), 'create_time'=>time() ]; + switch($financialType){ + case OrderEnum::MERCHANT_ORDER_OBTAINS: // 商户 + case OrderEnum::ORDER_MARGIN: // 商户保证金 + $data['type'] =OrderEnum::MERCHANT; + break; + case OrderEnum::PLATFORM_ORDER_OBTAINS: // 平台 + case OrderEnum::ORDER_HANDLING_FEES: // 手续费 + $data['type'] =OrderEnum::PLATFORM; + break; + case OrderEnum::SUPPLIER_ORDER_OBTAINS: // 供应链 + $data['type'] =OrderEnum::SUPPLIER; + break; + default: // 用户 + $data['type'] =OrderEnum::USER; + break; + } + $this->list[] = $data; } public function save() diff --git a/app/common/logic/VipLogic.php b/app/common/logic/VipLogic.php new file mode 100644 index 00000000..d47b9505 --- /dev/null +++ b/app/common/logic/VipLogic.php @@ -0,0 +1,183 @@ +select()->toArray(); + $total_vip = 0; + foreach ($detail as $value){ + $total_vip +=$value['cart_info']['vip_frozen_price']; + } + $data=[ + 'order_id' => $order['id'], + 'transaction_id' => $transaction_id??0, + 'order_sn' =>$order['order_id'], + 'user_id' => $order['uid'], +// 'financial_type' => $financialType, + 'number' => $total_vip, + 'pay_type' => $pay_type??1, + 'status' => 0, + 'store_id' => $order['store_id'], + 'staff_id' => $order['staff_id'], + 'create_time'=>time() + ]; + Db::name('vip_flow')->insert($data); + //todo 限制执行 +// self::afterPay($order,$transaction_id,$total_vip); + return true; + } + + + + + + + + public static function afterPay($order, $transaction_id = 0,$Vipmoney=0) + { + $financeLogic = new StoreFinanceFlowLogic(); + $financeLogic->order = $order; + $financeLogic->user = ['uid' => $order['uid']]; + + $financeLogic->in($transaction_id, $Vipmoney, OrderEnum::USER_ORDER_PAY); //用户订单支付 + $count_frees = 0; + + //平台手续费 + $fees = bcdiv(bcmul($Vipmoney, '0.02', 2), 1, 2); + $count_frees = bcadd($count_frees, $fees, 2); + if ($fees > 0) { + $financeLogic->in($transaction_id, $fees, OrderEnum::ORDER_HANDLING_FEES, $order['store_id'], 0, 0, $order['pay_type']); //平台手续费 + $financeLogic->out($transaction_id, $fees, OrderEnum::ORDER_HANDLING_FEES, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); //商户平台手续费支出 + } + // $frozen = bcsub($order->profit, $fees, 2); + //缴纳齐全了就加商户没有就加到平台 + $money_limt = SystemStore::where('id', $order['store_id'])->field('paid_deposit,security_deposit')->find(); + $deposit = bcsub($money_limt['security_deposit'], $money_limt['paid_deposit'], 2); //保证金剩余额度 + $store_profit = bcdiv(bcmul($Vipmoney, '0.05', 2), 1, 2); + $count_frees = bcadd($count_frees, $store_profit, 2); + if ($deposit > 0) { + 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']); + } + } else { + $money = bcsub($store_profit, $deposit, 2); + if ($deposit > 0) { + $financeLogic->out($transaction_id, $deposit, OrderEnum::ORDER_MARGIN, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + } + if ($money) { + SystemStore::where('id', $order['store_id'])->inc('store_money', $money)->update(); + $financeLogic->in($transaction_id, $money, OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); //平台手续费 + } + } + } else { + if ($store_profit > 0) { + SystemStore::where('id', $order['store_id'])->inc('store_money', $store_profit)->update(); + $financeLogic->in($transaction_id, $store_profit, OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); //平台手续费 + } + } + + if ($order['is_vip'] >= 1) { + if ($order['spread_uid'] > 0) { + $financeLogic->other_arr['vip_uid'] = $order['spread_uid']; + $fees = bcdiv(bcmul($Vipmoney, '0.08', 2), 1, 2); + $count_frees = bcadd($count_frees, $fees, 2); + if ($fees > 0) { + User::where('id', $order['spread_uid'])->inc('now_money', $fees)->update(); + $financeLogic->in($transaction_id, $fees, OrderEnum::VIP_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); //vip订单获得 + $financeLogic->out($transaction_id, $fees, OrderEnum::VIP_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + } + } + $fees = bcdiv(bcmul($Vipmoney, '0.01', 2), 1, 2); + $count_frees = bcadd($count_frees, bcmul($fees, 3, 2), 2); + $village_uid = 0; + $brigade_uid = 0; + //查询用户对应的村长和队长 + if ($order['uid'] > 0) { + $address = UserAddress::where(['uid' => $order['uid'], 'is_default' => 1])->find(); + if ($address) { + $arr1 = UserAddress::where(['village' => $address['village'], 'is_default' => 1])->column('uid'); + if ($arr1) { + $village_uid = User::where('id', 'in', $arr1)->where('user_ship', 2)->value('id'); + if($village_uid){ + User::where('id', $village_uid)->inc('integral', $fees)->update(); + } + } + $arr2 = UserAddress::where(['village' => $address['village'], 'brigade' => $address['brigade'], 'is_default' => 1])->column('uid'); + if ($arr2) { + $brigade_uid = User::where('id', 'in', $arr1)->where('user_ship', 3)->value('id'); + if($brigade_uid){ + User::where('id', $brigade_uid)->inc('integral', $fees)->update(); + } + } + } + } + if ($fees > 0) { + //村长获得 + $sing=[]; + $user_sing=new UserSign(); + + $sing[]=[ + 'uid'=>$village_uid, + 'title'=>'村长订单获得兑换券', + 'store_id'=>$order['store_id'], + 'number'=>$fees, + ]; + $sing[]=[ + 'uid'=>$brigade_uid, + 'title'=>'队长订单获得兑换券', + 'store_id'=>$order['store_id'], + 'number'=>$fees, + ]; + // if ($village_uid > 0) { + // $financeLogic->other_arr['vip_uid'] = $village_uid; + // } + // $financeLogic->in($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); + // $financeLogic->out($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + //队长获得 + // if ($brigade_uid > 0) { + // $financeLogic->other_arr['vip_uid'] = $brigade_uid; + // } + // $financeLogic->in($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); + // $financeLogic->out($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + $user_sing->saveAll($sing); + //其他获得 + $financeLogic->other_arr['vip_uid'] = 0; + $financeLogic->in($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); + $financeLogic->out($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + } + } + + $fees=bcsub($Vipmoney, $count_frees, 2); + //供应链订单获得 + if ($fees > 0) { + $financeLogic->in($transaction_id,$fees , OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); + $financeLogic->out($transaction_id, $fees, OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + + } + $financeLogic->save(); + + } + + +} \ No newline at end of file diff --git a/app/common/logic/store_order/StoreOrderLogic.php b/app/common/logic/store_order/StoreOrderLogic.php index 6fb41bf4..b892b808 100644 --- a/app/common/logic/store_order/StoreOrderLogic.php +++ b/app/common/logic/store_order/StoreOrderLogic.php @@ -4,6 +4,7 @@ namespace app\common\logic\store_order; use app\common\enum\OrderEnum; use app\common\enum\PayEnum; +use app\common\enum\UserShipEnum; use app\common\logic\BaseLogic; use app\common\enum\YesNoEnum; use app\common\model\dict\DictType; @@ -12,7 +13,9 @@ use app\common\model\store_branch_product\StoreBranchProduct; use app\common\model\store_order\StoreOrder; use app\common\model\store_order_cart_info\StoreOrderCartInfo; use app\common\model\store_product_unit\StoreProductUnit; +use app\common\model\user\User; use app\common\service\pay\PayService; +use app\common\service\SmsService; use Exception; use support\Cache; use think\facade\Db; @@ -23,6 +26,7 @@ class StoreOrderLogic extends BaseLogic public static $pay_price; public static $cost; public static $profit; + public static $store_price;//门店零售价 public static $activity_price; /** * @notes 获取购物车商品信息 @@ -44,36 +48,47 @@ class StoreOrderLogic extends BaseLogic self::$cost = 0; //成本 self::$profit = 0; //利润 self::$activity_price = 0; //活动减少 - + self::$store_price = 0; //门店零售价 /** 计算价格 */ - $check = DictType::where('type', 'activities')->find(); foreach ($cart_select as $k => $v) { - $find = StoreBranchProduct::where(['product_id' => $v['product_id'],'store_id'=>$params['store_id']])->field('id branch_product_id,store_name,image,unit,price,cost,product_id')->find(); + $find = StoreBranchProduct::where(['product_id' => $v['product_id'],'store_id'=>$params['store_id']])->field('id branch_product_id,store_name,image,unit,price,vip_price,cost,purchase,product_id')->withTrashed()->find(); if (!$find) { continue; } unset($cart_select[$k]['id']); $cart_select[$k]['price'] = $find['price']; + $cart_select[$k]['cost'] = $find['cost']; $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价 $cart_select[$k]['deduction_price'] =self::$activity_price;//抵扣金额 - if (isset($check) && $check['status'] == 1) { - //零售价*折扣率 - $activity_price = bcmul($find['price'], 0.9, 2); - $deduction_price_count=bcmul(bcsub($find['price'], $activity_price, 2),$v['cart_num'], 2); + $cart_select[$k]['vip'] = 0; + if ($user && $user['user_ship'] == 1) { + //更新 会员为1的时候原价减去会员价 + $deduction_price_count=bcmul(bcsub($find['price'], $find['vip_price'], 2),$v['cart_num'],2); $cart_select[$k]['deduction_price'] =$deduction_price_count; self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2); - $find['price'] = $activity_price; + $cart_select[$k]['vip'] =1; } + + if ($user && $user['user_ship'] == 4) { + //更新 为4商户的时候减去商户价格 + $deduction_price_count=bcmul(bcsub($find['price'], $find['cost'], 2),$v['cart_num'],2); + $cart_select[$k]['deduction_price'] =$deduction_price_count; + self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2); + } //利润 - $onePrice = bcsub($find['price'], $find['cost'], 2); - $cart_select[$k]['profit'] = bcmul($v['cart_num'], $onePrice, 2); //利润 - $cart_select[$k]['cost'] = bcmul($v['cart_num'], $find['cost'], 2) ?? 0; //成本 + // $cart_select[$k]['profit'] = bcmul($cart_select[$k]['total_price'],0.05,2); //利润 + $cart_select[$k]['purchase'] = bcmul($v['cart_num'], $find['purchase'], 2) ?? 0; //成本 $cart_select[$k]['pay_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单支付金额 + $cart_select[$k]['store_price'] = bcmul($v['cart_num'], $find['cost'], 2)??0; //门店零售价 + $cart_select[$k]['vip_price'] = bcmul($v['cart_num'], $find['vip_price'], 2)??0; //vip售价 $cart_select[$k]['product_id'] = $find['product_id']; $cart_select[$k]['old_cart_id'] = $v['id']; $cart_select[$k]['cart_num'] = $v['cart_num']; $cart_select[$k]['verify_code'] = $params['verify_code'] ?? ''; + //vip1待返回金额 + + $cart_select[$k]['vip_frozen_price'] = bcsub($cart_select[$k]['pay_price'],$cart_select[$k]['vip_price'],2); $cartInfo = $cart_select[$k]; $cartInfo['name'] = $find['store_name']; $cartInfo['image'] = $find['image']; @@ -82,7 +97,7 @@ class StoreOrderLogic extends BaseLogic // if ($vipPrice) { // $cartInfo['price'] = $vipPrice; // } - $cartInfo['vip_price'] = 0;//$cart_select[$k]['total'] - $vipPrice ?? 0; + //$cart_select[$k]['total'] - $vipPrice ?? 0; $cart_select[$k]['cart_info'] = json_encode($cartInfo); $cart_select[$k]['branch_product_id'] = $find['branch_product_id']; //理论上每笔都是拆分了 @@ -93,10 +108,21 @@ class StoreOrderLogic extends BaseLogic self::$total_price = bcadd(self::$total_price, $cart_select[$k]['total_price'], 2); self::$pay_price = bcadd(self::$pay_price, $cart_select[$k]['pay_price'], 2); self::$cost = bcadd(self::$cost, $cart_select[$k]['cost'], 2); - self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2); + self::$store_price = bcadd(self::$store_price, $cart_select[$k]['store_price'], 2);//门店零售价格 + // self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2); } - //TODO 收单打9.9折 会员按照比例打折 等级按照充值去升级 - $pay_price = self::$pay_price; + if ($user && $user['user_ship'] == 1) { + $pay_price = self::$pay_price; + $activity_string = ''; + }else{ + $pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额 + $activity_string = '减免'; + } + + if($pay_price < 500){ + throw new \think\Exception('金额低于500'); + } + $vipPrice = 0; //成本价 收益 $order = [ @@ -104,7 +130,7 @@ class StoreOrderLogic extends BaseLogic 'order_id' =>$params['order_id'] ?? getNewOrderId('PF'), 'total_price' => self::$total_price, //总价 'cost' => self::$cost,//成本价 - 'profit' => self::$profit,//利润 + 'profit' => 0,//利润 'pay_price' => $pay_price,//后期可能有降价抵扣 'vip_price' => $vipPrice, 'total_num' => count($cart_select),//总数 @@ -112,15 +138,18 @@ class StoreOrderLogic extends BaseLogic 'reservation_time' => $params['reservation_time'] ?? null, 'cart_id' => implode(',', $cartId), 'store_id' => $params['store_id'] ?? 0, - 'shipping_type' => $params['shipping_type'] ?? 2,//配送方式 1=快递 ，2=门店自提 - 'activity' =>'减免', - 'activity_price' =>self::$activity_price, - 'activities'=>$check['status'], + 'shipping_type' =>3,//配送方式 1=快递 ，2=门店自提 + 'activity' =>$activity_string, + 'activity_price' =>self::$activity_price,//活动优惠价 + 'activities' => self::$activity_price>0?1:0, 'default_delivery'=>1, 'original_price'=>self::$total_price, - 'deduction_price' => self::$activity_price - + 'deduction_price' => self::$activity_price,//抵扣金额 ]; + if($user && $user['user_ship']!=4){ + $order['is_vip']=1; + } + } catch (\Exception $e) { self::setError($e->getMessage()); return false; @@ -144,7 +173,7 @@ class StoreOrderLogic extends BaseLogic return false; } $_order = $orderInfo['order']; - $_order['deduction_price'] = 0; + $_order['uid'] = $user['id']??0; $_order['pay_type'] = $orderInfo['order']['pay_type']; $_order['verify_code'] = $verify_code; if (isset($params['reservation_time'])) { @@ -157,7 +186,7 @@ class StoreOrderLogic extends BaseLogic $goods_list = $orderInfo['cart_list']; foreach ($goods_list as $k => $v) { $goods_list[$k]['oid'] = $order['id']; - $goods_list[$k]['uid'] = 0; + $goods_list[$k]['uid'] = $user['id']??0; $goods_list[$k]['cart_id'] = implode(',', $cartId); $goods_list[$k]['delivery_id'] = $params['store_id']; //商家id $stock = StoreBranchProduct::where('id',$v['branch_product_id'])->value('stock'); @@ -199,9 +228,42 @@ class StoreOrderLogic extends BaseLogic $order['refund_type_name'] = OrderEnum::refundType($order['refund_type']) ?? ''; $order['pay_type_name'] =PayEnum::getPaySceneDesc($order['pay_type']) ?? ''; + $detail =StoreOrderCartInfo::where('oid',$order['id'])->find()->toArray(); + $vip =0; + if(isset($detail['cart_info']['vip']) && $detail['cart_info']['vip'] == 1){ + $vip = 1; + } + $order['vip'] = $vip; return $order->toArray(); } + //核销列表 + public function writeList($params) + { + $pageNo = $params['page_no']; + $pageSize = $params['page_size']; + unset($params['page_no'],$params['page_size']); + $params['paid'] = YesNoEnum::YES; + $params['is_writeoff'] = YesNoEnum::YES; + $order = StoreOrder::with(['user', 'staff', 'product' => function ($query) { + $query->field(['id', 'oid', 'product_id', 'cart_info']); + }])->where($params)->whereIn('shipping_type',OrderEnum::ONLINE) + ->page($pageNo, $pageSize) + ->select()->toArray(); + + foreach ($order as &$value){ + $value['pay_time'] = $value['pay_time'] > 0 ? date('Y-m-d H:i:s', $value['pay_time']) : ''; + $value['status_name'] = OrderEnum::getOrderType($value['status']) ?? ''; + $value['refund_status_name'] = OrderEnum::refundStatus($value['refund_status']) ?? ''; + $value['refund_type_name'] = OrderEnum::refundType($value['refund_type']) ?? ''; + $value['pay_type_name'] =PayEnum::getPaySceneDesc($value['pay_type']) ?? ''; + } + return $order; + } + + + + /** * 订单统计 * @param $storeId @@ -284,4 +346,30 @@ class StoreOrderLogic extends BaseLogic } + + public function dealSendSms($param,$type = 0) + { + $code = generateRandomCode(); + $phone = User::where('id',$param['uid'])->value('mobile'); + if(empty($phone)){ + throw new \Exception('用户未设置手机号'); + } + $template = getenv('SMS_TEMPLATE'); + if($type){ + $check =(new SmsService())->client($phone,$template,$code,1); + }else{ + $check =(new SmsService())->client($phone,$template,$code); + } + + if($check){ + $remark = $param['uid'].'_smsPay'; + Cache::set($remark,$code,5*60); + return true; + }else{ + return false; + } + + } + + } diff --git a/app/common/model/financial_transfers/FinancialTransfers.php b/app/common/model/financial_transfers/FinancialTransfers.php new file mode 100644 index 00000000..dede4d2f --- /dev/null +++ b/app/common/model/financial_transfers/FinancialTransfers.php @@ -0,0 +1,45 @@ +hasOne(SystemStore::class, 'id','store_id') + ->bind(['store_name'=>'name', 'store_phone'=>'phone','store_detailed_address'=>'detailed_address','store_simple_address'=>'address','store_bank'=>'bank','store_bank_code'=>'bank_code','store_bank_address'=>'bank_address','store_realName'=>'realname']); + } + + + public function staff() + { + return $this->hasOne(SystemStoreStaff::class, 'id', 'store_staff_id')->bind(['staff_name']); + } + + + public function admin() + { + return $this->hasOne(Admin::class, 'id','admin_id') + ->bind(['admin_name'=>'name']); + + } + +} \ No newline at end of file diff --git a/app/common/model/store_branch_product_exchange/StoreBranchProductExchange.php b/app/common/model/store_branch_product_exchange/StoreBranchProductExchange.php new file mode 100644 index 00000000..24ad4cbc --- /dev/null +++ b/app/common/model/store_branch_product_exchange/StoreBranchProductExchange.php @@ -0,0 +1,24 @@ +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/store_order/StoreOrder.php b/app/common/model/store_order/StoreOrder.php index 1b375309..f057b50c 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,64 @@ class StoreOrder extends BaseModel { 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'); + } + /** + * 用户趋势数据 + * @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(); + } + /** + * 曲线统计 + * @param $time + * @param $type + * @param $timeType + * @return mixed + */ + public function getCurveData($where,$time,$str) + { + return $this->where($where) + ->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"; + } 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(); + } } diff --git a/app/common/model/store_product_cate/StoreProductCate.php b/app/common/model/store_product_cate/StoreProductCate.php new file mode 100644 index 00000000..41338c9e --- /dev/null +++ b/app/common/model/store_product_cate/StoreProductCate.php @@ -0,0 +1,14 @@ +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 diff --git a/app/common/model/store_visit/StoreVisit.php b/app/common/model/store_visit/StoreVisit.php index 0f506070..82a837d8 100644 --- a/app/common/model/store_visit/StoreVisit.php +++ b/app/common/model/store_visit/StoreVisit.php @@ -8,7 +8,7 @@ use think\model\concern\SoftDelete; /** - * 计量单位 + * 商品浏览分析 * Class StoreProductUnit * @package app\common\model\store_product_unit */ diff --git a/app/common/model/user/User.php b/app/common/model/user/User.php index 6917e0c4..3739b860 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 @@ -113,7 +120,7 @@ class User extends BaseModel */ public function getAvatarAttr($value) { - if($value){ + if ($value) { return trim($value) ? FileService::getFileUrl($value) : ''; } } @@ -168,4 +175,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_label/UserLabel.php b/app/common/model/user_label/UserLabel.php new file mode 100644 index 00000000..adeb03be --- /dev/null +++ b/app/common/model/user_label/UserLabel.php @@ -0,0 +1,22 @@ +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(); + } +} diff --git a/app/common/model/user_sign/UserSign.php b/app/common/model/user_sign/UserSign.php new file mode 100644 index 00000000..70fcef24 --- /dev/null +++ b/app/common/model/user_sign/UserSign.php @@ -0,0 +1,22 @@ +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 diff --git a/app/common/service/JsonService.php b/app/common/service/JsonService.php index 7dbb069a..273eba12 100644 --- a/app/common/service/JsonService.php +++ b/app/common/service/JsonService.php @@ -4,10 +4,13 @@ namespace app\common\service; +use app\api\logic\store\StoreLogic; use app\common\enum\ExportEnum; use app\common\lists\BaseDataLists; use app\common\lists\ListsExcelInterface; use app\common\lists\ListsExtendInterface; +use app\common\model\dict\DictType; +use app\common\model\system_store\SystemStore; use support\Response; use support\exception\BusinessException; @@ -90,7 +93,7 @@ class JsonService * @author 令狐冲 * @date 2021/7/28 11:15 */ - public static function dataLists(BaseDataLists $lists) + public static function dataLists(BaseDataLists $lists,$remark) { //获取导出信息 if ($lists->export == ExportEnum::INFO && $lists instanceof ListsExcelInterface) { @@ -109,6 +112,12 @@ class JsonService 'page_no' => $lists->pageNo, 'page_size' => $lists->pageSize, ]; + $store_id = DictType::where('type','store')->value('remark')??5; + if($remark){ + $data['store'] = StoreLogic::search([ + 'id' => $store_id + ]); + } $data['extend'] = []; if ($lists instanceof ListsExtendInterface) { $data['extend'] = $lists->extend(); diff --git a/app/common/service/SmsService.php b/app/common/service/SmsService.php new file mode 100644 index 00000000..af0d86ba --- /dev/null +++ b/app/common/service/SmsService.php @@ -0,0 +1,82 @@ + 5.0, + + // 默认发送配置 + 'default' => [ + // 网关调用策略，默认：顺序调用 + 'strategy' => \Overtrue\EasySms\Strategies\OrderStrategy::class, + + // 默认可用的发送网关 + 'gateways' => [ + 'yunpian', 'aliyun', + ], + ], + // 可用的网关配置 + 'gateways' => [ + 'errorlog' => [ + 'file' => runtime_path() . '/logs/' . date('Ymd') . '/easy-sms.log', + ], + 'aliyun' => [ + 'access_key_id' => 'LTAI5t7mhH3ij2cNWs1zhPmv', + 'access_key_secret' => 'gqo2wMpvi8h5bDBmCpMje6BaiXvcPu', + 'sign_name' => '里海科技', + ], + //... + ], + ]; + $this->config=$config; + + } + + public function client($phone,$template,$code,$type = 0) + { + try{ + $easySms = new EasySms($this->config); + + if($type){//预留发送到货短信 + $res = $easySms->send($phone, [ + 'content' => '您的验证码为: '.$code, + 'template' => $template, + 'data' => [ + 'code' => $code + ], + ]); + + }else{ + $res = $easySms->send($phone, [ + 'content' => '您的验证码为: '.$code, + 'template' => $template, + 'data' => [ + 'code' => $code + ], + ]); + } + + if($res && $res['aliyun']['status'] == 'success'){ + return true; + }else{ + return false; + } + }catch(NoGatewayAvailableException $e){ + throw new BusinessException($e->getMessage()); + } + + } +} diff --git a/app/functions.php b/app/functions.php index 2328a71b..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,11 +402,26 @@ 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; } } +/** + * 随机验证码 + */ +if (!function_exists('generateRandomCode')) { + function generateRandomCode($length = 4) + { + $code = ''; + for ($i = 0; $i < $length; $i++) { + $code .= random_int(0, 9); + } + return $code; + } +} + + if (!function_exists('reset_index')) { /** * 重置数组索引 @@ -444,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); + } +} diff --git a/app/queue/redis/CodePaySend.php b/app/queue/redis/CodePaySend.php index c3b33c55..d944b9ee 100644 --- a/app/queue/redis/CodePaySend.php +++ b/app/queue/redis/CodePaySend.php @@ -30,7 +30,11 @@ class CodePaySend implements Consumer ]; $res = $pay->wechat->query($order); if ($res['trade_state'] == 'SUCCESS' && $res['trade_state_desc'] == '支付成功') { - PayNotifyLogic::handle('wechat_common', $res['out_trade_no'], $res); + if(isset($data['pay_type']) && $data['pay_type']=='recharge'){ + PayNotifyLogic::handle('recharge', $res['out_trade_no'], $res); + }else{ + PayNotifyLogic::handle('wechat_common', $res['out_trade_no'], $res); + } }else{ throw new BusinessException('订单支付中', 200); } diff --git a/app/queue/redis/StoreStorageSend.php b/app/queue/redis/StoreStorageSend.php index 6d58da70..d2cb8e0e 100644 --- a/app/queue/redis/StoreStorageSend.php +++ b/app/queue/redis/StoreStorageSend.php @@ -5,6 +5,7 @@ namespace app\queue\redis; use app\admin\logic\store_product\StoreProductLogic; use app\common\model\store_branch_product\StoreBranchProduct; use app\common\model\store_branch_product_attr_value\StoreBranchProductAttrValue; +use app\common\model\store_branch_product_exchange\StoreBranchProductExchange; use app\common\model\store_product\StoreProduct; use app\common\model\store_product_attr_value\StoreProductAttrValue; use app\common\model\system_store_storage\SystemStoreStorage; @@ -28,9 +29,18 @@ class StoreStorageSend implements Consumer { $product_arr = $data['product_arr']; $store_id = $data['store_id']; + $stock_type = $data['stock_type']; $admin_id = $data['admin_id']; - Log::error('StoreStorageSend: ' . json_encode($data)); $find = StoreProduct::where('id', $product_arr['id'])->findOrEmpty()->toArray(); + if($stock_type == 1){ + $this->ordinary($product_arr,$store_id,$admin_id,$find); + }elseif($stock_type == 2){ + $this->exchange($product_arr,$store_id,$admin_id,$find); + } + } + + /**普通 */ + public function ordinary($product_arr,$store_id,$admin_id,$find){ $store_find = StoreBranchProduct::where(['product_id' => $product_arr['id'], 'store_id' => $store_id])->findOrEmpty()->toArray(); if ($find && !$store_find) { $attr_value = StoreProductAttrValue::where('product_id', $product_arr['id'])->findOrEmpty(); @@ -45,8 +55,12 @@ class StoreStorageSend implements Consumer 'bar_code' => $find['bar_code'], 'cate_id' => $find['cate_id'], 'price' => $find['price'], - 'unit' => $find['unit'], +// 'cost' => $find['cost'], //v1.0 'cost' => $find['cost'], + 'purchase' => $find['purchase'], + 'vip_price' => $find['vip_price'], + 'unit' => $find['unit'], + 'batch' => $find['batch'], 'store_id' => $store_id, 'sales' => 0, 'stock' => 0, @@ -64,7 +78,7 @@ class StoreStorageSend implements Consumer if ($product_arr['stock'] > 0) { $this->storage($find, $store_id, $admin_id, $product_arr); } - StoreProductLogic::updateGoodsclass($find['cate_id']); + StoreProductLogic::updateGoodsclass($find['cate_id'],$store_id); Db::commit(); return true; } catch (\Exception $e) { @@ -76,7 +90,7 @@ class StoreStorageSend implements Consumer Db::startTrans(); try { if ($product_arr['stock'] > 0) { - $this->storage($find, $store_id, $admin_id, $product_arr); + $this->storage($find, $store_id, $admin_id, $product_arr,1); } Db::commit(); return true; @@ -88,13 +102,64 @@ class StoreStorageSend implements Consumer } } - public function storage($find, $store_id, $admin_id, $product_arr) + /**兑换 */ + public function exchange($product_arr,$store_id,$admin_id,$find){ + $store_find = StoreBranchProductExchange::where(['product_id' => $product_arr['id'], 'store_id' => $store_id])->findOrEmpty()->toArray(); + if ($find && !$store_find) { + Db::startTrans(); + try { + $product = [ + 'product_id' => $find['id'], + 'image' => $find['image'], + 'store_name' => $find['store_name'], + 'store_info' => $find['store_info'], + 'keyword' => $find['keyword'], + 'bar_code' => $find['bar_code'], + 'cate_id' => $find['cate_id'], + 'price' => $find['price'], + 'cost' => $find['cost'], + 'purchase' => $find['purchase'], + 'vip_price' => $find['vip_price'], + 'unit' => $find['unit'], + 'store_id' => $store_id, + 'sales' => 0, + 'stock' => 0, + ]; + StoreBranchProductExchange::create($product); + if ($product_arr['stock'] > 0) { + $this->storage($find, $store_id, $admin_id, $product_arr); + } + // StoreProductLogic::updateGoodsclass($find['cate_id'],$store_id); + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + Log::error('store-storage队列消费失败: ' . $e->getMessage() . ',line:' . $e->getLine() . ',file:' . $e->getFile()); + return false; + } + } else { + Db::startTrans(); + try { + if ($product_arr['stock'] > 0) { + $this->storage($find, $store_id, $admin_id, $product_arr,2); + } + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + Log::error('store-storage队列消费失败: ' . $e->getMessage() . ',line:' . $e->getLine() . ',file:' . $e->getFile()); + return false; + } + } + } + public function storage($find, $store_id, $admin_id, $product_arr,$stock_type=1) { $storage = [ 'product_id' => $product_arr['id'], 'store_id' => $store_id, 'nums' => $product_arr['stock'], 'admin_id' => $admin_id, + 'type' => $stock_type, ]; if ($find['stock'] < $product_arr['stock']) { $storage['status'] = -1; diff --git a/app/statistics/controller/IndexController.php b/app/statistics/controller/IndexController.php new file mode 100644 index 00000000..040fc819 --- /dev/null +++ b/app/statistics/controller/IndexController.php @@ -0,0 +1,107 @@ +fail(OrderLogic::getError()); //获取错误信息并返回错误信息 + } + return $this->success('ok', ['dayPayPrice' => $res,'title'=>'喻寺镇农(特)产品交易大数据']); + } + public function user() + { + $today = strtotime(date('Y-m-d')); + $dates=[]; + // 循环输出前5天的日期 + for ($i = 0; $i <= 4; $i++) { + // 计算前第$i天的日期时间戳 + $timestamp = $today - ($i * 86400); // 86400秒等于1天 + + // 将时间戳格式化为日期 + $date = date('Y-m-d', $timestamp); + $dates[]=$date; + } + $res = UserLogic::userCount(5,$dates); + if (UserLogic::hasError()) { + return $this->fail(UserLogic::getError()); //获取错误信息并返回错误信息 + } + return $this->success('ok', $res); + } + + /** + * 中间商品统计 + */ + public function product_count() + { + $res = ProductLogic::Count(5); + if (ProductLogic::hasError()) { + return $this->fail(ProductLogic::getError()); //获取错误信息并返回错误信息 + } + return $this->success('ok', $res); + } + /** + * 订单统计 + */ + public function order_user_num_count() + { + $res = OrderLogic::Count(5); + if (ProductLogic::hasError()) { + return $this->fail(ProductLogic::getError()); //获取错误信息并返回错误信息 + } + return $this->success('ok', $res); + } + /** + * 商品销量排行榜统计 + */ + public function sales_ranking() + { + $res = ProductLogic::sales(5); + if (ProductLogic::hasError()) { + return $this->fail(ProductLogic::getError()); //获取错误信息并返回错误信息 + } + return $this->success('ok', $res); + } + /** + * 成交用户数据 + */ + public function user_trade_count() + { + $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'); + } + $res = UserLogic::TradeCount(5, $dates); + if (UserLogic::hasError()) { + return $this->fail(UserLogic::getError()); //获取错误信息并返回错误信息 + } + return $this->success('ok', $res); + } + /** + * 当日订单金额 + */ + public function street_currday_order_count() + { + $res = OrderLogic::Currday(5); + if (ProductLogic::hasError()) { + return $this->fail(ProductLogic::getError()); //获取错误信息并返回错误信息 + } + return $this->success('ok', $res); + } +} diff --git a/app/statistics/logic/OrderLogic.php b/app/statistics/logic/OrderLogic.php new file mode 100644 index 00000000..83d7054d --- /dev/null +++ b/app/statistics/logic/OrderLogic.php @@ -0,0 +1,69 @@ +whereDay('create_time')->count(); + $orderPayNum = StoreOrder::where('store_id', $store_id)->where('paid', 1)->whereDay('create_time')->group('uid')->count(); + $monthOrderNum = StoreOrder::where('store_id', $store_id)->whereMonth('create_time')->count(); + $monthOrderPayNum = StoreOrder::where('store_id', $store_id)->where('paid', 1)->whereMonth('create_time')->group('uid')->count(); + $data = [ + "orderNum" => $orderNum, + "monthOrderNum" => $monthOrderNum, + "monthOrderNumRate" => 0, + "orderNumRate" => 0, + "orderPayNum" => $orderPayNum, + "monthOrderPayNum" => $monthOrderPayNum, + "monthOrderPayRate" => 0, + "orderOrderPayRate" => 0 + ]; + return $data; + } + public static function Currday($store_id) + { + $date = date("Y-m-d"); + $startTime = strtotime($date . ' 00:00:00'); // 当天的开始时间戳 + $endTime = strtotime($date . ' 23:59:59'); // 当天的结束时间戳 + + $interval = 4 * 60 * 60; // 4小时的秒数 + $data = []; + for ($time = $startTime; $time < $endTime; $time += $interval) { + + $endTimeSegment = $time + $interval; + $startTimeSegment = date('Y-m-d H:i:s', $time); + $yesterendTimeSegment = date('Y-m-d H:i:s', $endTimeSegment - 86400); + $endTimeSegment = date('Y-m-d H:i:s', $endTimeSegment); + $yesterstartTimeSegment = date('Y-m-d H:i:s', $time - 86400); + // 统计当前时间段的订单 + $todayAmount = StoreOrder::where('store_id', $store_id) + ->where('paid', 1) + ->whereBetween('create_time', [strtotime($startTimeSegment), strtotime($endTimeSegment)]) + ->sum('pay_price'); + $yesterdayAmount = StoreOrder::where('store_id', $store_id) + ->where('paid', 1) + ->whereBetween('create_time', [strtotime($yesterstartTimeSegment), strtotime($yesterendTimeSegment)]) + ->sum('pay_price'); + $data[] = [ + 'todayAmount' => $todayAmount, + 'yesterdayAmount' => $yesterdayAmount, + ]; + } + return $data; + } + public static function dayPayPrice($store_id) + { + $todayAmount = UserRecharge::where('store_id', $store_id) + ->where('paid', 1) + ->whereDay('create_time') + ->sum('price'); + + return $todayAmount; + } +} diff --git a/app/statistics/logic/ProductLogic.php b/app/statistics/logic/ProductLogic.php new file mode 100644 index 00000000..1b6a8aa8 --- /dev/null +++ b/app/statistics/logic/ProductLogic.php @@ -0,0 +1,51 @@ +count(); + $yestertodayProductCount=StoreBranchProduct::where('store_id',$store_id)->where('create_time', '<',strtotime(date('Y-md'))-1)->count(); + if ($yestertodayProductCount == 0 ||$todayProductCount==0) { + $weeklyProductTotalGrowthRate = 0; + } else { + $weeklyProductTotalGrowthRate = ($todayProductCount - $yestertodayProductCount) / $yestertodayProductCount * 100; + } + + $todayNewProductCount=StoreBranchProduct::where('store_id',$store_id)->whereDay('create_time')->count(); + $yestertodayNewProductCount=StoreBranchProduct::where('store_id',$store_id)->whereDay('create_time', 'yesterday')->count(); + if ($yestertodayProductCount == 0 ||$todayProductCount==0) { + $weeklyNewProductTotalGrowthRate = 0; + } else { + $weeklyNewProductTotalGrowthRate = ($todayNewProductCount - $yestertodayNewProductCount) / $yestertodayNewProductCount * 100; + } + $data = [ + "totalProductCounInfo" => [ + "todayProductCount" => $todayProductCount, + "yestertodayProductCount" => $yestertodayProductCount, + "weeklyProductTotalGrowthRate" => $weeklyProductTotalGrowthRate + ], + "newProductCountInfo" => [ + "todayNewProductCount" => 0, + "yestertodayNewProductCount" => 0, + "weeklyNewProductTotalGrowthRate" => $weeklyNewProductTotalGrowthRate + ], + "merchantCountInfo" => [ + "todayMerchantCount" => 1, + "yestertodayMerchantCount" => 1, + "weeklyMerchantGrowthRate" => 0 + ] + ]; + return $data; + } + + public static function sales($store_id){ + $select=StoreBranchProduct::where('store_id',$store_id)->limit(10)->order('sales desc')->field('id,store_name,image,sales')->select(); + return $select?->toArray(); + } +} diff --git a/app/statistics/logic/UserLogic.php b/app/statistics/logic/UserLogic.php new file mode 100644 index 00000000..5c34dc12 --- /dev/null +++ b/app/statistics/logic/UserLogic.php @@ -0,0 +1,33 @@ +$date) { + $data[$k]['newUserCount']=UserRecharge::whereDay('create_time', $date)->where('store_id',$store_id)->where('paid',1)->where('recharge_type','INDUSTRYMEMBERS')->count(); + $data[$k]['viewUserCount']=StoreVisit::whereDay('create_time', $date)->where('store_id',$store_id)->group('uid')->count(); + $data[$k]['totalUserCount']=UserRecharge::where('create_time','<',strtotime($date) )->where('store_id',$store_id)->where('paid',1)->where('recharge_type','INDUSTRYMEMBERS')->count(); + } + return $data; + } + public static function TradeCount($store_id,$dates) + { + $data = []; + foreach ($dates as $k=>$date) { + $data[$k]['date']=$date; + $data[$k]['visitUser']=StoreVisit::whereDay('create_time', $date)->where('store_id',$store_id)->cache('statistics_store_visit_count_' . $date, 300)->group('uid')->count(); + $data[$k]['orderUser']=StoreOrder::whereDay('create_time', $date)->where('store_id',$store_id)->cache('statistics_store_order_count_' . $date, 300)->group('uid')->count(); + $data[$k]['payOrderUser']=StoreOrder::whereDay('create_time', $date)->where('store_id',$store_id)->where('paid',1)->cache('statistics_store_order_pay_count_' . $date, 300)->group('uid')->count(); + } + return $data; + } +} diff --git a/app/store/controller/BaseAdminController.php b/app/store/controller/BaseAdminController.php index 4ccd24c8..b35b0d40 100644 --- a/app/store/controller/BaseAdminController.php +++ b/app/store/controller/BaseAdminController.php @@ -5,9 +5,7 @@ namespace app\store\controller; use app\common\controller\BaseLikeController; -use app\common\lists\BaseDataLists; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + class BaseAdminController extends BaseLikeController { diff --git a/app/store/controller/ConfigController.php b/app/store/controller/ConfigController.php index c13dec72..a8220b24 100644 --- a/app/store/controller/ConfigController.php +++ b/app/store/controller/ConfigController.php @@ -19,7 +19,6 @@ use app\admin\logic\system_store\SystemStoreLogic; use app\common\controller\Definitions; use app\common\service\ConfigService; use app\common\service\FileService; -use hg\apidoc\annotation as ApiDoc; use think\facade\Db; /** @@ -27,27 +26,26 @@ use think\facade\Db; * Class ConfigController * @package app\admin\controller */ -#[ApiDoc\title('站点配置')] class ConfigController extends BaseAdminController { public $notNeedLogin = ['getConfig', 'dict']; - #[ - ApiDoc\Title('站点配置'), - ApiDoc\url('/store/config/getConfig'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\ResponseSuccess("data", type: "array", children: [ - ['name' => 'oss_domain', 'desc' => 'oss域名', 'type' => 'string'], - ['name' => 'web_name', 'desc' => '站点名称', 'type' => 'string'], - ['name' => 'web_favicon', 'desc' => '站点图标', 'type' => 'string'], - ['name' => 'web_logo', 'desc' => '站点logo', 'type' => 'string'], - ['name' => 'login_image', 'desc' => '登录页背景图', 'type' => 'string'], - ['name' => 'copyright_config', 'desc' => '版权信息', 'type' => 'array'], - ]), - ] + // #[ + // ApiDoc\Title('站点配置'), + // ApiDoc\url('/store/config/getConfig'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\ResponseSuccess("data", type: "array", children: [ + // ['name' => 'oss_domain', 'desc' => 'oss域名', 'type' => 'string'], + // ['name' => 'web_name', 'desc' => '站点名称', 'type' => 'string'], + // ['name' => 'web_favicon', 'desc' => '站点图标', 'type' => 'string'], + // ['name' => 'web_logo', 'desc' => '站点logo', 'type' => 'string'], + // ['name' => 'login_image', 'desc' => '登录页背景图', 'type' => 'string'], + // ['name' => 'copyright_config', 'desc' => '版权信息', 'type' => 'array'], + // ]), + // ] public function getConfig() { // $data = ConfigLogic::getConfig(); @@ -70,15 +68,15 @@ class ConfigController extends BaseAdminController return $this->data($data); } - #[ - ApiDoc\Title('门店配置'), - ApiDoc\url('/store/config/store'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('门店配置'), + // ApiDoc\url('/store/config/store'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function store() { $params['id'] = $this->request->adminInfo['store_id']; @@ -86,15 +84,15 @@ class ConfigController extends BaseAdminController return $this->data($result); } - #[ - ApiDoc\Title('保存门店配置'), - ApiDoc\url('/store/config/saveStore'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('保存门店配置'), + // ApiDoc\url('/store/config/saveStore'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function saveStore() { $params = $this->request->post(); @@ -103,31 +101,31 @@ class ConfigController extends BaseAdminController return $this->success('操作成功', [], 1, 1); } - #[ - ApiDoc\Title('省列表'), - ApiDoc\url('/store/config/province'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('省列表'), + // ApiDoc\url('/store/config/province'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function province() { $list = Db::name('geo_province')->select()->toArray(); return $this->success('ok', $list); } - #[ - ApiDoc\Title('市列表'), - ApiDoc\url('/store/config/city'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'code', type: 'int', require: true, desc: '省份代码'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('市列表'), + // ApiDoc\url('/store/config/city'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'code', type: 'int', require: true, desc: '省份代码'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function city() { $province_code = $this->request->get('code'); @@ -135,16 +133,16 @@ class ConfigController extends BaseAdminController return $this->success('ok', $list); } - #[ - ApiDoc\Title('区列表'), - ApiDoc\url('/store/config/area'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'code', type: 'int', require: true, desc: '城市代码'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('区列表'), + // ApiDoc\url('/store/config/area'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'code', type: 'int', require: true, desc: '城市代码'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function area() { $city_code = $this->request->get('code'); diff --git a/app/store/controller/DeliveryController.php b/app/store/controller/DeliveryController.php index 0811d69f..d0a747e6 100644 --- a/app/store/controller/DeliveryController.php +++ b/app/store/controller/DeliveryController.php @@ -5,41 +5,39 @@ namespace app\store\controller; use app\common\controller\Definitions; use app\common\lists\DeliveryServiceLists; use app\common\logic\DeliveryServiceLogic; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\title('配送员管理')] class DeliveryController extends BaseAdminController { - #[ - ApiDoc\Title('列表'), - ApiDoc\url('/store/delivery/lists'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'keyword', type: 'string', require: false, desc: '名称/手机号'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(ref: [Definitions::class, "page"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('列表'), + // ApiDoc\url('/store/delivery/lists'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'keyword', type: 'string', require: false, desc: '名称/手机号'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(ref: [Definitions::class, "page"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function lists() { return $this->dataLists(new DeliveryServiceLists()); } - #[ - ApiDoc\Title('添加'), - ApiDoc\url('/store/delivery/add'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Param(name: 'avatar', type: 'string', require: true, desc: '头像'), - ApiDoc\Param(name: 'nickname', type: 'string', require: true, desc: '店员名称'), - ApiDoc\Param(name: 'phone', type: 'string', require: true, desc: '手机号'), - ApiDoc\Param(name: 'status', type: 'string', require: true, desc: '状态，1启用，0禁用'), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('添加'), + // ApiDoc\url('/store/delivery/add'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Param(name: 'avatar', type: 'string', require: true, desc: '头像'), + // ApiDoc\Param(name: 'nickname', type: 'string', require: true, desc: '店员名称'), + // ApiDoc\Param(name: 'phone', type: 'string', require: true, desc: '手机号'), + // ApiDoc\Param(name: 'status', type: 'string', require: true, desc: '状态，1启用，0禁用'), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function add(DeliveryServiceLogic $logic) { $params = $this->request->post(); @@ -47,20 +45,20 @@ class DeliveryController extends BaseAdminController return $this->success('操作成功', [], 1, 1); } - #[ - ApiDoc\Title('编辑'), - ApiDoc\url('/store/delivery/edit'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Param(name: 'avatar', type: 'string', require: true, desc: '头像'), - ApiDoc\Param(name: 'nickname', type: 'string', require: true, desc: '店员名称'), - ApiDoc\Param(name: 'phone', type: 'string', require: true, desc: '手机号'), - ApiDoc\Param(name: 'status', type: 'string', require: true, desc: '状态，1启用，0禁用'), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('编辑'), + // ApiDoc\url('/store/delivery/edit'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Param(name: 'avatar', type: 'string', require: true, desc: '头像'), + // ApiDoc\Param(name: 'nickname', type: 'string', require: true, desc: '店员名称'), + // ApiDoc\Param(name: 'phone', type: 'string', require: true, desc: '手机号'), + // ApiDoc\Param(name: 'status', type: 'string', require: true, desc: '状态，1启用，0禁用'), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function edit(DeliveryServiceLogic $logic) { $id = $this->request->post('id'); @@ -69,16 +67,16 @@ class DeliveryController extends BaseAdminController return $this->success('操作成功', [], 1, 1); } - #[ - ApiDoc\Title('删除'), - ApiDoc\url('/store/delivery/delete'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('删除'), + // ApiDoc\url('/store/delivery/delete'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function delete(DeliveryServiceLogic $logic) { $id = $this->request->post('id'); @@ -86,27 +84,27 @@ class DeliveryController extends BaseAdminController return $this->success('操作成功', [], 1, 1); } - #[ - ApiDoc\Title('详情'), - ApiDoc\url('/store/delivery/detail'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(name: 'id', type: 'int', require: true, desc: 'id'), - ApiDoc\ResponseSuccess("data", type: "array", children: [ - ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], - ['name' => 'account', 'desc' => '账号', 'type' => 'string'], - ['name' => 'avatar', 'desc' => '头像', 'type' => 'string'], - ['name' => 'staff_name', 'desc' => '店员名称', 'type' => 'string'], - ['name' => 'phone', 'desc' => '手机号', 'type' => 'string'], - ['name' => 'verify_status', 'desc' => '核销开关，1开启，0关闭', 'type' => 'int'], - ['name' => 'order_status', 'desc' => '订单状态，1开启，0关闭', 'type' => 'int'], - ['name' => 'is_admin', 'desc' => '是否管理员，1是，0不是', 'type' => 'int'], - ['name' => 'is_manager', 'desc' => '是否是店长，1是，0不是', 'type' => 'int'], - ['name' => 'status', 'desc' => '状态，1启用，0禁用', 'type' => 'int'], - ]), - ] + // #[ + // ApiDoc\Title('详情'), + // ApiDoc\url('/store/delivery/detail'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(name: 'id', type: 'int', require: true, desc: 'id'), + // ApiDoc\ResponseSuccess("data", type: "array", children: [ + // ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], + // ['name' => 'account', 'desc' => '账号', 'type' => 'string'], + // ['name' => 'avatar', 'desc' => '头像', 'type' => 'string'], + // ['name' => 'staff_name', 'desc' => '店员名称', 'type' => 'string'], + // ['name' => 'phone', 'desc' => '手机号', 'type' => 'string'], + // ['name' => 'verify_status', 'desc' => '核销开关，1开启，0关闭', 'type' => 'int'], + // ['name' => 'order_status', 'desc' => '订单状态，1开启，0关闭', 'type' => 'int'], + // ['name' => 'is_admin', 'desc' => '是否管理员，1是，0不是', 'type' => 'int'], + // ['name' => 'is_manager', 'desc' => '是否是店长，1是，0不是', 'type' => 'int'], + // ['name' => 'status', 'desc' => '状态，1启用，0禁用', 'type' => 'int'], + // ]), + // ] public function detail(DeliveryServiceLogic $logic) { $id = $this->request->get('id'); @@ -114,16 +112,16 @@ class DeliveryController extends BaseAdminController return $this->data($data); } - #[ - ApiDoc\Title('开启/关闭'), - ApiDoc\url('/store/delivery/status'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('开启/关闭'), + // ApiDoc\url('/store/delivery/status'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function status(DeliveryServiceLogic $logic) { $id = $this->request->post('id'); diff --git a/app/store/controller/DownloadController.php b/app/store/controller/DownloadController.php index faf1a11e..93ce7f38 100644 --- a/app/store/controller/DownloadController.php +++ b/app/store/controller/DownloadController.php @@ -7,8 +7,7 @@ namespace app\store\controller; use app\common\cache\ExportCache; use app\common\service\JsonService; use support\Cache; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + class DownloadController extends BaseAdminController { diff --git a/app/store/controller/FileController.php b/app/store/controller/FileController.php index d1a50d9a..e531cd65 100644 --- a/app/store/controller/FileController.php +++ b/app/store/controller/FileController.php @@ -7,33 +7,32 @@ use app\admin\lists\file\FileLists; use app\admin\logic\FileLogic; use app\admin\validate\FileValidate; use app\common\controller\Definitions; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\title('文件管理')] +// #[ApiDoc\title('文件管理')] class FileController extends BaseAdminController { - #[ - ApiDoc\Title('列表'), - ApiDoc\url('/store/file/lists'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(ref: [Definitions::class, "page"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('列表'), + // ApiDoc\url('/store/file/lists'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(ref: [Definitions::class, "page"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function lists() { return $this->dataLists(new FileLists()); } - #[ - ApiDoc\Title('移动'), - ApiDoc\url('/store/file/move'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('移动'), + // ApiDoc\url('/store/file/move'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function move() { $params = (new FileValidate())->post()->goCheck('move'); @@ -41,13 +40,13 @@ class FileController extends BaseAdminController return $this->success('移动成功', [], 1, 1); } - #[ - ApiDoc\Title('重命名'), - ApiDoc\url('/store/file/rename'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('重命名'), + // ApiDoc\url('/store/file/rename'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function rename() { $params = (new FileValidate())->post()->goCheck('rename'); @@ -55,13 +54,13 @@ class FileController extends BaseAdminController return $this->success('重命名成功', [], 1, 1); } - #[ - ApiDoc\Title('删除'), - ApiDoc\url('/store/file/delete'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('删除'), + // ApiDoc\url('/store/file/delete'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function delete() { $params = (new FileValidate())->post()->goCheck('delete'); @@ -69,25 +68,25 @@ class FileController extends BaseAdminController return $this->success('删除成功', [], 1, 1); } - #[ - ApiDoc\Title('分类列表'), - ApiDoc\url('/store/file/listCate'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('分类列表'), + // ApiDoc\url('/store/file/listCate'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function listCate() { return $this->dataLists(new FileCateLists()); } - #[ - ApiDoc\Title('添加文件分类'), - ApiDoc\url('/store/file/addCate'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('添加文件分类'), + // ApiDoc\url('/store/file/addCate'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function addCate() { $params = (new FileValidate())->post()->goCheck('addCate'); @@ -95,13 +94,13 @@ class FileController extends BaseAdminController return $this->success('添加成功', [], 1, 1); } - #[ - ApiDoc\Title('编辑文件分类'), - ApiDoc\url('/store/file/editCate'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('编辑文件分类'), + // ApiDoc\url('/store/file/editCate'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function editCate() { $params = (new FileValidate())->post()->goCheck('editCate'); @@ -109,13 +108,13 @@ class FileController extends BaseAdminController return $this->success('编辑成功', [], 1, 1); } - #[ - ApiDoc\Title('删除文件分类'), - ApiDoc\url('/store/file/delCate'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('删除文件分类'), + // ApiDoc\url('/store/file/delCate'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function delCate() { $params = (new FileValidate())->post()->goCheck('id'); diff --git a/app/store/controller/LoginController.php b/app/store/controller/LoginController.php index 151e52bb..b35adac6 100644 --- a/app/store/controller/LoginController.php +++ b/app/store/controller/LoginController.php @@ -17,34 +17,33 @@ namespace app\store\controller; use app\store\logic\LoginLogic; use app\store\validate\LoginValidate; use think\facade\Cache; -use hg\apidoc\annotation as ApiDoc; /** * 管理员登录控制器 * Class LoginController * @package app\store\controller */ -#[ApiDoc\title('登入登出')] +// #[ApiDoc\title('登入登出')] class LoginController extends BaseAdminController { public $notNeedLogin = ['account']; - #[ - ApiDoc\Title('账号登录'), - ApiDoc\url('/store/login/account'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "account", type: "string", require: true, desc: "账号"), - ApiDoc\Param(name: "password", type: "string", require: true, desc: "密码"), - ApiDoc\Param(name: "terminal", type: "integer", require: true, default: 1, desc: "终端类型：1-PC，2-H5"), - ApiDoc\NotHeaders(), - ApiDoc\ResponseSuccess("data", type: "array", children: [ - ['name' => 'name', 'desc' => '用户名', 'type' => 'string'], - ['name' => 'avatar', 'desc' => '头像', 'type' => 'string'], - ['name' => 'token', 'desc' => 'token', 'type' => 'string'], - ['name' => 'role_name', 'desc' => '角色名称', 'type' => 'integer'], - ]), - ] + // #[ + // ApiDoc\Title('账号登录'), + // ApiDoc\url('/store/login/account'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "account", type: "string", require: true, desc: "账号"), + // ApiDoc\Param(name: "password", type: "string", require: true, desc: "密码"), + // ApiDoc\Param(name: "terminal", type: "integer", require: true, default: 1, desc: "终端类型：1-PC，2-H5"), + // ApiDoc\NotHeaders(), + // ApiDoc\ResponseSuccess("data", type: "array", children: [ + // ['name' => 'name', 'desc' => '用户名', 'type' => 'string'], + // ['name' => 'avatar', 'desc' => '头像', 'type' => 'string'], + // ['name' => 'token', 'desc' => 'token', 'type' => 'string'], + // ['name' => 'role_name', 'desc' => '角色名称', 'type' => 'integer'], + // ]), + // ] public function account() { $params = (new LoginValidate())->post()->goCheck(); @@ -52,14 +51,14 @@ class LoginController extends BaseAdminController return $this->data((new LoginLogic())->login($params)); } - #[ - ApiDoc\Title('退出登录'), - ApiDoc\url('/store/login/logout'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('退出登录'), + // ApiDoc\url('/store/login/logout'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function logout() { //退出登录情况特殊，只有成功的情况，也不需要token验证 diff --git a/app/store/controller/StaffController.php b/app/store/controller/StaffController.php index 60e604c4..8dc4d3a0 100644 --- a/app/store/controller/StaffController.php +++ b/app/store/controller/StaffController.php @@ -5,53 +5,52 @@ namespace app\store\controller; use app\common\controller\Definitions; use app\common\lists\StoreStaffLists; use app\common\logic\SystemStoreStaffLogic; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\title('店员管理')] +// #[ApiDoc\title('店员管理')] class StaffController extends BaseAdminController { - #[ - ApiDoc\Title('列表'), - ApiDoc\url('/store/staff/lists'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'keyword', 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' => 'staff_name', 'desc' => '店员名称', 'type' => 'string'], - ['name' => 'avatar', 'desc' => '头像', 'type' => 'string'], - ['name' => 'account', 'desc' => '账号', 'type' => 'string'], - ['name' => 'phone', 'desc' => '手机号', 'type' => 'string'], - ['name' => 'is_admin', 'desc' => '是否是管理员，1是，0不是', 'type' => 'int'], - ['name' => 'is_manager', 'desc' => '是否是店长，1是，0不是', 'type' => 'int'], - ]), - ] + // #[ + // ApiDoc\Title('列表'), + // ApiDoc\url('/store/staff/lists'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'keyword', 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' => 'staff_name', 'desc' => '店员名称', 'type' => 'string'], + // ['name' => 'avatar', 'desc' => '头像', 'type' => 'string'], + // ['name' => 'account', 'desc' => '账号', 'type' => 'string'], + // ['name' => 'phone', 'desc' => '手机号', 'type' => 'string'], + // ['name' => 'is_admin', 'desc' => '是否是管理员，1是，0不是', 'type' => 'int'], + // ['name' => 'is_manager', 'desc' => '是否是店长，1是，0不是', 'type' => 'int'], + // ]), + // ] public function lists() { return $this->dataLists(new StoreStaffLists()); } - #[ - ApiDoc\Title('添加'), - ApiDoc\url('/store/staff/add'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Param(name: 'account', type: 'string', require: true, desc: '账号'), - ApiDoc\Param(name: 'pwd', type: 'string', require: true, desc: '密码'), - ApiDoc\Param(name: 'avatar', type: 'string', require: true, desc: '头像'), - ApiDoc\Param(name: 'staff_name', type: 'string', require: true, desc: '店员名称'), - ApiDoc\Param(name: 'phone', type: 'string', require: true, desc: '手机号'), - ApiDoc\Param(name: 'verify_status', type: 'string', require: true, desc: '核销开关，1开启，0关闭'), - ApiDoc\Param(name: 'order_status', type: 'string', require: true, desc: '订单状态，1开启，0关闭'), - ApiDoc\Param(name: 'is_manager', type: 'string', require: true, desc: '是否是店长，1是，0不是'), - ApiDoc\Param(name: 'status', type: 'string', require: true, desc: '状态，1启用，0禁用'), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('添加'), + // ApiDoc\url('/store/staff/add'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Param(name: 'account', type: 'string', require: true, desc: '账号'), + // ApiDoc\Param(name: 'pwd', type: 'string', require: true, desc: '密码'), + // ApiDoc\Param(name: 'avatar', type: 'string', require: true, desc: '头像'), + // ApiDoc\Param(name: 'staff_name', type: 'string', require: true, desc: '店员名称'), + // ApiDoc\Param(name: 'phone', type: 'string', require: true, desc: '手机号'), + // ApiDoc\Param(name: 'verify_status', type: 'string', require: true, desc: '核销开关，1开启，0关闭'), + // ApiDoc\Param(name: 'order_status', type: 'string', require: true, desc: '订单状态，1开启，0关闭'), + // ApiDoc\Param(name: 'is_manager', type: 'string', require: true, desc: '是否是店长，1是，0不是'), + // ApiDoc\Param(name: 'status', type: 'string', require: true, desc: '状态，1启用，0禁用'), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function add(SystemStoreStaffLogic $staffLogic) { $params = $this->request->post(); @@ -59,24 +58,24 @@ class StaffController extends BaseAdminController return $this->success('操作成功', [], 1, 1); } - #[ - ApiDoc\Title('编辑'), - ApiDoc\url('/store/staff/edit'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), - ApiDoc\Param(name: 'account', type: 'string', require: true, desc: '账号'), - ApiDoc\Param(name: 'pwd', type: 'string', require: true, desc: '密码'), - ApiDoc\Param(name: 'avatar', type: 'string', require: true, desc: '头像'), - ApiDoc\Param(name: 'staff_name', type: 'string', require: true, desc: '店员名称'), - ApiDoc\Param(name: 'phone', type: 'string', require: true, desc: '手机号'), - ApiDoc\Param(name: 'verify_status', type: 'string', require: true, desc: '核销开关，1开启，0关闭'), - ApiDoc\Param(name: 'order_status', type: 'string', require: true, desc: '订单状态，1开启，0关闭'), - ApiDoc\Param(name: 'is_manager', type: 'string', require: true, desc: '是否是店长，1是，0不是'), - ApiDoc\Param(name: 'status', type: 'string', require: true, desc: '状态，1启用，0禁用'), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('编辑'), + // ApiDoc\url('/store/staff/edit'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), + // ApiDoc\Param(name: 'account', type: 'string', require: true, desc: '账号'), + // ApiDoc\Param(name: 'pwd', type: 'string', require: true, desc: '密码'), + // ApiDoc\Param(name: 'avatar', type: 'string', require: true, desc: '头像'), + // ApiDoc\Param(name: 'staff_name', type: 'string', require: true, desc: '店员名称'), + // ApiDoc\Param(name: 'phone', type: 'string', require: true, desc: '手机号'), + // ApiDoc\Param(name: 'verify_status', type: 'string', require: true, desc: '核销开关，1开启，0关闭'), + // ApiDoc\Param(name: 'order_status', type: 'string', require: true, desc: '订单状态，1开启，0关闭'), + // ApiDoc\Param(name: 'is_manager', type: 'string', require: true, desc: '是否是店长，1是，0不是'), + // ApiDoc\Param(name: 'status', type: 'string', require: true, desc: '状态，1启用，0禁用'), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function edit(SystemStoreStaffLogic $staffLogic) { $id = $this->request->post('id'); @@ -85,15 +84,15 @@ class StaffController extends BaseAdminController return $this->success('操作成功', [], 1, 1); } - #[ - ApiDoc\Title('删除'), - ApiDoc\url('/store/staff/delete'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('删除'), + // ApiDoc\url('/store/staff/delete'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function delete(SystemStoreStaffLogic $staffLogic) { $id = $this->request->post('id'); @@ -101,26 +100,26 @@ class StaffController extends BaseAdminController return $this->success('操作成功', [], 1, 1); } - #[ - ApiDoc\Title('详情'), - ApiDoc\url('/store/staff/detail'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(name: 'id', type: 'int', require: true, desc: 'id'), - ApiDoc\ResponseSuccess("data", type: "array", children: [ - ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], - ['name' => 'account', 'desc' => '账号', 'type' => 'string'], - ['name' => 'avatar', 'desc' => '头像', 'type' => 'string'], - ['name' => 'staff_name', 'desc' => '店员名称', 'type' => 'string'], - ['name' => 'phone', 'desc' => '手机号', 'type' => 'string'], - ['name' => 'verify_status', 'desc' => '核销开关，1开启，0关闭', 'type' => 'int'], - ['name' => 'order_status', 'desc' => '订单状态，1开启，0关闭', 'type' => 'int'], - ['name' => 'is_admin', 'desc' => '是否管理员，1是，0不是', 'type' => 'int'], - ['name' => 'is_manager', 'desc' => '是否是店长，1是，0不是', 'type' => 'int'], - ['name' => 'status', 'desc' => '状态，1启用，0禁用', 'type' => 'int'], - ]), - ] + // #[ + // ApiDoc\Title('详情'), + // ApiDoc\url('/store/staff/detail'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(name: 'id', type: 'int', require: true, desc: 'id'), + // ApiDoc\ResponseSuccess("data", type: "array", children: [ + // ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], + // ['name' => 'account', 'desc' => '账号', 'type' => 'string'], + // ['name' => 'avatar', 'desc' => '头像', 'type' => 'string'], + // ['name' => 'staff_name', 'desc' => '店员名称', 'type' => 'string'], + // ['name' => 'phone', 'desc' => '手机号', 'type' => 'string'], + // ['name' => 'verify_status', 'desc' => '核销开关，1开启，0关闭', 'type' => 'int'], + // ['name' => 'order_status', 'desc' => '订单状态，1开启，0关闭', 'type' => 'int'], + // ['name' => 'is_admin', 'desc' => '是否管理员，1是，0不是', 'type' => 'int'], + // ['name' => 'is_manager', 'desc' => '是否是店长，1是，0不是', 'type' => 'int'], + // ['name' => 'status', 'desc' => '状态，1启用，0禁用', 'type' => 'int'], + // ]), + // ] public function detail(SystemStoreStaffLogic $staffLogic) { $id = $this->request->get('id'); @@ -128,15 +127,15 @@ class StaffController extends BaseAdminController return $this->data($data); } - #[ - ApiDoc\Title('开启/关闭'), - ApiDoc\url('/store/staff/status'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('开启/关闭'), + // ApiDoc\url('/store/staff/status'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function status(SystemStoreStaffLogic $logic) { $id = $this->request->post('id'); diff --git a/app/store/controller/UploadController.php b/app/store/controller/UploadController.php index 2cfc9211..cd00fde5 100644 --- a/app/store/controller/UploadController.php +++ b/app/store/controller/UploadController.php @@ -6,9 +6,7 @@ namespace app\store\controller; use app\common\service\UploadService; use Exception; -use Tinywan\Storage\Storage; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + class UploadController extends BaseAdminController { diff --git a/app/store/controller/WorkbenchController.php b/app/store/controller/WorkbenchController.php index 267a13ec..1e6fab09 100644 --- a/app/store/controller/WorkbenchController.php +++ b/app/store/controller/WorkbenchController.php @@ -3,25 +3,26 @@ namespace app\store\controller; use app\common\controller\Definitions; +use app\common\model\dict\DictType; use app\store\lists\store_order\StoreOrderLists; use app\store\logic\WorkbenchLogic; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\Title('工作台')] +// #[ApiDoc\Title('工作台')] class WorkbenchController extends BaseAdminController { + public $notNeedLogin = ['recharge_statistics']; - #[ - ApiDoc\Title('交易统计'), - ApiDoc\url('/store/workbench/index'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), - ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('交易统计'), + // ApiDoc\url('/store/workbench/index'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), + // ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function index() { $params = $this->request->get(); @@ -30,17 +31,17 @@ class WorkbenchController extends BaseAdminController return $this->data($result); } - #[ - ApiDoc\Title('商品统计（暂时不用）'), - ApiDoc\url('/store/workbench/product'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), - ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('商品统计（暂时不用）'), + // ApiDoc\url('/store/workbench/product'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), + // ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function product() { $params = $this->request->get(); @@ -49,17 +50,17 @@ class WorkbenchController extends BaseAdminController return $this->data($result); } - #[ - ApiDoc\Title('配送统计'), - ApiDoc\url('/store/workbench/delivery'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), - ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('配送统计'), + // ApiDoc\url('/store/workbench/delivery'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), + // ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function delivery() { $params = $this->request->get(); @@ -68,18 +69,18 @@ class WorkbenchController extends BaseAdminController return $this->data($result); } - #[ - ApiDoc\Title('配送订单统计'), - ApiDoc\url('/store/workbench/deliveryOrder'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), - ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(ref: [Definitions::class, "page"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('配送订单统计'), + // ApiDoc\url('/store/workbench/deliveryOrder'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), + // ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(ref: [Definitions::class, "page"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function deliveryOrder() { $params = $this->request->get(); @@ -88,58 +89,112 @@ class WorkbenchController extends BaseAdminController return $this->data($result); } - #[ - ApiDoc\Title('商品统计-概况'), - ApiDoc\url('/store/workbench/get_basic'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), - ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('商品统计-概况'), + // ApiDoc\url('/store/workbench/get_basic'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), + // ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] 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); } - #[ - ApiDoc\Title('商品统计-图表'), - ApiDoc\url('/store/workbench/get_trend'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), - ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] - public function get_trend(\app\admin\controller\WorkbenchController $workbench) + // #[ + // ApiDoc\Title('商品统计-图表'), + // ApiDoc\url('/store/workbench/get_trend'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), + // ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] + public function get_trend() + { +// $params = $this->request->get(); + $store_id = $this->request->adminInfo['store_id']; + $workbench = WorkbenchLogic::get_trend($store_id); + return $this->data($workbench); + } + + // #[ + // ApiDoc\Title('商品统计-排行'), + // ApiDoc\url('/store/workbench/get_product_ranking'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), + // ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] + public function 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); + } + + + // #[ + // ApiDoc\Title('收银台数据统计'), + // ApiDoc\url('/store/workbench/business_statistics'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] + public function business_statistics() { $params = $this->request->get(); $params['store_id'] = $this->request->adminInfo['store_id']; - return $workbench->get_trend(); + $result = WorkbenchLogic::revenueStatistics($params); + return $this->data($result); } - #[ - ApiDoc\Title('商品统计-排行'), - ApiDoc\url('/store/workbench/get_product_ranking'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), - ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] - public function get_product_ranking(\app\admin\controller\WorkbenchController $workbench) + + public function recharge_statistics() { - $params = $this->request->get(); - $params['store_id'] = $this->request->adminInfo['store_id']; - return $workbench->get_product_ranking(); + $params['store_id'] = DictType::where('type','store')->value('remark')??5; + $result = WorkbenchLogic::rechargeData($params); + return $this->data($result); + } - } diff --git a/app/store/controller/auth/AdminController.php b/app/store/controller/auth/AdminController.php index 50c75f33..0ec1f6cb 100644 --- a/app/store/controller/auth/AdminController.php +++ b/app/store/controller/auth/AdminController.php @@ -19,38 +19,37 @@ use app\store\lists\auth\AdminLists; use app\store\validate\auth\AdminValidate; use app\store\logic\auth\AdminLogic; use app\store\validate\auth\editSelfValidate; -use hg\apidoc\annotation as ApiDoc; /** * 管理员控制器 * Class AdminController * @package app\store\controller\auth */ -#[ApiDoc\title('管理员信息')] +// #[ApiDoc\title('管理员信息')] class AdminController extends BaseAdminController { - #[ - ApiDoc\Title("查看管理员列表"), - ApiDoc\url('/store/auth/admin/lists'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title("查看管理员列表"), + // ApiDoc\url('/store/auth/admin/lists'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function lists() { return $this->dataLists(new AdminLists()); } - #[ - ApiDoc\Title("添加管理员"), - ApiDoc\url('/store/auth/admin/add'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title("添加管理员"), + // ApiDoc\url('/store/auth/admin/add'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function add() { $params = (new AdminValidate())->post()->goCheck('add'); @@ -61,14 +60,14 @@ class AdminController extends BaseAdminController return $this->fail(AdminLogic::getError()); } - #[ - ApiDoc\Title("编辑管理员"), - ApiDoc\url('/store/auth/admin/edit'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title("编辑管理员"), + // ApiDoc\url('/store/auth/admin/edit'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function edit() { $params = (new AdminValidate())->post()->goCheck('edit'); @@ -79,14 +78,14 @@ class AdminController extends BaseAdminController return $this->fail(AdminLogic::getError()); } - #[ - ApiDoc\Title("删除管理员"), - ApiDoc\url('/store/auth/admin/delete'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title("删除管理员"), + // ApiDoc\url('/store/auth/admin/delete'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function delete() { $params = (new AdminValidate())->post()->goCheck('delete'); @@ -97,14 +96,14 @@ class AdminController extends BaseAdminController return $this->fail(AdminLogic::getError()); } - #[ - ApiDoc\Title("查看管理员详情"), - ApiDoc\url('/store/auth/admin/detail'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title("查看管理员详情"), + // ApiDoc\url('/store/auth/admin/detail'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function detail() { $params = (new AdminValidate())->goCheck('detail'); @@ -112,28 +111,28 @@ class AdminController extends BaseAdminController return $this->data($result); } - #[ - ApiDoc\Title("获取当前管理员信息"), - ApiDoc\url('/store/auth/admin/mySelf'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title("获取当前管理员信息"), + // ApiDoc\url('/store/auth/admin/mySelf'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function mySelf() { $result = AdminLogic::detail(['id' => $this->adminId], 'auth'); return $this->data($result); } - #[ - ApiDoc\Title("编辑超级管理员信息"), - ApiDoc\url('/store/auth/admin/editSelf'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title("编辑超级管理员信息"), + // ApiDoc\url('/store/auth/admin/editSelf'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function editSelf() { $params = (new editSelfValidate())->post()->goCheck('', ['admin_id' => $this->adminId]); diff --git a/app/store/controller/auth/MenuController.php b/app/store/controller/auth/MenuController.php index 0dd8ff82..caa58acf 100644 --- a/app/store/controller/auth/MenuController.php +++ b/app/store/controller/auth/MenuController.php @@ -19,7 +19,6 @@ use app\store\controller\BaseAdminController; use app\store\lists\auth\MenuLists; use app\store\logic\auth\MenuLogic; use app\store\validate\auth\MenuValidate; -use hg\apidoc\annotation as ApiDoc; /** @@ -27,7 +26,7 @@ use hg\apidoc\annotation as ApiDoc; * Class MenuController * @package app\store\controller\setting\system */ -#[ApiDoc\NotParse()] + class MenuController extends BaseAdminController { diff --git a/app/store/controller/auth/RoleController.php b/app/store/controller/auth/RoleController.php index 8cd0ee80..02557bb0 100644 --- a/app/store/controller/auth/RoleController.php +++ b/app/store/controller/auth/RoleController.php @@ -20,14 +20,12 @@ use app\store\{ validate\auth\RoleValidate, controller\BaseAdminController }; -use hg\apidoc\annotation as ApiDoc; - /** * 角色控制器 * Class RoleController * @package app\store\controller\auth */ -#[ApiDoc\NotParse()] + class RoleController extends BaseAdminController { diff --git a/app/store/controller/cart/CartController.php b/app/store/controller/cart/CartController.php index 6f3e640d..ae4587ee 100644 --- a/app/store/controller/cart/CartController.php +++ b/app/store/controller/cart/CartController.php @@ -8,9 +8,8 @@ use app\common\model\store_branch_product\StoreBranchProduct; use app\store\lists\cart\CartList; use app\common\model\order\Cart; use app\store\controller\BaseAdminController; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + class CartController extends BaseAdminController { public function list() @@ -25,10 +24,19 @@ class CartController extends BaseAdminController { $params = (new CartValidate())->post()->goCheck('StoreAdd'); $adminInfo = $this->adminInfo; - $params['uid'] = 0; + $params['uid'] = $this->request->post('uid')??0; $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个，请先结算'); diff --git a/app/store/controller/cate/CateController.php b/app/store/controller/cate/CateController.php new file mode 100644 index 00000000..d44b62da --- /dev/null +++ b/app/store/controller/cate/CateController.php @@ -0,0 +1,30 @@ +dataLists(new CateLists()); + } + + +} diff --git a/app/store/controller/finance/FinanceController.php b/app/store/controller/finance/FinanceController.php index 2ed913b2..54eee312 100644 --- a/app/store/controller/finance/FinanceController.php +++ b/app/store/controller/finance/FinanceController.php @@ -2,58 +2,34 @@ 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 hg\apidoc\annotation as ApiDoc; +use app\store\lists\store_finance_flow\StoreFinanceFlowLists; -#[ApiDoc\title('财务')] +// #[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()); } - #[ - ApiDoc\Title('备注'), - ApiDoc\url('/store/finance/finance/remark'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), - ApiDoc\Param(name: 'remark', type: 'string', require: true, desc: '备注'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('备注'), + // ApiDoc\url('/store/finance/finance/remark'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), + // ApiDoc\Param(name: 'remark', type: 'string', require: true, desc: '备注'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function remark(StoreFinanceFlowLogic $logic) { $id = $this->request->post('id'); diff --git a/app/store/controller/finance/FinancialTransfersController.php b/app/store/controller/finance/FinancialTransfersController.php new file mode 100644 index 00000000..0f103d94 --- /dev/null +++ b/app/store/controller/finance/FinancialTransfersController.php @@ -0,0 +1,74 @@ +dataLists(new FinancialTransfersLists()); + } + + + #[ + ApiDoc\Title('店铺确认'), + ApiDoc\url('/store/finance/financialTransfers/confirmation'), + ApiDoc\Method('POST'), + ApiDoc\NotHeaders(), + ApiDoc\Author('中国队长'), + ApiDoc\Query(name: 'status', type: 'int', require: true, desc: '状态1确认 0不确认'), + ApiDoc\Query(name: 'id', type: 'int', require: true, desc: '数据id'), + ApiDoc\Query(name: 'mark', type: 'string', require: false, desc: '原因/备注'), + ApiDoc\Header(ref: [Definitions::class, "token"]), + ApiDoc\Query(ref: [Definitions::class, "page"]), + ApiDoc\ResponseSuccess("data", type: "array"), + ] + public function confirmation() + { + $params = (new FinancialTransfersValidate())->post()->goCheck('confirm'); + + $staff_id = $this->request->adminInfo['admin_id']??5; + $data = [ + 'store_staff_id' => $staff_id, + 'mark' => $params['mark']??'', + ]; + $status = -2; + if ($params['status']) { + $status = 2; + $data['confirmation_time'] = time(); + } + $data['status'] = $status; + $result = FinancialTransfersLogic::dealchange($data,$params['id']); + + if (true === $result) { + return $this->success('操作成功',[],1,1 ); + } + return $this->fail(FinancialTransfersLogic::getError()); + + + + } + + +} \ No newline at end of file diff --git a/app/store/controller/finance/StoreBillController.php b/app/store/controller/finance/StoreBillController.php index 426f7cdd..cbd7bc6b 100644 --- a/app/store/controller/finance/StoreBillController.php +++ b/app/store/controller/finance/StoreBillController.php @@ -2,50 +2,60 @@ namespace app\store\controller\finance; +use app\admin\lists\store_finance_flow\StoreFinanceFlowDayLists; use app\admin\lists\store_finance_flow\StoreFinanceFlowLists; +use app\admin\lists\store_finance_flow\StoreFinanceFlowMonthLists; +use app\admin\lists\store_finance_flow\StoreFinanceFlowWeekLists; use app\common\controller\Definitions; use app\common\lists\StoreBillLists; use app\store\controller\BaseAdminController; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\title('账单记录')] +// #[ApiDoc\title('账单记录')] class StoreBillController extends BaseAdminController { - #[ - ApiDoc\Title('列表'), - ApiDoc\url('/store/finance/storeBill/lists'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'type', type: 'int', require: false, desc: '类型：1日账单，2周账单，3月账单'), - ApiDoc\Query(name: 'start_time', type: 'string', require: false, desc: '开始时间'), - ApiDoc\Query(name: 'end_time', type: 'string', require: false, desc: '结束时间'), - ApiDoc\Query(name: 'export', type: 'int', require: false, desc: '是否导出：2是'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(ref: [Definitions::class, "page"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('列表'), + // ApiDoc\url('/store/finance/storeBill/lists'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'type', type: 'int', require: false, desc: '类型：1日账单，2周账单，3月账单'), + // ApiDoc\Query(name: 'start_time', type: 'string', require: false, desc: '开始时间'), + // ApiDoc\Query(name: 'end_time', type: 'string', require: false, desc: '结束时间'), + // ApiDoc\Query(name: 'export', type: 'int', require: false, desc: '是否导出：2是'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(ref: [Definitions::class, "page"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function lists() { - return $this->dataLists(new StoreBillLists()); + $type = $this->request->get('type'); + if($type == 1){ + return $this->dataLists(new StoreFinanceFlowDayLists()); + }else if($type == 2){ + return $this->dataLists(new StoreFinanceFlowWeekLists()); + }else{ + return $this->dataLists(new StoreFinanceFlowMonthLists()); + } +// return $this->dataLists(new StoreBillLists()); } - #[ - ApiDoc\Title('详情'), - ApiDoc\url('/store/finance/storeBill/detail'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), - ApiDoc\Query(name: 'date_type', type: 'int', require: false, desc: '日期类型：1日账单，2周账单，3月账单'), - ApiDoc\Query(name: 'date', type: 'string', require: false, desc: '日期，日账单：2021-01-01，周账单：2024-W23，月账单：2021-01'), - ApiDoc\Query(name: 'staff_id', type: 'int', require: false, desc: '店员id'), - ApiDoc\Query(name: 'keyword', type: 'string', require: false, desc: '流水号/用户昵称'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(ref: [Definitions::class, "page"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('详情'), + // ApiDoc\url('/store/finance/storeBill/detail'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), + // ApiDoc\Query(name: 'date_type', type: 'int', require: false, desc: '日期类型：1日账单，2周账单，3月账单'), + // ApiDoc\Query(name: 'date', type: 'string', require: false, desc: '日期，日账单：2021-01-01，周账单：2024-W23，月账单：2021-01'), + // ApiDoc\Query(name: 'staff_id', type: 'int', require: false, desc: '店员id'), + // ApiDoc\Query(name: 'keyword', type: 'string', require: false, desc: '流水号/用户昵称'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(ref: [Definitions::class, "page"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function detail() { return $this->dataLists(new StoreFinanceFlowLists()); diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index 24f79e3a..e69c4f04 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -2,8 +2,11 @@ namespace app\store\controller\store_order; +use app\admin\logic\user\UserLogic; use app\api\logic\order\OrderLogic; use app\api\validate\OrderValidate; +use app\common\model\order\Cart; +use app\common\model\user\User; use app\store\lists\store_order\StoreOrderLists; use app\common\controller\Definitions; use app\common\enum\PayEnum; @@ -12,9 +15,14 @@ use app\common\logic\PayNotifyLogic; use app\common\logic\SystemStoreStaffLogic; use app\store\controller\BaseAdminController; use app\common\logic\store_order\StoreOrderLogic; +use app\common\model\store_branch_product\StoreBranchProduct; use app\common\model\store_order\StoreOrder; +use app\common\model\store_order_cart_info\StoreOrderCartInfo; +use app\common\model\store_product_unit\StoreProductUnit; +use app\common\model\system_store\SystemStore; +use app\common\model\system_store\SystemStoreStaff; +use app\common\model\user_recharge\UserRecharge; use app\store\validate\store_order\StoreOrderValidate; -use hg\apidoc\annotation as ApiDoc; use support\Log; use Webman\RedisQueue\Redis; @@ -23,59 +31,25 @@ use Webman\RedisQueue\Redis; * Class StoreOrderController * @package app\store\controller\store_order */ -#[ApiDoc\title('订单')] +// #[ApiDoc\title('订单')] class StoreOrderController extends BaseAdminController { - #[ - ApiDoc\Title('订单列表'), - ApiDoc\url('/store/store_order/storeOrder/lists'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'order_id', type: 'string', require: false, desc: '订单编号'), - ApiDoc\Query(name: 'staff_id', type: 'int', require: false, desc: '店员id'), - ApiDoc\Query(name: 'delivery_phone', type: 'int', require: false, desc: '配送员手机号'), - ApiDoc\Query(name: 'shipping_type', type: 'int', require: false, desc: '订单配送方式：1配送订单，2核销订单，3收银台订单'), - ApiDoc\Query(name: 'start_time', type: 'string', require: false, desc: '开始时间'), - ApiDoc\Query(name: 'end_time', type: 'string', require: false, desc: '结束时间'), - ApiDoc\Query(name: 'status', type: 'int', require: false, desc: '状态：-1待支付，0待发货，1待收货，2已完成'), - 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' => 'order_id', 'desc' => '订单编号', 'type' => 'string'], - ['name' => 'pay_price', 'desc' => '支付金额', 'type' => 'string'], - ['name' => 'pay_time', 'desc' => '支付时间', 'type' => 'float'], - ['name' => 'pay_type', 'desc' => '支付方式', 'type' => 'float'], - ['name' => 'status_name', 'desc' => '状态', 'type' => 'int'], - ['name' => 'staff_name', 'desc' => '店员', 'type' => 'int'], - ['name' => 'nickname', 'desc' => '用户昵称', 'type' => 'string'], - ['name' => 'avatar', 'desc' => '用户头像', 'type' => 'string'], - ['name' => 'product', 'desc' => '商品信息', 'type' => 'array', 'children' => [ - ['name' => 'cart_info', 'desc' => '商品信息', 'type' => 'array', 'children' => [ - ['name' => 'name', 'desc' => '商品名称', 'type' => 'int'], - ['name' => 'image', 'desc' => '图片', 'type' => 'string'], - ['name' => 'cart_num', 'desc' => '购买数量', 'type' => 'string'], - ['name' => 'price', 'desc' => '单价', 'type' => 'string'], - ]], - ]], - ]), - ] + /**订单列表 */ public function lists() { return $this->dataLists(new StoreOrderLists()); } - #[ - ApiDoc\Title('订单统计'), - ApiDoc\url('/store/store_order/storeOrder/title'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('订单统计'), + // ApiDoc\url('/store/store_order/storeOrder/title'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function title(SystemStoreStaffLogic $staffLogic, StoreOrderLogic $orderLogic) { return $this->data([ @@ -90,17 +64,9 @@ class StoreOrderController extends BaseAdminController ]); } - #[ - ApiDoc\Title('订单详情'), - ApiDoc\url('/store/store_order/storeOrder/detail'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(name: 'id', type: 'int', require: false, desc: '订单id'), - ApiDoc\Query(name: 'verify_code', type: 'string', require: false, desc: '核销码'), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + /** + * 订单详情 + */ public function detail(StoreOrderLogic $orderLogic) { $params = (new StoreOrderValidate())->goCheck('detail'); @@ -108,12 +74,16 @@ class StoreOrderController extends BaseAdminController return $this->data($result); } + /** + * 订单检查 + */ public function checkOrder() { $cartId = (array)$this->request->post('cart_id', []); $params = $this->request->post(); - $params['store_id']=$this->adminInfo['store_id']; - $res = StoreOrderLogic::cartIdByOrderInfo($cartId, null, null, $params); + $params['store_id'] = $this->adminInfo['store_id']; + $user=User::where('id',$params['uid'])->find(); + $res = StoreOrderLogic::cartIdByOrderInfo($cartId, null, $user, $params); if ($res == false) { $msg = StoreOrderLogic::getError(); if ($msg == '购物车为空') { @@ -124,28 +94,68 @@ class StoreOrderController extends BaseAdminController return $this->data($res); } + + public function checkSms() + { + $params = (new StoreOrderValidate())->post()->goCheck('check'); + $params['store_id'] = $this->request->adminInfo['store_id']; //当前登录的店铺id，用于判断是否是当前店铺的订单 + $user = User::where('id', $params['uid'])->find(); + if (empty($user)) { + return $this->fail('无该用户请检查'); + } + $order = StoreOrderLogic::cartIdByOrderInfo($params['cart_id'], null, $user, $params); + if (!$order) { + return $this->fail(StoreOrderLogic::getError()); + } + if ($order['order']['pay_price'] > $user['purchase_funds']) { + return $this->fail('当前用户采购款不足支付'); + } + $res = (new StoreOrderLogic())->dealSendSms($params); + if ($res) { + return $this->success('发送成功', [], 1, 0); + } else { + return $this->fail('发送失败'); + } + } + + + /** + * 创建订单 + */ public function createOrder() { $cartId = (array)$this->request->post('cart_id', []); $pay_type = (int)$this->request->post('pay_type'); $addressId = (int)$this->request->post('address_id'); $auth_code = $this->request->post('auth_code'); //微信支付条码 + $uid=$this->request->post('uid'); $params = $this->request->post(); - if ($auth_code == '' && $pay_type != PayEnum::CASH_PAY) { + if ($auth_code == '' && $pay_type != PayEnum::CASH_PAY && $pay_type != PayEnum::PURCHASE_FUNDS) { return $this->fail('支付条码不能为空'); } if (count($cartId) > 100) { return $this->fail('购物车商品不能超过100个'); } + $user = null; + if ($uid) { + $user = User::where('id', $uid)->find(); + } $params['store_id'] = $this->request->adminInfo['store_id']; //当前登录的店铺id，用于判断是否是当前店铺的订单 - $order = StoreOrderLogic::createOrder($cartId, $addressId, null, $params); + $order = StoreOrderLogic::createOrder($cartId, $addressId, $user, $params); if ($order != false) { switch ($pay_type) { + case PayEnum::PURCHASE_FUNDS: + //采购款支付 + PayNotifyLogic::handle('purchase_funds', $order['order_id'], [ + 'uid' => $uid,'store_id'=>$this->request->adminInfo['store_id'], + 'staff_id'=>$this->request->adminInfo['admin_id'] + ]); + return $this->success('采购款支付成功', ['id' => $order['id']]); case PayEnum::CASH_PAY: //现金支付 PayNotifyLogic::handle('cash_pay', $order['order_id']); - return $this->success('现金支付成功'); + return $this->success('现金支付成功', ['id' => $order['id']]); case PayEnum::WECHAT_PAY_BARCODE: //微信条码支付 @@ -160,7 +170,7 @@ class StoreOrderController extends BaseAdminController Redis::send('send-code-pay', ['order_id' => $order['order_id']]); return $this->success('用户支付中'); } - return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::WECHAT_PAY_BARCODE, 'transaction_id' => $result['transaction_id']]); + return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::WECHAT_PAY_BARCODE, 'transaction_id' => $result['transaction_id'], 'id' => $order['id']]); case PayEnum::ALIPAY_BARCODE: //支付宝条码支付 $result = PaymentLogic::ali_auth_code($auth_code, $order); @@ -172,7 +182,7 @@ class StoreOrderController extends BaseAdminController } PayNotifyLogic::handle('alipay_cashier', $result['out_trade_no'], $result); $result['create_time'] = $order['create_time']; - return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::ALIPAY_BARCODE, 'transaction_id' => $result['trade_no']]); + return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::ALIPAY_BARCODE, 'transaction_id' => $result['trade_no'], 'id' => $order['id']]); default: return $this->fail('支付方式错误'); } @@ -181,6 +191,9 @@ class StoreOrderController extends BaseAdminController } } + /** + * 重新支付 + */ public function pay() { $order_id = $this->request->post('order_id'); @@ -198,13 +211,15 @@ class StoreOrderController extends BaseAdminController if (!$order) { return $this->fail('订单不存在或已支付'); } - switch ($pay_type) { - + case PayEnum::PURCHASE_FUNDS: + //采购款支付 + PayNotifyLogic::handle('purchase_funds', $order['order_id'], ['uid' => $order['uid']]); + return $this->success('采购款支付成功', ['id' => $order['id']]); case PayEnum::CASH_PAY: //现金支付 PayNotifyLogic::handle('cash_pay', $order['order_id']); - return $this->success('现金支付成功'); + return $this->success('现金支付成功', ['id' => $order['id']]); break; case PayEnum::WECHAT_PAY_BARCODE: //微信条码支付 @@ -218,7 +233,7 @@ class StoreOrderController extends BaseAdminController Redis::send('send-code-pay', ['order_id' => $order['order_id']]); return $this->success('用户支付中'); } - return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::WECHAT_PAY_BARCODE, 'transaction_id' => $result['transaction_id']]); + return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::WECHAT_PAY_BARCODE, 'transaction_id' => $result['transaction_id'], 'id' => $order['id']]); case PayEnum::ALIPAY_BARCODE: //支付宝条码支付 $result = PaymentLogic::ali_auth_code($auth_code, $order); @@ -231,13 +246,16 @@ class StoreOrderController extends BaseAdminController PayNotifyLogic::handle('alipay_cashier', $result['out_trade_no'], $result); $result['create_time'] = $order['create_time']; - return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::ALIPAY_BARCODE, 'transaction_id' => $result['trade_no']]); + return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::ALIPAY_BARCODE, 'transaction_id' => $result['trade_no'], 'id' => $order['id']]); default: return $this->fail('支付方式错误'); } return $this->fail('支付失败'); } + /** + * 订单核销 + */ public function writeoff_order() { $params = (new OrderValidate())->post()->goCheck('check'); @@ -245,10 +263,141 @@ class StoreOrderController extends BaseAdminController if (empty($count)) { return $this->fail('无该核销码请检查'); } + $params['store_id'] = $this->adminInfo['store_id']; + $params['staff_id'] = $this->adminId; $res = OrderLogic::writeOff($params); if ($res) { return $this->success('核销成功'); } return $this->fail('核销失败' . OrderLogic::getError()); } + + + // #[ + // ApiDoc\Title('订单已核销列表'), + // ApiDoc\url('/store/store_order/storeOrder/writeoff_list'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(name: 'page_no', type: 'int', require: false, desc: '页数 默认1'), + // ApiDoc\Query(name: 'page_size', type: 'int', require: false, desc: '每页条数 默认15'), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] + public function writeoff_list(StoreOrderLogic $orderLogic) + { + $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; + $params['page_size'] = $page_size; + if (empty($page_no) || empty($page_size)) { + $params['page_no'] = 1; + $params['page_size'] = 15; + } + $params['store_id'] = $this->request->adminInfo['store_id']; + $result = $orderLogic->writeList($params); + + $data = [ + 'lists' => $result, + 'count' => count($result), + 'page_no' => $params['page_no'], + 'page_size' => $params['page_size'], + ]; + return $this->success('ok', $data); + } + /** + * vip充值 + */ + public function rechange_amount() + { + $pay_type = $this->request->post('pay_type'); + $auth_code = $this->request->post('auth_code'); //微信支付条码 + if ($auth_code == '' && $pay_type != PayEnum::CASH_PAY) { + return $this->fail('支付条码不能为空'); + } + $params = $this->request->post(); + $data = [ + 'store_id' => $this->adminInfo['store_id'], + 'uid' => $params['uid'], + 'staff_id' => $this->adminId, + 'order_id' => getNewOrderId('CZ'), + 'price' => $params['price'], + 'recharge_type' => 'INDUSTRYMEMBERS', + ]; + $order = UserRecharge::create($data); + $order['pay_price'] = $order['price']; + switch ($pay_type) { + case PayEnum::WECHAT_PAY_BARCODE: + //微信条码支付 + $result = PaymentLogic::codepay($auth_code, $order); + if (PaymentLogic::hasError()) { + return $this->fail(PaymentLogic::getError(), $params); + } + if (isset($result['trade_state_desc']) && $result['trade_state_desc'] == '支付成功') { + PayNotifyLogic::handle('recharge', $result['out_trade_no'], $result); + } else { + Redis::send('send-code-pay', ['order_id' => $order['order_id'], 'pay_type' => 'recharge']); + return $this->success('用户支付中'); + } + return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::WECHAT_PAY_BARCODE, 'transaction_id' => $result['transaction_id']]); + case PayEnum::ALIPAY_BARCODE: + //支付宝条码支付 + $result = PaymentLogic::ali_auth_code($auth_code, $order); + if (PaymentLogic::hasError()) { + return $this->fail(PaymentLogic::getError(), $params); + } + if ($result['msg'] !== 'Success') { + return $this->success('用户支付中'); + } + PayNotifyLogic::handle('recharge', $result['out_trade_no'], $result, 'ali'); + + $result['create_time'] = $order['create_time']; + return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::ALIPAY_BARCODE, 'transaction_id' => $result['trade_no']]); + default: + return $this->fail('支付方式错误'); + } + return $this->fail('支付失败'); + } + + public function stocking() + { + $uid = $this->request->post('uid'); + $res = (new StoreOrderLogic())->dealSendSms(['uid' => $uid], 1); + if ($res) { + return $this->success('发送成功', [], 0, 1); + } else { + return $this->fail('发送失败'); + } + } + + /** + * 订单打印 + */ + public function print() + { + $id = $this->request->get('id'); + $find = StoreOrder::where('id', $id)->find(); + if ($find) { + $merchant = SystemStore::where('id', $find['store_id'])->field('name,phone')->find(); + $mer_user_info = SystemStoreStaff::where('store_id', $find['store_id'])->where('is_admin', 1)->field('staff_name,phone')->find(); + $user = User::where('id', $find['uid'])->field('nickname,mobile')->find(); + $find['system_store_name'] = $merchant['name']; + $find['pay_type_name'] = PayEnum::getPaySceneDesc($find['pay_type']); + $find['system_store_phone'] = $merchant['phone']; + $find['staff_name'] = $mer_user_info['staff_name']; + $find['staff_phone'] = $mer_user_info['phone']; + $find['nickname'] = $user['nickname'] ?? ''; + $find['user_mobile'] = $user['mobile'] ?? ''; + $find['info'] = StoreOrderCartInfo::where('oid', $find['id'])->field('store_id,product_id,cart_num,cart_info')->select()->each(function ($item) { + $goods = StoreBranchProduct::where(['store_id' => $item['store_id'], 'product_id' => $item['product_id']])->field('store_name,unit')->find(); + $item['unit_name'] = StoreProductUnit::where('id', $goods['unit'])->value('name'); + $item['store_name'] = $goods['store_name']; + $item['total_price'] = $item['cart_info']['total_price']; + $item['price'] = $item['cart_info']['price']; + return $item; + }); + } + return $this->success('获取成功', $find?->toArray()); + } } diff --git a/app/store/controller/store_order/StoreRefundOrderController.php b/app/store/controller/store_order/StoreRefundOrderController.php index 14ffbb3e..5857b772 100644 --- a/app/store/controller/store_order/StoreRefundOrderController.php +++ b/app/store/controller/store_order/StoreRefundOrderController.php @@ -7,66 +7,65 @@ use app\common\lists\order\StoreRefundOrderLists; use app\store\controller\BaseAdminController; use app\common\logic\store_order\StoreOrderLogic; use app\store\validate\store_order\StoreOrderValidate; -use hg\apidoc\annotation as ApiDoc; /** * 订单列表控制器 * Class StoreOrderController * @package app\store\controller\store_order */ -#[ApiDoc\title('退款订单')] +// #[ApiDoc\title('退款订单')] class StoreRefundOrderController extends BaseAdminController { - #[ - ApiDoc\Title('订单列表'), - ApiDoc\url('/store/store_order/storeRefundOrder/lists'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'order_id', type: 'string', require: false, desc: '订单编号'), - ApiDoc\Query(name: 'start_time', type: 'string', require: false, desc: '开始时间', mock: "@datetime('yyyy-MM-dd')"), - ApiDoc\Query(name: 'end_time', type: 'string', require: false, desc: '结束时间', mock: "@datetime('yyyy-MM-dd')"), - ApiDoc\Query(name: 'refund_type', type: 'int', require: false, desc: '状态：1仅退款，2退款退货，3拒绝退款，4商品待退货，5退货待收货，6已退款', mock: "@integer(1, 6)"), - 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' => 'order_id', 'desc' => '订单编号', 'type' => 'string'], - ['name' => 'pay_price', 'desc' => '支付金额', 'type' => 'string'], - ['name' => 'pay_time', 'desc' => '支付时间', 'type' => 'float'], - ['name' => 'pay_type', 'desc' => '支付方式', 'type' => 'float'], - ['name' => 'status_name', 'desc' => '状态', 'type' => 'int'], - ['name' => 'refund_status_name', 'desc' => '退款状态', 'type' => 'string'], - ['name' => 'refund_type_name', 'desc' => '退款类型', 'type' => 'string'], - ['name' => 'refund_reason_time', 'desc' => '退款时间', 'type' => 'int'], - ['name' => 'staff_name', 'desc' => '店员', 'type' => 'int'], - ['name' => 'nickname', 'desc' => '用户昵称', 'type' => 'string'], - ['name' => 'avatar', 'desc' => '用户头像', 'type' => 'string'], - ['name' => 'product', 'desc' => '商品信息', 'type' => 'array', 'children' => [ - ['name' => 'cart_info', 'desc' => '商品信息', 'type' => 'array', 'children' => [ - ['name' => 'name', 'desc' => '商品名称', 'type' => 'int'], - ['name' => 'image', 'desc' => '图片', 'type' => 'string'], - ['name' => 'cart_num', 'desc' => '购买数量', 'type' => 'string'], - ['name' => 'price', 'desc' => '单价', 'type' => 'string'], - ]], - ]], - ]), - ] + // #[ + // ApiDoc\Title('订单列表'), + // ApiDoc\url('/store/store_order/storeRefundOrder/lists'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'order_id', type: 'string', require: false, desc: '订单编号'), + // ApiDoc\Query(name: 'start_time', type: 'string', require: false, desc: '开始时间', mock: "@datetime('yyyy-MM-dd')"), + // ApiDoc\Query(name: 'end_time', type: 'string', require: false, desc: '结束时间', mock: "@datetime('yyyy-MM-dd')"), + // ApiDoc\Query(name: 'refund_type', type: 'int', require: false, desc: '状态：1仅退款，2退款退货，3拒绝退款，4商品待退货，5退货待收货，6已退款', mock: "@integer(1, 6)"), + // 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' => 'order_id', 'desc' => '订单编号', 'type' => 'string'], + // ['name' => 'pay_price', 'desc' => '支付金额', 'type' => 'string'], + // ['name' => 'pay_time', 'desc' => '支付时间', 'type' => 'float'], + // ['name' => 'pay_type', 'desc' => '支付方式', 'type' => 'float'], + // ['name' => 'status_name', 'desc' => '状态', 'type' => 'int'], + // ['name' => 'refund_status_name', 'desc' => '退款状态', 'type' => 'string'], + // ['name' => 'refund_type_name', 'desc' => '退款类型', 'type' => 'string'], + // ['name' => 'refund_reason_time', 'desc' => '退款时间', 'type' => 'int'], + // ['name' => 'staff_name', 'desc' => '店员', 'type' => 'int'], + // ['name' => 'nickname', 'desc' => '用户昵称', 'type' => 'string'], + // ['name' => 'avatar', 'desc' => '用户头像', 'type' => 'string'], + // ['name' => 'product', 'desc' => '商品信息', 'type' => 'array', 'children' => [ + // ['name' => 'cart_info', 'desc' => '商品信息', 'type' => 'array', 'children' => [ + // ['name' => 'name', 'desc' => '商品名称', 'type' => 'int'], + // ['name' => 'image', 'desc' => '图片', 'type' => 'string'], + // ['name' => 'cart_num', 'desc' => '购买数量', 'type' => 'string'], + // ['name' => 'price', 'desc' => '单价', 'type' => 'string'], + // ]], + // ]], + // ]), + // ] public function lists() { return $this->dataLists(new StoreRefundOrderLists()); } - #[ - ApiDoc\Title('编辑订单'), - ApiDoc\url('/store/store_order/storeRefundOrder/edit'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('编辑订单'), + // ApiDoc\url('/store/store_order/storeRefundOrder/edit'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function edit() { $params = (new StoreOrderValidate())->post()->goCheck('edit'); @@ -77,16 +76,16 @@ class StoreRefundOrderController extends BaseAdminController return $this->fail(StoreOrderLogic::getError()); } - #[ - ApiDoc\Title('订单详情'), - ApiDoc\url('/store/store_order/storeRefundOrder/detail'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(name: 'id', type: 'int', require: true, desc: '订单id'), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('订单详情'), + // ApiDoc\url('/store/store_order/storeRefundOrder/detail'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(name: 'id', type: 'int', require: true, desc: '订单id'), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function detail(StoreOrderLogic $orderLogic) { $params = (new StoreOrderValidate())->goCheck('detail'); diff --git a/app/store/controller/store_product/StoreProductController.php b/app/store/controller/store_product/StoreProductController.php index c1aa3e16..780430b6 100644 --- a/app/store/controller/store_product/StoreProductController.php +++ b/app/store/controller/store_product/StoreProductController.php @@ -9,7 +9,6 @@ use app\store\controller\BaseAdminController; use app\store\logic\store_branch_product\StoreBranchProductLogic; use app\store\logic\store_product\StoreProductLogic; use app\store\validate\store_product\StoreProductValidate; -use hg\apidoc\annotation as ApiDoc; /** @@ -17,57 +16,57 @@ use hg\apidoc\annotation as ApiDoc; * Class StoreProductController * @package app\store\controller\store_product */ -#[ApiDoc\title('商品列表')] +// #[ApiDoc\title('商品列表')] class StoreProductController extends BaseAdminController { - #[ - ApiDoc\Title('商品列表'), - ApiDoc\url('/store/store_product/storeProduct/lists'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Query(name: 'cate_id', type: 'int', require: false, desc: '分类id'), - ApiDoc\Query(name: 'store_name', type: 'string', require: false, desc: '商品名称'), - ApiDoc\Query(name: 'status', type: 'int', require: false, desc: '状态：1上架，2下架，3售罄，4库存告警'), - 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' => 'product_id', 'desc' => '商品ID', 'type' => 'int'], - ['name' => 'image', 'desc' => '图片', 'type' => 'string'], - ['name' => 'store_name', 'desc' => '商品名称', 'type' => 'string'], - ['name' => 'price', 'desc' => '零售价', 'type' => 'float'], - ['name' => 'cost', 'desc' => '成本价', 'type' => 'float'], - ['name' => 'sales', 'desc' => '销量', 'type' => 'int'], - ['name' => 'stock', 'desc' => '库存', 'type' => 'int'], - ['name' => 'unit_name', 'desc' => '单位', 'type' => 'string'], - ['name' => 'cate_name', 'desc' => '分类', 'type' => 'string'], - ['name' => 'status', 'desc' => '状态：1上架，0下架', 'type' => 'string'], - ]), - ] + // #[ + // ApiDoc\Title('商品列表'), + // ApiDoc\url('/store/store_product/storeProduct/lists'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Query(name: 'cate_id', type: 'int', require: false, desc: '分类id'), + // ApiDoc\Query(name: 'store_name', type: 'string', require: false, desc: '商品名称'), + // ApiDoc\Query(name: 'status', type: 'int', require: false, desc: '状态：1上架，2下架，3售罄，4库存告警'), + // 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' => 'product_id', 'desc' => '商品ID', 'type' => 'int'], + // ['name' => 'image', 'desc' => '图片', 'type' => 'string'], + // ['name' => 'store_name', 'desc' => '商品名称', 'type' => 'string'], + // ['name' => 'price', 'desc' => '零售价', 'type' => 'float'], + // ['name' => 'cost', 'desc' => '成本价', 'type' => 'float'], + // ['name' => 'sales', 'desc' => '销量', 'type' => 'int'], + // ['name' => 'stock', 'desc' => '库存', 'type' => 'int'], + // ['name' => 'unit_name', 'desc' => '单位', 'type' => 'string'], + // ['name' => 'cate_name', 'desc' => '分类', 'type' => 'string'], + // ['name' => 'status', 'desc' => '状态：1上架，0下架', 'type' => 'string'], + // ]), + // ] public function lists() { return $this->dataLists(new StoreBranchProductLists()); } - #[ - ApiDoc\Title('添加商品'), - ApiDoc\url('/store/store_product/storeProduct/add'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array", children: [ - ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], - ['name' => 'image', 'desc' => '图片', 'type' => 'string'], - ['name' => 'store_name', 'desc' => '商品名称', 'type' => 'string'], - ['name' => 'price', 'desc' => '零售价', 'type' => 'float'], - ['name' => 'cost', 'desc' => '成本价', 'type' => 'float'], - ['name' => 'sales', 'desc' => '销量', 'type' => 'int'], - ['name' => 'stock', 'desc' => '库存', 'type' => 'int'], - ['name' => 'unit_name', 'desc' => '单位', 'type' => 'string'], - ['name' => 'cate_name', 'desc' => '分类', 'type' => 'string'], - ]), - ] + // #[ + // ApiDoc\Title('添加商品'), + // ApiDoc\url('/store/store_product/storeProduct/add'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array", children: [ + // ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], + // ['name' => 'image', 'desc' => '图片', 'type' => 'string'], + // ['name' => 'store_name', 'desc' => '商品名称', 'type' => 'string'], + // ['name' => 'price', 'desc' => '零售价', 'type' => 'float'], + // ['name' => 'cost', 'desc' => '成本价', 'type' => 'float'], + // ['name' => 'sales', 'desc' => '销量', 'type' => 'int'], + // ['name' => 'stock', 'desc' => '库存', 'type' => 'int'], + // ['name' => 'unit_name', 'desc' => '单位', 'type' => 'string'], + // ['name' => 'cate_name', 'desc' => '分类', 'type' => 'string'], + // ]), + // ] public function add() { $params = (new StoreProductValidate())->post()->goCheck('add'); @@ -78,25 +77,25 @@ class StoreProductController extends BaseAdminController return $this->fail(StoreProductLogic::getError()); } - #[ - ApiDoc\Title('编辑商品'), - ApiDoc\url('/store/store_product/storeProduct/edit'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Query(name: "id", type: "int", require: true, desc: "id"), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array", children: [ - ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], - ['name' => 'image', 'desc' => '图片', 'type' => 'string'], - ['name' => 'store_name', 'desc' => '商品名称', 'type' => 'string'], - ['name' => 'price', 'desc' => '零售价', 'type' => 'float'], - ['name' => 'cost', 'desc' => '成本价', 'type' => 'float'], - ['name' => 'sales', 'desc' => '销量', 'type' => 'int'], - ['name' => 'stock', 'desc' => '库存', 'type' => 'int'], - ['name' => 'unit_name', 'desc' => '单位', 'type' => 'string'], - ['name' => 'cate_name', 'desc' => '分类', 'type' => 'string'], - ]), - ] + // #[ + // ApiDoc\Title('编辑商品'), + // ApiDoc\url('/store/store_product/storeProduct/edit'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Query(name: "id", type: "int", require: true, desc: "id"), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array", children: [ + // ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], + // ['name' => 'image', 'desc' => '图片', 'type' => 'string'], + // ['name' => 'store_name', 'desc' => '商品名称', 'type' => 'string'], + // ['name' => 'price', 'desc' => '零售价', 'type' => 'float'], + // ['name' => 'cost', 'desc' => '成本价', 'type' => 'float'], + // ['name' => 'sales', 'desc' => '销量', 'type' => 'int'], + // ['name' => 'stock', 'desc' => '库存', 'type' => 'int'], + // ['name' => 'unit_name', 'desc' => '单位', 'type' => 'string'], + // ['name' => 'cate_name', 'desc' => '分类', 'type' => 'string'], + // ]), + // ] public function edit() { $params = (new StoreProductValidate())->post()->goCheck('edit'); @@ -107,25 +106,25 @@ class StoreProductController extends BaseAdminController return $this->fail(StoreProductLogic::getError()); } - #[ - ApiDoc\Title('删除商品'), - ApiDoc\url('/store/store_product/storeProduct/delete'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Param(name: "id", type: "int", require: true, desc: "id"), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array", children: [ - ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], - ['name' => 'image', 'desc' => '图片', 'type' => 'string'], - ['name' => 'store_name', 'desc' => '商品名称', 'type' => 'string'], - ['name' => 'price', 'desc' => '零售价', 'type' => 'float'], - ['name' => 'cost', 'desc' => '成本价', 'type' => 'float'], - ['name' => 'sales', 'desc' => '销量', 'type' => 'int'], - ['name' => 'stock', 'desc' => '库存', 'type' => 'int'], - ['name' => 'unit_name', 'desc' => '单位', 'type' => 'string'], - ['name' => 'cate_name', 'desc' => '分类', 'type' => 'string'], - ]), - ] + // #[ + // ApiDoc\Title('删除商品'), + // ApiDoc\url('/store/store_product/storeProduct/delete'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Param(name: "id", type: "int", require: true, desc: "id"), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array", children: [ + // ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], + // ['name' => 'image', 'desc' => '图片', 'type' => 'string'], + // ['name' => 'store_name', 'desc' => '商品名称', 'type' => 'string'], + // ['name' => 'price', 'desc' => '零售价', 'type' => 'float'], + // ['name' => 'cost', 'desc' => '成本价', 'type' => 'float'], + // ['name' => 'sales', 'desc' => '销量', 'type' => 'int'], + // ['name' => 'stock', 'desc' => '库存', 'type' => 'int'], + // ['name' => 'unit_name', 'desc' => '单位', 'type' => 'string'], + // ['name' => 'cate_name', 'desc' => '分类', 'type' => 'string'], + // ]), + // ] public function delete() { $params = (new StoreProductValidate())->post()->goCheck('delete'); @@ -133,25 +132,25 @@ class StoreProductController extends BaseAdminController return $this->success('删除成功', [], 1, 1); } - #[ - ApiDoc\Title('商品详情'), - ApiDoc\url('/store/store_product/storeProduct/detail'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Query(name: "id", type: "int", require: true, desc: "id"), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array", children: [ - ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], - ['name' => 'image', 'desc' => '图片', 'type' => 'string'], - ['name' => 'store_name', 'desc' => '商品名称', 'type' => 'string'], - ['name' => 'price', 'desc' => '零售价', 'type' => 'float'], - ['name' => 'cost', 'desc' => '成本价', 'type' => 'float'], - ['name' => 'sales', 'desc' => '销量', 'type' => 'int'], - ['name' => 'stock', 'desc' => '库存', 'type' => 'int'], - ['name' => 'unit_name', 'desc' => '单位', 'type' => 'string'], - ['name' => 'cate_name', 'desc' => '分类', 'type' => 'string'], - ]), - ] + // #[ + // ApiDoc\Title('商品详情'), + // ApiDoc\url('/store/store_product/storeProduct/detail'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Query(name: "id", type: "int", require: true, desc: "id"), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array", children: [ + // ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], + // ['name' => 'image', 'desc' => '图片', 'type' => 'string'], + // ['name' => 'store_name', 'desc' => '商品名称', 'type' => 'string'], + // ['name' => 'price', 'desc' => '零售价', 'type' => 'float'], + // ['name' => 'cost', 'desc' => '成本价', 'type' => 'float'], + // ['name' => 'sales', 'desc' => '销量', 'type' => 'int'], + // ['name' => 'stock', 'desc' => '库存', 'type' => 'int'], + // ['name' => 'unit_name', 'desc' => '单位', 'type' => 'string'], + // ['name' => 'cate_name', 'desc' => '分类', 'type' => 'string'], + // ]), + // ] public function detail() { $params = (new StoreProductValidate())->goCheck('detail'); @@ -159,15 +158,15 @@ class StoreProductController extends BaseAdminController return $this->data($result); } - #[ - ApiDoc\Title('商品上下架'), - ApiDoc\url('/store/store_product/storeProduct/status'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Param(name: "id", type: "int", require: true, desc: "id"), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('商品上下架'), + // ApiDoc\url('/store/store_product/storeProduct/status'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Param(name: "id", type: "int", require: true, desc: "id"), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function status() { $params = (new StoreProductValidate())->post()->goCheck('detail'); @@ -175,19 +174,19 @@ class StoreProductController extends BaseAdminController return $this->success('操作成功', [], 1, 1); } - #[ - ApiDoc\Title('商品库存增减'), - ApiDoc\url('/store/store_product/storeProduct/stock'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "attrs", type: "array", require: true, desc: "id", children: [ - ['name' => 'unique', 'desc' => '唯一值', 'type' => 'string'], - ['name' => 'type', 'desc' => '类型：1增加，2减少', 'type' => 'int'], - ['name' => 'number', 'desc' => '数量', 'type' => 'int'], - ]), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('商品库存增减'), + // ApiDoc\url('/store/store_product/storeProduct/stock'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "attrs", type: "array", require: true, desc: "id", children: [ + // ['name' => 'unique', 'desc' => '唯一值', 'type' => 'string'], + // ['name' => 'type', 'desc' => '类型：1增加，2减少', 'type' => 'int'], + // ['name' => 'number', 'desc' => '数量', 'type' => 'int'], + // ]), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function stock() { $params = (new StoreProductValidate())->post()->goCheck('stock'); diff --git a/app/store/controller/store_product/StoreStorageController.php b/app/store/controller/store_product/StoreStorageController.php index 0fc5a250..77ade604 100644 --- a/app/store/controller/store_product/StoreStorageController.php +++ b/app/store/controller/store_product/StoreStorageController.php @@ -7,38 +7,37 @@ use app\store\controller\BaseAdminController; use app\admin\lists\system_store_storage\SystemStoreStorageLists; use app\admin\logic\system_store_storage\SystemStoreStorageLogic; use app\admin\validate\system_store_storage\SystemStoreStorageValidate; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\title('入库管理')] +// #[ApiDoc\title('入库管理')] class StoreStorageController extends BaseAdminController { - #[ - ApiDoc\Title('入库记录'), - ApiDoc\url('/store/store_product/storeStorage/lists'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Query(name: 'store_id', type: 'int', require: false, desc: '门店id'), - ApiDoc\Query(name: 'staff_id', type: 'int', require: false, desc: '店员id'), - ApiDoc\Query(name: 'status', type: 'int', require: false, desc: '状态：0-待确认，1-已确认'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(ref: [Definitions::class, "page"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('入库记录'), + // ApiDoc\url('/store/store_product/storeStorage/lists'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Query(name: 'store_id', type: 'int', require: false, desc: '门店id'), + // ApiDoc\Query(name: 'staff_id', type: 'int', require: false, desc: '店员id'), + // ApiDoc\Query(name: 'status', type: 'int', require: false, desc: '状态：0-待确认，1-已确认'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(ref: [Definitions::class, "page"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function lists() { return $this->dataLists(new SystemStoreStorageLists()); } - #[ - ApiDoc\Title('确认入库'), - ApiDoc\url('/store/store_product/storeStorage/confirm'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('确认入库'), + // ApiDoc\url('/store/store_product/storeStorage/confirm'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function confirm() { $params = (new SystemStoreStorageValidate())->post()->goCheck('edit'); diff --git a/app/store/controller/store_product_attr_value/StoreProductAttrValueController.php b/app/store/controller/store_product_attr_value/StoreProductAttrValueController.php index ae7c0823..9b99546a 100644 --- a/app/store/controller/store_product_attr_value/StoreProductAttrValueController.php +++ b/app/store/controller/store_product_attr_value/StoreProductAttrValueController.php @@ -8,7 +8,6 @@ use app\store\controller\BaseAdminController; use app\store\lists\store_product_attr_value\StoreProductAttrValueLists; use app\store\logic\store_product_attr_value\StoreProductAttrValueLogic; use app\store\validate\store_product_attr_value\StoreProductAttrValueValidate; -use hg\apidoc\annotation as ApiDoc; /** @@ -16,47 +15,47 @@ use hg\apidoc\annotation as ApiDoc; * Class StoreProductAttrValueController * @package app\store\controller\store_product_attr_value */ -#[ApiDoc\title('商品属性值')] +// #[ApiDoc\title('商品属性值')] class StoreProductAttrValueController extends BaseAdminController { - #[ - ApiDoc\Title('商品属性值列表'), - ApiDoc\url('/store/store_product_attr_value/storeProductAttrValue/lists'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(ref: [Definitions::class, "page"]), - ApiDoc\Query(name: 'product_id', type: 'int', require: true, desc: '商品ID'), - ApiDoc\Query(name: 'store_id', type: 'int', require: true, desc: '门店ID'), - ApiDoc\ResponseSuccess("data", type: "array", children: [ - ['name' => 'count', 'desc' => '总数', 'type' => 'int'], - ['name' => 'page_no', 'desc' => '页码', 'type' => 'int'], - ['name' => 'page_size', 'desc' => '每页数量', 'type' => 'int'], - ['name' => 'extend', 'desc' => '扩展数据', 'type' => 'array'], - ['name' => 'lists', 'desc' => '列表数据', 'type' => 'array', 'children' => [ - ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], - ['name' => 'product_id', 'desc' => '商品ID', 'type' => 'int'], - ['name' => 'stock', 'desc' => '库存', 'type' => 'int'], - ['name' => 'unique', 'desc' => '唯一值', 'type' => 'string'], - ['name' => 'sales', 'desc' => '销量', 'type' => 'int'], - ['name' => 'bar_code', 'desc' => '条码', 'type' => 'string'], - ['name' => 'image', 'desc' => '规格图片', 'type' => 'string'], - ]], - ]), - ] + // #[ + // ApiDoc\Title('商品属性值列表'), + // ApiDoc\url('/store/store_product_attr_value/storeProductAttrValue/lists'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(ref: [Definitions::class, "page"]), + // ApiDoc\Query(name: 'product_id', type: 'int', require: true, desc: '商品ID'), + // ApiDoc\Query(name: 'store_id', type: 'int', require: true, desc: '门店ID'), + // ApiDoc\ResponseSuccess("data", type: "array", children: [ + // ['name' => 'count', 'desc' => '总数', 'type' => 'int'], + // ['name' => 'page_no', 'desc' => '页码', 'type' => 'int'], + // ['name' => 'page_size', 'desc' => '每页数量', 'type' => 'int'], + // ['name' => 'extend', 'desc' => '扩展数据', 'type' => 'array'], + // ['name' => 'lists', 'desc' => '列表数据', 'type' => 'array', 'children' => [ + // ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], + // ['name' => 'product_id', 'desc' => '商品ID', 'type' => 'int'], + // ['name' => 'stock', 'desc' => '库存', 'type' => 'int'], + // ['name' => 'unique', 'desc' => '唯一值', 'type' => 'string'], + // ['name' => 'sales', 'desc' => '销量', 'type' => 'int'], + // ['name' => 'bar_code', 'desc' => '条码', 'type' => 'string'], + // ['name' => 'image', 'desc' => '规格图片', 'type' => 'string'], + // ]], + // ]), + // ] public function lists() { return $this->dataLists(new StoreProductAttrValueLists()); } - #[ - ApiDoc\Title('添加商品属性值'), - ApiDoc\url('/store/store_product_attr_value/storeProductAttrValue/add'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ] + // #[ + // ApiDoc\Title('添加商品属性值'), + // ApiDoc\url('/store/store_product_attr_value/storeProductAttrValue/add'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ] public function add() { $params = (new StoreProductAttrValueValidate())->post()->goCheck('add'); @@ -67,13 +66,13 @@ class StoreProductAttrValueController extends BaseAdminController return $this->fail(StoreProductAttrValueLogic::getError()); } - #[ - ApiDoc\Title('编辑商品属性值'), - ApiDoc\url('/store/store_product_attr_value/storeProductAttrValue/edit'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ] + // #[ + // ApiDoc\Title('编辑商品属性值'), + // ApiDoc\url('/store/store_product_attr_value/storeProductAttrValue/edit'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ] public function edit() { $params = (new StoreProductAttrValueValidate())->post()->goCheck('edit'); @@ -84,13 +83,13 @@ class StoreProductAttrValueController extends BaseAdminController return $this->fail(StoreProductAttrValueLogic::getError()); } - #[ - ApiDoc\Title('删除商品属性值'), - ApiDoc\url('/store/store_product_attr_value/storeProductAttrValue/delete'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ] + // #[ + // ApiDoc\Title('删除商品属性值'), + // ApiDoc\url('/store/store_product_attr_value/storeProductAttrValue/delete'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ] public function delete() { $params = (new StoreProductAttrValueValidate())->post()->goCheck('delete'); @@ -98,14 +97,14 @@ class StoreProductAttrValueController extends BaseAdminController return $this->success('删除成功', [], 1, 1); } - #[ - ApiDoc\Title('获取商品属性值详情'), - ApiDoc\url('/store/store_product_attr_value/storeProductAttrValue/detail'), - ApiDoc\Method('GET'), - ApiDoc\Author('中国队长'), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ] + // #[ + // ApiDoc\Title('获取商品属性值详情'), + // ApiDoc\url('/store/store_product_attr_value/storeProductAttrValue/detail'), + // ApiDoc\Method('GET'), + // ApiDoc\Author('中国队长'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ] public function detail() { $params = (new StoreProductAttrValueValidate())->goCheck('detail'); diff --git a/app/store/controller/system_store_storage/SystemStoreStorageController.php b/app/store/controller/system_store_storage/SystemStoreStorageController.php index 11389cf7..be310492 100644 --- a/app/store/controller/system_store_storage/SystemStoreStorageController.php +++ b/app/store/controller/system_store_storage/SystemStoreStorageController.php @@ -9,7 +9,6 @@ use app\admin\logic\system_store_storage\SystemStoreStorageLogic; use app\admin\validate\system_store_storage\SystemStoreStorageValidate; use app\common\model\store_branch_product\StoreBranchProduct; use app\common\model\system_store_storage\SystemStoreStorage; -use hg\apidoc\annotation as ApiDoc; /** @@ -17,18 +16,19 @@ use hg\apidoc\annotation as ApiDoc; * Class SystemStoreStorageController * @package app\admin\controller\system_store_storage */ -#[ApiDoc\title('门店入库记录')] +// #[ApiDoc\title('门店入库记录')] class SystemStoreStorageController extends BaseAdminController { - #[ - ApiDoc\Title('列表'), - ApiDoc\url('/store/system_store_storage/systemstorestorage/lists'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ] + // #[ + // ApiDoc\Title('列表'), + // ApiDoc\url('/store/system_store_storage/systemstorestorage/lists'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ] public function lists() { + $this->request->__set('status',-1); return $this->dataLists(new SystemStoreStorageLists()); } diff --git a/app/store/controller/user/AddressController.php b/app/store/controller/user/AddressController.php new file mode 100644 index 00000000..b3a74cf8 --- /dev/null +++ b/app/store/controller/user/AddressController.php @@ -0,0 +1,49 @@ +dataLists(new UserAddressList()); + } + /** + * @notes 编辑地址 + * @return \support\Response + * @author likeadmin + * @date 2024/4/24 10:37 + */ + public function edit() + { + $params = (new UserAddressValidate())->post()->goCheck('edit'); + if(AddressLogic::edit($params)){ + return $this->success('编辑成功'); + }else{ + return $this->fail(AddressLogic::getError()); + } + } + /** + * @notes 获取地址详情 + * @return \support\Response + * @author likeadmin + * @date 2024/4/24 10:37 + */ + public function detail() + { + $id = $this->request->get('id'); + $uid = $this->request->get('uid'); + if($id){ + $params = ['id' => $id]; + } + if($uid){ + $params = ['uid' => $uid]; + } + return $this->success('获取成功',AddressLogic::detail($params)); + } +} diff --git a/app/store/controller/user/UserController.php b/app/store/controller/user/UserController.php new file mode 100644 index 00000000..5e45e778 --- /dev/null +++ b/app/store/controller/user/UserController.php @@ -0,0 +1,58 @@ +dataLists(new UserLists()); + } + + + public function add() + { + $params = (new UserValidate())->post()->goCheck('storeAdd'); + UserLogic::StoreAdd($params); + if (UserLogic::hasError() ) { + return $this->fail(UserLogic::getError()); + } + return $this->success('添加成功', [], 1, 1); + + } + + public function detail() + { + $params = (new UserValidate())->goCheck('detail'); + $detail = UserLogic::detail($params['id']); + return $this->success('', $detail); + } + + public function user_ship(){ + $user_ship=$this->request->post('user_ship',0); + $id=$this->request->post('id',0); + if($user_ship==1){ + return $this->fail('充值会员不能前端设置'); + } + User::where('id',$id)->update(['user_ship'=>$user_ship]); + return $this->success('设置成功'); + } + + public function user_label(){ + $label_id=$this->request->post('label_id',0); + $id=$this->request->post('id',0); + + User::where('id',$id)->update(['label_id'=>$label_id]); + return $this->success('设置成功'); + } + +} \ No newline at end of file diff --git a/app/store/controller/user/UserLabelController.php b/app/store/controller/user/UserLabelController.php new file mode 100644 index 00000000..abae0d92 --- /dev/null +++ b/app/store/controller/user/UserLabelController.php @@ -0,0 +1,30 @@ +dataLists(new UserLabelLists()); + } + +} \ No newline at end of file diff --git a/app/store/controller/user/UserShipController.php b/app/store/controller/user/UserShipController.php new file mode 100644 index 00000000..e6bd8cdc --- /dev/null +++ b/app/store/controller/user/UserShipController.php @@ -0,0 +1,18 @@ +dataLists(new UserShipLists()); + } +} \ No newline at end of file diff --git a/app/store/lists/financial_transfers/FinancialTransfersLists.php b/app/store/lists/financial_transfers/FinancialTransfersLists.php new file mode 100644 index 00000000..7c5f68a2 --- /dev/null +++ b/app/store/lists/financial_transfers/FinancialTransfersLists.php @@ -0,0 +1,65 @@ + [ 'admin_id', 'uid', 'status', 'initiation_time', 'confirmation_time', 'mark', 'money', 'remark_time'], + ]; + } + + + /** + * @notes 获取列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author admin + * @date 2024/06/14 10:10 + */ + public function lists(): array + { + $this->searchWhere[] = ['store_id','=',$this->adminInfo['store_id']]; + return FinancialTransfers::with(['store','staff','admin'])->where($this->searchWhere) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + } + + + /** + * @notes 获取数量 + * @return int + * @author admin + * @date 2024/06/14 10:10 + */ + public function count(): int + { + return FinancialTransfers::where($this->searchWhere)->count(); + } + +} \ No newline at end of file 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(); + } +} diff --git a/app/store/lists/store_order/StoreOrderLists.php b/app/store/lists/store_order/StoreOrderLists.php index 12f7c720..3c86ba98 100644 --- a/app/store/lists/store_order/StoreOrderLists.php +++ b/app/store/lists/store_order/StoreOrderLists.php @@ -46,13 +46,13 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface */ public function lists(): array { - $store_id = $this->adminInfo['store_id']; + $store_id = $this->adminInfo['store_id']??5; $this->searchWhere[] = ['store_id' ,'=',$store_id]; $is_sashier=$this->request->get('is_sashier'); if($is_sashier==1){//收银台订单 - $this->searchWhere[] = ['pay_type','in',[17,9,13]]; + $this->searchWhere[] = ['pay_type','in',[17,9,13,18]]; }elseif($is_sashier==2){//小程序订单 - $this->searchWhere[] = ['pay_type','in',[7,3]]; + $this->searchWhere[] = ['pay_type','in',[7,3,18]]; } return StoreOrder::where($this->searchWhere) ->field(['id', 'order_id', 'pay_price', 'pay_time', 'pay_type', 'status','paid']) diff --git a/app/store/lists/system_store_storage/SystemStoreStorageLists.php b/app/store/lists/system_store_storage/SystemStoreStorageLists.php index e2e94148..bf3f6a85 100644 --- a/app/store/lists/system_store_storage/SystemStoreStorageLists.php +++ b/app/store/lists/system_store_storage/SystemStoreStorageLists.php @@ -29,7 +29,7 @@ class SystemStoreStorageLists extends BaseAdminDataLists implements ListsSearchI public function setSearch(): array { return [ - '=' => ['admin_id', 'staff_id', 'status'], + '=' => ['admin_id', 'staff_id', 'status','type'], ]; } @@ -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'); diff --git a/app/store/lists/user/UserLists.php b/app/store/lists/user/UserLists.php new file mode 100644 index 00000000..0a888bef --- /dev/null +++ b/app/store/lists/user/UserLists.php @@ -0,0 +1,69 @@ + ['id','user_ship'], + '%like%' => ['mobile'], + ]; + } + + /** + * @notes 获取用户列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author 乔峰 + * @date 2022/9/22 15:50 + */ + public function lists(): array + { + + $field = "id,nickname,real_name,sex,avatar,account,mobile,now_money,user_ship,create_time,purchase_funds,integral"; + $lists = User::where($this->searchWhere) + ->limit($this->limitOffset, $this->limitLength) + ->field($field) + ->order('id desc') + ->select()->each(function($data){ + $data['sex_text'] = $data->sex_text; + $data['mobile'] = substr_replace($data['mobile'], '****', 3, 4); + $data['user_ship_name'] =$data['user_ship']==0?'一般用户':UserShip::where('id',$data['user_ship'])->value('title'); + $data['return_money'] = StoreFinanceFlow:: + where(['user_id'=>$data['id'],'status'=>0,'financial_pm'=>0]) + ->sum('number'); + + })->toArray(); + return $lists; + } + + + /** + * @notes 获取数量 + * @return int + * @author 乔峰 + * @date 2022/9/22 15:51 + */ + public function count(): int + { + return User::where($this->searchWhere)->count(); + } +} \ No newline at end of file diff --git a/app/store/logic/WorkbenchLogic.php b/app/store/logic/WorkbenchLogic.php index 01fb12a1..e887a4f7 100644 --- a/app/store/logic/WorkbenchLogic.php +++ b/app/store/logic/WorkbenchLogic.php @@ -15,14 +15,22 @@ 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; use app\common\logic\BaseLogic; use app\common\logic\store_order\StoreOrderLogic; +use app\common\logic\StoreFinanceFlowLogic; +use app\common\model\finance\CapitalFlow; use app\common\model\order\Cart; use app\common\model\store_cash_finance_flow\StoreCashFinanceFlow; +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_visit\StoreVisit; +use app\common\model\system_store\SystemStore; +use app\common\model\user_recharge\UserRecharge; use app\common\service\ConfigService; use app\common\service\FileService; @@ -42,6 +50,7 @@ class WorkbenchLogic extends BaseLogic $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'], $startTime, $endTime); @@ -55,12 +64,18 @@ class WorkbenchLogic extends BaseLogic $data['verify_amount'] = $orderLogic->storeOrderSumByDate($params['store_id'], $startTime, $endTime, ['shipping_type' => 2]); //门店收益金额 $data['income_amount'] = $orderLogic->storeOrderSumByDate($params['store_id'], $startTime, $endTime, [], 'profit'); + //门店收款金额 + $data['receipt_amount'] = UserRecharge::where([ + 'store_id'=>$params['store_id'], + 'paid'=>YesNoEnum::YES + ])->sum('price'); //门店成交用户数 $data['user_number'] = StoreOrder::where('store_id', $params['store_id']) ->where('paid', 1) ->whereBetweenTime('pay_time', $startTime, $endTime) ->group('uid') ->count(); + if ($dateDiff->days == 1) { $group = 'HOUR(pay_time)'; $i = 0; @@ -77,7 +92,8 @@ class WorkbenchLogic extends BaseLogic $i++; } $field = 'from_unixtime(pay_time,"%m-%d") as pay_time,sum(pay_price) as pay_price'; - } else { + } + else { $group = 'MONTH(pay_time)'; $i = 0; $month = 0; @@ -529,4 +545,297 @@ class WorkbenchLogic extends BaseLogic return $data; } + + public static function revenueStatistics($params) + { + + //当日营业额的统计 + $today = StoreOrder::where(['paid'=>YesNoEnum::YES,'store_id'=>$params['store_id']]); + $turnover_today = $today + ->whereDay('create_time') + ->sum('pay_price'); + //当日利润的统计 + $profit_today = $today + ->whereDay('create_time') + ->sum('profit'); + //当日成本合集的统计 + $cost_today = $today + ->whereDay('create_time') + ->sum('cost'); + + //当日加到保证金的 + $deposit = StoreFinanceFlow::where(['store_id'=>$params['store_id'],'status'=>YesNoEnum::YES]) + ->where('financial_type',OrderEnum::ORDER_MARGIN); + $deposit_today =$deposit + ->whereDay('create_time') + ->sum('number'); + //当日的现金收银 + $cash_today = StoreCashFinanceFlow::where('store_id',$params['store_id']) + ->whereDay('create_time') + ->where('status',YesNoEnum::YES) + ->sum('receivable'); + + //总的营业额的统计 总的利润的统计 总的成本合集的统计 总的加到保证金的 + $all = StoreOrder::where(['paid'=>YesNoEnum::YES,'store_id'=>$params['store_id']]); + + $deposit_all = StoreFinanceFlow::where(['store_id'=>$params['store_id'],'status'=>YesNoEnum::YES]) + ->sum('number'); + + $cash_all = StoreCashFinanceFlow::where('store_id',$params['store_id']) + ->where('status',YesNoEnum::YES) + ->sum('receivable'); + if(isset($params['month']) && $params['month']){ + $all = StoreOrder::where(['paid'=>YesNoEnum::YES,'store_id'=>$params['store_id']]) + ->whereMonth('create_time', $params['month']) + ; + $deposit_all = SystemStore::where('id',$params['store_id']) + ->whereMonth('create_time', $params['month']) + ->value('paid_deposit'); + $cash_all = StoreCashFinanceFlow::where('store_id',$params['store_id']) + ->where('status',YesNoEnum::YES) + ->whereMonth('create_time', $params['month']) + ->sum('receivable'); + } + $turnover_all = $all + ->sum('pay_price'); + $profit_all = $all + ->sum('profit'); + //消耗余额 V2.0 + $cost_all = CapitalFlow:: + where(['category'=>'user_order_balance_pay','store_id'=>$params['store_id']]) + ->sum('amount'); + + $time = self::getLastSevenDays(); + $newArr = []; + foreach ($time as $value){ + $data = self::dealSearch($params['store_id'],$value); + $newArr[$value] = $data; + } + return [ + 'today'=>[ + 'turnover_today'=>$turnover_today, + 'profit_today'=>$profit_today, + 'cost_today'=>$cost_today, + 'deposit_today'=>$deposit_today, + 'cash_today'=>$cash_today, + ], + 'all'=>[ + 'turnover_all'=>$turnover_all, + 'profit_all'=>$profit_all, + 'cost_all'=>$cost_all, + 'deposit_all'=>$deposit_all, + 'cash_all'=>$cash_all, + ], + 'time'=>$newArr + ]; + + + // 可以选时间 当日订单数 本月订单数 拆分线上和线下的方式 ---v.01 + /* if($params['start_time'] && $params['end_time']){ + $startTime = $params['start_time']; + $endTime = $params['end_time']; + $endTime = date('Y-m-d', strtotime($endTime) + 86400); + }else{ + $startTime = date('Y-m-d',time()); + $endTime = date('Y-m-d', strtotime($startTime) + 86400); + } + + //当日订单和当月订单 + $base = StoreOrder::where('paid',YesNoEnum::YES); + $offline_order_today_num =$base + ->whereIn('shipping_type',OrderEnum::OFFLINE) + ->whereDay('create_time') + ->count(); + + $offline_order_today_month = $base + ->whereIn('shipping_type',OrderEnum::OFFLINE) + ->whereMonth('create_time') + ->count(); + //条码收银的-->微信和支付宝的没那个 + + //线下现金收银 + whereIn('pay_type',[OrderEnum::CASHIER_ORDER_PAY, + OrderEnum::CASHIER_ORDER_ALI_PAY,OrderEnum::CASHIER_FACE_PAY]) + $cash = StoreCashFinanceFlow::where('store_id',$params['store_id']) + ->whereBetweenTime('create_time', $startTime, $endTime) + ->where('status',YesNoEnum::YES); + $cash_count = $cash->count(); + $cash_receipt = $cash->sum('receipts');*/ + + } + + + public static function getLastSevenDays() + { + $dates = []; + $today = new \DateTime(); // 获取当前日期 + + for ($i = 0; $i < 30; $i++) { + $date = clone $today; // 克隆当前日期对象，以避免修改原始对象 + $date->modify("-$i day"); // 减去相应的天数 + $dates[] = $date->format('Y-m-d'); // 格式化日期并添加到数组中 + } + + return $dates; + } + + + public static function dealSearch($store_id,$startTime) + { + $endTime = date('Y-m-d', strtotime($startTime) + 86400); + //当日营业额的统计 当日利润的统计 当日成本合集的统计 当日加到保证金的 当日的现金收银 + $today = StoreOrder::where(['paid'=>YesNoEnum::YES,'store_id'=>$store_id]); + $turnover_today = $today + ->whereBetweenTime('create_time', $startTime, $endTime) + ->sum('pay_price'); + $profit_today = $today + ->whereBetweenTime('create_time', $startTime, $endTime) + ->sum('profit'); + $cost_today = $today + ->whereBetweenTime('create_time', $startTime, $endTime) + ->sum('cost'); + + $deposit = StoreFinanceFlow::where(['store_id'=>$store_id]) + ->where('financial_type',OrderEnum::ORDER_MARGIN); + $deposit_today =$deposit + ->whereBetweenTime('create_time', $startTime, $endTime) + ->sum('number'); + + $cash_today = StoreCashFinanceFlow::where('store_id',$store_id) + ->whereBetweenTime('create_time', $startTime, $endTime) + ->where('status',YesNoEnum::YES) + ->sum('receipts'); + return [ + 'turnover_today'=>$turnover_today, + 'profit_today'=>$profit_today, + 'cost_today'=>$cost_today, + 'deposit_today'=>$deposit_today, + 'cash_today'=>$cash_today, + ]; + + } + + public static function rechargeData($params) + { + $data['receipt_amount'] = UserRecharge::where([ + 'store_id'=>$params['store_id'], + 'paid'=>YesNoEnum::YES + ])->sum('price'); + return $data??[]; + } + + + + /** + * 商品趋势 + */ + 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); + } + + } diff --git a/app/store/logic/store_branch_product/StoreBranchProductLogic.php b/app/store/logic/store_branch_product/StoreBranchProductLogic.php index ad7a331c..b08da5d3 100644 --- a/app/store/logic/store_branch_product/StoreBranchProductLogic.php +++ b/app/store/logic/store_branch_product/StoreBranchProductLogic.php @@ -127,29 +127,6 @@ class StoreBranchProductLogic extends BaseLogic return StoreProduct::findOrEmpty($params['id'])->toArray(); } - /** - * 更新商品分类 - */ - public static function updateGoodsclass($id, $type = 0) - { - $pid = StoreCategory::where('id', $id)->value('pid'); - if ($pid) { - $goodsclass = StoreCategory::where('id', $pid)->field('pid,children')->find(); - if ($goodsclass) { - if (count($goodsclass['children']) >= 1) { - if (!in_array($id, $goodsclass['children'])) { - $arr = $goodsclass['children']; - array_push($arr, $id); - StoreCategory::where('id', $pid)->update(['children' => $arr]); - if ($goodsclass['pid'] != 0 && $type == 0) { - self::updateGoodsclass($pid, 1); - } - } - } - } - } - } - /** * @notes 商品上下架 * @param array $params diff --git a/app/store/logic/store_product/StoreProductLogic.php b/app/store/logic/store_product/StoreProductLogic.php index 1dd27998..150040c2 100644 --- a/app/store/logic/store_product/StoreProductLogic.php +++ b/app/store/logic/store_product/StoreProductLogic.php @@ -122,27 +122,4 @@ class StoreProductLogic extends BaseLogic { return StoreProduct::findOrEmpty($params['id'])->toArray(); } - - /** - * 更新商品分类 - */ - public static function updateGoodsclass($id, $type = 0) - { - $pid = StoreCategory::where('id', $id)->value('pid'); - if ($pid) { - $goodsclass = StoreCategory::where('id', $pid)->field('pid,children')->find(); - if ($goodsclass) { - if (count($goodsclass['children']) >= 1) { - if (!in_array($id, $goodsclass['children'])) { - $arr = $goodsclass['children']; - array_push($arr, $id); - StoreCategory::where('id', $pid)->update(['children' => $arr]); - if ($goodsclass['pid'] != 0 && $type == 0) { - self::updateGoodsclass($pid, 1); - } - } - } - } - } - } } diff --git a/app/store/validate/store_order/StoreOrderValidate.php b/app/store/validate/store_order/StoreOrderValidate.php index f7b4eeb8..928c4658 100644 --- a/app/store/validate/store_order/StoreOrderValidate.php +++ b/app/store/validate/store_order/StoreOrderValidate.php @@ -21,6 +21,8 @@ class StoreOrderValidate extends BaseValidate protected $rule = [ 'id' => 'requireWithout:verify_code', 'verify_code' => 'requireWithout:id', + 'uid' => 'require|number', + 'cart_id' => 'require|array', ]; @@ -81,4 +83,9 @@ class StoreOrderValidate extends BaseValidate return $this->only(['id','verify_code']); } + public function sceneCheck() + { + return $this->only(['uid','cart_id']); + } + } diff --git a/composer.json b/composer.json index 7ed7add6..5a665d60 100644 --- a/composer.json +++ b/composer.json @@ -54,9 +54,9 @@ "ext-bcmath": "*", "jpush/jpush": "^3.6", "workerman/crontab": "^1.0", - "hg/apidoc": "^5.2", "intervention/image": "^3.6", - "picqer/php-barcode-generator": "^2.4" + "picqer/php-barcode-generator": "^2.4", + "overtrue/easy-sms": "^2.6" }, "suggest": { "ext-event": "For better performance. " diff --git a/composer.lock b/composer.lock index 2b148506..02626c93 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8c97deb23217033cd0ab2cb6e5b5d195", + "content-hash": "54acb0fe3bc70f1e94406e7b79e84b8a", "packages": [ { "name": "aliyuncs/oss-sdk-php", @@ -1240,75 +1240,6 @@ ], "time": "2023-12-03T19:50:20+00:00" }, - { - "name": "hg/apidoc", - "version": "v5.2.3", - "source": { - "type": "git", - "url": "https://github.com/HGthecode/apidoc-php.git", - "reference": "328aa4fe177ed7393f680724bf3eeb485052c2fe" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/HGthecode/apidoc-php/zipball/328aa4fe177ed7393f680724bf3eeb485052c2fe", - "reference": "328aa4fe177ed7393f680724bf3eeb485052c2fe", - "shasum": "" - }, - "require": { - "doctrine/annotations": "^1 || ^2", - "php": "^7.1 || ^8.0" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "hg\\apidoc\\providers\\LaravelService" - ] - }, - "think": { - "services": [ - "hg\\apidoc\\providers\\ThinkPHPService" - ], - "config": { - "apidoc": "src/config.php" - } - }, - "hyperf": { - "config": "hg\\apidoc\\ConfigProvider" - } - }, - "autoload": { - "psr-4": { - "hg\\apidoc\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "hg-code", - "email": "376401263@qq.com" - } - ], - "description": "根据注解生成API文档，兼容Laravel、ThinkPHP、Hyperf、Webman等框架；在线调试、Markdown文档、多应用/多版本、Mock数据、授权访问、接口生成器、代码生成器等众多实用功能", - "keywords": [ - "apidoc", - "api文档", - "markdown", - "php接口文档", - "接口文档", - "注解", - "注释生成", - "自动生成api" - ], - "support": { - "issues": "https://github.com/HGthecode/apidoc-php/issues", - "source": "https://github.com/HGthecode/apidoc-php/tree/v5.2.3" - }, - "time": "2024-03-22T02:25:31+00:00" - }, { "name": "hyperf/context", "version": "v3.1.15", @@ -2848,6 +2779,78 @@ ], "time": "2023-11-08T09:30:43+00:00" }, + { + "name": "overtrue/easy-sms", + "version": "2.6.0", + "source": { + "type": "git", + "url": "https://github.com/overtrue/easy-sms.git", + "reference": "bb88b244f0de8d1f74bc50c4c08414f4c5f30281" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/overtrue/easy-sms/zipball/bb88b244f0de8d1f74bc50c4c08414f4c5f30281", + "reference": "bb88b244f0de8d1f74bc50c4c08414f4c5f30281", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "ext-json": "*", + "guzzlehttp/guzzle": "^6.2 || ^7.0", + "php": ">=5.6" + }, + "require-dev": { + "brainmaestro/composer-git-hooks": "^2.8", + "jetbrains/phpstorm-attributes": "^1.0", + "mockery/mockery": "~1.3.3 || ^1.4.2", + "phpunit/phpunit": "^5.7 || ^7.5 || ^8.5.19 || ^9.5.8" + }, + "type": "library", + "extra": { + "hooks": { + "pre-commit": [ + "composer check-style", + "composer psalm", + "composer test" + ], + "pre-push": [ + "composer check-style" + ] + } + }, + "autoload": { + "psr-4": { + "Overtrue\\EasySms\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "overtrue", + "email": "i@overtrue.me" + } + ], + "description": "The easiest way to send short message.", + "support": { + "issues": "https://github.com/overtrue/easy-sms/issues", + "source": "https://github.com/overtrue/easy-sms/tree/2.6.0" + }, + "funding": [ + { + "url": "https://github.com/overtrue", + "type": "github" + } + ], + "time": "2024-03-08T06:36:45+00:00" + }, { "name": "overtrue/socialite", "version": "4.10.1", diff --git a/config/middleware.php b/config/middleware.php index 6bc9bfc9..f2a5297f 100644 --- a/config/middleware.php +++ b/config/middleware.php @@ -38,5 +38,10 @@ return [ app\store\middleware\InitMiddleware::class, app\store\middleware\LoginMiddleware::class, // app\store\middleware\AuthMiddleware::class, - ] + ], + 'statistics' => [ + // 跨域中间件 + app\common\http\middleware\AdminAllowMiddleware::class, + + ], ]; diff --git a/config/plugin/hg/apidoc/app.php b/config/plugin/hg/apidoc/app.php deleted file mode 100644 index 6af1865f..00000000 --- a/config/plugin/hg/apidoc/app.php +++ /dev/null @@ -1,105 +0,0 @@ - true, - 'apidoc' => [ - // （选配）文档标题，显示在左上角与首页 - 'title' => '接口文档', - // （选配）文档描述，显示在首页 - 'desc' => '', - // （必须）设置文档的应用/版本 - 'apps' => [ - [ - // （必须）标题 - 'title' => 'store接口', - // （必须）控制器目录地址 - 'path' => 'app\store\controller', - // （必须）唯一的key - 'key' => 'storeApi', - ], - [ - // （必须）标题 - 'title' => 'api接口', - // （必须）控制器目录地址 - 'path' => 'app\api\controller', - // （必须）唯一的key - 'key' => 'apiApi', - ] - ], - // （必须）指定通用注释定义的文件地址 - 'definitions' => "app\common\controller\Definitions", - // （必须）自动生成url规则，当接口不添加@Apidoc\Url ("xxx")注解时，使用以下规则自动生成 - 'auto_url' => [ - // 字母规则，lcfirst=首字母小写；ucfirst=首字母大写； - 'letter_rule' => "lcfirst", - // url前缀 - 'prefix' => "", - ], - // （选配）是否自动注册路由 - 'auto_register_routes' => true, - // （必须）缓存配置 - 'cache' => [ - // 是否开启缓存 - 'enable' => false, - ], - // （必须）权限认证配置 - 'auth' => [ - // 是否启用密码验证 - 'enable' => true, - // 全局访问密码 - 'password' => "qwe123", - // 密码加密盐 - 'secret_key' => "qwe123", - // 授权访问后的有效期 - 'expire' => 86400 * 7 - ], - // 全局参数 - 'params' => [ - // （选配）全局的请求Header - 'header' => [ - // name=字段名，type=字段类型，require=是否必须，default=默认值，desc=字段描述 - ['name' => 'Authorization', 'type' => 'string', 'require' => true, 'desc' => '身份令牌Token'], - ], - // （选配）全局的请求Query - 'query' => [ - // 同上 header - ], - // （选配）全局的请求Body - 'body' => [ - // 同上 header - ], - ], - // 全局响应体 - 'responses' => [ - // 成功响应体 - 'success' => [ - ['name' => 'code', 'desc' => '业务代码', 'type' => 'int', 'require' => 1], - ['name' => 'message', 'desc' => '业务信息', 'type' => 'string', 'require' => 1], - //参数同上 headers；main=true来指定接口Returned参数挂载节点 - ['name' => 'data', 'desc' => '业务数据', 'main' => true, 'type' => 'object', 'require' => 1], - ], - // 异常响应体 - 'error' => [ - ['name' => 'code', 'desc' => '业务代码', 'type' => 'int', 'require' => 1, 'md' => '/docs/HttpError.md'], - ['name' => 'message', 'desc' => '业务信息', 'type' => 'string', 'require' => 1], - ] - ], - //（选配）默认作者 - 'default_author' => '', - //（选配）默认请求类型 - 'default_method' => 'GET', - //（选配）Apidoc允许跨域访问 - 'allowCrossDomain' => false, - /** - * （选配）解析时忽略带@注解的关键词，当注解中存在带@字符并且非Apidoc注解，如 @key test，此时Apidoc页面报类似以下错误时: - * [Semantical Error] The annotation "@key" in method xxx() was never imported. Did you maybe forget to add a "use" statement for this annotation? - */ - 'ignored_annitation' => [], - - // （选配）数据库配置 - 'database' => [], - // （选配）Markdown文档 - 'docs' => [], - // （选配）接口生成器配置 注意：是一个二维数组 - 'generator' => [] - ] -]; diff --git a/config/plugin/hg/apidoc/route.php b/config/plugin/hg/apidoc/route.php deleted file mode 100644 index 1b03a1f3..00000000 --- a/config/plugin/hg/apidoc/route.php +++ /dev/null @@ -1,3 +0,0 @@ - [ + 'handler' => process\Task::class + ], ]; diff --git a/nginx.htaccess b/nginx.htaccess new file mode 100644 index 00000000..e69de29b diff --git a/process/Task.php b/process/Task.php new file mode 100644 index 00000000..fa0e6650 --- /dev/null +++ b/process/Task.php @@ -0,0 +1,22 @@ +0]; + $where[]=['create_time','<',time() - 600];// 10分钟前创建的订单 + // 删除10分钟未支付的订单 + StoreOrder::where($where)->update(['delete_time'=>time()]); // 删除时间设置为当前时间，即删除 + }); + + + } +} \ No newline at end of file diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index 2dcede84..348204dd 100644 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -10,7 +10,6 @@ return array( 'think\\' => array($vendorDir . '/topthink/think-container/src', $vendorDir . '/topthink/think-helper/src', $vendorDir . '/topthink/think-orm/src'), 'taoser\\' => array($vendorDir . '/taoser/webman-validate/src'), 'support\\' => array($vendorDir . '/workerman/webman-framework/src/support'), - 'hg\\apidoc\\' => array($vendorDir . '/hg/apidoc/src'), 'app\\View\\Components\\' => array($baseDir . '/app/view/components'), 'app\\' => array($baseDir . '/app'), 'ZipStream\\' => array($vendorDir . '/maennchen/zipstream-php/src'), @@ -73,6 +72,7 @@ return array( 'PhpOffice\\PhpSpreadsheet\\' => array($vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet'), 'PhpDocReader\\' => array($vendorDir . '/php-di/phpdoc-reader/src/PhpDocReader'), 'Overtrue\\Socialite\\' => array($vendorDir . '/overtrue/socialite/src'), + 'Overtrue\\EasySms\\' => array($vendorDir . '/overtrue/easy-sms/src'), 'OSS\\' => array($vendorDir . '/aliyuncs/oss-sdk-php/src/OSS'), 'Nyholm\\Psr7\\' => array($vendorDir . '/nyholm/psr7/src'), 'Nyholm\\Psr7Server\\' => array($vendorDir . '/nyholm/psr7-server/src'), diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index b4a00877..a6ee1799 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -57,10 +57,6 @@ class ComposerStaticInitcefecbcff919f3c1c8084830bbb72adc array ( 'support\\' => 8, ), - 'h' => - array ( - 'hg\\apidoc\\' => 10, - ), 'a' => array ( 'app\\View\\Components\\' => 20, @@ -149,6 +145,7 @@ class ComposerStaticInitcefecbcff919f3c1c8084830bbb72adc 'O' => array ( 'Overtrue\\Socialite\\' => 19, + 'Overtrue\\EasySms\\' => 17, 'OSS\\' => 4, ), 'N' => @@ -247,10 +244,6 @@ class ComposerStaticInitcefecbcff919f3c1c8084830bbb72adc array ( 0 => __DIR__ . '/..' . '/workerman/webman-framework/src/support', ), - 'hg\\apidoc\\' => - array ( - 0 => __DIR__ . '/..' . '/hg/apidoc/src', - ), 'app\\View\\Components\\' => array ( 0 => __DIR__ . '/../..' . '/app/view/components', @@ -500,6 +493,10 @@ class ComposerStaticInitcefecbcff919f3c1c8084830bbb72adc array ( 0 => __DIR__ . '/..' . '/overtrue/socialite/src', ), + 'Overtrue\\EasySms\\' => + array ( + 0 => __DIR__ . '/..' . '/overtrue/easy-sms/src', + ), 'OSS\\' => array ( 0 => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 7c04a897..9dfcf3b4 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1282,78 +1282,6 @@ ], "install-path": "../guzzlehttp/uri-template" }, - { - "name": "hg/apidoc", - "version": "v5.2.3", - "version_normalized": "5.2.3.0", - "source": { - "type": "git", - "url": "https://github.com/HGthecode/apidoc-php.git", - "reference": "328aa4fe177ed7393f680724bf3eeb485052c2fe" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/HGthecode/apidoc-php/zipball/328aa4fe177ed7393f680724bf3eeb485052c2fe", - "reference": "328aa4fe177ed7393f680724bf3eeb485052c2fe", - "shasum": "" - }, - "require": { - "doctrine/annotations": "^1 || ^2", - "php": "^7.1 || ^8.0" - }, - "time": "2024-03-22T02:25:31+00:00", - "type": "library", - "extra": { - "laravel": { - "providers": [ - "hg\\apidoc\\providers\\LaravelService" - ] - }, - "think": { - "services": [ - "hg\\apidoc\\providers\\ThinkPHPService" - ], - "config": { - "apidoc": "src/config.php" - } - }, - "hyperf": { - "config": "hg\\apidoc\\ConfigProvider" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "hg\\apidoc\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "hg-code", - "email": "376401263@qq.com" - } - ], - "description": "根据注解生成API文档，兼容Laravel、ThinkPHP、Hyperf、Webman等框架；在线调试、Markdown文档、多应用/多版本、Mock数据、授权访问、接口生成器、代码生成器等众多实用功能", - "keywords": [ - "apidoc", - "api文档", - "markdown", - "php接口文档", - "接口文档", - "注解", - "注释生成", - "自动生成api" - ], - "support": { - "issues": "https://github.com/HGthecode/apidoc-php/issues", - "source": "https://github.com/HGthecode/apidoc-php/tree/v5.2.3" - }, - "install-path": "../hg/apidoc" - }, { "name": "hyperf/context", "version": "v3.1.15", @@ -2965,6 +2893,81 @@ ], "install-path": "../nyholm/psr7-server" }, + { + "name": "overtrue/easy-sms", + "version": "2.6.0", + "version_normalized": "2.6.0.0", + "source": { + "type": "git", + "url": "https://github.com/overtrue/easy-sms.git", + "reference": "bb88b244f0de8d1f74bc50c4c08414f4c5f30281" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/overtrue/easy-sms/zipball/bb88b244f0de8d1f74bc50c4c08414f4c5f30281", + "reference": "bb88b244f0de8d1f74bc50c4c08414f4c5f30281", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "ext-json": "*", + "guzzlehttp/guzzle": "^6.2 || ^7.0", + "php": ">=5.6" + }, + "require-dev": { + "brainmaestro/composer-git-hooks": "^2.8", + "jetbrains/phpstorm-attributes": "^1.0", + "mockery/mockery": "~1.3.3 || ^1.4.2", + "phpunit/phpunit": "^5.7 || ^7.5 || ^8.5.19 || ^9.5.8" + }, + "time": "2024-03-08T06:36:45+00:00", + "type": "library", + "extra": { + "hooks": { + "pre-commit": [ + "composer check-style", + "composer psalm", + "composer test" + ], + "pre-push": [ + "composer check-style" + ] + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Overtrue\\EasySms\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "overtrue", + "email": "i@overtrue.me" + } + ], + "description": "The easiest way to send short message.", + "support": { + "issues": "https://github.com/overtrue/easy-sms/issues", + "source": "https://github.com/overtrue/easy-sms/tree/2.6.0" + }, + "funding": [ + { + "url": "https://github.com/overtrue", + "type": "github" + } + ], + "install-path": "../overtrue/easy-sms" + }, { "name": "overtrue/socialite", "version": "4.10.1", diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 43e1d6ee..b1b2bed4 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -1,9 +1,9 @@ array( 'name' => 'workerman/webman', - 'pretty_version' => 'dev-main', - 'version' => 'dev-main', - 'reference' => '4b5122f1ac239cde50650106617717ac4ed3db2b', + 'pretty_version' => '1.0.0+no-version-set', + 'version' => '1.0.0.0', + 'reference' => null, 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -154,15 +154,6 @@ 'aliases' => array(), 'dev_requirement' => false, ), - 'hg/apidoc' => array( - 'pretty_version' => 'v5.2.3', - 'version' => '5.2.3.0', - 'reference' => '328aa4fe177ed7393f680724bf3eeb485052c2fe', - 'type' => 'library', - 'install_path' => __DIR__ . '/../hg/apidoc', - 'aliases' => array(), - 'dev_requirement' => false, - ), 'hyperf/context' => array( 'pretty_version' => 'v3.1.15', 'version' => '3.1.15.0', @@ -385,6 +376,15 @@ 'aliases' => array(), 'dev_requirement' => false, ), + 'overtrue/easy-sms' => array( + 'pretty_version' => '2.6.0', + 'version' => '2.6.0.0', + 'reference' => 'bb88b244f0de8d1f74bc50c4c08414f4c5f30281', + 'type' => 'library', + 'install_path' => __DIR__ . '/../overtrue/easy-sms', + 'aliases' => array(), + 'dev_requirement' => false, + ), 'overtrue/socialite' => array( 'pretty_version' => '4.10.1', 'version' => '4.10.1.0', @@ -1038,9 +1038,9 @@ 'dev_requirement' => false, ), 'workerman/webman' => array( - 'pretty_version' => 'dev-main', - 'version' => 'dev-main', - 'reference' => '4b5122f1ac239cde50650106617717ac4ed3db2b', + 'pretty_version' => '1.0.0+no-version-set', + 'version' => '1.0.0.0', + 'reference' => null, 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), diff --git a/vendor/hg/apidoc/.gitignore b/vendor/hg/apidoc/.gitignore deleted file mode 100644 index 485dee64..00000000 --- a/vendor/hg/apidoc/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.idea diff --git a/vendor/hg/apidoc/README.md b/vendor/hg/apidoc/README.md deleted file mode 100644 index 0f8ace59..00000000 --- a/vendor/hg/apidoc/README.md +++ /dev/null @@ -1,88 +0,0 @@ -
- -
- -

- Apidoc -

- -
- 基于PHP的注解生成API文档及Api接口开发工具 -
- -
- - - - - - - - -
- - -## 🤷‍♀️ Apidoc是什么？ - -Apidoc是一个通过解析注解生成Api接口文档的PHP composer扩展，兼容Laravel、ThinkPHP、Hyperf、Webman等框架； -全面的注解引用、数据表字段引用，简单的注解即可生成Api文档，而Apidoc不仅于接口文档，在线接口调试、Mock调试数据、调试事件处理、Json/TypeScript生成、接口生成器、代码生成器等诸多实用功能，致力于提高Api接口开发效率。 - - -## ✨特性 - -- 开箱即用：无繁杂的配置、安装后按文档编写注释即可自动生成API文档。 -- 轻松编写：支持通用注释引用、业务逻辑层、数据表字段的引用，几句注释即可完成。 -- 在线调试：在线文档可直接调试，并支持全局请求/Mock参数/事件处理，接口调试省时省力。 -- 安全高效：支持访问密码验证、应用/版本独立密码；支持文档缓存。 -- 多应用/多版本：可适应各种单应用、多应用、多版本的项目的Api管理。 -- 分组/Tag：可对控制器/接口进行多级分组或定义Tag。 -- Markdown文档：支持.md文件的文档展示。 -- Json/TypeScript生成：文档自动生成接口的Json及TypeScript。 -- 代码生成器：配置+模板即可快速生成代码及数据表的创建，大大提高工作效率。 - - -## 📌兼容 - -以下框架已内置兼容，可开箱即用 - -|框架|版本| -|-|-|-| -|ThinkPHP|5.1、6.x、8.x| -|Laravel|8.x、9.x、10.x| -|Webman|1.x| -|Hyperf|2.x、3.x| - - -## 📖使用文档 - -[https://docs.apidoc.icu](https://docs.apidoc.icu/) - -[https://hg-code.gitee.io/apidoc-php/](https://hg-code.gitee.io/apidoc-php/) - -## 🏆支持我们 - -如果本项目对您有所帮助，请点个Star支持我们 - -- [Github](https://github.com/HGthecode/apidoc-php) -> - Star me on GitHub - -- [Gitee](https://gitee.com/hg-code/apidoc-php) -> star - - -## 🌐交流群 - -![QQ群](https://docs.apidoc.icu/qq-qun.png) - - - -## 💡鸣谢 - -doctrine/annotations - - -## 🔗链接 - ApiDoc UI - - ApiDoc Demo - - diff --git a/vendor/hg/apidoc/composer.json b/vendor/hg/apidoc/composer.json deleted file mode 100644 index fef0c0ab..00000000 --- a/vendor/hg/apidoc/composer.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "name": "hg/apidoc", - "description": "根据注解生成API文档，兼容Laravel、ThinkPHP、Hyperf、Webman等框架；在线调试、Markdown文档、多应用/多版本、Mock数据、授权访问、接口生成器、代码生成器等众多实用功能", - "keywords": [ - "apidoc", - "api文档", - "接口文档", - "自动生成api", - "注释生成", - "php接口文档", - "api文档", - "Markdown", - "注解" - ], - "require": { - "php": "^7.1 || ^8.0", - "doctrine/annotations": "^1 || ^2" - }, - "license": "MIT", - "authors": [ - { - "name": "hg-code", - "email": "376401263@qq.com" - } - ], - "autoload": { - "psr-4": { - "hg\\apidoc\\": "src/" - } - }, - "extra": { - "laravel": { - "providers": [ - "hg\\apidoc\\providers\\LaravelService" - ] - }, - "think": { - "services": [ - "hg\\apidoc\\providers\\ThinkPHPService" - ], - "config": { - "apidoc": "src/config.php" - } - }, - "hyperf": { - "config": "hg\\apidoc\\ConfigProvider" - } - }, - "minimum-stability": "dev" -} diff --git a/vendor/hg/apidoc/src/Auth.php b/vendor/hg/apidoc/src/Auth.php deleted file mode 100644 index b86686a5..00000000 --- a/vendor/hg/apidoc/src/Auth.php +++ /dev/null @@ -1,192 +0,0 @@ -authConfig = $authConfig; - } - - /** - * 验证密码是否正确 - * @param $password - * @return false|string - */ - public function verifyAuth(string $password, string $appKey) - { - $authConfig = $this->authConfig; - if (!empty($appKey)) { - $currentAppConfig = Helper::getCurrentAppConfig($appKey); - $currentApp = $currentAppConfig['appConfig']; - if (!empty($currentApp) && !empty($currentApp['password'])) { - // 应用密码 - if (md5($currentApp['password']) === $password) { - return $this->createToken($currentApp['password'],$authConfig['expire']); - } - throw new ErrorException("password error"); - } - } - if ($authConfig['enable']) { - // 密码验证 - if (md5($authConfig['password']) === $password) { - return $this->createToken($authConfig['password'],$authConfig['expire']); - } - throw new ErrorException("password error"); - } - return false; - } - - /** - * 验证token是否可用 - * @param $request - * @return bool - */ - public function checkAuth($params=[]): bool - { - $authConfig = $this->authConfig; - $token = !empty($params['token'])?$params['token']:""; - $appKey = !empty($params['appKey'])?$params['appKey']:""; - if (!empty($appKey)) { - $currentAppConfig = Helper::getCurrentAppConfig($appKey); - $currentApp = $currentAppConfig['appConfig']; - if (!empty($currentApp) && !empty($currentApp['password'])) { - if (empty($token)) { - throw new ErrorException("token not found"); - } - // 应用密码 - if ($this->checkToken($token, $currentApp['password'])) { - return true; - } else { - throw new ErrorException("token error"); - } - } else if (empty($authConfig['enable'])) { - return true; - } - } - if($authConfig['enable'] && empty($token)){ - throw new ErrorException("token not found"); - }else if (!empty($token) && !$this->checkToken($token, "") && $authConfig['enable']) { - throw new ErrorException("token error"); - } - return true; - } - - - /** - * 获取tokencode - * @param string $password - * @return string - */ - protected static function getTokenCode(string $password): string - { - return md5(md5($password)); - } - - - /** - * 创建token - * @param string $password - * @return string - */ - public function createToken(string $password): string - { - $authConfig = $this->authConfig; - $data = [ - 'key'=>static::getTokenCode($password), - 'expire'=>time()+$authConfig['expire'] - ]; - $code = json_encode($data); - return static::handleToken($code, "CE",$authConfig['secret_key']); - } - - /** - * 验证token是否可用 - * @param $token - * @return bool - */ - public function checkToken(string $token, string $password): bool - { - $authConfig = $this->authConfig; - if (empty($password)){ - $password = $authConfig['password']; - } - $decode = static::handleToken($token, "DE",$authConfig['secret_key']); - $deData = json_decode($decode,true); - - if (!empty($deData['key']) && $deData['key'] === static::getTokenCode($password) && !empty($deData['expire']) && $deData['expire']>time()){ - return true; - } - - return false; - } - - - - /** - * 处理token - * @param $string - * @param string $operation - * @param string $key - * @param int $expiry - * @return false|string - */ - protected static function handleToken(string $string, string $operation = 'DE', string $key = '', int $expiry = 0):string - { - $ckey_length = 4; - $key = md5($key); - $keya = md5(substr($key, 0, 16)); - $keyb = md5(substr($key, 16, 16)); - $keyc = $ckey_length ? ($operation == 'DE' ? substr($string, 0, $ckey_length) : substr(md5(microtime()), -$ckey_length)) : ''; - $cryptkey = $keya . md5($keya . $keyc); - $key_length = strlen($cryptkey); - $string = $operation == 'DE' ? base64_decode(substr($string, $ckey_length)) : sprintf('%010d', $expiry ? $expiry + time() : 0) . substr(md5($string . $keyb), 0, 16) . $string; - $string_length = strlen($string); - $result = ''; - $box = range(0, 255); - $rndkey = array(); - for ($i = 0; $i <= 255; $i++) { - $rndkey[$i] = ord($cryptkey[$i % $key_length]); - } - for ($j = $i = 0; $i < 256; $i++) { - $j = ($j + $box[$i] + $rndkey[$i]) % 256; - $tmp = $box[$i]; - $box[$i] = $box[$j]; - $box[$j] = $tmp; - } - for ($a = $j = $i = 0; $i < $string_length; $i++) { - $a = ($a + 1) % 256; - $j = ($j + $box[$a]) % 256; - $tmp = $box[$a]; - $box[$a] = $box[$j]; - $box[$j] = $tmp; - $result .= chr(ord($string[$i]) ^ ($box[($box[$a] + $box[$j]) % 256])); - } - if ($operation == 'DE') { - $subNumber = (int)substr($result, 0, 10); - if (($subNumber == 0 || $subNumber - time() > 0) && substr($result, 10, 16) == substr(md5(substr($result, 26) . $keyb), 0, 16)) { - return substr($result, 26); - } else { - return ''; - } - } else { - return $keyc . str_replace('=', '', base64_encode($result)); - } - } - -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/ConfigProvider.php b/vendor/hg/apidoc/src/ConfigProvider.php deleted file mode 100644 index f8f007c5..00000000 --- a/vendor/hg/apidoc/src/ConfigProvider.php +++ /dev/null @@ -1,24 +0,0 @@ - [], - 'publish' => [ - [ - 'id' => 'config', - 'description' => 'The config of apidoc.', - 'source' => __DIR__ . '/config.php', - 'destination' => BASE_PATH . '/config/autoload/apidoc.php', - ], - ], - ]; - } -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/Controller.php b/vendor/hg/apidoc/src/Controller.php deleted file mode 100644 index 479f7733..00000000 --- a/vendor/hg/apidoc/src/Controller.php +++ /dev/null @@ -1,451 +0,0 @@ -config = ConfigProvider::get(); - if (isset($this->config['enable']) && $this->config['enable'] === false) { - throw new ErrorException("apidoc close"); - } - if (!empty($this->config['request_params'])) { - $this->requestParams = $this->config['request_params']; - } else { - $this->requestParams = (new Request())->param(); - } - if (!empty($this->requestParams['lang']) && !empty($this->config['lang_register_function'])) { - $this->lang = $this->requestParams['lang']; - $this->config['lang_register_function']($this->lang); - } - if ($checkAuth) { - (new Auth($this->config))->checkAuth($this->requestParams); - } - } - - /** - * 验证权限 - * @param $config - * @param $params - */ - protected function checkAuth() - { - $config = $this->config; - $params = $this->requestParams; - if (!empty($params['shareKey'])) { - //分享 - $shareData = (new ApiShare())->checkShareAuth($config, $params); - $appKey = !empty($params['appKey']) ? $params['appKey'] : ""; - if (!empty($shareData['appKeys']) && !in_array($appKey, $shareData['appKeys'])) { - throw new ErrorException("share not exists"); - } - return $shareData; - } else { - (new Auth($config))->checkAuth($params); - } - } - - - /** - * 获取配置 - * @return \think\response\Json - */ - public function getConfig() - { - $this->init(false); - $params = $this->requestParams; - if (!empty($params['shareKey'])) { - // 接口分享 - $shareData = (new ApiShare())->checkShareAuth($this->config, $params); - if (!empty($shareData['appKeys'])) { - $config = ConfigProvider::getFeConfig($shareData['appKeys']); - } else { - $config = ConfigProvider::getFeConfig(); - } - } else { - (new Auth($this->config))->checkAuth($params); - $config = ConfigProvider::getFeConfig(); - } - return Helper::showJson(0, "", $config); - } - - /** - * 验证密码 - */ - public function verifyAuth() - { - $this->init(); - $config = $this->config; - $params = $this->requestParams; - if (empty($params['password'])) { - throw new ErrorException("password not found"); - } - $appKey = !empty($params['appKey']) ? $params['appKey'] : ""; - if (!empty($params['shareKey'])) { - // 接口分享 - $shareData = (new ApiShare())->getShareDetailByKey($params['shareKey']); - if (!empty($shareData['password']) && $params['password'] === md5($shareData['password'])) { - $hasAuth = (new Auth($config))->createToken($params['password']); - } else { - throw new ErrorException("password error"); - } - } else { - if (!$appKey && !(!empty($config['auth']) && $config['auth']['enable'])) { - throw new ErrorException("password error"); - } - $hasAuth = (new Auth($config))->verifyAuth($params['password'], $appKey); - } - $res = [ - "token" => $hasAuth - ]; - return Helper::showJson(0, "", $res); - } - - /** - * 获取api文档菜单 - */ - public function getApiMenus() - { - $this->init(false); - $config = $this->config; - $params = $this->requestParams; - if (empty($params['appKey'])) { - throw new ErrorException("appkey not found"); - } - $appKey = $params['appKey']; - $shareData = $this->checkAuth(); - $currentAppConfig = Helper::getCurrentAppConfig($appKey); - $currentApp = $currentAppConfig['appConfig']; - $apiData = $this->getApiMenusByAppKey($appKey); - $groups = !empty($currentApp['groups']) ? $currentApp['groups'] : []; - if (!empty($params['shareKey']) && $shareData['type'] == 'api') { - $apiData['data'] = Helper::filterTreeNodesByKeys($apiData['data'], $shareData['apiKeys'], 'menuKey'); - } - $json = [ - 'data' => $apiData['data'], - 'app' => $currentApp, - 'groups' => $groups, - 'tags' => $apiData['tags'], - ]; - return Helper::showJson(0, "", $json); - } - - protected function getApiMenusByAppKey($appKey) - { - $config = $this->config; - if (!empty($config['cache']) && $config['cache']['enable']) { - $cacheKey = Helper::getCacheKey('apiMenu', $appKey, $this->lang); - $cacheData = (new Cache())->get($cacheKey); - if ($cacheData && empty($params['reload'])) { - $apiData = $cacheData; - } else { - // 生成数据并缓存 - $apiData = (new ParseApiMenus($config))->renderApiMenus($appKey); - (new Cache())->set($cacheKey, $apiData); - } - } else { - // 生成数据 - $apiData = (new ParseApiMenus($config))->renderApiMenus($appKey); - } - return $apiData; - } - - - /** - * 获取所有api文档菜单 - */ - public function getAllApiMenus() - { - $this->init(true); - $config = $this->config; - $params = $this->requestParams; - $configApps = Helper::handleAppsConfig($config['apps'], false, $config); - $data = ApiShare::getAppShareApis($config, $configApps, "", [], false); - return Helper::showJson(0, "", $data); - } - - /** - * 获取接口明细 - * @return array - */ - public function getApiDetail() - { - $this->init(false); - $config = $this->config; - $params = $this->requestParams; - if (empty($params['path'])) { - throw new ErrorException("path not found"); - } - $appKey = !empty($params['appKey']) ? $params['appKey'] : ""; - $apiKey = urldecode($params['path']); - $this->checkAuth(); - if (!empty($config['cache']) && $config['cache']['enable']) { - $cacheKey = Helper::getCacheKey('apiDetail', $appKey, $this->lang, $params['path']); - $cacheData = (new Cache())->get($cacheKey); - if ($cacheData && empty($params['reload'])) { - $res = $cacheData; - } else { - // 生成数据并缓存 - $res = (new ParseApiDetail($config))->renderApiDetail($appKey, $apiKey); - (new Cache())->set($cacheKey, $res); - } - } else { - // 生成数据 - $res = (new ParseApiDetail($config))->renderApiDetail($appKey, $apiKey); - } - $res['appKey'] = $appKey; - return Helper::showJson(0, "", $res); - } - - - /** - * 获取md菜单 - * @return array - */ - public function getMdMenus() - { - $this->init(false); - $config = $this->config; - $params = $this->requestParams; - $appKey = ""; - if (!empty($params['appKey'])) { - // 获取指定应用 - $appKey = $params['appKey']; - } - $this->checkAuth(); - $docs = (new ParseMarkdown($config))->getDocsMenu($appKey, $this->lang); - return Helper::showJson(0, "", $docs); - - } - - /** - * 获取md文档内容 - * @return \think\response\Json - */ - public function getMdDetail() - { - $this->init(false); - $config = $this->config; - $params = $this->requestParams; - $this->checkAuth(); - try { - if (empty($params['path'])) { - throw new ErrorException("mdPath not found"); - } - if (empty($params['appKey'])) { - throw new ErrorException("appkey not found"); - } - - $path = urldecode($params['path']); - $content = (new ParseMarkdown($config))->getContent($params['appKey'], $path, $this->lang); - $res = [ - 'content' => $content, - ]; - return Helper::showJson(0, "", $res); - - } catch (ErrorException $e) { - return Helper::showJson($e->getCode(), $e->getMessage()); - } - } - - - /** - * 创建代码生成器 - * @return array - */ - public function createGenerator() - { - $this->init(true); - $config = $this->config; - $params = $this->requestParams; - $res = (new generator\Index($config))->create($params); - return Helper::showJson(0, "", $res); - } - - /** - * 删除所有接口缓存 - * @return array - */ - public function cancelAllCache() - { - $this->init(true); - $config = $this->config; - $path = APIDOC_STORAGE_PATH . $config['cache']['folder']. '/apis'; - $res = DirAndFile::deleteDir($path); - return Helper::showJson(0, "", $path); - } - - /** - * 生成所有接口缓存 - * @return array - */ - public function createAllCache() - { - $this->init(true); - $config = $this->config; - $params = $this->requestParams; - $apps = Helper::getAllApps($config['apps']); - $cache = new Cache(); - DirAndFile::deleteDir(APIDOC_STORAGE_PATH . $config['cache']['folder'] . '/' . 'apis'); - if (!empty($apps) && count($apps)) { - try { - foreach ($apps as $app) { - // 缓存菜单 - $appKey = $app['appKey']; - $controllerData = (new ParseApiMenus($config))->renderApiMenus($appKey); - if (!empty($controllerData['data']) && count($controllerData['data'])) { - foreach ($controllerData['data'] as $controller) { - if (!empty($controller['children']) && count($controller['children'])) { - foreach ($controller['children'] as $item) { - if (!empty($item['url']) && !empty($item['menuKey'])) { - $apiDetail = (new ParseApiDetail($config))->renderApiDetail($appKey, urldecode($item['menuKey'])); - $apiDetailCacheKey = Helper::getCacheKey('apiDetail', $appKey, $this->lang, $item['menuKey']); - $cache->set($apiDetailCacheKey, $apiDetail); - } - } - } - } - } - $cacheKey = Helper::getCacheKey('apiMenu', $appKey, $this->lang); - $cache->set($cacheKey, $controllerData); - } - } catch (\ReflectionException $e) { - DirAndFile::deleteDir(APIDOC_STORAGE_PATH . $config['cache']['folder'] . '/' . 'apis'); - throw new ErrorException($e->getMessage()); - } - } - return Helper::showJson(0, "", true); - } - - /** - * 生成代码模板内容 - * @return array - */ - public function renderCodeTemplate() - { - $this->init(true); - $config = $this->config; - $params = $this->requestParams; - $code = (new ParseCodeTemplate($config))->renderCode($params); - return Helper::showJson(0, "", [ - 'code' => $code - ]); - - } - - - /** - * 添加接口分享 - * @return array - */ - public function addApiShare() - { - $this->init(true); - $config = $this->config; - $params = $this->requestParams; - if (empty($params['name'])) { - throw new ErrorException('field not found', ['field' => 'name']); - } - if (empty($params['type'])) { - throw new ErrorException('field not found', ['field' => 'type']); - } - if ($params['type'] == 'app' && empty($params['appKeys'])) { - throw new ErrorException('field not found', ['field' => 'appKeys']); - } - if ($params['type'] == 'api' && empty($params['apiKeys'])) { - throw new ErrorException('field not found', ['field' => 'apiKeys']); - } - $res = (new ApiShare())->addApiShare($params); - return Helper::showJson(0, "", $res); - } - - /** - * 获取接口分享分页列表 - * @return array - */ - public function getApiShareList() - { - $this->init(true); - $config = $this->config; - $params = $this->requestParams; - $pageIndex = !empty($params['pageIndex']) ? $params['pageIndex'] : 1; - $pageSize = 5; - $res = (new ApiShare())->getSharePageList($config, $pageIndex, $pageSize); - return Helper::showJson(0, "", $res); - } - - /** - * 获取接口分享记录明细 - * @return array - */ - public function getApiShareDetail() - { - $this->init(true); - $config = $this->config; - $params = $this->requestParams; - if (empty($params['key'])) { - throw new ErrorException('field not found', ['field' => 'key']); - } - $cacheData = (new ApiShare())->getShareDetailByKey($params['key']); - return Helper::showJson(0, "", $cacheData); - } - - /** - * 删除接口分享记录 - * @return array - */ - public function deleteApiShare() - { - $this->init(true); - $config = $this->config; - $params = $this->requestParams; - if (empty($params['key'])) { - throw new ErrorException('field not found', ['field' => 'key']); - } - $cacheKey = ApiShare::getShareCacheKey($params['key']); - $res = (new Cache())->delete($cacheKey); - return Helper::showJson(0, "", $res); - } - - /** - * 处理接口分享操作 - * @return array - */ - public function handleApiShareAction() - { - $this->init(true); - $config = $this->config; - $params = $this->requestParams; - if (empty($params['key'])) { - throw new ErrorException('field not found', ['field' => 'key']); - } - if (!isset($params['index'])) { - throw new ErrorException('field not found', ['field' => 'index']); - } - $res = (new ApiShare())->handleApiShareAction($config, $params['key'], $params['index']); - return Helper::showJson(0, "", $res); - } - -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/Install.php b/vendor/hg/apidoc/src/Install.php deleted file mode 100644 index af693184..00000000 --- a/vendor/hg/apidoc/src/Install.php +++ /dev/null @@ -1,56 +0,0 @@ - 'config/plugin/hg/apidoc', - ); - - /** - * Install - * @return void - */ - public static function install() - { - foreach (static::$configPath as $source => $dest) { - if ($pos = strrpos($dest, '/')) { - $parent_dir = base_path() . '/' . substr($dest, 0, $pos); - if (!is_dir($parent_dir)) { - mkdir($parent_dir, 0777, true); - } - } - //symlink(__DIR__ . "/$source", base_path()."/$dest"); - copy_dir(__DIR__ . "/$source", base_path() . "/$dest"); - echo "Create $dest"; - } - } - - /** - * Uninstall - * @return void - */ - public static function uninstall() - { - foreach (static::$configPath as $source => $dest) { - $path = base_path()."/$dest"; - if (!is_dir($path) && !is_file($path)) { - continue; - } - echo "Remove $dest"; - if (is_file($path) || is_link($path)) { - unlink($path); - continue; - } - remove_dir($path); - } - } - -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/annotation/AddField.php b/vendor/hg/apidoc/src/annotation/AddField.php deleted file mode 100644 index 2f4450de..00000000 --- a/vendor/hg/apidoc/src/annotation/AddField.php +++ /dev/null @@ -1,84 +0,0 @@ - 'Apidoc', - // （选配）文档描述，显示在首页 - 'desc' => '', - // （必须）设置文档的应用/版本 - 'apps' => [ - [ - // （必须）标题 - 'title'=>'Api接口', - // （必须）控制器目录地址 - 'path'=>'app\controller', - // （必须）唯一的key - 'key'=>'api', - ] - ], - - // （必须）指定通用注释定义的文件地址 - 'definitions' => "app\common\controller\Definitions", - // （必须）自动生成url规则，当接口不添加@Apidoc\Url ("xxx")注解时，使用以下规则自动生成 - 'auto_url' => [ - // 字母规则，lcfirst=首字母小写；ucfirst=首字母大写； - 'letter_rule' => "lcfirst", - // url前缀 - 'prefix'=>"", - ], - // 是否自动注册路由 - 'auto_register_routes'=>false, - // （必须）缓存配置 - 'cache' => [ - // 是否开启缓存 - 'enable' => false, - ], - // （必须）权限认证配置 - 'auth' => [ - // 是否启用密码验证 - 'enable' => false, - // 全局访问密码 - 'password' => "123456", - // 密码加密盐 - 'secret_key' => "apidoc#hg_code", - // 授权访问后的有效期 - 'expire' => 24*60*60 - ], - // 全局参数 - 'params'=>[ - // （选配）全局的请求Header - 'header'=>[ - // name=字段名，type=字段类型，require=是否必须，default=默认值，desc=字段描述 - ['name'=>'Authorization','type'=>'string','require'=>true,'desc'=>'身份令牌Token'], - ], - // （选配）全局的请求Query - 'query'=>[ - // 同上 header - ], - // （选配）全局的请求Body - 'body'=>[ - // 同上 header - ], - ], - // 全局响应体 - 'responses'=>[ - // 成功响应体 - 'success'=>[ - ['name'=>'code','desc'=>'业务代码','type'=>'int','require'=>1], - ['name'=>'message','desc'=>'业务信息','type'=>'string','require'=>1], - //参数同上 headers；main=true来指定接口Returned参数挂载节点 - ['name'=>'data','desc'=>'业务数据','main'=>true,'type'=>'object','require'=>1], - ], - // 异常响应体 - 'error'=>[ - ['name'=>'code','desc'=>'业务代码','type'=>'int','require'=>1,'md'=>'/docs/HttpError.md'], - ['name'=>'message','desc'=>'业务信息','type'=>'string','require'=>1], - ] - ], - // （选配）apidoc路由前缀,默认apidoc - 'route_prefix'=>'/apidoc', - //（选配）默认作者 - 'default_author'=>'', - //（选配）默认请求类型 - 'default_method'=>'GET', - //（选配）允许跨域访问 - 'allowCrossDomain'=>false, - /** - * （选配）解析时忽略带@注解的关键词，当注解中存在带@字符并且非Apidoc注解，如 @key test，此时Apidoc页面报类似以下错误时: - * [Semantical Error] The annotation "@key" in method xxx() was never imported. Did you maybe forget to add a "use" statement for this annotation? - */ - 'ignored_annitation'=>[], - - // （选配）数据库配置 - 'database'=>[], - // （选配）Markdown文档 - 'docs' => [], - // （选配）代码生成器配置 注意：是一个二维数组 - 'generator' =>[], - // （选配）代码模板 - 'code_template'=>[], - // （选配）接口分享功能 - 'share'=>[ - // 是否开启接口分享功能 - 'enable'=>false, - // 自定义接口分享操作，二维数组，每个配置为一个按钮操作 - 'actions'=>[] - ], -]; diff --git a/vendor/hg/apidoc/src/config/plugin/hg/apidoc/app.php b/vendor/hg/apidoc/src/config/plugin/hg/apidoc/app.php deleted file mode 100644 index b9be3a7b..00000000 --- a/vendor/hg/apidoc/src/config/plugin/hg/apidoc/app.php +++ /dev/null @@ -1,97 +0,0 @@ - true, - 'apidoc' => [ - // （选配）文档标题，显示在左上角与首页 - 'title' => 'Apidoc', - // （选配）文档描述，显示在首页 - 'desc' => '', - // （必须）设置文档的应用/版本 - 'apps' => [ - [ - // （必须）标题 - 'title'=>'Api接口', - // （必须）控制器目录地址 - 'path'=>'app\controller', - // （必须）唯一的key - 'key'=>'api', - ] - ], - // （必须）指定通用注释定义的文件地址 - 'definitions' => "app\common\controller\Definitions", - // （必须）自动生成url规则，当接口不添加@Apidoc\Url ("xxx")注解时，使用以下规则自动生成 - 'auto_url' => [ - // 字母规则，lcfirst=首字母小写；ucfirst=首字母大写； - 'letter_rule' => "lcfirst", - // url前缀 - 'prefix'=>"", - ], - // （选配）是否自动注册路由 - 'auto_register_routes'=>false, - // （必须）缓存配置 - 'cache' => [ - // 是否开启缓存 - 'enable' => false, - ], - // （必须）权限认证配置 - 'auth' => [ - // 是否启用密码验证 - 'enable' => false, - // 全局访问密码 - 'password' => "123456", - // 密码加密盐 - 'secret_key' => "apidoc#hg_code", - // 授权访问后的有效期 - 'expire' => 24*60*60 - ], - // 全局参数 - 'params'=>[ - // （选配）全局的请求Header - 'header'=>[ - // name=字段名，type=字段类型，require=是否必须，default=默认值，desc=字段描述 - ['name'=>'Authorization','type'=>'string','require'=>true,'desc'=>'身份令牌Token'], - ], - // （选配）全局的请求Query - 'query'=>[ - // 同上 header - ], - // （选配）全局的请求Body - 'body'=>[ - // 同上 header - ], - ], - // 全局响应体 - 'responses'=>[ - // 成功响应体 - 'success'=>[ - ['name'=>'code','desc'=>'业务代码','type'=>'int','require'=>1], - ['name'=>'message','desc'=>'业务信息','type'=>'string','require'=>1], - //参数同上 headers；main=true来指定接口Returned参数挂载节点 - ['name'=>'data','desc'=>'业务数据','main'=>true,'type'=>'object','require'=>1], - ], - // 异常响应体 - 'error'=>[ - ['name'=>'code','desc'=>'业务代码','type'=>'int','require'=>1,'md'=>'/docs/HttpError.md'], - ['name'=>'message','desc'=>'业务信息','type'=>'string','require'=>1], - ] - ], - //（选配）默认作者 - 'default_author'=>'', - //（选配）默认请求类型 - 'default_method'=>'GET', - //（选配）Apidoc允许跨域访问 - 'allowCrossDomain'=>false, - /** - * （选配）解析时忽略带@注解的关键词，当注解中存在带@字符并且非Apidoc注解，如 @key test，此时Apidoc页面报类似以下错误时: - * [Semantical Error] The annotation "@key" in method xxx() was never imported. Did you maybe forget to add a "use" statement for this annotation? - */ - 'ignored_annitation'=>[], - - // （选配）数据库配置 - 'database'=>[], - // （选配）Markdown文档 - 'docs' => [], - // （选配）接口生成器配置 注意：是一个二维数组 - 'generator' =>[] - ] -]; \ No newline at end of file diff --git a/vendor/hg/apidoc/src/config/plugin/hg/apidoc/route.php b/vendor/hg/apidoc/src/config/plugin/hg/apidoc/route.php deleted file mode 100644 index 1b03a1f3..00000000 --- a/vendor/hg/apidoc/src/config/plugin/hg/apidoc/route.php +++ /dev/null @@ -1,3 +0,0 @@ - ['status'=>404,'code' => 4004, 'msg' => '文档已关闭'], - 'password error' => ['status'=>402,'code' => 4002, 'msg' => '密码不正确，请重新输入'], - 'password not found' => ['status'=>402,'code' => 4002, 'msg' => '密码不可为空'], - 'token error' => ['status'=>401,'code' => 4001, 'msg' => '不合法的Token'], - 'token not found' => ['status'=>401,'code' => 4001, 'msg' => '不存在Token'], - 'appkey not found' => ['status'=>412,'code' => 4005, 'msg' => '缺少必要参数appKey'], - 'mdPath not found' => ['status'=>412,'code' => 4006, 'msg' => '缺少必要参数path'], - 'appKey error' => ['status'=>412,'code' => 4007, 'msg' => '不存在 key为${appKey}的apps配置'], - 'template not found' => ['status'=>412,'code' => 4008, 'msg' => '${template}模板不存在'], - 'path not found' => ['status'=>412,'code' => 4009, 'msg' => '${path}目录不存在'], - 'classname error' => ['status'=>412,'code' => 4010, 'msg' => '${classname}文件名不合法'], - 'apiKey not found' => ['status'=>412,'code' => 4011, 'msg' => '缺少必要参数apiKey'], - 'no config apps' => ['status'=>412,'code' => 5000, 'msg' => 'apps配置不可为空'], - 'unknown error' => ['status'=>501,'code' => 5000, 'msg' => '未知异常'], - 'no debug' => ['status'=>412,'code' => 5001, 'msg' => '请在debug模式下，使用该功能'], - 'no config crud' => ['status'=>412,'code' => 5002, 'msg' => 'crud未配置'], - 'datatable crud error' => ['status'=>412,'code' => 5003, 'msg' => '数据表创建失败，请检查配置'], - 'file already exists' => ['status'=>412,'code' => 5004, 'msg' => '${filepath}文件已存在'], - 'file not exists' => ['status'=>412,'code' => 5005, 'msg' => '${filepath}文件不存在'], - 'datatable already exists' => ['status'=>412,'code' => 5004, 'msg' => '数据表${table}已存在'], - 'datatable not exists' => ['status'=>412,'code' => 5004, 'msg' => '数据表${table}不存在'], - 'ref file not exists' => ['status'=>412,'code' => 5005, 'msg' => 'ref引入 ${path} 文件不存在'], - 'ref method not exists' => ['status'=>412,'code' => 5005, 'msg' => 'ref引入${path} 中 ${method} 方法不存在'], - 'datatable create error' => ['status'=>412,'code' => 5006, 'msg' => '数据表[${table}]创建失败,error:${message},sql:${sql}'], - 'field not found' => ['status'=>412,'code' => 5006, 'msg' => '${field}字段不能为空'], - 'share not exists' => ['status'=>404,'code' => 4004, 'msg' => '该分享不存在'], - ]; - - public function __construct(string $exceptionCode, array $data = []) - { - $config = ConfigProvider::get(); - $exception = $this->getException($exceptionCode); - if ($exception){ - $msg = Helper::replaceTemplate($exception['msg'], $data); - }else{ - $exception = $this->exceptions['unknown error']; - $msg = $exceptionCode; - } - parent::__construct($exception['status'], $msg, null, [], $exception['code']); - - } - - public function getException($exceptionCode) - { - if (isset($this->exceptions[$exceptionCode])) { - return $this->exceptions[$exceptionCode]; - } - return null; - } - -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/exception/HttpException.php b/vendor/hg/apidoc/src/exception/HttpException.php deleted file mode 100644 index 9d29f371..00000000 --- a/vendor/hg/apidoc/src/exception/HttpException.php +++ /dev/null @@ -1,33 +0,0 @@ -statusCode = $statusCode; - $this->headers = $headers; - - parent::__construct($message, $code, $previous); - } - - public function getStatusCode() - { - return $this->statusCode; - } - - public function getHeaders() - { - return $this->headers; - } -} diff --git a/vendor/hg/apidoc/src/generator/Index.php b/vendor/hg/apidoc/src/generator/Index.php deleted file mode 100644 index dbfc970e..00000000 --- a/vendor/hg/apidoc/src/generator/Index.php +++ /dev/null @@ -1,358 +0,0 @@ - '', - // 数据库编码，默认为utf8 - 'charset' => 'utf8', - // 数据库引擎，默认为 InnoDB - 'engine' => 'InnoDB', - ]; - - protected $systemDefaultValues = [ - 'CURRENT_TIMESTAMP' - ]; - - public function __construct($config) - { - $this->config = $config; - if (!empty($config['database'])){ - if (!empty($config['database']['prefix'])){ - $this->databaseConfig['prefix'] = $config['database']['prefix']; - } - if (!empty($config['database']['charset'])){ - $this->databaseConfig['charset'] = $config['database']['charset']; - } - if (!empty($config['database']['engine'])){ - $this->databaseConfig['engine'] = $config['database']['engine']; - } - } - } - - public function create($params){ - $appKey = $params['form']['appKey']; - $currentAppConfig = Helper::getCurrentAppConfig($appKey); - $currentApps = $currentAppConfig['apps']; - $currentApp = $currentAppConfig['appConfig']; - $generatorItem = $this->config['generator'][$params['index']]; - - $checkParams = $this->checkFilesAndHandleParams($generatorItem,$params,$currentApps); - $tplParams = $checkParams['tplParams']; - // 注册中间件并执行before - if (!empty($generatorItem['middleware']) && count($generatorItem['middleware'])){ - foreach ($generatorItem['middleware'] as $middleware) { - $instance = new $middleware; - $this->middlewares[] = $instance; - if (method_exists($instance, 'before')) { - $middlewareRes = $instance->before($tplParams); - if (!empty($middlewareRes)){ - $tplParams = $middlewareRes; - } - } - } - } - - $this->createModels($checkParams['createModels'],$tplParams); - $this->createFiles($checkParams['createFiles'],$tplParams); - //执行after - if (count($this->middlewares)){ - foreach ($this->middlewares as $middleware) { - if (method_exists($instance, 'after')) { - $instance->after($tplParams); - } - } - } - return $tplParams; - } - - /** - * 验证文件及处理模板数据 - * @param $generatorItem - * @param $params - * @param $currentApps - * @return array - */ - protected function checkFilesAndHandleParams($generatorItem,$params,$currentApps){ - // 组成模板参数 - $tplParams=[ - 'form'=>$params['form'], - 'tables'=>$params['tables'], - 'app'=>$currentApps - ]; - $createFiles = []; - if (!empty($params['files']) && count($params['files'])>0) { - $files = $params['files']; - foreach ($files as $file) { - $fileConfig = Helper::getArrayFind($generatorItem['files'], function ($item) use ($file) { - if ($file['name'] === $item['name']) { - return true; - } - return false; - }); - - $filePath = $file['path']; - if (!empty($fileConfig['namespace'])) { - $fileNamespace = Helper::replaceCurrentAppTemplate($fileConfig['namespace'], $currentApps); - $fileNamespace = Helper::replaceTemplate($fileNamespace, $params['form'],"form."); - } else { - $fileNamespace = $filePath; - } - $fileNamespaceEndStr = substr($fileNamespace, -1); - if ($fileNamespaceEndStr == '\\') { - $fileNamespace = substr($fileNamespace, 0, strlen($fileNamespace) - 1); - } - $template = Helper::replaceCurrentAppTemplate($fileConfig['template'], $currentApps); - $template = Helper::replaceTemplate($template, $params['form'],"form."); - $tplParams[$file['name']] = [ - 'class_name' => $file['value'], - 'path' => $filePath, - 'namespace' => $fileNamespace, - 'template' => $template - ]; - - // 验证模板是否存在 - $templatePath =DirAndFile::formatPath( APIDOC_ROOT_PATH . $template,"/"); - if (is_readable($templatePath) == false) { - throw new ErrorException("template not found", [ - 'template' => $template - ]); - } - // 验证是否已存在生成的文件 - $fileFullPath = DirAndFile::formatPath(APIDOC_ROOT_PATH . $filePath, "/"); - $type = "folder"; - if (strpos($fileFullPath, '.php') !== false) { - // 路径为php文件，则验证文件是否存在 - if (is_readable($fileFullPath) == false) { - throw new ErrorException("file not exists", [ - 'filepath' => $filePath - ]); - } - $type = "file"; - } else { - $fileName = !empty($file['value']) ? $file['value'] : ""; - $fileFullPath = $fileFullPath . "/" . $fileName . ".php"; - if (is_readable($fileFullPath)) { - throw new ErrorException("file already exists",[ - 'filepath' => DirAndFile::formatPath($filePath) . $fileName . ".php" - ]); - } - } - $createFiles[] = [ - 'fileFullPath' => $fileFullPath, - 'template' => $template, - 'templatePath'=>$templatePath, - 'type' => $type - ]; - } - } - - $createModels = $this->checkModels($generatorItem,$tplParams,$currentApps,$params); - $tplParams['tables'] = $createModels['tables']; - return [ - 'tplParams'=>$tplParams, - 'createFiles'=>$createFiles, - 'createModels' =>$createModels['createModels'] - ]; - } - - /** - * 验证模型及表 - * @param $generatorItem - * @param $tplParams - * @return array - */ - protected function checkModels($generatorItem,$tplParams,$currentApps,$params=[]){ - if (empty($this->config['database_query_function'])){ - throw new ErrorException("not datatable_query_function config"); - } - - $res=""; - $tabls = $tplParams['tables']; - $newTables = []; - $createModels = []; - if (!empty($tabls) && count($tabls)){ - foreach ($tabls as $k=>$table) { - $tableConfig = $generatorItem['table']; - $fileFullPath=""; - if (!empty($table['model_name'])){ - $namespace = Helper::replaceCurrentAppTemplate($tableConfig['items'][$k]['namespace'], $currentApps); - $namespace = Helper::replaceTemplate($namespace, $params['form'],"form."); - $path = Helper::replaceCurrentAppTemplate($tableConfig['items'][$k]['path'], $currentApps); - $path = Helper::replaceTemplate($path, $params['form'],"form."); - $template = $tableConfig['items'][$k]['template']; - - // 验证模板是否存在 - $templatePath = DirAndFile::formatPath(APIDOC_ROOT_PATH . $template,"/"); - if (is_readable($templatePath) == false) { - throw new ErrorException("template not found", [ - 'template' => $template - ]); - } - $tplParams['tables'][$k]['class_name'] =$table['model_name']; - // 验证模型是否已存在 - $fileName = $table['model_name']; - $fileFullPath = DirAndFile::formatPath(APIDOC_ROOT_PATH.$path). "/" . $fileName . ".php"; - if (is_readable($fileFullPath)) { - throw new ErrorException("file already exists", [ - 'filepath' => DirAndFile::formatPath($path) . "/" . $fileName . ".php" - ]); - } - } - // 验证表是否存在 - if ($table['table_name']){ - $table_name = $this->databaseConfig['prefix'].$table['table_name']; - $isTable = $this->config['database_query_function']('SHOW TABLES LIKE '."'".$table_name."'"); - if ($isTable){ - throw new ErrorException("datatable already exists", [ - 'table' => $table_name - ]); - } - } - $table['namespace']=$namespace; - $table['path']=$path; - $table['model_path']=$path; - $newTables[]=$table; - $createModels[]=[ - 'namespace'=>$namespace, - 'template'=>$template, - 'path'=>$path, - 'templatePath' =>$templatePath, - 'table'=>$table, - 'fileFullPath'=>$fileFullPath - ]; - } - } - return ['createModels'=>$createModels,'tables'=>$newTables]; - - } - - /** - * 创建文件 - * @param $createFiles - * @param $tplParams - * @return mixed - */ - protected function createFiles($createFiles,$tplParams){ - - if (!empty($createFiles) && count($createFiles)>0){ - foreach ($createFiles as $fileItem) { - $html = (new ParseTemplate())->compile($fileItem['templatePath'],$tplParams); - if ($fileItem['type'] === "file"){ - // 路径为文件，则添加到该文件 - $pathFileContent = DirAndFile::getFileContent($fileItem['fileFullPath']); - $content = $pathFileContent."\r\n".$html; - DirAndFile::createFile($fileItem['fileFullPath'],$content); - }else{ - DirAndFile::createFile($fileItem['fileFullPath'],$html); - } - } - } - return $tplParams; - } - - /** - * 创建模型文件 - * @param $createModels - * @param $tplParams - */ - protected function createModels($createModels,$tplParams){ - if (!empty($createModels) && count($createModels)>0){ - foreach ($createModels as $k=>$item) { - $table = $item['table']; - if (!empty($table['table_name'])){ - $res = $this->createTable($table); - } - if (!empty($table['model_name'])){ - $tplParams['tables'][$k]['class_name'] =$table['model_name']; - $html = (new ParseTemplate())->compile($item['templatePath'],$tplParams); - DirAndFile::createFile($item['fileFullPath'],$html); - } - - } - } - } - - /** - * 创建数据表 - * @return mixed - */ - protected function createTable($table){ - $datas = $table['datas']; - $comment= ""; - if (!empty($table['table_comment'])){ - $comment =$table['table_comment']; - } - $table_name = $this->databaseConfig['prefix'].$table['table_name']; - $table_data = ''; - $main_keys = ''; - $defaultNullTypes = ['timestamp']; - foreach ($datas as $k=>$item){ - if (!empty($item['not_table_field'])){ - continue; - } - $table_field="`".$item['field']."` ".$item['type']; - if (!empty($item['length'])){ - $table_field.="(".$item['length'].")"; - } - - if (!empty($item['main_key'])){ - $main_keys.=$item['field']; - $table_field.=" NOT NULL"; - }else if (!empty($item['not_null'])){ - $table_field.=" NOT NULL"; - } - if (!empty($item['incremental']) && !empty($item['main_key'])){ - $table_field.=" AUTO_INCREMENT"; - } - if (!empty($item['default']) || (isset($item['default']) && $item['default']=="0")){ - $defaultValue = "'".$item['default']."'"; - if (in_array($item['default'],$this->systemDefaultValues)){ - $defaultValue = $item['default']; - } - $table_field.=" DEFAULT ".$defaultValue.""; - }else if (!empty($item['main_key']) && !$item['not_null']){ - $table_field.=" DEFAULT NULL"; - }else if (in_array($item['type'],$defaultNullTypes) && empty($item['not_null'])){ - $table_field.=" NULL DEFAULT NULL"; - } - $fh = $k < (count($datas)-1)?",":""; - $table_field.=" COMMENT '".$item['desc']."'".$fh; - $table_data.=$table_field; - } - $primaryKey = ""; - if (!empty($main_keys)){ - $table_data.=","; - $primaryKey = "PRIMARY KEY (`$main_keys`)"; - } - - $charset = $this->databaseConfig['charset']; - $engine = $this->databaseConfig['engine']; - $sql = "CREATE TABLE IF NOT EXISTS `$table_name` ( - $table_data - $primaryKey - ) ENGINE=$engine DEFAULT CHARSET=$charset COMMENT='$comment' AUTO_INCREMENT=1 ;"; - - try { - $this->config['database_query_function']($sql); - return true; - } catch (\Exception $e) { - throw new ErrorException("datatable create error", [ - 'table' => $table_name, - 'message'=>$e->getMessage(), - 'sql'=>$sql - ]); - } - } -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/generator/ParseTemplate.php b/vendor/hg/apidoc/src/generator/ParseTemplate.php deleted file mode 100644 index 4839a3c3..00000000 --- a/vendor/hg/apidoc/src/generator/ParseTemplate.php +++ /dev/null @@ -1,341 +0,0 @@ -replaceForeach($tplContent,$params); - $tplContent = $this->replaceParams($tplContent,$params); - $tplContent = $this->replaceIf($tplContent,$params); - $tplContent = preg_replace("/\s+\r\n/is", "\r\n", $tplContent); - return $tplContent; - } - - /** - * 替换变量 - * @param $tplContent - * @param $params - * @return array|string|string[]|null - */ - protected function replaceParams($tplContent,$params){ - $key = '{$%%}'; - $pattern = '#' . str_replace('%%', '(.+?)' , preg_quote($key, '#')) . '#'; - $tplContent = preg_replace_callback($pattern, function ($matches)use ($params){ - $k = $matches[1]; - if (strpos($k, '(') !== false){ - $tagArr = explode("(", $k); - $fun = $tagArr[0]; - $k = str_replace(")", "",$tagArr[1] ); - $v = $this->getObjectValueByKeys($params,$k); - if (empty($v)){ - return ""; - } - if ($fun === "lower"){ - return Helper::lower($v); - }else if ($fun === "snake"){ - return Helper::snake($v); - }else if ($fun === "lcfirst"){ - return lcfirst($v); - }else if ($fun === "ucfirst"){ - return ucfirst($v); - }else if ($fun === "count"){ - return count($v); - } - } - $value = $this->getObjectValueByKeys($params,$k); - if (is_bool($value)){ - return $value==true?'true':'false'; - }else if (is_array($value)){ - return $k; - } - return $value; - }, $tplContent); - return $tplContent; - } - - /** - * 替换if内容 - * @param $tplContent - * @param $params - * @return array|mixed|string|string[] - * @throws \Exception - */ - protected function replaceIf($tplContent,$params){ - $res = []; - $label = "if"; - $labelList = $this->parseLabel($tplContent,$label); - if (!empty($labelList) && count($labelList)>0){ - foreach ($labelList as $item) { - $itemStr =$item; - $ifChildren= $this->parseLabel($itemStr,$label,"children"); - - if (!empty($ifChildren) && count($ifChildren)>0){ - foreach ($ifChildren as $ifChild){ - $itemChildrenContent= $this->getIfContent($ifChild); - $itemStr = str_replace($ifChild, $itemChildrenContent,$itemStr ); - } - } - $itemContent= $this->getIfContent($itemStr); - $tplContent = str_replace($item, $itemContent,$tplContent ); - } - } - - return $tplContent; - } - protected function parseForeach($str,$params){ - if (preg_match('#{foreach (.+?) as (.+?)=>(.+?)}#s', $str, $matches)){ - $complete = $matches[0]; - $condition = $matches[1]; - $keyField = str_replace("$", "",$matches[2] ); - $itemField = str_replace("$", "",$matches[3] ); - $conditionKey = str_replace("$", "",$condition ); - $forListData = $this->getObjectValueByKeys($params,$conditionKey); - $contentStr = str_replace($complete, "",$str); - $contentStr = substr($contentStr,0,-10); - return [ - 'list'=>$forListData, - 'keyField'=>$keyField, - 'itemField'=>$itemField, - 'content'=>$contentStr - ]; - } - return []; - } - - /** - * 获取所有foreach标签 - * @param $str - * @return array - * @throws \Exception - */ - protected function getAllForeachLabel($str){ - $tree = []; - $label = "foreach"; - $labelList = $this->parseLabel($str,$label); - if (!empty($labelList) && count($labelList)>0){ - foreach ($labelList as $itemLabel) { - $labelChildrenList = $this->parseLabel($itemLabel,$label,"children"); - if (!empty($labelChildrenList) && count($labelChildrenList)>0){ - $childrenList = []; - foreach ($labelChildrenList as $item) { - $childrenList[]=[ - 'str'=>$item, - 'children' => [] - ]; - } - $tree[]=[ - 'str'=>$itemLabel, - 'children' => $childrenList - ]; - }else{ - $tree[]=[ - 'str'=>$itemLabel, - 'children' => [] - ]; - } - } - } - return $tree; - } - // 解析foreach - protected function replaceForeach($html,$params,$level=""){ - $allLabelData= $this->getAllForeachLabel($html); - $res = []; - if (count($allLabelData)>0){ - // 遍历每个foreach标签 - foreach ($allLabelData as $labelItem) { - $itemStr = $labelItem['str']; - $forOption = $this->parseForeach($labelItem['str'],$params); - $itemContent=""; - if (!empty($forOption['list']) && count($forOption['list'])>0){ - // 处理每行数据 - foreach ($forOption['list'] as $rowKey=>$row) { - $rowData = [$forOption['itemField']=>$row,$forOption['keyField']=>$rowKey]; - $rowParams = array_merge($params,$rowData); - // 存在子标签，处理子标签 - if (!empty($labelItem['children']) && count($labelItem['children'])>0){ - $itemStrContent = ""; - foreach ($labelItem['children'] as $childLabel){ - $childContents = ""; - $childStr = $childLabel['str']; - $childDataList = $this->parseForeach($childLabel['str'],$rowParams); - // 处理子标签数据 - if (!empty($childDataList['list']) && count($childDataList['list'])>0){ - foreach ($childDataList['list'] as $childDataKey=>$childDataItem) { - // 子标签每行数据 - $childDataItemData = [$childDataList['itemField']=>$childDataItem,$childDataList['keyField']=>$childDataKey,]; - $contentsStr= $this->getForContent($childDataList['content'],array_merge($rowParams,$childDataItemData)); - $contentsStr =ltrim($contentsStr,"\r\n"); - if (!empty(Helper::trimEmpty($contentsStr))){ - $childContents.= $contentsStr; - } - } - } - $itemStrContent.= str_replace($childLabel['str'], $childContents,$forOption['content']); - } - $rowContent=$this->replaceParams($itemStrContent,$rowParams); - $itemContentStr=$this->replaceIf($rowContent,$rowParams); - if (!empty(Helper::trimEmpty($itemContentStr))){ - $itemContent.= $itemContentStr; - } - }else{ - $rowContent=$this->getForContent($forOption['content'],$rowParams); - if (empty(Helper::trimEmpty($rowContent))){ - $rowContent= ""; - } - $itemContent.= $rowContent; - } - $itemContent =trim($itemContent,"\r\n"); - } - } - $html = str_replace($labelItem['str'], $itemContent,$html ); - } - } - return $html; - - } - - /** - * 获取foreach内容 - * @param $str - * @param $params - * @return array|mixed|string|string[] - * @throws \Exception - */ - protected function getForContent($str,$params){ - $content = $str; - if (!empty($params)){ - $content = $this->replaceParams($content,$params); - $content = $this->replaceIf($content,$params); - } - return $content; - } - - - /** - * 获取if条件的内容 - * @param $str - * @return mixed|string - */ - protected function getIfContent($str){ - if (preg_match('#{if (.+?)}(.*?){/if}#s', $str, $matches)){ - if (eval("return $matches[1];")){ - // 条件成立 - return $matches[2]; - } - } - return ""; - } - - - /** - * 解析指定标签 - * @param $str - * @param $label - * @param string $level - * @return array - * @throws \Exception - */ - protected function parseLabel($str,$label,$level=""){ - // 后面的 flag 表示记录偏移量 - preg_match_all('!({/?'.$label.' ?}?)!', $str, $matches, PREG_OFFSET_CAPTURE); - // 用数组来模拟栈 - $stack = []; - $top = null; - $result = []; - foreach ($matches[0] as $k=>[$match, $offset]) { - // 当取标签内容时，排除第一个和最后一个标签 - if ($level === 'children' && ($k==0 || $k>=count($matches[0])-1)){ - continue; - } - // 判断匹配到的如果是 开始标签 - if ($match === '{'.$label.' ') { - $stack[] = $offset; - // 记录开始的位置 - if ($top === null) { - $top = $offset; - } - // 如果不是 - } else { - // 从栈底部拿一个出来 - $pop = array_pop($stack); - // 如果取出来的是 null 就说明存在多余的 标签 - if ($pop === null) { - throw new \Exception('语法错误，存在多余的 {/'.$label.'} 标签'); - } - // 如果取完后栈空了 - if (empty($stack)) { - // offset 是匹配到的开始标签(前面)位置，加上内容的长度 - $newOffset = $offset + strlen($match)-$top; - // 从顶部到当前的偏移就是这个标签里的内容 - $result[] = substr($str, $top, $newOffset); - // 重置 top 开始下一轮 - $top = null; - } - } - } - // 如果运行完了，栈里面还有东西，那就说明缺少闭合标签。 - if (!empty($stack)) { - throw new \Exception('语法错误，存在未闭合的 {/'.$label.'} 标签'); - } - return $result; - } - - /** - * 根据keys获取对象中的值 - * @param $array - * @param $keyStr - * @param string $delimiter - * @return mixed|null - */ - public function getObjectValueByKeys($array, $keyStr, $delimiter = '.') - { - $keys = explode($delimiter, $keyStr); - if (preg_match_all('#\[(.+?)]#s', $keyStr, $matches)){ - $value = $array; - if (!empty($matches[1])){ - $matchesIndex=0; - foreach ($keys as $keyItem) { - if (strpos($keyItem, '[') !== false) { - $tagArr = explode("[", $keyItem); - if (!empty($value[$tagArr[0]]) && !empty($value[$tagArr[0]][$matches[1][$matchesIndex]])){ - $value =$value[$tagArr[0]][$matches[1][$matchesIndex]]; - }else{ - $value =null; - break; - } - $matchesIndex=$matchesIndex+1; - }else{ - $value =$value[$keyItem]; - } - } - } - return $value; - }else if (sizeof($keys) > 1) { - $value = $array; - foreach ($keys as $key){ - if (!empty($value[$key])){ - $value = $value[$key]; - }else{ - $value =null; - break; - } - } - return $value; - } else { - return $array[$keyStr] ?? null; - } - } - - -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/middleware/HyperfMiddleware.php b/vendor/hg/apidoc/src/middleware/HyperfMiddleware.php deleted file mode 100644 index 95623726..00000000 --- a/vendor/hg/apidoc/src/middleware/HyperfMiddleware.php +++ /dev/null @@ -1,81 +0,0 @@ -initConfig(); - - if ($request->getMethod() == "GET"){ - $params = $request->getQueryParams(); - }else{ - $params = $request->getParsedBody(); - } - $config = ConfigProvider::get(); - $config['request_params'] = $params; - ConfigProvider::set($config); - return $handler->handle($request); - } - - static function getApidocConfig() - { - $config = config("apidoc"); - if (!(!empty($config['auto_url']) && !empty($config['auto_url']['filter_keys']))){ - $config['auto_url']['filter_keys'] = ['App','Controller']; - } - $config['app_frame'] = "hyperf"; - return $config; - } - - static function registerRoute($route) - { - // TODO: Implement registerRoute() method. - } - - static function databaseQuery($sql) - { - return Db::select($sql); - } - - static function getRootPath() - { - return BASE_PATH."/"; - } - - static function getRuntimePath() - { - return BASE_PATH."/runtime/"; - } - - static function setLang($locale) - { - static::$langLocale = $locale; - } - - static function getLang($lang): string - { - return trans($lang); - } - - static function handleResponseJson($res) - { - return $res; - } - - static function getTablePrefix(){ - return config('databases.default.prefix',''); - } -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/middleware/LaravelMiddleware.php b/vendor/hg/apidoc/src/middleware/LaravelMiddleware.php deleted file mode 100644 index b6ec3b95..00000000 --- a/vendor/hg/apidoc/src/middleware/LaravelMiddleware.php +++ /dev/null @@ -1,17 +0,0 @@ -all(); - $config = ConfigProvider::get(); - $config['request_params'] = $params; - ConfigProvider::set($config); - return $next($request); - } -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/middleware/ThinkPHPMiddleware.php b/vendor/hg/apidoc/src/middleware/ThinkPHPMiddleware.php deleted file mode 100644 index 58e6c56c..00000000 --- a/vendor/hg/apidoc/src/middleware/ThinkPHPMiddleware.php +++ /dev/null @@ -1,17 +0,0 @@ -param(); - $config = ConfigProvider::get(); - $config['request_params'] = $params; - ConfigProvider::set($config); - return $next($request); - } -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/middleware/WebmanMiddleware.php b/vendor/hg/apidoc/src/middleware/WebmanMiddleware.php deleted file mode 100644 index 9eefcb4e..00000000 --- a/vendor/hg/apidoc/src/middleware/WebmanMiddleware.php +++ /dev/null @@ -1,88 +0,0 @@ -initConfig(); - $params = $request->all(); - $config = ConfigProvider::get(); - $config['request_params'] = $params; - ConfigProvider::set($config); - - $response = $request->method() == 'OPTIONS' ? response('') : $handler($request); - if (!empty($config['allowCrossDomain'])){ - // 给响应添加跨域相关的http头 - $response->withHeaders([ - 'Access-Control-Allow-Credentials' => 'true', - 'Access-Control-Allow-Origin' => $request->header('origin', '*'), - 'Access-Control-Allow-Methods' => $request->header('access-control-request-method', '*'), - 'Access-Control-Allow-Headers' => $request->header('access-control-request-headers', '*'), - ]); - } - - return $response; - } - - static function getApidocConfig() - { - $config = config('plugin.hg.apidoc.app.apidoc'); - if (!(!empty($config['auto_url']) && !empty($config['auto_url']['filter_keys']))){ - $config['auto_url']['filter_keys'] = ['app','controller']; - } - $config['app_frame'] = "webman"; - return $config; - } - - static function registerRoute($route) - { - return ""; - } - - static function databaseQuery($sql) - { - return Db::select($sql); - } - - static function getRootPath() - { - return BASE_PATH."/"; - } - - static function getRuntimePath() - { - return BASE_PATH."/runtime/"; - } - - static function setLang($locale) - { - locale($locale); - } - - static function getLang($lang): string - { - return $lang; - } - - static function handleResponseJson($res) - { - return json($res); - } - - static function getTablePrefix(){ - $driver = config('database.default'); - $table_prefix=config('database.connections.'.$driver.'.prefix'); - return $table_prefix; - } -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/parses/ParseAnnotation.php b/vendor/hg/apidoc/src/parses/ParseAnnotation.php deleted file mode 100644 index 0a6e8fad..00000000 --- a/vendor/hg/apidoc/src/parses/ParseAnnotation.php +++ /dev/null @@ -1,218 +0,0 @@ -parser = new AnnotationReader(); - if (!empty($config['ignored_annitation'])){ - foreach ($config['ignored_annitation'] as $item) { - AnnotationReader::addGlobalIgnoredName($item); - } - } - } - /** - * 解析非@注解的文本注释 - * @param $refMethod - * @param $isAll bool 是否获取全部，true则将带@开头的注释也包含 - * @return array|false - */ - public static function parseTextAnnotation($refMethod,$isAll=false): array - { - $annotation = $refMethod->getDocComment(); - if (empty($annotation)) { - return []; - } - if (preg_match('#^/\*\*(.*)\*/#s', $annotation, $comment) === false) - return []; - $comment = trim($comment [1]); - if (preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) - return []; - $data = []; - foreach ($lines[1] as $line) { - $line = trim($line); - if (!empty ($line) && ($isAll===true || ($isAll===false && strpos($line, '@') !== 0))) { - $data[] = $line; - } - } - return $data; - } - - /** - * 根据路径获取类名 - * @param $path - * @return string - */ - protected function getClassName($path){ - $NameArr = explode("\\", $path); - $name = lcfirst($NameArr[count($NameArr) - 1]); - return $name; - } - - /** - * 获取并处理注解参数 - * @param $attrList - * @return array - */ - protected function getParameters($attrList){ - $attrs = []; - foreach ($attrList as $item) { - $value = ""; - if ($item instanceof ReflectionAttribute) { - $name = $this->getClassName($item->getName()); - $params = $item->getArguments(); - if (!empty($params)){ - if (is_array($params) && !empty($params[0]) && is_string($params[0]) && count($params)===1){ - $value = $params[0]; - }else{ - if (!empty($params[0])){ - $paramObj = []; - foreach ($params as $k=>$value) { - $key = $k===0?'name':$k; - $paramObj[$key]=$value; - } - }else{ - $paramObj = $params; - } - $value = $paramObj; - } - } - }else{ - $name = $this->getClassName(get_class($item)); - $valueObj = Helper::objectToArray($item); - if (array_key_exists('name',$valueObj) && count($valueObj)===1){ - $value = $valueObj['name']===null?true: $valueObj['name']; - }else{ - $value = $valueObj; - } - } - if (!empty($attrs[$name]) && is_array($attrs[$name]) && Helper::arrayKeyFirst($attrs[$name])===0){ - $attrs[$name][]=$value; - }else if(!empty($attrs[$name])){ - $attrs[$name] = [$attrs[$name],$value]; - }else{ - $attrs[$name]=$value; - } - } - return $attrs; - } - - /** - * 获取类的注解参数 - * @param ReflectionMethod $refMethod - * @return array - */ - public function getClassAnnotation($refClass){ - if (method_exists($refClass,'getAttributes')){ - $attributes = $refClass->getAttributes(); - }else{ - $attributes = []; - } - $readerAttributes = $this->parser->getClassAnnotations($refClass); - return $this->getParameters(array_merge($attributes,$readerAttributes)); - } - - /** - * 获取方法的注解参数 - * @param ReflectionMethod $refMethod - * @return array - */ - public function getMethodAnnotation(ReflectionMethod $refMethod){ - if (method_exists($refMethod,'getAttributes')){ - $attributes = $refMethod->getAttributes(); - }else{ - $attributes = []; - } - $readerAttributes = $this->parser->getMethodAnnotations($refMethod); - return $this->getParameters(array_merge($attributes,$readerAttributes)); - } - - /** - * 获取属性的注解参数 - * @param $property - * @return array - */ - public function getPropertyAnnotation($property){ - if (method_exists($property,'getAttributes')){ - $attributes = $property->getAttributes(); - }else{ - $attributes = []; - } - $readerAttributes = $this->parser->getPropertyAnnotations($property); - return $this->getParameters(array_merge($attributes,$readerAttributes)); - } - - /** - * 解析类的属性文本注释的var - * @param $propertyTextAnnotations - * @return array - */ - protected static function parsesPropertyTextAnnotation($propertyTextAnnotations){ - $varLine = ""; - foreach ($propertyTextAnnotations as $item) { - if (strpos($item, '@var') !== false){ - $varLine = $item; - break; - } - } - $type = ""; - $desc = ""; - if ($varLine){ - $varLineArr = preg_split('/\\s+/', $varLine); - $type = !empty($varLineArr[1])?$varLineArr[1]:""; - $desc = !empty($varLineArr[2])?$varLineArr[2]:""; - } - if (empty($desc) && strpos($propertyTextAnnotations[0], '@var') === false){ - $desc = $propertyTextAnnotations[0]; - } - return [ - 'type'=>$type, - 'desc'=>$desc, - ]; - } - - /** - * 获取类的属性参数 - * @param $classReflect - * @return array - */ - public function getClassPropertiesy($classReflect){ - $publicProperties = $classReflect->getProperties(\ReflectionProperty::IS_PUBLIC); - $arr=[]; - foreach ($publicProperties as $property) { - $propertyAnnotations = $this->getPropertyAnnotation($property); - $item = []; - if (!empty($propertyAnnotations['property'])){ - // 有apidoc注解 - $arr[] = $propertyAnnotations['property']; - continue; - } - $propertyTextAnnotations = self::parseTextAnnotation($property,true); - if (empty($propertyTextAnnotations)){ - // 无注释 - continue; - } - $textAnnotationsParams=static::parsesPropertyTextAnnotation($propertyTextAnnotations); - $textAnnotationsParams['name'] =$property->getName(); - $arr[]=$textAnnotationsParams; - } - return $arr; - } - - - -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/parses/ParseApiDetail.php b/vendor/hg/apidoc/src/parses/ParseApiDetail.php deleted file mode 100644 index bb602e3f..00000000 --- a/vendor/hg/apidoc/src/parses/ParseApiDetail.php +++ /dev/null @@ -1,743 +0,0 @@ -config = $config; - } - - /** - * 生成api接口数据 - * @param string $appKey - * @param string $apiKey - * @return array - */ - public function renderApiDetail(string $appKey,string $apiKey) - { - - $this->appKey = $appKey; - $pathArr = explode("@", $apiKey); - $classPath = $pathArr[0]; - $methodName = $pathArr[1]; - $currentAppConfig = Helper::getCurrentAppConfig($appKey); - $this->currentApp = $currentAppConfig['appConfig']; - - try { - $refClass = new ReflectionClass($classPath); - $refMethod= $refClass->getMethod($methodName); - $methodItem = $this->parseApiMethod($refClass,$refMethod); - return $methodItem; - } catch (\ReflectionException $e) { - throw new ErrorException($e->getMessage()); - } - } - - - public function parseApiMethod($refClass,$refMethod,$currentAppData = null){ - $config = $this->config; - if (!empty($currentAppData)){ - $currentApp = $currentAppData; - $this->currentApp = $currentAppData; - $this->appKey = $currentAppData['appKey']; - }else{ - $currentApp = $this->currentApp; - - } - if (empty($refMethod->name)) { - return []; - } - $classTextAnnotations = ParseAnnotation::parseTextAnnotation($refClass); - $classAnnotations = (new ParseAnnotation($config))->getClassAnnotation($refClass); - - $textAnnotations = ParseAnnotation::parseTextAnnotation($refMethod); - // 标注不解析的方法 - if (in_array("NotParse", $textAnnotations)) { - return []; - } - $methodAnnotations = $this->getMethodAnnotation($refMethod); - $methodAnnotations = self::handleApiBaseInfo($methodAnnotations,$refClass->name,$refMethod->name,$textAnnotations,$config); - // 是否开启debug - if ( - in_array("NotDebug", $textAnnotations) || - (isset($config['notDebug']) && $config['notDebug']===true) || - (isset($currentApp['notDebug']) && $currentApp['notDebug']===true) || - isset($methodAnnotations['notDebug']) || - in_array("NotDebug", $classTextAnnotations) || - isset($classAnnotations['notDebug']) - ) { - $methodAnnotations['notDebug'] = true; - } - - if(!empty($methodAnnotations['md'])){ - $methodAnnotations['md'] = $this->getFieldMarkdownContent($methodAnnotations['md']); - } - if(!empty($methodAnnotations['responseSuccessMd'])){ - $methodAnnotations['responseSuccessMd'] = $this->getFieldMarkdownContent($methodAnnotations['responseSuccessMd']); - } - if(!empty($methodAnnotations['responseErrorMd'])){ - $methodAnnotations['responseErrorMd'] = $this->getFieldMarkdownContent($methodAnnotations['responseErrorMd']); - } - - // 合并全局请求参数-header - if ( - ( - (!empty($config['params']) && !empty($config['params']['header'])) || - (!empty($currentApp['params']) && !empty($currentApp['params']['header'])) - ) && - !in_array("NotHeaders", $textAnnotations) && - !isset($methodAnnotations['notHeaders']) - ) - { - $headers = !empty($methodAnnotations['header'])?$methodAnnotations['header']:[]; - $methodAnnotations['header'] = $this->mergeGlobalOrAppParams($headers,'header'); - } - - // 合并全局请求参数-query - if ( - ( - (!empty($config['params']) && !empty($config['params']['query'])) || - (!empty($this->currentApp['params']) && !empty($this->currentApp['params']['query'])) - ) && - !in_array("NotQuerys", $textAnnotations) && - !isset($methodAnnotations['notQuerys']) - ) - { - $querys = !empty($methodAnnotations['query'])?$methodAnnotations['query']:[]; - $methodAnnotations['query'] = $this->mergeGlobalOrAppParams($querys,'query'); - } - - // 合并全局请求参数-body - if ( - ( - (!empty($config['params']) && !empty($config['params']['body'])) || - (!empty($this->currentApp['params']) && !empty($this->currentApp['params']['body'])) - ) && - !in_array("NotParams", $textAnnotations) && - !isset($methodAnnotations['notParams']) - ) - { - $params = !empty($methodAnnotations['param'])?$methodAnnotations['param']:[]; - $methodAnnotations['param'] = $this->mergeGlobalOrAppParams($params,'body'); - } - - //添加成功响应体 - $methodAnnotations['responseSuccess'] = $this->handleApiResponseSuccess($methodAnnotations,$textAnnotations); - //添加异常响应体 - $methodAnnotations['responseError'] = $this->handleApiResponseError($methodAnnotations,$textAnnotations); - - // 合并全局事件after - if ( - ( - (!empty($config['debug_events']) && !empty($config['debug_events']['after'])) || - (!empty($this->currentApp['debug_events']) && !empty($this->currentApp['debug_events']['after'])) - ) && - !in_array("NotEvent", $textAnnotations)) - { - $debugAfterEvents = !empty($methodAnnotations['after'])?$methodAnnotations['after']:[]; - $methodAnnotations['after'] = $this->mergeGlobalOrAppEvents($debugAfterEvents,'after'); - } - - // 合并全局事件before - if ( - ( - (!empty($config['debug_events']) && !empty($config['debug_events']['before'])) || - (!empty($this->currentApp['debug_events']) && !empty($this->currentApp['debug_events']['before'])) - ) && - !in_array("NotEvent", $textAnnotations)) - { - $debugBeforeEvents = !empty($methodAnnotations['before'])?$methodAnnotations['before']:[]; - $methodAnnotations['before'] = $this->mergeGlobalOrAppEvents($debugBeforeEvents,'before'); - } - - return $methodAnnotations; - } - - /** - * 获取md注解内容 - * @param $mdAnnotations - * @return mixed|string - */ - protected function getFieldMarkdownContent($mdAnnotations){ - if(!empty($mdAnnotations['name'])){ - return $mdAnnotations['name']; - }else if(!empty($mdAnnotations['ref'])){ - return ParseMarkdown::getContent($this->appKey,$mdAnnotations['ref']); - } - return $mdAnnotations; - } - - /** - * 获取方法的注解，并处理参数 - * @param $refMethod - * @param string $refField ref时指定处理的参数 - * @return array - */ - protected function getMethodAnnotation($refMethod,$refField=""){ - $annotations = (new ParseAnnotation($this->config))->getMethodAnnotation($refMethod); - // 需要处理的注解字段 - if (!empty($refField)){ - $handleFields = [$refField]; - }else{ - $handleFields = ["header","query","param","routeParam","returned","before","after","responseSuccess","responseError"]; - } - foreach ($handleFields as $field) { - if (!empty($annotations[$field])){ - $annotations[$field]=$this->handleMethodParams($annotations[$field],$field); - } - } - return $annotations; - } - - - protected function mergeGlobalOrAppParams($params,$paramType='param'){ - $config = $this->config; - $currentApp = $this->currentApp; - $globalParams = []; - if (!empty($currentApp['params']) && !empty($currentApp['params'][$paramType])){ - // 不合并global的处理方式 - $globalParams = $currentApp['params'][$paramType]; - // 合并global的处理方式 - // $globalHeaders = Helper::arrayMergeAndUnique("name", $globalHeaders, $this->currentApp['params'][$paramType]); - }else if(!empty($config['params']) && !empty($config['params'][$paramType])){ - $globalParams = $config['params'][$paramType]; - } - - if (!empty($params) && count($params) && count($globalParams)) { - return Helper::arrayMergeAndUnique("name", $globalParams, $params); - } - return $globalParams; - } - - protected function mergeGlobalOrAppEvents($events,$eventType='after'){ - $config = $this->config; - $globalEvents = []; - if (!empty($this->currentApp['debug_events']) && !empty($this->currentApp['debug_events'][$eventType])){ - $globalEvents = $this->currentApp['debug_events'][$eventType]; - }else if(!empty($config['debug_events']) && !empty($config['debug_events'][$eventType])){ - $globalEvents = $config['debug_events'][$eventType]; - } - $mergeEvents = []; - foreach ($globalEvents as $item){ - if (!empty($item['desc'])){ - $item['desc'] = Lang::getLang($item['desc']); - } - $mergeEvents[] = $item; - } - if (!empty($events) && count($events)){ - foreach ($events as $event) { - $mergeEvents[] = $event; - } - } - return $mergeEvents; - } - - /** - * 处理接口成功响应参数 - * @param $methodAnnotations - * @param $textAnnotations - * @return array|mixed - */ - protected function handleApiResponseSuccess($methodAnnotations,$textAnnotations){ - $returned = !empty($methodAnnotations['returned'])?$methodAnnotations['returned']:""; - $currentApp = $this->currentApp; - $config = $this->config; - $mergeParams = []; - $paramType='success'; - if ( - in_array("NotResponses", $textAnnotations) || - in_array("NotResponseSuccess", $textAnnotations) || - isset($methodAnnotations['notResponses']) || - isset($methodAnnotations['notResponseSuccess']) - ) { - // 注解了不使用全局响应 - $mergeParams = []; - }else if (!empty($currentApp['responses']) && !empty($currentApp['responses'][$paramType])){ - $mergeParams = $currentApp['params'][$paramType]; - }else if(!empty($config['responses']) && !empty($config['responses'][$paramType])){ - $mergeParams = $config['responses'][$paramType]; - } - - if (!empty($methodAnnotations['responseSuccess'])){ - if (!is_int(Helper::arrayKeyFirst($methodAnnotations['responseSuccess']))){ - $methodResponseSuccess = [$methodAnnotations['responseSuccess']]; - }else{ - $methodResponseSuccess = $methodAnnotations['responseSuccess']; - } - $mergeParams = Helper::arrayMergeAndUnique("name", $mergeParams,$methodResponseSuccess); - } - - return $this->mergeResponseSuccessParam($mergeParams,$returned); - - } - - protected function mergeResponseSuccessParam($mergeParams,$returned){ - if (!empty($mergeParams) && count($mergeParams)){ - $resData = []; - foreach ($mergeParams as $item) { - if (!empty($item['main']) && $item['main'] === true){ - $item['children'] = $returned; - } - //支持到二级的挂载 - if (isset($item['children']) && !empty($item['children'])) { - $item['children'] = $this->mergeResponseSuccessParam($item['children'],$returned); - } - if (!empty($item['desc'])){ - $item['desc'] = Lang::getLang($item['desc']); - } - if (!empty($item['md'])){ - $item['md'] = ParseMarkdown::getContent($this->appKey,$item['md']); - } - $resData[]=$item; - } - return $resData; - } - return $returned; - } - - /** - * 处理接口异常响应参数 - * @param $methodAnnotations - * @param $textAnnotations - * @return array|mixed|void - */ - protected function handleApiResponseError($methodAnnotations,$textAnnotations){ - $config = $this->config; - $currentApp = $this->currentApp; - $responseErrors = []; - $paramType = "error"; - $mergeParams = []; - if ( - in_array("NotResponses", $textAnnotations) || - in_array("NotResponseError", $textAnnotations) || - isset($methodAnnotations['notResponses']) || - isset($methodAnnotations['notResponseError']) - ) { - // 注解了不使用全局响应 - $mergeParams = []; - }else if (!empty($currentApp['responses']) && !empty($currentApp['responses'][$paramType])){ - $mergeParams = $currentApp['params'][$paramType]; - }else if(!empty($config['responses']) && !empty($config['responses'][$paramType])){ - $mergeParams = $config['responses'][$paramType]; - } - - if (!empty($methodAnnotations['responseError'])){ - if (!is_int(Helper::arrayKeyFirst($methodAnnotations['responseError']))){ - $methodResponseError = [$methodAnnotations['responseError']]; - }else{ - $methodResponseError = $methodAnnotations['responseError']; - } - $mergeParams = Helper::arrayMergeAndUnique("name", $mergeParams,$methodResponseError); - } - - if (!empty($mergeParams) && count($mergeParams)){ - $resData = []; - foreach ($mergeParams as $item) { - $item['desc'] = Lang::getLang($item['desc']); - if (!empty($item['md'])){ - $item['md'] = ParseMarkdown::getContent($this->appKey,$item['md']); - } - $resData[]=$item; - } - return $resData; - } - return []; - } - - - - public static function handleApiBaseInfo($methodInfo,$className,$methodName,$textAnnotations,$config){ - // 无标题，且有文本注释 - if (empty($methodInfo['title']) && !empty($textAnnotations) && count($textAnnotations) > 0) { - $methodInfo['title'] = Lang::getLang($textAnnotations[0]); - }else if (!empty($methodInfo['title'])){ - $methodInfo['title'] = Lang::getLang($methodInfo['title']); - } - - // 默认method - if (!empty($methodInfo['method'])) { - $apiMethods = Helper::handleApiMethod($methodInfo['method']); - $methodInfo['method'] = count($apiMethods)==1?$apiMethods[0]:$apiMethods; - }else{ - $methodInfo['method'] = !empty($config['default_method']) ? strtoupper($config['default_method']) : '*'; - } - - // 默认default_author - if ( - empty($methodInfo['author']) && - !empty($config['default_author']) && - !in_array("NotDefaultAuthor", $textAnnotations) && - !isset($methodInfo['notDefaultAuthor']) - ) { - $methodInfo['author'] = $config['default_author']; - } - - if (!empty($methodInfo['tag'])){ - $methodInfo['tag'] = static::handleTags($methodInfo['tag']); - } - // 无url,自动生成 - if (empty($methodInfo['url'])) { - $methodInfo['url'] = static::autoCreateUrl($className,$methodName,$config); - } else if (!empty($methodInfo['url']) && is_string($methodInfo['url']) && substr($methodInfo['url'], 0, 1) != "/") { - $methodInfo['url'] = "/" . $methodInfo['url']; - } - $methodInfo['name'] = $methodName; - $methodInfo['menuKey'] = Helper::createApiKey($className,$methodName); - return $methodInfo; - } - - /** - * 处理方法的注解参数 - * @param $params array 注解参数 - * @param $field string 指定处理的参数字段名 - * @return array - */ - protected function handleMethodParams($params,$field){ - // 不处理合并的注解字段 - $notMergeNameFields=['before','after']; - $data=[]; - if (!empty($params)){ - // 处理单个注解为对象的参数 - if (!is_int(Helper::arrayKeyFirst($params))){ - $params = [$params]; - } - foreach ($params as $param) { - $item=$this->handleAnnotationsParamItem($param,$field); - if (!empty($item) && is_int(Helper::arrayKeyFirst($item))){ - if (in_array($field,$notMergeNameFields)){ - $data = $item; - }else{ - $data = Helper::arrayMergeAndUnique("name",$data,$item); - } - }else if ($item!==false){ - $data[]=$item; - } - } - } - return $data; - } - - - /** - * 处理注解某一参数 - * @param $param array 参数 - * @param $field string 处理的字段名 - * @return array|array[]|mixed - */ - protected function handleAnnotationsParamItem($param,$field){ - // 事件字段，不处理ref的数据过滤 - $eventFields=['before','after']; - $data = []; - if (!empty($param['ref'])){ - $refParams = $this->renderRef($param['ref'],$field); - if (!empty($refParams[$field])){ - if (in_array($field,$eventFields)){ - $data=$refParams[$field]; - }else{ - $data = $this->handleRefData($param,$refParams[$field],$field); - } - }else{ - return false; - } - }else if(!empty($param['table'])){ - $tableParams = (new ParseModel($this->config))->getTableDocument($param['table'],[]); - $data = $this->handleRefData($param,$tableParams,$field); - } else{ - $data = $param; - } - if (!empty($data['desc'])){ - $data['desc'] = Lang::getLang($data['desc']); - } - if (!empty($data['md'])){ - $data['md'] = ParseMarkdown::getContent($this->appKey,$data['md']); - } - if (!empty($data['children']) && is_array($data['children'])){ - $childrenData = []; - foreach ($data['children'] as $child) { - $paramItem=$this->handleAnnotationsParamItem($child,$field); - - if ($paramItem!==false){ - if (!empty($paramItem) && is_array($paramItem) && Helper::arrayKeyFirst($paramItem)===0){ - $childrenData = Helper::arrayMergeAndUnique("name",$childrenData,$paramItem); - }else{ - $childrenData[] = $paramItem; - } - } - } - $data['children'] = $childrenData; - } - if (!empty($data['type']) && $data['type'] === 'tree' ) { - // 类型为tree的 - $data['children'][] = [ - 'children' => $data['children'], - 'name' =>!empty($data['childrenField']) ?$data['childrenField']:'children', - 'type' => 'array', - 'desc' => !empty($data['childrenDesc'])?Lang::getLang($data['childrenDesc']):"", - ]; - } - - // 自定义解析 - if (!empty($this->config['parsesAnnotation'])){ - $callback = $this->config['parsesAnnotation']($data); - if (!empty($callback)){ - $data = $callback; - } - } - return $data; - } - - public static function handleTags($tagStr){ - if (!empty($tagStr)) { - $tagStr = Lang::getLang($tagStr); - $tagList = []; - if (is_string($tagStr) && strpos($tagStr, ',') !== false) { - $tagArr = explode(",", $tagStr); - foreach ($tagArr as $tag) { - $tagList[]=Lang::getLang($tag); - } - } else { - $tagList = [Lang::getLang($tagStr)]; - } - return $tagList; - } - return $tagStr; - } - - /** - * 自动生成url - * @param $method - * @return string - */ - public static function autoCreateUrl($className,$methodName,$config): string - { - - $pathArr = explode("\\", $className); - $filterPathNames = !empty($config['auto_url']) && !empty($config['auto_url']['filter_keys'])?$config['auto_url']['filter_keys']:[]; - $classUrlArr = []; - foreach ($pathArr as $item) { - if (!in_array($item, $filterPathNames)) { - if (!empty($config['auto_url'])){ - $key = $item; - if (!empty($config['auto_url']['letter_rule'])){ - switch ($config['auto_url']['letter_rule']) { - case 'lcfirst': - $key = lcfirst($item); - break; - case 'ucfirst': - $key = ucfirst($item); - break; - default: - $key = $item; - } - } - if (!empty($config['auto_url']['handle_key'])){ - $classUrlArr[] = $config['auto_url']['handle_key']($key); - }else{ - $classUrlArr[] = $key; - } - }else{ - $classUrlArr[] = $item; - } - } - } - $classUrl = implode('/', $classUrlArr); - $prefix = !empty($config['auto_url']) && !empty($config['auto_url']['prefix'])?$config['auto_url']['prefix']:""; - $url = $prefix . '/' . $classUrl . '/' . $methodName; - if (!empty($config['auto_url']) && !empty($config['auto_url']['custom']) && is_callable($config['auto_url']['custom'])){ - return $config['auto_url']['custom']($className,$methodName,$url); - } - return $url; - } - - /** - * ref引用 - */ - public function renderRef($refPath,$field): array - { - $res = ['type' => 'model']; - $config = $this->config; - $methodName =""; - if (is_string($refPath)){ - if (strpos($refPath, '\\') === false) { - // 引入通用注解 - $classPath = $config['definitions']; - $methodName = $refPath; - }else if (class_exists($refPath)) { - // use类 - $classPath = $refPath; - }else if (strpos($refPath, '@') !== false){ - // 带@指定方法 - $pathArr = explode("@", $refPath); - $classPath = $pathArr[0]; - $methodName = $pathArr[1]; - }else{ - // 直接指定方法 - $pathArr = explode("\\", $refPath); - $methodName = $pathArr[count($pathArr) - 1]; - unset($pathArr[count($pathArr) - 1]); - $classPath = implode("\\", $pathArr); - } - }else if(is_array($refPath)){ - $classPath = $refPath[0]; - $methodName = !empty($refPath[1])?$refPath[1]:""; - }else{ - // 未知ref - } - try { - $modelClass = ParseModel::getModelClass($classPath); - $classReflect = new \ReflectionClass($classPath); - if (!empty($modelClass)){ - // 模型解析 - $modelParams = (new ParseModel($config))->parseModelTable($modelClass,$classReflect,$methodName); - return [$field=>$modelParams]; - }else{ - // 类ref引用 - if (!empty($methodName)){ - // 指定引入类的方法注解 - $methodName = trim($methodName); - $refMethod = $classReflect->getMethod($methodName); - $res = $this->getMethodAnnotation($refMethod,$field); - return $res; - }else{ - // 类的参数property - $private_properties = (new ParseAnnotation($config))->getClassPropertiesy($classReflect); - return [$field=>$private_properties]; - } - } - - } catch (\ReflectionException $e) { - throw new ErrorException($e->getMessage()); - } - } - - - - public function handleRefData($annotation,$refParams, string $field): array - { - // 过滤field - if (!empty($annotation['field'])) { - $refParams = static::filterParamsField($refParams, $annotation['field'], 'field'); - } - // 过滤withoutField - if (!empty($annotation['withoutField'])) { - $refParams = static::filterParamsField($refParams, $annotation['withoutField'], 'withoutField'); - } - - if (!empty($annotation['name'])) { - if (!empty($annotation['children'])) { - $annotation['children'] = Helper::arrayMergeAndUnique("name",$refParams,$annotation['children']); - }else{ - $annotation['children'] = $refParams; - } - return $annotation; - } -// else{ -// if (!empty($annotation[$field])) { -// $annotation[$field] = Helper::arrayMergeAndUnique("name",$refParams,$annotation[$field]); -// } -// } - return $refParams; - } - - - - - - public function handleEventAnnotation($annotation,$type){ - $config = $this->config; - if (!empty($annotation->ref)){ - if (strpos($annotation->ref, '\\') === false && !empty($config['definitions']) ) { - $refPath = $config['definitions'] . '\\' . $annotation->ref; - $data = $this->renderService($refPath); - if (!empty($data[$type])){ - return $data[$type]; - } - return []; - } - } - if (!empty($annotation->value) && is_array($annotation->value)){ - $beforeInfo = Helper::objectToArray($annotation); - $valueList = []; - foreach ($annotation->value as $valueItem){ - $valueItemInfo = Helper::objectToArray($valueItem); - if ($valueItem instanceof Before){ - $valueItemInfo['type'] = "before"; - }else if ($valueItem instanceof After){ - $valueItemInfo['type'] = "after"; - } - $valueList[] = $valueItemInfo; - } - $beforeInfo['value'] = $valueList; - return [$beforeInfo]; - } - else if (!empty($annotation->value) && is_object($annotation->value)){ - $valueItemInfo = Helper::objectToArray($annotation->value); - if ($annotation->value instanceof Before){ - $valueItemInfo['type'] = "before"; - }else if ($annotation->value instanceof After){ - $valueItemInfo['type'] = "after"; - } - $annotation->value = [$valueItemInfo]; - return [$annotation]; - }else{ - return [$annotation]; - } - } - - - - /** - * 过滤指定字段、或只取指定字段 - * @param $data 参数 - * @param $fields 指定字段 - * @param string $type 处理类型 - * @return array - */ - public static function filterParamsField(array $data, $fields, string $type = "field"): array - { - if (!empty($fields) && is_string($fields)){ - if (strpos($fields, ',') !== false){ - $fieldArr = explode(',', $fields); - }else{ - $fieldArr = [$fields]; - } - }else if (!empty($fields) && is_array($fields)){ - if (Helper::arrayKeyFirst($fields)=="name"){ - $fieldArr = $fields['name']; - }else{ - $fieldArr = $fields; - } - }else{ - return $data; - } - $dataList = []; - foreach ($data as $item) { - $has = !empty($item['name']) && in_array($item['name'], $fieldArr); - if ($has && $type === 'field') { - $dataList[] = $item; - } else if (!($has) && $type == "withoutField") { - $dataList[] = $item; - } - } - return $dataList; - } - - - -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/parses/ParseApiMenus.php b/vendor/hg/apidoc/src/parses/ParseApiMenus.php deleted file mode 100644 index 6be17ab1..00000000 --- a/vendor/hg/apidoc/src/parses/ParseApiMenus.php +++ /dev/null @@ -1,318 +0,0 @@ -config = $config; - } - - /** - * 生成api接口数据 - * @param string $appKey - * @param bool $isParseDetail 是否解析接口明细 - * @return array - */ - public function renderApiMenus(string $appKey,bool $isParseDetail=false): array - { - $currentAppConfig = Helper::getCurrentAppConfig($appKey); - $currentApp = $currentAppConfig['appConfig']; - $this->currentApp = $currentApp; - - $controllers = []; - if (!empty($currentApp['controllers']) && count($currentApp['controllers']) > 0) { - // 配置的控制器列表 - $controllers = $this->getConfigControllers($currentApp['path'],$currentApp['controllers']); - }else if(!empty($currentApp['path']) && is_array($currentApp['path']) && count($currentApp['path'])){ - // 读取paths的 - foreach ($currentApp['path'] as $path) { - $controllersList = $this->getDirControllers($path); - $controllers = array_merge($controllers,$controllersList); - } - } else if(!empty($currentApp['path']) && is_string($currentApp['path'])){ - // 默认读取path下所有的 - $controllers = $this->getDirControllers($currentApp['path']); - } - $apiData = []; - if (!empty($controllers) && count($controllers) > 0) { - foreach ($controllers as $class) { - $classData = $this->parseController($class,$isParseDetail); - if ($classData !== false) { - $apiData[] = $classData; - } - } - } - // 排序 - $apiList = Helper::arraySortByKey($apiData); - - // 接口分组 - if (!empty($currentApp['groups'])){ - $apiList = ParseApiMenus::mergeApiGroup($apiList,$currentApp['groups']); - } - - $json = array( - "data" => $apiList, - "tags" => $this->tags, - "groups" => $this->groups, - ); - return $json; - } - - /** - * 获取生成文档的控制器列表 - * @param string $path - * @return array - */ - public function getConfigControllers(string $path,$appControllers): array - { - $controllers = []; - if (!empty($appControllers) && count($appControllers) > 0) { - foreach ($appControllers as $item) { - $classPath = $path."\\".$item; - if ( class_exists($classPath)) { - $controllers[] = $classPath; - } - } - } - return $controllers; - } - - /** - * 获取目录下的控制器列表 - * @param string $path - * @return array - */ - public function getDirControllers(string $path): array - { - - if ($path) { - if (strpos(APIDOC_ROOT_PATH, '/') !== false) { - $pathStr = str_replace("\\", "/", $path); - } else { - $pathStr = $path; - } - $dir = APIDOC_ROOT_PATH . $pathStr; - } else { - $dir = APIDOC_ROOT_PATH . $this->controller_layer; - } - $controllers = []; - if (is_dir($dir)) { - $controllers = $this->scanDir($dir, $path); - } - return $controllers; - } - - - - protected function scanDir($dir) { - - $classList= DirAndFile::getClassList($dir); - $list=[]; - - $configFilterController = !empty($this->config['filter_controllers']) ? $this->config['filter_controllers'] : []; - $currentAppFilterController = !empty($this->currentApp['filter_controllers']) ? $this->currentApp['filter_controllers'] : []; - $filterControllers = array_merge($configFilterController,$currentAppFilterController); - - $configFilterDir = !empty($this->config['filter_dirs']) ? $this->config['filter_dirs'] : []; - $currentAppFilterDir = !empty($this->currentApp['filter_dirs']) ? $this->currentApp['filter_dirs'] : []; - $filterDirList = array_merge($configFilterDir,$currentAppFilterDir); - $filterDirs=[]; - foreach ($filterDirList as $dirItem) { - $dirItemPath = DirAndFile::formatPath($dirItem,"/"); - $filterDirs[]=$dirItemPath; - } - - foreach ($classList as $item) { - $classNamespace = $item['name']; - - $isFilterDir = false; - foreach ($filterDirs as $dirItem) { - if (strpos($item['path'], $dirItem) !== false){ - $isFilterDir=true; - } - } - if ($isFilterDir){ - continue; - }else if ( - !in_array($classNamespace, $filterControllers) && - $this->config['definitions'] != $classNamespace - - ) { - $list[] = $classNamespace; - } - } - - return $list; - } - - public function parseController($class,$isParseDetail=false) - { - - $refClass = new ReflectionClass($class); - $classTextAnnotations = ParseAnnotation::parseTextAnnotation($refClass); - $data = (new ParseAnnotation($this->config))->getClassAnnotation($refClass); - if (in_array("NotParse", $classTextAnnotations) || isset($data['notParse'])) { - return false; - } - $controllersName = $refClass->getShortName(); - $data['controller'] = $controllersName; - $data['path'] = $class; - if (!empty($data['group']) && !in_array($data['group'], $this->groups)) { - $this->groups[] = $data['group']; - } - - if (empty($data['title'])) { - if (!empty($classTextAnnotations) && count($classTextAnnotations) > 0) { - $data['title'] = $classTextAnnotations[0]; - } else { - $data['title'] = $controllersName; - } - } - $data['title'] = Lang::getLang($data['title']); - $methodList = []; - $data['menuKey'] = Helper::createRandKey($data['controller']); - $isNotDebug = in_array("NotDebug", $classTextAnnotations) || isset($data['notDebug']); - $parseApiDetail = new ParseApiDetail($this->config); - foreach ($refClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $refMethod) { - if ($isParseDetail){ - $methodItem = $parseApiDetail->parseApiMethod($refClass,$refMethod,$this->currentApp); - }else{ - $methodItem = $this->parseApiMethod($refClass,$refMethod); - } - if ($methodItem===false){ - continue; - } - if ($isNotDebug) { - $methodItem['notDebug'] = true; - } - $methodList[] = $methodItem; - } - $data['children'] = $methodList; - if (count($methodList)===0){ - return false; - } - return $data; - } - - - protected function parseApiMethod($refClass,$refMethod){ - $config = $this->config; - if (empty($refMethod->name)) { - return false; - } - - try { - $textAnnotations = ParseAnnotation::parseTextAnnotation($refMethod); - - $methodInfo = (new ParseAnnotation($this->config))->getMethodAnnotation($refMethod); - // 标注不解析的方法 - if (in_array("NotParse", $textAnnotations) || isset($methodInfo['notParse']) || empty($methodInfo)) { - return false; - } - $methodInfo = ParseApiDetail::handleApiBaseInfo($methodInfo,$refClass->name,$refMethod->name,$textAnnotations,$config); - $methodInfo['appKey'] = !empty($this->currentApp['appKey'])?$this->currentApp['appKey']:""; - return Helper::getArrayValuesByKeys($methodInfo,['title','method','url','author','tag','name','menuKey','appKey']); - }catch (AnnotationException $e) { - throw new ErrorException($e->getMessage()); - } - - } - - - - /** - * 对象分组到tree - * @param $tree - * @param $objectData - * @param string $childrenField - * @return array - */ - public static function objtctGroupByTree($tree,$objectData,$childrenField='children'){ - $data = []; - foreach ($tree as $node){ - if (!empty($node[$childrenField])){ - $node[$childrenField] = static::objtctGroupByTree($node[$childrenField],$objectData); - }else if (!empty($objectData[$node['name']])){ - $node[$childrenField] = $objectData[$node['name']]; - } - $node['menuKey'] = Helper::createRandKey( $node['name']); - $data[] = $node; - } - return $data; - } - - protected static function getAppGroupNames($groups){ - $groupNames = []; - foreach ($groups as $item) { - if (!empty($item['name'])){ - $groupNames[]=$item['name']; - } - if (!empty($item['children']) && count($item['children'])){ - $childrenNames = self::getAppGroupNames($item['children']); - foreach ($childrenNames as $childrenName) { - $groupNames[]=$childrenName; - } - } - } - return $groupNames; - } - - /** - * 合并接口到应用分组 - * @param $apiData - * @param $groups - * @return array - */ - public static function mergeApiGroup($apiData,$groups){ - if (empty($groups) || count($apiData)<1){ - return $apiData; - } - $groupNames = static::getAppGroupNames($groups); - $apiObject = []; - foreach ($apiData as $controller){ - if (!empty($controller['group']) && in_array($controller['group'],$groupNames)){ - if (!empty($apiObject[$controller['group']])){ - $apiObject[$controller['group']][] = $controller; - }else{ - $apiObject[$controller['group']] = [$controller]; - } - }else{ - if (!empty($apiObject['notGroup'])){ - $apiObject['notGroup'][] = $controller; - }else{ - $apiObject['notGroup'] = [$controller]; - } - } - } - if (!empty($apiObject['notGroup'])){ - array_unshift($groups,['title'=>'未分组','name'=>'notGroup']); - } - $res = static::objtctGroupByTree($groups,$apiObject); - return $res; - } -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/parses/ParseCodeTemplate.php b/vendor/hg/apidoc/src/parses/ParseCodeTemplate.php deleted file mode 100644 index 720abae2..00000000 --- a/vendor/hg/apidoc/src/parses/ParseCodeTemplate.php +++ /dev/null @@ -1,100 +0,0 @@ -config = $config; - } - - public function renderCode($params) - { - $appKey = $params['appKey']; - $currentAppConfig = Helper::getCurrentAppConfig($appKey); - $currentApp = $currentAppConfig['appConfig']; - $this->currentApp = $currentApp; - - $codeTemplate = $params['template']; - - //验证参数 - - //验证模板文件是否存在 - - //解析接口数据 - $tplData = []; - if ($codeTemplate['select_mode'] == 'controller'){ - $parseApiMenusService = new ParseApiMenus($this->config); - $controllers = $params['selected']; - if (!empty($controllers) && count($controllers) > 0) { - $controllerList = []; - foreach ($controllers as $class) { - $classData = $parseApiMenusService->parseController($class); - if ($classData !== false) { - $controllerList[] = $classData; - } - } - if (empty($codeTemplate['multiple'])){ - $tplData = $controllerList[0]; - }else{ - $tplData = $controllerList; - } - } - }else{ - // api - $apis = $params['selected']; - if (!empty($apis) && count($apis) > 0) { - $parseApiDetailService = new ParseApiDetail($this->config); - $apiList = []; - foreach ($apis as $key) { - $apiKey = urldecode($key); - $apiDetail = $parseApiDetailService->renderApiDetail($appKey,$apiKey); - if ($apiDetail !== false) { - $apiList[] = $apiDetail; - } - } - if (empty($codeTemplate['multiple'])){ - $tplData = $apiList[0]; - }else{ - $tplData = $apiList; - } - } - } - - - // 读取模板 - $templatePath =DirAndFile::formatPath( APIDOC_ROOT_PATH . $codeTemplate['template'],"/"); - if (is_readable($templatePath) == false) { - throw new ErrorException("template not found", [ - 'template' => $template - ]); - } - $tplParams = [ - 'form'=> $params['form'], - 'data'=>$tplData - ]; - $html = (new ParseTemplate())->compile($templatePath,$tplParams); - - - - return $html; - } - - -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/parses/ParseMarkdown.php b/vendor/hg/apidoc/src/parses/ParseMarkdown.php deleted file mode 100644 index cd9a4a0b..00000000 --- a/vendor/hg/apidoc/src/parses/ParseMarkdown.php +++ /dev/null @@ -1,139 +0,0 @@ -config = $config; - } - - /** - * 获取md文档菜单 - * @return array - */ - public function getDocsMenu($appKey,string $lang): array - { - $config = $this->config; - $docData = []; - if (!empty($config['docs']) && count($config['docs']) > 0) { - $docData = $this->handleDocsMenuData($config['docs'],$appKey,$lang); - } - return $docData; - } - - /** - * 处理md文档菜单数据 - * @param array $menus - * @return array - */ - protected function handleDocsMenuData(array $menus,$appKey,string $lang): array - { - $list = []; - foreach ($menus as $item) { - $item['title'] = Lang::getLang($item['title']); - if (!empty($item['appKey']) && $item['appKey'] != $appKey){ - continue; - } - - if (!empty($item['children']) && count($item['children']) > 0) { - $item['children'] = $this->handleDocsMenuData($item['children'],$appKey,$lang); - $item['menuKey'] = Helper::createRandKey("md_group"); - } else { - $filePath = static::getFilePath($appKey,$item['path'],$lang); - if (!file_exists($filePath['filePath'])) { - continue; - } - - if(!empty($item['path'])){ - $item['path'] = Helper::replaceTemplate($item['path'],['lang'=>$lang]); - } - $item['type'] = 'md'; - $item['menuKey'] = Helper::createApiKey($item['path']); - } - $list[] = $item; - } - return $list; - } - - public static function getFilePath(string $appKey, string $path,$lang=""){ - if (!empty($appKey)){ - $currentAppConfig = Helper::getCurrentAppConfig($appKey); - $currentApps = $currentAppConfig['apps']; - $fullPath = Helper::replaceCurrentAppTemplate($path, $currentApps); - }else{ - $fullPath = $path; - } - $fullPath = Helper::replaceTemplate($fullPath,[ - 'lang'=>$lang - ]); - - if (strpos($fullPath, '#') !== false) { - $mdPathArr = explode("#", $fullPath); - $mdPath=$mdPathArr[0]; - $mdAnchor =$mdPathArr[1]; - } else { - $mdPath = $fullPath; - $mdAnchor=""; - } - $fileSuffix = ""; - if (strpos($fullPath, '.md') === false) { - $fileSuffix = ".md"; - } - $filePath = APIDOC_ROOT_PATH . $mdPath . $fileSuffix; - return [ - 'filePath'=>$filePath, - 'anchor'=>$mdAnchor - ]; - } - - - /** - * 获取md文档内容 - * @param string $appKey - * @param string $path - * @return string - */ - public static function getContent(string $appKey, string $path,$lang="") - { - $filePathArr = static::getFilePath($appKey,$path,$lang); - $mdAnchor = $filePathArr['anchor']; - $filePath = $filePathArr['filePath']; - if (!file_exists($filePath)) { - return $path; - } - $contents = DirAndFile::getFileContent($filePath); - // 获取指定h2标签内容 - if (!empty($mdAnchor)){ - if (strpos($contents, '## ') !== false) { - $contentArr = explode("\r\n", $contents); - $contentText = ""; - foreach ($contentArr as $line){ - $contentText.="\r\n".trim($line); - } - $contentArr = explode("\r\n## ", $contentText); - $content=""; - foreach ($contentArr as $item){ - $itemArr = explode("\r\n", $item); - if (!empty($itemArr) && $itemArr[0] && $mdAnchor===$itemArr[0]){ - $content = str_replace($itemArr[0]."\r\n", '', $item); - break; - } - } - return $content; - } - } - return $contents; - } - - -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/parses/ParseModel.php b/vendor/hg/apidoc/src/parses/ParseModel.php deleted file mode 100644 index dbe81e37..00000000 --- a/vendor/hg/apidoc/src/parses/ParseModel.php +++ /dev/null @@ -1,162 +0,0 @@ -config = $config; - } - - public function parseModelTable($model, $classReflect, $methodName = "") - { - if (!is_callable(array($model, 'getTable'))) { - return false; - } - $config = $this->config; - try { - // 获取所有模型属性 - $propertys = $classReflect->getDefaultProperties(); - $tableName = $model->getTable(); - $configTablePrefix = !empty($config['database']) && !empty($config['database']['prefix']) ? $config['database']['prefix'] : ""; - if (!empty($configTablePrefix) && strpos($tableName, $configTablePrefix) === false) { - $tableName = $configTablePrefix . $model->getTable(); - } - $table = $this->getTableDocument($tableName, $propertys, $model); - if (empty($methodName)) { - return $table; - } - - $methodReflect = $classReflect->getMethod($methodName); - $annotations = (new ParseAnnotation($config))->getMethodAnnotation($methodReflect); - if (!empty($annotations['field'])) { - $table = ParseApiDetail::filterParamsField($table, $annotations['field'], 'field'); - } - if (!empty($annotations['withoutField'])) { - $table = ParseApiDetail::filterParamsField($table, $annotations['withoutField'], 'withoutField'); - } - if (!empty($annotations['addField'])) { - $addFieldData = []; - if (is_int(Helper::arrayKeyFirst($annotations['addField']))) { - $addFieldData = $annotations['addField']; - } else { - $addFieldData = [$annotations['addField']]; - } - $addFieldList = []; - $parseApiDetail = new ParseApiDetail($config); - $field = 'param'; - foreach ($addFieldData as $fieldItem) { - if (!empty($fieldItem['ref'])) { - $refParams = $parseApiDetail->renderRef($fieldItem['ref'], $field); - if (!empty($refParams[$field])) { - $fieldItem = $parseApiDetail->handleRefData($fieldItem, $refParams[$field], $field); - } - } - if (!empty($fieldItem['md'])) { - $fieldItem['md'] = ParseMarkdown::getContent("", $fieldItem['md']); - } - // 自定义解析 - if (!empty($config['parsesAnnotation'])) { - $callback = $config['parsesAnnotation']($fieldItem); - if (!empty($callback)) { - $fieldItem = $callback; - } - } - $addFieldList[] = $fieldItem; - } - $table = Helper::arrayMergeAndUnique("name", $table, $addFieldList); - } - return $table; - } catch (\ReflectionException $e) { - throw new ErrorException('Class ' . get_class($model) . ' ' . $e->getMessage()); - } - - } - - /** - * 获取模型实例 - * @param $method - * @return mixed|null - */ - public static function getModelClass($namespaceName) - { - if (!empty($namespaceName) && class_exists($namespaceName)) { - $modelInstance = new $namespaceName(); - if (is_callable(array($modelInstance, 'getTable'))) { - return $modelInstance; - } - } - return null; - } - - - /** - * 获取模型注解数据 - * @param $tableName - * @param $propertys - * @return array - */ - public function getTableDocument($tableName, array $propertys, $model = null): array - { - $config = $this->config; - $fieldComment = []; - if (empty($config['database_query_function'])) { - throw new ErrorException("not datatable_query_function config"); - } - $tableColumns = $config['database_query_function']("SHOW FULL COLUMNS FROM `" . $tableName . "`"); - foreach ($tableColumns as $columns) { - $columns = Helper::objectToArray($columns); - $name = $columns['Field']; - $desc = $columns['Comment']; - $mock = ""; - $md = ""; - if (isset($propertys['convertNameToCamel']) && $propertys['convertNameToCamel'] === true) { - $name = Helper::camel($name); - } - if (!empty($desc)) { - // 存在字段注释 - $desc = Lang::getLang($desc); - if (strpos($desc, 'mock(') !== false) { - // 存在mock - preg_match('#mock\((.*)\)#s', $desc, $mocks); - if (!empty($mocks[1])) { - $mock = $mocks[1]; - $desc = str_replace($mocks[0], "", $desc); - } - } - if (strpos($desc, 'md="') !== false) { - // 存在md - preg_match('#md="(.*)"#s', $desc, $mdRefs); - if (!empty($mdRefs[1])) { - $md = ParseMarkdown::getContent("", $mdRefs[1]); - $desc = str_replace($mdRefs[0], "", $desc); - } - } - } - $fieldComment[] = [ - "name" => $name, - "type" => $columns['Type'], - "desc" => $desc, - "default" => $columns['Default'], - "require" => $columns['Null'] != "YES", - "mock" => $mock, - "md" => $md, - ]; - } - return $fieldComment; - } - -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/providers/BaseService.php b/vendor/hg/apidoc/src/providers/BaseService.php deleted file mode 100644 index 91303aa8..00000000 --- a/vendor/hg/apidoc/src/providers/BaseService.php +++ /dev/null @@ -1,172 +0,0 @@ -'config','route'=>'getConfig'], - ['rule'=>'apiMenus','route'=>'getApiMenus'], - ['rule'=>'apiDetail','route'=>'getApiDetail'], - ['rule'=>'docMenus','route'=>'getMdMenus'], - ['rule'=>'docDetail','route'=>'getMdDetail'], - ['rule'=>'verifyAuth','route'=>'verifyAuth'], - ['rule'=>'generator','route'=>'createGenerator'], - ['rule'=>'cancelAllCache','route'=>'cancelAllCache'], - ['rule'=>'createAllCache','route'=>'createAllCache'], - ['rule'=>'renderCodeTemplate','route'=>'renderCodeTemplate'], - ['rule'=>'allApiMenus','route'=>'getAllApiMenus'], - ['rule'=>'addApiShare','route'=>'addApiShare'], - ['rule'=>'getApiShareList','route'=>'getApiShareList'], - ['rule'=>'getApiShareDetail','route'=>'getApiShareDetail'], - ['rule'=>'deleteApiShare','route'=>'deleteApiShare'], - ['rule'=>'handleApiShareAction','route'=>'handleApiShareAction'], - ]; - - - - /** - * 获取apidoc配置 - * @return array 返回apidoc配置 - */ - abstract static function getApidocConfig(); - - - /** - * 注册apidoc路由 - * @param $route 路由参数 - * @return mixed - */ - abstract static function registerRoute($route); - - /** - * 执行Sql语句 - * @return mixed - */ - abstract static function databaseQuery($sql); - - /** - * 获取项目根目录 - * @return string 返回项目根目录 - */ - abstract static function getRootPath(); - - /** - * 获取缓存目录 - * @return string 返回项目缓存目录 - */ - abstract static function getRuntimePath(); - - - /** - * 设置当前语言 - * @param $locale 语言标识 - * @return mixed - */ - abstract static function setLang($locale); - - /** - * 获取语言定义 - * @param $lang - * @return string - */ - abstract static function getLang($lang); - - - /** - * 处理apidoc接口响应的数据 - * @return mixed - */ - abstract static function handleResponseJson($res); - - abstract static function getTablePrefix(); - - // 自动注册api路由 - static public function autoRegisterRoutes($routeFun,$config=""){ - if (empty($config)){ - $config = self::getApidocConfig(); - } - if (isset($config['auto_register_routes']) && $config['auto_register_routes']===true) { - $cacheKey = "apis/autoRegisterRoutes"; - if (!empty($config['cache']) && $config['cache']['enable']) { - $cacheData = (new Cache())->get($cacheKey); - if (!empty($cacheData)) { - $autoRegisterApis = $cacheData; - } else { - $autoRegisterApis = (new AutoRegisterRouts($config))->getAppsApis(); - (new Cache())->set($cacheKey, $autoRegisterApis); - } - } else { - $autoRegisterApis = (new AutoRegisterRouts($config))->getAppsApis(); - } - $routeFun($autoRegisterApis); - } - } - - public function initConfig(){ - ! defined('APIDOC_ROOT_PATH') && define('APIDOC_ROOT_PATH', $this->getRootPath()); - ! defined('APIDOC_STORAGE_PATH') && define('APIDOC_STORAGE_PATH', $this->getRuntimePath()); - $config = self::getApidocConfig(); - if (empty($config['database_query_function'])){ - $config['database_query_function'] = function ($sql){ - return self::databaseQuery($sql); - }; - } - if (empty($config['lang_register_function'])){ - $config['lang_register_function'] = function ($sql){ - return self::setLang($sql); - }; - } - if (empty($config['lang_get_function'])){ - $config['lang_get_function'] = function ($lang){ - return self::getLang($lang); - }; - } - $config['handle_response_json'] = function ($res){ - return self::handleResponseJson($res); - }; - $table_prefix = self::getTablePrefix(); - if (!empty($config['database'])){ - if (empty($config['prefix'])){ - $config['database']['prefix'] = $table_prefix; - } - }else{ - $config['database']=[ - 'prefix'=>$table_prefix - ]; - } - ConfigProvider::set($config); - } - - /** - * @param null $routeFun - */ - static public function registerApidocRoutes($routeFun=null){ - $routes = static::$routes; - $controller_namespace = '\hg\apidoc\Controller@'; - $route_prefix = "/apidoc"; - $config = self::getApidocConfig(); - if (!empty($config) && !empty($config['route_prefix'])){ - $route_prefix = $config['route_prefix']; - } - foreach ($routes as $item) { - $route = [ - 'uri'=>$route_prefix."/".$item['rule'], - 'callback'=>$controller_namespace.$item['route'], - 'route'=>$item['route'], - ]; - if (!empty($routeFun)){ - $routeFun($route); - }else{ - self::registerRoute($route); - } - } - } - -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/providers/CommonService.php b/vendor/hg/apidoc/src/providers/CommonService.php deleted file mode 100644 index 0fc5cbe2..00000000 --- a/vendor/hg/apidoc/src/providers/CommonService.php +++ /dev/null @@ -1,56 +0,0 @@ - [HyperfMiddleware::class]]); - }); - - // 自动注册路由 - CommonService::autoRegisterRoutes(function ($routeData){ - foreach ($routeData as $controller) { - if (count($controller['methods'])){ - $methods= $controller['methods']; - $routeCallback = function ()use ($methods){ - foreach ($methods as $method) { - $apiMethods = Helper::handleApiMethod($method['method']); - $options = []; - if (!empty($method['middleware'])){ - $options['middleware']= $method['middleware']; - } - Router::addRoute([...$apiMethods,'OPTIONS'],$method['url'], $method['controller']."@".$method['name'],$options); - } - }; - $groupOptions = []; - if (!empty($controller['middleware'])){ - $groupOptions['middleware'] = $controller['middleware']; - } - Router::addGroup("",$routeCallback,$groupOptions); - } - } - }, HyperfMiddleware::getApidocConfig()); - } -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/providers/LaravelService.php b/vendor/hg/apidoc/src/providers/LaravelService.php deleted file mode 100644 index 7a5fa94e..00000000 --- a/vendor/hg/apidoc/src/providers/LaravelService.php +++ /dev/null @@ -1,110 +0,0 @@ -publishes([ - __DIR__.'/../config.php' => config_path('apidoc.php'), - ]); - } - - public function register() - { - $config = static::getApidocConfig(); - $this->initConfig(); - self::registerApidocRoutes(); - - // 自动注册路由 - self::autoRegisterRoutes(function ($routeData){ - foreach ($routeData as $controller) { - if (count($controller['methods'])){ - $methods= $controller['methods']; - $routeCallback = function ()use ($methods){ - foreach ($methods as $method) { - $apiMethods = Helper::handleApiMethod($method['method']); - $route = Route::match($apiMethods + ['OPTIONS'],$method['url'], "\\".$method['controller']."@".$method['name']); - if (!empty($method['middleware'])){ - $route->middleware($method['middleware']); - } - } - }; - $routeGroup = Route::prefix(""); - if (!empty($controller['middleware'])){ - $routeGroup->middleware($controller['middleware']); - } - $routeGroup->group($routeCallback); - } - } - }); - - } - - static function getApidocConfig() - { - $config = config("apidoc"); - if (!(!empty($config['auto_url']) && !empty($config['auto_url']['filter_keys']))){ - $config['auto_url']['filter_keys'] = ['App','Http','Controllers']; - } - $config['app_frame'] = "laravel"; - return $config; - } - - static function registerRoute($route){ - $config = self::getApidocConfig(); - $registerRoute = Route::any($route['uri'], $route['callback']); - $registerRoute->middleware([LaravelMiddleware::class]); - if (!empty($config['allowCrossDomain'])) { - $registerRoute->middleware([ApiCrossDomain::class]); - } - } - - static function databaseQuery($sql){ - return DB::select($sql); - } - - static function getTablePrefix(){ - $driver = config('database.default'); - $table_prefix=config('database.connections.'.$driver.'.prefix'); - return $table_prefix; - } - - static function getRootPath() - { - return base_path()."/"; - } - - static function getRuntimePath() - { - return storage_path()."/"; - } - - static function setLang($locale){ - Lang::setLocale($locale); - } - - static function getLang($lang){ - return trans($lang); - } - - static function handleResponseJson($res){ - return $res; - } - - -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/providers/ThinkPHP5Service.php b/vendor/hg/apidoc/src/providers/ThinkPHP5Service.php deleted file mode 100644 index c301ba04..00000000 --- a/vendor/hg/apidoc/src/providers/ThinkPHP5Service.php +++ /dev/null @@ -1,94 +0,0 @@ -initConfig(); - self::registerApidocRoutes(); - // 自动注册路由 - self::autoRegisterRoutes(function ($routeData){ - $appRoute = app('route'); - $routeGroup = $appRoute->getGroup(); - foreach ($routeData as $controller) { - $routeGroup = $appRoute->getGroup(); - if (!empty($controller['middleware'])){ - $routeGroup->middleware($controller['middleware']); - } - if (count($controller['methods'])){ - foreach ($controller['methods'] as $method) { - $apiMethods = Helper::handleApiMethod($method['method']); - $apiMethods = implode("|",$apiMethods); - $route = $routeGroup->addRule($method['url'],$method['controller']."@".$method['name'],$apiMethods); - if (!empty($method['middleware'])){ - $route->middleware($method['middleware']); - } - } - } - } - }); - } - - static function getApidocConfig() - { - $config = config("apidoc."); - if (!(!empty($config['auto_url']) && !empty($config['auto_url']['filter_keys']))){ - $config['auto_url']['filter_keys'] = ['app','controller']; - } - $config['app_frame'] = "thinkphp5"; - return $config; - } - - static function registerRoute($route){ - $config = self::getApidocConfig(); - $registerRoute = Route::rule($route['uri'], $route['callback'],"*"); - if (!empty($config['allowCrossDomain'])) { - $registerRoute->allowCrossDomain(); - } - } - - static function databaseQuery($sql){ - return Db::query($sql); - } - - static function getTablePrefix(){ - $driver = config('database.default'); - $table_prefix=config('database.connections.'.$driver.'.prefix'); - return $table_prefix; - } - - static function getRootPath() - { - return App::getRootPath(); - } - - static function getRuntimePath() - { - return App::getRuntimePath(); - } - - static function setLang($locale){ - Lang::setLangCookieVar($locale); - } - - static function getLang($lang){ - return Lang::get($lang); - } - - static function handleResponseJson($res){ - return json($res); - } - - -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/providers/ThinkPHPService.php b/vendor/hg/apidoc/src/providers/ThinkPHPService.php deleted file mode 100644 index 767699e7..00000000 --- a/vendor/hg/apidoc/src/providers/ThinkPHPService.php +++ /dev/null @@ -1,107 +0,0 @@ -initConfig(); - - $this->registerRoutes(function () use($config){ - //注册apidoc所需路由 - self::registerApidocRoutes(function ($route)use ($config){ - $registerRoute = Route::any($route['uri'], $route['callback']); - $registerRoute->middleware([ThinkPHPMiddleware::class]); - if (!empty($config['allowCrossDomain'])) { - $registerRoute->allowCrossDomain(); - } - }); - - // 自动注册路由 - self::autoRegisterRoutes(function ($routeData){ - $appRoute = $this->app->route; - $appName = $this->app->http->getName(); - foreach ($routeData as $controller) { - $routeGroup = $appRoute->getGroup(); - if (!empty($controller['middleware'])){ - $routeGroup->middleware($controller['middleware']); - } - if (count($controller['methods'])){ - foreach ($controller['methods'] as $method) { - if (!empty($appName)){ - $method['url'] = str_replace("/".$appName,'',$method['url']); - } - $apiMethods = Helper::handleApiMethod($method['method']); - $apiMethods = implode("|",$apiMethods); - $route = $routeGroup->addRule($method['url'],$method['controller']."@".$method['name'],$apiMethods); - if (!empty($method['middleware'])){ - $route->middleware($method['middleware']); - } - } - } - } - }); - }); - } - - static function registerRoute($route){ - $registerRoute = Route::any($route['uri'], $route['callback']); - } - - static function databaseQuery($sql){ - return Db::query($sql); - } - - static function getTablePrefix(){ - $driver = config('database.default'); - $table_prefix=config('database.connections.'.$driver.'.prefix'); - return $table_prefix; - } - - static function getRootPath() - { - return App::getRootPath(); - } - - static function getRuntimePath() - { - return App::getRuntimePath(); - } - - static function setLang($locale){ - \think\facade\App::loadLangPack($locale); - Lang::setLangSet($locale); - } - - static function getLang($lang){ - return Lang::get($lang); - } - - static function handleResponseJson($res){ - return json($res); - } - - -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/providers/WebmanService.php b/vendor/hg/apidoc/src/providers/WebmanService.php deleted file mode 100644 index 63aa3baa..00000000 --- a/vendor/hg/apidoc/src/providers/WebmanService.php +++ /dev/null @@ -1,43 +0,0 @@ -middleware([WebmanMiddleware::class]); - }); - - // 自动注册路由 - CommonService::autoRegisterRoutes(function ($routeData){ - foreach ($routeData as $controller) { - if (count($controller['methods'])){ - $methods= $controller['methods']; - $routeCallback = function ()use ($methods){ - foreach ($methods as $method) { - $apiMethods = Helper::handleApiMethod($method['method']); - $route = Route::add([...$apiMethods,'OPTIONS'],$method['url'], $method['controller']."@".$method['name']); - if (!empty($method['middleware'])){ - $route->middleware($method['middleware']); - } - } - }; - $routeGroup = Route::group("",$routeCallback); - if (!empty($controller['middleware'])){ - $routeGroup->middleware($controller['middleware']); - } - } - } - }, WebmanMiddleware::getApidocConfig()); - } -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/utils/AbstractAnnotation.php b/vendor/hg/apidoc/src/utils/AbstractAnnotation.php deleted file mode 100644 index 8ed02b1f..00000000 --- a/vendor/hg/apidoc/src/utils/AbstractAnnotation.php +++ /dev/null @@ -1,36 +0,0 @@ -formatParams($value); - foreach ($formattedValue as $key => $val) { - if ($key=="value" && !property_exists($this, $key)){ - $this->name = $val; - }else{ - $this->{$key} = $val; - } - } - } - - protected function formatParams($value): array - { - if (isset($value[0])) { - $value = $value[0]; - } - if (!is_array($value)) { - $value = ['name' => $value]; - } - return $value; - } -} diff --git a/vendor/hg/apidoc/src/utils/ApiCrossDomain.php b/vendor/hg/apidoc/src/utils/ApiCrossDomain.php deleted file mode 100644 index e09b7204..00000000 --- a/vendor/hg/apidoc/src/utils/ApiCrossDomain.php +++ /dev/null @@ -1,22 +0,0 @@ -server('HTTP_ORIGIN') ? $request->server('HTTP_ORIGIN') : ''; - $response->header('Access-Control-Allow-Origin', $origin); - $response->header('Access-Control-Allow-Headers', 'Origin, Content-Type, Cookie, X-CSRF-TOKEN, Accept, Authorization, X-XSRF-TOKEN'); - $response->header('Access-Control-Expose-Headers', 'Authorization, authenticated'); - $response->header('Access-Control-Allow-Methods', 'GET, POST, PATCH, PUT, OPTIONS'); - $response->header('Access-Control-Allow-Credentials', 'true'); - return $response; - - } - - -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/utils/ApiShare.php b/vendor/hg/apidoc/src/utils/ApiShare.php deleted file mode 100644 index 05c8a4f4..00000000 --- a/vendor/hg/apidoc/src/utils/ApiShare.php +++ /dev/null @@ -1,165 +0,0 @@ - $params['name'], - 'type' => $params['type'], - ]; - if (!empty($params['appKeys'])) { - $data['appKeys'] = $params['appKeys']; - } - if (!empty($params['apiKeys'])) { - $data['apiKeys'] = $params['apiKeys']; - } - if (!empty($params['password'])) { - $data['password'] = $params['password']; - } - $data['create_at'] = date('Y-m-d h:i:s'); - $data['create_time'] = time(); - $res = (new Cache())->set($cacheKey, $data); - return $res; - } - - public function getSharePageList($config,$pageIndex,$pageSize){ - $path = APIDOC_STORAGE_PATH . $config['cache']['folder'] . "/share"; - - $list = DirAndFile::getFileList($path); - $data = []; - $cache = new Cache(); - - foreach ($list as $item) { - $fileNameArr = explode("_", $item['name']); - $cacheKey = "share/" . $fileNameArr[0] . "_" . $fileNameArr[1]; - $cacheData = $cache->get($cacheKey); - $itemData = [ - 'key' => $fileNameArr[1], - 'name' => $cacheData['name'], - 'type' => $cacheData['type'], - 'create_time' => $cacheData['create_time'], - 'create_at' => $cacheData['create_at'], - ]; - $data[] = $itemData; - } - $data = Helper::arraySortByKey($data, 'create_time', SORT_DESC); - $page = $pageIndex-1; - $res = array_slice($data,$page*$pageSize,$pageSize); - return [ - 'total'=>count($data), - 'data'=>$res - ]; - } - - - public function getShareDetailByKey($shareKey) - { - if (empty($shareKey)) { - throw new ErrorException('field not found', ['field' => 'shareKey']); - } - $cache = new Cache(); - $cacheKey = static::getShareCacheKey($shareKey); - $cacheData = $cache->get($cacheKey); - if (empty($cacheData)) { - throw new ErrorException("share not exists"); - } - return $cacheData; - } - - public function checkShareAuth($config, $params) - { - if (empty($params['shareKey'])) { - throw new ErrorException('field not found', ['field' => 'shareKey']); - } - $cacheData = $this->getShareDetailByKey($params['shareKey']); - - if (!empty($cacheData['password'])) { - //验证密码 - if (empty($params['token'])) { - throw new ErrorException("token not found"); - } - $password = md5($cacheData['password']); - $cacheData['pass'] = $password; - $checkAuth = (new Auth($config))->checkToken($params['token'], $password); - if (!$checkAuth) { - throw new ErrorException("token error"); - } - } - return $cacheData; - } - - public static function getAppShareApis(array $config, array $apps, $parentKey = "", $filterAppKeys = [], $isParseDetail = false) - { - $appList = []; - $separ = !empty($parentKey) ? ',' : ''; - foreach ($apps as $app) { - $appKey = $parentKey . $separ . $app['key']; - if (!empty($app['items']) && count($app['items'])) { - $items = static::getAppShareApis($config, $app['items'], $appKey, $filterAppKeys, $isParseDetail); - $app['children'] = $items; - } else { - $app['appKey'] = $appKey; - $apiData = (new ParseApiMenus($config))->renderApiMenus($appKey, $isParseDetail); - $app['children'] = $apiData['data']; - } - if (!empty($filterAppKeys) && count($filterAppKeys) && !in_array($appKey, $filterAppKeys) && empty($app['items'])) { - continue; - } - $app['menuKey'] = $appKey; - $appList[] = $app; - } - - return $appList; - } - - public function getShareData($config, $key) - { - $shareData = $this->getShareDetailByKey($key); - $filterAppKeys = !empty($shareData['appKeys']) ? $shareData['appKeys'] : []; - $configApps = Helper::handleAppsConfig($config['apps'], false, $config); - $appList = static::getAppShareApis($config, $configApps, "", $filterAppKeys, true); - if ($shareData['type'] == 'api') { - $appList = Helper::filterTreeNodesByKeys($appList, $shareData['apiKeys'], 'menuKey'); - } - return [ - 'shareData' => $shareData, - 'apiData' => $appList, - ]; - } - - public function handleApiShareAction($config, $key, $index) - { - - $actionConfig = $config['share']['actions'][$index]; - if (!empty($actionConfig['click'])) { - $data = $this->getShareData($config, $key); - $res = $actionConfig['click']($data['shareData'], $data['apiData']); - return $res; - } - return false; - - } - - -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/utils/AutoRegisterRouts.php b/vendor/hg/apidoc/src/utils/AutoRegisterRouts.php deleted file mode 100644 index b54e5371..00000000 --- a/vendor/hg/apidoc/src/utils/AutoRegisterRouts.php +++ /dev/null @@ -1,154 +0,0 @@ -config = $config; - } - - /** - * 解析所有应用的api - * @return array - */ - public function getAppsApis(){ - $apps = Helper::getAllApps($this->config['apps']); - $apiList = []; - if (!empty($apps) && count($apps)){ - foreach ($apps as $app) { - $apis = $this->getAppApis($app); - $apiList=array_merge($apiList,$apis); - } - } - return $apiList; - - } - - /** - * 生成api接口数据 - * @param array $app - * @return array - */ - public function getAppApis($app) - { - $controllers = []; - if (!empty($app['controllers']) && count($app['controllers']) > 0) { - // 配置的控制器列表 - $controllers = (new ParseApiMenus($this->config))->getConfigControllers($app['path'],$app['controllers']); - }else if(!empty($app['path']) && is_array($app['path']) && count($app['path'])){ - $parseApiMenus = new ParseApiMenus($this->config); - foreach ($app['path'] as $path) { - $controllersList = $parseApiMenus->getDirControllers($path); - $controllers = array_merge($controllers,$controllersList); - } - } else if(!empty($app['path']) && is_string($app['path'])) { - // 默认读取所有的 - $controllers = (new ParseApiMenus($this->config))->getDirControllers($app['path']); - } - - $routeData = []; - if (!empty($controllers) && count($controllers) > 0) { - foreach ($controllers as $class) { - $classData = $this->parseController($class); - if ($classData !== false) { - $routeData[] = $classData; - } - } - } - return $routeData; - } - - - public function parseController($class) - { - $refClass = new ReflectionClass($class); - $classTextAnnotations = ParseAnnotation::parseTextAnnotation($refClass); - $classAnnotations = (new ParseAnnotation($this->config))->getClassAnnotation($refClass); - if (in_array("NotParse", $classTextAnnotations) || isset($classAnnotations['notParse'])) { - return false; - } - - - $methodList = []; - foreach ($refClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $refMethod) { - $methodItem = $this->parseApiMethod($refClass,$refMethod); - if ($methodItem===false){ - continue; - } - $methodList[] = $methodItem; - } - if (count($methodList)===0){ - return false; - } - $data = [ - 'name'=>$refClass->name, - 'methods'=>$methodList, - ]; - - //控制器中间件 - if (!empty($classAnnotations['routeMiddleware']) && !empty($classAnnotations['routeMiddleware'])) { - $data['middleware'] = $classAnnotations['routeMiddleware']; - } - return $data; - } - - - protected function parseApiMethod($refClass,$refMethod){ - if (empty($refMethod->name) || in_array($refMethod->name,$this->filterMethods)) { - return false; - } - $config = $this->config; - $textAnnotations = ParseAnnotation::parseTextAnnotation($refMethod); - $methodAnnotation = (new ParseAnnotation($config))->getMethodAnnotation($refMethod); - if (in_array("NotParse", $textAnnotations) || isset($methodAnnotation['notParse'])) { - return false; - } - - if (empty($methodAnnotation['method'])) { - $method = !empty($config['default_method']) ? strtoupper($config['default_method']) : '*'; - }else{ - $method = $methodAnnotation['method']; - } - if (empty($methodAnnotation['url'])) { - $url = ParseApiDetail::autoCreateUrl($refClass->name,$refMethod->name,$config); - }else{ - $url = $methodAnnotation['url']; - } - if (!empty($url) && substr($url, 0, 1) != "/") { - $url = "/" . $url; - } - $data = [ - 'url'=>$url, - 'method'=>$method, - 'name'=>$refMethod->name, - 'controller'=>$refClass->name, - ]; - if (!empty($methodAnnotation['routeMiddleware']) && !empty($methodAnnotation['routeMiddleware'])) { - $data['middleware'] = $methodAnnotation['routeMiddleware']; - } - return $data; - - } - -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/utils/Cache.php b/vendor/hg/apidoc/src/utils/Cache.php deleted file mode 100644 index 51b19020..00000000 --- a/vendor/hg/apidoc/src/utils/Cache.php +++ /dev/null @@ -1,298 +0,0 @@ - 0, - 'cache_subdir' => true, - 'prefix' => '', - 'path' => '', - 'hash_type' => 'md5', - 'data_compress' => false, - 'serialize' => [], - ]; - - /** - * 架构函数 - * @param array $options 参数 - */ - public function __construct( array $options = []) - { - if (!empty($options)) { - $this->options = array_merge($this->options, $options); - } - - if (empty($this->options['path'])) { - $this->options['path'] = APIDOC_STORAGE_PATH .'/'. 'apidoc'; - } - - if (substr($this->options['path'], -1) != DIRECTORY_SEPARATOR) { - $this->options['path'] .= DIRECTORY_SEPARATOR; - } - } - - /** - * 取得变量的存储文件名 - * @access public - * @param string $name 缓存变量名 - * @return string - */ - public function getCacheKey(string $name): string - { - $name = $name."_".hash($this->options['hash_type'], $name); - - if ($this->options['prefix']) { - $name = $this->options['prefix'] . DIRECTORY_SEPARATOR . $name; - } - - return $this->options['path'] . $name . '.php'; - } - - /** - * 序列化数据 - * @access protected - * @param mixed $data 缓存数据 - * @return string - */ - protected function serialize($data): string - { - if (is_numeric($data)) { - return (string) $data; - } - - $serialize = $this->options['serialize'][0] ?? "serialize"; - - return $serialize($data); - } - - - /** - * 反序列化数据 - * @access protected - * @param string $data 缓存数据 - * @return mixed - */ - protected function unserialize($data) - { - if (is_numeric($data)) { - return $data; - } - - $unserialize = $this->options['serialize'][1] ?? "unserialize"; - - return $unserialize($data); - } - - - /** - * 获取有效期 - * @access protected - * @param integer|DateTimeInterface|DateInterval $expire 有效期 - * @return int - */ - protected function getExpireTime($expire): int - { - if ($expire instanceof DateTimeInterface) { - $expire = $expire->getTimestamp() - time(); - } elseif ($expire instanceof DateInterval) { - $expire = DateTime::createFromFormat('U', (string) time()) - ->add($expire) - ->format('U') - time(); - } - - return (int) $expire; - } - - /** - * 获取缓存数据 - * @param string $name 缓存标识名 - * @return array|null - */ - protected function getRaw(string $name) - { - $filename = $this->getCacheKey($name); - - if (!is_file($filename)) { - return; - } - - $content = @file_get_contents($filename); - - if (false !== $content) { - $expire = (int) substr($content, 8, 12); - $createTime = filemtime($filename); - if (0 != $expire && time() - $expire > $createTime) { - //缓存过期删除缓存文件 - DirAndFile::unlink($item->getPathname()); - return; - } - - $content = substr($content, 32); - - if ($this->options['data_compress'] && function_exists('gzcompress')) { - //启用数据压缩 - $content = gzuncompress($content); - } - - return is_string($content) ? ['content' => $content, 'expire' => $expire,'create_time'=>$createTime] : null; - } - } - - /** - * 判断缓存是否存在 - * @access public - * @param string $name 缓存变量名 - * @return bool - */ - public function has($name): bool - { - return $this->getRaw($name) !== null; - } - - /** - * 读取缓存 - * @access public - * @param string $name 缓存变量名 - * @param mixed $default 默认值 - * @return mixed - */ - public function get($name, $default = null) - { - $this->readTimes++; - - $raw = $this->getRaw($name); - - return is_null($raw) ? $default : $this->unserialize($raw['content']); - } - - /** - * 写入缓存 - * @access public - * @param string $name 缓存变量名 - * @param mixed $value 存储数据 - * @param int|\DateTime $expire 有效时间 0为永久 - * @return bool - */ - public function set($name, $value, $expire = null): bool - { - $this->writeTimes++; - - if (is_null($expire)) { - $expire = $this->options['expire']; - } - - $expire = $this->getExpireTime($expire); - $filename = $this->getCacheKey($name); - - $dir = dirname($filename); - - if (!is_dir($dir)) { - try { - mkdir($dir, 0755, true); - } catch (\Exception $e) { - // 创建失败 - } - } - - $data = $this->serialize($value); - - if ($this->options['data_compress'] && function_exists('gzcompress')) { - //数据压缩 - $data = gzcompress($data, 3); - } - - $data = "\n" . $data; - $result = file_put_contents($filename, $data); - - if ($result) { - clearstatcache(); - return true; - } - - return false; - } - - - - /** - * 删除缓存 - * @access public - * @param string $name 缓存变量名 - * @return bool - */ - public function delete($name): bool - { - $this->writeTimes++; - - return DirAndFile::unlink($this->getCacheKey($name)); - } - - /** - * 清除缓存 - * @access public - * @return bool - */ - public function clear(): bool - { - $this->writeTimes++; - - $dirname = $this->options['path'] . $this->options['prefix']; - - $this->rmdir($dirname); - - return true; - } - - - /** - * 删除文件夹 - * @param $dirname - * @return bool - */ - private function rmdir($dirname) - { - if (!is_dir($dirname)) { - return false; - } - - $items = new FilesystemIterator($dirname); - - foreach ($items as $item) { - if ($item->isDir() && !$item->isLink()) { - $this->rmdir($item->getPathname()); - } else { - DirAndFile::unlink($item->getPathname()); - } - } - - @rmdir($dirname); - - return true; - } - -} diff --git a/vendor/hg/apidoc/src/utils/ConfigProvider.php b/vendor/hg/apidoc/src/utils/ConfigProvider.php deleted file mode 100644 index 07e2342a..00000000 --- a/vendor/hg/apidoc/src/utils/ConfigProvider.php +++ /dev/null @@ -1,99 +0,0 @@ -[ - 'folder'=>'apidoc' - ] - ]; - protected static $config = []; - - - public static function get($field=""){ - - if (!empty(static::$config)) { - $config = static::$config; - }else{ - throw new ErrorException('ConfigProvider get error'); - } - - return Helper::getObjectFindByField($config,$field); - } - - public static function set($config){ - if (!(!empty($config['cache']) && !empty($config['cache']['folder']))){ - if (!empty($config['cache'])){ - $config['cache']['folder'] =static::$defaultConfig['cache']['folder']; - } - } - $config = static::handleConfig($config); - static::$config = $config; - } - - public static function handleConfig($config){ - if (!empty($config['params'])){ - if (!empty($config['params']['header'])){ - $config['params']['header'] = Helper::handleArrayParams($config['params']['header'],"desc",$config); - } - if (!empty($config['params']['query'])){ - $config['params']['query'] = Helper::handleArrayParams($config['params']['query'],"desc",$config); - } - if (!empty($config['params']['body'])){ - $config['params']['body'] = Helper::handleArrayParams($config['params']['body'],"desc",$config); - } - } - if (!empty($config['responses'])){ - if (!empty($config['responses']['success'])){ - $config['responses']['success'] = Helper::handleArrayParams($config['responses']['success'],"desc",$config); - } - if (!empty($config['responses']['error'])){ - $config['responses']['error'] = Helper::handleArrayParams($config['responses']['error'],"desc",$config); - } - } - return $config; - } - - public static function getFeConfig($filterAppKeys=[]){ - $config = static::$config; - - $feConfig = [ - 'title' =>!empty($config['title'])?Lang::getLang($config['title'] ):'', - 'desc' =>!empty($config['title'])?Lang::getLang($config['desc']):'', - 'apps'=>!empty($config['apps'])?$config['apps']:[], - 'cache'=>!empty($config['cache'])?$config['cache']:[], - 'params'=>!empty($config['params'])?$config['params']:[], - 'responses'=>!empty($config['responses'])?$config['responses']:[], - 'generator'=>!empty($config['generator'])?$config['generator']:[], - 'code_template'=>!empty($config['code_template'])?$config['code_template']:[], - 'share'=>!empty($config['share'])?$config['share']:[], - ]; - if (!empty($feConfig['apps']) && count($feConfig['apps'])){ - // 清除apps配置中的password - $feConfig['apps'] = Helper::handleAppsConfig($feConfig['apps'],true,"","",$filterAppKeys); - } - - if (!empty($feConfig['generator'])){ - $generatorList = []; - $generators= Helper::handleArrayParams($feConfig['generator'],"title"); - foreach ($generators as $item) { - if (isset($item['enable']) && $item['enable'] === false){ - continue; - } - if (!empty($item['form']) && !empty($item['form']['items']) && count($item['form']['items'])){ - $item['form']['items'] = Helper::handleArrayParams( $item['form']['items'],"title"); - } - $generatorList[]=$item; - } - $feConfig['generator'] = $generatorList; - } - return $feConfig; - } - - -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/utils/DirAndFile.php b/vendor/hg/apidoc/src/utils/DirAndFile.php deleted file mode 100644 index e97ba0f5..00000000 --- a/vendor/hg/apidoc/src/utils/DirAndFile.php +++ /dev/null @@ -1,258 +0,0 @@ -$value, - 'path'=>$sub_path, - ]; - $children = static::getDirTree($sub_path); - if (count($children)){ - $item['children'] = $children; - } - $arr[] = $item; - } - } - } - return $arr; - } - - public static function getClassList($dir){ - if ($handle = opendir($dir)) { - $file_list=[]; - while (false !== ($file = readdir($handle))) { - if($file=='..' || $file=='.') continue; - $filePath = static::formatPath($dir.'/'.$file,"/"); - if(is_file($filePath)) { - if ('php' !== pathinfo($filePath, \PATHINFO_EXTENSION)) { - continue; - } - $classes = self::findClasses($filePath); - if (!empty($classes) && count($classes)){ - $file_list[] = [ - 'name'=>$classes[0], - 'path'=>$filePath - ]; - }else{ - $file_list=[]; - } - continue; - } - $file_list[$file] = static::getClassList($filePath); - foreach($file_list[$file] as $infile) { - $file_list[] = $infile; - } - unset($file_list[$file]); - } - closedir($handle); - return $file_list; - } - return []; - } - public static function getFileList($path){ - if(is_dir($path)) { - $dirList = scandir($path); - $list = []; - foreach ($dirList as $dir) { - if ($dir == '.' || $dir == '..') { - continue; - } - $sub_path = DirAndFile::formatPath($path . '/' . $dir, "/"); - if (is_file($sub_path)){ - $list[]=[ - 'name'=>$dir, - 'path'=>$sub_path - ];; - } - } - return $list; - } - return []; - } - - public static function formatPath($path,$type="/"){ - if ($type==="/"){ - $path = str_replace("\\","/",$path); - }else{ - $path = str_replace("/","\\",$path); - $path = str_replace("\\\\","\\",$path); - $endStr = substr($path, -1); - if ($endStr=='\\'){ - $path = substr($path,0,strlen($path)-1); - } - } - return $path; - } - - private static function findClasses($path) - { - $contents = file_get_contents($path); - $tokens = token_get_all($contents); - - $nsTokens = [\T_STRING => true, \T_NS_SEPARATOR => true]; - if (\defined('T_NAME_QUALIFIED')) { - $nsTokens[T_NAME_QUALIFIED] = true; - } - - $classes = []; - - $namespace = ''; - for ($i = 0; isset($tokens[$i]); ++$i) { - $token = $tokens[$i]; - - if (!isset($token[1])) { - continue; - } - - $class = ''; - - switch ($token[0]) { - case \T_NAMESPACE: - $namespace = ''; - // If there is a namespace, extract it - while (isset($tokens[++$i][1])) { - if (isset($nsTokens[$tokens[$i][0]])) { - $namespace .= $tokens[$i][1]; - } - } - $namespace .= '\\'; - break; - case \T_CLASS: - case \T_INTERFACE: - case \T_TRAIT: - // Skip usage of ::class constant - $isClassConstant = false; - for ($j = $i - 1; $j > 0; --$j) { - if (!isset($tokens[$j][1])) { - break; - } - - if (\T_DOUBLE_COLON === $tokens[$j][0]) { - $isClassConstant = true; - break; - } elseif (!\in_array($tokens[$j][0], [\T_WHITESPACE, \T_DOC_COMMENT, \T_COMMENT])) { - break; - } - } - - if ($isClassConstant) { - break; - } - - // Find the classname - while (isset($tokens[++$i][1])) { - $t = $tokens[$i]; - if (\T_STRING === $t[0]) { - $class .= $t[1]; - } elseif ('' !== $class && \T_WHITESPACE === $t[0]) { - break; - } - } - - $classes[] = ltrim($namespace.$class, '\\'); - break; - default: - break; - } - } - - return $classes; - } - - - /** - * 读取文件内容 - * @param $fileName - * @return false|string - */ - public static function getFileContent(string $fileName): string - { - $content = ""; - if (file_exists($fileName)) { - $handle = fopen($fileName, "r"); - $content = fread($handle, filesize($fileName)); - fclose($handle); - } - return $content; - } - - /** - * 保存文件 - * @param $path - * @param $str_tmp - * @return bool - */ - public static function createFile(string $path, string $str_tmp): bool - { - $pathArr = explode("/", $path); - unset($pathArr[count($pathArr) - 1]); - $dir = implode("/", $pathArr); - if (!file_exists($dir)) { - mkdir($dir, 0775, true); - } - $fp = fopen($path, "w") or die("Unable to open file!"); - fwrite($fp, $str_tmp); //存入内容 - fclose($fp); - return true; - } - - /** - * 判断文件是否存在后，删除 - * @access private - * @param string $path - * @return bool - */ - public static function unlink(string $path): bool - { - try { - return is_file($path) && unlink($path); - } catch (\Exception $e) { - return false; - } - } - - public static function checkFileExist(string $path) - { - try { - return $path; - } catch (\Exception $e) { - return $e; - } - } - - public static function deleteDir($path) { - if (!is_dir($path)) { - return false; - } - $open = opendir($path); - if (!$open) { - return false; - } - while (($v = readdir($open)) !== false) { - if ('.' == $v || '..' == $v) { - continue; - } - $item = $path . '/' . $v; - if (is_file($item)) { - unlink($item); - continue; - } - static::deleteDir($item); - } - closedir($open); - return rmdir($path); - } -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/utils/Helper.php b/vendor/hg/apidoc/src/utils/Helper.php deleted file mode 100644 index ba4d7bf9..00000000 --- a/vendor/hg/apidoc/src/utils/Helper.php +++ /dev/null @@ -1,578 +0,0 @@ - $code, - 'message' => $msg, - 'data' => $data, - ]; - $handle_response_json = ConfigProvider::get("handle_response_json"); - if (!empty($handle_response_json) && is_callable($handle_response_json)){ - return $handle_response_json($res); - } - return $res; - } - - - - /** - * 将tree树形数据转成list数据 - * @param array $tree tree数据 - * @param string $childName 子节点名称 - * @return array 转换后的list数据 - */ - public static function treeToList(array $tree, string $childName = 'children',string $key = "id",string $parentField = "parent") - { - $array = array(); - foreach ($tree as $val) { - $array[] = $val; - if (isset($val[$childName])) { - $children = static::treeToList($val[$childName], $childName); - if ($children) { - $newChildren = []; - foreach ($children as $item) { - $item[$parentField] = $val[$key]; - $newChildren[] = $item; - } - $array = array_merge($array, $newChildren); - } - } - } - return $array; - } - - - - /** - * 根据一组keys获取所有关联节点 - * @param $tree - * @param $keys - */ - public static function getTreeNodesByKeys(array $tree, array $keys, string $field = "id", string $childrenField = "children") - { - $list = static::TreeToList($tree, $childrenField, "key"); - $data = []; - foreach ($keys as $k => $v) { - $parent = !$k ? "" : $keys[$k - 1]; - foreach ($list as $item) { - if (((!empty($item['parent']) && $item['parent'] === $parent) || empty($item['parent'])) && $item[$field] == $v) { - $data[] = $item; - break; - } - } - } - return $data; - - } - - /** - * 根据一组keys过滤树形数据 - * @param $tree - * @param $keys - */ - public static function filterTreeNodesByKeys(array $tree, array $keys, string $field = "id", string $childrenField = "children") - { - $data=[]; - foreach ($tree as $k => $item) { - if (!empty($item[$childrenField])){ - $childrenList = static::filterTreeNodesByKeys($item[$childrenField],$keys,$field,$childrenField); - if (!empty($childrenList) && count($childrenList)){ - $item[$childrenField] = $childrenList; - $data[]=$item; - } - }else if(!empty($item[$field]) && in_array($item[$field],$keys)){ - $data[]=$item; - } - } - return $data; - } - - /** - * 替换模板变量 - * @param $temp - * @param $data - * @param $prefix - * @return string|string[] - */ - public static function replaceTemplate(string $temp, array $data, string $prefix = ""):string - { - $str = $temp; - foreach ($data as $k => $v) { - $key = '${'. $prefix . $k . '}'; - if (strpos($str, $key) !== false) { - $str = str_replace($key, $v, $str); - } - } - return $str; - } - - /** - * 替换当前所选应用/版本的变量 - * @param $temp - * @param $currentApps - * @return string|string[] - */ - public static function replaceCurrentAppTemplate(string $temp,array $currentApps):string - { - $str = $temp; - if (!empty($currentApps) && count($currentApps) > 0) { - $data = []; - for ($i = 0; $i <= 3; $i++) { - if (isset($currentApps[$i])) { - $appItem = $currentApps[$i]; - foreach ($appItem as $k => $v) { - $key = 'app[' . $i . '].' . $k; - $data[$key] = $v; - } - } else { - $appItem = $currentApps[0]; - foreach ($appItem as $k => $v) { - $key = 'app[' . $i . '].' . $k; - $data[$key] = ""; - } - } - } - $str = static::replaceTemplate($str, $data); - } - return $str; - } - - /** - * 根据条件获取数组中的值 - * @param array $array - * @param $query - * @return mixed|null - */ - public static function getArrayFind(array $array, $query) - { - $res = null; - if (is_array($array)) { - foreach ($array as $item) { - if ($query($item)) { - $res = $item; - break; - } - } - } - return $res; - } - - /** - * 根据条件获取数组中的index - * @param array $array - * @param $query - * @return mixed|null - */ - public static function getArrayFindIndex(array $array, $query) - { - $res = null; - if (is_array($array)) { - foreach ($array as $k=>$item) { - if ($query($item)) { - $res = $k; - break; - } - } - } - return $res; - } - - /** - * 查询符合条件的数组 - * @param array $array - * @param $query - * @return array - */ - public static function getArraybyQuery(array $array, $query) - { - $res = []; - if (is_array($array)) { - foreach ($array as $item) { - if ($query($item)) { - $res[] = $item; - } - } - } - return $res; - } - - /** - * 对象转为数组 - * @param $object - * @return mixed - */ - public static function objectToArray($object) { - $object = json_decode( json_encode($object),true); - return $object; - } - - /** - * 合并对象数组并根据key去重 - * @param string $key - * @param mixed ...$array - * @return array - */ - public static function arrayMergeAndUnique(string $key = "name", ...$array):array - { - $arrayByKey = []; - foreach ($array as $k => $arr) { - if (!empty($arr) && count($arr)){ - foreach ($arr as $item) { - if (!empty($item[$key])){ - $arrayByKey[$item[$key]] = $item; - } - } - } - } - $newArray = []; - foreach ($arrayByKey as $item) { - $newArray[]=$item; - } - return $newArray; - } - - /** - * 初始化当前所选的应用/版本数据 - * @param $appKey - */ - public static function getCurrentAppConfig(string $appKey,$config=""):array - { - if (empty($config)){ - $config = ConfigProvider::get(); - } - $config['apps'] = static::handleAppsConfig($config['apps'],false,$config); - if (!(!empty($config['apps']) && count($config['apps']) > 0)) { - throw new ErrorException("no config apps"); - } - if (strpos($appKey, ',') !== false) { - $keyArr = explode(",", $appKey); - } else { - $keyArr = [$appKey]; - } - $currentApps = static::getTreeNodesByKeys($config['apps'], $keyArr, 'key', 'items'); - if (!$currentApps) { - throw new ErrorException("appKey error", [ - 'appKey' => $appKey - ]); - } - return [ - 'appConfig'=>$currentApps[count($currentApps) - 1], - 'apps'=>$currentApps - ]; - - } - - public static function getCacheKey($type,$appKey,$lang="",$key="",$folder="apis"){ - return $folder."/".$type."_".$appKey."_".$lang."_".$key; - } - - /** - * 处理apps配置参数 - * @param array $apps - * @return array - */ - public static function handleAppsConfig(array $apps,$isHandlePassword=false,$config="", $parentKey = "",$filterAppKeys=[]):array - { - $appsConfig = []; - $separ = !empty($parentKey) ? ',' : ''; - foreach ($apps as $app) { - if (!empty($app['key'])){ - $appKey = $parentKey . $separ . $app['key']; - $app['appKey'] = $appKey; - } - if (!empty($app['password']) && $isHandlePassword===true) { - unset($app['password']); - $app['hasPassword'] = true; - } - if (!empty($app['title'])){ - $app['title'] = Lang::getLang($app['title'],$config); - } - if (!empty($app['items']) && count($app['items']) > 0) { - $app['items'] = static::handleAppsConfig($app['items'],$isHandlePassword,$config,$appKey,$filterAppKeys); - }else if (!empty($filterAppKeys) && count($filterAppKeys) && !in_array($appKey,$filterAppKeys)){ - continue; - } - if (!empty($app['groups']) && count($app['groups']) > 0){ - $app['groups'] = static::handleGroupsConfig($app['groups']); - } - if (!empty($app['params'])){ - if (!empty($app['params']['header']) && count($app['params']['header']) > 0){ - $app['params']['header'] = static::handleArrayParams($app['params']['header'],"desc"); - } - if (!empty($app['params']['query']) && count($app['params']['query']) > 0){ - $app['params']['query'] = static::handleArrayParams($app['params']['query'],"desc"); - } - if (!empty($app['params']['body']) && count($app['params']['body']) > 0){ - $app['params']['body'] = static::handleArrayParams($app['params']['body'],"desc"); - } - } - $appsConfig[] = $app; - } - return $appsConfig; - } - - public static function handleArrayParams($array,$field,$config=""){ - $data = []; - if (!empty($array) && is_array($array)){ - foreach ($array as $item){ - $item[$field] = Lang::getLang($item[$field],$config); - if (!empty($item['md'])){ - $item['md'] = ParseMarkdown::getContent("",$item['md']); - } - $data[]=$item; - } - } - return $data; - } - - public static function getAllApps(array $apps,$parentKey=""){ - $appList = []; - $separ = !empty($parentKey)?',':''; - foreach ($apps as $app) { - $appKey = $parentKey.$separ.$app['key']; - if (!empty($app['items']) && count($app['items'])){ - $items = static::getAllApps($app['items'],$appKey); - $appList = array_merge($appList,$items); - }else{ - $app['appKey'] = $appKey; - $appList[]=$app; - } - } - return $appList; - } - - /** - * 处理groups配置参数 - * @param array $groups - * @return array - */ - public static function handleGroupsConfig(array $groups):array - { - $groupConfig = []; - foreach ($groups as $group) { - if (!empty($group['title'])){ - $group['title'] = Lang::getLang($group['title']); - } - if (!empty($group['children']) && count($group['children']) > 0) { - $group['children'] = static::handleAppsConfig($group['children']); - } - $groupConfig[] = $group; - } - return $groupConfig; - } - - /** - * 驼峰转下划线 - * - * @param string $value - * @param string $delimiter - * @return string - */ - public static function snake(string $value, string $delimiter = '_'): string - { - $key = $value; - - if (isset(static::$snakeCache[$key][$delimiter])) { - return static::$snakeCache[$key][$delimiter]; - } - - if (!ctype_lower($value)) { - $value = preg_replace('/\s+/u', '', $value); - - $value = static::lower(preg_replace('/(.)(?=[A-Z])/u', '$1' . $delimiter, $value)); - } - - return static::$snakeCache[$key][$delimiter] = $value; - } - - /** - * 下划线转驼峰(首字母小写) - * - * @param string $value - * @return string - */ - public static function camel(string $value): string - { - return lcfirst(static::studly($value)); - } - - - /** - * 下划线转驼峰(首字母大写) - * - * @param string $value - * @return string - */ - public static function studly(string $value): string - { - $value = ucwords(str_replace(['-', '_'], ' ', $value)); - return str_replace(' ', '', $value); - } - - /** - * 字符串转小写 - * - * @param string $value - * @return string - */ - public static function lower(string $value): string - { - return mb_strtolower($value, 'UTF-8'); - } - - /** - * 创建随机key - * @param string $prefix - * @return string - */ - public static function createRandKey(string $prefix=""): string{ - return uniqid($prefix); - } - - /** - * 创建api的key - * @param string $path - * @param string $name - * @return string - */ - public static function createApiKey(string $path,string $name=""): string{ - if ($name){ - $key = $path."@".$name; - }else{ - $key = $path; - } - $res = urlencode($key); - return $res; - } - - - /** - * 二维数组根据key排序 - * @param $array - * @param string $field - * @param int $order - * @return mixed - */ - public static function arraySortByKey($array, $field="sort",$order=SORT_ASC){ - $sorts = []; - foreach ($array as $key => $row) { - $sorts[$key] = isset($row[$field])?$row[$field]:""; - } - array_multisort($sorts, $order, $array); - return $array; - } - - - /** - * 过滤所有空格换行符 - * @param $str - * @return array|string|string[] - */ - public static function trimEmpty($str){ - $search = array(" ","　","\n","\r","\t"); - $replace = array("","","","",""); - return str_replace($search, $replace, $str); - } - - - public static function getObjectFindByField(array $data,string $name = null) - { - // 无参数时获取所有 - if (empty($name)) { - return $data; - } - if (false === strpos($name, '.')) { - $name = strtolower($name); - return $data[$name] ?? []; - } - $name = explode('.', $name); - $name[0] = strtolower($name[0]); - $result = $data; - // 按.拆分成多维数组进行判断 - foreach ($name as $val) { - if (isset($result[$val])) { - $result = $result[$val]; - } else { - return []; - } - } - return $result; - } - - - public static function inArrayBuyKeyword(array $arr,string $keyword):bool{ - $is = false; - foreach ($arr as $item) { - if (strpos($item, $keyword) !== false){ - $is=true; - break; - } - } - return $is; - } - - /** - * 处理接口请求类型为数组 - * @param $method - * @return array|false|string[] - */ - public static function handleApiMethod($method){ - if (is_array($method)){ - return $method; - }else if (strpos($method, ',') !== false){ - return explode(",", strtoupper($method)); - }else { - return [strtoupper($method)]; - } - } - - - /** - * 获取数组中指定keys的值为新数组 - * @param array $array - * @param array $keys - * @return array - */ - public static function getArrayValuesByKeys(array $array,array $keys){ - $data = []; - foreach ($keys as $key) { - if (isset($array[$key])){ - $data[$key]=$array[$key]; - }else{ - $data[$key]=""; - } - } - return $data; - } - public static function arrayKeyFirst($array){ - if (function_exists('array_key_first')) { - return array_key_first($array); - }else{ - foreach($array as $key => $unused) { - return $key; - } - return NULL; - } - } - - - - - -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/utils/Lang.php b/vendor/hg/apidoc/src/utils/Lang.php deleted file mode 100644 index d765b30d..00000000 --- a/vendor/hg/apidoc/src/utils/Lang.php +++ /dev/null @@ -1,59 +0,0 @@ -1 ? trim($key[1]):""; - if (!empty($langKey)){ - return $langGetFunction($langKey); - } - } - } - return $string; - } - - /** - * 二维数组设置指定字段的多语言 - * @param $array - * @param $field - * @return array - */ - public static function getArrayLang($array,$field,$config=[]){ - $data = []; - if (!empty($array) && is_array($array)){ - foreach ($array as $item){ - $item[$field] = static::getLang($item[$field],$config); - $data[]=$item; - } - } - return $data; - } - - -} \ No newline at end of file diff --git a/vendor/hg/apidoc/src/utils/Request.php b/vendor/hg/apidoc/src/utils/Request.php deleted file mode 100644 index bd22bf9c..00000000 --- a/vendor/hg/apidoc/src/utils/Request.php +++ /dev/null @@ -1,46 +0,0 @@ -get = $_GET; - $this->post = $_POST; - $this->method = !empty($_SERVER['REQUEST_METHOD'])?$_SERVER['REQUEST_METHOD']:""; - } - - public function get(){ - return $this->get; - } - - public function post(){ - return $this->post; - } - - public function input(){ - $input = file_get_contents('php://input'); - $inputObj = json_decode($input); - return Helper::objectToArray($inputObj); - } - - public function param(){ - $config = ConfigProvider::get(); - if (!empty($config['request_params'])){ - return $config['request_params']; - } - $method = !empty($this->method)?$this->method:"GET"; - if ($method == "GET"){ - return $this->get; - } - return $this->input(); - } - -} \ No newline at end of file diff --git a/vendor/overtrue/easy-sms/.editorconfig b/vendor/overtrue/easy-sms/.editorconfig new file mode 100644 index 00000000..df55cd78 --- /dev/null +++ b/vendor/overtrue/easy-sms/.editorconfig @@ -0,0 +1,20 @@ +root = true + +[*] +indent_style = space +indent_size = 4 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = false + +[*.{vue,js,scss}] +charset = utf-8 +indent_style = space +indent_size = 2 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +[*.md] +trim_trailing_whitespace = false \ No newline at end of file diff --git a/vendor/overtrue/easy-sms/.github/FUNDING.yml b/vendor/overtrue/easy-sms/.github/FUNDING.yml new file mode 100644 index 00000000..273b78ee --- /dev/null +++ b/vendor/overtrue/easy-sms/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +github: [overtrue] diff --git a/vendor/overtrue/easy-sms/.github/workflows/tests.yml b/vendor/overtrue/easy-sms/.github/workflows/tests.yml new file mode 100644 index 00000000..263a7d03 --- /dev/null +++ b/vendor/overtrue/easy-sms/.github/workflows/tests.yml @@ -0,0 +1,24 @@ +name: Tests + +on: + push: + branches: [ master ] + pull_request: + +jobs: + phpunit: + strategy: + matrix: + php_version: [5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Setup PHP environment + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php_version }} + coverage: xdebug + - name: Install dependencies + run: composer install + - name: PHPUnit check + run: ./vendor/bin/phpunit --coverage-text diff --git a/vendor/overtrue/easy-sms/.php-cs-fixer.dist.php b/vendor/overtrue/easy-sms/.php-cs-fixer.dist.php new file mode 100644 index 00000000..e755e859 --- /dev/null +++ b/vendor/overtrue/easy-sms/.php-cs-fixer.dist.php @@ -0,0 +1,49 @@ +setRules([ + '@PSR12' => true, + 'binary_operator_spaces' => true, + 'blank_line_after_opening_tag' => true, + 'compact_nullable_typehint' => true, + 'declare_equal_normalize' => true, + 'lowercase_cast' => true, + 'lowercase_static_reference' => true, + 'new_with_braces' => true, + 'no_blank_lines_after_class_opening' => true, + 'no_leading_import_slash' => true, + 'no_whitespace_in_blank_line' => true, + 'no_unused_imports' => true, + 'ordered_class_elements' => [ + 'order' => [ + 'use_trait', + ], + ], + 'ordered_imports' => [ + 'imports_order' => [ + 'class', + 'function', + 'const', + ], + 'sort_algorithm' => 'none', + ], + 'return_type_declaration' => true, + 'short_scalar_cast' => true, + 'single_blank_line_before_namespace' => true, + 'single_trait_insert_per_statement' => true, + 'ternary_operator_spaces' => true, + 'unary_operator_spaces' => true, + 'visibility_required' => [ + 'elements' => [ +// 'const', + 'method', + 'property', + ], + ], + ]) + ->setFinder( + PhpCsFixer\Finder::create() + ->exclude('vendor') + ->in([__DIR__.'/src/', __DIR__.'/tests/']) + ) +; diff --git a/vendor/hg/apidoc/LICENSE b/vendor/overtrue/easy-sms/LICENSE similarity index 96% rename from vendor/hg/apidoc/LICENSE rename to vendor/overtrue/easy-sms/LICENSE index 367a697b..8afd9ead 100644 --- a/vendor/hg/apidoc/LICENSE +++ b/vendor/overtrue/easy-sms/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022 HG +Copyright (c) 2023 overtrue Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file +SOFTWARE. diff --git a/vendor/overtrue/easy-sms/README.md b/vendor/overtrue/easy-sms/README.md new file mode 100644 index 00000000..eb8ffe05 --- /dev/null +++ b/vendor/overtrue/easy-sms/README.md @@ -0,0 +1,1019 @@ +

Easy SMS

+ +

:calling: 一款满足你的多种发送需求的短信发送组件

+ +

+Build Status +Latest Stable Version +Latest Unstable Version +Code Coverage +Total Downloads +License +

+ +

+Sponsor me +

+ + +## 特点 + +1. 支持目前市面多家服务商 +1. 一套写法兼容所有平台 +1. 简单配置即可灵活增减服务商 +1. 内置多种服务商轮询策略、支持自定义轮询策略 +1. 统一的返回值格式，便于日志与监控 +1. 自动轮询选择可用的服务商 +1. 更多等你去发现与改进... + +## 平台支持 + +- [腾讯云 SMS](https://cloud.tencent.com/product/sms) +- [Ucloud](https://www.ucloud.cn) +- [七牛云](https://www.qiniu.com/) +- [SendCloud](http://www.sendcloud.net/) +- [阿里云](https://www.aliyun.com/) +- [云片](https://www.yunpian.com) +- [Submail](https://www.mysubmail.com) +- [螺丝帽](https://luosimao.com/) +- [容联云通讯](http://www.yuntongxun.com) +- [互亿无线](http://www.ihuyi.com) +- [聚合数据](https://www.juhe.cn) +- [百度云](https://cloud.baidu.com/) +- [华信短信平台](http://www.ipyy.com/) +- [253云通讯（创蓝）](https://www.253.com/) +- [创蓝云智](https://www.chuanglan.com/) +- [融云](http://www.rongcloud.cn) +- [天毅无线](http://www.85hu.com/) +- [阿凡达数据](http://www.avatardata.cn/) +- [华为云](https://www.huaweicloud.com/product/msgsms.html) +- [网易云信](https://yunxin.163.com/sms) +- [云之讯](https://www.ucpaas.com/index.html) +- [凯信通](http://www.kingtto.cn/) +- [UE35.net](http://uesms.ue35.cn/) +- [短信宝](http://www.smsbao.com/) +- [Tiniyo](https://tiniyo.com/) +- [摩杜云](https://www.moduyun.com/) +- [融合云（助通）](https://www.ztinfo.cn/products/sms) +- [蜘蛛云](https://zzyun.com/) +- [融合云信](https://maap.wo.cn/) +- [天瑞云](http://cms.tinree.com/) +- [时代互联](https://www.now.cn/) +- [火山引擎](https://console.volcengine.com/sms/) + +## 环境需求 + +- PHP >= 5.6 + +## 安装 + +```shell +$ composer require "overtrue/easy-sms" +``` + +**For Laravel notification** + +如果你喜欢使用 [Laravel Notification](https://laravel.com/docs/5.8/notifications), 可以考虑直接使用朋友封装的拓展包： + +https://github.com/yl/easysms-notification-channel + +## 使用 + +```php +use Overtrue\EasySms\EasySms; + +$config = [ + // HTTP 请求的超时时间（秒） + 'timeout' => 5.0, + + // 默认发送配置 + 'default' => [ + // 网关调用策略，默认：顺序调用 + 'strategy' => \Overtrue\EasySms\Strategies\OrderStrategy::class, + + // 默认可用的发送网关 + 'gateways' => [ + 'yunpian', 'aliyun', + ], + ], + // 可用的网关配置 + 'gateways' => [ + 'errorlog' => [ + 'file' => '/tmp/easy-sms.log', + ], + 'yunpian' => [ + 'api_key' => '824f0ff2f71cab52936axxxxxxxxxx', + ], + 'aliyun' => [ + 'access_key_id' => '', + 'access_key_secret' => '', + 'sign_name' => '', + ], + //... + ], +]; + +$easySms = new EasySms($config); + +$easySms->send(13188888888, [ + 'content' => '您的验证码为: 6379', + 'template' => 'SMS_001', + 'data' => [ + 'code' => 6379 + ], +]); +``` + +## 短信内容 + +由于使用多网关发送，所以一条短信要支持多平台发送，每家的发送方式不一样，但是我们抽象定义了以下公用属性： + +- `content` 文字内容，使用在像云片类似的以文字内容发送的平台 +- `template` 模板 ID，使用在以模板ID来发送短信的平台 +- `data` 模板变量，使用在以模板ID来发送短信的平台 + +所以，在使用过程中你可以根据所要使用的平台定义发送的内容。 + +```php +$easySms->send(13188888888, [ + 'content' => '您的验证码为: 6379', + 'template' => 'SMS_001', + 'data' => [ + 'code' => 6379 + ], +]); +``` + +你也可以使用闭包来返回对应的值： + +```php +$easySms->send(13188888888, [ + 'content' => function($gateway){ + return '您的验证码为: 6379'; + }, + 'template' => function($gateway){ + return 'SMS_001'; + }, + 'data' => function($gateway){ + return [ + 'code' => 6379 + ]; + }, +]); +``` + +你可以根据 `$gateway` 参数类型来判断返回值，例如： + +```php +$easySms->send(13188888888, [ + 'content' => function($gateway){ + if ($gateway->getName() == 'yunpian') { + return '云片专用验证码：1235'; + } + return '您的验证码为: 6379'; + }, + 'template' => function($gateway){ + if ($gateway->getName() == 'aliyun') { + return 'TP2818'; + } + return 'SMS_001'; + }, + 'data' => function($gateway){ + return [ + 'code' => 6379 + ]; + }, +]); +``` + +## 发送网关 + +默认使用 `default` 中的设置来发送，如果某一条短信你想要覆盖默认的设置。在 `send` 方法中使用第三个参数即可： + +```php +$easySms->send(13188888888, [ + 'content' => '您的验证码为: 6379', + 'template' => 'SMS_001', + 'data' => [ + 'code' => 6379 + ], + ], ['yunpian', 'juhe']); // 这里的网关配置将会覆盖全局默认值 +``` + +## 返回值 + +由于使用多网关发送，所以返回值为一个数组，结构如下： +```php +[ + 'yunpian' => [ + 'gateway' => 'yunpian', + 'status' => 'success', + 'result' => [...] // 平台返回值 + ], + 'juhe' => [ + 'gateway' => 'juhe', + 'status' => 'failure', + 'exception' => \Overtrue\EasySms\Exceptions\GatewayErrorException 对象 + ], + //... +] +``` + +如果所选网关列表均发送失败时，将会抛出 `Overtrue\EasySms\Exceptions\NoGatewayAvailableException` 异常，你可以使用 `$e->results` 获取发送结果。 + +你也可以使用 `$e` 提供的更多便捷方法： + +```php +$e->getResults(); // 返回所有 API 的结果，结构同上 +$e->getExceptions(); // 返回所有调用异常列表 +$e->getException($gateway); // 返回指定网关名称的异常对象 +$e->getLastException(); // 获取最后一个失败的异常对象 +``` + +## 自定义网关 + +本拓展已经支持用户自定义网关，你可以很方便的配置即可当成与其它拓展一样的使用： + +```php +$config = [ + ... + 'default' => [ + 'gateways' => [ + 'mygateway', // 配置你的网站到可用的网关列表 + ], + ], + 'gateways' => [ + 'mygateway' => [...], // 你网关所需要的参数，如果没有可以不配置 + ], +]; + +$easySms = new EasySms($config); + +// 注册 +$easySms->extend('mygateway', function($gatewayConfig){ + // $gatewayConfig 来自配置文件里的 `gateways.mygateway` + return new MyGateway($gatewayConfig); +}); + +$easySms->send(13188888888, [ + 'content' => '您的验证码为: 6379', + 'template' => 'SMS_001', + 'data' => [ + 'code' => 6379 + ], +]); +``` + +## 国际短信 + +国际短信与国内短信的区别是号码前面需要加国际码，但是由于各平台对国际号码的写法不一致，所以在发送国际短信的时候有一点区别： + +```php +use Overtrue\EasySms\PhoneNumber; + +// 发送到国际码为 31 的国际号码 +$number = new PhoneNumber(13188888888, 31); + +$easySms->send($number, [ + 'content' => '您的验证码为: 6379', + 'template' => 'SMS_001', + 'data' => [ + 'code' => 6379 + ], +]); +``` + +## 定义短信 + +你可以根据发送场景的不同，定义不同的短信类，从而实现一处定义多处调用，你可以继承 `Overtrue\EasySms\Message` 来定义短信模型： + +```php +order = $order; + } + + // 定义直接使用内容发送平台的内容 + public function getContent(GatewayInterface $gateway = null) + { + return sprintf('您的订单:%s, 已经完成付款', $this->order->no); + } + + // 定义使用模板发送方式平台所需要的模板 ID + public function getTemplate(GatewayInterface $gateway = null) + { + return 'SMS_003'; + } + + // 模板参数 + public function getData(GatewayInterface $gateway = null) + { + return [ + 'order_no' => $this->order->no + ]; + } +} +``` + +> 更多自定义方式请参考：[`Overtrue\EasySms\Message`](Overtrue\EasySms\Message;) + +发送自定义短信： + +```php +$order = ...; +$message = new OrderPaidMessage($order); + +$easySms->send(13188888888, $message); +``` + +## 各平台配置说明 + +### [阿里云](https://www.aliyun.com/) + +短信内容使用 `template` + `data` + +```php + 'aliyun' => [ + 'access_key_id' => '', + 'access_key_secret' => '', + 'sign_name' => '', + ], +``` + +### [阿里云Rest](https://www.aliyun.com/) + +短信内容使用 `template` + `data` + +```php + 'aliyunrest' => [ + 'app_key' => '', + 'app_secret_key' => '', + 'sign_name' => '', + ], +``` + +### [阿里云国际](https://www.alibabacloud.com/help/zh/doc-detail/160524.html) + +短信内容使用 `template` + `data` + +```php + 'aliyunintl' => [ + 'access_key_id' => '', + 'access_key_secret' => '', + 'sign_name' => '', + ], +``` + +发送示例： + +```php +use Overtrue\EasySms\PhoneNumber; + +$easySms = new EasySms($config); +$phone_number = new PhoneNumber(18888888888, 86); + +$easySms->send($phone_number, [ + 'content' => '您好：先生/女士！您的验证码为${code}，有效时间是5分钟，请及时验证。', + 'template' => 'SMS_00000001', // 模板ID + 'data' => [ + "code" => 521410, + ], +]); +``` + +### [云片](https://www.yunpian.com) + +短信内容使用 `content` + +```php + 'yunpian' => [ + 'api_key' => '', + 'signature' => '【默认签名】', // 内容中无签名时使用 + ], +``` + +### [Submail](https://www.mysubmail.com) + +短信内容使用 `data` + +```php + 'submail' => [ + 'app_id' => '', + 'app_key' => '', + 'project' => '', // 默认 project，可在发送时 data 中指定 + ], +``` + +### [螺丝帽](https://luosimao.com/) + +短信内容使用 `content` + +```php + 'luosimao' => [ + 'api_key' => '', + ], +``` + +### [容联云通讯](http://www.yuntongxun.com) + +短信内容使用 `template` + `data` + +```php + 'yuntongxun' => [ + 'app_id' => '', + 'account_sid' => '', + 'account_token' => '', + 'is_sub_account' => false, + ], +``` + +### [互亿无线](http://www.ihuyi.com) + +短信内容使用 `content` + +```php + 'huyi' => [ + 'api_id' => '', + 'api_key' => '', + 'signature' => '', + ], +``` + +### [聚合数据](https://www.juhe.cn) + +短信内容使用 `template` + `data` + +```php + 'juhe' => [ + 'app_key' => '', + ], +``` + +### [SendCloud](http://www.sendcloud.net/) + +短信内容使用 `template` + `data` + +```php + 'sendcloud' => [ + 'sms_user' => '', + 'sms_key' => '', + 'timestamp' => false, // 是否启用时间戳 + ], +``` +### [百度云](https://cloud.baidu.com/) + +短信内容使用 `template` + `data` + +```php + 'baidu' => [ + 'ak' => '', + 'sk' => '', + 'invoke_id' => '', + 'domain' => '', + ], +``` + +### [华信短信平台](http://www.ipyy.com/) + +短信内容使用 `content` + +```php + 'huaxin' => [ + 'user_id' => '', + 'password' => '', + 'account' => '', + 'ip' => '', + 'ext_no' => '', + ], +``` + +### [253云通讯（创蓝）](https://www.253.com/) + +短信内容使用 `content` + +```php + 'chuanglan' => [ + 'account' => '', + 'password' => '', + + // 国际短信时必填 + 'intel_account' => '', + 'intel_password' => '', + + // \Overtrue\EasySms\Gateways\ChuanglanGateway::CHANNEL_VALIDATE_CODE => 验证码通道（默认） + // \Overtrue\EasySms\Gateways\ChuanglanGateway::CHANNEL_PROMOTION_CODE => 会员营销通道 + 'channel' => \Overtrue\EasySms\Gateways\ChuanglanGateway::CHANNEL_VALIDATE_CODE, + + // 会员营销通道 特定参数。创蓝规定：api提交营销短信的时候，需要自己加短信的签名及退订信息 + 'sign' => '【通讯云】', + 'unsubscribe' => '回TD退订', + ], +``` + +### [创蓝云智](https://www.chuanglan.com/) + +普通短信发送内容使用 `content` + +```php + 'chuanglanv1' => [ + 'account' => '', + 'password' => '', + 'needstatus' => false, + 'channel' => \Overtrue\EasySms\Gateways\Chuanglanv1Gateway::CHANNEL_NORMAL_CODE, + ], +``` +发送示例： + +```php +$easySms->send(18888888888, [ + 'content' => xxxxxxx +]); +``` + +变量短信发送内容使用 `template` + `data` + +```php + 'chuanglanv1' => [ + 'account' => '', + 'password' => '', + 'needstatus' => false, + 'channel' => \Overtrue\EasySms\Gateways\Chuanglanv1Gateway::CHANNEL_VARIABLE_CODE, + ], +``` +发送示例： + +```php +$easySms->send(18888888888, [ + 'template' => xxxxxx, // 模板内容 + 'data' => 'phone":"15800000000,1234；15300000000,4321', +]); +``` + +### [融云](http://www.rongcloud.cn) + +短信分为两大类，验证类和通知类短信。 发送验证类短信使用 `template` + `data` + +```php + 'rongcloud' => [ + 'app_key' => '', + 'app_secret' => '', + ] +``` + +### [天毅无线](http://www.85hu.com/) + +短信内容使用 `content` + +```php + 'tianyiwuxian' => [ + 'username' => '', //用户名 + 'password' => '', //密码 + 'gwid' => '', //网关ID + ] +``` + +### [twilio](https://www.twilio.com) + +短信使用 `content` +发送对象需要 使用`+`添加区号 + +```php + 'twilio' => [ + 'account_sid' => '', // sid + 'from' => '', // 发送的号码 可以在控制台购买 + 'token' => '', // apitoken + ], +``` + +### [tiniyo](https://www.tiniyo.com) + +短信使用 `content` +发送对象需要 使用`+`添加区号 + +```php + 'tiniyo' => [ + 'account_sid' => '', // auth_id from https://tiniyo.com + 'from' => '', // 发送的号码 可以在控制台购买 + 'token' => '', // auth_secret from https://tiniyo.com + ], +``` + + +### [腾讯云 SMS](https://cloud.tencent.com/product/sms) + +短信内容使用 `template` + `data` + +```php + 'qcloud' => [ + 'sdk_app_id' => '', // 短信应用的 SDK APP ID + 'secret_id' => '', // SECRET ID + 'secret_key' => '', // SECRET KEY + 'sign_name' => '腾讯CoDesign', // 短信签名 + ], +``` + +发送示例： + +```php +$easySms->send(18888888888, [ + 'template' => 101234, // 模板ID + 'data' => [ + "a", 'b', 'c', 'd', //按占位顺序给值 + ], +]); +``` + +### [阿凡达数据](http://www.avatardata.cn/) + +短信内容使用 `template` + `data` + +```php + 'avatardata' => [ + 'app_key' => '', // APP KEY + ], +``` + +### [华为云 SMS](https://www.huaweicloud.com/product/msgsms.html) + +短信内容使用 `template` + `data` + +```php + 'huawei' => [ + 'endpoint' => '', // APP接入地址 + 'app_key' => '', // APP KEY + 'app_secret' => '', // APP SECRET + 'from' => [ + 'default' => '1069012345', // 默认使用签名通道号 + 'custom' => 'csms12345', // 其他签名通道号 可以在 data 中定义 from 来指定 + 'abc' => 'csms67890', // 其他签名通道号 + ... + ], + 'callback' => '' // 短信状态回调地址 + ], +``` + +使用默认签名通道 `default` + +```php +$easySms->send(13188888888, [ + 'template' => 'SMS_001', + 'data' => [ + 6379 + ], +]); +``` + +使用指定签名通道 + +```php +$easySms->send(13188888888, [ + 'template' => 'SMS_001', + 'data' => [ + 6379, + 'from' => 'custom' // 对应 config 中的 from 数组中 custom + ], +]); +``` + +### [网易云信](https://yunxin.163.com/sms) + +短信内容使用 `template` + `data` + +```php + 'yunxin' => [ + 'app_key' => '', + 'app_secret' => '', + 'code_length' => 4, // 随机验证码长度，范围 4～10，默认为 4 + 'need_up' => false, // 是否需要支持短信上行 + ], +``` + +```php +$easySms->send(18888888888, [ + 'template' => 'SMS_001', // 不填则使用默认模板 + 'data' => [ + 'code' => 8946, // 如果设置了该参数，则 code_length 参数无效 + 'action' => 'sendCode', // 默认为 `sendCode`，校验短信验证码使用 `verifyCode` + ], +]); +``` +通知模板短信 + +```php +$easySms->send(18888888888, [ + 'template' => 'templateid', // 模板编号(由客户顾问配置之后告知开发者) + 'data' => [ + 'action' => 'sendTemplate', // 默认为 `sendCode`，校验短信验证码使用 `verifyCode` + 'params' => [1,2,3], //短信参数列表，用于依次填充模板 + ], +]); +``` + + +### [云之讯](https://www.ucpaas.com/index.html) + +短信内容使用 `template` + `data` + +```php + 'yunzhixun' => [ + 'sid' => '', + 'token' => '', + 'app_id' => '', + ], +``` + +```php +$easySms->send(18888888888, [ + 'template' => 'SMS_001', + 'data' => [ + 'params' => '8946,3', // 模板参数，多个参数使用 `,` 分割，模板无参数时可为空 + 'uid' => 'hexianghui', // 用户 ID，随状态报告返回，可为空 + 'mobiles' => '18888888888,188888888889', // 批量发送短信，手机号使用 `,` 分割，不使用批量发送请不要设置该参数 + ], +]); +``` + +### [凯信通](http://www.kingtto.cn/) + +短信内容使用 `content` + +```php + 'kingtto' => [ + 'userid' => '', + 'account' => '', + 'password' => '', + ], +``` + +```php +$easySms->send(18888888888, [ + 'content' => '您的验证码为: 6379', +]); +``` + +### [七牛云](https://www.qiniu.com/) + +短信内容使用 `template` + `data` + +```php + 'qiniu' => [ + 'secret_key' => '', + 'access_key' => '', + ], +``` + +```php +$easySms->send(18888888888, [ + 'template' => '1231234123412341234', + 'data' => [ + 'code' => 1234, + ], +]); +``` +### [Ucloud](https://www.ucloud.cn/) +短信使用 `template` + `data` + +```php + 'ucloud' => [ + 'private_key' => '', //私钥 + 'public_key' => '', //公钥 + 'sig_content' => '', // 短信签名, + 'project_id' => '', //项目ID,子账号才需要该参数 + ], +``` + +```php +$easySms->send(18888888888, [ + 'template' => 'UTAXXXXX', //短信模板 + 'data' => [ + 'code' => 1234, //模板参数，模板没有参数不用则填写，有多个参数请用数组，[1111,1111] + 'mobiles' =>'', //同时发送多个手机短信，请用数组[xxx,xxx] + ], +]); + +``` + + +### [短信宝](http://www.smsbao.com/) +短信使用 `content` + +```php + 'smsbao' => [ + 'user' => '', //账号 + 'password' => '' //密码 + ], +``` + +```php +$easySms->send(18888888888, [ + 'content' => '您的验证码为: 6379', //短信模板 +]); + +``` + +### [摩杜云](https://www.moduyun.com/) +短信使用 `template` + `data` + +```php + 'moduyun' => [ + 'accesskey' => '', //必填 ACCESS KEY + 'secretkey' => '', //必填 SECRET KEY + 'signId' => '', //选填 短信签名，如果使用默认签名，该字段可缺省 + 'type' => 0, //选填 0:普通短信;1:营销短信 + ], +``` + +```php +$easySms->send(18888888888, [ + 'template' => '5a95****b953', //短信模板 + 'data' => [ + 1234, //模板参数，对应模板的{1} + 30 //模板参数，对应模板的{2} + //... + ], +]); + +``` + +### [融合云（助通）](https://www.ztinfo.cn/products/sms) + +短信使用 `template` + `data` + +```php + 'rongheyun' => [ + 'username' => '', //必填 用户名 + 'password' => '', //必填 密码 + 'signature'=> '', //必填 已报备的签名 + ], +``` + +```php +$easySms->send(18888888888, [ + 'template' => '31874', //短信模板 + 'data' => [ + 'valid_code' => '888888', //模板参数，对应模板的{valid_code} + //... + ], +]); + +``` + +### [蜘蛛云](https://zzyun.com/) + +短信使用 `template` + `data` + +```php + 'zzyun' => [ + 'user_id' => '', //必填 会员ID + 'secret' => '', //必填 接口密钥 + 'sign_name'=> '', //必填 短信签名 + ], +``` + +```php +$easySms->send(18888888888, [ + 'template' => 'SMS_210317****', //短信模板 + 'data' => [ + 'code' => '888888', //模板参数，对应模板的{code} + //... + ], +]); + +``` + +### [融合云信](https://maap.wo.cn/) + +短信使用 `template` + `data` + +```php + 'maap' => [ + 'cpcode' => '', //必填 商户编码 + 'key' => '', //必填 接口密钥 + 'excode'=> '', //选填 扩展名 + ], +``` + +```php +$easySms->send(18888888888, [ + 'template' => '356120', //短信模板 + 'data' => [ + '123465' + ],//模板参数 +]); + +``` + +### [天瑞云](http://cms.tinree.com/) + +短信内容使用 `template` + `data` + +```php + 'tinree' => [ + 'accesskey' => '', // 平台分配给用户的accesskey + 'secret' => '', // 平台分配给用户的secret + 'sign' => '', // 平台上申请的接口短信签名或者签名ID + ], +``` + +发送示例： + +```php +$easySms->send(18888888888, [ + 'template' => '123456', // 模板ID + 'data' => [ + "a", 'b', 'c', //按模板变量占位顺序 + ], +]); +``` + +### [时代互联](https://www.now.cn/) + +短信使用 `content` + +```php + 'nowcn' => [ + 'key' => '', //用户ID + 'secret' => '', //开发密钥 + 'api_type' => '', // 短信通道, + ], +``` + +发送示例： +```php +$easySms->send(18888888888, [ + 'content' => '您的验证码为: 6379', +]); +``` + +### [火山引擎](https://console.volcengine.com/sms/) + +短信内容使用 `template` + `data` + +```php + 'volcengine' => [ + 'access_key_id' => '', // 平台分配给用户的access_key_id + 'access_key_secret' => '', // 平台分配给用户的access_key_secret + 'region_id' => 'cn-north-1', // 国内节点 cn-north-1，国外节点 ap-singapore-1，不填或填错，默认使用国内节点 + 'sign_name' => '', // 平台上申请的接口短信签名或者签名ID，可不填，发送短信时data中指定 + 'sms_account' => '', // 消息组帐号,火山短信页面右上角，短信应用括号中的字符串，可不填，发送短信时data中指定 + ], +``` + +发送示例1： + +```php +$easySms->send(18888888888, [ + 'template' => 'SMS_123456', // 模板ID + 'data' => [ + "code" => 1234 // 模板变量 + ], +]); +``` + +发送示例2： +```php +$easySms->send(18888888888, [ + 'template' => 'SMS_123456', // 模板ID + 'data' => [ + "template_param" => ["code" => 1234], // 模板变量参数 + "sign_name" => "yoursignname", // 签名，覆盖配置文件中的sign_name + "sms_account" => "yoursmsaccount", // 消息组帐号，覆盖配置文件中的sms_account + "phone_numbers" => "18888888888,18888888889", // 手机号，批量发送，英文的逗号连接多个手机号，覆盖发送方法中的填入的手机号 + ], +]); +``` + +## :heart: 支持我 + +[![Sponsor me](https://github.com/overtrue/overtrue/blob/master/sponsor-me.svg?raw=true)](https://github.com/sponsors/overtrue) + +如果你喜欢我的项目并想支持它，[点击这里 :heart:](https://github.com/sponsors/overtrue) + +## Project supported by JetBrains + +Many thanks to Jetbrains for kindly providing a license for me to work on this and other open-source projects. + +[![](https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.svg)](https://www.jetbrains.com/?from=https://github.com/overtrue) + + +## PHP 扩展包开发 + +> 想知道如何从零开始构建 PHP 扩展包？ +> +> 请关注我的实战课程，我会在此课程中分享一些扩展开发经验 —— [《PHP 扩展包实战教程 - 从入门到发布》](https://learnku.com/courses/creating-package) + +## License + +MIT diff --git a/vendor/overtrue/easy-sms/composer.json b/vendor/overtrue/easy-sms/composer.json new file mode 100644 index 00000000..716c5163 --- /dev/null +++ b/vendor/overtrue/easy-sms/composer.json @@ -0,0 +1,62 @@ +{ + "name": "overtrue/easy-sms", + "description": "The easiest way to send short message.", + "type": "library", + "require": { + "guzzlehttp/guzzle": "^6.2 || ^7.0", + "php": ">=5.6", + "ext-json": "*" + }, + "require-dev": { + "phpunit/phpunit": "^5.7 || ^7.5 || ^8.5.19 || ^9.5.8", + "mockery/mockery": "~1.3.3 || ^1.4.2", + "brainmaestro/composer-git-hooks": "^2.8", + "jetbrains/phpstorm-attributes": "^1.0" + }, + "autoload": { + "psr-4": { + "Overtrue\\EasySms\\": "src" + } + }, + "autoload-dev": { + "psr-4": { + "Overtrue\\EasySms\\Tests\\": "tests" + } + }, + "license": "MIT", + "authors": [{ + "name": "overtrue", + "email": "i@overtrue.me" + }], + "extra": { + "hooks": { + "pre-commit": [ + "composer check-style", + "composer psalm", + "composer test" + ], + "pre-push": [ + "composer check-style" + ] + } + }, + "scripts": { + "post-update-cmd": [ + "cghooks remove", + "cghooks add --ignore-lock", + "cghooks update" + ], + "post-merge": "composer install", + "post-install-cmd": [ + "cghooks remove", + "cghooks add --ignore-lock", + "cghooks update" + ], + "phpstan": "phpstan analyse", + "check-style": "php-cs-fixer fix --using-cache=no --diff --config=.php-cs-fixer.dist.php --dry-run --allow-risky=yes --ansi", + "fix-style": "php-cs-fixer fix --using-cache=no --config=.php-cs-fixer.dist.php --allow-risky=yes --ansi", + "test": "phpunit --colors", + "psalm": "psalm --show-info=true --no-cache", + "psalm-fix": "psalm --no-cache --alter --issues=MissingReturnType,MissingParamType" + } +} diff --git a/vendor/overtrue/easy-sms/psalm.xml b/vendor/overtrue/easy-sms/psalm.xml new file mode 100644 index 00000000..f8edfd3a --- /dev/null +++ b/vendor/overtrue/easy-sms/psalm.xml @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/vendor/overtrue/easy-sms/src/Contracts/GatewayInterface.php b/vendor/overtrue/easy-sms/src/Contracts/GatewayInterface.php new file mode 100644 index 00000000..34246770 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Contracts/GatewayInterface.php @@ -0,0 +1,38 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Contracts; + +use Overtrue\EasySms\Support\Config; + +/** + * Class GatewayInterface. + */ +interface GatewayInterface +{ + /** + * Get gateway name. + * + * @return string + */ + public function getName(); + + /** + * Send a short message. + * + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param \Overtrue\EasySms\Support\Config $config + * + * @return array + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config); +} diff --git a/vendor/overtrue/easy-sms/src/Contracts/MessageInterface.php b/vendor/overtrue/easy-sms/src/Contracts/MessageInterface.php new file mode 100644 index 00000000..7c17f100 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Contracts/MessageInterface.php @@ -0,0 +1,63 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Contracts; + +/** + * Interface MessageInterface. + */ +interface MessageInterface +{ + const TEXT_MESSAGE = 'text'; + + const VOICE_MESSAGE = 'voice'; + + /** + * Return the message type. + * + * @return string + */ + public function getMessageType(); + + /** + * Return message content. + * + * @param \Overtrue\EasySms\Contracts\GatewayInterface|null $gateway + * + * @return string + */ + public function getContent(GatewayInterface $gateway = null); + + /** + * Return the template id of message. + * + * @param \Overtrue\EasySms\Contracts\GatewayInterface|null $gateway + * + * @return string + */ + public function getTemplate(GatewayInterface $gateway = null); + + /** + * Return the template data of message. + * + * @param \Overtrue\EasySms\Contracts\GatewayInterface|null $gateway + * + * @return array + */ + public function getData(GatewayInterface $gateway = null); + + /** + * Return message supported gateways. + * + * @return array + */ + public function getGateways(); +} diff --git a/vendor/overtrue/easy-sms/src/Contracts/PhoneNumberInterface.php b/vendor/overtrue/easy-sms/src/Contracts/PhoneNumberInterface.php new file mode 100644 index 00000000..7d646480 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Contracts/PhoneNumberInterface.php @@ -0,0 +1,53 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Contracts; + +/** + * Interface PhoneNumberInterface. + * + * @author overtrue + */ +interface PhoneNumberInterface extends \JsonSerializable +{ + /** + * 86. + * + * @return int + */ + public function getIDDCode(); + + /** + * 18888888888. + * + * @return int + */ + public function getNumber(); + + /** + * +8618888888888. + * + * @return string + */ + public function getUniversalNumber(); + + /** + * 008618888888888. + * + * @return string + */ + public function getZeroPrefixedNumber(); + + /** + * @return string + */ + public function __toString(); +} diff --git a/vendor/overtrue/easy-sms/src/Contracts/StrategyInterface.php b/vendor/overtrue/easy-sms/src/Contracts/StrategyInterface.php new file mode 100644 index 00000000..1cda2c71 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Contracts/StrategyInterface.php @@ -0,0 +1,27 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Contracts; + +/** + * Interface StrategyInterface. + */ +interface StrategyInterface +{ + /** + * Apply the strategy and return result. + * + * @param array $gateways + * + * @return array + */ + public function apply(array $gateways); +} diff --git a/vendor/overtrue/easy-sms/src/EasySms.php b/vendor/overtrue/easy-sms/src/EasySms.php new file mode 100644 index 00000000..9fc68e74 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/EasySms.php @@ -0,0 +1,326 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms; + +use Closure; +use Overtrue\EasySms\Contracts\GatewayInterface; +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Contracts\StrategyInterface; +use Overtrue\EasySms\Exceptions\InvalidArgumentException; +use Overtrue\EasySms\Gateways\Gateway; +use Overtrue\EasySms\Strategies\OrderStrategy; +use Overtrue\EasySms\Support\Config; + +/** + * Class EasySms. + */ +class EasySms +{ + /** + * @var \Overtrue\EasySms\Support\Config + */ + protected $config; + + /** + * @var string + */ + protected $defaultGateway; + + /** + * @var array + */ + protected $customCreators = []; + + /** + * @var array + */ + protected $gateways = []; + + /** + * @var \Overtrue\EasySms\Messenger + */ + protected $messenger; + + /** + * @var array + */ + protected $strategies = []; + + /** + * Constructor. + * + * @param array $config + */ + public function __construct(array $config) + { + $this->config = new Config($config); + } + + /** + * Send a message. + * + * @param string|array $to + * @param \Overtrue\EasySms\Contracts\MessageInterface|array $message + * @param array $gateways + * + * @return array + * + * @throws \Overtrue\EasySms\Exceptions\InvalidArgumentException + * @throws \Overtrue\EasySms\Exceptions\NoGatewayAvailableException + */ + public function send($to, $message, array $gateways = []) + { + $to = $this->formatPhoneNumber($to); + $message = $this->formatMessage($message); + $gateways = empty($gateways) ? $message->getGateways() : $gateways; + + if (empty($gateways)) { + $gateways = $this->config->get('default.gateways', []); + } + + return $this->getMessenger()->send($to, $message, $this->formatGateways($gateways)); + } + + /** + * Create a gateway. + * + * @param string|null $name + * + * @return \Overtrue\EasySms\Contracts\GatewayInterface + * + * @throws \Overtrue\EasySms\Exceptions\InvalidArgumentException + */ + public function gateway($name) + { + if (!isset($this->gateways[$name])) { + $this->gateways[$name] = $this->createGateway($name); + } + + return $this->gateways[$name]; + } + + /** + * Get a strategy instance. + * + * @param string|null $strategy + * + * @return \Overtrue\EasySms\Contracts\StrategyInterface + * + * @throws \Overtrue\EasySms\Exceptions\InvalidArgumentException + */ + public function strategy($strategy = null) + { + if (\is_null($strategy)) { + $strategy = $this->config->get('default.strategy', OrderStrategy::class); + } + + if (!\class_exists($strategy)) { + $strategy = __NAMESPACE__.'\Strategies\\'.\ucfirst($strategy); + } + + if (!\class_exists($strategy)) { + throw new InvalidArgumentException("Unsupported strategy \"{$strategy}\""); + } + + if (empty($this->strategies[$strategy]) || !($this->strategies[$strategy] instanceof StrategyInterface)) { + $this->strategies[$strategy] = new $strategy($this); + } + + return $this->strategies[$strategy]; + } + + /** + * Register a custom driver creator Closure. + * + * @param string $name + * @param \Closure $callback + * + * @return $this + */ + public function extend($name, Closure $callback) + { + $this->customCreators[$name] = $callback; + + return $this; + } + + /** + * @return \Overtrue\EasySms\Support\Config + */ + public function getConfig() + { + return $this->config; + } + + /** + * @return \Overtrue\EasySms\Messenger + */ + public function getMessenger() + { + return $this->messenger ?: $this->messenger = new Messenger($this); + } + + /** + * Create a new driver instance. + * + * @param string $name + * + * @throws \InvalidArgumentException + * + * @return GatewayInterface + * + * @throws \Overtrue\EasySms\Exceptions\InvalidArgumentException + */ + protected function createGateway($name) + { + $config = $this->config->get("gateways.{$name}", []); + + if (!isset($config['timeout'])) { + $config['timeout'] = $this->config->get('timeout', Gateway::DEFAULT_TIMEOUT); + } + + $config['options'] = $this->config->get('options', []); + + if (isset($this->customCreators[$name])) { + $gateway = $this->callCustomCreator($name, $config); + } else { + $className = $this->formatGatewayClassName($name); + $gateway = $this->makeGateway($className, $config); + } + + if (!($gateway instanceof GatewayInterface)) { + throw new InvalidArgumentException(\sprintf('Gateway "%s" must implement interface %s.', $name, GatewayInterface::class)); + } + + return $gateway; + } + + /** + * Make gateway instance. + * + * @param string $gateway + * @param array $config + * + * @return \Overtrue\EasySms\Contracts\GatewayInterface + * + * @throws \Overtrue\EasySms\Exceptions\InvalidArgumentException + */ + protected function makeGateway($gateway, $config) + { + if (!\class_exists($gateway) || !\in_array(GatewayInterface::class, \class_implements($gateway))) { + throw new InvalidArgumentException(\sprintf('Class "%s" is a invalid easy-sms gateway.', $gateway)); + } + + return new $gateway($config); + } + + /** + * Format gateway name. + * + * @param string $name + * + * @return string + */ + protected function formatGatewayClassName($name) + { + if (\class_exists($name) && \in_array(GatewayInterface::class, \class_implements($name))) { + return $name; + } + + $name = \ucfirst(\str_replace(['-', '_', ''], '', $name)); + + return __NAMESPACE__."\\Gateways\\{$name}Gateway"; + } + + /** + * Call a custom gateway creator. + * + * @param string $gateway + * @param array $config + * + * @return mixed + */ + protected function callCustomCreator($gateway, $config) + { + return \call_user_func($this->customCreators[$gateway], $config); + } + + /** + * @param string|\Overtrue\EasySms\Contracts\PhoneNumberInterface $number + * + * @return \Overtrue\EasySms\Contracts\PhoneNumberInterface|string + */ + protected function formatPhoneNumber($number) + { + if ($number instanceof PhoneNumberInterface) { + return $number; + } + + return new PhoneNumber(\trim($number)); + } + + /** + * @param array|string|\Overtrue\EasySms\Contracts\MessageInterface $message + * + * @return \Overtrue\EasySms\Contracts\MessageInterface + */ + protected function formatMessage($message) + { + if (!($message instanceof MessageInterface)) { + if (!\is_array($message)) { + $message = [ + 'content' => $message, + 'template' => $message, + ]; + } + + $message = new Message($message); + } + + return $message; + } + + /** + * @param array $gateways + * + * @return array + * + * @throws \Overtrue\EasySms\Exceptions\InvalidArgumentException + */ + protected function formatGateways(array $gateways) + { + $formatted = []; + + foreach ($gateways as $gateway => $setting) { + if (\is_int($gateway) && \is_string($setting)) { + $gateway = $setting; + $setting = []; + } + + $formatted[$gateway] = $setting; + $globalSettings = $this->config->get("gateways.{$gateway}", []); + + if (\is_string($gateway) && !empty($globalSettings) && \is_array($setting)) { + $formatted[$gateway] = new Config(\array_merge($globalSettings, $setting)); + } + } + + $result = []; + + foreach ($this->strategy()->apply($formatted) as $name) { + $result[$name] = $formatted[$name]; + } + + return $result; + } +} diff --git a/vendor/overtrue/easy-sms/src/Exceptions/Exception.php b/vendor/overtrue/easy-sms/src/Exceptions/Exception.php new file mode 100644 index 00000000..079d4153 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Exceptions/Exception.php @@ -0,0 +1,21 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Exceptions; + +/** + * Class Exception. + * + * @author overtrue + */ +class Exception extends \Exception +{ +} diff --git a/vendor/overtrue/easy-sms/src/Exceptions/GatewayErrorException.php b/vendor/overtrue/easy-sms/src/Exceptions/GatewayErrorException.php new file mode 100644 index 00000000..e183deff --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Exceptions/GatewayErrorException.php @@ -0,0 +1,37 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Exceptions; + +/** + * Class GatewayErrorException. + */ +class GatewayErrorException extends Exception +{ + /** + * @var array + */ + public $raw = []; + + /** + * GatewayErrorException constructor. + * + * @param string $message + * @param int $code + * @param array $raw + */ + public function __construct($message, $code, array $raw = []) + { + parent::__construct($message, intval($code)); + + $this->raw = $raw; + } +} diff --git a/vendor/overtrue/easy-sms/src/Exceptions/InvalidArgumentException.php b/vendor/overtrue/easy-sms/src/Exceptions/InvalidArgumentException.php new file mode 100644 index 00000000..c2be998d --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Exceptions/InvalidArgumentException.php @@ -0,0 +1,19 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Exceptions; + +/** + * Class InvalidArgumentException. + */ +class InvalidArgumentException extends Exception +{ +} diff --git a/vendor/overtrue/easy-sms/src/Exceptions/NoGatewayAvailableException.php b/vendor/overtrue/easy-sms/src/Exceptions/NoGatewayAvailableException.php new file mode 100644 index 00000000..7c804d94 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Exceptions/NoGatewayAvailableException.php @@ -0,0 +1,81 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Exceptions; + +use Throwable; + +/** + * Class NoGatewayAvailableException. + * + * @author overtrue + */ +class NoGatewayAvailableException extends Exception +{ + /** + * @var array + */ + public $results = []; + + /** + * @var array + */ + public $exceptions = []; + + /** + * NoGatewayAvailableException constructor. + * + * @param array $results + * @param int $code + * @param \Throwable|null $previous + */ + public function __construct(array $results = [], $code = 0, Throwable $previous = null) + { + $this->results = $results; + $this->exceptions = \array_column($results, 'exception', 'gateway'); + + parent::__construct('All the gateways have failed. You can get error details by `$exception->getExceptions()`', $code, $previous); + } + + /** + * @return array + */ + public function getResults() + { + return $this->results; + } + + /** + * @param string $gateway + * + * @return mixed|null + */ + public function getException($gateway) + { + return isset($this->exceptions[$gateway]) ? $this->exceptions[$gateway] : null; + } + + /** + * @return array + */ + public function getExceptions() + { + return $this->exceptions; + } + + /** + * @return mixed + */ + public function getLastException() + { + return end($this->exceptions); + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/AliyunGateway.php b/vendor/overtrue/easy-sms/src/Gateways/AliyunGateway.php new file mode 100644 index 00000000..c061dd2f --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/AliyunGateway.php @@ -0,0 +1,107 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class AliyunGateway. + * + * @author carson + * + * @see https://help.aliyun.com/document_detail/55451.html + */ +class AliyunGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_URL = 'http://dysmsapi.aliyuncs.com'; + + const ENDPOINT_METHOD = 'SendSms'; + + const ENDPOINT_VERSION = '2017-05-25'; + + const ENDPOINT_FORMAT = 'JSON'; + + const ENDPOINT_REGION_ID = 'cn-hangzhou'; + + const ENDPOINT_SIGNATURE_METHOD = 'HMAC-SHA1'; + + const ENDPOINT_SIGNATURE_VERSION = '1.0'; + + /** + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param \Overtrue\EasySms\Support\Config $config + * + * @return array + * + * @throws \Overtrue\EasySms\Exceptions\GatewayErrorException ; + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $data = $message->getData($this); + + $signName = !empty($data['sign_name']) ? $data['sign_name'] : $config->get('sign_name'); + + unset($data['sign_name']); + + $params = [ + 'RegionId' => self::ENDPOINT_REGION_ID, + 'AccessKeyId' => $config->get('access_key_id'), + 'Format' => self::ENDPOINT_FORMAT, + 'SignatureMethod' => self::ENDPOINT_SIGNATURE_METHOD, + 'SignatureVersion' => self::ENDPOINT_SIGNATURE_VERSION, + 'SignatureNonce' => uniqid(), + 'Timestamp' => gmdate('Y-m-d\TH:i:s\Z'), + 'Action' => self::ENDPOINT_METHOD, + 'Version' => self::ENDPOINT_VERSION, + 'PhoneNumbers' => !\is_null($to->getIDDCode()) ? strval($to->getZeroPrefixedNumber()) : $to->getNumber(), + 'SignName' => $signName, + 'TemplateCode' => $message->getTemplate($this), + 'TemplateParam' => json_encode($data, JSON_FORCE_OBJECT), + ]; + + $params['Signature'] = $this->generateSign($params); + + $result = $this->get(self::ENDPOINT_URL, $params); + + if (!empty($result['Code']) && 'OK' != $result['Code']) { + throw new GatewayErrorException($result['Message'], $result['Code'], $result); + } + + return $result; + } + + /** + * Generate Sign. + * + * @param array $params + * + * @return string + * + * @see https://help.aliyun.com/document_detail/101343.html + */ + protected function generateSign($params) + { + ksort($params); + $accessKeySecret = $this->config->get('access_key_secret'); + $stringToSign = 'GET&%2F&'.urlencode(http_build_query($params, '', '&', PHP_QUERY_RFC3986)); + $stringToSign = str_replace('%7E', '~', $stringToSign); + + return base64_encode(hash_hmac('sha1', $stringToSign, $accessKeySecret.'&', true)); + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/AliyunIntlGateway.php b/vendor/overtrue/easy-sms/src/Gateways/AliyunIntlGateway.php new file mode 100644 index 00000000..dcd7880e --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/AliyunIntlGateway.php @@ -0,0 +1,97 @@ +getData($this); + + $signName = !empty($data['sign_name']) ? $data['sign_name'] : $config->get('sign_name'); + + unset($data['sign_name']); + + $params = [ + 'RegionId' => self::ENDPOINT_REGION_ID, + 'AccessKeyId' => $config->get('access_key_id'), + 'Format' => self::ENDPOINT_FORMAT, + 'SignatureMethod' => self::ENDPOINT_SIGNATURE_METHOD, + 'SignatureVersion' => self::ENDPOINT_SIGNATURE_VERSION, + 'SignatureNonce' => uniqid('', true), + 'Timestamp' => gmdate('Y-m-d\TH:i:s\Z'), + 'Version' => self::ENDPOINT_VERSION, + 'To' => !\is_null($to->getIDDCode()) ? (int) $to->getZeroPrefixedNumber() : $to->getNumber(), + 'Action' => self::ENDPOINT_ACTION, + 'From' => $signName, + 'TemplateCode' => $message->getTemplate($this), + 'TemplateParam' => json_encode($data, JSON_FORCE_OBJECT), + ]; + + $params['Signature'] = $this->generateSign($params); + + $result = $this->get(self::ENDPOINT_URL, $params); + + if ('OK' !== $result['ResponseCode']) { + throw new GatewayErrorException($result['ResponseDescription'], $result['ResponseCode'], $result); + } + + return $result; + } + + /** + * Generate sign + * + * @param array $params + * + * @return string + */ + protected function generateSign(array $params) + { + ksort($params); + $accessKeySecret = $this->config->get('access_key_secret'); + $stringToSign = 'GET&%2F&'.urlencode(http_build_query($params, '', '&', PHP_QUERY_RFC3986)); + + return base64_encode(hash_hmac('sha1', $stringToSign, $accessKeySecret.'&', true)); + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/AliyunrestGateway.php b/vendor/overtrue/easy-sms/src/Gateways/AliyunrestGateway.php new file mode 100644 index 00000000..d4359d2a --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/AliyunrestGateway.php @@ -0,0 +1,107 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class AliyunrestGateway. + */ +class AliyunrestGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_URL = 'http://gw.api.taobao.com/router/rest'; + + const ENDPOINT_VERSION = '2.0'; + + const ENDPOINT_FORMAT = 'json'; + + const ENDPOINT_METHOD = 'alibaba.aliqin.fc.sms.num.send'; + + const ENDPOINT_SIGNATURE_METHOD = 'md5'; + + const ENDPOINT_PARTNER_ID = 'EasySms'; + + /** + * @param PhoneNumberInterface $to + * @param MessageInterface $message + * @param Config $config + * + * @return array|void + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $urlParams = [ + 'app_key' => $config->get('app_key'), + 'v' => self::ENDPOINT_VERSION, + 'format' => self::ENDPOINT_FORMAT, + 'sign_method' => self::ENDPOINT_SIGNATURE_METHOD, + 'method' => self::ENDPOINT_METHOD, + 'timestamp' => date('Y-m-d H:i:s'), + 'partner_id' => self::ENDPOINT_PARTNER_ID, + ]; + + $params = [ + 'extend' => '', + 'sms_type' => 'normal', + 'sms_free_sign_name' => $config->get('sign_name'), + 'sms_param' => json_encode($message->getData($this)), + 'rec_num' => !\is_null($to->getIDDCode()) ? strval($to->getZeroPrefixedNumber()) : $to->getNumber(), + 'sms_template_code' => $message->getTemplate($this), + ]; + $urlParams['sign'] = $this->generateSign(array_merge($params, $urlParams)); + + $result = $this->post($this->getEndpointUrl($urlParams), $params); + + if (isset($result['error_response']) && 0 != $result['error_response']['code']) { + throw new GatewayErrorException($result['error_response']['msg'], $result['error_response']['code'], $result); + } + + return $result; + } + + /** + * @param array $params + * + * @return string + */ + protected function getEndpointUrl($params) + { + return self::ENDPOINT_URL.'?'.http_build_query($params); + } + + /** + * @param array $params + * + * @return string + */ + protected function generateSign($params) + { + ksort($params); + + $stringToBeSigned = $this->config->get('app_secret_key'); + foreach ($params as $k => $v) { + if (!is_array($v) && '@' != substr($v, 0, 1)) { + $stringToBeSigned .= "$k$v"; + } + } + unset($k, $v); + $stringToBeSigned .= $this->config->get('app_secret_key'); + + return strtoupper(md5($stringToBeSigned)); + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/AvatardataGateway.php b/vendor/overtrue/easy-sms/src/Gateways/AvatardataGateway.php new file mode 100644 index 00000000..1958cd49 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/AvatardataGateway.php @@ -0,0 +1,60 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class AvatardataGateway. + * + * @see http://www.avatardata.cn/Docs/Api/fd475e40-7809-4be7-936c-5926dd41b0fe + */ +class AvatardataGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_URL = 'http://v1.avatardata.cn/Sms/Send'; + + const ENDPOINT_FORMAT = 'json'; + + /** + * @param PhoneNumberInterface $to + * @param MessageInterface $message + * @param Config $config + * + * @return array + * + * @throws GatewayErrorException; + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $params = [ + 'mobile' => $to->getNumber(), + 'templateId' => $message->getTemplate($this), + 'param' => implode(',', $message->getData($this)), + 'dtype' => self::ENDPOINT_FORMAT, + 'key' => $config->get('app_key'), + ]; + + $result = $this->get(self::ENDPOINT_URL, $params); + + if ($result['error_code']) { + throw new GatewayErrorException($result['reason'], $result['error_code'], $result); + } + + return $result; + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/BaiduGateway.php b/vendor/overtrue/easy-sms/src/Gateways/BaiduGateway.php new file mode 100644 index 00000000..5c26b0a5 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/BaiduGateway.php @@ -0,0 +1,174 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class BaiduGateway. + * + * @see https://cloud.baidu.com/doc/SMS/index.html + */ +class BaiduGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_HOST = 'smsv3.bj.baidubce.com'; + + const ENDPOINT_URI = '/api/v3/sendSms'; + + const BCE_AUTH_VERSION = 'bce-auth-v1'; + + const DEFAULT_EXPIRATION_IN_SECONDS = 1800; //签名有效期默认1800秒 + + const SUCCESS_CODE = 1000; + + /** + * Send message. + * + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param \Overtrue\EasySms\Support\Config $config + * + * @return array + * + * @throws \Overtrue\EasySms\Exceptions\GatewayErrorException ; + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $params = [ + 'signatureId' => $config->get('invoke_id'), + 'mobile' => $to->getNumber(), + 'template' => $message->getTemplate($this), + 'contentVar' => $message->getData($this), + ]; + if (!empty($params['contentVar']['custom'])) { + //用户自定义参数，格式为字符串，状态回调时会回传该值 + $params['custom'] = $params['contentVar']['custom']; + unset($params['contentVar']['custom']); + } + if (!empty($params['contentVar']['userExtId'])) { + //通道自定义扩展码，上行回调时会回传该值，其格式为纯数字串。默认为不开通，请求时无需设置该参数。如需开通请联系客服申请 + $params['userExtId'] = $params['contentVar']['userExtId']; + unset($params['contentVar']['userExtId']); + } + + $datetime = gmdate('Y-m-d\TH:i:s\Z'); + + $headers = [ + 'host' => self::ENDPOINT_HOST, + 'content-type' => 'application/json', + 'x-bce-date' => $datetime, + ]; + //获得需要签名的数据 + $signHeaders = $this->getHeadersToSign($headers, ['host', 'x-bce-date']); + + $headers['Authorization'] = $this->generateSign($signHeaders, $datetime, $config); + + $result = $this->request('post', self::buildEndpoint($config), ['headers' => $headers, 'json' => $params]); + + if (self::SUCCESS_CODE != $result['code']) { + throw new GatewayErrorException($result['message'], $result['code'], $result); + } + + return $result; + } + + /** + * Build endpoint url. + * + * @param \Overtrue\EasySms\Support\Config $config + * + * @return string + */ + protected function buildEndpoint(Config $config) + { + return 'http://'.$config->get('domain', self::ENDPOINT_HOST).self::ENDPOINT_URI; + } + + /** + * Generate Authorization header. + * + * @param array $signHeaders + * @param int $datetime + * @param \Overtrue\EasySms\Support\Config $config + * + * @return string + */ + protected function generateSign(array $signHeaders, $datetime, Config $config) + { + // 生成 authString + $authString = self::BCE_AUTH_VERSION.'/'.$config->get('ak').'/' + .$datetime.'/'.self::DEFAULT_EXPIRATION_IN_SECONDS; + + // 使用 sk 和 authString 生成 signKey + $signingKey = hash_hmac('sha256', $authString, $config->get('sk')); + // 生成标准化 URI + // 根据 RFC 3986，除了：1.大小写英文字符 2.阿拉伯数字 3.点'.'、波浪线'~'、减号'-'以及下划线'_' 以外都要编码 + $canonicalURI = str_replace('%2F', '/', rawurlencode(self::ENDPOINT_URI)); + + // 生成标准化 QueryString + $canonicalQueryString = ''; // 此 api 不需要此项。返回空字符串 + + // 整理 headersToSign，以 ';' 号连接 + $signedHeaders = empty($signHeaders) ? '' : strtolower(trim(implode(';', array_keys($signHeaders)))); + + // 生成标准化 header + $canonicalHeader = $this->getCanonicalHeaders($signHeaders); + + // 组成标准请求串 + $canonicalRequest = "POST\n{$canonicalURI}\n{$canonicalQueryString}\n{$canonicalHeader}"; + + // 使用 signKey 和标准请求串完成签名 + $signature = hash_hmac('sha256', $canonicalRequest, $signingKey); + + // 组成最终签名串 + return "{$authString}/{$signedHeaders}/{$signature}"; + } + + /** + * 生成标准化 http 请求头串. + * + * @param array $headers + * + * @return string + */ + protected function getCanonicalHeaders(array $headers) + { + $headerStrings = []; + foreach ($headers as $name => $value) { + //trim后再encode，之后使用':'号连接起来 + $headerStrings[] = rawurlencode(strtolower(trim($name))).':'.rawurlencode(trim($value)); + } + + sort($headerStrings); + + return implode("\n", $headerStrings); + } + + /** + * 根据 指定的 keys 过滤应该参与签名的 header. + * + * @param array $headers + * @param array $keys + * + * @return array + */ + protected function getHeadersToSign(array $headers, array $keys) + { + return array_intersect_key($headers, array_flip($keys)); + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/ChuanglanGateway.php b/vendor/overtrue/easy-sms/src/Gateways/ChuanglanGateway.php new file mode 100644 index 00000000..f22839ad --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/ChuanglanGateway.php @@ -0,0 +1,156 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Exceptions\InvalidArgumentException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class ChuanglanGateway. + * + * @see https://zz.253.com/v5.html#/api_doc + */ +class ChuanglanGateway extends Gateway +{ + use HasHttpRequest; + + /** + * URL模板 + */ + const ENDPOINT_URL_TEMPLATE = 'https://%s.253.com/msg/send/json'; + + /** + * 国际短信 + */ + const INT_URL = 'http://intapi.253.com/send/json'; + + /** + * 验证码渠道code. + */ + const CHANNEL_VALIDATE_CODE = 'smsbj1'; + + /** + * 会员营销渠道code. + */ + const CHANNEL_PROMOTION_CODE = 'smssh1'; + + /** + * @param PhoneNumberInterface $to + * @param MessageInterface $message + * @param Config $config + * + * @return array + * + * @throws GatewayErrorException + * @throws InvalidArgumentException + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $IDDCode = !empty($to->getIDDCode()) ? $to->getIDDCode() : 86; + + $params = [ + 'account' => $config->get('account'), + 'password' => $config->get('password'), + 'phone' => $to->getNumber(), + 'msg' => $this->wrapChannelContent($message->getContent($this), $config, $IDDCode), + ]; + + if (86 != $IDDCode) { + $params['mobile'] = $to->getIDDCode().$to->getNumber(); + $params['account'] = $config->get('intel_account') ?: $config->get('account'); + $params['password'] = $config->get('intel_password') ?: $config->get('password'); + } + + $result = $this->postJson($this->buildEndpoint($config, $IDDCode), $params); + + if (!isset($result['code']) || '0' != $result['code']) { + throw new GatewayErrorException(json_encode($result, JSON_UNESCAPED_UNICODE), isset($result['code']) ? $result['code'] : 0, $result); + } + + return $result; + } + + /** + * @param Config $config + * @param int $IDDCode + * + * @return string + * + * @throws InvalidArgumentException + */ + protected function buildEndpoint(Config $config, $IDDCode = 86) + { + $channel = $this->getChannel($config, $IDDCode); + + if (self::INT_URL === $channel) { + return $channel; + } + + return sprintf(self::ENDPOINT_URL_TEMPLATE, $channel); + } + + /** + * @param Config $config + * @param int $IDDCode + * + * @return mixed + * + * @throws InvalidArgumentException + */ + protected function getChannel(Config $config, $IDDCode) + { + if (86 != $IDDCode) { + return self::INT_URL; + } + $channel = $config->get('channel', self::CHANNEL_VALIDATE_CODE); + + if (!in_array($channel, [self::CHANNEL_VALIDATE_CODE, self::CHANNEL_PROMOTION_CODE])) { + throw new InvalidArgumentException('Invalid channel for ChuanglanGateway.'); + } + + return $channel; + } + + /** + * @param string $content + * @param Config $config + * @param int $IDDCode + * + * @return string|string + * + * @throws InvalidArgumentException + */ + protected function wrapChannelContent($content, Config $config, $IDDCode) + { + $channel = $this->getChannel($config, $IDDCode); + + if (self::CHANNEL_PROMOTION_CODE == $channel) { + $sign = (string) $config->get('sign', ''); + if (empty($sign)) { + throw new InvalidArgumentException('Invalid sign for ChuanglanGateway when using promotion channel'); + } + + $unsubscribe = (string) $config->get('unsubscribe', ''); + if (empty($unsubscribe)) { + throw new InvalidArgumentException('Invalid unsubscribe for ChuanglanGateway when using promotion channel'); + } + + $content = $sign.$content.$unsubscribe; + } + + return $content; + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/Chuanglanv1Gateway.php b/vendor/overtrue/easy-sms/src/Gateways/Chuanglanv1Gateway.php new file mode 100644 index 00000000..a81fb6aa --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/Chuanglanv1Gateway.php @@ -0,0 +1,147 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Exceptions\InvalidArgumentException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class ChuanglanGateway. + * + * @see https://www.chuanglan.com/document/6110e57909fd9600010209de/62b3dc1d272e290001af3e75 + */ +class Chuanglanv1Gateway extends Gateway +{ + use HasHttpRequest; + + /** + * 国际短信 + */ + const INT_URL = 'http://intapi.253.com/send/json'; + + /** + * URL模板 + */ + const ENDPOINT_URL_TEMPLATE = 'https://smssh1.253.com/msg/%s/json'; + + /** + * 支持单发、群发短信 + */ + const CHANNEL_NORMAL_CODE = 'v1/send'; + + /** + * 单号码对应单内容批量下发 + */ + const CHANNEL_VARIABLE_CODE = 'variable'; + + /** + * @param PhoneNumberInterface $to + * @param MessageInterface $message + * @param Config $config + * + * @return array + * + * @throws GatewayErrorException + * @throws InvalidArgumentException + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $IDDCode = !empty($to->getIDDCode()) ? $to->getIDDCode() : 86; + + $params = [ + 'account' => $config->get('account'), + 'password' => $config->get('password'), + 'report' => $config->get('needstatus') ?? false + ]; + + if (86 != $IDDCode) { + $params['mobile'] = $to->getIDDCode() . $to->getNumber(); + $params['account'] = $config->get('intel_account') ?: $config->get('account'); + $params['password'] = $config->get('intel_password') ?: $config->get('password'); + } + + if (self::CHANNEL_VARIABLE_CODE == $this->getChannel($config, $IDDCode)) { + $params['params'] = $message->getData($this); + $params['msg'] = $this->wrapChannelContent($message->getTemplate($this), $config, $IDDCode); + } else { + $params['phone'] = $to->getNumber(); + $params['msg'] = $this->wrapChannelContent($message->getContent($this), $config, $IDDCode); + } + + $result = $this->postJson($this->buildEndpoint($config, $IDDCode), $params); + + if (!isset($result['code']) || '0' != $result['code']) { + throw new GatewayErrorException(json_encode($result, JSON_UNESCAPED_UNICODE), isset($result['code']) ? $result['code'] : 0, $result); + } + + return $result; + } + + /** + * @param Config $config + * @param int $IDDCode + * + * @return string + * + * @throws InvalidArgumentException + */ + protected function buildEndpoint(Config $config, $IDDCode = 86) + { + $channel = $this->getChannel($config, $IDDCode); + + if (self::INT_URL === $channel) { + return $channel; + } + + return sprintf(self::ENDPOINT_URL_TEMPLATE, $channel); + } + + /** + * @param Config $config + * @param int $IDDCode + * + * @return mixed + * + * @throws InvalidArgumentException + */ + protected function getChannel(Config $config, $IDDCode) + { + if (86 != $IDDCode) { + return self::INT_URL; + } + $channel = $config->get('channel', self::CHANNEL_NORMAL_CODE); + + if (!in_array($channel, [self::CHANNEL_NORMAL_CODE, self::CHANNEL_VARIABLE_CODE])) { + throw new InvalidArgumentException('Invalid channel for ChuanglanGateway.'); + } + + return $channel; + } + + /** + * @param string $content + * @param Config $config + * @param int $IDDCode + * + * @return string|string + * + * @throws InvalidArgumentException + */ + protected function wrapChannelContent($content, Config $config, $IDDCode) + { + return $content; + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/ErrorlogGateway.php b/vendor/overtrue/easy-sms/src/Gateways/ErrorlogGateway.php new file mode 100644 index 00000000..d27b40d9 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/ErrorlogGateway.php @@ -0,0 +1,50 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Support\Config; + +/** + * Class ErrorlogGateway. + */ +class ErrorlogGateway extends Gateway +{ + /** + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param \Overtrue\EasySms\Support\Config $config + * + * @return array + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + if (is_array($to)) { + $to = implode(',', $to); + } + + $message = sprintf( + "[%s] to: %s | message: \"%s\" | template: \"%s\" | data: %s\n", + date('Y-m-d H:i:s'), + $to, + $message->getContent($this), + $message->getTemplate($this), + json_encode($message->getData($this)) + ); + + $file = $this->config->get('file', ini_get('error_log')); + $status = error_log($message, 3, $file); + + return compact('status', 'file'); + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/Gateway.php b/vendor/overtrue/easy-sms/src/Gateways/Gateway.php new file mode 100644 index 00000000..c6791fc9 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/Gateway.php @@ -0,0 +1,120 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\GatewayInterface; +use Overtrue\EasySms\Support\Config; + +/** + * Class Gateway. + */ +abstract class Gateway implements GatewayInterface +{ + const DEFAULT_TIMEOUT = 5.0; + + /** + * @var \Overtrue\EasySms\Support\Config + */ + protected $config; + + /** + * @var array + */ + protected $options; + + /** + * @var float + */ + protected $timeout; + + /** + * Gateway constructor. + * + * @param array $config + */ + public function __construct(array $config) + { + $this->config = new Config($config); + } + + /** + * Return timeout. + * + * @return int|mixed + */ + public function getTimeout() + { + return $this->timeout ?: $this->config->get('timeout', self::DEFAULT_TIMEOUT); + } + + /** + * Set timeout. + * + * @param int $timeout + * + * @return $this + */ + public function setTimeout($timeout) + { + $this->timeout = floatval($timeout); + + return $this; + } + + /** + * @return \Overtrue\EasySms\Support\Config + */ + public function getConfig() + { + return $this->config; + } + + /** + * @param \Overtrue\EasySms\Support\Config $config + * + * @return $this + */ + public function setConfig(Config $config) + { + $this->config = $config; + + return $this; + } + + /** + * @param $options + * + * @return $this + */ + public function setGuzzleOptions($options) + { + $this->options = $options; + + return $this; + } + + /** + * @return array + */ + public function getGuzzleOptions() + { + return $this->options ?: $this->config->get('options', []); + } + + /** + * {@inheritdoc} + */ + public function getName() + { + return \strtolower(str_replace([__NAMESPACE__.'\\', 'Gateway'], '', \get_class($this))); + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/HuaweiGateway.php b/vendor/overtrue/easy-sms/src/Gateways/HuaweiGateway.php new file mode 100644 index 00000000..16060ca1 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/HuaweiGateway.php @@ -0,0 +1,148 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use GuzzleHttp\Exception\RequestException; +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Exceptions\InvalidArgumentException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +class HuaweiGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_HOST = 'https://api.rtc.huaweicloud.com:10443'; + + const ENDPOINT_URI = '/sms/batchSendSms/v1'; + + const SUCCESS_CODE = '000000'; + + /** + * 发送信息. + * + * @param PhoneNumberInterface $to + * @param MessageInterface $message + * @param Config $config + * + * @return array + * + * @throws GatewayErrorException + * @throws InvalidArgumentException + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $appKey = $config->get('app_key'); + $appSecret = $config->get('app_secret'); + $channels = $config->get('from'); + $statusCallback = $config->get('callback', ''); + + $endpoint = $this->getEndpoint($config); + $headers = $this->getHeaders($appKey, $appSecret); + + $templateId = $message->getTemplate($this); + $messageData = $message->getData($this); + + // 短信签名通道号码 + $from = 'default'; + if (isset($messageData['from'])) { + $from = $messageData['from']; + unset($messageData['from']); + } + $channel = isset($channels[$from]) ? $channels[$from] : ''; + + if (empty($channel)) { + throw new InvalidArgumentException("From Channel [{$from}] Not Exist"); + } + + $params = [ + 'from' => $channel, + 'to' => $to->getUniversalNumber(), + 'templateId' => $templateId, + 'templateParas' => json_encode($messageData), + 'statusCallback' => $statusCallback, + ]; + + try { + $result = $this->request('post', $endpoint, [ + 'headers' => $headers, + 'form_params' => $params, + //为防止因HTTPS证书认证失败造成API调用失败，需要先忽略证书信任问题 + 'verify' => false, + ]); + } catch (RequestException $e) { + $result = $this->unwrapResponse($e->getResponse()); + } + + if (self::SUCCESS_CODE != $result['code']) { + throw new GatewayErrorException($result['description'], ltrim($result['code'], 'E'), $result); + } + + return $result; + } + + /** + * 构造 Endpoint. + * + * @param Config $config + * + * @return string + */ + protected function getEndpoint(Config $config) + { + $endpoint = rtrim($config->get('endpoint', self::ENDPOINT_HOST), '/'); + + return $endpoint.self::ENDPOINT_URI; + } + + /** + * 获取请求 Headers 参数. + * + * @param string $appKey + * @param string $appSecret + * + * @return array + */ + protected function getHeaders($appKey, $appSecret) + { + return [ + 'Content-Type' => 'application/x-www-form-urlencoded', + 'Authorization' => 'WSSE realm="SDP",profile="UsernameToken",type="Appkey"', + 'X-WSSE' => $this->buildWsseHeader($appKey, $appSecret), + ]; + } + + /** + * 构造X-WSSE参数值 + * + * @param string $appKey + * @param string $appSecret + * + * @return string + */ + protected function buildWsseHeader($appKey, $appSecret) + { + $now = date('Y-m-d\TH:i:s\Z'); + $nonce = uniqid(); + $passwordDigest = base64_encode(hash('sha256', ($nonce.$now.$appSecret))); + + return sprintf( + 'UsernameToken Username="%s",PasswordDigest="%s",Nonce="%s",Created="%s"', + $appKey, + $passwordDigest, + $nonce, + $now + ); + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/HuaxinGateway.php b/vendor/overtrue/easy-sms/src/Gateways/HuaxinGateway.php new file mode 100644 index 00000000..3e5c9fec --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/HuaxinGateway.php @@ -0,0 +1,73 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class HuaxinGateway. + * + * @see http://www.ipyy.com/help/ + */ +class HuaxinGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_TEMPLATE = 'http://%s/smsJson.aspx'; + + /** + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param \Overtrue\EasySms\Support\Config $config + * + * @return array + * + * @throws \Overtrue\EasySms\Exceptions\GatewayErrorException ; + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $endpoint = $this->buildEndpoint($config->get('ip')); + + $result = $this->post($endpoint, [ + 'userid' => $config->get('user_id'), + 'account' => $config->get('account'), + 'password' => $config->get('password'), + 'mobile' => $to->getNumber(), + 'content' => $message->getContent($this), + 'sendTime' => '', + 'action' => 'send', + 'extno' => $config->get('ext_no'), + ]); + + if ('Success' !== $result['returnstatus']) { + throw new GatewayErrorException($result['message'], 400, $result); + } + + return $result; + } + + /** + * Build endpoint url. + * + * @param string $ip + * + * @return string + */ + protected function buildEndpoint($ip) + { + return sprintf(self::ENDPOINT_TEMPLATE, $ip); + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/HuyiGateway.php b/vendor/overtrue/easy-sms/src/Gateways/HuyiGateway.php new file mode 100644 index 00000000..bcdb91b3 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/HuyiGateway.php @@ -0,0 +1,77 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class HuyiGateway. + * + * @see http://www.ihuyi.com/api/sms.html + */ +class HuyiGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_URL = 'http://106.ihuyi.com/webservice/sms.php?method=Submit'; + + const ENDPOINT_FORMAT = 'json'; + + const SUCCESS_CODE = 2; + + /** + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param \Overtrue\EasySms\Support\Config $config + * + * @return array + * + * @throws \Overtrue\EasySms\Exceptions\GatewayErrorException ; + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $params = [ + 'account' => $config->get('api_id'), + 'mobile' => $to->getIDDCode() ? \sprintf('%s %s', $to->getIDDCode(), $to->getNumber()) : $to->getNumber(), + 'content' => $message->getContent($this), + 'time' => time(), + 'format' => self::ENDPOINT_FORMAT, + 'sign' => $config->get('signature'), + ]; + + $params['password'] = $this->generateSign($params); + + $result = $this->post(self::ENDPOINT_URL, $params); + + if (self::SUCCESS_CODE != $result['code']) { + throw new GatewayErrorException($result['msg'], $result['code'], $result); + } + + return $result; + } + + /** + * Generate Sign. + * + * @param array $params + * + * @return string + */ + protected function generateSign($params) + { + return md5($params['account'].$this->config->get('api_key').$params['mobile'].$params['content'].$params['time']); + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/JuheGateway.php b/vendor/overtrue/easy-sms/src/Gateways/JuheGateway.php new file mode 100644 index 00000000..e94d7075 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/JuheGateway.php @@ -0,0 +1,76 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class JuheGateway. + * + * @see https://www.juhe.cn/docs/api/id/54 + */ +class JuheGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_URL = 'http://v.juhe.cn/sms/send'; + + const ENDPOINT_FORMAT = 'json'; + + /** + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param \Overtrue\EasySms\Support\Config $config + * + * @return array + * + * @throws \Overtrue\EasySms\Exceptions\GatewayErrorException ; + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $params = [ + 'mobile' => $to->getNumber(), + 'tpl_id' => $message->getTemplate($this), + 'tpl_value' => $this->formatTemplateVars($message->getData($this)), + 'dtype' => self::ENDPOINT_FORMAT, + 'key' => $config->get('app_key'), + ]; + + $result = $this->get(self::ENDPOINT_URL, $params); + + if ($result['error_code']) { + throw new GatewayErrorException($result['reason'], $result['error_code'], $result); + } + + return $result; + } + + /** + * @param array $vars + * + * @return string + */ + protected function formatTemplateVars(array $vars) + { + $formatted = []; + + foreach ($vars as $key => $value) { + $formatted[sprintf('#%s#', trim($key, '#'))] = $value; + } + + return urldecode(http_build_query($formatted)); + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/KingttoGateway.php b/vendor/overtrue/easy-sms/src/Gateways/KingttoGateway.php new file mode 100644 index 00000000..c74795a3 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/KingttoGateway.php @@ -0,0 +1,61 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class KingttoGateWay. + * + * @see http://www.kingtto.cn/ + */ +class KingttoGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_URL = 'http://101.201.41.194:9999/sms.aspx'; + + const ENDPOINT_METHOD = 'send'; + + /** + * @param PhoneNumberInterface $to + * @param MessageInterface $message + * @param Config $config + * + * @return \Psr\Http\Message\ResponseInterface|array|string + * + * @throws GatewayErrorException + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $params = [ + 'action' => self::ENDPOINT_METHOD, + 'userid' => $config->get('userid'), + 'account' => $config->get('account'), + 'password' => $config->get('password'), + 'mobile' => $to->getNumber(), + 'content' => $message->getContent(), + ]; + + $result = $this->post(self::ENDPOINT_URL, $params); + + if ('Success' != $result['returnstatus']) { + throw new GatewayErrorException($result['message'], $result['remainpoint'], $result); + } + + return $result; + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/LuosimaoGateway.php b/vendor/overtrue/easy-sms/src/Gateways/LuosimaoGateway.php new file mode 100644 index 00000000..07ba2b76 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/LuosimaoGateway.php @@ -0,0 +1,74 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class LuosimaoGateway. + * + * @see https://luosimao.com/docs/api/ + */ +class LuosimaoGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_TEMPLATE = 'https://%s.luosimao.com/%s/%s.%s'; + + const ENDPOINT_VERSION = 'v1'; + + const ENDPOINT_FORMAT = 'json'; + + /** + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param \Overtrue\EasySms\Support\Config $config + * + * @return array + * + * @throws \Overtrue\EasySms\Exceptions\GatewayErrorException ; + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $endpoint = $this->buildEndpoint('sms-api', 'send'); + + $result = $this->post($endpoint, [ + 'mobile' => $to->getNumber(), + 'message' => $message->getContent($this), + ], [ + 'Authorization' => 'Basic '.base64_encode('api:key-'.$config->get('api_key')), + ]); + + if ($result['error']) { + throw new GatewayErrorException($result['msg'], $result['error'], $result); + } + + return $result; + } + + /** + * Build endpoint url. + * + * @param string $type + * @param string $function + * + * @return string + */ + protected function buildEndpoint($type, $function) + { + return sprintf(self::ENDPOINT_TEMPLATE, $type, self::ENDPOINT_VERSION, $function, self::ENDPOINT_FORMAT); + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/MaapGateway.php b/vendor/overtrue/easy-sms/src/Gateways/MaapGateway.php new file mode 100644 index 00000000..1ca44bea --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/MaapGateway.php @@ -0,0 +1,72 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class MaapGateway. + * + * @see https://maap.wo.cn/ + */ +class MaapGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_URL = 'http://rcsapi.wo.cn:8000/umcinterface/sendtempletmsg'; + + /** + * Send message. + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param \Overtrue\EasySms\Support\Config $config + * + * @return array + * + * @throws \Overtrue\EasySms\Exceptions\GatewayErrorException + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $params = [ + 'cpcode' => $config->get('cpcode'), + 'msg' => implode(',', $message->getData($this)), + 'mobiles' => $to->getNumber(), + 'excode' => $config->get('excode', ''), + 'templetid' => $message->getTemplate($this), + ]; + $params['sign'] = $this->generateSign($params, $config->get('key')); + + $result = $this->postJson(self::ENDPOINT_URL, $params); + + if (0 != $result['resultcode']) { + throw new GatewayErrorException($result['resultmsg'], $result['resultcode'], $result); + } + + return $result; + } + + /** + * Generate Sign. + * + * @param array $params + * @param string $key 签名Key + * @return string + */ + protected function generateSign($params, $key) + { + return md5($params['cpcode'] . $params['msg'] . $params['mobiles'] . $params['excode'] . $params['templetid'] . $key); + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/ModuyunGateway.php b/vendor/overtrue/easy-sms/src/Gateways/ModuyunGateway.php new file mode 100644 index 00000000..7a6d1521 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/ModuyunGateway.php @@ -0,0 +1,99 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class ModuyunGateway. + * + * @see https://www.moduyun.com/doc/index.html#10002 + */ +class ModuyunGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_URL = 'https://live.moduyun.com/sms/v2/sendsinglesms'; + + /** + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param \Overtrue\EasySms\Support\Config $config + * + * @return array + * + * @throws \Overtrue\EasySms\Exceptions\GatewayErrorException ; + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $urlParams = [ + 'accesskey' => $config->get('accesskey'), + 'random' => rand(100000, 999999), + ]; + + $params = [ + 'tel' => [ + 'mobile' => $to->getNumber(), + 'nationcode' => $to->getIDDCode() ?: '86', + ], + 'signId' => $config->get('signId', ''), + 'templateId' => $message->getTemplate($this), + 'time' => time(), + 'type' => $config->get('type', 0), + 'params' => array_values($message->getData($this)), + 'ext' => '', + 'extend' => '', + ]; + $params['sig'] = $this->generateSign($params, $urlParams['random']); + + $result = $this->postJson($this->getEndpointUrl($urlParams), $params); + $result = is_string($result) ? json_decode($result, true) : $result; + if (0 != $result['result']) { + throw new GatewayErrorException($result['errmsg'], $result['result'], $result); + } + + return $result; + } + + /** + * @param array $params + * + * @return string + */ + protected function getEndpointUrl($params) + { + return self::ENDPOINT_URL . '?' . http_build_query($params); + } + + /** + * Generate Sign. + * + * @param array $params + * @param string $random + * + * @return string + */ + protected function generateSign($params, $random) + { + return hash('sha256', sprintf( + 'secretkey=%s&random=%d&time=%d&mobile=%s', + $this->config->get('secretkey'), + $random, + $params['time'], + $params['tel']['mobile'] + )); + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/NowcnGateway.php b/vendor/overtrue/easy-sms/src/Gateways/NowcnGateway.php new file mode 100644 index 00000000..1a41d8a5 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/NowcnGateway.php @@ -0,0 +1,38 @@ +get('key')) { + throw new GatewayErrorException("key not found", -2, []); + } + $params=[ + 'mobile' => $to->getNumber(), + 'content' => $message->getContent($this), + 'userId' => $config->get('key'), + 'password' => $config->get('secret'), + 'apiType' => $config->get('api_type'), + ]; + $result = $this->get(self::ENDPOINT_URL, $params); + $result = is_string($result) ? json_decode($result, true) : $result; + if (self::SUCCESS_CODE != $result['code']) { + throw new GatewayErrorException($result['msg'], $result['code'], $result); + } + return $result; + } +} \ No newline at end of file diff --git a/vendor/overtrue/easy-sms/src/Gateways/QcloudGateway.php b/vendor/overtrue/easy-sms/src/Gateways/QcloudGateway.php new file mode 100644 index 00000000..2aaad189 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/QcloudGateway.php @@ -0,0 +1,137 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class QcloudGateway. + * + * @see https://cloud.tencent.com/document/api/382/55981 + */ +class QcloudGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_URL = 'https://sms.tencentcloudapi.com'; + + const ENDPOINT_HOST = 'sms.tencentcloudapi.com'; + + const ENDPOINT_SERVICE = 'sms'; + + const ENDPOINT_METHOD = 'SendSms'; + + const ENDPOINT_VERSION = '2021-01-11'; + + const ENDPOINT_REGION = 'ap-guangzhou'; + + const ENDPOINT_FORMAT = 'json'; + + /** + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param \Overtrue\EasySms\Support\Config $config + * + * @return array + * + * @throws \Overtrue\EasySms\Exceptions\GatewayErrorException ; + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $data = $message->getData($this); + + $signName = !empty($data['sign_name']) ? $data['sign_name'] : $config->get('sign_name', ''); + + unset($data['sign_name']); + + $phone = !\is_null($to->getIDDCode()) ? strval($to->getUniversalNumber()) : $to->getNumber(); + $params = [ + 'PhoneNumberSet' => [ + $phone + ], + 'SmsSdkAppId' => $this->config->get('sdk_app_id'), + 'SignName' => $signName, + 'TemplateId' => (string) $message->getTemplate($this), + 'TemplateParamSet' => array_map('strval', array_values($data)), + ]; + + $time = time(); + + $result = $this->request('post', self::ENDPOINT_URL, [ + 'headers' => [ + 'Authorization' => $this->generateSign($params, $time), + 'Host' => self::ENDPOINT_HOST, + 'Content-Type' => 'application/json; charset=utf-8', + 'X-TC-Action' => self::ENDPOINT_METHOD, + 'X-TC-Region' => $this->config->get('region', self::ENDPOINT_REGION), + 'X-TC-Timestamp' => $time, + 'X-TC-Version' => self::ENDPOINT_VERSION, + ], + 'json' => $params, + ]); + + if (!empty($result['Response']['Error']['Code'])) { + throw new GatewayErrorException($result['Response']['Error']['Message'], 400, $result); + } + + if (!empty($result['Response']['SendStatusSet'])) { + foreach ($result['Response']['SendStatusSet'] as $group) { + if ($group['Code'] != 'Ok') { + throw new GatewayErrorException($group['Message'], 400, $result); + } + } + } + + return $result; + } + + /** + * Generate Sign. + * + * @param array $params + * + * @return string + */ + protected function generateSign($params, $timestamp) + { + $date = gmdate("Y-m-d", $timestamp); + $secretKey = $this->config->get('secret_key'); + $secretId = $this->config->get('secret_id'); + + $canonicalRequest = 'POST'."\n". + '/'."\n". + '' ."\n". + 'content-type:application/json; charset=utf-8'."\n". + 'host:' . self::ENDPOINT_HOST."\n"."\n". + 'content-type;host'."\n". + hash("SHA256", json_encode($params)); + + $stringToSign = + 'TC3-HMAC-SHA256'."\n". + $timestamp."\n". + $date . '/'. self::ENDPOINT_SERVICE .'/tc3_request'."\n". + hash("SHA256", $canonicalRequest); + + $secretDate = hash_hmac("SHA256", $date, "TC3".$secretKey, true); + $secretService = hash_hmac("SHA256", self::ENDPOINT_SERVICE, $secretDate, true); + $secretSigning = hash_hmac("SHA256", "tc3_request", $secretService, true); + $signature = hash_hmac("SHA256", $stringToSign, $secretSigning); + + return 'TC3-HMAC-SHA256' + ." Credential=". $secretId ."/". $date . '/'. self::ENDPOINT_SERVICE .'/tc3_request' + .", SignedHeaders=content-type;host, Signature=".$signature; + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/QiniuGateway.php b/vendor/overtrue/easy-sms/src/Gateways/QiniuGateway.php new file mode 100644 index 00000000..9a9ad315 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/QiniuGateway.php @@ -0,0 +1,148 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class QiniuGateway. + * + * @see https://developer.qiniu.com/sms/api/5897/sms-api-send-message + */ +class QiniuGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_TEMPLATE = 'https://%s.qiniuapi.com/%s/%s'; + + const ENDPOINT_VERSION = 'v1'; + + /** + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param \Overtrue\EasySms\Support\Config $config + * + * @return array + * + * @throws \Overtrue\EasySms\Exceptions\GatewayErrorException ; + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $endpoint = $this->buildEndpoint('sms', 'message/single'); + + $data = $message->getData($this); + + $params = [ + 'template_id' => $message->getTemplate($this), + 'mobile' => $to->getNumber(), + ]; + + if (!empty($data)) { + $params['parameters'] = $data; + } + + $headers = [ + 'Content-Type' => 'application/json', + ]; + + $headers['Authorization'] = $this->generateSign($endpoint, 'POST', json_encode($params), $headers['Content-Type'], $config); + + $result = $this->postJson($endpoint, $params, $headers); + + if (isset($result['error'])) { + throw new GatewayErrorException($result['message'], $result['error'], $result); + } + + return $result; + } + + /** + * Build endpoint url. + * + * @param string $type + * @param string $function + * + * @return string + */ + protected function buildEndpoint($type, $function) + { + return sprintf(self::ENDPOINT_TEMPLATE, $type, self::ENDPOINT_VERSION, $function); + } + + /** + * Build endpoint url. + * + * @param string $url + * @param string $method + * @param string $body + * @param string $contentType + * @param Config $config + * + * @return string + */ + protected function generateSign($url, $method, $body, $contentType, Config $config) + { + $urlItems = parse_url($url); + $host = $urlItems['host']; + if (isset($urlItems['port'])) { + $port = $urlItems['port']; + } else { + $port = ''; + } + $path = $urlItems['path']; + if (isset($urlItems['query'])) { + $query = $urlItems['query']; + } else { + $query = ''; + } + //write request uri + $toSignStr = $method.' '.$path; + if (!empty($query)) { + $toSignStr .= '?'.$query; + } + //write host and port + $toSignStr .= "\nHost: ".$host; + if (!empty($port)) { + $toSignStr .= ':'.$port; + } + //write content type + if (!empty($contentType)) { + $toSignStr .= "\nContent-Type: ".$contentType; + } + $toSignStr .= "\n\n"; + //write body + if (!empty($body)) { + $toSignStr .= $body; + } + + $hmac = hash_hmac('sha1', $toSignStr, $config->get('secret_key'), true); + + return 'Qiniu '.$config->get('access_key').':'.$this->base64UrlSafeEncode($hmac); + } + + /** + * @param string $data + * + * @return string + */ + protected function base64UrlSafeEncode($data) + { + $find = array('+', '/'); + $replace = array('-', '_'); + + return str_replace($find, $replace, base64_encode($data)); + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/RongcloudGateway.php b/vendor/overtrue/easy-sms/src/Gateways/RongcloudGateway.php new file mode 100644 index 00000000..8464a1cf --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/RongcloudGateway.php @@ -0,0 +1,134 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use GuzzleHttp\Exception\ClientException; +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class RongcloudGateway. + * + * @author Darren Gao + * + * @see http://www.rongcloud.cn/docs/sms_service.html#send_sms_code + */ +class RongcloudGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_TEMPLATE = 'http://api.sms.ronghub.com/%s.%s'; + + const ENDPOINT_ACTION = 'sendCode'; + + const ENDPOINT_FORMAT = 'json'; + + const ENDPOINT_REGION = '86'; // 中国区，目前只支持此国别 + + const SUCCESS_CODE = 200; + + /** + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param \Overtrue\EasySms\Support\Config $config + * + * @return array + * + * @throws \Overtrue\EasySms\Exceptions\GatewayErrorException ; + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $data = $message->getData(); + $action = array_key_exists('action', $data) ? $data['action'] : self::ENDPOINT_ACTION; + $endpoint = $this->buildEndpoint($action); + + $headers = [ + 'Nonce' => uniqid(), + 'App-Key' => $config->get('app_key'), + 'Timestamp' => time(), + ]; + $headers['Signature'] = $this->generateSign($headers, $config); + + switch ($action) { + case 'sendCode': + $params = [ + 'mobile' => $to->getNumber(), + 'region' => self::ENDPOINT_REGION, + 'templateId' => $message->getTemplate($this), + ]; + + break; + case 'verifyCode': + if (!array_key_exists('code', $data) + or !array_key_exists('sessionId', $data)) { + throw new GatewayErrorException('"code" or "sessionId" is not set', 0); + } + $params = [ + 'code' => $data['code'], + 'sessionId' => $data['sessionId'], + ]; + + break; + case 'sendNotify': + $params = [ + 'mobile' => $to->getNumber(), + 'region' => self::ENDPOINT_REGION, + 'templateId' => $message->getTemplate($this), + ]; + $params = array_merge($params, $data); + + break; + default: + throw new GatewayErrorException(sprintf('action: %s not supported', $action)); + } + + try { + $result = $this->post($endpoint, $params, $headers); + + if (self::SUCCESS_CODE !== $result['code']) { + throw new GatewayErrorException($result['errorMessage'], $result['code'], $result); + } + } catch (ClientException $e) { + throw new GatewayErrorException($e->getMessage(), $e->getCode()); + } + + return $result; + } + + /** + * Generate Sign. + * + * @param array $params + * @param \Overtrue\EasySms\Support\Config $config + * + * @return string + */ + protected function generateSign($params, Config $config) + { + return sha1(sprintf('%s%s%s', $config->get('app_secret'), $params['Nonce'], $params['Timestamp'])); + } + + /** + * Build endpoint url. + * + * @param string $action + * + * @return string + */ + protected function buildEndpoint($action) + { + return sprintf(self::ENDPOINT_TEMPLATE, $action, self::ENDPOINT_FORMAT); + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/RongheyunGateway.php b/vendor/overtrue/easy-sms/src/Gateways/RongheyunGateway.php new file mode 100644 index 00000000..aa63c655 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/RongheyunGateway.php @@ -0,0 +1,69 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class RongheyunGateway. + * + * @see https://doc.zthysms.com/web/#/1?page_id=13 + */ +class RongheyunGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_URL = 'https://api.mix2.zthysms.com/v2/sendSmsTp'; + + /** + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param \Overtrue\EasySms\Support\Config $config + * + * @return array + * + * @throws \Overtrue\EasySms\Exceptions\GatewayErrorException ; + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $tKey = time(); + $password = md5(md5($config->get('password')) . $tKey); + $params = [ + 'username' => $config->get('username', ''), + 'password' => $password, + 'tKey' => $tKey, + 'signature' => $config->get('signature', ''), + 'tpId' => $message->getTemplate($this), + 'ext' => '', + 'extend' => '', + 'records' => [ + 'mobile' => $to->getNumber(), + 'tpContent' => $message->getData($this), + ], + ]; + + $result = $this->postJson( + self::ENDPOINT_URL, + $params, + ['Content-Type' => 'application/json; charset="UTF-8"'] + ); + if (200 != $result['code']) { + throw new GatewayErrorException($result['msg'], $result['code'], $result); + } + + return $result; + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/SendcloudGateway.php b/vendor/overtrue/easy-sms/src/Gateways/SendcloudGateway.php new file mode 100644 index 00000000..5da3a4fc --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/SendcloudGateway.php @@ -0,0 +1,95 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class SendcloudGateway. + * + * @see http://sendcloud.sohu.com/doc/sms/ + */ +class SendcloudGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_TEMPLATE = 'http://www.sendcloud.net/smsapi/%s'; + + /** + * Send a short message. + * + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param \Overtrue\EasySms\Support\Config $config + * + * @return array + * + * @throws \Overtrue\EasySms\Exceptions\GatewayErrorException + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $params = [ + 'smsUser' => $config->get('sms_user'), + 'templateId' => $message->getTemplate($this), + 'msgType' => $to->getIDDCode() ? 2 : 0, + 'phone' => $to->getZeroPrefixedNumber(), + 'vars' => $this->formatTemplateVars($message->getData($this)), + ]; + + if ($config->get('timestamp', false)) { + $params['timestamp'] = time() * 1000; + } + + $params['signature'] = $this->sign($params, $config->get('sms_key')); + + $result = $this->post(sprintf(self::ENDPOINT_TEMPLATE, 'send'), $params); + + if (!$result['result']) { + throw new GatewayErrorException($result['message'], $result['statusCode'], $result); + } + + return $result; + } + + /** + * @param array $vars + * + * @return string + */ + protected function formatTemplateVars(array $vars) + { + $formatted = []; + + foreach ($vars as $key => $value) { + $formatted[sprintf('%%%s%%', trim($key, '%'))] = $value; + } + + return json_encode($formatted, JSON_FORCE_OBJECT); + } + + /** + * @param array $params + * @param string $key + * + * @return string + */ + protected function sign($params, $key) + { + ksort($params); + + return md5(sprintf('%s&%s&%s', $key, urldecode(http_build_query($params)), $key)); + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/SmsbaoGateway.php b/vendor/overtrue/easy-sms/src/Gateways/SmsbaoGateway.php new file mode 100644 index 00000000..b202d4cc --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/SmsbaoGateway.php @@ -0,0 +1,77 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class SmsbaoGateway + * @author iwindy <203962638@qq.com> + * @see http://www.smsbao.com/openapi/ + */ +class SmsbaoGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_URL = 'http://api.smsbao.com/%s'; + + const SUCCESS_CODE = '0'; + + protected $errorStatuses = [ + '0' => '短信发送成功', + '-1' => '参数不全', + '-2' => '服务器空间不支持,请确认支持curl或者fsocket，联系您的空间商解决或者更换空间！', + '30' => '密码错误', + '40' => '账号不存在', + '41' => '余额不足', + '42' => '帐户已过期', + '43' => 'IP地址限制', + '50' => '内容含有敏感词' + ]; + + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $data = $message->getContent($this); + + if (is_null($to->getIDDCode()) || $to->getIDDCode() == '86') { + $number = $to->getNumber(); + $action = 'sms'; + } else { + $number = $to->getUniversalNumber(); + $action = 'wsms'; + } + + $params = [ + 'u' => $config->get('user'), + 'p' => md5($config->get('password')), + 'm' => $number, + 'c' => $data + ]; + + $result = $this->get($this->buildEndpoint($action), $params); + + if ($result !== self::SUCCESS_CODE) { + throw new GatewayErrorException($this->errorStatuses[$result], $result); + } + + return $result; + } + + protected function buildEndpoint($type) + { + return sprintf(self::ENDPOINT_URL, $type); + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/SubmailGateway.php b/vendor/overtrue/easy-sms/src/Gateways/SubmailGateway.php new file mode 100644 index 00000000..7d4678ff --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/SubmailGateway.php @@ -0,0 +1,88 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class SubmailGateway. + * + * @see https://www.mysubmail.com/chs/documents/developer/index + */ +class SubmailGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_TEMPLATE = 'https://api.mysubmail.com/%s.%s'; + + const ENDPOINT_FORMAT = 'json'; + + /** + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param \Overtrue\EasySms\Support\Config $config + * + * @return array + * + * @throws \Overtrue\EasySms\Exceptions\GatewayErrorException ; + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $endpoint = $this->buildEndpoint($this->inChineseMainland($to) ? 'message/xsend' : 'internationalsms/xsend'); + + $data = $message->getData($this); + + $result = $this->post($endpoint, [ + 'appid' => $config->get('app_id'), + 'signature' => $config->get('app_key'), + 'project' => !empty($data['project']) ? $data['project'] : $config->get('project'), + 'to' => $to->getUniversalNumber(), + 'vars' => json_encode($data, JSON_FORCE_OBJECT), + ]); + + if ('success' != $result['status']) { + throw new GatewayErrorException($result['msg'], $result['code'], $result); + } + + return $result; + } + + /** + * Build endpoint url. + * + * @param string $function + * + * @return string + */ + protected function buildEndpoint($function) + { + return sprintf(self::ENDPOINT_TEMPLATE, $function, self::ENDPOINT_FORMAT); + } + + /** + * Check if the phone number belongs to chinese mainland. + * + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * + * @return bool + */ + protected function inChineseMainland($to) + { + $code = $to->getIDDCode(); + + return empty($code) || 86 === $code; + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/TianyiwuxianGateway.php b/vendor/overtrue/easy-sms/src/Gateways/TianyiwuxianGateway.php new file mode 100644 index 00000000..a30758cc --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/TianyiwuxianGateway.php @@ -0,0 +1,84 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class TianyiwuxianGateway. + * + * @author Darren Gao + */ +class TianyiwuxianGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_TEMPLATE = 'http://jk.106api.cn/sms%s.aspx'; + + const ENDPOINT_ENCODE = 'UTF8'; + + const ENDPOINT_TYPE = 'send'; + + const ENDPOINT_FORMAT = 'json'; + + const SUCCESS_STATUS = 'success'; + + const SUCCESS_CODE = '0'; + + /** + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param \Overtrue\EasySms\Support\Config $config + * + * @return array + * + * @throws \Overtrue\EasySms\Exceptions\GatewayErrorException ; + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $endpoint = $this->buildEndpoint(); + + $params = [ + 'gwid' => $config->get('gwid'), + 'type' => self::ENDPOINT_TYPE, + 'rece' => self::ENDPOINT_FORMAT, + 'mobile' => $to->getNumber(), + 'message' => $message->getContent($this), + 'username' => $config->get('username'), + 'password' => strtoupper(md5($config->get('password'))), + ]; + + $result = $this->post($endpoint, $params); + + $result = json_decode($result, true); + + if (self::SUCCESS_STATUS !== $result['returnstatus'] || self::SUCCESS_CODE !== $result['code']) { + throw new GatewayErrorException($result['remark'], $result['code']); + } + + return $result; + } + + /** + * Build endpoint url. + * + * @return string + */ + protected function buildEndpoint() + { + return sprintf(self::ENDPOINT_TEMPLATE, self::ENDPOINT_ENCODE); + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/TiniyoGateway.php b/vendor/overtrue/easy-sms/src/Gateways/TiniyoGateway.php new file mode 100644 index 00000000..f3faff35 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/TiniyoGateway.php @@ -0,0 +1,85 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class Tiniyo Gateway. + * + * @see https://tiniyo.com/sms.html + */ +class TiniyoGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_URL = 'https://api.tiniyo.com/v1/Account/%s/Message'; + + const SUCCESS_CODE = '000000'; + + public function getName() + { + return 'tiniyo'; + } + + /** + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param \Overtrue\EasySms\Support\Config $config + * + * @return array + * + * @throws \Overtrue\EasySms\Exceptions\GatewayErrorException + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $accountSid = $config->get('account_sid'); + $endpoint = $this->buildEndPoint($accountSid); + + $params = [ + 'dst' => $to->getUniversalNumber(), + 'src' => $config->get('from'), + 'text' => $message->getContent($this), + ]; + + $result = $this->request('post', $endpoint, [ + 'json' => $params, + 'headers' => [ + 'Accept' => 'application/json', + 'Content-Type' => 'application/json;charset=utf-8', + 'Authorization' => base64_encode($config->get('account_sid').':'.$config->get('token')), + ], + ]); + + if (self::SUCCESS_CODE != $result['statusCode']) { + throw new GatewayErrorException($result['statusCode'], $result['statusCode'], $result); + } + + return $result; + } + + /** + * build endpoint url. + * + * @param string $accountSid + * + * @return string + */ + protected function buildEndPoint($accountSid) + { + return sprintf(self::ENDPOINT_URL, $accountSid); + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/TinreeGateway.php b/vendor/overtrue/easy-sms/src/Gateways/TinreeGateway.php new file mode 100644 index 00000000..7a72dd96 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/TinreeGateway.php @@ -0,0 +1,77 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; + +/** + * Class TinreeGateway. + * + * @see http://cms.tinree.com + */ +class TinreeGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_URL = 'http://api.tinree.com/api/v2/single_send'; + + /** + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param \Overtrue\EasySms\Support\Config $config + * + * @return array + * + * @throws \Overtrue\EasySms\Exceptions\GatewayErrorException + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $params = [ + 'accesskey' => $config->get('accesskey'), + 'secret' => $config->get('secret'), + 'sign' => $config->get('sign'), + 'templateId' => $message->getTemplate($this), + 'mobile' => $to->getNumber(), + 'content' => $this->buildContent($message), + ]; + + $result = $this->post(self::ENDPOINT_URL, $params); + + if (0 != $result['code']) { + throw new GatewayErrorException($result['msg'], $result['code'], $result); + } + + return $result; + } + + /** + * 构建发送内容 + * 用 data 数据合成内容，或者直接使用 data 的值 + * + * @param MessageInterface $message + * @return string + */ + protected function buildContent(MessageInterface $message) + { + $data = $message->getData($this); + + if (is_array($data)) { + return implode("##", $data); + } + + return $data; + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/TwilioGateway.php b/vendor/overtrue/easy-sms/src/Gateways/TwilioGateway.php new file mode 100644 index 00000000..95e572c6 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/TwilioGateway.php @@ -0,0 +1,91 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use GuzzleHttp\Exception\ClientException; +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class TwilioGateway. + * + * @see https://www.twilio.com/docs/api/messaging/send-messages + */ +class TwilioGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_URL = 'https://api.twilio.com/2010-04-01/Accounts/%s/Messages.json'; + + protected $errorStatuses = [ + 'failed', + 'undelivered', + ]; + + public function getName() + { + return 'twilio'; + } + + /** + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param \Overtrue\EasySms\Support\Config $config + * + * @return array + * + * @throws \Overtrue\EasySms\Exceptions\GatewayErrorException + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $accountSid = $config->get('account_sid'); + $endpoint = $this->buildEndPoint($accountSid); + + $params = [ + 'To' => $to->getUniversalNumber(), + 'From' => $config->get('from'), + 'Body' => $message->getContent($this), + ]; + + try { + $result = $this->request('post', $endpoint, [ + 'auth' => [ + $accountSid, + $config->get('token'), + ], + 'form_params' => $params, + ]); + if (in_array($result['status'], $this->errorStatuses) || !is_null($result['error_code'])) { + throw new GatewayErrorException($result['message'], $result['error_code'], $result); + } + } catch (ClientException $e) { + throw new GatewayErrorException($e->getMessage(), $e->getCode()); + } + + return $result; + } + + /** + * build endpoint url. + * + * @param string $accountSid + * + * @return string + */ + protected function buildEndPoint($accountSid) + { + return sprintf(self::ENDPOINT_URL, $accountSid); + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/UcloudGateway.php b/vendor/overtrue/easy-sms/src/Gateways/UcloudGateway.php new file mode 100644 index 00000000..fddfd3c8 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/UcloudGateway.php @@ -0,0 +1,130 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class UcloudGateway. + */ +class UcloudGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_URL = 'https://api.ucloud.cn'; + + const ENDPOINT_Action = 'SendUSMSMessage'; + + const SUCCESS_CODE = 0; + + /** + * Send Message. + * + * @param PhoneNumberInterface $to + * @param MessageInterface $message + * @param Config $config + * + * @return array + * + * @throws GatewayErrorException + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $params = $this->buildParams($to, $message, $config); + + $result = $this->get(self::ENDPOINT_URL, $params); + + if (self::SUCCESS_CODE != $result['RetCode']) { + throw new GatewayErrorException($result['Message'], $result['RetCode'], $result); + } + + return $result; + } + + /** + * Build Params. + * + * @param PhoneNumberInterface $to + * @param MessageInterface $message + * @param Config $config + * + * @return array + */ + protected function buildParams(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $data = $message->getData($this); + $params = [ + 'Action' => self::ENDPOINT_Action, + 'SigContent' => !empty($data['sig_content']) ? $data['sig_content'] : $config->get('sig_content', ''), + 'TemplateId' => $message->getTemplate($this), + 'PublicKey' => $config->get('public_key'), + ]; + $code = isset($data['code']) ? $data['code'] : ''; + if (is_array($code) && !empty($code)) { + foreach ($code as $key => $value) { + $params['TemplateParams.'.$key] = $value; + } + } else { + if (!empty($code) || !is_null($code)) { + $params['TemplateParams.0'] = $code; + } + } + + $mobiles = isset($data['mobiles']) ? $data['mobiles'] : ''; + if (!empty($mobiles) && !is_null($mobiles)) { + if (is_array($mobiles)) { + foreach ($mobiles as $key => $value) { + $params['PhoneNumbers.'.$key] = $value; + } + } else { + $params['PhoneNumbers.0'] = $mobiles; + } + } else { + $params['PhoneNumbers.0'] = $to->getNumber(); + } + + if (!is_null($config->get('project_id')) && !empty($config->get('project_id'))) { + $params['ProjectId'] = $config->get('project_id'); + } + + $signature = $this->getSignature($params, $config->get('private_key')); + $params['Signature'] = $signature; + + return $params; + } + + /** + * Generate Sign. + * + * @param array $params + * @param string $privateKey + * + * @return string + */ + protected function getSignature($params, $privateKey) + { + ksort($params); + + $paramsData = ''; + foreach ($params as $key => $value) { + $paramsData .= $key; + $paramsData .= $value; + } + $paramsData .= $privateKey; + + return sha1($paramsData); + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/Ue35Gateway.php b/vendor/overtrue/easy-sms/src/Gateways/Ue35Gateway.php new file mode 100644 index 00000000..9e05e1d4 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/Ue35Gateway.php @@ -0,0 +1,77 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class Ue35Gateway. + * + * @see https://shimo.im/docs/380b42d8cba24521 + */ +class Ue35Gateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_HOST = 'sms.ue35.cn'; + + const ENDPOINT_URI = '/sms/interface/sendmess.htm'; + + const SUCCESS_CODE = 1; + + /** + * Send message. + * + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param \Overtrue\EasySms\Support\Config $config + * + * @return array + * + * @throws \Overtrue\EasySms\Exceptions\GatewayErrorException ; + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $params = [ + 'username' => $config->get('username'), + 'userpwd' => $config->get('userpwd'), + 'mobiles' => $to->getNumber(), + 'content' => $message->getContent($this), + ]; + + $headers = [ + 'host' => static::ENDPOINT_HOST, + 'content-type' => 'application/json', + 'user-agent' => 'PHP EasySms Client', + ]; + + $result = $this->request('get', self::getEndpointUri().'?'.http_build_query($params), ['headers' => $headers]); + if (is_string($result)) { + $result = json_decode(json_encode(simplexml_load_string($result)), true); + } + + if (self::SUCCESS_CODE != $result['errorcode']) { + throw new GatewayErrorException($result['message'], $result['errorcode'], $result); + } + + return $result; + } + + public static function getEndpointUri() + { + return 'http://'.static::ENDPOINT_HOST.static::ENDPOINT_URI; + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/VolcengineGateway.php b/vendor/overtrue/easy-sms/src/Gateways/VolcengineGateway.php new file mode 100644 index 00000000..536e7c5d --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/VolcengineGateway.php @@ -0,0 +1,311 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use GuzzleHttp\Exception\ClientException; +use GuzzleHttp\HandlerStack; +use GuzzleHttp\Psr7\Query; +use GuzzleHttp\Psr7\Utils; +use GuzzleHttp\Psr7; +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; +use Psr\Http\Message\RequestInterface; + +/** + * Class VolcengineGateway. + * + * @see https://www.volcengine.com/docs/6361/66704 + */ +class VolcengineGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_ACTION = 'SendSms'; + const ENDPOINT_VERSION = '2020-01-01'; + const ENDPOINT_CONTENT_TYPE = 'application/json; charset=utf-8'; + const ENDPOINT_ACCEPT = 'application/json'; + const ENDPOINT_USER_AGENT = 'overtrue/easy-sms'; + const ENDPOINT_SERVICE = 'volcSMS'; + + const Algorithm = 'HMAC-SHA256'; + + const ENDPOINT_DEFAULT_REGION_ID = 'cn-north-1'; + + public static $endpoints = [ + 'cn-north-1' => 'https://sms.volcengineapi.com', + 'ap-singapore-1' => 'https://sms.byteplusapi.com', + ]; + + private $regionId = self::ENDPOINT_DEFAULT_REGION_ID; + protected $requestDate; + + + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $data = $message->getData($this); + $signName = !empty($data['sign_name']) ? $data['sign_name'] : $config->get('sign_name'); + $smsAccount = !empty($data['sms_account']) ? $data['sms_account'] : $config->get('sms_account'); + $templateId = $message->getTemplate($this); + $phoneNumbers = !empty($data['phone_numbers']) ? $data['phone_numbers'] : $to->getNumber(); + $templateParam = !empty($data['template_param']) ? $data['template_param'] : $message->getData($this); + + $tag = !empty($data['tag']) ? $data['tag'] : ''; + + $payload = [ + 'SmsAccount' => $smsAccount, // 消息组帐号,火山短信页面右上角，短信应用括号中的字符串 + 'Sign' => $signName, // 短信签名 + 'TemplateID' => $templateId, // 短信模板ID + 'TemplateParam' => json_encode($templateParam), // 短信模板占位符要替换的值 + 'PhoneNumbers' => $phoneNumbers, // 手机号，如果有多个使用英文逗号分割 + ]; + if ($tag) { + $payload['Tag'] = $tag; + } + $queries = [ + 'Action' => self::ENDPOINT_ACTION, + 'Version' => self::ENDPOINT_VERSION, + ]; + + try { + $stack = HandlerStack::create(); + $stack->push($this->signHandle()); + $this->setGuzzleOptions([ + 'headers' => [ + 'Content-Type' => self::ENDPOINT_CONTENT_TYPE, + 'Accept' => self::ENDPOINT_ACCEPT, + 'User-Agent' => self::ENDPOINT_USER_AGENT + ], + 'timeout' => $this->getTimeout(), + 'handler' => $stack, + 'base_uri' => $this->getEndpoint(), + ]); + + $response = $this->request('post', $this->getEndpoint().$this->getCanonicalURI(), [ + 'query' => $queries, + 'json' => $payload, + ]); + if ($response instanceof Psr7\Response) { + $response = json_decode($response->getBody()->getContents(), true); + } + if (isset($response['ResponseMetadata']['Error'])) { // 请求错误参数，如果请求没有错误，则不存在该参数返回 + // 火山引擎错误码格式为：'ZJ'+ 5位数字，比如 ZJ20009，取出数字部分 + preg_match('/\d+/', $response['ResponseMetadata']['Error']['Code'], $matches); + throw new GatewayErrorException($response['ResponseMetadata']['Error']['Code'].":".$response['ResponseMetadata']['Error']['Message'], $matches[0], $response); + } + return $response; + } catch (ClientException $exception) { + $responseContent = $exception->getResponse()->getBody()->getContents(); + $response = json_decode($responseContent, true); + if (isset($response['ResponseMetadata']['Error']) && $error = $response['ResponseMetadata']['Error']) { // 请求错误参数，如果请求没有错误，则不存在该参数返回 + // 火山引擎公共错误码Error与业务错误码略有不同，比如："Error":{"CodeN":100004,"Code":"MissingRequestInfo","Message":"The request is missing timestamp information."} + // 此处错误码直接取 CodeN + throw new GatewayErrorException($error["CodeN"].":".$error['Message'], $error["CodeN"], $response); + } + throw new GatewayErrorException($responseContent, $exception->getCode(), ['content' => $responseContent]); + } + } + + protected function signHandle() + { + return function (callable $handler) { + return function (RequestInterface $request, array $options) use ($handler) { + $request = $request->withHeader('X-Date', $this->getRequestDate()); + list($canonicalHeaders, $signedHeaders) = $this->getCanonicalHeaders($request); + + $queries = Query::parse($request->getUri()->getQuery()); + $canonicalRequest = $request->getMethod()."\n" + .$this->getCanonicalURI()."\n" + .$this->getCanonicalQueryString($queries)."\n" + .$canonicalHeaders."\n" + .$signedHeaders."\n" + .$this->getPayloadHash($request); + + $stringToSign = $this->getStringToSign($canonicalRequest); + + $signingKey = $this->getSigningKey(); + + $signature = hash_hmac('sha256', $stringToSign, $signingKey); + $parsed = $this->parseRequest($request); + + $parsed['headers']['Authorization'] = self::Algorithm. + ' Credential='.$this->getAccessKeyId().'/'.$this->getCredentialScope().', SignedHeaders='.$signedHeaders.', Signature='.$signature; + + $buildRequest = function () use ($request, $parsed) { + if ($parsed['query']) { + $parsed['uri'] = $parsed['uri']->withQuery(Query::build($parsed['query'])); + } + + return new Psr7\Request( + $parsed['method'], + $parsed['uri'], + $parsed['headers'], + $parsed['body'], + $parsed['version'] + ); + }; + + return $handler($buildRequest(), $options); + }; + }; + } + + private function parseRequest(RequestInterface $request) + { + $uri = $request->getUri(); + return [ + 'method' => $request->getMethod(), + 'path' => $uri->getPath(), + 'query' => Query::parse($uri->getQuery()), + 'uri' => $uri, + 'headers' => $request->getHeaders(), + 'body' => $request->getBody(), + 'version' => $request->getProtocolVersion() + ]; + } + + public function getPayloadHash(RequestInterface $request) + { + if ($request->hasHeader('X-Content-Sha256')) { + return $request->getHeaderLine('X-Content-Sha256'); + } + + return Utils::hash($request->getBody(), 'sha256'); + } + + public function getRegionId() + { + return $this->config->get('region_id', self::ENDPOINT_DEFAULT_REGION_ID); + } + + public function getEndpoint() + { + $regionId = $this->getRegionId(); + if (!in_array($regionId, array_keys(self::$endpoints))) { + $regionId = self::ENDPOINT_DEFAULT_REGION_ID; + } + return static::$endpoints[$regionId]; + } + + public function getRequestDate() + { + return $this->requestDate ?: gmdate('Ymd\THis\Z'); + } + + + /** + * 指代信任状，格式为：YYYYMMDD/region/service/request + * @return string + */ + public function getCredentialScope() + { + return date('Ymd', strtotime($this->getRequestDate())).'/'.$this->getRegionId().'/'.self::ENDPOINT_SERVICE.'/request'; + } + + /** + * 计算签名密钥 + * 在计算签名前，首先从私有访问密钥（Secret Access Key）派生出签名密钥（signing key），而不是直接使用私有访问密钥。具体计算过程如下： + * kSecret = *Your Secret Access Key* + * kDate = HMAC(kSecret, Date) + * kRegion = HMAC(kDate, Region) + * kService = HMAC(kRegion, Service) + * kSigning = HMAC(kService, "request") + * 其中Date精确到日，与RequestDate中YYYYMMDD部分相同。 + * @return string + */ + protected function getSigningKey() + { + $dateKey = hash_hmac('sha256', date("Ymd", strtotime($this->getRequestDate())), $this->getAccessKeySecret(), true); + $regionKey = hash_hmac('sha256', $this->getRegionId(), $dateKey, true); + $serviceKey = hash_hmac('sha256', self::ENDPOINT_SERVICE, $regionKey, true); + return hash_hmac('sha256', 'request', $serviceKey, true); + } + + /** + * 创建签名字符串 + * 签名字符串主要包含请求以及正规化请求的元数据信息，由签名算法、请求日期、信任状和正规化请求哈希值连接组成，伪代码如下： + * StringToSign = Algorithm + '\n' + RequestDate + '\n' + CredentialScope + '\n' + HexEncode(Hash(CanonicalRequest)) + * @return string + */ + public function getStringToSign($canonicalRequest) + { + return self::Algorithm."\n".$this->getRequestDate()."\n".$this->getCredentialScope()."\n".hash('sha256', $canonicalRequest); + } + + /** + * @return string + */ + public function getAccessKeySecret() + { + return $this->config->get('access_key_secret'); + } + + /** + * @return string + */ + public function getAccessKeyId() + { + return $this->config->get('access_key_id'); + } + + /** + * 指代正规化后的Header。 + * 其中伪代码如下： + * CanonicalHeaders = CanonicalHeadersEntry0 + CanonicalHeadersEntry1 + ... + CanonicalHeadersEntryN + * 其中CanonicalHeadersEntry = Lowercase(HeaderName) + ':' + Trimall(HeaderValue) + '\n' + * Lowcase代表将Header的名称全部转化成小写，Trimall表示去掉Header的值的前后多余的空格。 + * 特别注意：最后需要添加"\n"的换行符，header的顺序是以headerName的小写后ascii排序。 + * @return array + */ + public function getCanonicalHeaders(RequestInterface $request) + { + $headers = $request->getHeaders(); + ksort($headers); + $canonicalHeaders = ''; + $signedHeaders = []; + foreach ($headers as $key => $val) { + $lowerKey = strtolower($key); + $canonicalHeaders .= $lowerKey.':'.trim($val[0]).PHP_EOL; + $signedHeaders[] = $lowerKey; + } + $signedHeadersString = implode(';', $signedHeaders); + return [$canonicalHeaders, $signedHeadersString]; + } + + /** + * urlencode（注：同RFC3986方法）每一个querystring参数名称和参数值。 + * 按照ASCII字节顺序对参数名称严格排序，相同参数名的不同参数值需保持请求的原始顺序。 + * 将排序好的参数名称和参数值用=连接，按照排序结果将“参数对”用&连接。 + * 例如：CanonicalQueryString = "Action=ListUsers&Version=2018-01-01" + * @return string + */ + public function getCanonicalQueryString(array $query) + { + ksort($query); + return http_build_query($query); + } + + /** + * 指代正规化后的URI。 + * 如果URI为空，那么使用"/"作为绝对路径。 + * 在火山引擎中绝大多数接口的URI都为"/"。 + * 如果是复杂的path，请通过RFC3986规范进行编码。 + * + * @return string + */ + public function getCanonicalURI() + { + return '/'; + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/YunpianGateway.php b/vendor/overtrue/easy-sms/src/Gateways/YunpianGateway.php new file mode 100644 index 00000000..e60942f2 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/YunpianGateway.php @@ -0,0 +1,101 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class YunpianGateway. + * + * @see https://www.yunpian.com/doc/zh_CN/intl/single_send.html + */ +class YunpianGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_TEMPLATE = 'https://%s.yunpian.com/%s/%s/%s.%s'; + + const ENDPOINT_VERSION = 'v2'; + + const ENDPOINT_FORMAT = 'json'; + + /** + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param \Overtrue\EasySms\Support\Config $config + * + * @return array + * + * @throws \Overtrue\EasySms\Exceptions\GatewayErrorException ; + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $template = $message->getTemplate($this); + $function = 'single_send'; + $option = [ + 'form_params' => [ + 'apikey' => $config->get('api_key'), + 'mobile' => $to->getUniversalNumber() + ], + 'exceptions' => false, + ]; + + if (!is_null($template)) { + $function = 'tpl_single_send'; + $data = []; + + $templateData = $message->getData($this); + $templateData = isset($templateData) ? $templateData : []; + foreach ($templateData as $key => $value) { + $data[] = urlencode('#'.$key.'#') . '=' . urlencode($value); + } + + $option['form_params'] = array_merge($option['form_params'], [ + 'tpl_id' => $template, + 'tpl_value' => implode('&', $data) + ]); + } else { + $content = $message->getContent($this); + $signature = $config->get('signature', ''); + $option['form_params'] = array_merge($option['form_params'], [ + 'text' => 0 === \stripos($content, '【') ? $content : $signature.$content + ]); + } + + $endpoint = $this->buildEndpoint('sms', 'sms', $function); + $result = $this->request('post', $endpoint, $option); + + if ($result['code']) { + throw new GatewayErrorException($result['msg'], $result['code'], $result); + } + + return $result; + } + + /** + * Build endpoint url. + * + * @param string $type + * @param string $resource + * @param string $function + * + * @return string + */ + protected function buildEndpoint($type, $resource, $function) + { + return sprintf(self::ENDPOINT_TEMPLATE, $type, self::ENDPOINT_VERSION, $resource, $function, self::ENDPOINT_FORMAT); + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/YuntongxunGateway.php b/vendor/overtrue/easy-sms/src/Gateways/YuntongxunGateway.php new file mode 100644 index 00000000..9554434d --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/YuntongxunGateway.php @@ -0,0 +1,123 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class YuntongxunGateway. + * + * @see Chinese Mainland: http://doc.yuntongxun.com/pe/5a533de33b8496dd00dce07c + * @see International: http://doc.yuntongxun.com/pe/604f29eda80948a1006e928d + */ +class YuntongxunGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_TEMPLATE = 'https://%s:%s/%s/%s/%s/%s/%s?sig=%s'; + + const SERVER_IP = 'app.cloopen.com'; + + const DEBUG_SERVER_IP = 'sandboxapp.cloopen.com'; + + const DEBUG_TEMPLATE_ID = 1; + + const SERVER_PORT = '8883'; + + const SDK_VERSION = '2013-12-26'; + + const SDK_VERSION_INT = 'v2'; + + const SUCCESS_CODE = '000000'; + + private $international = false; // if international SMS, default false means no. + + /** + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param \Overtrue\EasySms\Support\Config $config + * + * @return array + * + * @throws \Overtrue\EasySms\Exceptions\GatewayErrorException ; + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $datetime = date('YmdHis'); + + $data = [ + 'appId' => $config->get('app_id'), + ]; + + if ($to->inChineseMainland()) { + $type = 'SMS'; + $resource = 'TemplateSMS'; + $data['to'] = $to->getNumber(); + $data['templateId'] = (int) ($this->config->get('debug') ? self::DEBUG_TEMPLATE_ID : $message->getTemplate($this)); + $data['datas'] = $message->getData($this); + } else { + $type = 'international'; + $resource = 'send'; + $this->international = true; + $data['mobile'] = $to->getZeroPrefixedNumber(); + $data['content'] = $message->getContent($this); + } + + $endpoint = $this->buildEndpoint($type, $resource, $datetime, $config); + + $result = $this->request('post', $endpoint, [ + 'json' => $data, + 'headers' => [ + 'Accept' => 'application/json', + 'Content-Type' => 'application/json;charset=utf-8', + 'Authorization' => base64_encode($config->get('account_sid').':'.$datetime), + ], + ]); + + if (self::SUCCESS_CODE != $result['statusCode']) { + throw new GatewayErrorException($result['statusCode'], $result['statusCode'], $result); + } + + return $result; + } + + /** + * Build endpoint url. + * + * @param string $type + * @param string $resource + * @param string $datetime + * @param \Overtrue\EasySms\Support\Config $config + * + * @return string + */ + protected function buildEndpoint($type, $resource, $datetime, Config $config) + { + $serverIp = $this->config->get('debug') ? self::DEBUG_SERVER_IP : self::SERVER_IP; + + if ($this->international) { + $accountType = 'account'; + $sdkVersion = self::SDK_VERSION_INT; + } else { + $accountType = $this->config->get('is_sub_account') ? 'SubAccounts' : 'Accounts'; + $sdkVersion = self::SDK_VERSION; + } + + $sig = strtoupper(md5($config->get('account_sid').$config->get('account_token').$datetime)); + + return sprintf(self::ENDPOINT_TEMPLATE, $serverIp, self::SERVER_PORT, $sdkVersion, $accountType, $config->get('account_sid'), $type, $resource, $sig); + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/YunxinGateway.php b/vendor/overtrue/easy-sms/src/Gateways/YunxinGateway.php new file mode 100644 index 00000000..8db2784c --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/YunxinGateway.php @@ -0,0 +1,188 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class YunxinGateway. + * + * @author her-cat + * + * @see https://dev.yunxin.163.com/docs/product/%E7%9F%AD%E4%BF%A1/%E7%9F%AD%E4%BF%A1%E6%8E%A5%E5%8F%A3%E6%8C%87%E5%8D%97 + */ +class YunxinGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_TEMPLATE = 'https://api.netease.im/%s/%s.action'; + + const ENDPOINT_ACTION = 'sendCode'; + + const SUCCESS_CODE = 200; + + /** + * Send a short message. + * + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param \Overtrue\EasySms\Support\Config $config + * + * @return array + * + * @throws GatewayErrorException + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $data = $message->getData($this); + + $action = isset($data['action']) ? $data['action'] : self::ENDPOINT_ACTION; + + $endpoint = $this->buildEndpoint('sms', $action); + + switch ($action) { + case 'sendCode': + $params = $this->buildSendCodeParams($to, $message, $config); + + break; + case 'verifyCode': + $params = $this->buildVerifyCodeParams($to, $message); + + break; + case "sendTemplate": + $params = $this->buildTemplateParams($to, $message, $config); + + break; + default: + throw new GatewayErrorException(sprintf('action: %s not supported', $action), 0); + } + + $headers = $this->buildHeaders($config); + + try { + $result = $this->post($endpoint, $params, $headers); + + if (!isset($result['code']) || self::SUCCESS_CODE !== $result['code']) { + $code = isset($result['code']) ? $result['code'] : 0; + $error = isset($result['msg']) ? $result['msg'] : json_encode($result, JSON_UNESCAPED_UNICODE); + + throw new GatewayErrorException($error, $code); + } + } catch (\Exception $e) { + throw new GatewayErrorException($e->getMessage(), $e->getCode()); + } + + return $result; + } + + /** + * @param $resource + * @param $function + * + * @return string + */ + protected function buildEndpoint($resource, $function) + { + return sprintf(self::ENDPOINT_TEMPLATE, $resource, strtolower($function)); + } + + /** + * Get the request headers. + * + * @param Config $config + * + * @return array + */ + protected function buildHeaders(Config $config) + { + $headers = [ + 'AppKey' => $config->get('app_key'), + 'Nonce' => md5(uniqid('easysms')), + 'CurTime' => (string) time(), + 'Content-Type' => 'application/x-www-form-urlencoded;charset=utf-8', + ]; + + $headers['CheckSum'] = sha1("{$config->get('app_secret')}{$headers['Nonce']}{$headers['CurTime']}"); + + return $headers; + } + + /** + * @param PhoneNumberInterface $to + * @param MessageInterface $message + * @param Config $config + * + * @return array + */ + public function buildSendCodeParams(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $data = $message->getData($this); + $template = $message->getTemplate($this); + + return [ + 'mobile' => $to->getUniversalNumber(), + 'authCode' => array_key_exists('code', $data) ? $data['code'] : '', + 'deviceId' => array_key_exists('device_id', $data) ? $data['device_id'] : '', + 'templateid' => is_string($template) ? $template : '', + 'codeLen' => $config->get('code_length', 4), + 'needUp' => $config->get('need_up', false), + ]; + } + + /** + * @param PhoneNumberInterface $to + * @param MessageInterface $message + * + * @return array + * + * @throws GatewayErrorException + */ + public function buildVerifyCodeParams(PhoneNumberInterface $to, MessageInterface $message) + { + $data = $message->getData($this); + + if (!array_key_exists('code', $data)) { + throw new GatewayErrorException('"code" cannot be empty', 0); + } + + return [ + 'mobile' => $to->getUniversalNumber(), + 'code' => $data['code'], + ]; + } + + /** + * @param PhoneNumberInterface $to + * @param MessageInterface $message + * @param Config $config + * @return array + * + */ + public function buildTemplateParams(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $data = $message->getData($this); + + $template = $message->getTemplate($this); + + return [ + 'templateid'=>$template, + 'mobiles'=>json_encode([$to->getUniversalNumber()]), + 'params'=>array_key_exists('params',$data) ? json_encode($data['params']) : '', + 'needUp'=>$config->get('need_up', false) + ]; + + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/YunzhixunGateway.php b/vendor/overtrue/easy-sms/src/Gateways/YunzhixunGateway.php new file mode 100644 index 00000000..0e213e4d --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/YunzhixunGateway.php @@ -0,0 +1,121 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class YunzhixunGateway. + * + * @author her-cat + * + * @see http://docs.ucpaas.com/doku.php?id=%E7%9F%AD%E4%BF%A1:sendsms + */ +class YunzhixunGateway extends Gateway +{ + use HasHttpRequest; + + const SUCCESS_CODE = '000000'; + + const FUNCTION_SEND_SMS = 'sendsms'; + + const FUNCTION_BATCH_SEND_SMS = 'sendsms_batch'; + + const ENDPOINT_TEMPLATE = 'https://open.ucpaas.com/ol/%s/%s'; + + /** + * Send a short message. + * + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param \Overtrue\EasySms\Support\Config $config + * + * @return array + * + * @throws GatewayErrorException + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $data = $message->getData($this); + + $function = isset($data['mobiles']) ? self::FUNCTION_BATCH_SEND_SMS : self::FUNCTION_SEND_SMS; + + $endpoint = $this->buildEndpoint('sms', $function); + + $params = $this->buildParams($to, $message, $config); + + return $this->execute($endpoint, $params); + } + + /** + * @param $resource + * @param $function + * + * @return string + */ + protected function buildEndpoint($resource, $function) + { + return sprintf(self::ENDPOINT_TEMPLATE, $resource, $function); + } + + /** + * @param PhoneNumberInterface $to + * @param MessageInterface $message + * @param Config $config + * + * @return array + */ + protected function buildParams(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $data = $message->getData($this); + + return [ + 'sid' => $config->get('sid'), + 'token' => $config->get('token'), + 'appid' => $config->get('app_id'), + 'templateid' => $message->getTemplate($this), + 'uid' => isset($data['uid']) ? $data['uid'] : '', + 'param' => isset($data['params']) ? $data['params'] : '', + 'mobile' => isset($data['mobiles']) ? $data['mobiles'] : $to->getNumber(), + ]; + } + + /** + * @param $endpoint + * @param $params + * + * @return array + * + * @throws GatewayErrorException + */ + protected function execute($endpoint, $params) + { + try { + $result = $this->postJson($endpoint, $params); + + if (!isset($result['code']) || self::SUCCESS_CODE !== $result['code']) { + $code = isset($result['code']) ? $result['code'] : 0; + $error = isset($result['msg']) ? $result['msg'] : json_encode($result, JSON_UNESCAPED_UNICODE); + + throw new GatewayErrorException($error, $code); + } + + return $result; + } catch (\Exception $e) { + throw new GatewayErrorException($e->getMessage(), $e->getCode()); + } + } +} diff --git a/vendor/overtrue/easy-sms/src/Gateways/ZzyunGateway.php b/vendor/overtrue/easy-sms/src/Gateways/ZzyunGateway.php new file mode 100644 index 00000000..878a6a75 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Gateways/ZzyunGateway.php @@ -0,0 +1,63 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Gateways; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\GatewayErrorException; +use Overtrue\EasySms\Support\Config; +use Overtrue\EasySms\Traits\HasHttpRequest; + +/** + * Class RongheyunGateway. + * + * @see https://zzyun.com/ + */ +class ZzyunGateway extends Gateway +{ + use HasHttpRequest; + + const ENDPOINT_URL = 'https://zzyun.com/api/sms/sendByTplCode'; + + /** + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param \Overtrue\EasySms\Support\Config $config + * + * @return array + * + * @throws \Overtrue\EasySms\Exceptions\GatewayErrorException ; + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, Config $config) + { + $time = time(); + $user_id = $config->get('user_id'); + $token = md5($time . $user_id . $config->get('secret')); + $params = [ + 'user_id' => $user_id, + 'time' => $time, + 'token' => $token, + 'mobiles' => $to->getNumber(),// 手机号码，多个英文逗号隔开 + 'tpl_code' => $message->getTemplate($this), + 'tpl_params' => $message->getData($this), + 'sign_name' => $config->get('sign_name'), + ]; + + $result = $this->post(self::ENDPOINT_URL, $params); + + if ('Success' != $result['Code']) { + throw new GatewayErrorException($result['Message'], $result['Code'], $result); + } + + return $result; + } +} diff --git a/vendor/overtrue/easy-sms/src/Message.php b/vendor/overtrue/easy-sms/src/Message.php new file mode 100644 index 00000000..7b76ca8c --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Message.php @@ -0,0 +1,187 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms; + +use Overtrue\EasySms\Contracts\GatewayInterface; +use Overtrue\EasySms\Contracts\MessageInterface; + +/** + * Class Message. + */ +class Message implements MessageInterface +{ + /** + * @var array + */ + protected $gateways = []; + + /** + * @var string + */ + protected $type; + + /** + * @var string + */ + protected $content; + + /** + * @var string + */ + protected $template; + + /** + * @var array + */ + protected $data = []; + + /** + * Message constructor. + * + * @param array $attributes + * @param string $type + */ + public function __construct(array $attributes = [], $type = MessageInterface::TEXT_MESSAGE) + { + $this->type = $type; + + foreach ($attributes as $property => $value) { + if (property_exists($this, $property)) { + $this->$property = $value; + } + } + } + + /** + * Return the message type. + * + * @return string + */ + public function getMessageType() + { + return $this->type; + } + + /** + * Return message content. + * + * @param \Overtrue\EasySms\Contracts\GatewayInterface|null $gateway + * + * @return string + */ + public function getContent(GatewayInterface $gateway = null) + { + return is_callable($this->content) ? call_user_func($this->content, $gateway) : $this->content; + } + + /** + * Return the template id of message. + * + * @param \Overtrue\EasySms\Contracts\GatewayInterface|null $gateway + * + * @return string + */ + public function getTemplate(GatewayInterface $gateway = null) + { + return is_callable($this->template) ? call_user_func($this->template, $gateway) : $this->template; + } + + /** + * @param $type + * + * @return $this + */ + public function setType($type) + { + $this->type = $type; + + return $this; + } + + /** + * @param mixed $content + * + * @return $this + */ + public function setContent($content) + { + $this->content = $content; + + return $this; + } + + /** + * @param mixed $template + * + * @return $this + */ + public function setTemplate($template) + { + $this->template = $template; + + return $this; + } + + /** + * @param \Overtrue\EasySms\Contracts\GatewayInterface|null $gateway + * + * @return array + */ + public function getData(GatewayInterface $gateway = null) + { + return is_callable($this->data) ? call_user_func($this->data, $gateway) : $this->data; + } + + /** + * @param array|callable $data + * + * @return $this + */ + public function setData($data) + { + $this->data = $data; + + return $this; + } + + /** + * @return array + */ + public function getGateways() + { + return $this->gateways; + } + + /** + * @param array $gateways + * + * @return $this + */ + public function setGateways(array $gateways) + { + $this->gateways = $gateways; + + return $this; + } + + /** + * @param $property + * + * @return string + */ + public function __get($property) + { + if (property_exists($this, $property)) { + return $this->$property; + } + } +} diff --git a/vendor/overtrue/easy-sms/src/Messenger.php b/vendor/overtrue/easy-sms/src/Messenger.php new file mode 100644 index 00000000..97b704c5 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Messenger.php @@ -0,0 +1,92 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms; + +use Overtrue\EasySms\Contracts\MessageInterface; +use Overtrue\EasySms\Contracts\PhoneNumberInterface; +use Overtrue\EasySms\Exceptions\NoGatewayAvailableException; + +/** + * Class Messenger. + */ +class Messenger +{ + const STATUS_SUCCESS = 'success'; + + const STATUS_FAILURE = 'failure'; + + /** + * @var \Overtrue\EasySms\EasySms + */ + protected $easySms; + + /** + * Messenger constructor. + * + * @param \Overtrue\EasySms\EasySms $easySms + */ + public function __construct(EasySms $easySms) + { + $this->easySms = $easySms; + } + + /** + * Send a message. + * + * @param \Overtrue\EasySms\Contracts\PhoneNumberInterface $to + * @param \Overtrue\EasySms\Contracts\MessageInterface $message + * @param array $gateways + * + * @return array + * + * @throws \Overtrue\EasySms\Exceptions\NoGatewayAvailableException + */ + public function send(PhoneNumberInterface $to, MessageInterface $message, array $gateways = []) + { + $results = []; + $isSuccessful = false; + + foreach ($gateways as $gateway => $config) { + try { + $results[$gateway] = [ + 'gateway' => $gateway, + 'status' => self::STATUS_SUCCESS, + 'template' => $message->getTemplate($this->easySms->gateway($gateway)), + 'result' => $this->easySms->gateway($gateway)->send($to, $message, $config), + ]; + $isSuccessful = true; + + break; + } catch (\Exception $e) { + $results[$gateway] = [ + 'gateway' => $gateway, + 'status' => self::STATUS_FAILURE, + 'template' => $message->getTemplate($this->easySms->gateway($gateway)), + 'exception' => $e, + ]; + } catch (\Throwable $e) { + $results[$gateway] = [ + 'gateway' => $gateway, + 'status' => self::STATUS_FAILURE, + 'template' => $message->getTemplate($this->easySms->gateway($gateway)), + 'exception' => $e, + ]; + } + } + + if (!$isSuccessful) { + throw new NoGatewayAvailableException($results); + } + + return $results; + } +} diff --git a/vendor/overtrue/easy-sms/src/PhoneNumber.php b/vendor/overtrue/easy-sms/src/PhoneNumber.php new file mode 100644 index 00000000..cde95f5d --- /dev/null +++ b/vendor/overtrue/easy-sms/src/PhoneNumber.php @@ -0,0 +1,126 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms; + +/** + * Class PhoneNumberInterface. + * + * @author overtrue + */ +class PhoneNumber implements \Overtrue\EasySms\Contracts\PhoneNumberInterface +{ + /** + * @var int + */ + protected $number; + + /** + * @var int + */ + protected $IDDCode; + + /** + * PhoneNumberInterface constructor. + * + * @param int $numberWithoutIDDCode + * @param string $IDDCode + */ + public function __construct($numberWithoutIDDCode, $IDDCode = null) + { + $this->number = $numberWithoutIDDCode; + $this->IDDCode = $IDDCode ? intval(ltrim($IDDCode, '+0')) : null; + } + + /** + * 86. + * + * @return int + */ + public function getIDDCode() + { + return $this->IDDCode; + } + + /** + * 18888888888. + * + * @return int + */ + public function getNumber() + { + return $this->number; + } + + /** + * +8618888888888. + * + * @return string + */ + public function getUniversalNumber() + { + return $this->getPrefixedIDDCode('+').$this->number; + } + + /** + * 008618888888888. + * + * @return string + */ + public function getZeroPrefixedNumber() + { + return $this->getPrefixedIDDCode('00').$this->number; + } + + /** + * @param string $prefix + * + * @return string|null + */ + public function getPrefixedIDDCode($prefix) + { + return $this->IDDCode ? $prefix.$this->IDDCode : null; + } + + /** + * @return string + */ + public function __toString() + { + return $this->getUniversalNumber(); + } + + /** + * Specify data which should be serialized to JSON. + * + * @see http://php.net/manual/en/jsonserializable.jsonserialize.php + * + * @return mixed data which can be serialized by json_encode, + * which is a value of any type other than a resource + * + * @since 5.4.0 + */ + #[\ReturnTypeWillChange] + public function jsonSerialize() + { + return $this->getUniversalNumber(); + } + + /** + * Check if the phone number belongs to chinese mainland. + * + * @return bool + */ + public function inChineseMainland() + { + return empty($this->IDDCode) || $this->IDDCode === 86; + } +} diff --git a/vendor/overtrue/easy-sms/src/Strategies/OrderStrategy.php b/vendor/overtrue/easy-sms/src/Strategies/OrderStrategy.php new file mode 100644 index 00000000..f44b29ef --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Strategies/OrderStrategy.php @@ -0,0 +1,32 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Strategies; + +use Overtrue\EasySms\Contracts\StrategyInterface; + +/** + * Class OrderStrategy. + */ +class OrderStrategy implements StrategyInterface +{ + /** + * Apply the strategy and return result. + * + * @param array $gateways + * + * @return array + */ + public function apply(array $gateways) + { + return array_keys($gateways); + } +} diff --git a/vendor/overtrue/easy-sms/src/Strategies/RandomStrategy.php b/vendor/overtrue/easy-sms/src/Strategies/RandomStrategy.php new file mode 100644 index 00000000..605c5d9f --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Strategies/RandomStrategy.php @@ -0,0 +1,34 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Strategies; + +use Overtrue\EasySms\Contracts\StrategyInterface; + +/** + * Class RandomStrategy. + */ +class RandomStrategy implements StrategyInterface +{ + /** + * @param array $gateways + * + * @return array + */ + public function apply(array $gateways) + { + uasort($gateways, function () { + return mt_rand() - mt_rand(); + }); + + return array_keys($gateways); + } +} diff --git a/vendor/overtrue/easy-sms/src/Support/Config.php b/vendor/overtrue/easy-sms/src/Support/Config.php new file mode 100644 index 00000000..3b914234 --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Support/Config.php @@ -0,0 +1,147 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Support; + +use ArrayAccess; + +/** + * Class Config. + */ +class Config implements ArrayAccess +{ + /** + * @var array + */ + protected $config; + + /** + * Config constructor. + * + * @param array $config + */ + public function __construct(array $config = []) + { + $this->config = $config; + } + + /** + * Get an item from an array using "dot" notation. + * + * @param string $key + * @param mixed $default + * + * @return mixed + */ + public function get($key, $default = null) + { + $config = $this->config; + + if (isset($config[$key])) { + return $config[$key]; + } + + if (false === strpos($key, '.')) { + return $default; + } + + foreach (explode('.', $key) as $segment) { + if (!is_array($config) || !array_key_exists($segment, $config)) { + return $default; + } + $config = $config[$segment]; + } + + return $config; + } + + /** + * Whether a offset exists. + * + * @see http://php.net/manual/en/arrayaccess.offsetexists.php + * + * @param mixed $offset

+ * An offset to check for. + *

+ * + * @return bool true on success or false on failure. + *

+ *

+ * The return value will be casted to boolean if non-boolean was returned + * + * @since 5.0.0 + */ + #[\ReturnTypeWillChange] + public function offsetExists($offset) + { + return array_key_exists($offset, $this->config); + } + + /** + * Offset to retrieve. + * + * @see http://php.net/manual/en/arrayaccess.offsetget.php + * + * @param mixed $offset

+ * The offset to retrieve. + *

+ * + * @return mixed Can return all value types + * + * @since 5.0.0 + */ + #[\ReturnTypeWillChange] + public function offsetGet($offset) + { + return $this->get($offset); + } + + /** + * Offset to set. + * + * @see http://php.net/manual/en/arrayaccess.offsetset.php + * + * @param mixed $offset

+ * The offset to assign the value to. + *

+ * @param mixed $value

+ * The value to set. + *

+ * + * @since 5.0.0 + */ + #[\ReturnTypeWillChange] + public function offsetSet($offset, $value) + { + if (isset($this->config[$offset])) { + $this->config[$offset] = $value; + } + } + + /** + * Offset to unset. + * + * @see http://php.net/manual/en/arrayaccess.offsetunset.php + * + * @param mixed $offset

+ * The offset to unset. + *

+ * + * @since 5.0.0 + */ + #[\ReturnTypeWillChange] + public function offsetUnset($offset) + { + if (isset($this->config[$offset])) { + unset($this->config[$offset]); + } + } +} diff --git a/vendor/overtrue/easy-sms/src/Traits/HasHttpRequest.php b/vendor/overtrue/easy-sms/src/Traits/HasHttpRequest.php new file mode 100644 index 00000000..d861dedf --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Traits/HasHttpRequest.php @@ -0,0 +1,136 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Traits; + +use GuzzleHttp\Client; +use Psr\Http\Message\ResponseInterface; + +/** + * Trait HasHttpRequest. + */ +trait HasHttpRequest +{ + /** + * Make a get request. + * + * @param string $endpoint + * @param array $query + * @param array $headers + * + * @return ResponseInterface|array|string + */ + protected function get($endpoint, $query = [], $headers = []) + { + return $this->request('get', $endpoint, [ + 'headers' => $headers, + 'query' => $query, + ]); + } + + /** + * Make a post request. + * + * @param string $endpoint + * @param array $params + * @param array $headers + * + * @return ResponseInterface|array|string + */ + protected function post($endpoint, $params = [], $headers = []) + { + return $this->request('post', $endpoint, [ + 'headers' => $headers, + 'form_params' => $params, + ]); + } + + /** + * Make a post request with json params. + * + * @param $endpoint + * @param array $params + * @param array $headers + * + * @return ResponseInterface|array|string + */ + protected function postJson($endpoint, $params = [], $headers = []) + { + return $this->request('post', $endpoint, [ + 'headers' => $headers, + 'json' => $params, + ]); + } + + /** + * Make a http request. + * + * @param string $method + * @param string $endpoint + * @param array $options http://docs.guzzlephp.org/en/latest/request-options.html + * + * @return ResponseInterface|array|string + */ + protected function request($method, $endpoint, $options = []) + { + return $this->unwrapResponse($this->getHttpClient($this->getBaseOptions())->{$method}($endpoint, $options)); + } + + /** + * Return base Guzzle options. + * + * @return array + */ + protected function getBaseOptions() + { + $options = method_exists($this, 'getGuzzleOptions') ? $this->getGuzzleOptions() : []; + + return \array_merge($options, [ + 'base_uri' => method_exists($this, 'getBaseUri') ? $this->getBaseUri() : '', + 'timeout' => method_exists($this, 'getTimeout') ? $this->getTimeout() : 5.0, + ]); + } + + /** + * Return http client. + * + * @param array $options + * + * @return \GuzzleHttp\Client + * + * @codeCoverageIgnore + */ + protected function getHttpClient(array $options = []) + { + return new Client($options); + } + + /** + * Convert response contents to json. + * + * @param \Psr\Http\Message\ResponseInterface $response + * + * @return ResponseInterface|array|string + */ + protected function unwrapResponse(ResponseInterface $response) + { + $contentType = $response->getHeaderLine('Content-Type'); + $contents = $response->getBody()->getContents(); + + if (false !== stripos($contentType, 'json') || stripos($contentType, 'javascript')) { + return json_decode($contents, true); + } elseif (false !== stripos($contentType, 'xml')) { + return json_decode(json_encode(simplexml_load_string($contents)), true); + } + + return $contents; + } +}