延期功能优化

biz-ghs/order/services/OrderService.php

@@ -256,9 +256,9 @@ class OrderService extends BaseService
             util::fail('订单不是待付款状态');
         }
         if (isset($order['deadline']) && $now > $order['deadline']) {
-            $id = $order['id'];
-            $info = OrderClass::getLockById($id);
-            self::expire($info);
+            //$id = $order['id'];
+            //$info = OrderClass::getLockById($id);
+            //self::expire($info);
             util::fail('订单已过期');
         }
         if (ceil($order['actPrice']) <= 0) {
@@ -280,9 +280,9 @@ class OrderService extends BaseService
             util::fail('不是您的订单');
         }
         if (isset($order['deadline']) && $now > $order['deadline']) {
-            $id = $order['id'];
-            $info = OrderClass::getLockById($id);
-            self::expire($info);
+            //$id = $order['id'];
+            //$info = OrderClass::getLockById($id);
+            //self::expire($info);
             util::fail('订单已过期');
         }
     }
@@ -403,7 +403,8 @@ class OrderService extends BaseService
         if (empty($order)) {
             util::fail('没有找到订单');
         }
-        $order = self::expire($order);
+        //由脚本处理，这里不进行处理，避免重复操作
+        //$order = self::expire($order);
         $info = $order->attributes;
         $respond = OrderClass::groupOrder([$info], $showButton, $showItem, $showExpress, $isList);
         return current($respond);

biz-hd/purchase/services/PurchaseService.php

@@ -102,7 +102,7 @@ class PurchaseService extends BaseService
         if (empty($purchase)) {
             util::fail('没有找到采购单');
         }
-        $purchase = self::expire($purchase);
+        //$purchase = self::expire($purchase);
         $info = $purchase->attributes;
         $respond = PurchaseClass::groupPurchase([$info], $showButton, $showProduct);
         return current($respond);

console/controllers/ShopCouponController.php

@@ -12,6 +12,7 @@ use Yii;
 
 class ShopCouponController extends Controller
 {
+
     // 优惠券过期
     // ./yii shop-coupon/expire
     // /usr/local/nginx/html/huahuibao/yii shop-coupon/expire
@@ -26,7 +27,6 @@ class ShopCouponController extends Controller
             foreach ($coupons as $coupon) {
                 $couponAr = ShopCouponClass::getById($coupon['id'], true);
                 ShopCouponClass::expire($couponAr);
-
                 $log = "过期的优惠券：{$coupon['id']} json:" . json_encode($coupon);
                 Yii::info($log);
             }
@@ -35,4 +35,5 @@ class ShopCouponController extends Controller
             noticeUtil::push("零售商优惠券过期变更报错：{$msg}", '15280215347');
         }
     }
+
 }