Merge remote-tracking branch 'origin/developer' into developerD

# Conflicts:
#	src/main/webapp/WEB-INF/views/modules/order/orderDetail.jsp

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

@@ -879,11 +879,10 @@
                 <c:if test="${order.organizeID != 4&&shopOrder.commercialCode eq 'E1807059160' && (order.receiptStatus == 2 || order.receiptStatus == 3)}">
                     <font color="red">(采美信息线上收款)</font>
                 </c:if>
-                <c:if test="${order.organizeID == 4}">
-                    <c:if test="${ voucherVo eq null &&voucher.addTime eq null }">
+                    <c:if test="${order.organizeID == 4&& voucherVo eq null }">
                         <font color="red">(联合丽格线上收款)</font>
                     </c:if>
-                    <c:if test="${ voucherVo ne null &&voucher.addTime ne null }">
+                    <c:if test="${order.organizeID == 4&& voucherVo ne null }">
                         <font color="red">(联合丽格线下收款)</font>
                     </c:if>
                 </c:if>
@@ -954,6 +953,12 @@
                         <c:if test="${shopOrder.payStatus == 3 or shopOrder.payStatus == 2}">
                                 <span>
                                     已付金额: <fmt:formatNumber value="${shopOrder.payed}" type="currency"/>
+                                      <c:if test="${order.organizeID == 4&& voucherVo eq null }">
+                                          <font color="red">(联合丽格线上收款)</font>
+                                      </c:if>
+                                        <c:if test="${order.organizeID == 4&& voucherVo ne null }">
+                                            <font color="red">(联合丽格线下收款)</font>
+                                        </c:if>
                                 </span>
                         </c:if>
                     </div>
@@ -1265,8 +1270,9 @@
     </div>
 </c:if>
 <%--</c:if>--%>
-<c:if test="${order.organizeID == 4&& voucherVo ne null &&voucher.addTime ne null  }">
+<c:if test="${order.organizeID == 4&& voucherVo ne null }">
     <div class="order-rows">
+
         <label>线下支付凭证：</label>
         <c:forEach items="${voucherVo}" var="voucher">
             <div>