超级会员优惠券列表

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

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

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

@@ -17,5 +17,9 @@ public interface SvipCouponListDao extends CrudDao<SvipCouponList> {
 
     CmCoupon findStatus(Integer couponId);
 
-    Integer findVipStatus(Integer couponId);
+    SvipCouponList findVipStatus(Integer couponId);
+
+    void updateVip(SvipCouponList coupon);
+
+    CmCoupon findCoupon(Integer couponId);
 }

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

@@ -18,12 +18,15 @@ public class CmVipCoupon extends CmCoupon implements Serializable {
     //一次新建的优惠券字符串拼接结果
     private String bindCoupon;
 
+    private String status;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
+    private String delFlag;
 
     public String getBindCoupon() {
         return bindCoupon;
@@ -33,6 +36,26 @@ public class CmVipCoupon extends CmCoupon implements Serializable {
         this.bindCoupon = bindCoupon;
     }
 
+    @Override
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    @Override
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    @Override
+    public String getStatus() {
+        return status;
+    }
+
+    @Override
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
     public String getUseTime() {
         return useTime;
     }

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

@@ -14,8 +14,9 @@ public class SvipCouponList extends DataEntity<SvipCouponList> {
     private Integer couponId;
     /** 一组优惠券id的String字符串，逗号隔开 */
     private String bindCoupon;
+    private String delFlag;
+    private SvipCouponForm svipCoupons;
 
-    private List<SvipCouponForm> svipCoupons;
 
     @Override
     public String getId() {
@@ -26,6 +27,16 @@ public class SvipCouponList extends DataEntity<SvipCouponList> {
         this.id = id;
     }
 
+    @Override
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    @Override
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
     public String getUseTime() {
         return useTime;
     }
@@ -58,11 +69,11 @@ public class SvipCouponList extends DataEntity<SvipCouponList> {
         this.bindCoupon = bindCoupon;
     }
 
-    public List<SvipCouponForm> getSvipCoupons() {
+    public SvipCouponForm getSvipCoupons() {
         return svipCoupons;
     }
 
-    public void setSvipCoupons(List<SvipCouponForm> svipCoupons) {
+    public void setSvipCoupons(SvipCouponForm svipCoupons) {
         this.svipCoupons = svipCoupons;
     }
 }

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

@@ -1,5 +1,6 @@
 package com.caimei.modules.coupon.service;
 
+import com.caimei.modules.coupon.dao.CmCouponDao;
 import com.caimei.modules.coupon.dao.CmCouponVipDao;
 import com.caimei.modules.coupon.dao.SvipCouponListDao;
 import com.caimei.modules.coupon.entity.CmCoupon;
@@ -9,7 +10,6 @@ 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;
@@ -30,9 +30,11 @@ public class CmVipCouponService extends CrudService<SvipCouponListDao, SvipCoupo
     private CmCouponVipDao vipDao;
     @Autowired
     private SvipCouponListDao listDao;
+    @Autowired
+    private CmCouponDao cmCouponDao;
 
     @Transactional(readOnly = false)
-    public void addCoupon(SvipCouponForm svipcouponForm) {
+    public void addCoupon(SvipCouponForm svipcouponForm, Integer couponId1, String flag) {
         String month = svipcouponForm.getMonth();
         Date beginTime = DateUtil.getMinDay(month);
         Date lastTime = DateUtil.getMaxDay(month);
@@ -130,6 +132,7 @@ public class CmVipCouponService extends CrudService<SvipCouponListDao, SvipCoupo
             coupon4.setShopId(svipcouponForm.getShopId4());
             coupon4.setCouponType(3);
         }
+
         cmCouponService.save(coupon1);
         cmCouponService.save(coupon2);
         cmCouponService.save(coupon3);
@@ -148,12 +151,59 @@ public class CmVipCouponService extends CrudService<SvipCouponListDao, SvipCoupo
         vipCoupon2.setBindCoupon(s);
         vipCoupon3.setBindCoupon(s);
         vipCoupon4.setBindCoupon(s);
-        vipDao.addVipCoupon(vipCoupon1);
-        vipDao.addVipCoupon(vipCoupon2);
-        vipDao.addVipCoupon(vipCoupon3);
-        vipDao.addVipCoupon(vipCoupon4);
+        //0修改，1新增
+        if (flag.equals("0")) {
+            CmVipCoupon byCoupon = vipDao.findByCoupon(couponId1, null);
+            if (byCoupon != null) {
+                vipDao.updateVip(vipCoupon1);
+                vipDao.updateVip(vipCoupon2);
+                vipDao.updateVip(vipCoupon3);
+                vipDao.updateVip(vipCoupon4);
+            }
+        }
+        if (flag.equals("1")) {
+            vipDao.addVipCoupon(vipCoupon1);
+            vipDao.addVipCoupon(vipCoupon2);
+            vipDao.addVipCoupon(vipCoupon3);
+            vipDao.addVipCoupon(vipCoupon4);
+        }
     }
 
+    @Transactional(readOnly = false)
+    public void close(Integer couponId) {
+        SvipCouponList vip = listDao.findVipStatus(couponId);
+        String bindCoupon = vip.getBindCoupon();
+        String[] split = bindCoupon.split(",");
+        SvipCouponList vipCouponList = new SvipCouponList();
+        for (String s : split) {
+            Integer ids = Integer.valueOf(s);
+            CmCoupon coupon = listDao.findCoupon(ids);
+            vipCouponList.setCouponId(ids);
+            vipCouponList.setStatus(0);
+            coupon.setStatus("2");
+            coupon.setCouponsMode("0");
+            cmCouponDao.update(coupon);
+            listDao.updateVip(vipCouponList);
+        }
+    }
+
+    @Transactional(readOnly = false)
+    public void deleteById(Integer couponId) {
+        SvipCouponList vip = listDao.findVipStatus(couponId);
+        String bindCoupon = vip.getBindCoupon();
+        String[] split = bindCoupon.split(",");
+        SvipCouponList vipCouponList = new SvipCouponList();
+        for (String s : split) {
+            Integer ids = Integer.valueOf(s);
+            CmCoupon coupon = listDao.findCoupon(ids);
+            vipCouponList.setCouponId(ids);
+            vipCouponList.setDelFlag("1");
+            coupon.setDelFlag("1");
+            coupon.setCouponsMode("0");
+            cmCouponDao.delete(coupon);
+            listDao.updateVip(vipCouponList);
+        }
+    }
 
     @Override
     public Page<SvipCouponList> findPage(Page<SvipCouponList> page, SvipCouponList svipCouponList) {
@@ -164,7 +214,6 @@ public class CmVipCouponService extends CrudService<SvipCouponListDao, SvipCoupo
         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(",");
@@ -173,58 +222,31 @@ public class CmVipCouponService extends CrudService<SvipCouponListDao, SvipCoupo
                 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)){
+            if (endDate.after(now) && startDate.before(now)) {
                 form.setStatus("1");
             }
             //开始时间>现在
-            if(startDate.after(now)){
+            if (startDate.after(now)) {
                 form.setStatus("0");
             }
             //结束>现在
-            if(endDate.before(now)){
+            if (endDate.before(now)) {
                 form.setStatus("3");
             }
-            Integer vipStatus = listDao.findVipStatus(couponId1);
-            if(vipStatus != 1){
+            SvipCouponList vipStatus = listDao.findVipStatus(couponId1);
+            if (vipStatus.getStatus() != 1) {
                 form.setStatus("2");
             }
-            forms.add(form);
-            svipCoupon.setSvipCoupons(forms);
+            svipCoupon.setSvipCoupons(form);
             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;
     }
 
@@ -260,6 +282,7 @@ public class CmVipCouponService extends CrudService<SvipCouponListDao, SvipCoupo
         form.setTouchPrice4(coupon4.getTouchPrice());
         form.setCouponType4(coupon4.getCouponType());
 
+        //todo 等于0的时候活动券productinfo查出来还回去
         if (coupon1.getCouponType() == 0) {
             form.setProductType1(coupon1.getProductType());
         }
@@ -303,4 +326,15 @@ public class CmVipCouponService extends CrudService<SvipCouponListDao, SvipCoupo
         return form;
     }
 
+    public SvipCouponForm getVipForm(Integer couponId1) {
+        CmVipCoupon byCoupon = vipDao.findByCoupon(couponId1, null);
+        ArrayList<Integer> couponIds = new ArrayList<>();
+        String[] split = byCoupon.getBindCoupon().split(",");
+        for (String s : split) {
+            Integer ids = Integer.valueOf(s);
+            couponIds.add(ids);
+        }
+        SvipCouponForm form = getForm(couponIds);
+        return form;
+    }
 }

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

@@ -42,6 +42,9 @@ public class CmVipCouponController {
     @Autowired
     private CmVipCouponService vipCouponService;
 
+    @Autowired
+    private CmCouponVipDao vipDao;
+
     @ModelAttribute
     public SvipCouponList get(@RequestParam(required = false) String id) {
         SvipCouponList entity = null;
@@ -54,34 +57,70 @@ public class CmVipCouponController {
         return entity;
     }
 
+    @RequestMapping(value = "close")
+    public String close(Integer couponId1, RedirectAttributes redirectAttributes) {
+        vipCouponService.close(couponId1);
+        addMessage(redirectAttributes, "关闭优惠券成功");
+        return "redirect:" + Global.getAdminPath() + "/svip/cmCoupon/list";
+    }
 
-
+    @RequestMapping(value = "delete")
+    public String delete(Integer couponId1, RedirectAttributes redirectAttributes) {
+        vipCouponService.deleteById(couponId1);
+        addMessage(redirectAttributes, "删除优惠券成功");
+        return "redirect:" + Global.getAdminPath() + "/svip/cmCoupon/list";
+    }
 
     @RequestMapping(value = {"list", ""})
     public String list(SvipCouponList svipCouponList, HttpServletRequest request, HttpServletResponse response, Model model) {
-        Page<SvipCouponList> page= vipCouponService.findPage(new Page<SvipCouponList>(request, response), svipCouponList);
+        Page<SvipCouponList> page = vipCouponService.findPage(new Page<SvipCouponList>(request, response), svipCouponList);
         model.addAttribute("page", page);
         return "modules/svip/cmSvipCouponList";
     }
 
     @RequestMapping(value = "form")
-    public String form(SvipCouponForm svipcouponForm, Model model) {
-        // 根据4个CmCoupon的Id查询CmCoupon列表，封装成解析SvipCouponForm
+    public String form(Integer couponId1, SvipCouponForm svipcouponForm, Model model) {
+        if (couponId1 != null) {
+            svipcouponForm = vipCouponService.getVipForm(couponId1);
+            // 根据4个CmCoupon的Id查询CmCoupon列表，封装成解析SvipCouponForm
+            model.addAttribute("svipcouponForm", svipcouponForm);
+        }
+        return "modules/svip/cmSvipCouponForm";
+    }
 
+    @RequestMapping(value = "forms")
+    public String forms(Model model) {
+        SvipCouponForm svipcouponForm = new SvipCouponForm();
         model.addAttribute("svipcouponForm", svipcouponForm);
         return "modules/svip/cmSvipCouponForm";
     }
 
+
     /**
      * 保存
      *
      * @param svipcouponForm
      */
     @RequestMapping(value = "save")
-    public String save(SvipCouponForm svipcouponForm, Model model, RedirectAttributes redirectAttributes) throws ParseException {
-        vipCouponService.addCoupon(svipcouponForm);
-        addMessage(redirectAttributes, "保存超级会员专属优惠券成功");
-        return "redirect:" + Global.getAdminPath() + "/vip/cmCoupon/?repage";
+    public String save(Integer couponId1, SvipCouponForm svipcouponForm, Model model, RedirectAttributes redirectAttributes) throws ParseException {
+        if (couponId1 != null) {
+            //不为空修改
+            vipCouponService.addCoupon(svipcouponForm, couponId1, "0");
+            addMessage(redirectAttributes, "修改超级会员专属优惠券成功");
+            return "redirect:" + Global.getAdminPath() + "/vip/cmCoupon/?repage";
+        } else {
+            //couponid为空一定新增
+            List<String> useTime = vipDao.findUseTime();
+            if (useTime.contains(svipcouponForm.getMonth())) {
+                //不能新增，这个月已经有了
+                addMessage(redirectAttributes, "本月已存在优惠券，无法新增");
+                return "redirect:" + Global.getAdminPath() + "/vip/cmCoupon/?repage";
+            } else {
+                vipCouponService.addCoupon(svipcouponForm, couponId1, "1");
+                addMessage(redirectAttributes, "新增超级会员专属优惠券成功");
+                return "redirect:" + Global.getAdminPath() + "/vip/cmCoupon/?repage";
+            }
+        }
     }
 
     /**

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

@@ -12,6 +12,25 @@
                 #{bindCoupon})
     </insert>
 
+    <update id="updateVip">
+        update cm_svip_coupon
+        set
+        <if test="useTime != null and useTime != ''">
+            useTime=#{useTime},
+        </if>
+        <if test="delFlag != null and delFlag != ''">
+            delflag=#{delFlag},
+        </if>
+        <if test="status != null and status != ''">
+            status=#{status},
+        </if>
+        <if test="bindCoupon != null and bindCoupon != ''">
+            bindCoupon=#{bindCoupon},
+        </if>
+        UPDATED_TIME=now()
+        where couponId=#{couponId}
+    </update>
+
     <!--    <sql id="cmCouponColumns">-->
     <!--        a.id AS "id",-->
     <!--		a.name AS "name",-->
@@ -110,6 +129,7 @@
     <!--        </otherwise>-->
     <!--    </choose>-->
 
+
     <select id="findAllVipCoupon" resultType="com.caimei.modules.coupon.entity.CmVipCoupon">
         SELECT
         cs.useTime,
@@ -163,4 +183,14 @@
         SELECT DISTINCT bindCoupon
         FROM cm_svip_coupon
     </select>
+
+    <select id="findByCoupon" resultType="com.caimei.modules.coupon.entity.CmVipCoupon">
+        select useTime, status, couponId, bindCoupon
+        from cm_svip_coupon
+        where delFlag = 0
+        and couponId=#{couponId}
+        <if test="status != null and status != ''">
+            and status=#{status}
+        </if>
+    </select>
 </mapper>

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

@@ -122,22 +122,22 @@
 
 
     <select id="superFind" resultType="com.caimei.modules.supervip.entity.CmSvipHistory">
-        SELECT DISTINCT cb.name as clubName, cb.linkMan1 as linkMan, cb.contractMobile1 as mobile, cs.userId,
+        SELECT cb.name as clubName, cb.linkMan1 as linkMan, cb.contractMobile1 as mobile, cs.userId,
         cs.packageId
         FROM cm_svip_history cs
         LEFT JOIN club cb ON cs.userId = cb.userId
         LEFT JOIN cm_svip_user cu ON cs.userId = cu.userId
         <where>
-            <if test="clubName!=null and clubName!=''">
+            <if test="clubName != null and clubName != ''">
                 and cb.name=#{clubName}
             </if>
-            <if test="linkMan!=null and linkMan!=''">
+            <if test="linkMan != null and linkMan != ''">
                 and cb.linkMan1=#{linkMan} or linkMan2=#{linkMan}
             </if>
-            <if test="mobile!=null and mobile!=''">
+            <if test="mobile != null and mobile != ''">
                 and cb.contractMobile1=#{mobile}
             </if>
-            <if test="startPayTime !=null and startPayTime!='' and endPayTime !=null and endPayTime!=''">
+            <if test="startPayTime !=null and startPayTime != '' and endPayTime !=null and endPayTime!=''">
                 and (payTime between #{startPayTime} and #{endPayTime})
             </if>
             <if test="startEndTime !=null and startEndTime!='' and endEndTime!=null and endEndTime!=''">
@@ -153,6 +153,7 @@
                 and now() > cu.endTime
             </if>
         </where>
+        group by cs.userId
     </select>
 
     <select id="findOutEndTime" resultType="com.caimei.modules.supervip.entity.CmSvipHistory">
@@ -162,5 +163,4 @@
           and beginTime > now()
     </select>
 
-
 </mapper>

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

@@ -34,10 +34,54 @@
     </select>
 
     <select id="findStatus" resultType="com.caimei.modules.coupon.entity.CmCoupon">
-        select startDate,endDate from cm_coupon where id=#{couponId}
+        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 id="findVipStatus" resultType="com.caimei.modules.coupon.entity.SvipCouponList">
+        select status, bindCoupon
+        from cm_svip_coupon
+        where couponId = #{couponId}
+    </select>
+
+    <select id="findCoupon" resultType="com.caimei.modules.coupon.entity.CmCoupon">
+        select id,
+               couponAmount,
+               touchPrice,
+               startDate,
+               endDate,
+               status,
+               couponType,
+               userId,
+               shopId,
+               productType,
+               pcBanner,
+               appletsBanner,
+               categoryType,
+               couponsMode,
+               createDate,
+               delFlag
+        from cm_coupon
+        where id = #{couponId}
     </select>
+
+    <update id="updateVip">
+        UPDATE cm_svip_coupon
+        SET
+        <if test="useTime !=null and useTime!=''">
+            useTime = #{useTime},
+        </if>
+        <if test="delFlag !=null and delFlag!=''">
+            delFlag = #{delFlag},
+        </if>
+        <if test="bindCoupon !=null and bindCoupon!=''">
+            bindCoupon = #{bindCoupon},
+        </if>
+        <if test="status !=null and status!=''">
+            status =#{status},
+        </if>
+        UPDATED_TIME = now()
+        WHERE couponId = #{couponId}
+    </update>
 </mapper>

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

@@ -39,14 +39,11 @@
                     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 == ""){
@@ -140,7 +137,7 @@
 </ul>
 <br/>
 
-<form:form id="inputForm" modelAttribute="svipcouponForm" action="${ctx}/vip/cmCoupon/save" method="post" class="form-horizontal">
+<form:form id="inputForm" modelAttribute="svipcouponForm" action="${ctx}/vip/cmCoupon/save?couponId1=${svipcouponForm.couponId1}" method="post" class="form-horizontal">
     <sys:message content="${message}"/>
     <div class="control-group">
         <label class="control-label"><font color="red">*</font>优惠月份：</label>
@@ -160,6 +157,7 @@
                 <form:radiobutton path="couponType1" class="couponType" label="店铺券" value="3" onclick="cType(1)"></form:radiobutton>
             </div>
         </div>
+        <form:hidden path="couponId1" id="couponId1"/>
         <div class="control-group coupon-line l0" style="display:none">
             <label class="control-label"><font color="red">*</font>供应商：</label>
             <div class="controls">
@@ -265,6 +263,7 @@
                 <form:radiobutton path="couponType2" class="couponType" label="店铺券" value="3" onclick="cType(2)"></form:radiobutton>
             </div>
         </div>
+        <form:hidden path="couponId2" id="couponId2"/>
         <div class="control-group coupon-line l0" style="display:none">
             <label class="control-label"><font color="red">*</font>供应商：</label>
             <div class="controls">
@@ -369,6 +368,7 @@
                 <form:radiobutton path="couponType3" class="couponType" label="店铺券" value="3" onclick="cType(3)"></form:radiobutton>
             </div>
         </div>
+        <form:hidden path="couponId3" id="couponId3"/>
         <div class="control-group coupon-line l0" style="display:none">
             <label class="control-label"><font color="red">*</font>供应商：</label>
             <div class="controls">
@@ -473,6 +473,7 @@
                 <form:radiobutton path="couponType4" class="couponType" label="店铺券" value="3" onclick="cType(4)"></form:radiobutton>
             </div>
         </div>
+        <form:hidden path="couponId4" id="couponId4"/>
         <div class="control-group coupon-line l0" style="display:none">
             <label class="control-label"><font color="red">*</font>供应商：</label>
             <div class="controls">

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

@@ -41,10 +41,11 @@
             <form:option value="3" label="已失效"/>
         </form:select>
         <label>优惠月份：</label>
-        <form:input path="useTime" type="text" maxlength="20" class="input-medium Wdate" value="${svipCouponList.useTime}"
-                            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'"
+        <input class="btn btn-primary" style="width: 80px" onclick="window.location='${ctx}/vip/cmCoupon/forms'"
                value="添加优惠券"/>
         <div class="clearfix"></div>
     </div>
@@ -61,87 +62,87 @@
     </thead>
     <tbody>
     <c:forEach items="${page.list}" var="cmCoupon">
+
         <tr>
+            
+            <td><label>${cmCoupon.svipCoupons.month}</label></td>
             <td>
-<%--                <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 test="${cmCoupon.svipCoupons.couponType1 eq 0}">活动券￥${cmCoupon.svipCoupons.couponAmount1}，满${cmCoupon.svipCoupons.touchPrice1}可用，
+                    <c:if test="${cmCoupon.svipCoupons.productType1 eq '1'}"> 全商城商品通用</c:if>
+                    <c:if test="${cmCoupon.svipCoupons.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 test="${cmCoupon.svipCoupons.couponType1 eq 1}">品类券￥${cmCoupon.svipCoupons.couponAmount1}，满${cmCoupon.svipCoupons.touchPrice1}可用，
+                    <c:if test="${cmCoupon.svipCoupons.categoryType1 eq '2'}">仅可购买仪器类商品</c:if>
+                    <c:if test="${cmCoupon.svipCoupons.categoryType1 eq '1'}">仅可购买产品类商品</c:if>
                 </c:if>
-                <c:if test="${svipcouponForm.couponType1 eq 3}">店铺券￥${svipcouponForm.couponAmount1}，满${svipcouponForm.touchPrice1}可用，仅可购买店铺
-                    ${svipcouponForm.shopId1}的商品
+                <c:if test="${cmCoupon.svipCoupons.couponType1 eq 3}">店铺券￥${cmCoupon.svipCoupons.couponAmount1}，满${cmCoupon.svipCoupons.touchPrice1}可用，仅可购买店铺
+                    ${cmCoupon.svipCoupons.shopId1}的商品
                 </c:if>
                 <br/>
                 优惠券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 test="${cmCoupon.svipCoupons.couponType2 eq 0}">活动券￥${cmCoupon.svipCoupons.couponAmount2}，满${cmCoupon.svipCoupons.touchPrice2}可用，
+                    <c:if test="${cmCoupon.svipCoupons.productType2 eq '1'}"> 全商城商品通用</c:if>
+                    <c:if test="${cmCoupon.svipCoupons.productType2 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 test="${cmCoupon.svipCoupons.couponType2 eq 1}">品类券￥${cmCoupon.svipCoupons.couponAmount2}，满${cmCoupon.svipCoupons.touchPrice2}可用，
+                    <c:if test="${cmCoupon.svipCoupons.categoryType2 eq '2'}">仅可购买仪器类商品</c:if>
+                    <c:if test="${cmCoupon.svipCoupons.categoryType2 eq '1'}">仅可购买产品类商品</c:if>
                 </c:if>
-                <c:if test="${svipcouponForm.couponType2 eq 3}">店铺券￥${svipcouponForm.couponAmount2}，满${svipcouponForm.touchPrice2}可用，仅可购买店铺
-                    ${svipcouponForm.shopId2}的商品
+                <c:if test="${cmCoupon.svipCoupons.couponType2 eq 3}">店铺券￥${cmCoupon.svipCoupons.couponAmount2}，满${cmCoupon.svipCoupons.touchPrice2}可用，仅可购买店铺
+                    ${cmCoupon.svipCoupons.shopId2}的商品
                 </c:if>
                 <br/>
                 优惠券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 test="${cmCoupon.svipCoupons.couponType3 eq 0}">活动券￥${cmCoupon.svipCoupons.couponAmount3}，满${cmCoupon.svipCoupons.touchPrice3}可用，
+                    <c:if test="${cmCoupon.svipCoupons.productType3 eq '1'}"> 全商城商品通用</c:if>
+                    <c:if test="${cmCoupon.svipCoupons.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 test="${cmCoupon.svipCoupons.couponType3 eq 1}">品类券￥${cmCoupon.svipCoupons.couponAmount3}，满${cmCoupon.svipCoupons.touchPrice3}可用，
+                    <c:if test="${cmCoupon.svipCoupons.categoryType3 eq '2'}">仅可购买仪器类商品</c:if>
+                    <c:if test="${cmCoupon.svipCoupons.categoryType3 eq '1'}">仅可购买产品类商品</c:if>
                 </c:if>
-                <c:if test="${svipcouponForm.couponType3 eq 3}">店铺券￥${svipcouponForm.couponAmount3}，满${svipcouponForm.touchPrice3}可用，仅可购买店铺
-                    ${svipcouponForm.shopId3}的商品
+                <c:if test="${cmCoupon.svipCoupons.couponType3 eq 3}">店铺券￥${cmCoupon.svipCoupons.couponAmount3}，满${cmCoupon.svipCoupons.touchPrice3}可用，仅可购买店铺
+                    ${cmCoupon.svipCoupons.shopId3}的商品
                 </c:if>
                 <br/>
                 优惠券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 test="${cmCoupon.svipCoupons.couponType4 eq 0}">活动券￥${cmCoupon.svipCoupons.couponAmount4}，满${cmCoupon.svipCoupons.touchPrice4}可用，
+                    <c:if test="${cmCoupon.svipCoupons.productType4 eq '1'}"> 全商城商品通用</c:if>
+                    <c:if test="${cmCoupon.svipCoupons.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 test="${cmCoupon.svipCoupons.couponType4 eq 1}">品类券￥${cmCoupon.svipCoupons.couponAmount4}，满${cmCoupon.svipCoupons.touchPrice4}可用，
+                    <c:if test="${cmCoupon.svipCoupons.categoryType4 eq '2'}">仅可购买仪器类商品</c:if>
+                    <c:if test="${cmCoupon.svipCoupons.categoryType4 eq '1'}">仅可购买产品类商品</c:if>
                 </c:if>
-                <c:if test="${svipcouponForm.couponType4 eq 3}">店铺券￥${svipcouponForm.couponAmount4}，满${svipcouponForm.touchPrice4}可用，仅可购买店铺
-                    ${svipcouponForm.shopId4}的商品
+                <c:if test="${cmCoupon.svipCoupons.couponType4 eq 3}">店铺券￥${cmCoupon.svipCoupons.couponAmount4}，满${cmCoupon.svipCoupons.touchPrice4}可用，仅可购买店铺
+                    ${cmCoupon.svipCoupons.shopId4}的商品
                 </c:if>
             </td>
+
             <td>
-                <c:if test="${svipcouponForm.status eq '0'}">
+                <c:if test="${cmCoupon.svipCoupons.status eq '0'}">
                     <font color="#800080">未生效</font>
                 </c:if>
-                <c:if test="${svipcouponForm.status eq '1'}">
+                <c:if test="${cmCoupon.svipCoupons.status eq '1'}">
                     <font color="#00CC66">已生效</font>
                 </c:if>
-                <c:if test="${svipcouponForm.status eq '2'}">
+                <c:if test="${cmCoupon.svipCoupons.status eq '2'}">
                     <font color="red">已关闭</font>
                 </c:if>
-                <c:if test="${svipcouponForm.status eq '3'}">
+                <c:if test="${cmCoupon.svipCoupons.status eq '3'}">
                     <font color="#FF6600">已失效</font>
                 </c:if>
             </td>
+
             <td>
-                <a href="${ctx}/vip/cmCoupon/form?id=${svipcouponForm.couponId1}">编辑</a>
-                <a href="${ctx}/vip/cmCoupon/close?id=${svipcouponForm.couponId1}"
+                <a href="${ctx}/vip/cmCoupon/form?couponId1=${cmCoupon.svipCoupons.couponId1}">编辑</a>
+                <a href="${ctx}/vip/cmCoupon/close?couponId1=${cmCoupon.svipCoupons.couponId1}"
                    onclick="return confirmx('确定关闭该该月份的优惠券吗？关闭后该月份将不赠送优惠券？', this.href)">关闭</a>
-                <a href="${ctx}/vip/cmCoupon/delete?id=${svipcouponForm.couponId1}"
+                <a href="${ctx}/vip/cmCoupon/delete?couponId1=${cmCoupon.svipCoupons.couponId1}"
                    onclick="return confirmx('确定删除该月份的优惠券吗？删除后该月份将不赠送优惠券', this.href)">删除</a>
             </td>
-            </c:forEach>
         </tr>
     </c:forEach>
     </tbody>