bugfix

src/main/webapp/WEB-INF/views/modules/coupon/cmCouponClubList.jsp

@@ -42,6 +42,7 @@
 	<form:form id="searchForm" modelAttribute="cmCouponClub" action="${ctx}/coupon/cmCouponClub/" method="post" class="breadcrumb form-search">
 		<input type="hidden" name="couponId" value="${cmCouponClub.couponId}">
 		<input type="hidden" name="couponType" value="${cmCouponClub.couponType}">
+		<input type="hidden" name="moneyCouponFlag" value="${cmCouponClub.moneyCouponFlag}">
 		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 		<div class="ul-form">
@@ -60,7 +61,14 @@
 					<form:option value="1" label="未使用"/>
 					<form:option value="2" label="已使用"/>
 				</form:select>
-			 <label>领取时间：</label>
+			 <label>
+				 <c:if test="${cmCouponClub.moneyCouponFlag ne 1}">
+					 领取时间：
+				 </c:if>
+				 <c:if test="${cmCouponClub.moneyCouponFlag eq 1}">
+					 购买时间：
+				 </c:if>
+			 </label>
 				<input name="createDate" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate"
 					value="<fmt:formatDate value="${cmCouponClub.createDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"
 					onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/>
@@ -79,7 +87,14 @@
 				<th>机构名称</th>
 				<th>领取渠道</th>
 				<th>使用状态</th>
-				<th>领取时间</th>
+				<th>
+					<c:if test="${cmCouponClub.moneyCouponFlag ne 1}">
+					领取时间：
+					</c:if>
+					<c:if test="${cmCouponClub.moneyCouponFlag eq 1}">
+						购买时间：
+					</c:if>
+				</th>
 				<th>使用时间</th>
 			</tr>
 		</thead>
@@ -87,6 +102,7 @@
 		<c:forEach items="${page.list}" var="cmCouponClub">
 			<tr>
 				<td>
+
 					${cmCouponClub.clubName}
 				</td>
 				<td>
@@ -97,7 +113,7 @@
 						<font color="red">未使用</font>
 					</c:if>
 					<c:if test="${cmCouponClub.status eq '2'}">
-						<font color="#00CC66">已使用</font>
+						<font color="#00CC66"><a href="${ctx}/order/detail?id=${cmCouponClub.orderId}">已使用</a></font>
 					</c:if>
 				</td>
 				<td>

src/main/webapp/WEB-INF/views/modules/coupon/cmMoneyCouponList.jsp

@@ -128,7 +128,7 @@
 <%--						<a href="${ctx}/coupon/cmCoupon/close?id=${cmCoupon.id}" onclick="return confirmx('确定关闭该活动吗？', this.href)">关闭</a>--%>
 <%--					</c:if>--%>
 					<a href="${ctx}/coupon/cmCoupon/delete?id=${cmCoupon.id}&moneyCouponFlag=1" onclick="return confirmx('确定删除该优惠券吗？', this.href)">删除</a>
-					<a href="${ctx}/coupon/cmCouponClub/list?couponId=${cmCoupon.id}&couponType=0&moneyCouponFlag=1">领取用户</a>
+					<a href="${ctx}/coupon/cmCouponClub/list?couponId=${cmCoupon.id}&couponType=0&moneyCouponFlag=1">购买用户</a>
 				</td>
 			</tr>
 		</c:forEach>