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

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

@@ -182,6 +182,10 @@ public class CmDiscernReceiptService extends CrudService<CmDiscernReceiptDao, Cm
             ReceiptVipInfoVo receiptVipInfo = cmDiscernReceiptDao.getReceiptVipInfo(vo.getReceiptID());
             vo.setVipInfo(receiptVipInfo);
         }
+        if ("7".equals(vo.getReceiptType())) {
+            // 二手商品上架费
+
+        }
         vo.setOrderInfos(orderInfos);
         return vo;
     }

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

@@ -178,6 +178,9 @@
                         </c:if>
                         <c:if test="${vo.receiptType == 6}">
                             超级会员款
+                        </c:if>
+                        <c:if test="${vo.receiptType == 6}">
+                            二手商品上架费
                         </c:if>
 					</span>
             <span><label>收款类型：</label>${fns:getPayTypeStr(vo.payType)}</span>
@@ -222,38 +225,38 @@
             </div>
         </c:if>
     </div>
-    <c:if test="${vo.receiptType != 2 and vo.receiptType != 6}">
-    <h5>关联订单</h5>
-    <div class="receipt-order-form">
-        <c:forEach items="${vo.orderInfos}" var="orderInfo">
-            <div class="receipt-order-form">
-                <c:if test="${vo.receiptType == 3 || vo.receiptType == 5}">
-                    <div class="receipt-suborder-title">
+    <c:if test="${vo.receiptType != 2 and vo.receiptType != 6 and vo.receiptType != 7}">
+        <h5>关联订单</h5>
+        <div class="receipt-order-form">
+            <c:forEach items="${vo.orderInfos}" var="orderInfo">
+                <div class="receipt-order-form">
+                    <c:if test="${vo.receiptType == 3 || vo.receiptType == 5}">
+                        <div class="receipt-suborder-title">
                         <span class="font-blue"><label>子订单编号：</label><a
                                 href="${ctx}/order/detail?id=${orderInfo.orderID}">${orderInfo.shopOrderNo}(${orderInfo.shopOrderID})</a></span>
-                        <span><label>订单金额：</label>¥<fmt:formatNumber value="${orderInfo.shopOrderAmount}"
-                                                                     pattern="#0.00"/></span>
-                        <span><label>供应商：</label>${orderInfo.shopName}</span>
-                        <c:if test="${vo.receiptType == 5}">
-                            <span><label>应付金额：</label>¥<fmt:formatNumber value="${orderInfo.shouldPayShopAmount}"
+                            <span><label>订单金额：</label>¥<fmt:formatNumber value="${orderInfo.shopOrderAmount}"
                                                                          pattern="#0.00"/></span>
-                            <span><label>已付金额：</label>¥<fmt:formatNumber value="${orderInfo.payedShopAmount}"
-                                                                         pattern="#0.00"/></span>
-                            <span><label>已退金额：</label>¥<fmt:formatNumber value="${orderInfo.refundsAmount}"
+                            <span><label>供应商：</label>${orderInfo.shopName}</span>
+                            <c:if test="${vo.receiptType == 5}">
+                            <span><label>应付金额：</label>¥<fmt:formatNumber value="${orderInfo.shouldPayShopAmount}"
                                                                          pattern="#0.00"/></span>
-                        </c:if>
-                    </div>
-                </c:if>
-                <div class="receipt-order-row2">
+                                <span><label>已付金额：</label>¥<fmt:formatNumber value="${orderInfo.payedShopAmount}"
+                                                                             pattern="#0.00"/></span>
+                                <span><label>已退金额：</label>¥<fmt:formatNumber value="${orderInfo.refundsAmount}"
+                                                                             pattern="#0.00"/></span>
+                            </c:if>
+                        </div>
+                    </c:if>
+                    <div class="receipt-order-row2">
                     <span class="font-blue"><label>订单编号：</label><a
                             href="${ctx}/order/detail?id=${orderInfo.orderID}">${orderInfo.orderNo}（${orderInfo.orderID}）</a></span>
-                    <span><label>订单金额：</label>¥<fmt:formatNumber
-                            value="${orderInfo.orderAmount}"
-                            pattern="#0.00"/></span>
-                    <span>
+                        <span><label>订单金额：</label>¥<fmt:formatNumber
+                                value="${orderInfo.orderAmount}"
+                                pattern="#0.00"/></span>
+                        <span>
                         <label>已收金额：</label>¥<fmt:formatNumber
-                            value="${empty orderInfo.receiptAmount ? 0 : orderInfo.receiptAmount}"
-                            pattern="#0.00"/>
+                                value="${empty orderInfo.receiptAmount ? 0 : orderInfo.receiptAmount}"
+                                pattern="#0.00"/>
                         <span>
                                     <c:forEach items="${orderInfo.receiptRecordVo}" var="receiptRecord"
                                                varStatus="index">
@@ -299,7 +302,7 @@
                                     </c:forEach>
                                 </span>
                             </span>
-                    <span><label>机构名称：</label>
+                        <span><label>机构名称：</label>
                                     <c:if test="${orderInfo.organizeID == 1}">
                                         <span class="org-note">星范</span>
                                     </c:if>
@@ -308,36 +311,36 @@
 
                         </c:if>
                                 </span>
-                    <span><label>订单状态：</label>
+                        <span><label>订单状态：</label>
                                     <c:if test="${orderInfo.receiptStatus == 1}">待收款</c:if>
                                     <c:if test="${orderInfo.receiptStatus == 2}">部分收款</c:if>
                                     <c:if test="${orderInfo.receiptStatus == 3}">已收款</c:if>
                                 </span>
-                </div>
-                <div class="receipt-order-row3">
+                    </div>
+                    <div class="receipt-order-row3">
                                 <span><label>订单类型：</label><c:if test="${orderInfo.orderType == 0}">协销订单</c:if>
                                         <c:if test="${orderInfo.orderType == 1}">自主订单</c:if></span>
-                    <span><label>下单日期：</label>${orderInfo.orderTime}</span>
-                </div>
-                <div class="receipt-order-row4">
-                    <div><h5><label>订单收款记录：</label></h5></div>
-                    <c:forEach items="${orderInfo.receiptRecordVo}" var="receiptRecord" varStatus="index">
-                        <div class="row4-wrapper">
-                            <span class="row4-order-no">${index.index + 1}、</span>
-                            <span class="row4-time">${receiptRecord.receiptTime}</span>
-                            <c:if test="${receiptRecord.payWay == 1}">
-                                <%--线上收款--%>
-                                <span>线上&nbsp;${fns:getPayTypeStr(receiptRecord.payType)}</span>
-                                <span>${receiptRecord.receiptAmount}</span>
-                                <span><label>交易号：</label>${receiptRecord.mbOrderId}</span>
-                            </c:if>
-                            <c:if test="${receiptRecord.payWay == 2}">
-                                <span>线下&nbsp;${fns:getPayTypeStr(receiptRecord.payType)}</span>
-                                <span>${receiptRecord.receiptAmount}</span>
-                                <c:if test="${not empty receiptRecord.confirmUserPermissionID}">
-                                    <span>${receiptRecord.confirmUserName}确认(${receiptRecord.confirmDate})</span>
+                        <span><label>下单日期：</label>${orderInfo.orderTime}</span>
+                    </div>
+                    <div class="receipt-order-row4">
+                        <div><h5><label>订单收款记录：</label></h5></div>
+                        <c:forEach items="${orderInfo.receiptRecordVo}" var="receiptRecord" varStatus="index">
+                            <div class="row4-wrapper">
+                                <span class="row4-order-no">${index.index + 1}、</span>
+                                <span class="row4-time">${receiptRecord.receiptTime}</span>
+                                <c:if test="${receiptRecord.payWay == 1}">
+                                    <%--线上收款--%>
+                                    <span>线上&nbsp;${fns:getPayTypeStr(receiptRecord.payType)}</span>
+                                    <span>${receiptRecord.receiptAmount}</span>
+                                    <span><label>交易号：</label>${receiptRecord.mbOrderId}</span>
                                 </c:if>
-                                <c:if test="${not empty receiptRecord.reviewUserPermissionID}">
+                                <c:if test="${receiptRecord.payWay == 2}">
+                                    <span>线下&nbsp;${fns:getPayTypeStr(receiptRecord.payType)}</span>
+                                    <span>${receiptRecord.receiptAmount}</span>
+                                    <c:if test="${not empty receiptRecord.confirmUserPermissionID}">
+                                        <span>${receiptRecord.confirmUserName}确认(${receiptRecord.confirmDate})</span>
+                                    </c:if>
+                                    <c:if test="${not empty receiptRecord.reviewUserPermissionID}">
                                     <span>
                                         <c:if test="${receiptRecord.receiptStatus eq 4}">
                                             ${receiptRecord.reviewUserName}审核不通过(${receiptRecord.reviewDate})
@@ -346,18 +349,18 @@
                                             ${receiptRecord.reviewUserName}审核通过(${receiptRecord.reviewDate})
                                         </c:if>
                                     </span>
+                                    </c:if>
                                 </c:if>
-                            </c:if>
-                            <c:if test="${receiptRecord.payWay == 3}">
-                                <%--余额抵扣--%>
-                                <span><a
-                                        href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${orderInfo.userID}"
-                                        style="text-decoration: underline">${fns:getPayTypeStr(receiptRecord.payType)}</a></span>
-                                <span><a
-                                        href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${orderInfo.userID}"
-                                        style="text-decoration: underline">${receiptRecord.receiptAmount}</a></span>
-                            </c:if>
-                            <span>
+                                <c:if test="${receiptRecord.payWay == 3}">
+                                    <%--余额抵扣--%>
+                                    <span><a
+                                            href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${orderInfo.userID}"
+                                            style="text-decoration: underline">${fns:getPayTypeStr(receiptRecord.payType)}</a></span>
+                                    <span><a
+                                            href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${orderInfo.userID}"
+                                            style="text-decoration: underline">${receiptRecord.receiptAmount}</a></span>
+                                </c:if>
+                                <span>
     <%--                        一款多单的时候直接显示再订单上即可，无需收款记录显示--%>
                                 <c:if test="${!vo.receiptOrderFlag}">
                                     <c:if test="${receiptRecord.confirmType eq 1 || receiptRecord.confirmType eq  2 || receiptRecord.confirmType eq 3}">
@@ -386,22 +389,30 @@
                                     </c:if>
                                 </c:if>
                                 </span>
-                        </div>
-                    </c:forEach>
+                            </div>
+                        </c:forEach>
+                    </div>
                 </div>
-            </div>
-            <br>
-        </c:forEach>
-    </div>
+                <br>
+            </c:forEach>
+        </div>
     </c:if>
     <c:if test="${vo.receiptType == 6}">
         <h5>关联超级会员记录</h5>
         <div class="receipt-order-form">
             <div>
-            <c:if test="${not empty vo.vipInfo}">
-                <span>会员套餐：${vo.vipInfo.duration}个月</span>
-                <span>交易号：${vo.vipInfo.orderRequestNo}</span>
-            </c:if>
+                <c:if test="${not empty vo.vipInfo}">
+                    <span>会员套餐：${vo.vipInfo.duration}个月</span>
+                    <span>交易号：${vo.vipInfo.orderRequestNo}</span>
+                </c:if>
+            </div>
+        </div>
+    </c:if>
+    <c:if test="${vo.receiptType == 7}">
+        <h5>二手商品上架费</h5>
+        <div class="receipt-order-form">
+            <div>
+                <span>交易号：${receiptRecord.mbOrderId}</span>
             </div>
         </div>
     </c:if>