Merge branch 'master' of gitee.com:yiguanjia/php

www/protected/controllers/JCouponController.php

@@ -172,7 +172,6 @@ class JCouponController extends AdminController
 //            $num++;
 //
 //        }
-        $criteria->sort('coupon_coding',EMongoCriteria::SORT_DESC);
         $cursor = JCoupon::model()->findAll($criteria);
         $rows = CommonFn::getRowsFromCursor($cursor);
         $parsedRows = JCoupon::model()->parse($rows);

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

@@ -68,12 +68,14 @@ class JCoupon extends MongoAr
     }
     public static function getByPwd($pwd) {
         $criteria = new EMongoCriteria();
+        $pwd = strtolower($pwd);
         $criteria->pwd('==', $pwd);
         $model = self::model()->findAll($criteria);
         return $model;
     }
     public static function getByPwdOne($pwd) {
         $criteria = new EMongoCriteria();
+        $pwd = strtolower($pwd);
         $criteria->pwd('==', $pwd);
 //        if ($num) {
 //            $criteria->coding_num('==', $num);