1

www/protected/controllers/JCouponController.php

@@ -17,7 +17,7 @@ class JCouponController extends AdminController
         foreach ($gifts as $gift) {
             $tmp[] = array('name' => $gift->title,'id' => (string)$gift->_id);
         }
-        $tmp = CommonFn::getComboboxData($tmp, 0, false );
+        $tmp = CommonFn::getComboboxData($tmp, 100, true, 100 );
 
         $c = new EMongoCriteria();
         $c->type('==',1);
@@ -43,12 +43,22 @@ class JCouponController extends AdminController
         $pageParams = CommonFn::getPageParams();
         $search = Yii::app()->request->getParam('search', '');
         $status = intval(Yii::app()->request->getParam('status', 100));
+        $gift_num = intval(Yii::app()->request->getParam('gift', 100));
         $criteria = new EMongoCriteria($pageParams);
         if ($status != 100 ) {
             $criteria->status('==',$status);
         }
+        if ($gift_num != 100 ) {
+            $gifts = Gift::model()->findAll();
+            $tmp =[];
+            foreach ($gifts as $gift) {
+                $tmp[] = array('name' => $gift->title,'id' => (string)$gift->_id);
+            }
+            $criteria->gift_id('==',$tmp[$gift_num]['id']);
+        }
+
         if ($search) {
-            $criteria->addCond('title','or',new MongoRegex('/' . $search . '/'));
+            $criteria->addCond('coupon_coding','or',new MongoRegex('/' . $search . '/'));
         }
         $criteria->sort('created_at',EMongoCriteria::SORT_DESC);
         $cursor = JCoupon::model()->findAll($criteria);
@@ -82,12 +92,16 @@ class JCouponController extends AdminController
         $num = (int)Yii::app()->request->getParam('num','');
         $coding_num = (int)Yii::app()->request->getParam('coding_num','');
         $gift_id = Yii::app()->request->getParam('gift_id','');
+        $gift = Yii::app()->request->getParam('gift','');
         $channel = Yii::app()->request->getParam('bus_id','');
         $bus = (int)Yii::app()->request->getParam('bus','');
         $expire_time = Yii::app()->request->getParam('expire_time_str','');
         if ($bus == 100 || !$num ||!$channel || !$gift_id || !$expire_time) {
             CommonFn::requestAjax(false,'请填写完整信息');exit;
         }
+        if ($gift == 100) {
+            CommonFn::requestAjax(false,'请选择礼包');exit;
+        }
         $gift = Gift::get(new MongoId($gift_id));
         if (empty($gift)) {
             CommonFn::requestAjax(false,'礼包不存在');exit;

www/protected/controllers/JRecordController.php

@@ -79,6 +79,10 @@ class JRecordController extends AdminController
         );
         $record->address = $address;
         $record->status = $status;
+        // 改动前后不想等 则判断为修改物流信息 则发送短信
+        if ($flow != $record->flow || $flow_number != $record->flow_number || $flow_time != $record->flow_time) {
+
+        }
         $record->flow = $flow;
         $record->flow_number = $flow_number;
         $record->flow_time = strtotime($flow_time);

www/protected/modules/j/controllers/JRecordController.php

@@ -38,6 +38,7 @@
          $record->coupon_id = (string)$coupon->_id;
          $record->status = 0;
          $record->time = time();
+         $record->user_id = $user_id;
          $record->save();
          $coupon->user_id = $user_id;
          $coupon->status = 1;

www/protected/modules/j/models/JRecord.php

@@ -11,6 +11,7 @@
 class JRecord extends MongoAr
 {
     public $_id;
+    public $user_id;
     public $user_info = array();//姓名 手机
     public $address;
     public $coupon_id;
@@ -69,6 +70,7 @@ class JRecord extends MongoAr
         $newRow['gift_type'] = Gift::$type_options[$gift->type]['name'];
         $newRow['gift_id'] = $gift->gift_num;
         $newRow['address'] = CommonFn::get_val_if_isset($row,'address','');
+        $newRow['user_id'] = CommonFn::get_val_if_isset($row,'user_id','');
         $newRow['user_info'] = CommonFn::get_val_if_isset($row,'user_info','');
         $newRow['name'] = $newRow['user_info']['name'];
         $newRow['mobile'] = $newRow['user_info']['mobile'];

www/protected/services/JCouponService.php

@@ -38,6 +38,7 @@ class JCouponService extends Service
             ->setCellValue('D' . $num, '发行日期')//$name
             ->setCellValue('E' . $num, '兑换日期')//$name
             ->setCellValue('F' . $num, '状态')//$name
+            ->setCellValue('G' . $num, '状态')//$name
         ;
         $num += 1;
         foreach($data as $key => $value){
@@ -50,6 +51,7 @@ class JCouponService extends Service
                 ->setCellValue('D' . $num, $value['add_time_str'])
                 ->setCellValue('E' . $num, $value['exchange_time_str'])
                 ->setCellValue('F' . $num, $value['status_str'])
+                ->setCellValue('F' . $num, $value['coding_num'])
             ;
             $num += 1;
         }

www/protected/views/jCoupon/index.php

@@ -16,8 +16,15 @@
         <div id="tb_content">
 
             <div class="tb_line">
+                <div class="tb_line">
+                    <div class="left">
+                        编号查询：<input id="ss" />
+                    </div>
+                </div>
                 <span class="tb_label">状态: </span>
                 <input id="filter_status" />
+                <span class="tb_label">礼包: </span>
+                <input id="filter_gift" />
                 <div class="left" style="border-bottom: 1px solid #0b0b0b;">
                     导出批次号：<input id="start_num" />
                     <a href="#" class='easyui-linkbutton' plain="true" iconCls="icon-add" onclick="export_order();return false;">导出兑换券</a>
@@ -359,6 +366,14 @@
         search_content();
       }
     });
+    $('#filter_gift').combobox({
+      width: 100,
+      data: gifts,
+      editable: false,
+      onSelect: function(){
+        search_content();
+      }
+    });
     jq_edit_extra_dialog.dialog({
       title: '添加时间段',
       width: 440,
@@ -677,11 +692,13 @@
   function search_content(value = ''){
     var search = value;
     var filter_status = jq_filter_status.combobox('getValue');
+    var filter_gift = $('#filter_gift').combobox('getValue');
     jq_dg_content.datagrid({
       pageNum: 1,
       queryParams: {
         search : search,
-        status : filter_status
+        status : filter_status,
+        gift: filter_gift,
       }
     });