线上/下余额

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

@@ -117,23 +117,29 @@
 				<td>
 					<fmt:formatNumber value="${empty cmUser.ableUserMoney ? 0:cmUser.ableUserMoney}" type="currency"/>
 				</td>
-					<td>
-						<a href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${cmUser.userID}" >查看详情</a>
-						<shiro:hasPermission name="balance:cmUserBalanceRecord:recharge">
-							<a href="javascript:void(0);" onclick="recharge('${cmUser.userID}')">充值</a>
-							<%--<font title="请使用充值订单的方式进行充值！">充值</font>--%>
-						</shiro:hasPermission>
-						<shiro:hasPermission name="balance:cmUserBalanceWithdrawals:withdrawals">
-							<c:if test="${cmUser.ableUserMoney > 0}">
-								<c:if test="${cmUser.pending}">
-									<font color="#666666">申请提现</font>
-								</c:if>
-								<c:if test="${!cmUser.pending}">
-									<a href="${ctx}/user/cmUserBalanceRecord/userWithdrawals?userID=${cmUser.userID}" >申请提现</a>
-								</c:if>
+				<td>
+					<fmt:formatNumber value="${empty cmUser.userMoney ? 0:cmUser.userMoney}" type="currency"/>
+				</td>
+				<td>
+
+				</td>
+				<td>
+					<a href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${cmUser.userID}" >查看详情</a>
+					<shiro:hasPermission name="balance:cmUserBalanceRecord:recharge">
+						<a href="javascript:void(0);" onclick="recharge('${cmUser.userID}')">充值</a>
+						<%--<font title="请使用充值订单的方式进行充值！">充值</font>--%>
+					</shiro:hasPermission>
+					<shiro:hasPermission name="balance:cmUserBalanceWithdrawals:withdrawals">
+						<c:if test="${cmUser.ableUserMoney > 0}">
+							<c:if test="${cmUser.pending}">
+								<font color="#666666">申请提现</font>
 							</c:if>
-						</shiro:hasPermission>
-					</td>
+							<c:if test="${!cmUser.pending}">
+								<a href="${ctx}/user/cmUserBalanceRecord/userWithdrawals?userID=${cmUser.userID}" >申请提现</a>
+							</c:if>
+						</c:if>
+					</shiro:hasPermission>
+				</td>
 			</tr>
 		</c:forEach>
 		</tbody>

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

@@ -138,6 +138,22 @@
 						<td>
 							<fmt:formatNumber value="${cmUserBalanceRecord.amount}" type="currency"/>
 						</td>
+						<td>
+							<c:if test="${cmUserBalanceRecord.balanceType ne 10 || cmUserBalanceRecord.balanceType ne 16 || cmUserBalanceRecord.balanceType ne 17}">
+								<fmt:formatNumber value="${cmUserBalanceRecord.amount}" type="currency"/>
+							</c:if>
+							<c:if test="${cmUserBalanceRecord.balanceType eq 10 || cmUserBalanceRecord.balanceType eq 16 || cmUserBalanceRecord.balanceType eq 17}">
+								<fmt:formatNumber value="0" type="currency"/>
+							</c:if>
+						</td>
+						<td>
+							<c:if test="${cmUserBalanceRecord.balanceType eq 10 || cmUserBalanceRecord.balanceType eq 16 || cmUserBalanceRecord.balanceType eq 17}">
+								<fmt:formatNumber value="${cmUserBalanceRecord.amount}" type="currency"/>
+							</c:if>
+							<c:if test="${cmUserBalanceRecord.balanceType ne 10 || cmUserBalanceRecord.balanceType ne 16 || cmUserBalanceRecord.balanceType ne 17}">
+								<fmt:formatNumber value="0" type="currency"/>
+							</c:if>
+						</td>
 						<td>
 							<c:if test="${cmUserBalanceRecord.balanceType eq 1 }">
 								<a href="${ctx}/order/detail?id=${cmUserBalanceRecord.orderId}">余额抵扣</a>