bugfix-订单发货按钮

src/main/webapp/WEB-INF/views/modules/hehe/heheNewOrderDetail.jsp

@@ -286,7 +286,7 @@
             <div class="operation-block">
                 <shiro:hasPermission name="order:order:edit">
                     <%--包含订单充值商品就不显示--%>
-                    <c:if test="${empty order.rechargeGoods}">
+                    <c:if test="${order.rechargeGoods ne 1 and order.rechargeGoods ne 2}">
                         <c:if test="${order.status == 11 || order.status == 12 || order.status == 21 || order.status == 22 || order.status == 31 || order.status == 32}">
                             <a href="${ctx}/order/toDeliveryPage?id=${order.orderID}">发货</a>
                         </c:if>

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

@@ -620,7 +620,7 @@
             <div class="operation-block">
                 <shiro:hasPermission name="order:order:edit">
                     <%--包含订单充值商品就不显示--%>
-                    <c:if test="${empty order.rechargeGoods}">
+                    <c:if test="${order.rechargeGoods ne 1 and order.rechargeGoods ne 2}">
                         <c:if test="${order.status == 11 || order.status == 12 || order.status == 21 || order.status == 22 || order.status == 31 || order.status == 32}">
                             <a href="${ctx}/order/toDeliveryPage?id=${order.orderID}">发货</a>
                         </c:if>