后台添加优惠券

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

@@ -0,0 +1,19 @@
+package com.caimei.modules.coupon.dao;
+
+import com.caimei.modules.coupon.entity.CmVipCoupon;
+import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
+
+/**
+ * @author 超级会员优惠券
+ */
+@MyBatisDao
+public interface CmCouponVipDao{
+
+    /**
+     * 查找所有的超级会员优惠券
+     * @return
+     */
+    CmVipCoupon findAllVipCouponDao();
+
+
+}

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

@@ -0,0 +1,20 @@
+package com.caimei.modules.coupon.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.joda.time.DateTime;
+
+import java.io.Serializable;
+
+/**
+ * vip优惠券
+ */
+public class CmVipCoupon extends CmCoupon implements Serializable {
+
+    //生效月份
+    private Integer useTime;
+    //优惠券id
+    private Integer couponId;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private DateTime updateTime;
+}

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

@@ -86,6 +86,34 @@ public class CmCouponService extends CrudService<CmCouponDao, CmCoupon> {
         return couponPage;
     }
 
+
+    public Page<CmCoupon> findVipPage(Page<CmCoupon> page, CmCoupon cmCoupon) {
+        Page<CmCoupon> couponPage = super.findPage(page, cmCoupon);
+        List<CmCoupon> couponList = couponPage.getList();
+        Date date = new Date();
+        couponList.forEach(coupon -> {
+            setCouponStatus(coupon, date);
+            if ("1".equals(coupon.getCouponsMode())) {
+                //兑换码券
+                Integer num = cmCouponDao.findQuantityRedeemed(coupon.getId());
+                coupon.setCodeNum(num);
+            } else {
+                if (2 == coupon.getCouponType()) {
+                    //用户专享劵
+                    CmCouponClub couponClub = cmCouponDao.findCouponClub(coupon.getId());
+                    if (couponClub == null) {
+                        coupon.setClaimStatus("1");
+                    } else {
+                        coupon.setClaimStatus("2");
+                    }
+                    coupon.setCouponClub(couponClub);
+                }
+            }
+        });
+        return couponPage;
+    }
+
+
     private void setCouponStatus(CmCoupon cmCoupon, Date date) {
         if (cmCoupon != null) {
             if (!cmCoupon.getStatus().contains("2")) {

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

@@ -0,0 +1,22 @@
+package com.caimei.modules.coupon.service;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+
+/**
+ * @author zzj
+ */
+@Service
+@Transactional(readOnly = false)
+public class CmVipCouponService{
+
+
+    public void addCoupon(){
+
+    }
+
+
+
+
+}

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

@@ -61,6 +61,8 @@ public class CmCouponController extends BaseController {
         return entity;
     }
 
+
+
     @RequiresPermissions("coupon:cmCoupon:view")
     @RequestMapping(value = {"list", ""})
     public String list(CmCoupon cmCoupon, HttpServletRequest request, HttpServletResponse response, Model model) {

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

@@ -0,0 +1,74 @@
+package com.caimei.modules.coupon.web;
+
+import com.caimei.modules.coupon.entity.CmCoupon;
+import com.caimei.modules.coupon.entity.CmCouponAssociate;
+import com.caimei.modules.coupon.service.CmCouponService;
+import com.caimei.modules.product.service.ProductService;
+import com.caimei.modules.user.dao.CmUserDao;
+import com.caimei.modules.user.dao.NewCmClubDao;
+import com.caimei.modules.user.entity.CmUser;
+import com.caimei.modules.user.entity.NewCmClub;
+import com.thinkgem.jeesite.common.persistence.Page;
+import com.thinkgem.jeesite.common.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author zzj
+ * 超级会员优惠券
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/vip/cmCoupon")
+public class CmVipCouponController {
+
+
+    @Autowired
+    private CmCouponService cmCouponService;
+    @Autowired
+    private CmUserDao cmUserDao;
+    @Autowired
+    private NewCmClubDao newCmClubDao;
+    @Autowired
+    private ProductService productService;
+
+    @ModelAttribute
+    public CmCoupon get(@RequestParam(required = false) String id) {
+        CmCoupon entity = null;
+        if (StringUtils.isNotBlank(id)) {
+            entity = cmCouponService.get(id);
+        }
+        if (entity == null) {
+            entity = new CmCoupon();
+        }
+        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);
+        model.addAttribute("page", page);
+        return "modules/svip/cmSvipCouponForm";
+    }
+
+    @RequestMapping(value = "form")
+    public String form(CmCoupon cmCoupon, Model model) {
+        model.addAttribute("cmCoupon", cmCoupon);
+        return "modules/svip/cmSvipCouponForm";
+    }
+
+    @RequestMapping(value = "add")
+    public String add(CmCoupon cmCoupon, Model model){
+
+        return  "modules/svip/cmSvipCouponList";
+    }
+}

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -1007,10 +1007,11 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
         List<Integer> l = new ArrayList<>();
         l.add(newOrder.getOrderID());
         List<Integer> orderIds = cmDiscernReceiptDao.findRebateOrderID(l);
-        if (orderIds.contains(newOrder.getOrderID()) || "1".equals(newOrder.getRebateFlag()))
+        if (orderIds.contains(newOrder.getOrderID()) || "1".equals(newOrder.getRebateFlag())) {
             newOrder.setRebateOrder("1");
-        else
+        } else {
             newOrder.setRebateOrder("0");
+        }
         if (null != newOrder) {
             if (newOrder.getCouponAmount() > 0) {
                 CmCouponOrderRecord couponRecord = newOrderDao.findOrderCouponRecord(newOrder.getOrderID());

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

@@ -0,0 +1,108 @@
+<?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.CmCouponVipDao">
+
+    <sql id="cmCouponColumns">
+        a.id AS "id",
+		a.name AS "name",
+		a.couponAmount AS "couponAmount",
+		a.touchPrice AS "touchPrice",
+		a.startDate AS "startDate",
+		a.endDate AS "endDate",
+		a.status AS "status",
+		a.couponType AS "couponType",
+		a.userId AS "userId",
+		a.shopId AS "shopId",
+		a.productType AS "productType",
+		a.pcBanner AS "pcBanner",
+		a.appletsBanner AS "appletsBanner",
+		a.categoryType AS "categoryType",
+		a.couponsMode AS "couponsMode",
+		a.createDate AS "createDate",
+		a.delFlag AS "delFlag"
+    </sql>
+
+    <sql id="cmCouponJoins">
+    </sql>
+
+    <select id="findAllVipCouponDao" resultType="com.caimei.modules.coupon.entity.CmVipCoupon">
+        SELECT
+        <include refid="cmCouponColumns"/>,
+        u.name AS "clubName",
+        s.name AS "shopName"
+        FROM cm_coupon a
+        LEFT JOIN cm_coupon_club ccc ON ccc.couponId = a.id
+        LEFT JOIN USER u ON u.userID = a.userId
+        LEFT JOIN shop s ON s.shopID = a.shopId
+        <include refid="cmCouponJoins"/>
+        <where>
+            AND a.delFlag = 0
+            <if test="couponType != null">
+                AND a.couponType = #{couponType}
+            </if>
+            <if test="name != null and name != ''">
+                AND a.name LIKE
+                <if test="dbName == 'oracle'">'%'||#{name}||'%'</if>
+                <if test="dbName == 'mssql'">'%'+#{name}+'%'</if>
+                <if test="dbName == 'mysql'">concat('%',#{name},'%')</if>
+            </if>
+            <if test="startDate != null and startDate != ''">
+                AND a.startDate <![CDATA[ >= ]]> #{startDate}
+            </if>
+            <if test="endDate != null and endDate != ''">
+                AND a.endDate <![CDATA[ <= ]]> #{endDate}
+            </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="clubName != null and clubName != ''">
+                AND u.name LIKE concat('%',#{clubName},'%')
+            </if>
+            <if test='claimStatus == "1"'>
+                AND ccc.id IS NULL
+            </if>
+            <if test='claimStatus == "2"'>
+                AND ccc.id IS NOT NULL
+            </if>
+            <if test='useStatus == "1"'>
+                AND (ccc.status IS NULL OR ccc.status = #{useStatus})
+            </if>
+            <if test='useStatus == "2"'>
+                AND ccc.status = #{useStatus}
+            </if>
+            <if test="source != null and source != ''">
+                AND ccc.source = #{source}
+            </if>
+            <if test="shopName != null and shopName != ''">
+                AND s.name LIKE concat('%',#{shopName},'%')
+            </if>
+            <if test="couponsMode != null and couponsMode != ''">
+                AND a.couponsMode = #{couponsMode}
+            </if>
+        </where>
+        GROUP BY a.id
+        <choose>
+            <when test="page !=null and page.orderBy != null and page.orderBy != ''">
+                ORDER BY ${page.orderBy}
+            </when>
+            <otherwise>
+                ORDER BY createDate DESC
+            </otherwise>
+        </choose>
+    </select>
+
+
+
+
+</mapper>

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

@@ -0,0 +1,124 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
+<html>
+<head>
+    <title>超级会员优惠券管理列表</title>
+    <meta name="decorator" content="default"/>
+    <style type="text/css">
+        .table th {
+            text-align: center;
+        }
+
+        .table td {
+            text-align: center;
+        }
+    </style>
+    <script type="text/javascript">
+        $(document).ready(function () {
+
+        });
+
+        function page(n, s) {
+            $("#pageNo").val(n);
+            $("#pageSize").val(s);
+            $("#searchForm").submit();
+            return false;
+        }
+    </script>
+</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"
+           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="status" class="input-medium required">
+            <form:option value="" 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});"/>
+        <input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
+        <input class="btn btn-primary" style="width: 80px" onclick="window.location='${ctx}/vip/cmCoupon/add'"
+               value="添加优惠券"/>
+        <div class="clearfix"></div>
+    </div>
+</form:form>
+<sys:message content="${message}"/>
+<table id="contentTable" class="table table-striped table-bordered table-condensed">
+    <thead>
+    <tr>
+        <th>优惠月份</th>
+        <th>优惠券</th>
+        <th>优惠状态</th>
+        <th>操作</th>
+    </tr>
+    </thead>
+    <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}可用，
+                全商城商品通用
+                </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>
+                </c:if>
+                <br/>
+                <c:if test="${cmCoupon.couponType eq 3}">优惠券3：店铺券￥${cmCoupon.couponAmount}，满${cmCoupon.touchPrice}可用，仅可购买店铺
+                    ${cmCoupon.shopId}的商品
+                </c:if>
+                <br/>
+                <c:if test="${cmCoupon.couponType eq 0 && cmCoupon.productType eq '2'}">优惠券4：活动券￥${cmCoupon.couponAmount}，满${cmCoupon.touchPrice}可用，
+                仅可购买指定商品
+                </c:if>
+            </td>
+            <td>
+                <c:if test="${cmCoupon.status eq 0}">
+                    <font color="#800080">未生效</font>
+                </c:if>
+                <c:if test="${cmCoupon.status eq 1}">
+                    <font color="#00CC66">已生效</font>
+                </c:if>
+                <c:if test="${cmCoupon.status eq 2}">
+                    <font color="red">已关闭</font>
+                </c:if>
+                <c:if test="${cmCoupon.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}"
+                   onclick="return confirmx('确定关闭该该月份的优惠券吗？关闭后该月份将不赠送优惠券？', this.href)">关闭</a>
+                <a href="${ctx}/vip/cmCoupon/delete?id=${cmCoupon.id}"
+                   onclick="return confirmx('确定删除该月份的优惠券吗？删除后该月份将不赠送优惠券', this.href)">删除</a>
+            </td>
+        </tr>
+    </c:forEach>
+    </tbody>
+</table>
+<div class="pagination">${page}</div>
+</body>
+</html>

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

@@ -0,0 +1,199 @@
+<%@ page import="java.util.Date" %>
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
+<html>
+<head>
+    <title>优惠券管理</title>
+    <meta name="decorator" content="default"/>
+
+</head>
+<body>
+<ul class="nav nav-tabs">
+    <li><a href="${ctx}/vip/cmCoupon/">专属优惠券</a></li>
+    <li class="active"><a
+            href="${ctx}/vip/cmCoupon/add">${not empty cmCoupon.id?'编辑':'添加'}</a>
+    </li>
+</ul>
+<br/>
+<%--<font style="color: red;margin-left: 20px">品类券只适合在某种品类需要优惠时创建，适用于该品类商品和全部客户。</font><br><br>--%>
+<form:form id="inputForm" modelAttribute="cmCoupon" action="${ctx}/vip/cmCoupon/add" method="post"
+           class="form-horizontal">
+    <%--    <form:hidden path="id"/>--%>
+    <%--    <form:hidden path="productInfo" id="productInfo"/>--%>
+    <%--    <input type="hidden" name="couponType" value="1"/>--%>
+    <sys:message content="${message}"/>
+    <div class="control-group">
+        <label class="control-label"><font color="red">*</font>优惠月份：</label>
+        <div class="controls">
+            <input name="startDate" id="startDate" type="text" required readonly="readonly" maxlength="20"
+                   class="input-medium Wdate "
+                   value="<fmt:formatDate value="${cmCoupon.startDate}" pattern="yyyy-MM"/>"
+                   onclick="WdatePicker({dateFmt:'yyyy-MM',isShowClear:false});" onblur="dateShow()"/>
+        </div>
+    </div>
+    <div class="coupon-wrap">
+        <div class="control-group">
+            <label>优惠券1：</label>
+            <form:select path="couponType" class="input-medium coupon-select" onchange="changeCoupon($this)">
+                <form:option value="" label="全部"/>
+                <form:option value="0" label="活动券"/>
+                <form:option value="1" label="品类券"/>
+                <form:option value="3" label="店铺券"/>
+            </form:select>
+        </div>
+
+        <div class="control-group coupon-line" style="display:none">
+            <label class="control-label"><font color="red">*</font>优惠券金额：</label>
+            <div class="controls">
+                <input type="number" id="couponAmount" name="couponAmount" value="${cmCoupon.couponAmount}" min="0"
+                       required>
+            </div>
+        </div>
+
+        <div class="control-group coupon-line" style="display:none">
+            <label class="control-label"><font color="red">*</font>优惠条件：</label>
+            <div class="controls">
+                订单商品总额满&nbsp;&nbsp;&nbsp;&nbsp;<input type="number" name="touchPrice" id="touchPrice"
+                                                      value="${cmCoupon.touchPrice}" min="0" required>
+            </div>
+        </div>
+        <div class="control-group coupon-line" style="display:none">
+            <label class="control-label"><font color="red">*</font>优惠商品：</label>
+            <div class="controls">
+                <form:radiobutton path="categoryType" value="1" label="产品"
+                                  checked="${empty cmCoupon.categoryType ? true:false}"/>
+                <form:radiobutton path="categoryType" value="2" label="仪器"/>
+            </div>
+        </div>
+    </div>
+
+
+    <div class="control-group">
+        <label>优惠券2：</label>
+        <form:select path="couponType" class="input-medium" onchange="changeVal()">
+            <form:option value="" label="全部"/>
+            <form:option value="0" label="活动券"/>
+            <form:option value="1" label="品类券"/>
+            <form:option value="3" label="店铺券"/>
+        </form:select>
+    </div>
+
+    <div class="control-group">
+        <label>优惠券3：</label>
+        <form:select path="couponType" class="input-medium" onchange="changeVal()">
+            <form:option value="" label="全部"/>
+            <form:option value="0" label="活动券"/>
+            <form:option value="1" label="品类券"/>
+            <form:option value="3" label="店铺券"/>
+        </form:select>
+    </div>
+
+    <div class="control-group">
+        <label>优惠券4：</label>
+        <form:select path="couponType" class="input-medium" onchange="changeVal()">
+            <form:option value="" label="全部"/>
+            <form:option value="0" label="活动券"/>
+            <form:option value="1" label="品类券"/>
+            <form:option value="3" label="店铺券"/>
+        </form:select>
+    </div>
+
+
+    <div class="control-group">
+
+    </div>
+
+
+    <div class="form-actions">
+        <input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;
+        <input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
+    </div>
+</form:form>
+<script>
+    function statusShow() {
+        var status = $("input[name='status']:checked").val();
+        if (status == 2) {
+            $("#initializeShow").hide();
+            $("#closeShow").show();
+        } else {
+            $("#initializeShow").show();
+            $("#closeShow").hide();
+            $("#hiddenStatus").val(0);
+        }
+    }
+
+    function dateShow() {
+        var startDate = $("#startDate").val();
+        var startMs = new Date(startDate).getTime();
+        var endDate = $("#endDate").val();
+        var endMs = new Date(endDate).getTime();
+        var nowMs = new Date().getTime();
+        if (nowMs < startMs) {
+            $("#initializeShow").html("<font color=\"#800080\">未生效</font>");
+        } else if (nowMs > endMs) {
+            $("#initializeShow").html("<font color=\"#FF6600\">已失效</font>");
+        } else {
+            $("#initializeShow").html("<font color=\"#00CC66\">已生效</font>");
+        }
+    }
+
+    /**
+     * @param obj
+     * jquery控制input只能输入数字
+     */
+    function onlynum(obj) {
+        obj.value = obj.value.replace(/[^\d]/g, ""); //清除"数字"以外的字符
+    }
+
+    $(document).ready(function () {
+        //$("#name").focus();
+        $("#inputForm").validate({
+            submitHandler: function (form) {
+                var couponAmount = $("#couponAmount").val() * 1;
+                var touchPrice = $("#touchPrice").val() * 1;
+                if (couponAmount >= touchPrice) {
+                    alertx("优惠券金额必须小于优惠条件金额");
+                    return false;
+                }
+                var startDate = $("#startDate").val();
+                var endDate = $("#endDate").val();
+                if (startDate >= endDate) {
+                    alertx("结束时间不能早于开始时间");
+                    return false;
+                }
+                loading('正在提交，请稍等...');
+                form.submit();
+            },
+            errorContainer: "#messageBox",
+            errorPlacement: function (error, element) {
+                $("#messageBox").text("输入有误，请先更正。");
+                if (element.is(":checkbox") || element.is(":radio") || element.parent().is(".input-append")) {
+                    error.appendTo(element.parent().parent());
+                } else {
+                    error.insertAfter(element);
+                }
+            }
+        });
+    });
+    /*        function changeCoupon(el) {
+        var value = $(this).val()*1;
+        alert(el)
+        if (1 === value) {
+        $(this).parents(".coupon-wrap").find(".coupon-line").show();
+    }
+    }*/
+    // $("body").on("change", "select.coupon-select", function(){
+    //     var value = $(this).val()*1;
+    //         alert(value)
+    //     if (1 === value) {
+    //         $(this).parents(".coupon-wrap").find(".coupon-line").show();
+    //     }
+    // });
+    function changeCoupon(){
+        alert(this.val());
+        (".coupon-line").show();
+    }
+
+</script>
+</body>
+</html>

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

@@ -119,7 +119,6 @@
                 <c:if test="${cmSvipHistory.payWay eq '4'}">采美豆抵扣</c:if>
             </td>
             <td>
-
                 <c:if test="${cmSvipHistory.status eq '1'}"><font color="green">已生效</font> </c:if>
                 <c:if test="${cmSvipHistory.status eq '2'}"><font color="red">已过期</font> </c:if>
                 <c:if test="${cmSvipHistory.status eq '3'}"><font color="red">暂未生效</font> </c:if>