bugfix

src/main/java/com/caimei/modules/coupon/dao/CmCouponDao.java

@@ -87,5 +87,5 @@ public interface CmCouponDao extends CrudDao<CmCoupon> {
      */
     void updateClubCoupon(@Param("clubCouponId") Integer clubCouponId, @Param("orderId") Integer orderId);
 
-    List<CmCoupon> findCouponList(Integer moneyCouponFlag);
+    List<CmCoupon> findCouponList(@Param("userId")Integer userId,@Param("moneyCouponFlag")Integer moneyCouponFlag);
 }

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

@@ -334,8 +334,8 @@ public class CmCouponService extends CrudService<CmCouponDao, CmCoupon> {
         return couponsLogo;
     }
 
-    public List<CmCoupon> findClubCouponList(Product product,Integer moneyCouponFlag) {
-        List<CmCoupon> couponList = cmCouponDao.findCouponList(moneyCouponFlag);
+    public List<CmCoupon> findClubCouponList(Product product,Integer userId,Integer moneyCouponFlag) {
+        List<CmCoupon> couponList = cmCouponDao.findCouponList(userId,moneyCouponFlag);
         filterCoupon(product, couponList);
         setCouponCopywriting(couponList);
         return couponList;

src/main/java/com/caimei/modules/coupon/web/CmCouponController.java

@@ -307,11 +307,11 @@ public class CmCouponController extends BaseController {
         String wwwServer = Global.getConfig("wwwServer");
         product.setMainImage(AppUtils.getImageURL("product", product.getMainImage(), 0, wwwServer));
         //展示全部可用普通优惠券,不包含已领取兑换优惠券
-        List<CmCoupon> ordinaryCoupons = cmCouponService.findClubCouponList(product, 2);
+        List<CmCoupon> ordinaryCoupons = cmCouponService.findClubCouponList(product, userId,2);
         //展示全部可用兑换优惠券
         List<CmCoupon> redeemCoupons = cmCouponService.findNotRedeemedCoupon(product);
         //展示全部可用价值优惠券
-        List<CmCoupon> moneyCoupons = cmCouponService.findClubCouponList(product, 1);
+        List<CmCoupon> moneyCoupons = cmCouponService.findClubCouponList(product, userId,1);
         model.addAttribute("product", product);
         model.addAttribute("ordinaryCoupons", ordinaryCoupons);
         model.addAttribute("redeemCoupons", redeemCoupons);

src/main/resources/mappings/modules/coupon/CmCouponMapper.xml

@@ -537,8 +537,13 @@
 		  AND cc.moneyCouponFlag = #{moneyCouponFlag}
 		  AND cc.status != 2
 		  AND cc.couponsMode = 0
-		  AND now() BETWEEN cc.startDate
-		  AND cc.endDate
+		  AND (couponType IN (0,1,3)
+			OR (couponType = 2 AND userId = #{userId})
+			OR ((SELECT registerTime FROM USER WHERE userID = #{userId}) <![CDATA[ >= ]]> startDate
+				AND couponType = 4))
+		  AND NOW() <![CDATA[ < ]]> if(receiveFlag = 1,endDate,
+									   date_add(if((SELECT registerTime FROM USER WHERE userID = #{userId}) <![CDATA[ > ]]> startDate and (SELECT registerTime FROM USER WHERE userID = #{userId}) <![CDATA[ < ]]> endDate,(SELECT registerTime FROM USER WHERE userID = #{userId}),startDate),
+												interval receivePeriod day))
 		ORDER BY
 			cc.couponAmount DESC
 	</select>