shish 2 месяцев назад
Родитель
Сommit
48cfc5b426

+ 2 - 0
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)) {

+ 2 - 0
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)) {

+ 4 - 0
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);
     }