model类save方法成功后处理Express对象数据

Author: liu21st

src/Model.php

@@ -19,6 +19,7 @@
 use think\contract\Arrayable;
 use think\contract\Jsonable;
 use think\db\BaseQuery as Query;
+use think\db\Express;
 use think\model\contract\Modelable;
 
 /**
@@ -691,15 +692,28 @@ public function save(array | object $data = [], ?string $sequence = null): bool
         // 写入回调
         $this->trigger('AfterWrite');
 
-        if (!empty($this->change)) {
-            // 处理递增递减数据
-            foreach ($this->change as $field => $val) {
-                $this->data[$field] = $val;
+        if (!$this->entity) {
+            if (!empty($this->change)) {
+                // 处理递增递减数据
+                foreach ($this->change as $field => $val) {
+                    $this->data[$field] = $val;
+                }
+                $this->change = [];
             }
-            $this->change = [];
-        }
 
-        if (!$this->entity) {
+            foreach ($this->data as $name => &$val) {
+                if ($val instanceof Express) {
+                    $step   = $val->getStep();
+                    $origin = $this->origin[$name];
+                    $val    = match ($val->getType()) {
+                        '+'         => $origin + $step,
+                        '-'         => $origin - $step,
+                        '*'         => $origin * $step,
+                        '/'         => $origin / $step,
+                        default     => $origin,
+                    };
+                }
+            }
             // 重新记录原始数据
             $this->origin = $this->data;
             $this->get    = [];