Merge branch 'itemremark' into dev

.aiignore

@@ -0,0 +1,26 @@
+# Dependencies & vendors
+node_modules/
+vendor/
+
+# Build & generated output
+dist/
+build/
+**/web/assets/
+coverage/
+
+# Runtime & logs
+runtime/
+console/runtime/
+logs/
+*.log
+
+# VCS & IDE
+.git/
+.idea/
+.hbuilderx/
+.DS_Store
+
+# Secrets
+
+# Source maps
+*.map

.cursorignore

@@ -0,0 +1,27 @@
+# Dependencies & vendors
+node_modules/
+vendor/
+
+# Build & generated output
+dist/
+build/
+**/web/assets/
+coverage/
+
+# Runtime & logs
+runtime/
+console/runtime/
+logs/
+*.log
+
+# VCS & IDE
+.git/
+.idea/
+.hbuilderx/
+.DS_Store
+
+# Secrets
+
+
+# Source maps
+*.map

.windsurfignore

@@ -0,0 +1,27 @@
+# Dependencies & vendors
+node_modules/
+vendor/
+
+# Build & generated output
+dist/
+build/
+**/web/assets/
+coverage/
+
+# Runtime & logs
+runtime/
+console/runtime/
+logs/
+*.log
+
+# VCS & IDE
+.git/
+.idea/
+.hbuilderx/
+.DS_Store
+
+# Secrets
+
+
+# Source maps
+*.map

app-ghs/controllers/ShopMoneyController.php

@@ -35,6 +35,7 @@ class ShopMoneyController extends BaseController
             $data['amount'] = $amount;
             $data['staffId'] = $staffId;
             $data['staffName'] = $staff->name ?? '';
+            $data['remark'] = trim($get['remark'] ?? '');
             $data['ptStyle'] = dict::getDict('ptStyle', 'ghs');
             $main = MainClass::getLockById($mainId);
             if (empty($main)) {
@@ -73,6 +74,7 @@ class ShopMoneyController extends BaseController
             $data['amount'] = $amount;
             $data['staffId'] = $staffId;
             $data['staffName'] = $staff->name ?? '';
+            $data['remark'] = trim($get['remark'] ?? '');
             $data['ptStyle'] = dict::getDict('ptStyle', 'ghs');
             $main = MainClass::getLockById($mainId);
             if (empty($main)) {

app-hd/controllers/ItemController.php

@@ -505,4 +505,44 @@ class ItemController extends BaseController
         $customList = ProductClass::getHasLimitBuyList($item);
         util::success(['customList' => $customList]);
     }
+
+    //花材展示备注
+    public function actionUpdateItemRemark()
+    {
+        $get = Yii::$app->request->get();
+        $id = $get['id'] ?? 0;
+        $itemRemark = trim($get['itemRemark'] ?? '');
+        if (empty($itemRemark)) {
+            util::fail('请填写备注');
+        }
+        if (mb_strlen($itemRemark) > 200) {
+            util::fail('备注不能超过200字');
+        }
+        $info = ItemClass::getById($id, true);
+        if (empty($info)) {
+            util::fail('没有找到花材');
+        }
+        if ($info->mainId != $this->mainId) {
+            util::fail('无法操作');
+        }
+        $info->itemRemark = $itemRemark;
+        $info->save();
+        util::complete('保存成功');
+    }
+
+    public function actionClearItemRemark()
+    {
+        $get = Yii::$app->request->get();
+        $id = $get['id'] ?? 0;
+        $info = ItemClass::getById($id, true);
+        if (empty($info)) {
+            util::fail('没有找到花材');
+        }
+        if ($info->mainId != $this->mainId) {
+            util::fail('无法操作');
+        }
+        $info->itemRemark = '';
+        $info->save();
+        util::complete('清除成功');
+    }
 }

app-hd/controllers/ShopMoneyController.php

@@ -43,6 +43,7 @@ class ShopMoneyController extends BaseController
             $data['amount'] = $amount;
             $data['staffId'] = $staffId;
             $data['staffName'] = $staff->name ?? '';
+            $data['remark'] = trim($get['remark'] ?? '');
             $data['ptStyle'] = dict::getDict('ptStyle', 'hd');
             $main = MainClass::getLockById($mainId);
             if (empty($main)) {
@@ -79,6 +80,7 @@ class ShopMoneyController extends BaseController
             $data['amount'] = $amount;
             $data['staffId'] = $staffId;
             $data['staffName'] = $staff->name ?? '';
+            $data['remark'] = trim($get['remark'] ?? '');
             $data['ptStyle'] = dict::getDict('ptStyle', 'hd');
             $main = MainClass::getLockById($mainId);
             if (empty($main)) {

biz-hd/shop/classes/ShopMoneyClass.php

@@ -25,6 +25,7 @@ class ShopMoneyClass extends BaseClass
         $return = self::addData($data);
         $id = $return->id ?? 0;
         $staffName = $data['staffName'] ?? '';
+        $remark = trim($data['remark'] ?? '');
         $event = $staffName . '存入' . $amount . '元';
         $capitalType = dict::getDict('capitalType', 'inMoney', 'id');
         if (isset($data['ptStyle'])) {
@@ -42,6 +43,7 @@ class ShopMoneyClass extends BaseClass
             'capitalType' => $capitalType,
             'ptStyle' => $ptStyle,
             'event' => $event,
+            'remark' => $remark,
         ];
         ShopMoneyChangeClass::addData($change);
     }
@@ -63,6 +65,7 @@ class ShopMoneyClass extends BaseClass
         $return = self::addData($data);
         $id = $return->id ?? 0;
         $staffName = $data['staffName'] ?? '';
+        $remark = trim($data['remark'] ?? '');
         $event = $staffName . '取出' . $amount . '元';
         $capitalType = dict::getDict('capitalType', 'outMoney', 'id');
         if (isset($data['ptStyle'])) {
@@ -79,6 +82,7 @@ class ShopMoneyClass extends BaseClass
             'capitalType' => $capitalType,
             'ptStyle' => $ptStyle,
             'event' => $event,
+            'remark' => $remark,
         ];
         ShopMoneyChangeClass::addData($change);
     }