兼容收银台端数据

biz-ghs/order/services/OrderService.php

@@ -35,6 +35,32 @@ class OrderService extends BaseService
     //添加订单
     public static function createFinishOrder($data, $custom, $hasPay = 1)
     {
+
+        //收银台过来的数据结构和APP端不一样，先进行转换一下
+        $requestSide = Yii::$app->request->post('requestSide', 0);
+        if ($requestSide == 1) {
+            $newProductData = [];
+            foreach ($data['product'] as $productItem) {
+                $unitType = $productItem['unitType'] ?? 0;
+                $num = $productItem['num'] ?? 0;
+                $productId = $productItem['productId'] ?? 0;
+                $classId = $productItem['classId'] ?? 0;
+                $itemId = $productItem['itemId'] ?? 0;
+                $price = $productItem['price'] ?? 0;
+                if ($unitType == 0) {
+                    $bigNum = $num;
+                    $smallNum = '';
+                } else {
+                    $bigNum = '';
+                    $smallNum = $num;
+                }
+                $newProductData[] = ['productId' => (int)$productId, 'bigNum' => (int)$bigNum, 'smallNum' => (int)$smallNum,
+                    'classId' => (int)$classId, 'itemId' => (int)$itemId, 'price' => floatval($price)];
+            }
+            $data['product'] = $newProductData;
+        }
+
+
         //供应商销售单
         $returnOrder = OrderClass::addOrder($data);
         $saleId = $returnOrder->id ?? 0;

biz-hd/goods/classes/GoodsClass.php

@@ -51,7 +51,6 @@ class GoodsClass extends BaseClass
             //多款式
             $val['goodsStyleList'] = isset($val['goodsStyle']) && $val['goodsStyle'] == 1 ? array_values(GoodsStyleClass::getStyleList($id)) : [];
             $val['createDate'] = date("Y-m-d", strtotime($val['createTime']));
-            $val['name'] = '';
             //节日涨价
             if (!empty($rise)) {
                 $price = $val['price'];