Merge branch 'master' of http://39.98.194.76:3000/txct/wanyue_app

app/admin/service/coupon/CouponDetailService.php

@@ -248,16 +248,16 @@ class CouponDetailService
                 } else {
                     $now_nbr -= 1;
                     $params['coupon_detail_gain_datetime'] = date('Y-m-01 00:00:00', strtotime("+" . $now_nbr . ' month'));
-                    $params['coupon_detail_deadline_datetime'] = date('Y-m-t 23:59:59', strtotime("+" . $now_nbr . ' month'));
+                    $params['coupon_detail_deadline_datetime'] = date('Y-m-t 23:59:59', strtotime(date('Y-m-01 00:00:00')."+" . $now_nbr . ' month'));
                 }
             } else {
                 if ($now_nbr == 1) {
                     $params['coupon_detail_gain_datetime'] = date('Y-m-01 00:00:00');
-                    $params['coupon_detail_deadline_datetime'] = date('Y-m-t 23:59:59', strtotime("+" . $val . ' month'));
+                    $params['coupon_detail_deadline_datetime'] = date('Y-m-t 23:59:59', strtotime(date('Y-m-01 00:00:00')."+" . $val . ' month'));
                 } else {
                     $now_nbr -= 1;
                     $params['coupon_detail_gain_datetime'] = date('Y-m-01 00:00:00', strtotime( "+" . ((($val + 1) * $now_nbr)) . ' month'));
-                    $params['coupon_detail_deadline_datetime'] = date('Y-m-t 23:59:59', strtotime("+" . ((($val + 1) * $now_nbr) + $val) . ' month'));
+                    $params['coupon_detail_deadline_datetime'] = date('Y-m-t 23:59:59', strtotime(date('Y-m-01 00:00:00')."+" . ((($val + 1) * $now_nbr) + $val) . ' month'));
                 }
             }
         }