过期时间

app-mall/controllers/OrderController.php

@@ -49,7 +49,7 @@ class OrderController extends BaseController
         $transaction = $connection->beginTransaction();
         try {
             $post['product'] = $productList;
-            $post['deadline'] = date("Y-m-d H:i:s", strtotime('+360 day'));
+            $post['deadline'] = time() + 3600;
             $return = OrderService::createOrder($post);
             $transaction->commit();
             $orderSn = $return->orderSn ?? '';

biz-ghs/order/classes/OrderClass.php

@@ -45,8 +45,6 @@ class OrderClass extends BaseClass
     use OrderTrait;
     public static $baseFile = '\bizGhs\order\models\Order';
 
-    //已退款
-    const ORDER_STATUS_REFUND = 6;
     //已取消
     const ORDER_STATUS_CANCEL = 5;
     //已完成

biz-hd/order/classes/OrderClass.php

@@ -32,8 +32,6 @@ class OrderClass extends BaseClass
 
     public static $baseFile = '\bizHd\order\models\Order';
 
-    //已退款
-    const ORDER_STATUS_REFUND = 6;
     //已取消
     const ORDER_STATUS_CANCEL = 5;
     //完成

biz-mall/order/classes/OrderClass.php

@@ -20,20 +20,17 @@ class OrderClass extends BaseClass
 
     public static $baseFile = '\bizMall\order\models\Order';
 
-    //已退款
-    const ORDER_STATUS_REFUND = 6;
     //完成
-    const ORDER_STATUS_COMPLETE = 5;
+    const ORDER_STATUS_COMPLETE = 4;
     //已取消
-    const ORDER_STATUS_CANCEL = 4;
-    //待通知
-    const ORDER_STATUS_UN_NOTICE = 3;
+    const ORDER_STATUS_CANCEL = 5;
     //配送中
-    const ORDER_STATUS_SENDING = 2;
+    const ORDER_STATUS_SENDING = 3;
     //待配送
-    const ORDER_STATUS_UN_SEND = 1;
+    const ORDER_STATUS_UN_SEND = 2;
     //待付款
-    const ORDER_STATUS_UN_PAY = 0;
+    const ORDER_STATUS_UN_PAY = 1;
+
     //订单总流程数
     const ORDER_TOTAL_FLOW = 4;
 

biz-mall/order/services/OrderService.php

@@ -73,7 +73,6 @@ class OrderService extends BaseService
             $unitType = $val['unitType'] ?? 0;
             $currentId = $val['productId'] ?? 0;
             $num = $val['num'] ?? 0;
-            $currentPrice = 0;
             $unitPrice = 0;
             if ($property == dict::getDict('property', 'goods')) {
                 $name = $goodsInfo[$currentId]['name'] ?? '';
@@ -158,9 +157,10 @@ class OrderService extends BaseService
             $goodsPrice = bcadd($goodsPrice, bcmul($unitPrice, $num, 2), 2);
 
         }
+
         $sendCost = $data['sendCost'] ?? 0;
         $totalPrice = bcadd($goodsPrice, $sendCost, 2);
-        $modifyPrice = $data['modifyPrice'] ?? 0;
+        $modifyPrice = $totalPrice;
         if ($modifyPrice > $totalPrice) {
             //人工资材包装费
             $data['labourCost'] = bcsub($modifyPrice, $totalPrice, 2);