超级会员优惠券列表

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

@@ -2,6 +2,9 @@ package com.caimei.modules.coupon.dao;
 
 import com.caimei.modules.coupon.entity.CmVipCoupon;
 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @author 超级会员优惠券
@@ -13,7 +16,7 @@ public interface CmCouponVipDao{
      * 查找所有的超级会员优惠券
      * @return
      */
-    CmVipCoupon findAllVipCoupon();
+    List<CmVipCoupon> findAllVipCoupon(@Param("status") Integer status,@Param("useTime") String useTime,@Param("couponId") Integer couponId);
 
     /**
      * 在vip优惠券表添加数据
@@ -21,4 +24,16 @@ public interface CmCouponVipDao{
      */
     void addVipCoupon(CmVipCoupon vipCoupon);
 
+    /**
+     * 查供应商名称
+     * @param shopId
+     * @return
+     */
+    String findShopName(Integer shopId);
+
+    List<CmVipCoupon> findGroup(String useTime,Integer status);
+
+    List<String> findUseTime();
+
+    List<String> findBind();
 }

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

@@ -0,0 +1,21 @@
+package com.caimei.modules.coupon.dao;
+
+
+import com.caimei.modules.coupon.entity.CmCoupon;
+import com.caimei.modules.coupon.entity.SvipCouponList;
+import com.thinkgem.jeesite.common.persistence.CrudDao;
+import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
+
+import java.util.List;
+
+@MyBatisDao
+public interface SvipCouponListDao extends CrudDao<SvipCouponList> {
+
+    List<SvipCouponListDao> findList();
+
+    List<SvipCouponList> findLists();
+
+    CmCoupon findStatus(Integer couponId);
+
+    Integer findVipStatus(Integer couponId);
+}

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

@@ -15,6 +15,8 @@ public class CmVipCoupon extends CmCoupon implements Serializable {
     private String useTime;
     //优惠券id
     private Integer couponId;
+    //一次新建的优惠券字符串拼接结果
+    private String bindCoupon;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
@@ -22,6 +24,15 @@ public class CmVipCoupon extends CmCoupon implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
+
+    public String getBindCoupon() {
+        return bindCoupon;
+    }
+
+    public void setBindCoupon(String bindCoupon) {
+        this.bindCoupon = bindCoupon;
+    }
+
     public String getUseTime() {
         return useTime;
     }

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

@@ -1,5 +1,7 @@
 package com.caimei.modules.coupon.entity;
 
+import com.thinkgem.jeesite.common.persistence.DataEntity;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -9,12 +11,14 @@ import java.util.Date;
  * @author : Charles
  * @date : 2021/9/29
  */
-public class SvipCouponForm {
+public class SvipCouponForm extends DataEntity<SvipCouponForm> {
     /**
      * 月份
      */
     private String month;
 
+    private String status;
+
     private String productInfo1;        //商品json数据
     private String productInfo2;        //商品json数据
     private String productInfo3;        //商品json数据
@@ -33,6 +37,7 @@ public class SvipCouponForm {
 //    private String appletsBanner2;
 //    private String appletsBanner3;
 //    private String appletsBanner4;
+
     /**
      * 优惠券Id
      */
@@ -115,6 +120,13 @@ public class SvipCouponForm {
         this.productInfo4 = productInfo4;
     }
 
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
 //    public String getPcBanner2() {
 //        return pcBanner2;
 //    }

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

@@ -0,0 +1,68 @@
+package com.caimei.modules.coupon.entity;
+
+import com.thinkgem.jeesite.common.persistence.DataEntity;
+
+import java.util.List;
+
+public class SvipCouponList extends DataEntity<SvipCouponList> {
+    private String id;
+    /** 生效月份 */
+
+    private String useTime;
+    private Integer status;
+    /** 单张优惠券id */
+    private Integer couponId;
+    /** 一组优惠券id的String字符串，逗号隔开 */
+    private String bindCoupon;
+
+    private List<SvipCouponForm> svipCoupons;
+
+    @Override
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getUseTime() {
+        return useTime;
+    }
+
+    public void setUseTime(String useTime) {
+        this.useTime = useTime;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Integer getCouponId() {
+        return couponId;
+    }
+
+    public void setCouponId(Integer couponId) {
+        this.couponId = couponId;
+    }
+
+    public String getBindCoupon() {
+        return bindCoupon;
+    }
+
+    public void setBindCoupon(String bindCoupon) {
+        this.bindCoupon = bindCoupon;
+    }
+
+    public List<SvipCouponForm> getSvipCoupons() {
+        return svipCoupons;
+    }
+
+    public void setSvipCoupons(List<SvipCouponForm> svipCoupons) {
+        this.svipCoupons = svipCoupons;
+    }
+}

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

@@ -1,15 +1,20 @@
 package com.caimei.modules.coupon.service;
 
 import com.caimei.modules.coupon.dao.CmCouponVipDao;
+import com.caimei.modules.coupon.dao.SvipCouponListDao;
 import com.caimei.modules.coupon.entity.CmCoupon;
 import com.caimei.modules.coupon.entity.CmVipCoupon;
 import com.caimei.modules.coupon.entity.SvipCouponForm;
+import com.caimei.modules.coupon.entity.SvipCouponList;
 import com.caimei.modules.utils.DateUtil;
+import com.thinkgem.jeesite.common.persistence.Page;
+import com.thinkgem.jeesite.common.service.CrudService;
+import org.apache.poi.ss.formula.functions.Now;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
+import java.util.*;
 
 
 /**
@@ -17,15 +22,17 @@ import java.util.Date;
  */
 @Service
 @Transactional(readOnly = true)
-public class CmVipCouponService{
+public class CmVipCouponService extends CrudService<SvipCouponListDao, SvipCouponList> {
 
     @Autowired
     private CmCouponService cmCouponService;
     @Autowired
     private CmCouponVipDao vipDao;
+    @Autowired
+    private SvipCouponListDao listDao;
 
     @Transactional(readOnly = false)
-    public void addCoupon(SvipCouponForm svipcouponForm){
+    public void addCoupon(SvipCouponForm svipcouponForm) {
         String month = svipcouponForm.getMonth();
         Date beginTime = DateUtil.getMinDay(month);
         Date lastTime = DateUtil.getMaxDay(month);
@@ -136,6 +143,11 @@ public class CmVipCouponService{
         vipCoupon2.setCreateTime(date);
         vipCoupon3.setCreateTime(date);
         vipCoupon4.setCreateTime(date);
+        String s = vipCoupon1.getCouponId() + "," + vipCoupon2.getCouponId() + "," + vipCoupon3.getCouponId() + "," + vipCoupon4.getCouponId();
+        vipCoupon1.setBindCoupon(s);
+        vipCoupon2.setBindCoupon(s);
+        vipCoupon3.setBindCoupon(s);
+        vipCoupon4.setBindCoupon(s);
         vipDao.addVipCoupon(vipCoupon1);
         vipDao.addVipCoupon(vipCoupon2);
         vipDao.addVipCoupon(vipCoupon3);
@@ -143,6 +155,152 @@ public class CmVipCouponService{
     }
 
 
+    @Override
+    public Page<SvipCouponList> findPage(Page<SvipCouponList> page, SvipCouponList svipCouponList) {
+//           0 "未生效
+//           1 "已生效"
+//           2 "已关闭"
+//           3 "已失效"
+        Page<SvipCouponList> couponPage = super.findPage(page, svipCouponList);
+        List<SvipCouponList> list = couponPage.getList();
+        List<Integer> couponIds = new ArrayList<>();
+        ArrayList<SvipCouponForm> forms = new ArrayList<>();
+        for (SvipCouponList svipCoupon : list) {
+            String bindCoupon = svipCoupon.getBindCoupon();
+            String[] split = bindCoupon.split(",");
+            for (String s : split) {
+                Integer in = Integer.valueOf(s);
+                couponIds.add(in);
+            }
+            SvipCouponForm form = getForm(couponIds);
+            //todo 状态判断
+            Integer couponId1 = form.getCouponId1();
+            CmCoupon status = listDao.findStatus(couponId1);
+            Date endDate = status.getEndDate();
+            Date startDate = status.getStartDate();
+            Date now = new Date();
+            //结束>现在，开始<现在
+            if(endDate.after(now) && startDate.before(now)){
+                form.setStatus("1");
+            }
+            //开始时间>现在
+            if(startDate.after(now)){
+                form.setStatus("0");
+            }
+            //结束>现在
+            if(endDate.before(now)){
+                form.setStatus("3");
+            }
+            Integer vipStatus = listDao.findVipStatus(couponId1);
+            if(vipStatus != 1){
+                form.setStatus("2");
+            }
+            forms.add(form);
+            svipCoupon.setSvipCoupons(forms);
+            couponIds.clear();
+        }
+
+//        List<String> bind = vipDao.findBind();
+//        List<Integer> couponIds = new ArrayList<>();
+//        List<SvipCouponForm> forms = new ArrayList<>();
+//
+//        for (String s : bind) {
+//            String[] split = s.split(",");
+//            for (String s1 : split) {
+//                Integer in = Integer.valueOf(s1);
+//                couponIds.add(in);
+//            }
+//            SvipCouponForm form = getForm(couponIds);
+//            //todo 状态判断
+//            form.setStatus("0");
+//            forms.add(form);
+//            couponIds.clear();
+//        }
+//
+////        bind.forEach(b -> {
+////            for (String s : b.split(",")) {
+////                couponIds.add(Integer.valueOf(s));
+////            }
+////            SvipCouponForm form = getForm(couponIds);
+////            forms.add(form);
+////        });
+//        couponPage.setList(forms);
+        return page;
+    }
+
+    private SvipCouponForm getForm(List<Integer> couponIds) {
+        ArrayList<CmVipCoupon> group = new ArrayList<>();
+        SvipCouponForm form = new SvipCouponForm();
+        //根据couponId查4张优惠券,装进form
+        for (Integer couponId : couponIds) {
+            group.add(vipDao.findAllVipCoupon(null, null, couponId).get(0));
+        }
+        CmVipCoupon coupon1 = group.get(0);
+        CmVipCoupon coupon2 = group.get(1);
+        CmVipCoupon coupon3 = group.get(2);
+        CmVipCoupon coupon4 = group.get(3);
+        form.setMonth(coupon1.getUseTime());
+        form.setCouponId1(coupon1.getCouponId());
+        form.setCouponAmount1(coupon1.getCouponAmount());
+        form.setTouchPrice1(coupon1.getTouchPrice());
+        form.setCouponType1(coupon1.getCouponType());
+
+        form.setCouponId2(coupon2.getCouponId());
+        form.setCouponAmount2(coupon2.getCouponAmount());
+        form.setTouchPrice2(coupon2.getTouchPrice());
+        form.setCouponType2(coupon2.getCouponType());
+
+        form.setCouponId3(coupon3.getCouponId());
+        form.setCouponAmount3(coupon3.getCouponAmount());
+        form.setTouchPrice3(coupon3.getTouchPrice());
+        form.setCouponType3(coupon3.getCouponType());
+
+        form.setCouponId4(coupon4.getCouponId());
+        form.setCouponAmount4(coupon4.getCouponAmount());
+        form.setTouchPrice4(coupon4.getTouchPrice());
+        form.setCouponType4(coupon4.getCouponType());
 
+        if (coupon1.getCouponType() == 0) {
+            form.setProductType1(coupon1.getProductType());
+        }
+        if (coupon1.getCouponType() == 1) {
+            form.setCategoryType1(coupon1.getCategoryType());
+        }
+        if (coupon1.getCouponType() == 3) {
+            form.setShopId1(coupon1.getShopId());
+        }
+
+        if (coupon2.getCouponType() == 0) {
+            form.setProductType2(coupon2.getProductType());
+        }
+        if (coupon2.getCouponType() == 1) {
+            form.setCategoryType2(coupon2.getCategoryType());
+        }
+        if (coupon2.getCouponType() == 3) {
+            form.setShopId2(coupon2.getShopId());
+        }
+
+        if (coupon3.getCouponType() == 0) {
+            form.setProductType3(coupon3.getProductType());
+        }
+        if (coupon3.getCouponType() == 1) {
+            form.setCategoryType3(coupon3.getCategoryType());
+        }
+        if (coupon3.getCouponType() == 3) {
+            form.setShopId3(coupon3.getShopId());
+        }
+
+        if (coupon4.getCouponType() == 0) {
+            form.setProductType4(coupon4.getProductType());
+        }
+        if (coupon4.getCouponType() == 1) {
+            form.setCategoryType4(coupon4.getCategoryType());
+        }
+        if (coupon4.getCouponType() == 3) {
+            form.setShopId4(coupon4.getShopId());
+        }
+
+        return form;
+    }
 
 }

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

@@ -4,6 +4,7 @@ import com.caimei.modules.coupon.dao.CmCouponVipDao;
 import com.caimei.modules.coupon.entity.CmCoupon;
 import com.caimei.modules.coupon.entity.CmVipCoupon;
 import com.caimei.modules.coupon.entity.SvipCouponForm;
+import com.caimei.modules.coupon.entity.SvipCouponList;
 import com.caimei.modules.coupon.service.CmCouponService;
 import com.caimei.modules.coupon.service.CmVipCouponService;
 import com.caimei.modules.product.service.ProductService;
@@ -42,21 +43,23 @@ public class CmVipCouponController {
     private CmVipCouponService vipCouponService;
 
     @ModelAttribute
-    public CmCoupon get(@RequestParam(required = false) String id) {
-        CmCoupon entity = null;
+    public SvipCouponList get(@RequestParam(required = false) String id) {
+        SvipCouponList entity = null;
         if (StringUtils.isNotBlank(id)) {
-            entity = cmCouponService.get(id);
+            entity = vipCouponService.get(id);
         }
         if (entity == null) {
-            entity = new CmCoupon();
+            entity = new SvipCouponList();
         }
         return entity;
     }
 
+
+
+
     @RequestMapping(value = {"list", ""})
-    public String list(CmCoupon cmCoupon, HttpServletRequest request, HttpServletResponse response, Model model) {
-        cmCoupon.setCouponsMode("0");
-        Page<CmCoupon> page = cmCouponService.findVipPage(new Page<CmCoupon>(request, response), cmCoupon);
+    public String list(SvipCouponList svipCouponList, HttpServletRequest request, HttpServletResponse response, Model model) {
+        Page<SvipCouponList> page= vipCouponService.findPage(new Page<SvipCouponList>(request, response), svipCouponList);
         model.addAttribute("page", page);
         return "modules/svip/cmSvipCouponList";
     }

src/main/java/com/caimei/modules/utils/DateUtil.java

@@ -41,6 +41,15 @@ public class DateUtil {
         return null;
     }
 
+    /**
+     * 返回现在时间yyyy-mm格式
+     * @return
+     */
+    public static String getNowMonth(){
+        Date date = new Date();
+        String format = new SimpleDateFormat("yyyy-MM").format(date);
+        return format;
+    }
 //    public static void main(String[] args) throws ParseException {
 //        String month = "2020-02";
 //        System.out.println(getMinDateMonth(month));

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

@@ -3,12 +3,13 @@
 <mapper namespace="com.caimei.modules.coupon.dao.CmCouponVipDao">
 
     <insert id="addVipCoupon">
-        insert into cm_svip_coupon (created_time, updated_time, couponId, usetime, delflag, status)
+        insert into cm_svip_coupon (created_time, updated_time, couponId, usetime, delflag, status, bindCoupon)
         values (#{createTime},
                 #{updateTime},
                 #{couponId},
                 #{useTime},
-                0, 1)
+                0, 1,
+                #{bindCoupon})
     </insert>
 
     <!--    <sql id="cmCouponColumns">-->
@@ -110,7 +111,9 @@
     <!--    </choose>-->
 
     <select id="findAllVipCoupon" resultType="com.caimei.modules.coupon.entity.CmVipCoupon">
-        SELECT cc.`id` AS "couponId",
+        SELECT
+        cs.useTime,
+        cc.`id` AS "couponId",
         cc.`couponAmount`,
         cc.`touchPrice`,
         cc.`startDate`,
@@ -124,13 +127,40 @@
         INNER JOIN cm_svip_coupon cs ON cs.couponId = cc.id
         WHERE cc.delFlag = 0
         <if test="status != null and status != ''">
-            AND cc.status != 2
+            AND cc.status = #{status}
         </if>
-        <if test="useTime != null and userTime != ''">
-            AND cs.useTime=#{userTime}
+        <if test="useTime != null and useTime != ''">
+            AND cs.useTime=#{useTime}
+        </if>
+        <if test="couponId != null and couponId !=''">
+            AND cs.couponId=#{couponId}
+        </if>
+        ORDER BY cc.startDate DESC
+    </select>
+
+    <select id="findGroup" resultType="com.caimei.modules.coupon.entity.CmVipCoupon">
+        select *
+        from cm_svip_coupon cs
+        where useTime = #{useTime}
+        AND cs.delFlag=0
+        <if test="status!=null and status != ''">
+            AND cs.status=#{status}
         </if>
-        ORDER BY cs.created_time DESC
     </select>
 
+    <select id="findShopName" resultType="java.lang.String">
+        select name
+        from shop
+        where shopID = #{shopId}
+    </select>
+
+    <select id="findUseTime" resultType="String">
+        SELECT DISTINCT usetime
+        FROM cm_svip_coupon
+    </select>
 
+    <select id="findBind" resultType="java.lang.String">
+        SELECT DISTINCT bindCoupon
+        FROM cm_svip_coupon
+    </select>
 </mapper>

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

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.caimei.modules.coupon.dao.SvipCouponListDao">
+
+    <select id="findList" resultType="com.caimei.modules.coupon.entity.SvipCouponList">
+        select cs.id, cs.useTime, cs.status, cs.couponId, cs.bindCoupon
+        from cm_svip_coupon cs
+        <if test='status == "1" or status == "0" or status =="3"'>
+            inner join cm_coupon cc on cc.id=cs.couponId
+        </if>
+        where cs.delFlag=0
+        <if test='status == "2"'>
+            AND cs.status=0
+        </if>
+        <if test='status == "1"'>
+            AND now() between cc.startDate and cc.endDate
+        </if>
+        <if test='status == "0"'>
+            AND cc.startDate > now()
+        </if>
+        <if test='status == "3"'>
+            AND now() > cc.endDate
+        </if>
+        <if test="useTime!=null and useTime!=''">
+            AND cs.useTime=#{useTime}
+        </if>
+        group by cs.bindCoupon
+    </select>
+
+    <select id="findLists" resultType="com.caimei.modules.coupon.entity.SvipCouponList">
+        select useTime, delFlag, status, couponId, bindCoupon
+        from cm_svip_coupon
+        where useTime = #{useTime}
+    </select>
+
+    <select id="findStatus" resultType="com.caimei.modules.coupon.entity.CmCoupon">
+        select startDate,endDate from cm_coupon where id=#{couponId}
+    </select>
+
+    <select id="findVipStatus" resultType="java.lang.Integer">
+        select status from cm_svip_coupon where couponId=#{couponId}
+    </select>
+</mapper>

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

@@ -36,6 +36,17 @@
                         $('#productInfo4').val(productInfo4);
                     }
 
+                    var couponType1 = $("#couponType1").val();
+                    var shopId1 = $("#shopId1").val();
+                    if(couponType1 == 3){
+                        debugger;
+                        if(shopId1 == "" || shopId1 == null){
+                            alert("店铺券供应商不能为空 !");
+                            return false;
+                        }
+                    }
+                    alert(couponType1);
+                    alert(shopId1);
                     var month = $("#month").val();
                     // 判断月份 ...
                     if(month == null || month == ""){

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

@@ -5,40 +5,44 @@
     <title>超级会员优惠券管理列表</title>
     <meta name="decorator" content="default"/>
     <style type="text/css">
-        .table th { text-align: center; }
-        .table td { text-align: center; }
+        .table th {
+            text-align: center;
+        }
+
+        .table td {
+            text-align: center;
+        }
     </style>
 </head>
 <body>
 <ul class="nav nav-tabs">
     <li class="active"><a href="${ctx}/vip/cmCoupon/">超级会员专属优惠券</a></li>
 </ul>
-<form:form id="searchForm" modelAttribute="cmCoupon" action="${ctx}/vip/cmCoupon/" method="post"
+<form:form id="searchForm" modelAttribute="svipCouponList" action="${ctx}/vip/cmCoupon/" method="post"
            class="breadcrumb form-search">
     <input type="hidden" name="couponType" value="4"/>
     <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
     <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
     <div class="ul-form">
 
-        <label>优惠券类型：</label>
-        <form:select path="couponType" class="input-medium">
-            <form:option value="" label="全部"/>
-            <form:option value="0" label="活动券"/>
-            <form:option value="1" label="品类券"/>
-            <form:option value="3" label="店铺券"/>
-        </form:select>
+            <%--        <label>优惠券类型：</label>--%>
+            <%--        <form:select path="couponType" class="input-medium">--%>
+            <%--            <form:option value="" label="全部"/>--%>
+            <%--            <form:option value="0" label="活动券"/>--%>
+            <%--            <form:option value="1" label="品类券"/>--%>
+            <%--            <form:option value="3" label="店铺券"/>--%>
+            <%--        </form:select>--%>
         <label>优惠状态：</label>
         <form:select path="status" class="input-medium required">
-            <form:option value="" label="所有"/>
+            <form:option value="99" label="所有"/>
             <form:option value="0" label="未生效"/>
             <form:option value="1" label="已生效"/>
             <form:option value="2" label="已关闭"/>
             <form:option value="3" label="已失效"/>
         </form:select>
         <label>优惠月份：</label>
-        <input name="startDate" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate"
-               value="<fmt:formatDate value="${cmCoupon.startDate}" pattern="yyyy-MM"/>"
-               onclick="WdatePicker({dateFmt:'yyyy-MM',isShowClear:false});"/>
+        <form:input path="useTime" type="text" maxlength="20" class="input-medium Wdate" value="${svipCouponList.useTime}"
+                            onclick="WdatePicker({dateFmt:'yyyy-MM',isShowClear:false});"/>
         <input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
         <input class="btn btn-primary" style="width: 80px" onclick="window.location='${ctx}/vip/cmCoupon/form'"
                value="添加优惠券"/>
@@ -58,46 +62,86 @@
     <tbody>
     <c:forEach items="${page.list}" var="cmCoupon">
         <tr>
-            <td><fmt:formatDate value="${cmCoupon.startDate}" type="date" pattern="yyyy-MM"/></td>
             <td>
-                <c:if test="${cmCoupon.couponType eq 0 && cmCoupon.productType eq '1'}">优惠券1：活动券￥${cmCoupon.couponAmount}，满${cmCoupon.touchPrice}可用，
-                    全商城商品通用
+<%--                <fmt:formatDate value="${cmCoupon.useTime}" type="date" pattern="yyyy-MM"/>--%>
+                <label>${cmCoupon.useTime}</label>
+            </td>
+            <td>
+                <c:forEach items="${cmCoupon.svipCoupons}" var="svipcouponForm">
+                优惠券1：
+                <c:if test="${svipcouponForm.couponType1 eq 0}">活动券￥${svipcouponForm.couponAmount1}，满${svipcouponForm.touchPrice1}可用，
+                    <c:if test="${svipcouponForm.productType1 eq '1'}"> 全商城商品通用</c:if>
+                    <c:if test="${svipcouponForm.productType1 eq '2'}"> 仅可购买指定商品</c:if>
+                </c:if>
+                <c:if test="${svipcouponForm.couponType1 eq 1}">品类券￥${svipcouponForm.couponAmount1}，满${svipcouponForm.touchPrice1}可用，
+                    <c:if test="${svipcouponForm.categoryType1 eq '2'}">仅可购买仪器类商品</c:if>
+                    <c:if test="${svipcouponForm.categoryType1 eq '1'}">仅可购买产品类商品</c:if>
+                </c:if>
+                <c:if test="${svipcouponForm.couponType1 eq 3}">店铺券￥${svipcouponForm.couponAmount1}，满${svipcouponForm.touchPrice1}可用，仅可购买店铺
+                    ${svipcouponForm.shopId1}的商品
                 </c:if>
                 <br/>
-                <c:if test="${cmCoupon.couponType eq 1}">优惠券2：品类券￥${cmCoupon.couponAmount}，满${cmCoupon.touchPrice}可用，
-                    <c:if test="${cmCoupon.categoryType eq '2'}">仅可购买仪器类商品</c:if>
-                    <c:if test="${cmCoupon.categoryType eq '1'}">仅可购买产品类商品</c:if>
+                优惠券2：
+                <c:if test="${svipcouponForm.couponType2 eq 0}">活动券￥${svipcouponForm.couponAmount2}，满${svipcouponForm.touchPrice2}可用，
+                    <c:if test="${svipcouponForm.productType2 eq '1'}"> 全商城商品通用</c:if>
+                    <c:if test="${svipcouponForm.productType23 eq '2'}"> 仅可购买指定商品</c:if>
+                </c:if>
+                <c:if test="${svipcouponForm.couponType2 eq 1}">品类券￥${svipcouponForm.couponAmount2}，满${svipcouponForm.touchPrice2}可用，
+                    <c:if test="${svipcouponForm.categoryType2 eq '2'}">仅可购买仪器类商品</c:if>
+                    <c:if test="${svipcouponForm.categoryType2 eq '1'}">仅可购买产品类商品</c:if>
+                </c:if>
+                <c:if test="${svipcouponForm.couponType2 eq 3}">店铺券￥${svipcouponForm.couponAmount2}，满${svipcouponForm.touchPrice2}可用，仅可购买店铺
+                    ${svipcouponForm.shopId2}的商品
                 </c:if>
                 <br/>
-                <c:if test="${cmCoupon.couponType eq 3}">优惠券3：店铺券￥${cmCoupon.couponAmount}，满${cmCoupon.touchPrice}可用，仅可购买店铺
-                    ${cmCoupon.shopId}的商品
+                优惠券3：
+                <c:if test="${svipcouponForm.couponType3 eq 0}">活动券￥${svipcouponForm.couponAmount3}，满${svipcouponForm.touchPrice3}可用，
+                    <c:if test="${svipcouponForm.productType3 eq '1'}"> 全商城商品通用</c:if>
+                    <c:if test="${svipcouponForm.productType3 eq '2'}"> 仅可购买指定商品</c:if>
+                </c:if>
+                <c:if test="${svipcouponForm.couponType3 eq 1}">品类券￥${svipcouponForm.couponAmount3}，满${svipcouponForm.touchPrice3}可用，
+                    <c:if test="${svipcouponForm.categoryType3 eq '2'}">仅可购买仪器类商品</c:if>
+                    <c:if test="${svipcouponForm.categoryType3 eq '1'}">仅可购买产品类商品</c:if>
+                </c:if>
+                <c:if test="${svipcouponForm.couponType3 eq 3}">店铺券￥${svipcouponForm.couponAmount3}，满${svipcouponForm.touchPrice3}可用，仅可购买店铺
+                    ${svipcouponForm.shopId3}的商品
                 </c:if>
                 <br/>
-                <c:if test="${cmCoupon.couponType eq 0 && cmCoupon.productType eq '2'}">优惠券4：活动券￥${cmCoupon.couponAmount}，满${cmCoupon.touchPrice}可用，
-                    仅可购买指定商品
+                优惠券4：
+                <c:if test="${svipcouponForm.couponType4 eq 0}">活动券￥${svipcouponForm.couponAmount4}，满${svipcouponForm.touchPrice4}可用，
+                    <c:if test="${svipcouponForm.productType4 eq '1'}"> 全商城商品通用</c:if>
+                    <c:if test="${svipcouponForm.productType4 eq '2'}"> 仅可购买指定商品</c:if>
+                </c:if>
+                <c:if test="${svipcouponForm.couponType4 eq 1}">品类券￥${svipcouponForm.couponAmount4}，满${svipcouponForm.touchPrice4}可用，
+                    <c:if test="${svipcouponForm.categoryType4 eq '2'}">仅可购买仪器类商品</c:if>
+                    <c:if test="${svipcouponForm.categoryType4 eq '1'}">仅可购买产品类商品</c:if>
+                </c:if>
+                <c:if test="${svipcouponForm.couponType4 eq 3}">店铺券￥${svipcouponForm.couponAmount4}，满${svipcouponForm.touchPrice4}可用，仅可购买店铺
+                    ${svipcouponForm.shopId4}的商品
                 </c:if>
             </td>
             <td>
-                <c:if test="${cmCoupon.status eq 0}">
+                <c:if test="${svipcouponForm.status eq '0'}">
                     <font color="#800080">未生效</font>
                 </c:if>
-                <c:if test="${cmCoupon.status eq 1}">
+                <c:if test="${svipcouponForm.status eq '1'}">
                     <font color="#00CC66">已生效</font>
                 </c:if>
-                <c:if test="${cmCoupon.status eq 2}">
+                <c:if test="${svipcouponForm.status eq '2'}">
                     <font color="red">已关闭</font>
                 </c:if>
-                <c:if test="${cmCoupon.status eq 3}">
+                <c:if test="${svipcouponForm.status eq '3'}">
                     <font color="#FF6600">已失效</font>
                 </c:if>
             </td>
             <td>
-                <a href="${ctx}/vip/cmCoupon/form?id=${cmCoupon.id}">编辑</a>
-                <a href="${ctx}/vip/cmCoupon/close?id=${cmCoupon.id}"
+                <a href="${ctx}/vip/cmCoupon/form?id=${svipcouponForm.couponId1}">编辑</a>
+                <a href="${ctx}/vip/cmCoupon/close?id=${svipcouponForm.couponId1}"
                    onclick="return confirmx('确定关闭该该月份的优惠券吗？关闭后该月份将不赠送优惠券？', this.href)">关闭</a>
-                <a href="${ctx}/vip/cmCoupon/delete?id=${cmCoupon.id}"
+                <a href="${ctx}/vip/cmCoupon/delete?id=${svipcouponForm.couponId1}"
                    onclick="return confirmx('确定删除该月份的优惠券吗？删除后该月份将不赠送优惠券', this.href)">删除</a>
             </td>
+            </c:forEach>
         </tr>
     </c:forEach>
     </tbody>

src/test/java/com/caimei/designpattern/adapter/AdapterTest.java

@@ -1,5 +1,12 @@
 package com.caimei.designpattern.adapter;
 
+import com.caimei.modules.coupon.dao.CmCouponVipDao;
+import com.caimei.modules.coupon.entity.CmVipCoupon;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * 结构型模式之
  * 适配器模式
@@ -9,10 +16,5 @@ package com.caimei.designpattern.adapter;
  * @version 1.0
  */
 public class AdapterTest {
-	
-	 public static void main(String[] args) {  
-	        Targetable target = new Adapter();  
-	        target.method1();  
-	        target.method2();  
-	 }  
+
 }

src/test/java/com/caimei/getSrcFilePathTest.java

@@ -1,17 +1,29 @@
 package com.caimei;
 
+import com.caimei.modules.coupon.dao.CmCouponVipDao;
+import com.caimei.modules.coupon.entity.CmVipCoupon;
 import org.junit.Test;
 
 import com.thinkgem.jeesite.common.utils.FileUtils;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.List;
+
 
 public class getSrcFilePathTest {
-	
+
+
 	@Test
 	public  void test() {
-		String templateFileName="cache/ehcache-local.xml";
-		//得到模板文件路径
-		String srcFilePath = FileUtils.class.getClassLoader().getResource(templateFileName).getPath();
-		System.out.println(srcFilePath);
+//		String templateFileName="cache/ehcache-local.xml";
+//		//得到模板文件路径
+//		String srcFilePath = FileUtils.class.getClassLoader().getResource(templateFileName).getPath();
+//		System.out.println(srcFilePath);
+
 	}
 
 }

src/test/java/com/caimei/info/InfoTest.java

@@ -1,5 +1,7 @@
 package com.caimei.info;
 
+import com.caimei.modules.coupon.dao.CmCouponVipDao;
+import com.caimei.modules.coupon.entity.CmVipCoupon;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -10,6 +12,8 @@ import com.thinkgem.jeesite.common.utils.Encodes;
 import com.thinkgem.jeesite.common.utils.StringUtils;
 import com.thinkgem.jeesite.test.service.InfomationService;
 
+import java.util.List;
+
 
 public class InfoTest extends SpringTransactionalContextTests {
 	
@@ -18,28 +22,33 @@ public class InfoTest extends SpringTransactionalContextTests {
 	
 	@Autowired
 	private InfoService infoService;
-	
+
+	@Autowired
+	private CmCouponVipDao dao;
+
 	@Test
 	public void test(){
-		Info info = infoService.get("228");
-		String infoContent=Encodes.unescapeHtml(info.getInfoContent());
-		//infoContent=Encodes.urlDecode(infoContent);
-//		Document doc = Jsoup.parse(infoContent);
-//		Elements links = doc.getElementsByTag("div");
-//		for (Element link : links) {
-//			//page-break-after: always;
-//			String linkSrc = link.attr("style");
-//			if(StringUtils.equals(linkSrc, "page-break-after: always;")){
-//				
-//			}
-//		}
-		
-		String a="<div style=\"page-break-after: always;\">\r\n\t<span style=\"display: none;\"> </span></div>";
-		//String[] split = StringUtils.split(infoContent,a);
-		String[] split=StringUtils.splitByWholeSeparator(infoContent, a);
-		System.out.println(split[0]);
-		System.out.println("-------------------------------------------------------");
-		System.out.println(split[1]);
+//		Info info = infoService.get("228");
+//		String infoContent=Encodes.unescapeHtml(info.getInfoContent());
+//		//infoContent=Encodes.urlDecode(infoContent);
+////		Document doc = Jsoup.parse(infoContent);
+////		Elements links = doc.getElementsByTag("div");
+////		for (Element link : links) {
+////			//page-break-after: always;
+////			String linkSrc = link.attr("style");
+////			if(StringUtils.equals(linkSrc, "page-break-after: always;")){
+////
+////			}
+////		}
+//
+//		String a="<div style=\"page-break-after: always;\">\r\n\t<span style=\"display: none;\"> </span></div>";
+//		//String[] split = StringUtils.split(infoContent,a);
+//		String[] split=StringUtils.splitByWholeSeparator(infoContent, a);
+//		System.out.println(split[0]);
+//		System.out.println("-------------------------------------------------------");
+//		System.out.println(split[1]);
+
+
 	}
 	
 	

src/test/java/com/thinkgem/jeesite/test/Test.java

@@ -1,8 +1,13 @@
 package com.thinkgem.jeesite.test;
 
+import com.caimei.modules.coupon.dao.CmCouponVipDao;
+
+import javax.annotation.Resource;
+
 public class Test {
 
+
 	public static void main(String[] args) {
-		
+
 	}
 }