3 anni fa · 7b13c98b68
--- a/src/main/resources/mappings/modules/order/ShopOrderMapper.xml
+++ b/src/main/resources/mappings/modules/order/ShopOrderMapper.xml
@@ -973,7 +973,6 @@
 
				                                                                      GROUP BY cso.orderID
			
 
				                                                                  ), 0))
			
 
				                                         - IFNULL(co.couponAmount, 0)
			
 
				-                                        - IFNULL(IF(userBeans>0,freight,0),0)
			
 
				                                         - (SELECT IFNULL(SUM(cso.shopOtherFee), 0)
			
 
				                                            FROM cm_shop_order cso
			
 
				                                            WHERE cso.orderID = co.orderID)
			
--- a/src/main/webapp/WEB-INF/views/modules/super/cmSvipGiveForm.jsp
+++ b/src/main/webapp/WEB-INF/views/modules/super/cmSvipGiveForm.jsp
@@ -89,8 +89,8 @@
 
				 </head>
			
 
				 <body>
			
 
				 <ul class="nav nav-tabs">
			
 
				-    <li class="active"><a href="${ctx}/svip/cmSvipHistory/">超级会员列表</a></li>
			
 
				-    <li><a href="${ctx}/svip/cmSvipGive/">赠送超级会员</a></li>
			
 
				+    <li><a href="${ctx}/svip/cmSvipHistory/">超级会员列表</a></li>
			
 
				+    <li class="active"><a href="${ctx}/svip/cmSvipGive/">赠送超级会员</a></li>
			
 
				 </ul>
			
 
				 <br/>
			
 
				 <form:form id="inputForm" modelAttribute="cmSvipGive" action="${ctx}/svip/cmSvipGive/save" method="post"
			
--- a/src/main/webapp/WEB-INF/views/modules/svip/cmSvipHistoryList.jsp
+++ b/src/main/webapp/WEB-INF/views/modules/svip/cmSvipHistoryList.jsp
@@ -29,7 +29,7 @@
 
				 <body>
			
 
				 <ul class="nav nav-tabs">
			
 
				     <li class="active"><a href="${ctx}/svip/cmSvipHistory/">超级会员列表</a></li>
			
 
				-    <li class="active"><a href="${ctx}/svip/cmSvipGive/">赠送超级会员</a></li>
			
 
				+    <li><a href="${ctx}/svip/cmSvipGive/">赠送超级会员</a></li>
			
 
				 </ul>
			
 
				 <form:form id="searchForm" modelAttribute="cmSvipHistory" action="${ctx}/svip/cmSvipHistory/" method="post"
			
 
				            class="breadcrumb form-search">