订单

biz-ghs/order/classes/OrderClass.php

@@ -214,7 +214,7 @@ class OrderClass extends BaseClass
         $current = $currentTime + $validTime;
         $data['deadline'] = isset($data['deadline']) ? $data['deadline'] : date("Y-m-d H:i:s", $current);
         //订单自动记为欠款单时间
-        $localConfirmTime = dict::getDict('local_gys_kd_auto_confirm_time');
+        $localConfirmTime = dict::getDict('local_gys_kd_auto_set_debt_time');
         $currentSet = $currentTime + $localConfirmTime;
         $data['autoSetTime'] = $data['autoSetTime'] ?? date("Y-m-d H:i:s", $currentSet);
         $return = self::add($data, true);

biz-hd/purchase/classes/PurchaseClass.php

@@ -202,7 +202,7 @@ class PurchaseClass extends BaseClass
         $current = $currentTime + $validTime;
         $data['deadline'] = $data['deadline'] ?? date("Y-m-d H:i:s", $current);
         //采购单自动记为欠款单时间
-        $localConfirmTime = dict::getDict('local_gys_kd_auto_confirm_time');
+        $localConfirmTime = dict::getDict('local_gys_kd_auto_set_debt_time');
         $currentSet = $currentTime + $localConfirmTime;
         $data['autoSetTime'] = $data['autoSetTime'] ?? date("Y-m-d H:i:s", $currentSet);
         $respond = self::add($data, true);

biz-hd/purchase/services/PurchaseService.php

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

common/components/dict.php

@@ -48,12 +48,11 @@ class dict
         //是否在线支付
         'onlinePay' => ['not' => 1, 'yes' => 2],
 
-        //----------------------------------------------------------------------------
-        //商家开了待付款单未确认自动标记欠款单时间，必须小于下面的sale_purchase_order_valid--
-        'local_gys_kd_auto_confirm_time' => 1600,
-        //商家开单或客户采购订单有效期是多少秒，有效期内可以支付-----------------------------
-        'sale_purchase_order_valid' => 1900,
-        //----------------------------------------------------------------------------
+        //商家开了待付款单客户未付款自动标记欠款单时间
+        'local_gys_kd_auto_set_debt_time' => 30,
+
+        //客户采购订单有效期是多少秒，有效期内可以支付，到期自动取消
+        'sale_purchase_order_valid' => 120,
 
         'expressList' => [
             [

console/controllers/PurchaseController.php

@@ -16,11 +16,14 @@ class PurchaseController extends Controller
     //采购订单过期变更 shish 2021.5.14
     public function actionExpireOrder()
     {
-        $hdInvite = dict::getDict('cgStyle', 'ghs');
+        //采购单由花店发起的！！！！！
+        $hdInvite = dict::getDict('cgStyle', 'hd');
         $query = new \yii\db\Query();
         $query->from(Purchase::tableName());
         $date = date("Y-m-d H:i:s");
-        $query->where(['status' => PurchaseClass::STATUS_UN_PAY])->where(['cgStyle' => $hdInvite])->andWhere(['<=', 'deadline', $date]);
+        //找出一个星期内可以标记为过期的订单
+        $startDate = date("Y-m-d H:i:s", strtotime('-7 days'));
+        $query->where(['status' => PurchaseClass::STATUS_UN_PAY])->where(['cgStyle' => $hdInvite])->andWhere(['>', 'deadline', $startDate])->andWhere(['<=', 'deadline', $date]);
         $query->orderBy('deadline ASC');
 
         Yii::$app->params['ptStyle'] = dict::getDict('ptStyle', 'hd');
@@ -66,11 +69,14 @@ class PurchaseController extends Controller
     //待付款订单自动变成欠款订单
     public function actionSetDebtOrder()
     {
+        //采购单由供应商发起的！！！！！
         $ghsInvite = dict::getDict('cgStyle', 'ghs');
         $query = new \yii\db\Query();
         $query->from(Purchase::tableName());
         $date = date("Y-m-d H:i:s");
-        $query->where(['status' => PurchaseClass::STATUS_UN_PAY])->where(['cgStyle' => $ghsInvite])->andWhere(['<=', 'autoSetTime', $date]);
+        //找出一个星期内可以标记为欠款的订单
+        $startDate = date("Y-m-d H:i:s", strtotime('-7 days'));
+        $query->where(['status' => PurchaseClass::STATUS_UN_PAY])->where(['cgStyle' => $ghsInvite])->andWhere(['>', 'autoSetTime', $startDate])->andWhere(['<=', 'autoSetTime', $date]);
         $query->orderBy('autoSetTime ASC');
 
         Yii::$app->params['ptStyle'] = dict::getDict('ptStyle', 'hd');
@@ -80,7 +86,6 @@ class PurchaseController extends Controller
 
         $arr = [];
         foreach ($query->batch() as $purchases) {
-
             foreach ($purchases as $purchase) {
                 $connection = Yii::$app->db;//事务处理
                 $transaction = $connection->beginTransaction();