增加优惠券类型

app/adminapi/lists/coupon/CouponRulesLists.php

@@ -87,7 +87,7 @@ class CouponRulesLists extends BaseAdminDataLists implements ListsSearchInterfac
             $query->field('id,name');
         }])->where($this->searchWhere)
             ->where($this->queryWhere())
-            ->field(['id', 'amount', 'amount_require', 'begin_use', 'discount_ratio', 'event_name', 'expire_time', 'max_deductible_price', 'mold_type', 'server_category_name', 'voucher_status', 'voucher_count'])
+            ->field(['id', 'amount', 'coupon_type','amount_require', 'begin_use', 'discount_ratio', 'event_name', 'expire_time', 'max_deductible_price', 'mold_type', 'server_category_name', 'voucher_status', 'voucher_count'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()

app/adminapi/logic/coupon/CouponRulesLogic.php

@@ -43,6 +43,7 @@ class CouponRulesLogic extends BaseLogic
         Db::startTrans();
         try {
             $model = CouponRules::create([
+                'coupon_type'=> $params['coupon_type'],
                 'amount' => $params['amount'],
                 'amount_require' => $params['amount_require'],
                 'begin_use' => $params['begin_use'] ? strtotime($params['begin_use']) :0,
@@ -84,6 +85,7 @@ class CouponRulesLogic extends BaseLogic
         Db::startTrans();
         try {
             CouponRules::where('id', $params['id'])->update([
+                'coupon_type'=> $params['coupon_type'],
                 'amount' => $params['amount'],
                 'amount_require' => $params['amount_require'],
                 'begin_use' => $params['begin_use'] ? strtotime($params['begin_use']) :0,

app/adminapi/validate/coupon/CouponRulesValidate.php

@@ -32,6 +32,7 @@ class CouponRulesValidate extends BaseValidate
       */
     protected $rule = [
         'id' => 'require',
+        'coupon_type'=> 'require',
         'amount_require' => 'require',
         'event_name' => 'require',
         'expire_time' => 'require',
@@ -49,6 +50,7 @@ class CouponRulesValidate extends BaseValidate
     protected $field = [
         'id' => 'id',
         'amount_require' => '满减金额',
+        'coupon_type' => '优惠券类型',
         'event_name' => '优惠卷名称',
         'expire_time' => '到期时间',
         'mold_type' => '折扣方式',