shish 6 жил өмнө
parent
commit
34a4292238

+ 30 - 0
app/business/controllers/CouponController.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace business\controllers;
+
+use biz\admin\classes\AdminClass;
+use biz\admin\services\AdminService;
+use biz\promote\services\CouponService;
+use common\components\jwt;
+use common\components\util;
+use Yii;
+use yii\web\Controller;
+
+class CouponController extends BaseController
+{
+
+	//优惠券列表 shish 2019.12.11
+	public function actionList()
+	{
+		$get = Yii::$app->request->get();
+		$status = isset($get['status']) ? $get['status'] : -1;
+		$where = [];
+		$where['merchantId'] = $this->merchantId;
+		if ($status != -1) {
+			$where['status'] = $status;
+		}
+		$list = CouponService::getCouponList($where);
+		util::success($list);
+	}
+
+}

+ 22 - 1
biz/promote/classes/CouponClass.php

@@ -3,12 +3,13 @@
 namespace biz\promote\classes;
 
 use biz\user\classes\UserAssetClass;
+use biz\user\classes\UserClass;
 use Yii;
 use biz\base\classes\BaseClass;
 
 class CouponClass extends BaseClass
 {
-
+	
 	public static $baseFile = '\biz\promote\models\Coupon';
 	
 	//新增优惠卷
@@ -22,4 +23,24 @@ class CouponClass extends BaseClass
 		return $respond;
 	}
 	
+	//整体优惠券信息 shish 2019.12.11
+	public static function groupCouponBaseInfo($list)
+	{
+		$userIdList = array_column($list, 'userId');
+		$introIdList = array_column($list, 'introUserId');
+		$ids = array_merge($userIdList, $introIdList);
+		$ids = array_unique(array_filter($ids));
+		
+		$userInfo = UserClass::getByIds($ids, null, 'id');
+		$userList = UserClass::groupUserBaseInfo($userInfo);
+		foreach ($list as $key => $val) {
+			$userId = $val['userId'];
+			$introUserId = $val['introUserId'];
+			$list[$key]['userName'] = isset($userList[$userId]) ? $userList[$userId]['userName'] : '';
+			$list[$key]['userAvatar'] = isset($userList[$userId]) ? $userList[$userId]['avatarUrl'] : '';
+			$list[$key]['introUserName'] = isset($userList[$introUserId]) ? $userList[$introUserId]['userName'] : '';
+		}
+		return $list;
+	}
+
 }

+ 13 - 1
biz/promote/services/CouponService.php

@@ -15,8 +15,20 @@ use Yii;
 
 class CouponService extends BaseService
 {
-	
+
 	public static $baseFile = '\biz\promote\classes\CouponClass';
+
+	//优惠券列表 shish 2019.12.11
+	public static function getCouponList($where)
+	{
+		$data = CouponClass::getList('*', $where, 'addTime DESC');
+		$list = isset($data['list']) && !empty($data['list']) ? $data['list'] : [];
+		if (empty($list)) {
+			return $data;
+		}
+		$data['list'] = CouponClass::groupCouponBaseInfo($list);
+		return $data;
+	}
 	
 	//验证使用的优惠券是否有效
 	public static function valid($couponId, $price, $userId)

+ 3 - 0
sql.txt

@@ -1,3 +1,6 @@
+2019.12.11 shish 领券
+ALTER TABLE xhCoupon MODIFY getType TINYINT NOT NULL DEFAULT 0 COMMENT '获取方式,0新人领券 1邀请领券';
+
 2019.12.10 shish 角色相关
 ALTER TABLE xhAdminRole ADD `num` INT NOT NULL DEFAULT 0 COMMENT '成员数' AFTER `merchantId`;
 CREATE TABLE xhAdminLog(