超级会员优惠券列表筛选条件bugfix

src/main/java/com/caimei/modules/coupon/entity/CmVipCoupon.java

@@ -29,9 +29,9 @@ public class CmVipCoupon extends DataEntity<CmVipCoupon> {
      */
     List<CmCoupon> couponList;
     /** 开始时间 */
-    private Date startDate;
+    private String startDate;
     /** 结束时间 */
-    private Date endDate;
+    private String endDate;
     /** 优惠券类型 */
     private String couponType;
 
@@ -111,19 +111,19 @@ public class CmVipCoupon extends DataEntity<CmVipCoupon> {
         this.couponList = couponList;
     }
 
-    public Date getStartDate() {
+    public String getStartDate() {
         return startDate;
     }
 
-    public void setStartDate(Date startDate) {
+    public void setStartDate(String startDate) {
         this.startDate = startDate;
     }
 
-    public Date getEndDate() {
+    public String getEndDate() {
         return endDate;
     }
 
-    public void setEndDate(Date endDate) {
+    public void setEndDate(String endDate) {
         this.endDate = endDate;
     }
 }

src/main/java/com/caimei/modules/coupon/service/CmVipCouponService.java

@@ -224,6 +224,7 @@ public class CmVipCouponService extends CrudService<CmCouponVipDao, CmVipCoupon>
         cmVipCoupon.setUpdateTime(new Date());
         cmVipCoupon.setStatus("1");
         cmVipCoupon.setDelFlag("0");
+        setVipCouponStatus(cmVipCoupon);
         // 解析 svipcouponForm -> 组装 CmCoupon 列表 保存
         CmCoupon coupon1 = new CmCoupon();
         CmCoupon coupon2 = new CmCoupon();

src/main/resources/mappings/modules/super/CmCouponVipMapper.xml

@@ -56,6 +56,24 @@
             <if test="endDate!=null and endDate!=''">
                 AND cs.useTime <![CDATA[   <=  ]]> #{endDate}
             </if>
+            <!-- 0未生效 1已生效 2已关闭 3已失效 -->
+            <if test="status!=null and status!=''">
+                <if test='status == "0"'>
+                    AND cs.status != '2'
+                    AND cs.useTime <![CDATA[ > ]]> DATE_FORMAT(NOW(), '%Y-%m')
+                </if>
+                <if test='status == "1"'>
+                    AND cs.status != '2'
+                    AND cs.useTime <![CDATA[ = ]]> DATE_FORMAT(NOW(), '%Y-%m')
+                </if>
+                <if test='status == "2"'>
+                    AND cs.status = '2'
+                </if>
+                <if test='status == "3"'>
+                    AND cs.status != '2'
+                    AND cs.useTime <![CDATA[ < ]]> DATE_FORMAT(NOW(), '%Y-%m')
+                </if>
+            </if>
         </where>
         ORDER BY cs.useTime DESC
     </select>
@@ -70,24 +88,10 @@
         LEFT JOIN shop s ON s.shopID = a.shopId
         <where>
             AND a.delFlag = 0
-            <if test="couponType != null">
+            <if test="couponType!=null and couponType!=''">
                 AND a.couponType = #{couponType}
             </if>
-            <if test='status == "0"'>
-                AND a.startDate <![CDATA[ > ]]> NOW()
-            </if>
-            <if test='status == "1"'>
-                AND a.startDate <![CDATA[ <= ]]> NOW()
-                AND a.endDate <![CDATA[ >= ]]> NOW()
-                AND a.status != '2'
-            </if>
-            <if test='status == "2"'>
-                AND a.status = '2'
-            </if>
-            <if test='status == "3"'>
-                AND a.endDate <![CDATA[ < ]]> NOW()
-            </if>
-            <if test="bindCoupons != null">
+            <if test="bindCoupons!=null">
                 AND a.id IN
                 <foreach collection="bindCoupons" open="(" separator="," close=")" item="couponId">
                     #{couponId}

src/main/webapp/WEB-INF/views/modules/svip/cmSvipCouponList.jsp

@@ -38,7 +38,7 @@
             <div class="item">
                 <label>优惠券类型：</label>
                 <form:select path="couponType" class="input-medium">
-                    <form:option value="99" label="全部"/>
+                    <form:option value="" label="全部"/>
                     <form:option value="0" label="活动券"/>
                     <form:option value="1" label="品类券"/>
                     <form:option value="3" label="店铺券"/>
@@ -48,7 +48,7 @@
             <div class="item">
                 <label>优惠状态：</label>
                 <form:select path="status" class="input-medium required">
-                    <form:option value="99" label="所有"/>
+                    <form:option value="" label="所有"/>
                     <form:option value="0" label="未生效"/>
                     <form:option value="1" label="已生效"/>
                     <form:option value="2" label="已关闭"/>