Sfoglia il codice sorgente

期望送货时间

shish 5 anni fa
parent
commit
71146c21be

+ 0 - 1
app-hd/controllers/PurchaseController.php

@@ -45,7 +45,6 @@ class PurchaseController extends BaseController
 //            if (!$post['sendCost']) {
 //                util::fail("请确认运费");
 //            }
-            // $post['sendCost'] =
         }
         $connection = Yii::$app->db;//事务处理
         $transaction = $connection->beginTransaction();

+ 1 - 1
biz-ghs/order/classes/OrderClass.php

@@ -147,7 +147,7 @@ class OrderClass extends BaseClass
             $data['realPrice'] = bcsub($currentPrice, $discountAmount, 2);
         }
 
-        $data['sendTime'] = isset($data['sendTime']) && !empty($data['sendTime']) ? $data['sendTime'] : '0000-00-00 00:00:00';
+        $data['sendTimeWant'] = isset($data['sendTimeWant']) && !empty($data['sendTimeWant']) ? $data['sendTimeWant'] : date("Y-m-d");
         //订单有效期
         $validTime = dict::getDict('sale_purchase_order_valid');
         $current = time() + $validTime;

+ 1 - 4
biz-hd/purchase/classes/PurchaseClass.php

@@ -52,10 +52,7 @@ class PurchaseClass extends BaseClass
         $orderSn = orderSn::getPurchaseSn();
         $data['orderSn'] = $orderSn;
         $prePrice = 0;
-
-        $data['sendTimeWant'] = date("Y-m-d") . ' ' . $data['sendTime'];
-        unset($data['sendTime']);
-
+        $data['sendTimeWant'] = isset($data['sendTimeWant']) && !empty($data['sendTimeWant']) ? $data['sendTimeWant'] : date("Y-m-d");
         if (isset($data['product']) == false || empty($data['product'])) {
             util::fail('请选择花材');
         }

+ 2 - 0
biz-hd/purchase/services/PurchaseService.php

@@ -61,6 +61,7 @@ class PurchaseService extends BaseService
         $discountAmount = $respond->discountAmount ?? 0;
         $remark = $data['remark'] ?? '';
         $xj = $data['xj'] ?? '';
+        $sendTimeWant = isset($data['sendTimeWant']) && !empty($data['sendTimeWant']) ? $data['sendTimeWant'] : date("Y-m-d");
         $arr = [
             'product' => $product,
             'sjId' => $currentSjId,
@@ -90,6 +91,7 @@ class PurchaseService extends BaseService
             'discountAmount' => $discountAmount,
             'remark' => $remark,
             'xj' => $xj,
+            'sendTimeWant' => $sendTimeWant,
         ];
         $result = OrderClass::addOrder($arr);
         $saleId = $result['id'] ?? 0;