浏览代码

线上/下余额退款

zhijiezhao 3 年之前
父节点
当前提交
c2bc4c5da8

+ 5 - 1
src/main/webapp/WEB-INF/views/modules/user/cmRechargeForm.jsp

@@ -80,8 +80,12 @@
 	<div id="isnull" style="display: none">
 		<font color='red' style=" margin-left: 74px">充值金额不能为空</font>
 	</div>
+	<br/>
+	<div id="note" style="display: none">
+		<font color='red' style=" margin-left: 74px">充值备注不能为空</font>
+	</div>
 	<%--<input id="" name="" title="请输入此次充值的金额" value="">--%>
-	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;备注:&nbsp;<textarea id='remarks' name='remarks' rows='3' cols='4' style="width: 205px" maxlength="200"></textarea>
+	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color='red'>*</font>备注:&nbsp;<textarea id='remarks' name='remarks' rows='3' cols='4' style="width: 205px" maxlength="200"></textarea>
 </form:form>
 </body>
 </html>

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

@@ -200,6 +200,24 @@
 									<font color="red">(${cmUserBalanceRecord.remark})</font>
 								</c:if>
 							</c:if>
+							<c:if test="${cmUserBalanceRecord.balanceType eq 10 }">
+								<a href="${ctx}/order/detail?id=${cmUserBalanceRecord.orderId}">线上余额抵扣</a>
+							</c:if>
+							<c:if test="${cmUserBalanceRecord.balanceType eq 13 }">
+								<a href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecord.rpc?id=${cmUserBalanceRecord.returnedId}&orderID=${cmUserBalanceRecord.orderId}">申请退款到线上余额</a>
+							</c:if>
+							<c:if test="${cmUserBalanceRecord.balanceType eq 16 }">
+								线上订金订单充值
+							</c:if>
+							<c:if test="${cmUserBalanceRecord.balanceType eq 17 }">
+								线上余额订单充值
+							</c:if>
+							<c:if test="${cmUserBalanceRecord.balanceType eq 18 }">
+								线上订金订单退款
+							</c:if>
+							<c:if test="${cmUserBalanceRecord.balanceType eq 19 }">
+								线上余额订单退款
+							</c:if>
 						</td>
 						<td>
 							<c:if test="${cmUserBalanceRecord.balanceType eq 1 && not empty cmUserBalanceRecord.closeReason}">