收款列表加入二手商品上架费

src/main/java/com/caimei/modules/order/service/CmDiscernReceiptService.java

@@ -104,6 +104,10 @@ public class CmDiscernReceiptService extends CrudService<CmDiscernReceiptDao, Cm
                 String userName = cmDiscernReceiptDao.getUserNameByUserId(userId);
                 bean.setName(userName);
             }
+            if("7".equals(bean.getReceiptType())){
+                //二手商品上架费
+                bean.setName("-----");
+            }
             bean.setOrders(no);
             bean.setOrderType(type);
         });

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

@@ -213,7 +213,7 @@
                     <c:if test="${cmDiscernReceipt.receiptStatus == 4}"><font color="red">审核未通过</font></c:if>
                     <c:if test="${cmDiscernReceipt.receiptStatus == 5}"><font color="red">收款撤销</font></c:if>
                 </c:if>
-                <c:if test="${cmDiscernReceipt.payWay != 2}">----</c:if>
+                <c:if test="${cmDiscernReceipt.payWay != 2}">-----</c:if>
             </td>
             <td>
                 <c:if test="${cmDiscernReceipt.organizeID == 1}">
@@ -229,11 +229,13 @@
             </td>
             <td>
                 <c:if test="${cmDiscernReceipt.receiptType != 6}">${cmDiscernReceipt.orderType}</c:if>
-                <c:if test="${cmDiscernReceipt.receiptType == 6}">----</c:if>
+                <c:if test="${cmDiscernReceipt.receiptType == 6}">-----</c:if>
+                <c:if test="${cmDiscernReceipt.receiptType == 7}">-----</c:if>
             </td>
             <td>
                 <c:if test="${cmDiscernReceipt.receiptType != 6}">${cmDiscernReceipt.orders}</c:if>
-                <c:if test="${cmDiscernReceipt.receiptType == 6}">----</c:if>
+                <c:if test="${cmDiscernReceipt.receiptType == 6}">-----</c:if>
+                <c:if test="${cmDiscernReceipt.receiptType == 7}">-----</c:if>
             </td>
             <shiro:hasPermission name="order:cmDiscernReceipt:edit">
                 <td>