bugfix-订单相关

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

@@ -990,7 +990,6 @@
           AND cdr.payWay = 1
           AND cdr.receiptDate <![CDATA[  <=  ]]> #{currentTime}
           AND co.organizeID = 0
-          AND co.orderType != 2
           AND co.refundType != 2
     </select>
 

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

@@ -817,7 +817,7 @@
                 <span>留言：${shopOrder.note}</span>
             </c:if>
         </c:if>
-        <c:if test="${order.onlinePayFlag ne 1}">
+        <c:if test="${order.onlinePayFlag eq 1}">
             <c:if test="${shopOrder.postFeeCos eq '0'}">
                 <c:if test="${order.status ne 0 && order.status ne 11}">
                     <div class="delivery-wrapper">

src/main/webapp/WEB-INF/views/modules/product-new/productList.jsp

@@ -207,28 +207,28 @@
 					</c:if>
 				</td>
 				<td>
-						${product.splitCode}
-				</td>
-				<td>
-				    <c:if test="${product.productCategory eq 2}">
-				        ---
+					<c:if test="${product.productCategory eq 2}">
+						---
 					</c:if>
 					<c:if test="${product.productCategory ne 2}">
-					    <c:if test="${product.priceFlag eq 0}">
-						<font color="green">对所有机构公开</font>
-                        </c:if>
-                        <c:if test="${product.priceFlag eq 1}">
-                            <font color="red">价格不公开</font>
-                        </c:if>
-                        <c:if test="${product.priceFlag eq 2}">
-                            <font color="#ff8c00">仅对会员机构公开</font>
-                        </c:if>
+						<c:if test="${product.priceFlag eq 0}">
+							<font color="green">对所有机构公开</font>
+						</c:if>
+						<c:if test="${product.priceFlag eq 1}">
+							<font color="red">价格不公开</font>
+						</c:if>
+						<c:if test="${product.priceFlag eq 2}">
+							<font color="#ff8c00">仅对会员机构公开</font>
+						</c:if>
 						<c:if test="${product.priceFlag eq 3}">
 							<font color="#ff69b4">仅对医美机构公开</font>
 						</c:if>
 					</c:if>
 				</td>
 				<td>
+						${product.splitCode}
+				</td>
+				<td>
 <%--				${fns:getDictLabel(product.validFlag,"product_status","" )}--%>
 					<%--商品状态（0逻辑删除 1待审核 2已上架 3已下架 8审核未通过 9已隐身 10已冻结）--%>
 					<c:if test="${product.validFlag eq 0}">