bug fix

src/main/java/com/caimei/modules/order/entity/CmReturnedPurchase.java

@@ -20,7 +20,7 @@ public class CmReturnedPurchase extends DataEntity<CmReturnedPurchase> {
     private Integer organizeID;    //组织id
     private String orderNo;         //主订单号
     private String userName;        //买家名
-    private Integer userOrganizeId;     //机构所属组织Id
+//    private Integer userOrganizeId;     //机构所属组织Id
     //	private Integer shopOrderID;		// 子订单Id
     private Integer userID;        // 用户ID（买家）
     private String status;        // 状态：1待审核、2审核通过、3审核不通过
@@ -71,6 +71,9 @@ public class CmReturnedPurchase extends DataEntity<CmReturnedPurchase> {
     private String name; //机构名
     private Integer orderType; //订单类型 0协销订单、 1普通订单、 2呵呵订单
 
+    private String beginTime;     //时间开始 查询条件 申请时间
+    private String endTime;        //时间结束  查询条件 申请时间
+
     public String getName() {
         return name;
     }
@@ -462,4 +465,20 @@ public class CmReturnedPurchase extends DataEntity<CmReturnedPurchase> {
     public void setOrderType(Integer orderType) {
         this.orderType = orderType;
     }
+
+    public String getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(String beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
 }

src/main/java/com/caimei/modules/order/web/CmDiscernReceiptController.java

@@ -89,6 +89,14 @@ public class CmDiscernReceiptController extends BaseController {
     @RequiresPermissions("order:cmDiscernReceipt:view")
     @RequestMapping(value = {"list", ""})
     public String list(CmDiscernReceipt cmDiscernReceipt, HttpServletRequest request, HttpServletResponse response, Model model) {
+        if (null != cmDiscernReceipt.getStartTime() && !"".equals(cmDiscernReceipt.getStartTime()) && !cmDiscernReceipt.getStartTime().endsWith("00:00:00")) {
+            model.addAttribute("startTime", cmDiscernReceipt.getStartTime());
+            cmDiscernReceipt.setStartTime(cmDiscernReceipt.getStartTime().trim() + " 00:00:00");
+        }
+        if (null != cmDiscernReceipt.getEndTime() && !"".equals(cmDiscernReceipt.getEndTime()) && !cmDiscernReceipt.getEndTime().endsWith("23:59:59")) {
+            model.addAttribute("endTime", cmDiscernReceipt.getEndTime());
+            cmDiscernReceipt.setEndTime(cmDiscernReceipt.getEndTime().trim() + " 23:59:59");
+        }
         Page<CmDiscernReceipt> page = cmDiscernReceiptService.findPage(new Page<CmDiscernReceipt>(request, response), cmDiscernReceipt);
         //获取组织列表
         List<CmUserOrganize> cmUserOrganizeList = cmUserOrganizeService.findOrganize();

src/main/java/com/caimei/modules/order/web/CmPayShopController.java

@@ -73,6 +73,14 @@ public class CmPayShopController extends BaseController {
     @RequiresPermissions("order:cmPayShop:view")
     @RequestMapping(value = {"list", ""})
     public String list(CmPayShop cmPayShop, HttpServletRequest request, HttpServletResponse response, Model model) {
+        if (null != cmPayShop.getStartTime() && !"".equals(cmPayShop.getStartTime()) && !cmPayShop.getStartTime().endsWith("00:00:00")) {
+            model.addAttribute("startTime", cmPayShop.getStartTime());
+            cmPayShop.setStartTime(cmPayShop.getStartTime().trim() + " 00:00:00");
+        }
+        if (null != cmPayShop.getEndTime() && !"".equals(cmPayShop.getEndTime()) && !cmPayShop.getEndTime().endsWith("23:59:59")) {
+            model.addAttribute("endTime", cmPayShop.getEndTime());
+            cmPayShop.setEndTime(cmPayShop.getEndTime().trim() + " 23:59:59");
+        }
         Page<CmPayShop> page = cmPayShopService.findPage(new Page<CmPayShop>(request, response), cmPayShop);
         //获取组织列表
         List<CmUserOrganize> cmUserOrganizeList = cmUserOrganizeService.findOrganize();

src/main/java/com/caimei/modules/order/web/CmRefundShopController.java

@@ -53,6 +53,14 @@ public class CmRefundShopController extends BaseController {
 	@RequiresPermissions("order:cmRefundShop:view")
 	@RequestMapping(value = {"list", ""})
 	public String list(CmRefundShop cmRefundShop, HttpServletRequest request, HttpServletResponse response, Model model) {
+		if (null != cmRefundShop.getStartTime() && !"".equals(cmRefundShop.getStartTime()) && !cmRefundShop.getStartTime().endsWith("00:00:00")) {
+			model.addAttribute("startTime", cmRefundShop.getStartTime());
+			cmRefundShop.setStartTime(cmRefundShop.getStartTime().trim() + " 00:00:00");
+		}
+		if (null != cmRefundShop.getEndTime() && !"".equals(cmRefundShop.getEndTime()) && !cmRefundShop.getEndTime().endsWith("23:59:59")) {
+			model.addAttribute("endTime", cmRefundShop.getEndTime());
+			cmRefundShop.setEndTime(cmRefundShop.getEndTime().trim() + " 23:59:59");
+		}
 		Page<CmRefundShop> page = cmRefundShopService.findPage(new Page<CmRefundShop>(request, response), cmRefundShop);
 		//获取组织列表
 		List<CmUserOrganize> cmUserOrganizeList = cmUserOrganizeService.findOrganize();

src/main/java/com/caimei/modules/order/web/CmReturnedPurchaseController.java

@@ -67,6 +67,14 @@ public class CmReturnedPurchaseController extends BaseController {
 
     @RequestMapping(value = {"list", ""})
     public String list(CmReturnedPurchase cmReturnedPurchase, HttpServletRequest request, HttpServletResponse response, Model model) {
+        if (null != cmReturnedPurchase.getBeginTime() && !"".equals(cmReturnedPurchase.getBeginTime()) && !cmReturnedPurchase.getBeginTime().endsWith("00:00:00")) {
+            model.addAttribute("beginTime", cmReturnedPurchase.getBeginTime());
+            cmReturnedPurchase.setBeginTime(cmReturnedPurchase.getBeginTime().trim() + " 00:00:00");
+        }
+        if (null != cmReturnedPurchase.getEndTime() && !"".equals(cmReturnedPurchase.getEndTime()) && !cmReturnedPurchase.getEndTime().endsWith("23:59:59")) {
+            model.addAttribute("endTime", cmReturnedPurchase.getEndTime());
+            cmReturnedPurchase.setEndTime(cmReturnedPurchase.getEndTime().trim() + " 23:59:59");
+        }
         Page<CmReturnedPurchase> page = cmReturnedPurchaseService.findPage(new Page<CmReturnedPurchase>(request, response), cmReturnedPurchase);
         //获取组织列表
         List<CmUserOrganize> cmUserOrganizeList = cmUserOrganizeService.findOrganize();

src/main/java/com/caimei/modules/order/web/CmShopOrderController.java

@@ -60,10 +60,12 @@ public class CmShopOrderController extends BaseController {
     @RequestMapping("payOrderList")
     public String payOrderList(NewShopOrder newShopOrder, HttpServletRequest request, HttpServletResponse response, Model model) {
         if (null != newShopOrder.getStartTime() && !"".equals(newShopOrder.getStartTime()) && !newShopOrder.getStartTime().endsWith("00:00:00")) {
-            newShopOrder.setStartTime(newShopOrder.getStartTime() + " 00:00:00");
+            model.addAttribute("startTime", newShopOrder.getStartTime());
+            newShopOrder.setStartTime(newShopOrder.getStartTime().trim() + " 00:00:00");
         }
         if (null != newShopOrder.getEndTime() && !"".equals(newShopOrder.getEndTime()) && !newShopOrder.getEndTime().endsWith("23:59:59")) {
-            newShopOrder.setEndTime(newShopOrder.getEndTime() + " 23:59:59");
+            model.addAttribute("endTime", newShopOrder.getEndTime());
+            newShopOrder.setEndTime(newShopOrder.getEndTime().trim() + " 23:59:59");
         }
         Page<NewShopOrder> page = newShopOrderService.findPayOrderList(new Page<>(request, response), newShopOrder);
         //获取组织列表
@@ -78,10 +80,12 @@ public class CmShopOrderController extends BaseController {
     @RequestMapping("refundRecordList")
     public String refundRecordList(NewShopOrder newShopOrder, HttpServletRequest request, HttpServletResponse response, Model model) {
         if (null != newShopOrder.getStartTime() && !"".equals(newShopOrder.getStartTime()) && !newShopOrder.getStartTime().endsWith("00:00:00")) {
-            newShopOrder.setStartTime(newShopOrder.getStartTime() + " 00:00:00");
+            model.addAttribute("startTime", newShopOrder.getStartTime());
+            newShopOrder.setStartTime(newShopOrder.getStartTime().trim() + " 00:00:00");
         }
         if (null != newShopOrder.getEndTime() && !"".equals(newShopOrder.getEndTime()) && !newShopOrder.getEndTime().endsWith("23:59:59")) {
-            newShopOrder.setEndTime(newShopOrder.getEndTime() + " 23:59:59");
+            model.addAttribute("endTime", newShopOrder.getEndTime());
+            newShopOrder.setEndTime(newShopOrder.getEndTime().trim() + " 23:59:59");
         }
         Page<NewShopOrder> page = newShopOrderService.findPayOrderList(new Page<>(request, response), newShopOrder);
         //获取组织列表
@@ -164,10 +168,12 @@ public class CmShopOrderController extends BaseController {
     @RequestMapping("checkPaymentOrder")
     public String checkPaymentOrder(NewOrder newOrder, HttpServletRequest request, HttpServletResponse response, Model model) {
         if (null != newOrder.getStartTime() && !"".equals(newOrder.getStartTime()) && !newOrder.getStartTime().endsWith("00:00:00")) {
-            newOrder.setStartTime(newOrder.getStartTime() + " 00:00:00");
+            model.addAttribute("startTime", newOrder.getStartTime());
+            newOrder.setStartTime(newOrder.getStartTime().trim() + " 00:00:00");
         }
         if (null != newOrder.getEndTime() && !"".equals(newOrder.getEndTime()) && !newOrder.getEndTime().endsWith("23:59:59")) {
-            newOrder.setEndTime(newOrder.getEndTime() + " 23:59:59");
+            model.addAttribute("endTime", newOrder.getEndTime());
+            newOrder.setEndTime(newOrder.getEndTime().trim() + " 23:59:59");
         }
         Page<NewOrder> page = newShopOrderService.findPaymentOrderList(new Page<NewOrder>(request, response), newOrder);
         List<CmUserOrganize> organizeList = cmUserOrganizeService.findOrganize();

src/main/java/com/caimei/modules/order/web/NewOrderController.java

@@ -151,27 +151,27 @@ public class NewOrderController extends BaseController {
     public String orderList(NewOrder order, HttpServletRequest request, HttpServletResponse response, Model model) {
         if (null != order.getStartTime() && !"".equals(order.getStartTime()) && !order.getStartTime().endsWith("00:00:00")) {
             model.addAttribute("startTime", order.getStartTime());
-            order.setStartTime(order.getStartTime() + " 00:00:00");
+            order.setStartTime(order.getStartTime().trim() + " 00:00:00");
         }
         if (null != order.getEndTime() && !"".equals(order.getEndTime()) && !order.getEndTime().endsWith("23:59:59")) {
             model.addAttribute("endTime", order.getEndTime());
-            order.setEndTime(order.getEndTime() + " 23:59:59");
+            order.setEndTime(order.getEndTime().trim() + " 23:59:59");
         }
         if (null != order.getStartConfirmTime() && !"".equals(order.getStartConfirmTime()) && !order.getStartConfirmTime().endsWith("00:00:00")) {
             model.addAttribute("startConfirmTime", order.getStartConfirmTime());
-            order.setStartConfirmTime(order.getStartConfirmTime() + " 00:00:00");
+            order.setStartConfirmTime(order.getStartConfirmTime().trim() + " 00:00:00");
         }
         if (null != order.getEndConfirmTime() && !"".equals(order.getEndConfirmTime()) && !order.getEndConfirmTime().endsWith("23:59:59")) {
             model.addAttribute("endConfirmTime", order.getEndConfirmTime());
-            order.setEndConfirmTime(order.getEndConfirmTime() + " 23:59:59");
+            order.setEndConfirmTime(order.getEndConfirmTime().trim() + " 23:59:59");
         }
         if (null != order.getStartRefundTime() && !"".equals(order.getStartRefundTime()) && !order.getStartRefundTime().endsWith("00:00:00")) {
             model.addAttribute("startRefundTime", order.getStartRefundTime());
-            order.setStartRefundTime(order.getStartRefundTime() + " 00:00:00");
+            order.setStartRefundTime(order.getStartRefundTime().trim() + " 00:00:00");
         }
         if (null != order.getEndRefundTime() && !"".equals(order.getEndRefundTime()) && !order.getEndRefundTime().endsWith("23:59:59")) {
             model.addAttribute("endRefundTime", order.getEndRefundTime());
-            order.setEndRefundTime(order.getEndRefundTime() + " 23:59:59");
+            order.setEndRefundTime(order.getEndRefundTime().trim() + " 23:59:59");
         }
         model.addAttribute("orderRefundType", order.getOrderRefundType());
         if (null != order.getBuyer()) {

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

@@ -47,4 +47,8 @@ public interface ProductNewDao extends CrudDao<Product> {
     void insertProductImage(ProductImage productimage);
 
     ProductImage getImageById(@Param("productImageID") Integer productImageID);
+
+    String getValidFlagByProductId(Integer productID);
+
+    String getBeforeValidFlagByProductId(Integer productID);
 }

src/main/java/com/caimei/modules/product/entity/Product.java

@@ -60,7 +60,7 @@ public class Product extends DataEntity<Product> {
     private Date classifyAddTime;     // 小程序分类添加时间
     private String sellNumber;        // 销量
     private String weekSellNumber;        // weekSellNumber
-    private String beforeValidFlag;        // beforeValidFlag
+    private String beforeValidFlag;        // 保存商品状态修改之前的状态（目前只在进行冻结操作时保存）
     private String favoriteTimes;        // 收藏量
     private String commentScore;        // 评论分数
     private String commentTimes;        // 评论次数

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

@@ -179,10 +179,11 @@ public class ProductNewService extends CrudService<ProductNewDao, Product> {
         }
     }
 
-    public void auditProduct(String validFlag, Integer productID) {
+    public void auditProduct(String validFlag, String beforeValidFlag, Integer productID) {
         Product product = new Product();
         product.setProductID(productID);
         product.setValidFlag(validFlag);
+        product.setBeforeValidFlag(beforeValidFlag);
         productNewDao.updateByPrimaryKeySelective(product);
     }
 

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

@@ -6,6 +6,7 @@ import com.caimei.modules.common.entity.Province;
 import com.caimei.modules.common.service.AreaService;
 import com.caimei.modules.opensearch.GenerateUtils;
 import com.caimei.modules.opensearch.CoreServiceUitls;
+import com.caimei.modules.product.dao.ProductNewDao;
 import com.caimei.modules.product.entity.*;
 import com.caimei.modules.product.service.*;
 import com.caimei.modules.user.entity.CmPageModules;
@@ -75,6 +76,9 @@ public class ProductNewController extends BaseController {
     private RedisService redisService;
     @Resource
     private GenerateUtils generateUtils;
+    @Resource
+    private ProductNewDao productNewDao;
+
     @ModelAttribute
     public Product get(@RequestParam(required = false) String id) {
         Product entity = null;
@@ -669,9 +673,6 @@ public class ProductNewController extends BaseController {
             if (null == validFlag || "".equals(validFlag) || null == productID) {
                 throw new Exception("参数错误！");
             }
-            if ("22".equals(validFlag)) {
-                validFlag = "2";
-            }
             //冻结,删除,隐身需判断促销活动
             if ("0".equals(validFlag) || "10".equals(validFlag) || "9".equals(validFlag)) {
                 map = productNewService.findPromotionStatus(validFlag, productID);
@@ -680,7 +681,21 @@ public class ProductNewController extends BaseController {
                     return map;
                 }
             }
-            productNewService.auditProduct(validFlag, productID);
+            // 当进行冻结操作时，保存冻结前的状态，解除冻结时需要恢复为之前的状态
+            String beforeValidFlag = null;
+            if ("10".equals(validFlag)) {
+                beforeValidFlag = productNewDao.getValidFlagByProductId(productID);
+            }
+            // 当进行解冻操作时，恢复冻结前的状态
+            if ("22".equals(validFlag)) {
+                beforeValidFlag = productNewDao.getBeforeValidFlagByProductId(productID);
+                if (StringUtils.isNotEmpty(beforeValidFlag)) {
+                    validFlag = beforeValidFlag;
+                } else {
+                    validFlag = "2";
+                }
+            }
+            productNewService.auditProduct(validFlag, beforeValidFlag, productID);
             map.put("success", true);
             map.put("msg", "操作成功");
             int valid = new Integer(validFlag);
@@ -715,7 +730,7 @@ public class ProductNewController extends BaseController {
             if (null == validFlag || "".equals(validFlag) || null == productID) {
                 throw new Exception("参数错误！");
             }
-            productNewService.auditProduct(validFlag, productID);
+            productNewService.auditProduct(validFlag, null, productID);
             map.put("success", true);
             map.put("msg", "操作成功");
             // 更新二手商品上架信息
@@ -773,7 +788,7 @@ public class ProductNewController extends BaseController {
 
             }
             // 更新商品库上下架状态
-            productNewService.auditProduct(validFlag, productId);
+            productNewService.auditProduct(validFlag, null, productId);
             map.put("success", true);
             cleanRedisCache();
         } catch (Exception e) {

src/main/resources/mappings/modules/order/CmReturnedPurchaseMapper.xml

@@ -137,11 +137,11 @@
 			<if test="confirmReturnTime != null and confirmReturnTime != ''">
 				AND a.confirmReturnTime = #{confirmReturnTime}
 			</if>
-			<if test="beginReturnTime != null and beginReturnTime != ''">
-				AND STR_TO_DATE(returnTime,'%Y-%m-%d %H:%i') <![CDATA[  >  ]]> STR_TO_DATE(#{beginReturnTime},'%Y-%m-%d %H:%i')
+			<if test="beginTime != null and beginTime != ''">
+				AND returnTime <![CDATA[  >=  ]]> #{beginTime}
 			</if>
-			<if test="endReturnTime != null and endReturnTime != ''">
-				AND STR_TO_DATE(returnTime,'%Y-%m-%d %H:%i') <![CDATA[  <  ]]> STR_TO_DATE(#{endReturnTime},'%Y-%m-%d %H:%i')
+			<if test="endTime != null and endTime != ''">
+				AND returnTime <![CDATA[  <=  ]]> #{endTime}
 			</if>
 			<if test="beginConfirmReturnTime != null and beginConfirmReturnTime != ''">
 				AND STR_TO_DATE(confirmReturnTime,'%Y-%m-%d %H:%i') <![CDATA[  >  ]]> STR_TO_DATE(#{beginConfirmReturnTime},'%Y-%m-%d %H:%i')

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

@@ -329,6 +329,12 @@
         from productimage
         where productImageID = #{productImageID}
     </select>
+    <select id="getValidFlagByProductId" resultType="java.lang.String">
+        select validFlag from product where productID = #{productID}
+    </select>
+    <select id="getBeforeValidFlagByProductId" resultType="java.lang.String">
+        select beforeValidFlag from product where productID = #{productID}
+    </select>
 
     <insert id="insert" parameterType="Product" keyProperty="id" useGeneratedKeys="true">
         INSERT INTO product(productID,

src/main/webapp/WEB-INF/views/modules/hehe/cmHeheFloorList.jsp

@@ -43,8 +43,8 @@
 				<th>ID</th>
 				<th>楼层标题</th>
 				<th>描述</th>
-				<th>排序</th>
 				<th>状态</th>
+				<th>排序</th>
 				<th>创建时间</th>
 				<th>操作</th>
 			</tr>
@@ -62,9 +62,6 @@
 				<td>
 					${cmHeheFloor.description}
 				</td>
-				<td>
-					<input id="sort" name="sort" style="width:50px;" value="${cmHeheFloor.sort}"  onkeyup="onlynum(this)"  onchange="changeSort(${cmHeheFloor.id},this)">
-				</td>
 				<td>
 					<c:if test="${cmHeheFloor.status eq 1 }">
 						<font color="green">已启用</font>
@@ -79,6 +76,9 @@
 						</a>
 					</c:if>
 				</td>
+				<td>
+					<input id="sort" name="sort" style="width:50px;" value="${cmHeheFloor.sort}"  onkeyup="onlynum(this)"  onchange="changeSort(${cmHeheFloor.id},this)">
+				</td>
 				<td>
 					<fmt:formatDate value="${cmHeheFloor.createTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
 				</td>

src/main/webapp/WEB-INF/views/modules/order/cmPayShopDetail.jsp

@@ -368,9 +368,11 @@
 				</c:if>
 			</div>
 		</div>
-		<div class="check-btn">
-			<button class="apply-btn btn btn-primary" type="button" onclick="window.location.href='${ctx}/order/cmPayShop/printDetail?id=${cmPayShop.id}'">去打印</button>
-		</div>
+		<c:if test="${cmPayShop.status == '1'}">
+			<div class="check-btn">
+				<button class="apply-btn btn btn-primary" type="button" onclick="window.location.href='${ctx}/order/cmPayShop/printDetail?id=${cmPayShop.id}'">去打印</button>
+			</div>
+		</c:if>
 	</div>
 	<script>
 		(function(){

src/main/webapp/WEB-INF/views/modules/order/cmReturnedPurchaseList.jsp

@@ -108,13 +108,11 @@
 			</div>
 			<div>
 				<label>申请时间：</label>
-				<input name="beginReturnTime" type="text"  maxlength="20" class="input-medium Wdate"
-					   value="<fmt:formatDate value="${cmReturnedPurchase.beginReturnTime}" pattern="yyyy-MM-dd HH:mm:ss"/>"
-					   onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/>
+				<form:input path="beginTime" type="text" maxlength="20" class="input-medium Wdate" value="${beginTime}"
+							onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
 				<span class="time-space-symbols">至</span>
-				<input name="endReturnTime" type="text"  maxlength="20" class="input-medium Wdate"
-					   value="<fmt:formatDate value="${cmReturnedPurchase.endReturnTime}" pattern="yyyy-MM-dd HH:mm:ss"/>"
-					   onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/>
+				<form:input path="endTime" type="text" maxlength="20" class="input-medium Wdate" value="${endTime}"
+							onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
 				<label>退款审核状态：</label>
 				<form:select path="status" htmlEscape="false" maxlength="2"  class="select-ele input-medium required">
 					<form:option value="" label="所有"/>

src/main/webapp/WEB-INF/views/modules/order/orderDetail.jsp

@@ -458,8 +458,8 @@
             </c:if>
         </c:if>
         <div>
-            <c:forEach items="${shopOrder.newOrderProducts}" var="op">
-                <div class="supplier-product-item">
+            <c:forEach items="${shopOrder.newOrderProducts}" var="op"  varStatus="varIndex">
+                <div class="supplier-product-item" style="z-index:${100000 - varIndex.index};position:relative;">
                     <%--二手订单详情--%>
                     <c:if test="${order.secondHandOrderFlag eq 1}">
                         <a href="${fns:getConfig('wwwServer')}product-${op.productID}.html" target="_blank">
@@ -499,7 +499,7 @@
                         </c:if>
                     </div>
                     <c:if test="${op.productID ne 999}">
-                        <div class="supplier-product-info">
+                        <div class="supplier-product-info" >
                             <span>单价:
                                 <c:if test="${op.productPromotion.mode eq 1}">
                                     <label style="text-decoration: line-through"><fmt:formatNumber value="${op.price}" type="currency"/></label></span>

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

@@ -265,13 +265,13 @@
                                     <a class="red" href="javascript:void(0);" onclick="validChange(${product.id}, 10)">冻结</a>
                                 </c:if>
                                 <c:if test="${product.validFlag eq 10}">
-                                    <a class="red" href="javascript:void(0);" onclick="validChange(${product.id}, 2)">解除冻结</a>
+                                    <a class="red" href="javascript:void(0);" onclick="validChange(${product.id}, 22)">解除冻结</a>
                                 </c:if>
 								<c:if test="${product.validFlag eq 2}">
 									<a class="red" href="javascript:void(0);" onclick="validChange(${product.id}, 9)">隐身</a>
 								</c:if>
 								<c:if test="${product.validFlag eq 9}">
-									<a class="red" href="javascript:void(0);" onclick="validChange(${product.id}, 22)">显身</a>
+									<a class="red" href="javascript:void(0);" onclick="validChange(${product.id}, 2)">显身</a>
 								</c:if>
                                 <a class="red" href="javascript:void(0);" onclick="validChange(${product.id}, 0)" >删除</a>
                             </td>
@@ -494,11 +494,11 @@
 			var msg = "提示信息";
 			if(flag == 10){
 				msg = "确定冻结该商品吗？冻结后该商品不会出现在采美商城。";
-			}else if(flag == 2){
+			}else if(flag == 22){
 				msg = "确定解除冻结该商品吗？";
 			}else if(flag == 9){
 				msg = "确定隐身此商品吗？";
-			}else if(flag == 22){
+			}else if(flag == 2){
 				msg = "确定显身此商品吗？";
 			}else if(flag == 0){
 				msg = "确定删除该商品吗？删除后不可恢复。";