达达增加备注

app-ghs/controllers/OrderController.php

@@ -10,6 +10,7 @@ use bizGhs\order\classes\OrderClass;
 use bizGhs\order\services\OrderService;
 use bizHd\saas\services\RegionService;
 use bizGhs\product\classes\ProductClass;
+use common\components\dada\dada;
 use common\components\dict;
 use common\components\dateUtil;
 use common\components\freight;
@@ -343,6 +344,7 @@ class OrderController extends BaseController
         if (empty($lat) || empty($lng) || empty($fullAddress)) {
             util::fail('请选择配送地址');
         }
+        ini_set('date.timezone','Asia/Shanghai');
         if (!empty($sendTime)) {
             //配送时间不为空
             // 预约发单时间（预约时间unix时间戳(10位),精确到分;整分钟为间隔，并且需要至少提前5分钟预约
@@ -353,6 +355,9 @@ class OrderController extends BaseController
             if ($diff <= 360) {
                 util::fail('配送时间至少提前6分钟');
             }
+        }else{
+            //默认30分钟后
+            $sendTime = date('Y-m-d H:i:s',strtotime("+30 minutes"));
         }
         //更新订单表
         $info = OrderService::getOrderInfo($orderId);

biz-ghs/express/services/DadaExpressServices.php

@@ -32,14 +32,14 @@ class DadaExpressServices
 
 
     //根据订单号，发快递
-    public static function addOrder($orderInfo)
+    public static function addOrder($orderInfo,$expressRemark = '')
     {
         if (empty($orderInfo)) {
             util::fail("订单不存在");
         }
         $sjId = $orderInfo->sjId;
         $sourceId = SjExpressClass::getSourceId($sjId);
-        $orderParams = self::orderParams($orderInfo->attributes);
+        $orderParams = self::orderParams($orderInfo->attributes,$expressRemark);
         $res = dada::addOrder($sourceId, $orderParams);
         Yii::debug($orderParams);
         Yii::debug($res);
@@ -105,7 +105,7 @@ class DadaExpressServices
     }
 
     //组装订单参数
-    public static function orderParams($orderInfo)
+    public static function orderParams($orderInfo,$expressRemark='')
     {
         $sjId = $orderInfo['sjId'];
         //$online = Yii::$app->params['dadaOnline'];
@@ -131,7 +131,7 @@ class DadaExpressServices
 
             'cargo_weight' => (float)$orderInfo['weight'],//订单重量（单位：Kg）
             'receiver_phone' => $orderInfo['customMobile'],//否	收货人手机号（手机号和座机号必填一项）
-            'info' => '',//备注
+            'info' => $expressRemark,//备注
             'cargo_type' => 3, //类型：鲜花
             'cargo_num' => (int)$orderInfo['bigNum'],
             'origin_mark_no' => '#销花宝#',

biz-ghs/order/classes/OrderClass.php

@@ -418,6 +418,7 @@ class OrderClass extends BaseClass
         $id = $order->id;
         $expressId = $expressInfo['expressId'] ?? 1;
         $expressName = $expressInfo['deliveryName'] ?? '达达';
+        $expressRemark = $expressInfo['remark']??'';
 
         $order->status = self::ORDER_STATUS_SENDING;
         $order->sendType = self::SEND_TYPE_THIRD;
@@ -439,7 +440,8 @@ class OrderClass extends BaseClass
         }
 
         //达达
-        $dadaRes = DadaExpressServices::addOrder($order);
+
+        $dadaRes = DadaExpressServices::addOrder($order,$expressRemark);
 
         $orderSn = $order->orderSn;
         $sjId = $order->sjId ?? 0;
@@ -463,6 +465,7 @@ class OrderClass extends BaseClass
             'distance' => $dadaRes['distance'],
             'status' => 1,
             'expressName' => $expressName,
+            'remark' =>$expressRemark,
         ];
         OrderExpressClass::addExpress($expData);
         OrderSendClass::thirdSend($order);