优惠券数量

app/business/controllers/CouponController.php

@@ -4,6 +4,7 @@ namespace business\controllers;
 
 use biz\admin\classes\AdminClass;
 use biz\admin\services\AdminService;
+use biz\promote\services\CouponAssetService;
 use biz\promote\services\CouponService;
 use common\components\jwt;
 use common\components\util;
@@ -12,7 +13,7 @@ use yii\web\Controller;
 
 class CouponController extends BaseController
 {
-
+	
 	//优惠券列表 shish 2019.12.11
 	public function actionList()
 	{
@@ -23,8 +24,14 @@ class CouponController extends BaseController
 		if ($status != -1) {
 			$where['status'] = $status;
 		}
-		$list = CouponService::getCouponList($where);
-		util::success($list);
+		$data = CouponService::getCouponList($where);
+		
+		$asset = CouponAssetService::getAsset($this->merchantId);
+		if (empty($asset)) {
+			util::fail('找不到优惠券初始数据');
+		}
+		$data['asset'] = $asset;
+		util::success($data);
 	}
-
+	
 }

biz/promote/classes/CouponAssetClass.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace biz\promote\classes;
+
+use biz\user\classes\UserAssetClass;
+use biz\user\classes\UserClass;
+use Yii;
+use biz\base\classes\BaseClass;
+
+class CouponAssetClass extends BaseClass
+{
+	
+	public static $baseFile = '\biz\promote\models\CouponAsset';
+
+	//优惠券资产 shish 2019.12.11
+	public static function getAsset($merchantId)
+	{
+		return self::getByCondition(['merchantId' => $merchantId]);
+	}
+
+}

biz/promote/models/CouponAsset.php

@@ -0,0 +1,13 @@
+<?php
+namespace biz\promote\models;
+use biz\base\models\Base;
+
+class CouponAsset extends Base
+{
+
+	public static function tableName()
+	{
+		return 'xhCouponAsset';
+	}
+	
+}

biz/promote/services/CouponAssetService.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace biz\promote\services;
+
+use biz\base\services\BaseService;
+use biz\merchant\services\MerchantService;
+use biz\promote\classes\CouponAssetClass;
+use biz\promote\classes\CouponClass;
+use biz\user\services\UserAssetService;
+use biz\user\services\UserService;
+use common\components\validate;
+use common\components\weixinUtil;
+use common\components\util;
+use common\services\xhTMessageService;
+use Yii;
+
+class CouponAssetService extends BaseService
+{
+	
+	public static $baseFile = '\biz\promote\classes\CouponAssetClass';
+	
+	//优惠券的资产 shish 2019.12.11
+	public static function getAsset($merchantId)
+	{
+		return CouponAssetClass::getAsset($merchantId);
+	}
+	
+}

sql.txt

@@ -1,6 +1,7 @@
 2019.12.11 shish 领券
 ALTER TABLE xhCoupon MODIFY getType TINYINT NOT NULL DEFAULT 0 COMMENT '获取方式，0新人领券 1邀请领券';
-CREATE TABLE IF NOT EXISTS xhCouponSet(
+DROP TABLE IF EXISTS `xhCouponAsset`;
+CREATE TABLE IF NOT EXISTS `xhCouponAsset`(
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
 merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id',
 totalNum INT NOT NULL DEFAULT 0 COMMENT '优惠券总数',
@@ -8,7 +9,7 @@ unUseNum INT NOT NULL DEFAULT 0 COMMENT '未使用数',
 useNum INT NOT NULL DEFAULT 0 COMMENT '已使用数',
 invalidNum INT NOT NULL DEFAULT 0 COMMENT '失效数',
 `addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间'
-)COMMENT='优惠券相关资产与设置';
+)COMMENT='优惠券资产与设置';
 
 2019.12.10 shish 角色相关
 ALTER TABLE xhAdminRole ADD `num` INT NOT NULL DEFAULT 0 COMMENT '成员数' AFTER `merchantId`;