Home Explore Help
Sign In
caimei365
/
caimei365-manager
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

bugfix

zhijiezhao 3 years ago
parent
422a75b32d
commit
e39febc57b
3 changed files with 20 additions and 8 deletions
Split View Show Diff Stats
  1. 9 0
      src/main/java/com/caimei/modules/coupon/entity/CmCouponClub.java
  2. 9 6
      src/main/webapp/WEB-INF/views/modules/coupon/cmCouponClubList.jsp
  3. 2 2
      src/main/webapp/WEB-INF/views/modules/coupon/cmMoneyCouponList.jsp

+ 9 - 0
src/main/java/com/caimei/modules/coupon/entity/CmCouponClub.java
View File 

@@ -29,6 +29,7 @@ public class CmCouponClub extends DataEntity<CmCouponClub> {
 
     private BigDecimal couponAmount;        // 优惠券金额(面值)
 
     private BigDecimal touchPrice;        // 优惠满减条件金额
 
     private String couponStatus;    // 状态 0未生效 1已生效 2已关闭 3已失效
 
+    private Integer moneyCouponFlag; //普通/价值优惠券标记1是2不是
 
     private Date startDate;        // 使用开始时间（有效期）
 
     private Date endDate;        // 使用结束时间（有效期）
 
     private String orderNo;     //订单编号
 
@@ -49,6 +50,14 @@ public class CmCouponClub extends DataEntity<CmCouponClub> {
 
         this.userId = userId;
 
     }
 
 
+    public Integer getMoneyCouponFlag() {
 
+        return moneyCouponFlag;
 
+    }
 
+
 
+    public void setMoneyCouponFlag(Integer moneyCouponFlag) {
 
+        this.moneyCouponFlag = moneyCouponFlag;
 
+    }
 
+
 
     public Integer getCouponId() {
 
         return couponId;
 
     }

+ 9 - 6
src/main/webapp/WEB-INF/views/modules/coupon/cmCouponClubList.jsp
View File 

@@ -22,19 +22,22 @@
 
 </head>
 
 <body>
 
 	<ul class="nav nav-tabs">
 
-		<c:if test="${cmCouponClub.couponType eq 0}">
 
+		<c:if test="${cmCouponClub.couponType eq 0 && cmCouponClub.moneyCouponFlag ne 1}">
 
 			<li><a href="${ctx}/coupon/cmCoupon/list?couponType=0&&moneyCouponFlag=2">活动券</a></li>
 
 		</c:if>
 
-		<c:if test="${cmCouponClub.couponType eq 1}">
 
+		<c:if test="${cmCouponClub.couponType eq 1 && cmCouponClub.moneyCouponFlag ne 1}">
 
 			<li><a href="${ctx}/coupon/cmCoupon/list?couponType=1&&moneyCouponFlag=2">品类券</a></li>
 
 		</c:if>
 
-		<c:if test="${cmCouponClub.couponType eq 3}">
 
+		<c:if test="${cmCouponClub.couponType eq 3 && cmCouponClub.moneyCouponFlag ne 1}">
 
 			<li><a href="${ctx}/coupon/cmCoupon/list?couponType=3&&moneyCouponFlag=2">店铺券</a></li>
 
 		</c:if>
 
-		<c:if test="${cmCouponClub.couponType eq 4}">
 
+		<c:if test="${cmCouponClub.couponType eq 4 && cmCouponClub.moneyCouponFlag ne 1}">
 
 			<li><a href="${ctx}/coupon/cmCoupon/list?couponType=4&&moneyCouponFlag=2">新用户券</a></li>
 
 		</c:if>
 
-		<li class="active"><a href="${ctx}/coupon/cmCouponClub/list?couponId=${cmCouponClub.couponId}&couponType=${cmCouponClub.couponType}">领取用户列表</a></li>
 
+		<c:if test="${cmCouponClub.moneyCouponFlag eq 1}">
 
+			<li><a href="${ctx}/coupon/cmCoupon/list?moneyCouponFlag=1&&couponType=5">价值优惠券列表</a></li>
 
+		</c:if>
 
+		<li class="active"><a href="${ctx}/coupon/cmCouponClub/list?couponId=${cmCouponClub.couponId}&couponType=${cmCouponClub.couponType}&moneyCouponFlag=${cmCouponClub.moneyCouponFlag}">领取用户列表</a></li>
 
 	</ul>
 
 	<form:form id="searchForm" modelAttribute="cmCouponClub" action="${ctx}/coupon/cmCouponClub/" method="post" class="breadcrumb form-search">
 
 		<input type="hidden" name="couponId" value="${cmCouponClub.couponId}">
 
@@ -44,7 +47,7 @@
 
 		<div class="ul-form">
 
 			 <label>机构名称：</label>
 
 				<form:input path="clubName" htmlEscape="false" class="input-medium"/>
 
-			 <label>领取渠道：  ：</label>
 
+			 <label>领取渠道：</label>
 
 				<form:select path="source" class="input-medium">
 
 					<form:option value="" label="全部"/>
 
 					<form:option value="1" label="小程序"/>

+ 2 - 2
src/main/webapp/WEB-INF/views/modules/coupon/cmMoneyCouponList.jsp
View File 

@@ -63,7 +63,7 @@
 
 				<th>购买价格</th>
 
 				<th>上架时间</th>
 
 				<th>下架时间</th>
 
-				<th>领取期限</th>
 
+				<th>购买期限</th>
 
 				<th>使用期限</th>
 
 				<th>状态</th>
 
 				<th>创建时间</th>
 
@@ -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">领取用户</a>
 
+					<a href="${ctx}/coupon/cmCouponClub/list?couponId=${cmCoupon.id}&couponType=0&moneyCouponFlag=1">领取用户</a>
 
 				</td>
 
 			</tr>
 
 		</c:forEach>