bugfix

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

@@ -111,6 +111,9 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
                 orderUserInfo.setFirstClubType(club.getFirstClubType());
             }
         }
+        //支付凭证
+        List<CmOrderPaymentVoucherVo> voucherVo = newOrderService.findVoucherVoOrderID(shopOrder.getShopOrderID());
+        shopOrder.setVoucherVo(voucherVo);
         List<NewOrderProduct> list = newOrderProductDao.findListByShopOrderID(shopOrder.getShopOrderID());
         List<NewOrderProduct> listAll = new ArrayList<NewOrderProduct>();
         if (null != list && list.size() > 0) {

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

@@ -260,7 +260,7 @@
                 </c:if>
                 <c:if test="${order.orderType == 0}">
                     协销订单
-                    <c:if test="${not empty order.spName and order.organizeId != 4}">
+                    <c:if test="${not empty order.spName and order.organizeID != 4}">
                         <br>${fns:appendLast1('(',order.spName,')')}
                     </c:if>
                 </c:if>

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

@@ -625,6 +625,30 @@
         </c:forEach>
     </div>
 </c:if>
+<c:if test="${ order.voucherVo ne null }">
+    <div class="order-rows">
+
+        <label>线下支付凭证：</label>
+        <c:forEach items="${order.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 class="remarks-drawer-content">--%>
 <%--    <div class="drawer-btn-main">--%>