更新

app/admin/logic/goods/GoodsLogic.php

@@ -27,6 +27,10 @@ class GoodsLogic extends BaseLogic
      */
     public static function add(array $params): bool
     {
+        if($params['sys_labels']){
+            $sys_labels=implode(',',$params['sys_labels']);
+            $params['sys_labels']=','.explode(',',$sys_labels).',';
+        }
         Db::startTrans();
         try {
             Goods::create([
@@ -71,6 +75,10 @@ class GoodsLogic extends BaseLogic
      */
     public static function edit(array $params): bool
     {
+        if($params['sys_labels']){
+            $sys_labels=implode(',',$params['sys_labels']);
+            $params['sys_labels']=','.explode(',',$sys_labels).',';
+        }
         Db::startTrans();
         try {
             Goods::where('id', $params['id'])->update([

app/admin/logic/supplier/SupplierLogic.php

@@ -27,6 +27,10 @@ class SupplierLogic extends BaseLogic
      */
     public static function add(array $params): bool
     {
+        if($params['sys_labels']){
+            $sys_labels=implode(',',$params['sys_labels']);
+            $params['sys_labels']=','.explode(',',$sys_labels).',';
+        }
         Db::startTrans();
         try {
             Supplier::create([
@@ -76,6 +80,10 @@ class SupplierLogic extends BaseLogic
      */
     public static function edit(array $params): bool
     {
+        if($params['sys_labels']){
+            $sys_labels=implode(',',$params['sys_labels']);
+            $params['sys_labels']=','.explode(',',$sys_labels).',';
+        }
         Db::startTrans();
         try {
             Supplier::where('id', $params['id'])->update([

app/api/controller/IndexController.php

@@ -2,6 +2,7 @@
 
 namespace app\api\controller;
 
+use app\admin\logic\operation\OpurchaseclassLogic;
 use app\admin\validate\tools\GenerateTableValidate;
 use app\admin\logic\tools\GeneratorLogic;
 use app\common\service\pay\PayService;
@@ -20,8 +21,10 @@ class IndexController extends BaseApiController
     public function index()
     {
 
-       $extra=$this->request->post();
+    //    $extra=$this->request->post();
-       d(!empty($extra['payer']['openid']));
+    //    Redis::send('push-supplier-products', ['order_id'=>11]);
+    // createSupplierGoods
+       d(OpurchaseclassLogic::createSupplierGoods(['goods'=>99]));
         $queue = 'send-mail';
         // 数据，可以直接传数组，无需序列化
         $data = ['to' => 'tom@gmail.com', 'content' => 'hello'];

app/api/controller/order/RetailOrderController.php

@@ -51,7 +51,7 @@ class RetailOrderController extends BaseApiController
         $where[] = ['paid', '=',1];
         $where[] = ['is_opurchase', '=',0];
         $res = Cashierclass::where($where)->page($page_no, 25)->whereDay('create_time', $date)
-        ->order('address_id','asc')
+        ->order('address_id asc,id desc')
         ->select()->each(function($item){
             $item['goods_list']=Cashierinfo::where('pid',$item['id'])->with('goodsName')->field('goods,nums,price sell')->limit(5)->select();
             $item['goods_count']=count(explode(',',$item['cart_id']));

app/functions.php

@@ -254,4 +254,45 @@ if (!function_exists('getDistance')) {
         $s = 2 * asin(sqrt(pow(sin($a / 2), 2) + cos($radLat1) * cos($radLat2) * pow(sin($b / 2), 2))) * 6371;
         return round($s, 1);
     }
-}
+}
+/**
+ * 写日志
+ */
+if (!function_exists('write_log')) {
+    function write_log($msg, $extend = [], $level = 'error', $channel = 'api')
+    {
+        $requestParams = [];
+        $line = "\n---------------------------------------------------------------\n";
+        if (empty(request()))
+        {
+            $logInfo = $line;
+        }else{
+            $method = request()->method();
+            $requestInfo = [
+                'ip' => request()->getRealIp(),
+                'method' => $method,
+                'uri' => ltrim(request()->fullUrl(),'/')
+            ];
+            $logInfo = implode(' ',$requestInfo) . $line;
+            $method = strtolower($method);
+            $requestParams = in_array($method,['get','post']) ? request()->{$method}() : request()->all();
+        }
+        $logInfo .= var_export([
+            'msg' => $msg,
+            'extend' => $extend,
+            'params' => $requestParams
+        ], true);
+        \support\Log::channel($channel)->addRecord(LOG_LEVEL_STATUS[$level],$logInfo);
+    }
+}
+
+// LOG_LEVEL_STATUS如下:
+const LOG_LEVEL_STATUS = [
+        'debug' => 100,
+        'info'  => 200,
+        'warning' => 300,
+        'error' => 400,
+        'critical' => 500,
+        'alert' => 550,
+        'emergency' => 600
+    ];

config/log.php

@@ -16,15 +16,17 @@ return [
     'default' => [
         'handlers' => [
             [
-                'class' => Monolog\Handler\RotatingFileHandler::class,
+                'class' => \support\log\MonologExtendHandler::class,
                 'constructor' => [
-                    runtime_path() . '/logs/webman.log',
+                    null,
-                    7, //$maxFiles
+                    2048,
                     Monolog\Logger::DEBUG,
+                    true,
+                    0755
                 ],
                 'formatter' => [
                     'class' => Monolog\Formatter\LineFormatter::class,
-                    'constructor' => [null, 'Y-m-d H:i:s', true],
+                    'constructor' => [null, 'Y-m-d H:i:s', true,true],
                 ],
             ]
         ],

support/log/MonologExtendHandler.php

@@ -0,0 +1,120 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: hjl
+ * Date: 2023/6/21
+ * Time: 07:25
+ */
+
+namespace support\log;
+
+use Monolog\Handler\StreamHandler;
+use Monolog\Logger;
+
+class MonologExtendHandler extends StreamHandler
+{
+    protected int $maxFileSize;
+    protected bool $mustRotate;
+    protected string $runtimeLogPath;
+    protected string|null $channelDirName;
+
+    /**
+     * @param string $channelDirName 日志通道路径
+     * @param int $maxFileSize The maximal file size (default 10MB)
+     * @param int $level The minimum logging level at which this handler will be triggered
+     * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
+     * @param int|null $filePermission Optional file permissions (default (0644) are only for owner read/write)
+     * @param bool $useLocking Try to lock log file before doing any writes
+     *
+     * @throws \Exception
+     */
+    public function __construct($channelDirName = null, $maxFileSize = 10485760, $level = Logger::DEBUG, bool $bubble = true, int $filePermission = null, bool $useLocking = false)
+    {
+        $this->runtimeLogPath = runtime_path() . '/logs/';
+        $this->channelDirName = $channelDirName;
+        $dateDir = date('Ym').'/';
+        $filename = date('d') .'.log';
+        $fullFilePath = empty($channelDirName) ? $this->runtimeLogPath . $dateDir .$filename : $this->runtimeLogPath . $this->channelDirName . '/' . $dateDir . $filename;
+        $this->maxFileSize = (int)$maxFileSize;
+        if ($maxFileSize <= 0) {
+            throw new \Exception('Max file size must be higher than 0');
+        }
+        parent::__construct($fullFilePath, $level, $bubble, $filePermission, $useLocking);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function close(): void
+    {
+        parent::close();
+        if ($this->mustRotate) {
+            $this->rotate();
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        parent::reset();
+        if ($this->mustRotate) {
+            $this->rotate();
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function write(array $record): void
+    {
+        $dateDir = date('Ym') . '/';
+        $logBasePath = empty($this->channelDirName) ? $this->runtimeLogPath . $dateDir : $this->runtimeLogPath . $this->channelDirName . '/' . $dateDir;
+        $fullLogFilename = $logBasePath . date('d').'.log';
+        clearstatcache(true, $fullLogFilename);
+        if (file_exists($fullLogFilename)) {
+            $fileSize = filesize($fullLogFilename);
+            if ($fileSize >= $this->maxFileSize) {
+                $this->mustRotate = true;
+                $this->close();
+            }else{
+                $this->stream = null;
+                $this->url = $fullLogFilename;
+            }
+        }else{
+            // 解决WebMan启动后删除日志文件无法写入的问题
+            $this->mustRotate = true;
+            $this->close();
+        }
+        parent::write($record);
+    }
+
+    /**
+     * Rotates the files.
+     */
+    protected function rotate()
+    {
+        // skip GC of old logs if file size is unlimited
+        if ($this->maxFileSize === 0) {
+            return;
+        }
+        $dateDir = date('Ym') . '/';
+        $logBasePath = empty($this->channelDirName) ? $this->runtimeLogPath . $dateDir : $this->runtimeLogPath . $this->channelDirName . '/' . $dateDir;
+        $filename = date('d').'.log';
+        $fullLogFilename = $logBasePath . $filename;
+        // archive latest file
+        clearstatcache(true, $fullLogFilename);
+        if (file_exists($fullLogFilename)) {
+            $target = $logBasePath.  time() . '_' .  $filename;
+            rename($fullLogFilename, $target);
+        }else{
+            if (!is_dir($logBasePath))
+            {
+                mkdir($logBasePath,0755,true);
+            }
+            $this->url = $fullLogFilename;
+        }
+        $this->mustRotate = false;
+    }
+}