shish 6 місяців тому
батько
коміт
30103b97d9
2 змінених файлів з 16 додано та 12 видалено
  1. 15 11
      app-hd/controllers/HbController.php
  2. 1 1
      app-hd/models/hb/CreateHbForm.php

+ 15 - 11
app-hd/controllers/HbController.php

@@ -57,9 +57,9 @@ class HbController extends BaseController
         }
         $status = Yii::$app->request->get('status', '');
         if (isset($status) && $status != '') {
-            if($status == -1){ // 已失效包含:1作废 与 过期(0未使用但endTime<当前时间) --- 所以当操作作废时,status改为-1,同时将endTime改为当前时间
+            if ($status == -1) { // 已失效包含:1作废 与 过期(0未使用但endTime<当前时间) --- 所以当操作作废时,status改为-1,同时将endTime改为当前时间
                 $where['endTime<'] = time();
-            }else{
+            } else {
                 $where['status'] = $status;
             }
         }
@@ -76,7 +76,7 @@ class HbController extends BaseController
     public function actionAvailableHb()
     {
         $get = Yii::$app->request->get();
-        
+
         $where = [];
         $where['customId'] = $get['customId'];
         $where['status'] = 0;
@@ -111,7 +111,11 @@ class HbController extends BaseController
         $duration = (int)$form->days;
         $count = $post['count'] ?? 1;
         $beginTime = time();
-        $endTime = $beginTime + $duration * 86400;
+        if ($duration <= 0) {
+            $endTime = 4102416000;
+        } else {
+            $endTime = $beginTime + $duration * 86400;
+        }
 
         $data = [
             'mainId' => $this->mainId,
@@ -142,7 +146,7 @@ class HbController extends BaseController
             $hbManage = HbManageClass::add($manageData);
         }
         $arr = [];
-        if(!empty($hb) && !empty($hbManage)){
+        if (!empty($hb) && !empty($hbManage)) {
             $arr = array_merge($hb, $hbManage);
         }
         util::success($arr);
@@ -163,7 +167,7 @@ class HbController extends BaseController
         $hb = HbClass::getById($id, true);
 
         //检测是否是本门店的红包
-        if($hb->shopId != $this->shopId){
+        if ($hb->shopId != $this->shopId) {
             util::fail('不是本门店的红包');
         }
 
@@ -178,7 +182,7 @@ class HbController extends BaseController
             }
         }
         // 当操作作废时,status改为-1,同时将endTime改为当前时间
-        if($hb->status == -1){
+        if ($hb->status == -1) {
             $hb->endTime = time();
             //记录作废人
             $updateData = [
@@ -186,7 +190,7 @@ class HbController extends BaseController
                 'cancelStaffName' => $this->shopAdminName,
                 'cancelTime' => date('Y-m-d H:i:s'),
             ];
-            HbManageClass::updateByCondition(['hbId'=>$id], $updateData);
+            HbManageClass::updateByCondition(['hbId' => $id], $updateData);
         }
         $hb->save();
         util::success($hb->attributes);
@@ -197,7 +201,7 @@ class HbController extends BaseController
      */
     public function actionHbRules()
     {
-        $list = RechargeShbClass::getList('*', ['shopId'=>$this->shopId]);
+        $list = RechargeShbClass::getList('*', ['shopId' => $this->shopId]);
         util::success($list);
     }
 
@@ -233,9 +237,9 @@ class HbController extends BaseController
     {
         $id = Yii::$app->request->post('id');
         $re = RechargeShbClass::deleteById($id);
-        if($re == 1){
+        if ($re == 1) {
             util::complete();
-        }else{
+        } else {
             util::fail('删除失败');
         }
     }

+ 1 - 1
app-hd/models/hb/CreateHbForm.php

@@ -40,8 +40,8 @@ class CreateHbForm extends BaseForm
             [['customId'], 'required', 'message' => '请选择客户'],
             [['amount'], 'required', 'message' => '请填写红包金额'],
             [['minConsume'], 'required', 'message' => '请填写最低消费金额'],
-            [['days'], 'required', 'message' => '请填写有效天数'],
 
+            [['days'], 'default', 'value' => 0],
             [['count'], 'default', 'value' => 1],
             [['remark'], 'default', 'value' => ''],