bug fixes

src/main/java/com/caimei/modules/user/service/CmUserbeanshistoryService.java

@@ -44,7 +44,6 @@ public class CmUserbeanshistoryService {
                     Integer returnedId = cmUserbeanshistoryDao.findPurchaseReturnedId(history.getOrderId());
                     history.setReturnedId(returnedId);
                 }
-
             }
         }
         return historyList;

src/main/webapp/WEB-INF/views/modules/order/newOrderList.jsp

@@ -1130,7 +1130,7 @@
                         <%--                        <a href="javascript:void(0);" onclick="remarks('${order.orderID}','')">备注</a>--%>
                         <%--包含订单充值商品就不显示--%>
                         <c:if test="${empty order.rechargeGoods}">
-                            <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 21 && order.status ne 6 && order.status ne 4}">
+                            <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 21 && order.status ne 6}">
                                 <a href="${ctx}/order/logisticsDetails?orderID=${order.orderID}">发货记录</a>
                             </c:if>
                             <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 6}">

src/main/webapp/WEB-INF/views/modules/order/orderDetail.jsp

@@ -369,7 +369,7 @@
                     <a href="${ctx}/order/cmOrderRemark/remarksViewNew.rpc?orderID=${order.orderID}&source=2">订单备注</a>
                     <%--包含订单充值商品就不显示--%>
                     <c:if test="${empty order.rechargeGoods}">
-                        <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 21 && order.status ne 6 && order.status ne 4}">
+                        <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 21 && order.status ne 6}">
                             <a href="${ctx}/order/logisticsDetails?orderID=${order.orderID}">发货记录</a>
                         </c:if>
                         <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 6}">

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

@@ -80,7 +80,7 @@
 						<a href="${ctx}/new/user/agency/form?id=${userBeansHistory.clubId}&source=1">升级会员机构</a>
 					</c:if>
 					<c:if test="${userBeansHistory.beansType eq 3 || userBeansHistory.beansType eq 4}">
-						完善资料
+						<a href="${ctx}/new/user/agency/form?id=${userBeansHistory.clubId}&source=1">完善资料</a>
 					</c:if>
 					<c:if test="${userBeansHistory.beansType eq 5}">
 						<a href="${ctx}/hehe/new/order/detail?id=${userBeansHistory.orderId}">下单</a>
@@ -99,7 +99,7 @@
 							<a href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecord?id=${userBeansHistory.returnedId}&orderID=${userBeansHistory.orderId}">抵用退回</a>
 						</c:if>
 						<c:if test="${empty userBeansHistory.returnedId}">
-							<a href="${ctx}/hehe/new/order/detail?id=${userBeansHistory.returnedId}">确认收货</a>
+							<a href="${ctx}/hehe/new/order/detail?id=${userBeansHistory.orderId}">抵用退回</a>
 						</c:if>
 					</c:if>
 					<c:if test="${userBeansHistory.beansType eq 10}">