bugfix

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

@@ -77,17 +77,18 @@ public class CmDiscernReceiptService extends CrudService<CmDiscernReceiptDao, Cm
             logger.info("-----------------:::::" + bean.getId());
             String type = "";
             String no = "";
-            if ("1".equals(bean.getReceiptType()) || "3".equals(bean.getReceiptType()) || "5".equals(bean.getReceiptType())) {
+            if ("1".equals(bean.getReceiptType()) || "3".equals(bean.getReceiptType()) || "5".equals(bean.getReceiptType()) ||
+                    "10".equals(bean.getReceiptType()) || "11".equals(bean.getReceiptType())) {
                 List<Map<String, Object>> orderIDs = cmDiscernReceiptDao.getShopOrderIDStr(bean.getId());
                 boolean flag = false;
                 boolean mapFlag = false;
-                if (orderIDs == null || orderIDs.size()<=0) {
+                if (orderIDs == null || orderIDs.size() <= 0) {
                     flag = true;
                 }
-                for (Map<String, Object> m : orderIDs){
+                for (Map<String, Object> m : orderIDs) {
                     mapFlag = ObjectUtils.isEmpty(m);
                 }
-                if (!mapFlag && orderIDs != null && orderIDs.size()>0 && null == orderIDs.get(0).get("shopOrderId")) {
+                if (!mapFlag && orderIDs != null && orderIDs.size() > 0 && null == orderIDs.get(0).get("shopOrderId")) {
                     flag = true;
                 }
                 if (flag) {
@@ -116,10 +117,10 @@ public class CmDiscernReceiptService extends CrudService<CmDiscernReceiptDao, Cm
                         }
                         if ("".equals(no)) {
                             // no += "<a href='/a/order/detail?id=" + map.get("orderID") + "'>" + map.get("shopOrderNo") + "</a>";
-                            no += "<a href='/a/order/detail?id=" + map.get("orderID") + "&shopOrderID=" + map.get("shopOrderId") + "'>" + "子订单" + map.get("shopOrderNo") + "("+map.get("shopOrderId")+")" + "</a>";
+                            no += "<a href='/a/order/detail?id=" + map.get("orderID") + "&shopOrderID=" + map.get("shopOrderId") + "'>" + "子订单" + map.get("shopOrderNo") + "(" + map.get("shopOrderId") + ")" + "</a>";
                         } else {
                             // no += ("<br><a href='/a/order/detail?id=" + map.get("orderID") + "'>" + map.get("shopOrderNo")) + "</a>";
-                            no += ("<br><a href='/a/order/detail?id=" + map.get("orderID") + "&shopOrderID=" + map.get("shopOrderId") + "'>" + "子订单" + map.get("shopOrderNo") + "("+map.get("shopOrderId")+")") + "</a>";
+                            no += ("<br><a href='/a/order/detail?id=" + map.get("orderID") + "&shopOrderID=" + map.get("shopOrderId") + "'>" + "子订单" + map.get("shopOrderNo") + "(" + map.get("shopOrderId") + ")") + "</a>";
                         }
                     }
                 }
@@ -162,7 +163,7 @@ public class CmDiscernReceiptService extends CrudService<CmDiscernReceiptDao, Cm
         List<ReceiptOrderInfoVo> orderInfos = new ArrayList<>(); //一个收款可能会关联了一个或多个订单
         ReceiptOrderInfoVo receiptOrderInfoVo = null;
         double needAmount = 0d;
-        for(CmReceiptOrderRelation relation : relations) {
+        for (CmReceiptOrderRelation relation : relations) {
             if (null != relation.getShopOrderId()) {
                 receiptOrderInfoVo = cmDiscernReceiptDao.getOrderInfoByShopOrderID(relation.getShopOrderId().toString());
                 BigDecimal add = MathUtil.add(receiptOrderInfoVo.getReceiptAmount(), cmDiscernReceiptService.findShoOrderIDReceipt(relation.getShopOrderId()));
@@ -497,6 +498,7 @@ public class CmDiscernReceiptService extends CrudService<CmDiscernReceiptDao, Cm
         Double receiptAmount = cmDiscernReceiptDao.findOrderReceipt(orderID);
         return receiptAmount;
     }
+
     public Double findShoOrderIDReceipt(Integer shopOrderID) {
         Double receiptAmount = cmDiscernReceiptDao.findShoOrderIDReceipt(shopOrderID);
         return receiptAmount;

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

@@ -144,7 +144,9 @@
 <body>
 <ul class="nav nav-tabs">
     <li><a href="${ctx}/order/cmDiscernReceipt/">收款列表</a></li>
-    <li class="active"><a href="${ctx}/order/cmDiscernReceipt/detail?checkMan=${cmDiscernReceipt.checkMan}&orderID=${cmDiscernReceipt.orderID}&shopName=${cmDiscernReceipt.shopName}&id=${cmDiscernReceipt.id}&organizeID=${cmDiscernReceipt.organizeID}&shopOrderId=${cmDiscernReceipt.shopOrderId}">收款详情</a></li>
+    <li class="active"><a
+            href="${ctx}/order/cmDiscernReceipt/detail?checkMan=${cmDiscernReceipt.checkMan}&orderID=${cmDiscernReceipt.orderID}&shopName=${cmDiscernReceipt.shopName}&id=${cmDiscernReceipt.id}&organizeID=${cmDiscernReceipt.organizeID}&shopOrderId=${cmDiscernReceipt.shopOrderId}">收款详情</a>
+    </li>
 </ul>
 <br/>
 <div class="receipt-order-details">
@@ -152,9 +154,9 @@
     <div>
         <div class="receipt-title">
             <h5>收款信息</h5>
-<%--            <c:if test="${vo.receiptStatus != 5 && vo.payWay eq 2}">--%>
-<%--                <a href="#" onclick="cancel(${vo.receiptID})" class="receipt-order-recall">撤销收款</a>--%>
-<%--            </c:if>--%>
+            <%--            <c:if test="${vo.receiptStatus != 5 && vo.payWay eq 2}">--%>
+            <%--                <a href="#" onclick="cancel(${vo.receiptID})" class="receipt-order-recall">撤销收款</a>--%>
+            <%--            </c:if>--%>
         </div>
         <div class="receipt-order-title">
             <span><label>收款ID：</label>${vo.receiptID}</span>
@@ -189,14 +191,23 @@
                         </c:if>
                         <c:if test="${vo.receiptType == 8}">
                             优惠券购买费
+                        </c:if>
+                        <c:if test="${vo.receiptType == 9}">
+                            认证通会员款
+                        </c:if>
+                        <c:if test="${vo.receiptType == 10}">
+                            平台服务费
+                        </c:if>
+                        <c:if test="${vo.receiptType == 11}">
+                            服务费欠款
                         </c:if>
 					</span>
             <span><label>收款类型：</label>${vo.bankNameType}</span>
 
             <span><label>收款方：</label>
                 <c:if test="${(cmDiscernReceipt.payWay == '3' || cmDiscernReceipt.payWay == '2') && (cmDiscernReceipt.receiptType==1 || cmDiscernReceipt.receiptType==2 || cmDiscernReceipt.receiptType==3 || cmDiscernReceipt.receiptType==4) || cmDiscernReceipt.newReceiptType == 3 && cmDiscernReceipt.payWay ==2}">
-                采美
-            </c:if>
+                    采美
+                </c:if>
                 <c:if test="${cmDiscernReceipt.payWay == '1'}">
                     ${cmDiscernReceipt.shopName}
                 </c:if>
@@ -282,83 +293,82 @@
             </div>
         </c:if>
     </div>
-<%--    <c:if test="${not empty op.shopOrderNo}">
-        <h5>关联订单</h5>
-        <div class="receipt-order-form">
-            <div class="receipt-order-row2">
-                        <span class="font-blue"><label>子订单编号：</label>
-                               <a href="${ctx}/order/detail?id=${op.orderID}">${op.shopOrderNo}（${op.shopOrderId}）</a></span>
-                <span><label>订单金额：</label>¥<fmt:formatNumber
-                        value="${op.productAmount}"
-                        pattern="#0.00"/></span>
-                <span>
-                         <span><label>供应商：</label>${op.shopName}</span>
-                    </span>
-                        <hr style="margin: 10px;"/>
-            </div>
-
-            <div class="receipt-order-row3">
+    <%--    <c:if test="${not empty op.shopOrderNo}">
+            <h5>关联订单</h5>
+            <div class="receipt-order-form">
+                <div class="receipt-order-row2">
+                            <span class="font-blue"><label>子订单编号：</label>
+                                   <a href="${ctx}/order/detail?id=${op.orderID}">${op.shopOrderNo}（${op.shopOrderId}）</a></span>
+                    <span><label>订单金额：</label>¥<fmt:formatNumber
+                            value="${op.productAmount}"
+                            pattern="#0.00"/></span>
+                    <span>
+                             <span><label>供应商：</label>${op.shopName}</span>
+                        </span>
+                            <hr style="margin: 10px;"/>
+                </div>
 
-                         <span class="font-blue"><label>订单编号：</label><a
-                                 href="${ctx}/order/detail?id=${op.orderID}">${op.orderNo}（${op.orderID}）</a></span>
+                <div class="receipt-order-row3">
 
-                <span><label>订单金额：</label>¥<fmt:formatNumber
-                        value="${op.productAmount}"
-                        pattern="#0.00"/></span>
+                             <span class="font-blue"><label>订单编号：</label><a
+                                     href="${ctx}/order/detail?id=${op.orderID}">${op.orderNo}（${op.orderID}）</a></span>
 
-                <span><label>应收金额：</label>¥<fmt:formatNumber value="${op.needPayAmount}"
-                                                             pattern="#0.00"/></span>
-                <span>
-                            <label>已收金额：</label>¥<fmt:formatNumber
-                        value="${empty op.receiptAmount ? 0 : op.receiptAmount}"
-                        pattern="#0.00"/>
-                            </span>
-                <span><label>机构名称：</label>${op.jgName}</span>
-            </div>
+                    <span><label>订单金额：</label>¥<fmt:formatNumber
+                            value="${op.productAmount}"
+                            pattern="#0.00"/></span>
 
-            <label>订单类型：</label><c:if test="${op.orderType eq 0}">普通订单</c:if>
-            <c:if test="${op.orderType eq 1}">协销订单</c:if>
+                    <span><label>应收金额：</label>¥<fmt:formatNumber value="${op.needPayAmount}"
+                                                                 pattern="#0.00"/></span>
+                    <span>
+                                <label>已收金额：</label>¥<fmt:formatNumber
+                            value="${empty op.receiptAmount ? 0 : op.receiptAmount}"
+                            pattern="#0.00"/>
+                                </span>
+                    <span><label>机构名称：</label>${op.jgName}</span>
+                </div>
 
-            <span><label>下单日期：</label>${cmDiscernReceipt.confirmDate}</span>
+                <label>订单类型：</label><c:if test="${op.orderType eq 0}">普通订单</c:if>
+                <c:if test="${op.orderType eq 1}">协销订单</c:if>
 
-        </div>--%>
+                <span><label>下单日期：</label>${cmDiscernReceipt.confirmDate}</span>
 
+            </div>--%>
 
 
     <c:if test="${vo.receiptType != 2 and vo.receiptType != 6 and vo.receiptType != 7 and vo.receiptType != 8}">
-        <h5>关联订单</h5>
+    <h5>关联订单</h5>
+    <div class="receipt-order-form">
+        <c:forEach items="${vo.orderInfos}" var="orderInfo">
         <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}"--%>
-<%--                                                                         pattern="#0.00"/></span>--%>
-<%--                                <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">
+                <%--                    <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}"--%>
+                <%--                                                                         pattern="#0.00"/></span>--%>
+                <%--                                <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}&shopOrderID=${orderInfo.shopOrderID}">${orderInfo.shopOrderNo}（${orderInfo.shopOrderID}）</a></span>
-<%--                                href="${ctx}/order/detail?id=${orderInfo.orderID}">${orderInfo.orderNo}（${orderInfo.orderID}）</a></span>--%>
+                    <%--                                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>
                             <span><label>子订单应收金额：</label>¥<fmt:formatNumber value="${orderInfo.shopOrderAmount}"
-                                                                         pattern="#0.00"/></span>
+                                                                            pattern="#0.00"/></span>
                             <span>
                             <label>子订单已收金额：</label>¥<fmt:formatNumber
                                     value="${orderInfo.receiptAmount}"
@@ -432,43 +442,43 @@
                                         <c:if test="${orderInfo.receiptStatus == 3}">已收款</c:if>
                             </span>
                         </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="shop-order-row">
-                        <c:forEach items="${orderInfo.shopOrderInfos}" var="shopOrder" varStatus="index">
-                            <span>子订单编号：${shopOrder.shopOrderNo}(${shopOrder.shopOrderID})</span>
-                            <span>子订单应收金额：¥<fmt:formatNumber value="${shopOrder.realPay}"
-                                                             pattern="#0.00"/></span>
-                            <span>子订单已收金额：¥<fmt:formatNumber value="${shopOrder.receiptAmount}"
-                                                             pattern="#0.00"/></span>
-                            <span>子订单收款状态：${fns:getDictLabel(shopOrder.shopReceiptStatus,'receiptStatus' ,'' )}</span>
-                        </c:forEach>
-                    </div>
-                    <c:if test="${not empty orderInfo.receiptRecordVo}">
-                        <div class="receipt-order-form">
-                            <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;${receiptRecord.bankNameType}</span>
-                                            <span>${receiptRecord.receiptAmount}</span>
-                                            <span><label>交易号：</label>${receiptRecord.mbOrderId}</span>
-                                        </c:if>
-                                        <c:if test="${receiptRecord.payWay == 2}">
-                                            <span>线下&nbsp;${receiptRecord.bankNameType}</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><label>下单日期：</label>${orderInfo.orderTime}</span>
+            </div>
+            <div class="shop-order-row">
+                <c:forEach items="${orderInfo.shopOrderInfos}" var="shopOrder" varStatus="index">
+                    <span>子订单编号：${shopOrder.shopOrderNo}(${shopOrder.shopOrderID})</span>
+                    <span>子订单应收金额：¥<fmt:formatNumber value="${shopOrder.realPay}"
+                                                     pattern="#0.00"/></span>
+                    <span>子订单已收金额：¥<fmt:formatNumber value="${shopOrder.receiptAmount}"
+                                                     pattern="#0.00"/></span>
+                    <span>子订单收款状态：${fns:getDictLabel(shopOrder.shopReceiptStatus,'receiptStatus' ,'' )}</span>
+                </c:forEach>
+            </div>
+            <c:if test="${not empty orderInfo.receiptRecordVo}">
+                <div class="receipt-order-form">
+                    <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;${receiptRecord.bankNameType}</span>
+                                    <span>${receiptRecord.receiptAmount}</span>
+                                    <span><label>交易号：</label>${receiptRecord.mbOrderId}</span>
+                                </c:if>
+                                <c:if test="${receiptRecord.payWay == 2}">
+                                    <span>线下&nbsp;${receiptRecord.bankNameType}</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})
@@ -477,18 +487,18 @@
                                                             ${receiptRecord.reviewUserName}审核通过(${receiptRecord.reviewDate})
                                                         </c:if>
                                                     </span>
-                                            </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>
+                                </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="${!vo.receiptOrderFlag}">
                                                     <c:if test="${receiptRecord.confirmType eq 1 || receiptRecord.confirmType eq  2 || receiptRecord.confirmType eq 3}">
@@ -532,164 +542,165 @@
                                                     </c:if>
                                                 </c:if>--%>
                                             </span>
-                                    </div>
-                                </c:forEach>
                             </div>
-                        </div>
-                    </c:if>
-                    <%--<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}">
-                                    &lt;%&ndash;线上收款&ndash;%&gt;
-                                    <span>线上&nbsp;${receiptRecord.bankNameType}</span>
-                                    <span>${receiptRecord.receiptAmount}</span>
-                                    <span><label>交易号：</label>${receiptRecord.mbOrderId}</span>
+                        </c:forEach>
+                    </div>
+                </div>
+            </c:if>
+                <%--<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}">
+                                &lt;%&ndash;线上收款&ndash;%&gt;
+                                <span>线上&nbsp;${receiptRecord.bankNameType}</span>
+                                <span>${receiptRecord.receiptAmount}</span>
+                                <span><label>交易号：</label>${receiptRecord.mbOrderId}</span>
+                            </c:if>
+                            <c:if test="${receiptRecord.payWay == 2}">
+                                <span>线下&nbsp;${receiptRecord.bankNameType}</span>
+                                <span>${receiptRecord.receiptAmount}</span>
+                                <c:if test="${not empty receiptRecord.confirmUserPermissionID}">
+                                    <span>${receiptRecord.confirmUserName}确认(${receiptRecord.confirmDate})</span>
                                 </c:if>
-                                <c:if test="${receiptRecord.payWay == 2}">
-                                    <span>线下&nbsp;${receiptRecord.bankNameType}</span>
-                                    <span>${receiptRecord.receiptAmount}</span>
-                                    <c:if test="${not empty receiptRecord.confirmUserPermissionID}">
-                                        <span>${receiptRecord.confirmUserName}确认(${receiptRecord.confirmDate})</span>
+                                <c:if test="${not empty receiptRecord.reviewUserPermissionID}">
+                                <span>
+                                    <c:if test="${receiptRecord.receiptStatus eq 4}">
+                                        ${receiptRecord.reviewUserName}审核不通过(${receiptRecord.reviewDate})
                                     </c:if>
-                                    <c:if test="${not empty receiptRecord.reviewUserPermissionID}">
-                                    <span>
-                                        <c:if test="${receiptRecord.receiptStatus eq 4}">
-                                            ${receiptRecord.reviewUserName}审核不通过(${receiptRecord.reviewDate})
-                                        </c:if>
-                                        <c:if test="${receiptRecord.receiptStatus ne 4}">
-                                            ${receiptRecord.reviewUserName}审核通过(${receiptRecord.reviewDate})
-                                        </c:if>
-                                    </span>
+                                    <c:if test="${receiptRecord.receiptStatus ne 4}">
+                                        ${receiptRecord.reviewUserName}审核通过(${receiptRecord.reviewDate})
                                     </c:if>
+                                </span>
                                 </c:if>
-                                <c:if test="${receiptRecord.payWay == 3}">
-                                    &lt;%&ndash;余额抵扣&ndash;%&gt;
-                                    <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>
-    &lt;%&ndash;                        一款多单的时候直接显示再订单上即可，无需收款记录显示&ndash;%&gt;
-                                <c:if test="${!vo.receiptOrderFlag}">
-                                    <c:if test="${receiptRecord.confirmType eq 1 || receiptRecord.confirmType eq  2 || receiptRecord.confirmType eq 3}">
-                                        <label>抹平明细：</label>
-                                        <c:if test="${receiptRecord.confirmType eq 1}">
-                                                <font color="red">(少收抹平:
-                                                    ￥<fmt:formatNumber
-                                                            value="${orderInfo.payableAmount - (empty receiptRecord.orderReceivedAmount ? 0 : receiptRecord.orderReceivedAmount)}"
-                                                            pattern="#0.00"/>元)
-                                                </font>
-                                        </c:if>
-                                        <c:if test="${receiptRecord.confirmType eq 2}">
-                                                <font color="red">(多收抹平:
-                                                    ￥<fmt:formatNumber
-                                                            value="${(empty receiptRecord.orderReceivedAmount ? 0 : receiptRecord.orderReceivedAmount) - orderInfo.payableAmount}"
-                                                            pattern="#0.00"/>元)
-                                                </font>
-                                        </c:if>
-                                        <c:if test="${receiptRecord.confirmType eq 3}">
-                                                <font color="red">(多收退余额${receiptRecord.associationType eq 2 ? "(自动)" : ""}:
-                                                    ￥<fmt:formatNumber
-                                                            value="${(empty receiptRecord.returnBalanceAmount ? 0 : receiptRecord.returnBalanceAmount)}"
-                                                            pattern="#0.00"/>元)
-                                                </font>
-                                        </c:if>
+                            </c:if>
+                            <c:if test="${receiptRecord.payWay == 3}">
+                                &lt;%&ndash;余额抵扣&ndash;%&gt;
+                                <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>
+&lt;%&ndash;                        一款多单的时候直接显示再订单上即可，无需收款记录显示&ndash;%&gt;
+                            <c:if test="${!vo.receiptOrderFlag}">
+                                <c:if test="${receiptRecord.confirmType eq 1 || receiptRecord.confirmType eq  2 || receiptRecord.confirmType eq 3}">
+                                    <label>抹平明细：</label>
+                                    <c:if test="${receiptRecord.confirmType eq 1}">
+                                            <font color="red">(少收抹平:
+                                                ￥<fmt:formatNumber
+                                                        value="${orderInfo.payableAmount - (empty receiptRecord.orderReceivedAmount ? 0 : receiptRecord.orderReceivedAmount)}"
+                                                        pattern="#0.00"/>元)
+                                            </font>
+                                    </c:if>
+                                    <c:if test="${receiptRecord.confirmType eq 2}">
+                                            <font color="red">(多收抹平:
+                                                ￥<fmt:formatNumber
+                                                        value="${(empty receiptRecord.orderReceivedAmount ? 0 : receiptRecord.orderReceivedAmount) - orderInfo.payableAmount}"
+                                                        pattern="#0.00"/>元)
+                                            </font>
+                                    </c:if>
+                                    <c:if test="${receiptRecord.confirmType eq 3}">
+                                            <font color="red">(多收退余额${receiptRecord.associationType eq 2 ? "(自动)" : ""}:
+                                                ￥<fmt:formatNumber
+                                                        value="${(empty receiptRecord.returnBalanceAmount ? 0 : receiptRecord.returnBalanceAmount)}"
+                                                        pattern="#0.00"/>元)
+                                            </font>
                                     </c:if>
                                 </c:if>
-                                </span>
+                            </c:if>
+                            </span>
 &lt;%&ndash;                                <span>&ndash;%&gt;
 &lt;%&ndash;                                    ${receiptRecord.receiptAmount}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${vo.confirmer} 确认 ${vo.confirmTime}&ndash;%&gt;
 &lt;%&ndash;                                </span>&ndash;%&gt;
-                            </div>
-                        </c:forEach>
-                    </div>
-                </div>--%>
-                <br>
+                        </div>
+                    </c:forEach>
+                </div>
+            </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.clubName}</span>
-                    <br/>
-                    <span>购买时间：${vo.receiptDate}</span>
-                    <span>会员套餐：${vo.vipInfo.duration}个月</span>
-                    <span>交易号：${vo.vipInfo.orderRequestNo}</span>
-                </c:if>
+        </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.clubName}</span>
+                        <br/>
+                        <span>购买时间：${vo.receiptDate}</span>
+                        <span>会员套餐：${vo.vipInfo.duration}个月</span>
+                        <span>交易号：${vo.vipInfo.orderRequestNo}</span>
+                    </c:if>
+                </div>
             </div>
-        </div>
-    </c:if>
-    <c:if test="${vo.receiptType == 7}">
-        <h5>二手商品上架费</h5>
-        <div class="receipt-order-form">
-            <div>
-                <span>交易号：${receiptRecord.mbOrderId}</span>
+        </c:if>
+        <c:if test="${vo.receiptType == 7}">
+            <h5>二手商品上架费</h5>
+            <div class="receipt-order-form">
+                <div>
+                    <span>交易号：${receiptRecord.mbOrderId}</span>
+                </div>
             </div>
-        </div>
-    </c:if>
-    <c:if test="${vo.receiptType == 8}">
-        <h5>优惠券信息</h5>
-        <div class="receipt-order-form">
-            <div>
-                <span>机构名称：</span>
-                <br/>
-                <span>购买时间：${vo.receiptDate}</span>
-                <span>优惠券类型：
+        </c:if>
+        <c:if test="${vo.receiptType == 8}">
+            <h5>优惠券信息</h5>
+            <div class="receipt-order-form">
+                <div>
+                    <span>机构名称：</span>
+                    <br/>
+                    <span>购买时间：${vo.receiptDate}</span>
+                    <span>优惠券类型：
                     <c:if test="${vo.couponInfo.couponType eq '0'}">活动券</c:if>
                     <c:if test="${vo.couponInfo.couponType eq '1'}">品类券</c:if>
                     <c:if test="${vo.couponInfo.couponType eq '2'}">活动券</c:if>
                     <c:if test="${vo.couponInfo.couponType eq '3'}">店铺券</c:if>
                 </span>
-                <span>满减金额：${vo.couponInfo.couponAmount}</span>
-                <span>购买金额：${vo.receiptAmount}</span>
-                <span>交易号：${vo.couponInfo.mbOrderId}</span>
+                    <span>满减金额：${vo.couponInfo.couponAmount}</span>
+                    <span>购买金额：${vo.receiptAmount}</span>
+                    <span>交易号：${vo.couponInfo.mbOrderId}</span>
+                </div>
             </div>
-        </div>
-    </c:if>
-
-    <c:if test="${ voucherVo ne null }">
-        <div class="order-rows">
+        </c:if>
 
-            <label>线下支付凭证：</label>
-            <c:forEach items="${voucherVo}" var="voucher">
-                <div>
-                    <p><fmt:formatDate value="${voucher.addTime}" pattern="yyyy-MM-dd HH:mm:ss"/></p>
-                    <c:if test="${voucher.images ne null  }">
-                        <div>
-                            <c:forEach items="${voucher.images}" var="items" varStatus="index">
-                                <c:if test="${items.image ne null  }">
-                                    <a href="${items.image}" target="_blank">
-                                        <img class="supplier-img" src="${items.image}" style="width: 120px;height: 120px"/>
-                                    </a>
-                                </c:if>
-                            </c:forEach>
-                        </div>
-                    </c:if>
-                    <p>备注: ${voucher.remarks}</p>
-                </div>
-            </c:forEach>
-        </div>
-    </c:if>
-</div>
-<script>
-    (function () {
-        var row4_wrapper = $('.row4-wrapper');
-        row4_wrapper.each(function (index) {
-            if (index % 2 !== 0) {
-                row4_wrapper.eq(index).css('color', '#2fa4e7');
-            }
-        })
-    })()
-</script>
+        <c:if test="${ voucherVo ne null }">
+            <div class="order-rows">
+
+                <label>线下支付凭证：</label>
+                <c:forEach items="${voucherVo}" var="voucher">
+                    <div>
+                        <p><fmt:formatDate value="${voucher.addTime}" pattern="yyyy-MM-dd HH:mm:ss"/></p>
+                        <c:if test="${voucher.images ne null  }">
+                            <div>
+                                <c:forEach items="${voucher.images}" var="items" varStatus="index">
+                                    <c:if test="${items.image ne null  }">
+                                        <a href="${items.image}" target="_blank">
+                                            <img class="supplier-img" src="${items.image}"
+                                                 style="width: 120px;height: 120px"/>
+                                        </a>
+                                    </c:if>
+                                </c:forEach>
+                            </div>
+                        </c:if>
+                        <p>备注: ${voucher.remarks}</p>
+                    </div>
+                </c:forEach>
+            </div>
+        </c:if>
+    </div>
+    <script>
+        (function () {
+            var row4_wrapper = $('.row4-wrapper');
+            row4_wrapper.each(function (index) {
+                if (index % 2 !== 0) {
+                    row4_wrapper.eq(index).css('color', '#2fa4e7');
+                }
+            })
+        })()
+    </script>
 </body>
 </html>