订单详情

app/business/controllers/OrderController.php

@@ -36,7 +36,7 @@ class OrderController extends BaseController
 	public function actionDetail()
 	{
 		$id = Yii::$app->request->get('id');
-		$detail = OrderService::getDetail($id);
+		$detail = OrderService::getOrderById($id);
 		util::success($detail);
 	}
 	

app/client/controllers/OrderController.php

@@ -24,7 +24,7 @@ use common\components\util;
 
 class OrderController extends BaseController
 {
-
+	
 	//商城下单操作 shish 2019.12.3
 	public function actionCreateOrder()
 	{
@@ -157,7 +157,7 @@ class OrderController extends BaseController
 		xhPayToolService::balancePay($orderSn, $totalFee, $capitalType, $couponId);
 		util::success('支付成功');
 	}
-
+	
 	//获取商城下单要用的微信支付和小程序支付参数 shish 2019.21.3
 	public function actionWxPay()
 	{
@@ -172,11 +172,11 @@ class OrderController extends BaseController
 		
 		$name = isset($order['orderName']) && !empty($order['orderName']) ? $order['orderName'] : '购买商品';
 		$totalFee = $order['actPrice'];
-
+		
 		//小程序使用miniOpenId
-		if(httpUtil::isMiniProgram()){
+		if (httpUtil::isMiniProgram()) {
 			$openId = $this->user['miniOpenId'];
-		}else{
+		} else {
 			$openId = $this->user['openId'];
 		}
 		
@@ -210,10 +210,10 @@ class OrderController extends BaseController
 			$input->SetOpenid($openId);
 		}
 		//小程序使用miniAppId
-		if(httpUtil::isMiniProgram()){
+		if (httpUtil::isMiniProgram()) {
 			$merchantExtend['wxAppId'] = $merchantExtend['miniAppId'];
 		}
-
+		
 		$wxOrder = \WxPayApi::unifiedOrder($input, 6, $merchantExtend);
 		$tools = new \JsApiPay();
 		$jsApiParameters = $tools->GetJsApiParameters($wxOrder, $merchantExtend);
@@ -269,14 +269,14 @@ class OrderController extends BaseController
 			$totalFee = $actPrice;
 			$userId = $post['userId'];
 			$user = UserService::getById($this->userId);
-
+			
 			//小程序使用miniOpenId
-			if(httpUtil::isMiniProgram()){
+			if (httpUtil::isMiniProgram()) {
 				$openId = $user['miniOpenId'];
-			}else{
+			} else {
 				$openId = $user['openId'];
 			}
-
+			
 			$typeList = configDict::getConfig('capitalType');
 			$capitalType = $typeList['xhOrder']['id'];
 			$attach = 'capitalType=' . $capitalType . '&couponId=' . $couponId;//将流水类型、优惠卷传过去
@@ -292,7 +292,7 @@ class OrderController extends BaseController
 			$input->SetTime_expire(date("YmdHis", $expireTime));//设置订单有效期5分钟
 			$input->SetNotify_url($this->frontUrl . '/notice/weixin-callback/');
 			$input->SetTrade_type("JSAPI");
-
+			
 			//花卉宝代为申请的微信支付
 			$merchantExtend = $this->merchantExtend;
 			if ($merchantExtend['generalMerchant'] == 1) {
@@ -301,10 +301,10 @@ class OrderController extends BaseController
 				$input->SetOpenid($openId);
 			}
 			//小程序使用miniAppId
-			if(httpUtil::isMiniProgram()){
+			if (httpUtil::isMiniProgram()) {
 				$merchantExtend['wxAppId'] = $merchantExtend['miniAppId'];
 			}
-
+			
 			$wxOrder = \WxPayApi::unifiedOrder($input, 6, $merchantExtend);
 			$tools = new \JsApiPay();
 			$jsApiParameters = $tools->GetJsApiParameters($wxOrder, $merchantExtend);
@@ -422,5 +422,14 @@ class OrderController extends BaseController
 		OrderService::comment($post);
 		util::ok('提交成功');
 	}
+	
+	//订单详情 shish 2019.12.16
+	public function actionDetail()
+	{
+		$id = Yii::$app->request->get('id');
+		$detail = OrderService::getOrderById($id);
+		OrderService::valid($detail, $this->merchantId);
+		util::success($detail);
+	}
 
 }

biz/order/classes/OrderClass.php

@@ -35,12 +35,12 @@ class OrderClass extends BaseClass
 		$return = self::add($data);
 		return $return;
 	}
-
+	
 	public static function getByOrderSn($orderSn)
 	{
 		return self::getByCondition(['orderSn' => $orderSn]);
 	}
-
+	
 	//评价 shish 2019.12.16
 	public static function comment($data)
 	{
@@ -49,4 +49,12 @@ class OrderClass extends BaseClass
 		return self::updateById($id, $data);
 	}
 
+	//订单
+	public static function getOrderById($id)
+	{
+		$order = self::getById($id);
+		$order['goodsInfoList'] = OrderGoodsClass::getGoodsListById($id);
+		return $order;
+	}
+
 }

biz/order/classes/OrderGoodsClass.php

@@ -2,12 +2,43 @@
 
 namespace biz\order\classes;
 
+use common\components\business;
 use Yii;
 use biz\base\classes\BaseClass;
 
 class OrderGoodsClass extends BaseClass
 {
-	
+
 	public static $baseFile = '\biz\order\models\OrderGoods';
-	
+
+	//取订单 shish 2020.1.2
+	public static function getGoodsListById($id)
+	{
+		$arr = self::getAllByCondition(['orderId' => $id], null, '*');
+		if (empty($arr)) {
+			return [];
+		}
+		foreach ($arr as $key => $val) {
+			$val = business::formatOrderGoodsCover($val);
+			$arr[$key] = $val;
+		}
+		return $arr;
+	}
+
+	//批量取订单 shish 2020.1.2
+	public static function getGoodsListByOrderIds($ids)
+	{
+		$arr = self::getAllByCondition(['orderId' => ['in', $ids]], null, '*');
+		if (empty($arr)) {
+			return [];
+		}
+		$data = [];
+		foreach ($arr as $info) {
+			$orderId = $info['orderId'];
+			$info = business::formatOrderGoodsCover($info);
+			$data[$orderId][] = $info;
+		}
+		return $data;
+	}
+
 }

biz/order/services/OrderGoodsService.php

@@ -3,36 +3,25 @@
 namespace biz\order\services;
 
 use biz\base\services\BaseService;
+use biz\order\classes\OrderGoodsClass;
+use common\components\business;
 use Yii;
-use linslin\yii2\curl;
-use yii\helpers\ArrayHelper;
 
 class OrderGoodsService extends BaseService
 {
 	
 	public static $baseFile = '\biz\order\classes\OrderGoodsClass';
-
+	
 	//根据ids取订单的商品详情，图片等处理好了 shish 2019.11.28
 	public static function getGoodsListByOrderIds($ids)
 	{
-		$arr = self::getAllByCondition(['orderId' => ['in', $ids]], null, '*');
-		if (empty($arr)) {
-			return [];
-		}
-		$prefix = Yii::$app->params['imgUrl'];
-		$data = [];
-		foreach ($arr as $info) {
-			$orderId = $info['orderId'];
-			$info['cover'] = $prefix . $info['cover'];
-			$data[$orderId][] = $info;
-		}
-		return $data;
+		return OrderGoodsClass::getGoodsListByOrderIds($ids);
 	}
 	
 	//取一个订单的商品详情
 	public static function getGoodsListById($id)
 	{
-		return self::getAllByCondition(['orderId' => $id], null, '*');
+		OrderGoodsClass::getGoodsListById($id);
 	}
-	
+
 }

biz/order/services/OrderService.php

@@ -150,5 +150,11 @@ class OrderService extends BaseService
 		}
 		OrderClass::updateById($id, $data);
 	}
+	
+	//订单详情 shish 2020.1.2
+	public static function getOrderById($id)
+	{
+		return OrderClass::getOrderById($id);
+	}
 
 }

common/components/business.php

@@ -127,7 +127,24 @@ class business
 		$info['avatarUrl'] = $prefixImgUrl . $imgUrl;
 		return $info;
 	}
-	
+
+	//
+	public static function formatOrderGoodsCover($info)
+	{
+		$imgUrl = isset($info['cover']) ? $info['cover'] : '';
+		if (empty($imgUrl)) {
+			$info['coverUrl'] = '';
+			$info['smallCoverUrl'] = '';
+			return $info;
+		}
+		$prefixImgUrl = Yii::$app->params['imgUrl'];
+		$smallImg = self::getSmallImg($imgUrl);
+		$small = $prefixImgUrl . $smallImg;
+		$info['smallCoverUrl'] = $small;
+		$info['coverUrl'] = $prefixImgUrl . $imgUrl;
+		return $info;
+	}
+
 	//商家公众号logo处理 shish 2019.12.20
 	public static function formatMerchantLogo($info)
 	{