bugfix

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

@@ -866,7 +866,7 @@
         });
         $(window).on("load", function () {
             $('.need-to-pay').each(function (index, ele) {
-                if ($(this).val() <= 0) {
+                if ($(this).val() < 0) {
                     alertx("待付金额为负数，不能操作付款抹平。请先去操作供应商退款，使数据恢复正常", function () {
                         window.location.href = "${ctx}/shopOrder/refundRecordList?operatingMode=2"
                     });

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

@@ -506,13 +506,25 @@
                                                                     pattern="#,##0.00"/></td>
                     <td class="supplier-fee">
                         <c:if test="${s.differenceType ne 1 && s.differenceType ne 2 }">
-                            <font color="#E15616"><fmt:formatNumber value="${s.shouldPayShopAmount-s.shopOtherFee}" type="number" pattern="#,##0.00"/></font>
+                            <span color="#E15616">
+                                <fmt:formatNumber value="${s.shouldPayShopAmount-s.shopOtherFee}" type="number" pattern="#,##0.00"/>
+                            </span>
                         </c:if>
                         <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                            <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount+s.differencePrice-s.shopOtherFee}"/></font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+                            <span color="black">
+                                <fmt:formatNumber value="${s.shouldPayShopAmount+(s.differencePrice-s.shopOtherFee)}" type="number" pattern="#,##0.00"/>
+                            </span>
+                            <font color="red">
+                                (原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})
+                            </font>
                         </c:if>
                         <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                            <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount-s.differencePrice-s.shopOtherFee}" type="number" pattern="#,##0.00"/></font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+                            <span color="black">
+                                <fmt:formatNumber value="${s.shouldPayShopAmount-(s.differencePrice+s.shopOtherFee)}" type="number" pattern="#,##0.00"/>
+                            </span>
+                            <font color="red">
+                                (原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})
+                            </font>
                         </c:if>
                     </td>
                     <input type="hidden" class="payedShopAmount" value="${s.payedShopAmount}">