发货记录

biz-ghs/order/classes/OrderClass.php

@@ -342,13 +342,15 @@ class OrderClass extends BaseClass
             if ($order['sendType'] == self::SEND_TYPE_NO) {
                 $send['disable'] = 1;
             }
-
             //取消订单置灰
             if ($order['status'] == self::ORDER_STATUS_CANCEL) {
                 $send['disable'] = 1;
                 $selfGet['disable'] = 1;
                 $print['disable'] = 1;
             }
+            if ($order['status'] == self::ORDER_STATUS_COMPLETE) {
+                $send['name'] = '发货记录';
+            }
             return [$send, $selfGet, $print, $confirm];
 
         } else {
@@ -375,12 +377,12 @@ class OrderClass extends BaseClass
             }
             //配送中显示按钮
             if ($order['status'] == self::ORDER_STATUS_SENDING) {
-                $send = ['type' => 'send', 'show' => 1, 'disable' => 0,'name' => '发货'];
+                $send = ['type' => 'send', 'show' => 1, 'disable' => 0, 'name' => '发货'];
                 return [$print, $send];
             }
             //完成
             if ($order['status'] == self::ORDER_STATUS_COMPLETE) {
-                $send = ['type' => 'send', 'show' => 1, 'disable' => 0,'name' => '发货记录'];
+                $send = ['type' => 'send', 'show' => 1, 'disable' => 0, 'name' => '发货记录'];
                 //自取订单不显示发货按钮
                 if ($order['sendType'] == self::SEND_TYPE_NO) {
                     $send['show'] = 0;

biz-hd/purchase/services/PurchaseService.php

@@ -221,10 +221,10 @@ class PurchaseService extends BaseService
 
         //由供应商帮零售发起的采购，零售付款了则直接完成。实际场景是：供应商送货给客户让客户付款。所以直接完成即可。
         if ($info->cgStyle == dict::getDict('cgStyle', 'ghs')) {
+            Yii::$app->params['noNeedWxNotice'] = 1;
             $order = OrderClass::getLockById($saleId);
             OrderClass::selfSend($order);
             $order = OrderClass::getLockById($saleId);
-            Yii::$app->params['noNeedWxNotice'] = 1;
             OrderService::reach($order);
         }