发货

app-ghs/controllers/OrderController.php

@@ -230,8 +230,8 @@ class OrderController extends BaseController
     {
         $get = Yii::$app->request->get();
         $id = isset($get['id']) ? $get['id'] : 0;
-        $info = OrderService::getOrderInfo($id);
-        OrderClass::valid($info, $this->shopId);
+        $info = OrderClass::getById($id, true);
+        OrderClass::valid($info->attributes, $this->shopId);
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
@@ -319,8 +319,8 @@ class OrderController extends BaseController
     {
         $get = Yii::$app->request->get();
         $id = isset($get['id']) ? $get['id'] : 0;
-        $info = OrderService::getOrderInfo($id);
-        OrderClass::valid($info, $this->shopId);
+        $info = OrderService::getById($id, true);
+        OrderClass::valid($info->attributes, $this->shopId);
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {

biz-ghs/express/services/DadaExpressServices.php

@@ -37,9 +37,9 @@ class DadaExpressServices
         if (empty($orderInfo)) {
             util::fail("订单不存在");
         }
-        $sjId = $orderInfo['merchantId'];
+        $sjId = $orderInfo->merchantId;
         $sourceId = SjExpressClass::getSourceId($sjId);
-        $orderParams = self::orderParams($orderInfo);
+        $orderParams = self::orderParams($orderInfo->attributes);
         $res = dada::addOrder($sourceId, $orderParams);
         return $res;
     }

biz-ghs/order/classes/OrderClass.php

@@ -14,6 +14,7 @@ use bizGhs\admin\classes\AdminClass;
 use bizGhs\custom\classes\CustomClass;
 use bizGhs\stat\classes\StatOrderCountClass;
 use bizGhs\stat\classes\StatYjClass;
+use bizHd\purchase\classes\PurchaseClass;
 use bizHd\stat\classes\StatIncomeClass;
 use bizHd\stat\classes\StatOrderClass;
 use common\components\dict;
@@ -366,13 +367,13 @@ class OrderClass extends BaseClass
     //快递送 ssh 2021.3.16
     public static function thirdSend($order, $expressInfo)
     {
-        if ($order['status'] == self::ORDER_STATUS_UN_PAY) {
+        if ($order->status == self::ORDER_STATUS_UN_PAY) {
             util::fail('订单未付款');
         }
-        if ($order['status'] != self::ORDER_STATUS_UN_SEND) {
+        if ($order->status != self::ORDER_STATUS_UN_SEND) {
             util::fail('不是待配送状态');
         }
-        $id = $order['id'];
+        $id = $order->id;
         $expressId = $expressInfo['expressId'] ?? 1;
         $expressName = $expressInfo['deliveryName'] ?? '达达';
         self::updateById($id, ['status' => self::ORDER_STATUS_SENDING, 'sendType' => self::SEND_TYPE_THIRD, 'expressId' => $expressId]);
@@ -385,10 +386,8 @@ class OrderClass extends BaseClass
         //达达
         $dadaRes = DadaExpressServices::addOrder($order);
 
-
-        $orderSn = $order['orderSn'];
-        $sjId = $order['merchantId'] ?? 0;
-
+        $orderSn = $order->orderSn;
+        $sjId = $order->merchantId ?? 0;
 
         /*
         $getInfo = ExpressClass::getExpressInfo($expressId);
@@ -404,7 +403,7 @@ class OrderClass extends BaseClass
             'orderSn' => $orderSn,
             'sjId' => $sjId,
             'expressId' => $expressId,
-            'sendTime' => strtotime($order['sendTime']),
+            'sendTime' => strtotime($order->sendTime),
             'cost' => $dadaRes['fee'],
             'distance' => $dadaRes['distance'],
             'status' => 1,
@@ -420,22 +419,30 @@ class OrderClass extends BaseClass
             'status' => 2,
             'tip' => 0,
         ];
-        return $respond;
 
+        //采购单变成已发货
+        $purchaseId = $order->purchaseId ?? 0;
+        PurchaseClass::sending($purchaseId);
+
+        return $respond;
     }
 
     //本店送 ssh 2021.1.24
     public static function selfSend($info)
     {
-        if ($info['status'] == self::ORDER_STATUS_UN_PAY) {
+        if ($info->status == self::ORDER_STATUS_UN_PAY) {
             util::fail('订单未付款');
         }
-        if ($info['status'] != self::ORDER_STATUS_UN_SEND) {
+        if ($info->status != self::ORDER_STATUS_UN_SEND) {
             util::fail('不是待配送状态');
         }
-        $id = $info['id'];
-        self::updateById($id, ['status' => self::ORDER_STATUS_SENDING, 'sendType' => self::SEND_TYPE_MYSELF,]);
+        $info->status = self::ORDER_STATUS_SENDING;
+        $info->sendType = self::SEND_TYPE_MYSELF;
+        $info->save();
         OrderSendClass::selfSend($info);
+        //采购单变成已发货
+        $purchaseId = $info->purchaseId ?? 0;
+        PurchaseClass::sending($purchaseId);
     }
 
     //订单完成 ssh 2020.3.12

biz-ghs/order/classes/OrderSendClass.php

@@ -20,7 +20,7 @@ class OrderSendClass extends BaseClass
 
     public static function thirdSend($order)
     {
-        $orderSn = $order['orderSn'];
+        $orderSn = $order->orderSn;
         $relation = self::ACTION_RELATION;
         $currentId = $relation['deliver'] ?? 0;
         if (empty($currentId)) {
@@ -40,7 +40,7 @@ class OrderSendClass extends BaseClass
     //本店送 ssh 2021.3.4
     public static function selfSend($order)
     {
-        $orderSn = $order['orderSn'];
+        $orderSn = $order->orderSn;
         $relation = self::ACTION_RELATION;
         $currentId = $relation['deliver'] ?? 0;
         if (empty($currentId)) {

biz-hd/purchase/classes/PurchaseClass.php

@@ -271,7 +271,17 @@ class PurchaseClass extends BaseClass
         foreach ($purchaseItem as $v) {
             ProductClass::addStockByItemNum($v['productId'], $v['itemNum']);
         }
+    }
 
+    //订单信息变更为配送中 shish 2021.5.15
+    public static function sending($purchaseId)
+    {
+        $purchase = PurchaseClass::getById($purchaseId, true);
+        if (empty($purchase)) {
+            util::fail('没有采购单信息');
+        }
+        $purchase->status = PurchaseClass::STATUS_SENDING;
+        $purchase->save();
     }
 
 }