促销活动bugfix

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

@@ -52,7 +52,7 @@ public class CmPromotionService extends CrudService<CmPromotionDao, CmPromotion>
         List<Shop> promotionShops = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(promotionList)) {
             for (CmPromotion promotion : promotionList) {
-                if("1".equals(promotion.getType())){
+                if("1".equals(promotion.getMode())){
                     promotion.setSkus(productDao.findSkuByPromotion(promotion.getId()));
                 }
                 if (StringUtils.isNotBlank(cmPromotion.getProductName())) {
@@ -94,7 +94,6 @@ public class CmPromotionService extends CrudService<CmPromotionDao, CmPromotion>
                     //根据促销id和商品名查询
                     promotionProducts = findPromotionProduct(promotion);
                     promotion.setPromotionProducts(promotionProducts);
-
                 } else {
                     promotionShops = findPromotionShops(promotion);
                     promotion.setPromotionShops(promotionShops);

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

@@ -154,10 +154,17 @@
                             <span style="position: absolute; left: 1100px">
                                 <p style="float: left">机构价：</p>
                                 <div style="float:left">
-                                <c:forEach items="${cmPromotion.skus}" var="sku">
-                                    <div>&nbsp;&nbsp;&nbsp;&nbsp;${sku.unit}-￥${sku.price}</div>
-                                </c:forEach>
-                                    </div>
+                                  <c:if test="${cmPromotion.mode eq 1}">
+                                      <c:forEach items="${cmPromotion.skus}" var="sku">
+                                          <div class="cm-sku-item">&nbsp;&nbsp;&nbsp;&nbsp;${sku.unit}-￥${sku.price}&nbsp;&nbsp;</div>
+                                      </c:forEach>
+                                  </c:if>
+                                    <c:if test="${cmPromotion.mode ne 1}">
+                                        <c:forEach items="${promotionProduct.skuList}" var="sku">
+                                            <div class="cm-sku-item">&nbsp;&nbsp;&nbsp;&nbsp;${sku.unit}-￥${sku.price}&nbsp;&nbsp;</div>
+                                        </c:forEach>
+                                    </c:if>
+                                </div>
                             </span>
                         </div>
                     </c:forEach>