预订有带备注

biz-ghs/book/classes/BookItemClass.php

@@ -258,6 +258,8 @@ class BookItemClass extends BaseClass
             }
 
             $lastNum = $data['lastNum'] ?? 0;
+            $remark = $data['remark']??'';
+            $hasRemark = $data['hasRemark']??0;
             $staffName = $params['staffName'] ?? '';
             $staffId = $params['staffId'] ?? 0;
             $ioData = [
@@ -286,7 +288,8 @@ class BookItemClass extends BaseClass
                     'bookSn' => $bookSn,
                     'py' => $py,
                     'cgStaffId' => $cgStaffId,
-                    'cgStaffName' => $cgStaffName
+                    'cgStaffName' => $cgStaffName,
+                    'hasRemark'=>$hasRemark,
                 ];
                 $bookItemRes = self::add($statData, true);
             }
@@ -314,6 +317,8 @@ class BookItemClass extends BaseClass
                     'cgStaffId' => $cgStaffId,
                     'cgStaffName' => $cgStaffName,
                     'bookSn' => $bookSn,
+                    'hasRemark'=>$hasRemark,
+                    'remark'=>$remark,
                 ];
                 $bookItemCustomRes = BookItemCustomClass::add($currentData, true);
             }
@@ -329,6 +334,7 @@ class BookItemClass extends BaseClass
                     'mainId' => $mainId,
                     'customId' => $customId,
                     'bookSn' => $bookSn,
+                    'hasRemark'=>$hasRemark,
                 ];
                 $bookCustomRes = BookCustomClass::add($currentData, true);
             }

biz-ghs/order/services/OrderService.php

@@ -761,10 +761,14 @@ class OrderService extends BaseService
             if (!empty($itemList)) {
                 $bookData = [];
                 foreach ($itemList as $currentItem) {
+                    $itemRemark = $currentItem->remark??0;
+                    $hasRemark = !empty($itemRemark)?1:0;
                     $bookData[] = [
                         'productId' => $currentItem->productId,
                         'num' => $currentItem->xhNum ?? 0,
                         'lastNum' => $currentItem->xhNum ?? 0,
+                        'remark'=>$itemRemark,
+                        'hasRemark'=>$hasRemark,
                     ];
                 }
                 $staffId = $order->shopAdminId ?? 0;