修改订单 与 期望发货时间

app-ghs/controllers/OrderController.php

@@ -1699,7 +1699,7 @@ class OrderController extends BaseController
             // 底层在发货和收货扣减库存时，使用商品 ID 升序排序加锁（SELECT FOR UPDATE）策略，100% 杜绝交叉死锁，因此这里无需再做重试。
             $transaction = $connection->beginTransaction();
             try {
-                $return = OrderService::createNewOrder($post, $custom, $hasPay);
+                $return = OrderService::createSaleOrder($post, $custom, $hasPay);
                 $transaction->commit();
             } catch (\Exception $exception) {
                 if ($transaction->isActive) {
@@ -3670,7 +3670,7 @@ class OrderController extends BaseController
                 // 底层在发货和收货扣减库存时，使用商品 ID 升序排序加锁（SELECT FOR UPDATE）策略，100% 杜绝交叉死锁，因此这里无需再做重试。
                 $transaction = $connection->beginTransaction();
                 try {
-                    OrderService::createNewOrder($post, $custom, $hasPay);
+                    OrderService::createSaleOrder($post, $custom, $hasPay);
                     $transaction->commit();
                 } catch (\Exception $exception) {
                     if ($transaction->isActive) {

biz-ghs/order/services/OrderService.php

@@ -144,7 +144,7 @@ class OrderService extends BaseService
     }
 
     //添加订单
-    public static function createNewOrder($data, $custom, $hasPay = 1)
+    public static function createSaleOrder($data, $custom, $hasPay = 1)
     {
         //有unitType数据，说明是收银台传过来的数据，转换成和手机端结构一致
         $hasUnitType = array_column($data['product'], 'unitType');
@@ -189,6 +189,10 @@ class OrderService extends BaseService
             $data['sendTime'] = $sendTimeInput;
         }
 
+        //小票打印用到这个
+        $sendTimeWant = date('Y-m-d', strtotime($data['sendTime']));
+        $data['sendTimeWant'] = $sendTimeWant;
+
         //供货商销售单
         $returnOrder = OrderClass::addOrder($data, $custom);
         $saleId = $returnOrder->id ?? 0;
@@ -233,8 +237,6 @@ class OrderService extends BaseService
             }
         }
 
-        $sendTimeWant = !empty($data['sendTimeWant']) ? $data['sendTimeWant'] : date("Y-m-d");
-
         $remark = $data['remark'] ?? '';
         $xj = $data['xj'] ?? '';
         $treeData = $data['treeData'] ?? [];
@@ -947,7 +949,7 @@ class OrderService extends BaseService
         //当天同个人同地址的订单汇总
         $prefixDate = substr($order->payTime, 0, 10);
         OrderClass::updateSameTimeIds($order, $prefixDate);
-        OrderClass::updateMergeOrder($order,0);
+        OrderClass::updateMergeOrder($order, 0);
     }
 
     //发起退款

console/controllers/LiveOrderController.php

@@ -154,7 +154,7 @@ class LiveOrderController extends Controller
 
                     $post['historyDate'] = $historyDate;
                     //多处有用到此方法，需要同步修改，搜索关键词create_new_order
-                    $order = OrderService::createNewOrder($post, $custom, $hasPay);
+                    $order = OrderService::createSaleOrder($post, $custom, $hasPay);
 
                     //清掉一天多单的汇总
                     $sameDate = date("Y_m_d");