采美豆购买优惠券

src/main/resources/mappings/modules/coupon/CmCouponMapper.xml

@@ -59,6 +59,9 @@
 		    <if test="moneyCouponFlag != null and moneyCouponFlag > 0">
 				AND a.moneyCouponFlag = #{moneyCouponFlag}
 			</if>
+		    <if test="couponPayWay != null">
+				AND a.couponPayWay = #{couponPayWay}
+			</if>
 			<if test="name != null and name != ''">
 				AND a.name LIKE
 					<if test="dbName == 'oracle'">'%'||#{name}||'%'</if>

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

@@ -40,13 +40,13 @@
 				<form:option value="3" label="已下架"/>
 				<form:option value="2" 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-dd HH:mm:ss"/>"--%>
-<%--					onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/> ---%>
-<%--				<input name="endDate" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate"--%>
-<%--					value="<fmt:formatDate value="${cmCoupon.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"--%>
-<%--					onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>--%>
+			<label>购买方式：</label>
+			<form:select path="couponPayWay" class="input-medium required">
+				<form:option value="" label="全部"/>
+				<form:option value="1" label="直接购买"/>
+				<form:option value="2" label="采美豆抵扣"/>
+			</form:select>
+
 			&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
 			<input class="btn btn-primary" style="width: 120px" onclick="window.location='${ctx}/coupon/cmCoupon/moneyCouponForm'" value="添加价值优惠券"/>
 			<div class="clearfix"></div>
@@ -86,7 +86,8 @@
 					满${cmCoupon.touchPrice}
 				</td>
 				<td>
-					${cmCoupon.moneyCouponPrice}
+					<c:if test="${cmCoupon.couponPayWay == 1}">￥${cmCoupon.moneyCouponPrice}</c:if>
+					<c:if test="${cmCoupon.couponPayWay == 2}">${cmCoupon.moneyCouponPrice}采美豆</c:if>
 				</td>
 				<td>
 					<fmt:formatDate value="${cmCoupon.startDate}" pattern="yyyy-MM-dd HH:mm:ss"/>

src/main/webapp/WEB-INF/views/modules/user/cmUserbeanshistoryList.jsp

@@ -53,6 +53,10 @@
 				<form:option value="12" label="登录奖励"/>
 				<form:option value="13" label="查看商品资料"/>
 				<form:option value="14" label="购买超级会员"/>
+				<form:option value="15" label="系统扣除"/>
+				<form:option value="16" label="系统退回"/>
+				<form:option value="17" label="购买优惠券"/>
+				<form:option value="18" label="购买优惠券退款"/>
 			</form:select>
 			&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
 			<div class="clearfix"></div>
@@ -120,6 +124,18 @@
 					<c:if test="${userBeansHistory.beansType eq 14}">
 						购买超级会员
 					</c:if>
+					<c:if test="${userBeansHistory.beansType eq 15}">
+						系统扣除
+					</c:if>
+					<c:if test="${userBeansHistory.beansType eq 16}">
+						系统退回
+					</c:if>
+					<c:if test="${userBeansHistory.beansType eq 17}">
+						购买优惠券
+					</c:if>
+					<c:if test="${userBeansHistory.beansType eq 18}">
+						购买优惠券退款
+					</c:if>
 				</td>
 			</tr>
 		</c:forEach>