north 7 年之前
父節點
當前提交
45f12480da

+ 10 - 10
www/protected/controllers/JCouponController.php

@@ -90,7 +90,7 @@ class JCouponController extends AdminController
     public function actionAdd()
     {
         $num = (int)Yii::app()->request->getParam('num','');
-        $coding_num = (int)Yii::app()->request->getParam('coding_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','');
@@ -106,9 +106,9 @@ class JCouponController extends AdminController
         if (empty($gift)) {
             CommonFn::requestAjax(false,'礼包不存在');exit;
         }
-        if ($coding_num > 100000) {
-            CommonFn::requestAjax(false,'起始值不能超过100000');exit;
-        }
+//        if ($coding_num > 100000) {
+//            CommonFn::requestAjax(false,'起始值不能超过100000');exit;
+//        }
         /*$c = new EMongoCriteria();
         $c->coding_num('==',$coding_num);
         $j = JCoupon::model()->findAll($c);
@@ -119,8 +119,8 @@ class JCouponController extends AdminController
         for($i=0; $i<$num; $i++) {
             $coupon = new JCoupon();
             $coupon->gift_id = $gift_id;
-            $tmp1 = $coding_num + 100000;
-            $coupon->coding_num = date('d').substr($tmp1,1);
+//            $tmp1 = $coding_num + 100000;
+//            $coupon->coding_num = date('d').substr($tmp1,1);
 
             $flag = true;
             while($flag) {
@@ -137,12 +137,12 @@ class JCouponController extends AdminController
             $coupon->status = 0;
             $coupon->expire_time = $expire_time;
             $coupon->created_at = time();
-            if (substr($coupon->coding_num,5) == substr($coupon->coupon_coding,-3)) {
-                CommonFn::requestAjax(false,'起始值重复');exit;
-            }
+//            if (substr($coupon->coding_num,5) == substr($coupon->coupon_coding,-3)) {
+//                CommonFn::requestAjax(false,'起始值重复');exit;
+//            }
             $coupon->add_time = time();
             $coupon->save();
-            $coding_num++;
+//            $coding_num++;
         }
 
         CommonFn::requestAjax(true,'生成成功');exit;

+ 2 - 2
www/protected/controllers/JRecordController.php

@@ -95,12 +95,12 @@ class JRecordController extends AdminController
         $mobile = Yii::app()->request->getParam('mobile','');
         $address = Yii::app()->request->getParam('address','');
         $pwd = Yii::app()->request->getParam('pwd','');
-        $coding_num = Yii::app()->request->getParam('coding_num','');
+//        $coding_num = Yii::app()->request->getParam('coding_num','');
 
         if (!$name ||!$mobile || !$address   || !$pwd) {
             CommonFn::requestAjax(false,'请填写完整信息');exit;
         }
-        $coupon = JCoupon::getByPwdOne($pwd, $coding_num);
+        $coupon = JCoupon::getByPwdOne($pwd);
         if (empty($coupon) || $coupon->status >= 2) {
             CommonFn::requestAjax(false,'兑换券不存在或已失效');exit;
         }

+ 3 - 3
www/protected/modules/j/controllers/JRecordController.php

@@ -13,13 +13,13 @@
          $address = Yii::app()->request->getParam('address','');
          $user_id = Yii::app()->request->getParam('user_id','');
          $pwd = Yii::app()->request->getParam('pwd','');
-         $coding_num = Yii::app()->request->getParam('coding_num','');
+//         $coding_num = Yii::app()->request->getParam('coding_num','');
 
-         if (!$name ||!$mobile || !$address  || !$pwd || !$user_id || !$coding_num) {
+         if (!$name ||!$mobile || !$address  || !$pwd || !$user_id ) {
              CommonFn::requestAjax(false,'请填写完整信息');exit;
          }
 
-         $coupon = JCoupon::getByPwdOne($pwd,$coding_num);
+         $coupon = JCoupon::getByPwdOne($pwd);
          if (empty($coupon)) {
              CommonFn::requestAjax(false,'兑换码或验证码错误');exit;
          }

+ 11 - 11
www/protected/modules/j/models/JCoupon.php

@@ -16,7 +16,7 @@ class JCoupon extends MongoAr
     public $add_time;
     public $exchange_time;
     public $pwd;//提货密码
-    public $coding_num;//验证码
+//    public $coding_num;//验证码
     public $coupon_coding;//礼品券编号 AABBB1806000001
     public $expire_time;//过期时间
     public $channel;//渠道
@@ -72,15 +72,15 @@ class JCoupon extends MongoAr
         $model = self::model()->findAll($criteria);
         return $model;
     }
-    public static function getByPwdOne($pwd,$num = '') {
-        $criteria = new EMongoCriteria();
-        $criteria->pwd('==', $pwd);
-        if ($num) {
-            $criteria->coding_num('==', $num);
-        }
-        $model = self::model()->find($criteria);
-        return $model;
-    }
+//    public static function getByPwdOne($pwd,$num = '') {
+//        $criteria = new EMongoCriteria();
+//        $criteria->pwd('==', $pwd);
+//        if ($num) {
+//            $criteria->coding_num('==', $num);
+//        }
+//        $model = self::model()->find($criteria);
+//        return $model;
+//    }
 
 
 
@@ -98,7 +98,7 @@ class JCoupon extends MongoAr
         $newRow['pwd'] = CommonFn::get_val_if_isset($row,'pwd','');;
         $newRow['pwd_str'] = CommonFn::get_val_if_isset($row,'pwd','');
         $newRow['status'] = CommonFn::get_val_if_isset($row,'status','');
-        $newRow['coding_num'] = CommonFn::get_val_if_isset($row,'coding_num','');
+//        $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','');
         if ($newRow['add_time']) {

+ 1 - 1
www/protected/modules/j/models/JRecord.php

@@ -63,7 +63,7 @@ class JRecord extends MongoAr
         $newRow['coupon_id'] = (string)$row['coupon_id'];
         $coupon = JCoupon::get(new MongoId($newRow['coupon_id']));
         $newRow['coupon_coding'] = $coupon->coupon_coding;
-        $newRow['coding_num'] = $coupon->coding_num;
+//        $newRow['coding_num'] = $coupon->coding_num;
         $gift = Gift::get(new MongoId((string)$coupon->gift_id));
         $newRow['pwd'] = $coupon->pwd;
         $newRow['gift_name'] = $gift->title;

+ 2 - 2
www/protected/services/JCouponService.php

@@ -38,7 +38,7 @@ class JCouponService extends Service
             ->setCellValue('D' . $num, '发行日期')//$name
             ->setCellValue('E' . $num, '兑换日期')//$name
             ->setCellValue('F' . $num, '状态')//$name
-            ->setCellValue('G' . $num, '验证码')//$name
+//            ->setCellValue('G' . $num, '验证码')//$name
         ;
         $num += 1;
         foreach($data as $key => $value){
@@ -51,7 +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('G' . $num, $value['coding_num'])
+//                ->setCellValue('G' . $num, $value['coding_num'])
             ;
             $num += 1;
         }

+ 22 - 22
www/protected/views/jCoupon/index.php

@@ -87,16 +87,16 @@
                                         </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="coding_num"></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="coding_num"></span>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                </li>-->
                                 <li class="f_item">
                                     <div class="box">
                                         <div class="f_label">
@@ -189,16 +189,16 @@
                         </div>
                     </div>
                 </li>
-                <li class="f_item">
-                    <div class="box">
-                        <div class="f_label">
-                            <span>验证码起始值: </span>
-                        </div>
-                        <div class="box_flex f_content">
-                            <input id="coding_num" name="coding_num" style="width: 250px;"  />
-                        </div>
-                    </div>
-                </li>
+<!--                <li class="f_item">-->
+<!--                    <div class="box">-->
+<!--                        <div class="f_label">-->
+<!--                            <span>验证码起始值: </span>-->
+<!--                        </div>-->
+<!--                        <div class="box_flex f_content">-->
+<!--                            <input id="coding_num" name="coding_num" style="width: 250px;"  />-->
+<!--                        </div>-->
+<!--                    </div>-->
+<!--                </li>-->
                 <li class="f_item">
                     <div class="box">
                         <div class="f_label">
@@ -567,7 +567,7 @@
         {field:'id', title:'id', hidden:true},
         {field:'gift_name', title:'礼包名称',width:40 },
         {field:'pwd', title:'提货密码', width:40,sortable:false},
-        {field:'coding_num', 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},
@@ -590,7 +590,7 @@
         $('#pwd').html(data.pwd);
         $('#channel').html(data.channel_str);
         $('#gift_num').html(data.coupon_coding);
-        $('#coding_num').html(data.coding_num);
+        // $('#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);

+ 23 - 23
www/protected/views/jRecord/index.php

@@ -152,16 +152,16 @@
                                         </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="coding_num"></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="coding_num"></span>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                </li>-->
                                 <li class="f_item">
                                     <div class="box">
                                         <div class="f_label">
@@ -244,16 +244,16 @@
                         </div>
                     </div>
                 </li>
-                <li class="f_item">
-                    <div class="box">
-                        <div class="f_label">
-                            <span>验证码: </span>
-                        </div>
-                        <div class="box_flex f_content">
-                            <input  name="coding_num" type="text" style="width: 250px;"  />
-                        </div>
-                    </div>
-                </li>
+<!--                <li class="f_item">-->
+<!--                    <div class="box">-->
+<!--                        <div class="f_label">-->
+<!--                            <span>验证码: </span>-->
+<!--                        </div>-->
+<!--                        <div class="box_flex f_content">-->
+<!--                            <input  name="coding_num" type="text" style="width: 250px;"  />-->
+<!--                        </div>-->
+<!--                    </div>-->
+<!--                </li>-->
 
             </ul>
 
@@ -462,7 +462,7 @@
         {field:'id', title:'id', hidden:true},
         {field:'gift_name', title:'礼包名称', },
         {field:'coupon_coding', title:'礼券编号'},
-        {field:'coding_num', title:'验证码', width:40,sortable:false},
+        // {field:'coding_num', title:'验证码', width:40,sortable:false},
         {field:'pwd', title:'提货密码'},
         {field:'name', title:'姓名',width:40 },
         {field:'mobile', title:'手机号', width:40,sortable:false},
@@ -484,7 +484,7 @@
 
         $('#id').val(row.id);
         $('#id_str').html(row.id);
-        $('#coding_num').html(row.coding_num);
+        // $('#coding_num').html(row.coding_num);
         $('#coupon_coding').html(row.coupon_coding);
         $('#gift_type').html(row.gift_type);
         $('#gift_name').html(row.gift_name);
@@ -511,7 +511,7 @@
         $('#edit_flow_number').val('');
         $('#edit_pwd').val('');
         $('#expire_time1').datetimebox('setValue', '');
-        $('#coding_num').html('');
+        // $('#coding_num').html('');
         $('#coupon_coding').html('');
         $('#edit_status').combobox('setValue', 100);