north 7 years ago
parent
commit
6398c8a989

+ 4 - 1
www/protected/controllers/JCouponController.php

@@ -69,9 +69,11 @@ class JCouponController extends AdminController
         }
 
 
-
         $coupon = JCoupon::get(new MongoId($id));
         $coupon->status = $status;
+        if (empty($coupon->add_time)) {
+            $coupon->add_time = time();
+        }
         $coupon->save();
         CommonFn::requestAjax(true,'保存成功');exit;
     }
@@ -124,6 +126,7 @@ class JCouponController extends AdminController
             if (substr($coupon->coding_num,5) == substr($coupon->coupon_coding,-3)) {
                 CommonFn::requestAjax(false,'起始值重复');exit;
             }
+            $coupon->add_time = time();
             $coupon->save();
             $coding_num++;
         }

+ 1 - 0
www/protected/modules/j/controllers/JRecordController.php

@@ -41,6 +41,7 @@
          $record->save();
          $coupon->user_id = $user_id;
          $coupon->status = 1;
+         $coupon->exchange_time = time();
          $coupon->save();
          $data['coupon'] = $coupon;
          $gift = Gift::get(new MongoId($coupon->gift_id));

+ 6 - 0
www/protected/modules/j/models/JCoupon.php

@@ -13,6 +13,8 @@ class JCoupon extends MongoAr
     public $_id;
     public $user_id;
     public $gift_id;
+    public $add_time;
+    public $exchange_time;
     public $pwd;//提货密码
     public $coding_num;//验证码
     public $coupon_coding;//礼品券编号 AABBB1806000001
@@ -98,6 +100,10 @@ class JCoupon extends MongoAr
         $newRow['status'] = CommonFn::get_val_if_isset($row,'status','');
         $newRow['coding_num'] = CommonFn::get_val_if_isset($row,'coding_num','');
         $newRow['coupon_coding'] = CommonFn::get_val_if_isset($row,'coupon_coding','');
+        $newRow['add_time'] = CommonFn::get_val_if_isset($row,'add_time','');
+        $newRow['add_time_str'] = date('Y-m-d H:i:s',$newRow['add_time']);
+        $newRow['exchange_time'] = CommonFn::get_val_if_isset($row,'exchange_time','');
+        $newRow['exchange_time_str'] = date('Y-m-d H:i:s',$newRow['exchange_time']);
         $newRow['status_str'] = self::$status_options[$newRow['status']]['name'];
 
         if(APPLICATION=='admin'){

+ 4 - 0
www/protected/services/JCouponService.php

@@ -35,6 +35,8 @@ class JCouponService extends Service
             ->setCellValue('A' . $num, '礼包名称')//$name
             ->setCellValue('B' . $num, '礼品券编号')//$name
             ->setCellValue('C' . $num, '提货密码')//$name
+            ->setCellValue('D' . $num, '发行日期')//$name
+            ->setCellValue('E' . $num, '兑换日期')//$name
         ;
         $num += 1;
         foreach($data as $key => $value){
@@ -44,6 +46,8 @@ class JCouponService extends Service
                 ->setCellValue('A' . $num, $value['gift_name'])
                 ->setCellValue('B' . $num, $value['coupon_coding'])
                 ->setCellValue('C' . $num, $value['pwd_str'])
+                ->setCellValue('D' . $num, $value['add_time_str'])
+                ->setCellValue('E' . $num, $value['exchange_time_str'])
             ;
             $num += 1;
         }

+ 24 - 0
www/protected/views/jCoupon/index.php

@@ -90,6 +90,26 @@
                                         </div>
                                     </div>
                                 </li>
+                                <li class="f_item">
+                                    <div class="box">
+                                        <div class="f_label">
+                                            <span>发行日期: </span>
+                                        </div>
+                                        <div class="box_flex f_content">
+                                            <span id="add_time_str"></span>
+                                        </div>
+                                    </div>
+                                </li>
+                                <li class="f_item">
+                                    <div class="box">
+                                        <div class="f_label">
+                                            <span>兑换日期: </span>
+                                        </div>
+                                        <div class="box_flex f_content">
+                                            <span id="exchange_time_str"></span>
+                                        </div>
+                                    </div>
+                                </li>
                                 <li class="f_item">
                                     <div class="box">
                                         <div class="f_label">
@@ -534,6 +554,8 @@
         {field:'pwd', title:'提货密码', width:40,sortable:false},
         {field:'coding_num', title:'验证码', width:40,sortable:false},
         {field:'coupon_coding', title:'礼品券编号', width:40,sortable:false},
+        {field:'add_time_str', title:'发行日期', width:40,sortable:false},
+        {field:'exchange_time_str', title:'兑换日期', width:40,sortable:false},
         {field:'expire_time', title:'过期时间', width:40,sortable:true,formatter: function(value, row){
           return   row.expire_time_str;
         }},
@@ -555,6 +577,8 @@
         $('#gift_num').html(data.coupon_coding);
         $('#coding_num').html(data.coding_num);
         $('#expreid_time').html(data.expire_time_str);
+        $('#add_time_str').html(data.add_time_str);
+        $('#exchange_time_str').html(data.exchange_time_str);
         $('#setStatus').combobox('setValue', row.status);