商品楼层增加商品状态

src/main/java/com/caimei/modules/newhome/entity/NewPageFloorImage.java

@@ -81,6 +81,11 @@ public class NewPageFloorImage implements Serializable {
      */
     private String createDate;
 
+    /**
+     * 商品状态，见表c_productstatus或枚举ProductStatus，0逻辑删除 1待审核 2已上架 3已下架 8审核未通过 9已隐身 10已冻结
+     */
+    private String validFlag;
+
     public Integer getId() {
         return id;
     }
@@ -200,4 +205,12 @@ public class NewPageFloorImage implements Serializable {
     public void setAppletsImage(String appletsImage) {
         this.appletsImage = appletsImage;
     }
+
+    public String getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag;
+    }
 }

src/main/java/com/caimei/modules/newhome/web/NewPageFloorController.java

@@ -140,23 +140,6 @@ public class NewPageFloorController extends BaseController {
     public String goContentPage(NewPageFloorContent floorContent, Model model) {
         floorContent = newPageFloorService.findFloorContent(floorContent.getFloorId());
         model.addAttribute("floorContent", floorContent);
-        /*String returnUrl = "";
-        if (newPageFloor.getId() != null && newPageFloor.getId() != "") {
-            if (newPageFloor.getId().equals("1")) {
-                returnUrl = "/newhome/newActivity/?repage";
-            } else if (newPageFloor.getId().equals("2")) {
-                returnUrl = "/newhome/newActivity/groupList?repage";
-            } else if (newPageFloor.getId().equals("3")) {
-                returnUrl = "/newhome/newPageQualitySupplier/?repage";
-            } else if (newPageFloor.getId().equals("4")) {
-                returnUrl = "/newhome/newPageCommodityTopic/?repage";
-            } else if (newPageFloor.getId().equals("5")) {
-                returnUrl = "/newhome/newPageSmallTopic/?repage";
-            } else if (newPageFloor.getId().equals("6")) {
-                returnUrl = "/cmpage/cmPageBigTopic/?repage";
-            }
-        }
-        return "redirect:" + Global.getAdminPath() + returnUrl;*/
         return "modules/newhome/newPageFloorContentForm";
     }
 

src/main/java/com/caimei/modules/product/dao/ProductNewDao.java

@@ -55,5 +55,5 @@ public interface ProductNewDao extends CrudDao<Product> {
 
     void insertStatusRecord(ProductStatusRecord statusRecord);
 
-    List<ProductStatusRecord> findALLStatusRemarks(Integer productId);
+    List<ProductStatusRecord> findAllStatusRemarks(Integer productId);
 }

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

@@ -253,7 +253,7 @@ public class ProductNewService extends CrudService<ProductNewDao, Product> {
     }
 
     public List<ProductStatusRecord> findStatusRemarks(Integer productId) {
-        List<ProductStatusRecord> recordList = productNewDao.findALLStatusRemarks(productId);
+        List<ProductStatusRecord> recordList = productNewDao.findAllStatusRemarks(productId);
         if (recordList != null && recordList.size() > 0) {
             recordList.forEach(record -> {
                 User user = UserUtils.get(String.valueOf(record.getModifyUserId()));

src/main/resources/mappings/modules/cmpage/CmPageCentreMapper.xml

@@ -176,26 +176,29 @@
 
 	<select id="findFloorImage" resultType="com.caimei.modules.newhome.entity.NewPageFloorImage">
 		SELECT
-		  id,
-		  floorId,
-		  centreId,
-		  productId,
-		  `name`,
-		  content,
-		  link,
-		  image,
-		  appletsImage,
-		  adsImage,
-		  `label`,
-		  pcStatus,
-		  appletsStatus,
-		  sort,
-		  DATE_FORMAT(createDate,'%Y-%m-%d %H:%i:%S') AS createDate
+		  a.id,
+		  a.floorId,
+		  a.centreId,
+		  a.productId,
+		  IF(a.productId IS NULL, a.name, p.name) AS name,
+		  a.content,
+		  a.link,
+		  IF(a.productId IS NULL, a.image, p.mainImage) AS image,
+		  a.appletsImage,
+		  a.adsImage,
+		  a.`label`,
+		  a.pcStatus,
+		  a.appletsStatus,
+		  a.sort,
+		  DATE_FORMAT(a.createDate, '%Y-%m-%d %H:%i:%S') AS createDate,
+		  p.validFlag
 		FROM
-		  new_page_floor_image
+		  new_page_floor_image a
+		  LEFT JOIN product p ON a.productId = p.productID
 		WHERE
-		  centreId = #{centreId}
+		  a.centreId = #{centreId}
 	</select>
+
 	<select id="findPageTitle" resultType="java.lang.String">
 		select title from cm_page where id = #{pageId}
 	</select>

src/main/resources/mappings/modules/newhome/NewPageFloorMapper.xml

@@ -149,24 +149,26 @@
 
 	<select id="findFloorImage" resultType="com.caimei.modules.newhome.entity.NewPageFloorImage">
 		SELECT
-		  id,
-		  floorId,
-		  productId,
-		  `name`,
-		  content,
-		  link,
-		  image,
-		  appletsImage,
-		  adsImage,
-		  `label`,
-		  pcStatus,
-		  appletsStatus,
-		  sort,
-		  DATE_FORMAT(createDate,'%Y-%m-%d %H:%i:%S') AS createDate
+		  a.id,
+		  a.floorId,
+		  a.productId,
+		  IF(a.productId IS NULL, a.name, p.name) AS name,
+		  a.content,
+		  a.link,
+		  IF(a.productId IS NULL, a.image, p.mainImage) AS image,
+		  a.appletsImage,
+		  a.adsImage,
+		  a.`label`,
+		  a.pcStatus,
+		  a.appletsStatus,
+		  a.sort,
+		  DATE_FORMAT(a.createDate, '%Y-%m-%d %H:%i:%S') AS createDate,
+		  p.validFlag
 		FROM
-		  new_page_floor_image
+		  new_page_floor_image a
+		  LEFT JOIN product p ON a.productId = p.productID
 		WHERE
-		  floorId = #{floorId}
+		  a.floorId = #{floorId}
 	</select>
 
 	<insert id="insertFloorContent">

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

@@ -1148,7 +1148,7 @@
           )
     </insert>
 
-    <select id="findALLStatusRemarks" resultType="com.caimei.modules.product.entity.ProductStatusRecord">
+    <select id="findAllStatusRemarks" resultType="com.caimei.modules.product.entity.ProductStatusRecord">
         SELECT
           id,
           `productId`,
@@ -1160,6 +1160,8 @@
           `product_status_record`
         WHERE
           productId = #{productId}
+        ORDER BY
+          addTime DESC
     </select>
 
 </mapper>

src/main/webapp/WEB-INF/views/modules/newhome/addProductImage.jsp

@@ -124,6 +124,7 @@
         var items = {
             "id": "",
             "productId": product.productID,
+            "validFlag": product.validFlag,
             "image": product.mainImage,
             "name": product.name,
             "link": link,

src/main/webapp/WEB-INF/views/modules/newhome/newPageFloorContentForm.jsp

@@ -318,6 +318,7 @@
                 </th>
                 <th>图片</th>
                 <th>名称</th>
+                <th>商品状态</th>
                 <th>跳转链接</th>
                 <th>标签</th>
                 <th>网站状态</th>
@@ -445,6 +446,7 @@
         imageList.push({
             id: "${floorImage.id}",
             productId: "${empty floorImage.productId ? "":floorImage.productId}",
+            validFlag: "${floorImage.validFlag}",
             image: "${floorImage.image}",
             name: "${floorImage.name}",
             link: "${floorImage.link}",
@@ -560,6 +562,11 @@
             ) : (data.name)) +
             '</td>' +
             '<td>' +
+            (data.productId == '' ? (
+                ('------')
+            ) : (data.validFlag == '0' ? "逻辑删除":(data.validFlag == '2' ? "已上架": (data.validFlag == '3' ? "已下架":(data.validFlag == '9' ? "已隐身":(data.validFlag == '10' ? "已冻结":"------")))))) +
+            '</td>' +
+            '<td>' +
             (data.productId == '' ? (
                 '<input value="' + data.link + '"  onchange="changeLink(' + index + ',this)">'
             ) : ('------')) +

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

@@ -291,7 +291,7 @@
             <td colspan="3"><form:input path="minBuyNumber" maxlength="11" class="short" /></td>
         </tr>
         <tr>
-            <th><span class="red">*</span>商品查看权限：</th>
+            <th><span class="red">*</span>商品可见度：</th>
             <td colspan="3">
                 <form:select path="visibility" class="input-large required" id="visibility">
                     <form:option value="3" label="所有人可见"/>

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

@@ -144,6 +144,7 @@
 				<th>供应商名称</th>
 				<th>市场价</th>
 				<th>机构价</th>
+				<th>商品可见度</th>
 				<th>价格可见度</th>
 				<th>状态</th>
 				<th>提交时间</th>
@@ -189,6 +190,17 @@
                     </c:if>
 				</td>
 				<td>${product.price1}</td>
+				<td>
+					<c:if test="${product.visibility eq 1}">
+						仅会员机构可见
+					</c:if>
+					<c:if test="${product.visibility eq 2}">
+						所有机构可见
+					</c:if>
+					<c:if test="${product.visibility eq 3}">
+						所有人可见
+					</c:if>
+				</td>
 				<td>
 				    <c:if test="${product.productCategory eq 2}">
 				        ---
@@ -559,20 +571,6 @@
 		$('.tips-popup-reason').show();
 		productID = id;
 		validFlag = flag;
-
-            /*top.$.jBox.confirm(msg,'系统提示',function(v,h,f){
-                if(v=='ok'){
-                    $.post("${ctx}/product/new/auditProduct",{'productID': id,'validFlag': flag}, function(data) {
-                        if(true==data.success){
-                            $.jBox.tip(data.msg, 'info');
-                        } else {
-                            $.jBox.tip(data.msg,'error');
-                        }
-                        $("#searchForm").submit();
-                    },"JSON");//这里返回的类型有：json,html,xml,text
-                }
-                return;
-            },{buttonsFocus:1,persistent: true});*/
 	}
 	// 一级分类
 	var bigtypeList = [

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

@@ -123,7 +123,7 @@
             <div>
                 <label>备注内容：${record.remarks}</label>
             </div>
-        </div>
+        </div><br>
         <hr>
     </c:forEach>
 </c:if>