订单收付信息bugfix

src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -1369,7 +1369,7 @@
         and settleType = 2
     </select>
     <select id="findSettleAmount" resultType="java.lang.Double">
-        SELECT SUM(settleAmount)
+        SELECT ifnull(SUM(settleAmount),0)
         FROM cm_settle_record csr
         LEFT JOIN cm_shop_order cso ON csr.shopOrderId = cso.shopOrderId
         WHERE settleType=1

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

@@ -500,9 +500,9 @@
                     </td>
                     <td>
                         <c:if test="${s.onlinePayFlag eq 0}">
-                            <c:if test="${s.settleAmount < s.shouldPayShopAmount && s.settleAmount > 0}">部分结算</c:if>
-                            <c:if test="${s.settleAmount eq s.shouldPayShopAmount && s.settleAmount > 0}">已结算</c:if>
-                            <c:if test="${s.settleAmount eq 0}">未结算</c:if>
+                            <c:if test="${s.settleAmount < s.shouldPayShopAmount && s.settleAmount > 0}"><font color="#ff8c00">部分结算</font></c:if>
+                            <c:if test="${s.settleAmount eq s.shouldPayShopAmount && s.settleAmount > 0}"><font color="green">已结算</font></c:if>
+                            <c:if test="${s.settleAmount eq 0}"><font color="red">未结算</font></c:if>
                         </c:if>
                         <c:if test="${s.onlinePayFlag eq 1}">---</c:if>
                     </td>