删除无用代码，修改零售跑腿消费者代码

app-ghs/controllers/DeliveryController.php

@@ -272,7 +272,7 @@ class DeliveryController extends BaseController
             'address' => $custom['address'], //'toAddress' => $order['address'],
             'city' => $custom['city'],
             'weight' => $post['weight'] ?? 1,
-            //'remark' => $post['remark'] ?? '',
+            'remark' => $post['remark'] ?? '',
             'prePrice' => floatval($post['totalPrice'] ?? 0),
             'actPrice' => floatval($post['totalPrice'] ?? 0),
         ];

app-hd/controllers/DeliveryController.php

@@ -126,7 +126,7 @@ class DeliveryController extends BaseController
             'address' => $custom['address'], //'toAddress' => $order['address'],
             'city' => $custom['city'],
             'weight' => $post['weight'] ?? 1,
-            //'remark' => $post['remark'] ?? '',
+            'remark' => $post['remark'] ?? '',
             'prePrice' => floatval($post['totalPrice'] ?? 0),
             'actPrice' => floatval($post['totalPrice'] ?? 0),
         ];

biz-ghs/express/classes/ExpressClass.php

@@ -18,29 +18,6 @@ class ExpressClass extends BaseClass
 
     public static $baseFile = '\bizGhs\express\models\DeliveryOrder';
 
-    //要求下单
-    public static function askCreateOrder($data)
-    {
-        try {
-            $orderId = $data['orderId'] ?? 0;
-            $producer = Yii::$app->rabbitmq->getProducer('ptProducer');
-            $msg = serialize(['type' => 'ghs_pt_create_order', 'orderId' => $orderId]);
-            $producer->publish($msg, 'ptExchange', 'ptRoute', ['delivery_mode' => 2, 'content_type' => 'application/octet-stream']);
-        } catch (\Exception $e) {
-            $msg = $e->getMessage();
-            $remind = "批发，跑腿下单，生产消息端报错 {$orderId} {$msg}";
-            noticeUtil::push($remind, '15280215347');
-        }
-    }
-
-    //开始下单 ssh
-    public static function beginCreateOrder($data)
-    {
-        //批发，进行下单流程处理
-        noticeUtil::push('已消费ghs', '15280215347');
-        return true;
-    }
-
     public static function getTrack($params, $order)
     {
         $merchant = WxOpenClass::getGhsWxInfo();

biz-ghs/express/classes/GhsDeliveryOrderClass.php

@@ -6,7 +6,6 @@ use bizGhs\order\classes\OrderClass;
 use common\components\delivery\services\DispatchService;
 use mikemadisonweb\rabbitmq\components\ConsumerInterface;
 use common\components\noticeUtil;
-use common\components\util;
 use Yii;
 
 class GhsDeliveryOrderClass extends BaseClass
@@ -33,7 +32,7 @@ class GhsDeliveryOrderClass extends BaseClass
                 'remark' => $data['remark'],
                 'price' => $data['price']
             ]);
-            Yii::info('askCreateOrder == ' . $msg);
+            Yii::info('ghs askCreateOrder == ' . $msg);
             $producer->publish($msg, 'ptExchange', 'ptRoute', ['delivery_mode' => 2, 'content_type' => 'application/octet-stream']);
         } catch (\Exception $e) {
             $msg = $e->getMessage();

biz-hd/express/classes/ExpressClass.php

@@ -15,29 +15,6 @@ class ExpressClass extends BaseClass
     public static $baseFile = '\bizHd\express\models\Express';
 
 
-    public static function askCreateOrder($data)
-    {
-        try {
-            $orderId = $data['orderId'] ?? 0;
-            $producer = Yii::$app->rabbitmq->getProducer('ptProducer');
-            $msg = serialize(['type' => 'hd_pt_create_order', 'orderId' => $orderId]);
-            $producer->publish($msg, 'ptExchange', 'ptRoute', ['delivery_mode' => 2, 'content_type' => 'application/octet-stream']);
-        } catch (\Exception $e) {
-            $msg = $e->getMessage();
-            $remind = "零售花店，跑腿下单，生产消息端报错 {$orderId} {$msg}";
-            noticeUtil::push($remind, '15280215347');
-        }
-    }
-
-    //开始下单 ssh
-    public static function beginCreateOrder($data)
-    {
-        //花店，进行下单流程处理
-        noticeUtil::push('已消费hd', '15280215347');
-        return true;
-    }
-
-
     public static function getTrack($params, $cg)
     {
         $merchant = WxOpenClass::getGhsWxInfo();

biz-hd/express/classes/HdDeliveryOrderClass.php

@@ -3,6 +3,7 @@ namespace bizHd\express\classes;
 
 use bizHd\base\classes\BaseClass;
 use common\components\noticeUtil;
+use mikemadisonweb\rabbitmq\components\ConsumerInterface;
 use Yii;
 
 class HdDeliveryOrderClass extends BaseClass
@@ -14,8 +15,21 @@ class HdDeliveryOrderClass extends BaseClass
     {
         try {
             $orderId = $data['orderId'];
+            $allParams = $data['allParmas'];
             $producer = Yii::$app->rabbitmq->getProducer('ptProducer');
-            $msg = serialize(['type' => 'hd_pt_create_order', 'orderId' => $orderId]);
+            $msg = serialize([
+                'type' => 'hd_pt_create_order',
+                'orderId' => $orderId,
+                'mainId' => $data['mainId'],
+                'shopId' => $data['shopId'],
+                'pickupTime' => $data['pickupTime'],
+                'ip' => $data['ip'],
+                'allParams' => $allParams,
+                'weight' => $data['weight'],
+                'remark' => $data['remark'],
+                'price' => $data['price']
+            ]);
+            Yii::info('hd askCreateOrder == ' . $msg);
             $producer->publish($msg, 'ptExchange', 'ptRoute', ['delivery_mode' => 2, 'content_type' => 'application/octet-stream']);
         } catch (\Exception $e) {
             $msg = $e->getMessage();
@@ -33,7 +47,7 @@ class HdDeliveryOrderClass extends BaseClass
         $orderId = $data['orderId']; // xhGhsOrder.id
         $params = $data['allParams'];
         Yii::info('params == ' . json_encode($params, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
-        return true;
+        return ConsumerInterface::MSG_REJECT;
     }
 }
 

common/components/rabbitmq/ptConsumer.php

@@ -36,12 +36,10 @@ class ptConsumer implements ConsumerInterface
             switch ($type) {
                 case 'hd_pt_create_order':
                     //花店跑腿开始下单
-                    //$result = \bizHd\express\classes\ExpressClass::beginCreateOrder($data);
                     $result = \bizHd\express\classes\HdDeliveryOrderClass::beginCreateOrder($data);
                     break;
                 case 'ghs_pt_create_order':
                     //供货商跑腿开始下单
-                    //$result = \bizGhs\express\classes\ExpressClass::beginCreateOrder($data);
                     $result = \bizGhs\express\classes\GhsDeliveryOrderClass::beginCreateOrder($data);
                     break;
                 default: