Sfoglia il codice sorgente

组织促销活动2

Aslee 4 anni fa
parent
commit
33a1288e43

+ 2 - 2
src/main/resources/mappings/modules/weisha/CmOrganizePromotionMapper.xml

@@ -177,13 +177,13 @@
                 AND s.name LIKE concat('%',#{shopName},'%')
             </if>
             <if test="ids != null and ids.size > 0">
-                AND cop.productId NOT IN
+                AND cop.id NOT IN
                 <foreach collection="ids" open="(" close=")" item="id" separator=",">
                     #{id}
                 </foreach>
             </if>
             <if test="promotionType == 1 or promotionType == 2">
-                AND cop.productId NOT IN
+                AND cop.id NOT IN
                 (SELECT cpp.productId
                 FROM cm_organize_promotions_product cpp
                 LEFT JOIN cm_organize_promotions cp on cpp.promotionsId = cp.id

+ 3 - 1
src/main/webapp/WEB-INF/views/modules/weisha/organizeSinglePromotionForm.jsp

@@ -258,6 +258,7 @@
 
         function deleteProduct(obj, storeStatus,type) {
             //将该行数据取消勾选,若存在数据库中则将其删除
+            debugger
             $(".check-item[value=" + obj + "]").prop("checked", false);
             var delProductIds = $("#delProductIds").val();
             var delGiftIds = $("#delGiftIds").val();
@@ -293,6 +294,7 @@
         }
 
         function getCheckedItems(type) {
+            debugger
             var items = new Array();
             var $items = type==0? $('.check-item:checked'):type==1?$("#productCheckItem:checked"):$("#giftCheckItem:checked");
             $items.each(function () {
@@ -305,7 +307,7 @@
 </head>
 <body>
 <ul class="nav nav-tabs">
-    <li><a href="${ctx}/weisha/cmOrganizeProduct/?organizeId=${organizeId}">组织商品列表</a></li>
+    <li><a href="${ctx}/weisha/cmMallOrganize/">组织列表</a></li>
     <li><a href="${ctx}/weisha/cmOrganizePromotions/list?type=1&organizeId=${cmOrganizePromotion.organizeId}">单品促销</a></li>
     <li class="active"><a href="${ctx}/weisha/cmOrganizePromotions/form?id=${cmOrganizePromotion.id}&type=1&organizeId=${cmOrganizePromotion.organizeId}">${not empty cmOrganizePromotion.id?'编辑':'添加'}单品促销</a></li>
 </ul><br/>

+ 30 - 31
src/main/webapp/WEB-INF/views/modules/weisha/organizeSinglePromotionList.jsp

@@ -28,7 +28,7 @@
 </head>
 <body>
 <ul class="nav nav-tabs">
-    <li><a href="${ctx}/weisha/cmOrganizeProduct/?organizeId=${organizeId}">组织商品列表</a></li>
+    <li><a href="${ctx}/weisha/cmMallOrganize/">组织列表</a></li>
     <li class="active"><a href="${ctx}/weisha/cmOrganizePromotions/list?type=1&organizeId=${cmOrganizePromotion.organizeId}">单品促销</a></li>
 </ul>
 <form:form id="searchForm" modelAttribute="cmOrganizePromotion" action="${ctx}/weisha/cmOrganizePromotions/list?type=1" method="post"
@@ -81,61 +81,61 @@
     </tr>
     </thead>
     <tbody>
-    <c:forEach items="${page.list}" var="cmOrganizePromotion">
+    <c:forEach items="${page.list}" var="promotion">
         <tr>
             <td rowspan="2">
-                    ${cmOrganizePromotion.id}
+                    ${promotion.id}
             </td>
-            <td style="color: ${cmOrganizePromotion.mode eq 1?"green":cmOrganizePromotion.mode eq 2?"orange":"purple"}">
-                ${cmOrganizePromotion.mode eq 1?"优惠价":cmOrganizePromotion.mode eq 2?"满减":"满赠"}
+            <td style="color: ${promotion.mode eq 1?"green":promotion.mode eq 2?"orange":"purple"}">
+                ${promotion.mode eq 1?"优惠价":promotion.mode eq 2?"满减":"满赠"}
             </td>
             <td>
-                <c:if test="${cmOrganizePromotion.mode eq 1}">
-                    优惠价:<fmt:formatNumber value="${cmOrganizePromotion.touchPrice}" pattern="#,##0.00" maxFractionDigits="2"/>
+                <c:if test="${promotion.mode eq 1}">
+                    优惠价:<fmt:formatNumber value="${promotion.touchPrice}" pattern="#,##0.00" maxFractionDigits="2"/>
                 </c:if>
-                <c:if test="${cmOrganizePromotion.mode eq 2}">
-                    满<fmt:formatNumber value="${cmOrganizePromotion.touchPrice}" pattern="#,##0.00" maxFractionDigits="2"/>
-                    ,减<fmt:formatNumber value="${cmOrganizePromotion.reducedPrice}" pattern="#,##0.00" maxFractionDigits="2"/>
+                <c:if test="${promotion.mode eq 2}">
+                    满<fmt:formatNumber value="${promotion.touchPrice}" pattern="#,##0.00" maxFractionDigits="2"/>
+                    ,减<fmt:formatNumber value="${promotion.reducedPrice}" pattern="#,##0.00" maxFractionDigits="2"/>
                 </c:if>
-                <c:if test="${cmOrganizePromotion.mode eq 3}">
-                    满<fmt:formatNumber value="${cmOrganizePromotion.touchPrice}" pattern="#,##0.00" maxFractionDigits="2"/>,赠品:<c:if test="${cmOrganizePromotion.giftTypeNumber > 1}">${cmOrganizePromotion.giftTypeNumber}类</c:if>${cmOrganizePromotion.giftNumber}个,详见下表
+                <c:if test="${promotion.mode eq 3}">
+                    满<fmt:formatNumber value="${promotion.touchPrice}" pattern="#,##0.00" maxFractionDigits="2"/>,赠品:<c:if test="${promotion.giftTypeNumber > 1}">${promotion.giftTypeNumber}类</c:if>${promotion.giftNumber}个,详见下表
                 </c:if>
             </td>
             <td>
-                ${cmOrganizePromotion.status eq 1?"永久":"区间有效"}
+                ${promotion.status eq 1?"永久":"区间有效"}
             </td>
             <td>
-                <c:if test="${cmOrganizePromotion.status eq 2}">
-                    <fmt:formatDate value="${cmOrganizePromotion.beginTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
+                <c:if test="${promotion.status eq 2}">
+                    <fmt:formatDate value="${promotion.beginTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
                 </c:if>
             </td>
             <td>
-                <c:if test="${cmOrganizePromotion.status eq 2}">
-                    <fmt:formatDate value="${cmOrganizePromotion.endTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
+                <c:if test="${promotion.status eq 2}">
+                    <fmt:formatDate value="${promotion.endTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
                 </c:if>
             </td>
-            <td style="color: ${cmOrganizePromotion.delFlag1 eq 1?"purple":cmOrganizePromotion.delFlag1 eq 2?"green":cmOrganizePromotion.delFlag1 eq 3?"orange":cmOrganizePromotion.delFlag1 eq 0?"red":"black"}">
-                ${cmOrganizePromotion.delFlag1 eq 1?"未开始":cmOrganizePromotion.delFlag1 eq 2?"进行中":cmOrganizePromotion.delFlag1 eq 3?"已结束":cmOrganizePromotion.delFlag1 eq 0?"已关闭":"未知"}
+            <td style="color: ${promotion.delFlag1 eq 1?"purple":promotion.delFlag1 eq 2?"green":promotion.delFlag1 eq 3?"orange":promotion.delFlag1 eq 0?"red":"black"}">
+                ${promotion.delFlag1 eq 1?"未开始":promotion.delFlag1 eq 2?"进行中":promotion.delFlag1 eq 3?"已结束":promotion.delFlag1 eq 0?"已关闭":"未知"}
             </td>
             <td>
-                <fmt:formatDate value="${cmOrganizePromotion.updateTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
+                <fmt:formatDate value="${promotion.updateTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
             </td>
             <td>
-                <c:if test="${cmOrganizePromotion.delFlag1 eq 0}">
-                    <a href="javascript:void(0);" onclick="updateStatus(${cmOrganizePromotion.id},'open')">开启</a>
+                <c:if test="${promotion.delFlag1 eq 0}">
+                    <a href="javascript:void(0);" onclick="updateStatus(${promotion.id},'open')">开启</a>
                 </c:if>
-                <c:if test="${cmOrganizePromotion.delFlag1 ne 0}">
-                    <a href="javascript:void(0);" onclick="updateStatus(${cmOrganizePromotion.id},'close')">关闭</a>
+                <c:if test="${promotion.delFlag1 ne 0}">
+                    <a href="javascript:void(0);" onclick="updateStatus(${promotion.id},'close')">关闭</a>
                 </c:if>
-                <a href="${ctx}/weisha/cmOrganizePromotions/form?id=${cmOrganizePromotion.id}">编辑</a>
-                <a href="javascript:void(0);" onclick="updateStatus(${cmOrganizePromotion.id},'delete')">删除</a>
+                <a href="${ctx}/weisha/cmOrganizePromotions/form?id=${promotion.id}&organizeId=${cmOrganizePromotion.organizeId}">编辑</a>
+                <a href="javascript:void(0);" onclick="updateStatus(${promotion.id},'delete')">删除</a>
             </td>
         </tr>
         <tr>
             <td colspan="8" style="text-align: left">
-                <c:if test="${cmOrganizePromotion.promotionProducts.size()>0}">
+                <c:if test="${promotion.promotionProducts.size()>0}">
                     <p>促销商品:</p >
-                    <c:forEach items="${cmOrganizePromotion.promotionProducts}" var="promotionProduct">
+                    <c:forEach items="${promotion.promotionProducts}" var="promotionProduct">
                         <p>
                             <img src="${promotionProduct.mainImage}" alt="图片" width="50px" height="50px">
                             <span style="position: absolute; left: 120px;width: 550px">商品名称:${promotionProduct.name}</span>
@@ -144,9 +144,9 @@
                         </p>
                     </c:forEach>
                 </c:if>
-                <c:if test="${cmOrganizePromotion.giftProducts.size()>0}">
+                <c:if test="${promotion.giftProducts.size()>0}">
                     <p>赠送商品:</p>
-                    <c:forEach items="${cmOrganizePromotion.giftProducts}" var="giftProduct">
+                    <c:forEach items="${promotion.giftProducts}" var="giftProduct">
                         <p>
                             <img src="${giftProduct.mainImage}" alt="图片" width="50px" height="50px">
                             <span style="position: absolute; left: 120px;width: 550px">商品名称:${giftProduct.name}</span>
@@ -165,7 +165,6 @@
                 <td>机构价:${promotionProduct.price1}</td>
             </tr>
         </c:forEach>--%>
-        <c:forEach items="${page.list}" var="cmOrganizePromotion"></c:forEach>
     </c:forEach>
     </tbody>
 </table>