付供应商优化

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

@@ -330,6 +330,7 @@
 <ul class="nav nav-tabs">
     <li class="active tab-li"><a href="${ctx}/shopOrder/checkPaymentOrder">订单财务信息</a></li>
 </ul>
+
 <form:form id="searchForm" onsubmit="submitFunc()" modelAttribute="newOrder"
            action="${ctx}/shopOrder/checkPaymentOrder" method="post" class="breadcrumb form-search">
     <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
@@ -557,14 +558,6 @@
                             </c:if>
                         </td>
                         <td colspan="2">
-                                <%--                            <fmt:formatNumber value="${so.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>--%>
-                                <%--                            <c:if test="${so.differenceType eq 1 && so.differencePrice > 0}">--%>
-                                <%--                                <font color="red">(需补差价￥${so.differencePrice})</font>--%>
-                                <%--                            </c:if>--%>
-                                <%--                            <c:if test="${so.differenceType eq 2 && so.differencePrice > 0}">--%>
-                                <%--                                <font color="red">(需退差价￥${so.differencePrice})</font>--%>
-                                <%--                            </c:if>--%>
-
                             <c:if test="${so.differenceType ne 1 && so.differenceType ne 2 }">
                                 <font color="#E15616"><fmt:formatNumber value="${so.shouldPayShopAmount}" type="number"
                                                                         pattern="#,##0.00"/></font>

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

@@ -422,7 +422,9 @@
                     <td colspan="2" class="payCm-t"></td>
                     <td colspan="3" class="taxes"><fmt:formatNumber value="${s.shopTaxFee}" type="number" pattern="#,##0.00"/></td>
                     <td colspan="2" class="supplier-fee">
-                        <div>应付：<fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
+                        <div>
+                            <c:if test="${s.differenceType ne 1 && s.differenceType ne 2}">应付：<fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
+                            </c:if>
                             <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
                                 <font color="red">${s.shouldPayShopAmount-s.differencePrice}(原应付：${s.shouldPayShopAmount},已退差价：${s.differencePrice})</font>
                             </c:if>