自取免配送

app-ghs/controllers/OrderController.php

@@ -219,7 +219,7 @@ class OrderController extends BaseController
     {
         $get = Yii::$app->request->get();
         $id = $get['id'] ?? 0;
-        $info = OrderService::getOrderInfo($id);
+        $info = OrderService::getById($id, true);
         OrderClass::valid($info, $this->shopId);
         OrderService::withoutSend($info);
         util::complete();

biz-ghs/order/services/OrderService.php

@@ -83,13 +83,13 @@ class OrderService extends BaseService
         return $return->attributes;
     }
 
-    //自取免发货流程处理 ssh 2021.1.24
+    //自取免配送流程处理 ssh 2021.1.24
     public static function withoutSend($order)
     {
         if (isset($order->status) == false) {
             util::fail('没有订单状态');
         }
-        if ($order->status == self::ORDER_STATUS_COMPLETE) {
+        if ($order->status == OrderClass::ORDER_STATUS_COMPLETE) {
             util::fail('订单已完成');
         }
 
@@ -103,6 +103,10 @@ class OrderService extends BaseService
         $shop->sendingOrder += 1;
         $shop->save();
 
+        //自取免配送
+        $order->sendType = OrderClass::SEND_TYPE_NO;
+        $order->save();
+
         //订单完成
         self::finish($order, $shop);
 
@@ -138,10 +142,10 @@ class OrderService extends BaseService
     }
 
     //订单完成
-    public static function finish($order, $shop, $sendType)
+    public static function finish($order, $shop)
     {
         //销售单完成
-        $order = OrderClass::complete($order, $shop, $sendType);
+        $order = OrderClass::complete($order, $shop);
         //采购单完成
         $purchaseId = $order->purchaseId ?? 0;
         $purchase = PurchaseClass::getById($purchaseId, true);
@@ -421,7 +425,7 @@ class OrderService extends BaseService
         $order->payWay = $payWay;
         $order->status = OrderClass::ORDER_STATUS_UN_SEND;
         if ($payWay == dict::getDict('payWay', 'debtPay')) {
-            $order->debt = self::DEBT_YES;
+            $order->debt = OrderClass::DEBT_YES;
         }
         $order->save();
 

biz-hd/purchase/services/PurchaseService.php

@@ -3,6 +3,7 @@
 namespace bizHd\purchase\services;
 
 use biz\ghs\models\Ghs;
+use biz\shop\models\Shop;
 use bizGhs\custom\classes\CustomClass;
 use bizGhs\order\classes\OrderClass;
 use bizGhs\order\services\OrderService;

sql.sql

@@ -2496,6 +2496,8 @@ ADD INDEX `idx_ptStyle` (`ptStyle`) ;
 -----shish 20210514
 ALTER TABLE xhPurchase MODIFY `status` TINYINT(2) NOT NULL DEFAULT '1' COMMENT '订单状态 1待付款，待确认，2待配送，3配送中，4已完成 5已取消';
 ALTER TABLE xhPurchase ADD INDEX expire(`status`,`deadline`);
+ALTER TABLE xhGhsOrder MODIFY `sendNum` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '配送编号，方便寻找订单对应的花材' AFTER `orderSn`;
+ALTER TABLE xhGhsOrder MODIFY `sendNum` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '配送编号，方便寻找订单对应的花材' AFTER `id`;
 
 
 -----linqh 2021.5.14  监控ws定时任务