Merge branch 'master' into dev

app-ghs/controllers/OrderController.php

@@ -3225,8 +3225,6 @@ class OrderController extends BaseController
         $ext = $this->shopExt;
         $shop = $this->shop;
         OrderClass::printLogisticsLabel($order, $shop, $ext);
-        $order->printWlNum = intval($order->printWlNum ?? 0) + 1;
-        $order->save();
         util::complete('打印成功');
     }
 

biz-ghs/clear/classes/ClearClass.php

@@ -314,9 +314,14 @@ class ClearClass extends BaseClass
         $deadline = $info['deadline'] ?? '';
         $deadTime = strtotime($deadline);
         $current = time();
-        if ($current >= $deadTime) {
+        // 仅待结清且已过期时才取消，避免已结清账单被误改状态
+        if ($current >= $deadTime && ($info['status'] ?? 0) == PurchaseClearClass::STATUS_AWAIT_PAY) {
+            $n = date("Y-m-d H:i:s");
             $info['status'] = PurchaseClearClass::STATUS_EXPIRE;
-            self::updateById($id, ['status' => PurchaseClearClass::STATUS_EXPIRE]);
+            self::updateById($id, [
+                'status' => PurchaseClearClass::STATUS_EXPIRE,
+                'remark' => "账单过期，已自动取消，参数：{$deadline} {$n}",
+            ]);
         }
 
         $purchaseIds = $info['purchaseIds'] ?? [];

biz-ghs/order/classes/OrderClass.php

@@ -3148,6 +3148,10 @@ XL;
             /**************************如果是好多花的云仓还要再打一下标签纸，多处要同步修改，关键词 hdh_yc *****************************/
         }
         $p->printLabelMsg($content);
+        if (is_object($order) && method_exists($order, 'save')) {
+            $order->printWlNum = intval($order->printWlNum ?? 0) + 1;
+            $order->save();
+        }
         return true;
     }