商品状态修改

src/main/java/com/caimei/modules/product/web/ProductNewController.java

@@ -670,7 +670,7 @@ public class ProductNewController extends BaseController {
     public Map<String, Object> auditProduct(String validFlag, Integer productID, String remarks) {
         Map<String, Object> map = Maps.newLinkedHashMap();
         try {
-            if (StringUtils.isBlank(validFlag) || null == productID || StringUtils.isBlank(remarks)) {
+            if (StringUtils.isBlank(validFlag) || null == productID) {
                 throw new Exception("参数错误！");
             }
             //冻结,删除,隐身需判断促销活动
@@ -681,8 +681,10 @@ public class ProductNewController extends BaseController {
                     return map;
                 }
             }
-            //保存商品状态修改记录
-            productNewService.statusRecordSave(productID, validFlag, remarks);
+            if (StringUtils.isNotBlank(remarks)) {
+                //保存商品状态修改记录
+                productNewService.statusRecordSave(productID, validFlag, remarks);
+            }
             // 当进行冻结操作时，保存冻结前的状态，解除冻结时需要恢复为之前的状态
             String beforeValidFlag = null;
             if ("10".equals(validFlag)) {

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

@@ -252,7 +252,7 @@
 				</td>
 				<shiro:hasPermission name="product:product:edit">
 					<c:if test="${product.validFlag eq 0}">
-						<td class="todo">无</td>
+						<a href="${ctx}/product/new/statusRemarks?productId=${product.id}">状态备注</a>
 					</c:if>
 					<c:if test="${product.productCategory eq 2}">
 						<c:if test="${product.validFlag ne 0}">
@@ -380,6 +380,10 @@
 			$('.tips-popup-reason').hide();
 		});
 
+		$('.close-btn1').on('click', function () {
+			$('.tips-popup-reason').hide();
+		});
+
 		$('.tips-cfm-directly').on('click', function () {
 			if ($('.tips-cfm-btn').hasClass('tips-cfm-directly')) {
 				$('.tips-popup').hide();