供应商给机构下单

src/main/java/com/caimei/modules/product/service/ProductService.java

@@ -697,6 +697,7 @@ public class ProductService extends CrudService<ProductDao, Product> {
         Integer costCheckFlag = productDao.getCostCheckFlag(productID, 4);
         skuOrganizeList.forEach(o -> {
             o.setCostCheckFlag(costCheckFlag);
+            o.ladderPriceList(productDao.findLadderPriceBySku(o.skuId()));
         });
         return skuOrganizeList;
     }

src/main/resources/mappings/modules/product/ProductMapper.xml

@@ -2084,6 +2084,7 @@
                cs.organizeCostPrice,
                cs.cmCostPrice,
                cs.price,
+               cs.ladderPriceFlag,
                cs.minBuyNumber,
                cs.organizePercent,
                cs.shopPercent,

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}">
+                    <c:if test="${not empty order.spName and order.organizeId != 4}">
                         <br>${fns:appendLast1('(',order.spName,')')}
                     </c:if>
                 </c:if>