订单兼容前端未修改情况

app-hd/controllers/OrderController.php

@@ -521,6 +521,13 @@ class OrderController extends BaseController
             $detail = OrderService::getOrderBySn($orderSn);
         }
         OrderService::valid($detail, $this->shopId);
+
+        //因前端未修改，这里先做一下兼容，好像打印时要调用到
+        $detail['receiveProvince'] = $detail['province'] ?? '';
+        $detail['receiveCity'] = $detail['city'] ?? '';
+        $detail['receiveAddress'] = $detail['address'] ?? '';
+        $detail['receiveFloor'] = $detail['floor'] ?? '';
+
         util::success($detail);
     }
 

app-mall/controllers/OrderController.php

@@ -284,6 +284,31 @@ class OrderController extends BaseController
         $post['fromType'] = $fromType;
         $post['reachDate'] = isset($post['reachDate']) && !empty($post['reachDate']) ? $post['reachDate'] : '00-00-00';
         $post['thirdPay'] = dict::getDict('thirdPay', 'onlineWay');
+
+        //前端未修改时这边做兼容
+        if (isset($post['receiveAddress']) && !empty($post['receiveAddress'])) {
+            $post['address'] = $post['receiveAddress'];
+            if (isset($post['receiveProvince']) && !empty($post['receiveProvince'])) {
+                $post['province'] = $post['receiveProvince'];
+            }
+            if (isset($post['receiveCity']) && !empty($post['receiveCity'])) {
+                $post['city'] = $post['receiveCity'];
+            }
+            if (isset($post['receiveFloor']) && !empty($post['receiveFloor'])) {
+                $post['floor'] = $post['receiveFloor'];
+            }
+            if (isset($post['latitude']) && !empty($post['latitude'])) {
+                $post['lat'] = $post['latitude'];
+            }
+            if (isset($post['longitude']) && !empty($post['longitude'])) {
+                $post['long'] = $post['longitude'];
+            }
+            $city = $post['receiveCity'] ?? '';
+            $address = $post['receiveAddress'] ?? '';
+            $floor = $post['receiveFloor'] ?? '';
+            $post['fullAddress'] = $city . $address . $floor;
+        }
+
         $order = OrderClass::addOrder($post);
         $orderId = $order['id'];
         $orderSn = $order['orderSn'];

biz-hd/order/services/OrderSendService.php

@@ -167,6 +167,9 @@ class OrderSendService extends BaseService
                         'address' => $order['address'],
                         'floor' => $order['floor'],
                         'fullAddress' => $order['fullAddress'],
+                        'receiveAddress' => $order['address'],
+                        'receiveFloor' => $order['floor'],
+                        'receiveFullAddress' => $order['fullAddress'],
                     ];
                 }
             }