预订设置

app-ghs/controllers/OrderController.php

@@ -39,6 +39,23 @@ class OrderController extends BaseController
         util::complete();
     }
 
+    //到货获取订单详情 ssh 20220323
+    public function actionArrivalDetail()
+    {
+        $get = Yii::$app->request->get();
+        $id = $get['id'] ?? 0;
+        $info = OrderClass::getById($id);
+        OrderClass::valid($info, $this->shopId);
+        $showItemData = OrderClass::getOriginalShowItem(true, $info);
+        $itemList = $showItemData['list'] ?? [];
+        $info['product'] = $itemList;
+        $kiloFee = $this->shop->kiloFee ?? 0;
+        $miniKilo = $this->shop->miniKilo ?? 0;
+        $info['kiloFee'] = $kiloFee;
+        $info['miniKilo'] = $miniKilo;
+        util::success($info);
+    }
+
     //支付宝扫码支付 shish 20210103
     public function actionScanPayCheck()
     {

app-ghs/controllers/ShopController.php

@@ -22,6 +22,25 @@ class ShopController extends BaseController
 
     public $guestAccess = ['all'];
 
+    //预订设置 ssh 20220324
+    public function actionBookSet()
+    {
+        $get = Yii::$app->request->get();
+        $kiloFee = $get['kiloFee'] ?? 0;
+        $miniKilo = $get['miniKilo'] ?? 0;
+        $this->shop->kiloFee = $kiloFee;
+        $this->shop->miniKilo = $miniKilo;
+        $this->shop->save();
+        util::complete();
+    }
+
+    //当前门店信息
+    public function actionInfo()
+    {
+        $shop = $this->shop ?? [];
+        util::success($shop);
+    }
+
     //获取当前门店信息 ssh 2021.3.27
     public function actionCurrentShop()
     {

biz-ghs/order/classes/OrderClass.php

@@ -467,6 +467,7 @@ class OrderClass extends BaseClass
                 if ($order['status'] != self::ORDER_STATUS_UN_PAY && $order['status'] != self::ORDER_STATUS_CANCEL) {
                     $arrival['show'] = 1;
                 }
+                $arrival['show'] = 1;
             }
 
             //待确认订单显示延期付和已付款

biz-ghs/order/classes/OrderItemClass.php

@@ -43,6 +43,8 @@ class OrderItemClass extends BaseClass
                 $ratio = $productData[$val['productId']]['ratio'] ?? 1;
                 $list[$key]['ratio'] = $ratio;
             }
+            //保存实时成本，预订单到货时使用
+            $list[$key]['currentCost'] = $productData[$val['productId']]['cost'] ?? 0;
         }
         return $list;
     }

biz-ghs/product/classes/ProductClass.php

@@ -678,6 +678,7 @@ class ProductClass extends BaseClass
             $tmp['ratio'] = $productData[$productId]['ratio'] ?? 1;
             $tmp['variety'] = $productData[$productId]['variety'] ?? 0;
             $tmp['unitPrice'] = $itemPrice;
+            $tmp['unitWeight'] = $productData[$productId]['weight'] ?? 0;;
             $tmp['num'] = $itemNum;
             $tmp['bigNum'] = $v['bigNum'];
             $tmp['smallNum'] = $v['smallNum'];

biz-hd/purchase/classes/PurchaseClass.php

@@ -109,6 +109,7 @@ class PurchaseClass extends BaseClass
             $productId = $product['productId'];
             $hdProductId = $product['hdProductId'];
 
+            $unitWeight = $hdProductData[$hdProductId]['weight'] ?? 0;
             $variety = $hdProductData[$hdProductId]['variety'] ?? 0;
             $ratio = $hdProductData[$hdProductId]['ratio'] ?? 0; //比例必须一致
             $itemId = $hdProductData[$hdProductId]['itemId'] ?? 0;
@@ -153,6 +154,7 @@ class PurchaseClass extends BaseClass
             $productList[$key]['smallNum'] = $product['smallNum'] ?? 0;
             $productList[$key]['price'] = $price;
             $productList[$key]['ratio'] = $ratio;
+            $productList[$key]['unitWeight'] = $unitWeight;
             $productList[$key]['totalPrice'] = $productTotalPrice;
             $productList[$key]['preTotalPrice'] = $productTotalPrice;
             $productList[$key]['productId'] = $hdProductId;

sql.txt

@@ -624,4 +624,7 @@ ALTER TABLE xhCg CHANGE `stockLock` `stockChange` TINYINT(4) NOT NULL DEFAULT '1
 ALTER TABLE xhGhs ADD ownMainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `ownShopId`;
 ALTER TABLE xhGhsCustom ADD ownMainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `ownShopId`;
 
+ALTER TABLE xhGhsOrderItem ADD unitWeight DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '单位重量' AFTER `smallUnitPrice`;
+ALTER TABLE xhCgItem ADD unitWeight DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '单位重量' AFTER `variety`;
+
 ====预订单 ssh 20220321