查看订单详情

.env.example

@@ -10,5 +10,10 @@ REDIS_PASSWORD=null
 REDIS_PORT=6379
 REDIS_DB=8
 
+#rabbitMQ
 RABBIT_MQ_HOST=127.0.0.1
-RABBIT_MQ_PORT=5672
+RABBIT_MQ_PORT=5672
+
+#达达
+DADA_APP_KEY=
+DADA_APP_SECRET=

app/business/controllers/StatController.php

@@ -20,7 +20,6 @@ class StatController extends BaseController
 			//按分类统计
 			//按用途统计
 		}
-		
 	}
-	
+
 }

app/client/controllers/OrderController.php

@@ -155,7 +155,7 @@ class OrderController extends BaseController
 		$capitalType = $typeList['xhOrder']['id'];
 		$totalFee = $order['actPrice'];
 		xhPayToolService::balancePay($orderSn, $totalFee, $capitalType, $couponId);
-		util::success(['discountAmount'=>9.9,'discountType'=>0]);
+		util::success(['discountAmount' => 9.9, 'discountType' => 0]);
 	}
 	
 	//获取商城下单要用的微信支付和小程序支付参数 shish 2019.21.3
@@ -167,7 +167,7 @@ class OrderController extends BaseController
 		$orderSn = isset($post['orderSn']) ? $post['orderSn'] : 0;
 		$order = OrderService::getByOrderSn($orderSn);
 		$orderId = $order['id'];
-
+		
 		//验证订单有效性
 		OrderService::check($order, $this->userId);
 		
@@ -397,7 +397,7 @@ class OrderController extends BaseController
 			$capitalType = $typeList['xhOrder']['id'];
 			$totalFee = $order['actPrice'];
 			xhPayToolService::balancePay($orderSn, $totalFee, $capitalType, $couponId);
-			util::success(['discountAmount'=>9.9,'discountType'=>0]);
+			util::success(['discountAmount' => 9.9, 'discountType' => 0]);
 		} else {
 			util::fail('无效的支付方式');
 		}
@@ -427,10 +427,17 @@ class OrderController extends BaseController
 	//订单详情 shish 2019.12.16
 	public function actionDetail()
 	{
-		$id = Yii::$app->request->get('id');
-		$detail = OrderService::getOrderById($id);
+		$id = Yii::$app->request->get('id', 0);
+		$orderSn = Yii::$app->request->get('orderSn', '');
+		$detail = [];
+		if (!empty($id)) {
+			$detail = OrderService::getOrderById($id);
+		}
+		if (!empty($orderSn)) {
+			$detail = OrderService::getOrderBySn($orderSn);
+		}
 		OrderService::valid($detail, $this->merchantId);
 		util::success($detail);
 	}
-
+	
 }

biz/order/classes/OrderClass.php

@@ -48,11 +48,26 @@ class OrderClass extends BaseClass
 		unset($data['id']);
 		return self::updateById($id, $data);
 	}
-
+	
 	//订单
 	public static function getOrderById($id)
 	{
 		$order = self::getById($id);
+		if (empty($order)) {
+			return [];
+		}
+		$order['goodsInfoList'] = OrderGoodsClass::getGoodsListById($id);
+		return $order;
+	}
+	
+	//根据订单查询 shish 2020.1.4
+	public static function getOrderBySn($orderSn)
+	{
+		$order = self::getByCondition(['orderSn' => $orderSn]);
+		if (empty($order)) {
+			return [];
+		}
+		$id = $order['id'];
 		$order['goodsInfoList'] = OrderGoodsClass::getGoodsListById($id);
 		return $order;
 	}

biz/order/services/OrderService.php

@@ -157,4 +157,10 @@ class OrderService extends BaseService
 		return OrderClass::getOrderById($id);
 	}
 
+	//查看订单详情 shish 2020.1.4
+	public static function getOrderBySn($orderSn)
+	{
+		return OrderClass::getOrderBySn($orderSn);
+	}
+	
 }