Merge remote-tracking branch 'origin/developer' into developer

src/main/java/com/caimei/modules/hehe/dao/CmHeheFloorDao.java

@@ -0,0 +1,20 @@
+package com.caimei.modules.hehe.dao;
+
+import com.caimei.modules.hehe.entity.CmHeheFloor;
+import com.thinkgem.jeesite.common.persistence.CrudDao;
+import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 呵呵商品商品楼层DAO接口
+ * @author Aslee
+ * @version 2021-06-17
+ */
+@MyBatisDao
+public interface CmHeheFloorDao extends CrudDao<CmHeheFloor> {
+
+    void updateStatusByFloorId(@Param("status") Integer status, @Param("floorId") Integer floorId);
+
+    void saveSort(@Param("sort") String sort, @Param("floorId") String id);
+
+}

src/main/java/com/caimei/modules/hehe/dao/CmHeheFloorProductDao.java

@@ -0,0 +1,24 @@
+package com.caimei.modules.hehe.dao;
+
+import com.caimei.modules.product.entity.Product;
+import com.thinkgem.jeesite.common.persistence.CrudDao;
+import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
+import com.caimei.modules.hehe.entity.CmHeheFloorProduct;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 呵呵商城楼层商品DAO接口
+ * @author Aslee
+ * @version 2021-06-18
+ */
+@MyBatisDao
+public interface CmHeheFloorProductDao extends CrudDao<CmHeheFloorProduct> {
+
+    void updateSort(@Param("sort") String sort,@Param("id") String id);
+
+    List<Integer> findFloorProductId(Integer floorId);
+
+    List<Product> findAllProduct(Product product);
+}

src/main/java/com/caimei/modules/hehe/dao/CmHeheProductDao.java

@@ -32,13 +32,6 @@ public interface CmHeheProductDao extends CrudDao<CmHeheProduct> {
      */
     List<Product> findAllProduct(Product product);
 
-    /**
-     * 保存排序值
-     *
-     * @param sort
-     * @param id
-     */
-    void saveSort(@Param("sort") String sort, @Param("id") String id);
 
     /**
      * 删除活动商品

src/main/java/com/caimei/modules/hehe/entity/CmHeheFloor.java

@@ -0,0 +1,72 @@
+package com.caimei.modules.hehe.entity;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.thinkgem.jeesite.common.persistence.DataEntity;
+
+import java.util.Date;
+
+/**
+ * 呵呵商品商品楼层Entity
+ * @author Aslee
+ * @version 2021-06-17
+ */
+public class CmHeheFloor extends DataEntity<CmHeheFloor> {
+	
+	private static final long serialVersionUID = 1L;
+	private String title;		// 楼层标题
+	private String description;		// 楼层描述
+	private String sort;		// 排序
+	private String status;		// 状态
+	private Date createTime;		// 创建时间
+
+	public CmHeheFloor() {
+		super();
+	}
+
+	public CmHeheFloor(String id){
+		super(id);
+	}
+
+	@Length(min=1, max=20, message="楼层标题长度必须介于 1 和 20 之间")
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+	
+	@Length(min=1, max=255, message="楼层描述长度必须介于 1 和 255 之间")
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	
+	public String getSort() {
+		return sort;
+	}
+
+	public void setSort(String sort) {
+		this.sort = sort;
+	}
+	
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+}

src/main/java/com/caimei/modules/hehe/entity/CmHeheFloorProduct.java

@@ -0,0 +1,108 @@
+package com.caimei.modules.hehe.entity;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.thinkgem.jeesite.common.persistence.DataEntity;
+
+/**
+ * 呵呵商城楼层商品Entity
+ * @author Aslee
+ * @version 2021-06-18
+ */
+public class CmHeheFloorProduct extends DataEntity<CmHeheFloorProduct> {
+	
+	private static final long serialVersionUID = 1L;
+	private Integer floorId;		// floorId
+	private Integer productId;		// productId
+	private Integer validFlag;		// 上架状态:1上架,0下架
+	private Integer recommend;		// 是否为推荐商品(0 没推荐,1 推荐商品)
+	private Integer sort;		// 排序值
+	private Date addTime;		// 添加时间
+
+	private String productName;		//商品名称
+	private String mainImage;		//商品图片
+	private String shopName;		//供应商名称
+	private String productIds;		//商品id，以，隔开
+
+
+	public Integer getFloorId() {
+		return floorId;
+	}
+
+	public void setFloorId(Integer floorId) {
+		this.floorId = floorId;
+	}
+
+	public Integer getProductId() {
+		return productId;
+	}
+
+	public void setProductId(Integer productId) {
+		this.productId = productId;
+	}
+
+	public Integer getValidFlag() {
+		return validFlag;
+	}
+
+	public void setValidFlag(Integer validFlag) {
+		this.validFlag = validFlag;
+	}
+
+	public Integer getRecommend() {
+		return recommend;
+	}
+
+	public void setRecommend(Integer recommend) {
+		this.recommend = recommend;
+	}
+
+	public Integer getSort() {
+		return sort;
+	}
+
+	public void setSort(Integer sort) {
+		this.sort = sort;
+	}
+
+	public Date getAddTime() {
+		return addTime;
+	}
+
+	public void setAddTime(Date addTime) {
+		this.addTime = addTime;
+	}
+
+	public String getProductName() {
+		return productName;
+	}
+
+	public void setProductName(String productName) {
+		this.productName = productName;
+	}
+
+	public String getMainImage() {
+		return mainImage;
+	}
+
+	public void setMainImage(String mainImage) {
+		this.mainImage = mainImage;
+	}
+
+	public String getShopName() {
+		return shopName;
+	}
+
+	public void setShopName(String shopName) {
+		this.shopName = shopName;
+	}
+
+	public String getProductIds() {
+		return productIds;
+	}
+
+	public void setProductIds(String productIds) {
+		this.productIds = productIds;
+	}
+}

src/main/java/com/caimei/modules/hehe/entity/CmHeheProduct.java

@@ -18,8 +18,6 @@ public class CmHeheProduct extends DataEntity<CmHeheProduct> {
 
     private static final long serialVersionUID = 1L;
     private Integer productId;        // 对应采美商品id
-    private Integer sort;        // 排序值
-    private String recommend;        // 是否为推荐商品(0 没推荐,1 推荐商品)
     private String validFlag;        // 上架状态:1上架,2下架
     private BigDecimal price;        // 售价
     private String includedTax;        // 是否含税 0不含税，1含税
@@ -51,23 +49,6 @@ public class CmHeheProduct extends DataEntity<CmHeheProduct> {
         this.productId = productId;
     }
 
-    public Integer getSort() {
-        return sort;
-    }
-
-    public void setSort(Integer sort) {
-        this.sort = sort;
-    }
-
-    @Length(min = 0, max = 2, message = "是否为推荐商品(0 没推荐,1 推荐商品)长度必须介于 0 和 2 之间")
-    public String getRecommend() {
-        return recommend;
-    }
-
-    public void setRecommend(String recommend) {
-        this.recommend = recommend;
-    }
-
     @Length(min = 0, max = 2, message = "上架状态:1上架,2下架长度必须介于 0 和 2 之间")
     public String getValidFlag() {
         return validFlag;

src/main/java/com/caimei/modules/hehe/service/CmHeheFloorProductService.java

@@ -0,0 +1,107 @@
+package com.caimei.modules.hehe.service;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.caimei.modules.hehe.entity.CmHeheProduct;
+import com.caimei.modules.product.entity.Product;
+import com.caimei.utils.AppUtils;
+import com.caimei.utils.StringUtil;
+import com.caimei.utils.StringUtils;
+import com.thinkgem.jeesite.common.config.Global;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.thinkgem.jeesite.common.persistence.Page;
+import com.thinkgem.jeesite.common.service.CrudService;
+import com.caimei.modules.hehe.entity.CmHeheFloorProduct;
+import com.caimei.modules.hehe.dao.CmHeheFloorProductDao;
+
+import javax.annotation.Resource;
+
+/**
+ * 呵呵商城楼层商品Service
+ * @author Aslee
+ * @version 2021-06-18
+ */
+@Service
+@Transactional(readOnly = true)
+public class CmHeheFloorProductService extends CrudService<CmHeheFloorProductDao, CmHeheFloorProduct> {
+	@Resource
+	private CmHeheFloorProductDao cmHeheFloorProductDao;
+
+	public CmHeheFloorProduct get(String id) {
+		return super.get(id);
+	}
+	
+	public List<CmHeheFloorProduct> findList(CmHeheFloorProduct cmHeheFloorProduct) {
+		return super.findList(cmHeheFloorProduct);
+	}
+	
+	public Page<CmHeheFloorProduct> findPage(Page<CmHeheFloorProduct> page, CmHeheFloorProduct cmHeheFloorProduct) {
+		Page<CmHeheFloorProduct> productPage = super.findPage(page, cmHeheFloorProduct);
+		List<CmHeheFloorProduct> productList = productPage.getList();
+		String wwwServer = Global.getConfig("wwwServer");
+		productList.forEach(item -> {
+			if (StringUtil.isNotBlank(item.getMainImage())) {
+				item.setMainImage(AppUtils.getImageURL("product", item.getMainImage(), 0, wwwServer));
+			}
+		});
+		return productPage;
+	}
+	
+	@Transactional(readOnly = false)
+	public void save(CmHeheFloorProduct cmHeheFloorProduct) {
+		super.save(cmHeheFloorProduct);
+	}
+	
+	@Transactional(readOnly = false)
+	public void delete(CmHeheFloorProduct cmHeheFloorProduct) {
+		super.delete(cmHeheFloorProduct);
+	}
+
+	@Transactional(readOnly = false)
+	public void saveSort(String sort, String id) {
+		cmHeheFloorProductDao.updateSort(sort, id);
+	}
+
+	public Page<Product> findProductPage(Page<Product> productPage, Product product) {
+		List<Integer> ids = cmHeheFloorProductDao.findFloorProductId(product.getFloorId());
+		product.setIds(ids);
+		product.setPage(productPage);
+		List<Product> productList = cmHeheFloorProductDao.findAllProduct(product);
+		String wwwServer = Global.getConfig("wwwServer");
+		productList.forEach(item -> {
+			if (StringUtil.isNotBlank(item.getMainImage())) {
+				item.setMainImage(AppUtils.getImageURL("product", item.getMainImage(), 0, wwwServer));
+			}
+		});
+		productPage.setList(productList);
+		return productPage;
+	}
+
+	@Transactional(readOnly = false)
+	public Map<String, Object> addProduct(CmHeheFloorProduct cmHeheFloorProduct) {
+		HashMap<String, Object> map = new HashMap<>();
+		String productIds = cmHeheFloorProduct.getProductIds();
+		if (StringUtils.isNotEmpty(productIds)) {
+			String[] split = productIds.split(",");
+			for (int i = 0; i < split.length; i++) {
+				Integer productId = Integer.parseInt(split[i]);
+				CmHeheFloorProduct newProduct = new CmHeheFloorProduct();
+				newProduct.setProductId(productId);
+				newProduct.setFloorId(cmHeheFloorProduct.getFloorId());
+				newProduct.setRecommend(0);
+				newProduct.setSort(1);
+				newProduct.setValidFlag(1);
+				newProduct.setAddTime(new Date());
+				super.save(newProduct);
+			}
+		}
+		map.put("success", true);
+		map.put("msg", "添加楼层商品成功");
+		return map;
+	}
+}

src/main/java/com/caimei/modules/hehe/service/CmHeheFloorService.java

@@ -0,0 +1,48 @@
+package com.caimei.modules.hehe.service;
+
+import java.util.List;
+
+import com.caimei.modules.hehe.entity.CmHeheFloor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.thinkgem.jeesite.common.persistence.Page;
+import com.thinkgem.jeesite.common.service.CrudService;
+import com.caimei.modules.hehe.dao.CmHeheFloorDao;
+
+import javax.annotation.Resource;
+
+/**
+ * 呵呵商品商品楼层Service
+ * @author Aslee
+ * @version 2021-06-17
+ */
+@Service
+@Transactional(readOnly = true)
+public class CmHeheFloorService extends CrudService<CmHeheFloorDao, CmHeheFloor> {
+    @Resource
+    private CmHeheFloorDao cmHeheFloorDao;
+
+	public CmHeheFloor get(String id) {
+		return super.get(id);
+	}
+	
+	public List<CmHeheFloor> findList(CmHeheFloor cmHeheFloor) {
+		return super.findList(cmHeheFloor);
+	}
+	
+	public Page<CmHeheFloor> findPage(Page<CmHeheFloor> page, CmHeheFloor cmHeheFloor) {
+		return super.findPage(page, cmHeheFloor);
+	}
+	
+	@Transactional(readOnly = false)
+	public void save(CmHeheFloor cmHeheFloor) {
+		super.save(cmHeheFloor);
+	}
+	
+	@Transactional(readOnly = false)
+	public void delete(CmHeheFloor cmHeheFloor) {
+		super.delete(cmHeheFloor);
+	}
+
+}

src/main/java/com/caimei/modules/hehe/service/CmHeheProductService.java

@@ -85,10 +85,7 @@ public class CmHeheProductService extends CrudService<CmHeheProductDao, CmHehePr
         return productPage;
     }
 
-    @Transactional(readOnly = false)
-    public void saveSort(String sort, String id) {
-        cmHeheProductDao.saveSort(sort, id);
-    }
+
 
     @Transactional(readOnly = false)
     public void updateValidFlag(CmHeheProduct cmHeheProduct) {
@@ -100,13 +97,4 @@ public class CmHeheProductService extends CrudService<CmHeheProductDao, CmHehePr
         cmHeheProductDao.update(cmHeheProduct);
     }
 
-    @Transactional(readOnly = false)
-    public void updateRecommend(CmHeheProduct cmHeheProduct) {
-        if ("0".equals(cmHeheProduct.getRecommend())) {
-            cmHeheProduct.setRecommend("1");
-        } else {
-            cmHeheProduct.setRecommend("0");
-        }
-        cmHeheProductDao.update(cmHeheProduct);
-    }
 }

src/main/java/com/caimei/modules/hehe/web/CmHeheFloorController.java

@@ -0,0 +1,144 @@
+package com.caimei.modules.hehe.web;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.caimei.modules.hehe.dao.CmHeheFloorDao;
+import com.caimei.modules.hehe.entity.CmHeheFloor;
+import com.google.common.collect.Maps;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.thinkgem.jeesite.common.config.Global;
+import com.thinkgem.jeesite.common.persistence.Page;
+import com.thinkgem.jeesite.common.web.BaseController;
+import com.thinkgem.jeesite.common.utils.StringUtils;
+import com.caimei.modules.hehe.service.CmHeheFloorService;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.caimei.modules.newhome.web.NewPageQualitySupplierController.isInteger;
+
+/**
+ * 呵呵商品商品楼层Controller
+ * @author Aslee
+ * @version 2021-06-17
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/hehe/cmHeheFloor")
+public class CmHeheFloorController extends BaseController {
+
+	@Autowired
+	private CmHeheFloorService cmHeheFloorService;
+
+	@Resource
+	private CmHeheFloorDao cmHeheFloorDao;
+	
+	@ModelAttribute
+	public CmHeheFloor get(@RequestParam(required=false) String id) {
+		CmHeheFloor entity = null;
+		if (StringUtils.isNotBlank(id)){
+			entity = cmHeheFloorService.get(id);
+		}
+		if (entity == null){
+			entity = new CmHeheFloor();
+		}
+		return entity;
+	}
+	
+	@RequestMapping(value = {"list", ""})
+	public String list(CmHeheFloor cmHeheFloor, HttpServletRequest request, HttpServletResponse response, Model model) {
+		Page<CmHeheFloor> page = cmHeheFloorService.findPage(new Page<CmHeheFloor>(request, response), cmHeheFloor);
+		model.addAttribute("page", page);
+		return "modules/hehe/cmHeheFloorList";
+	}
+
+	@RequestMapping(value = "form")
+	public String form(CmHeheFloor cmHeheFloor, Model model) {
+		model.addAttribute("cmHeheFloor", cmHeheFloor);
+		return "modules/hehe/cmHeheFloorForm";
+	}
+
+	@RequestMapping(value = "save")
+	public String save(CmHeheFloor cmHeheFloor, Model model, RedirectAttributes redirectAttributes) {
+		if (!beanValidator(model, cmHeheFloor)){
+			return form(cmHeheFloor, model);
+		}
+		if (cmHeheFloor.getIsNewRecord()) {
+			cmHeheFloor.setCreateTime(new Date());
+		}
+		cmHeheFloorService.save(cmHeheFloor);
+		addMessage(redirectAttributes, "保存商品楼层成功");
+		return "redirect:"+Global.getAdminPath()+"/hehe/cmHeheFloor/?repage";
+	}
+	
+	@RequestMapping(value = "delete")
+	public String delete(CmHeheFloor cmHeheFloor, RedirectAttributes redirectAttributes) {
+		cmHeheFloorService.delete(cmHeheFloor);
+		addMessage(redirectAttributes, "删除商品楼层成功");
+		return "redirect:"+Global.getAdminPath()+"/hehe/cmHeheFloor/?repage";
+	}
+
+	@RequestMapping(value = "updateStatus")
+	@ResponseBody
+	public Map<String,Object> updateStatus(Integer status, Integer floorId) {
+		HashMap<String, Object> result = new HashMap<>(2);
+		cmHeheFloorDao.updateStatusByFloorId(status, floorId);
+		result.put("success", true);
+		result.put("msg", (status == 1 ? "启用" : "停用") + "商品楼层成功");
+		return result;
+	}
+
+
+	/**
+	 * 批量更新排序值
+	 */
+	@RequestMapping(value = "batchSaveSort")
+	@ResponseBody
+	public Map<String, Object> batchSaveSort(String sortList) {
+		Map<String, Object> map = Maps.newLinkedHashMap();
+		try {
+			String[] newPageLists = sortList.split(",");
+			for (String list : newPageLists) {
+				String[] split = list.split("-");
+				if (split.length == 1 || split.length < 1) {
+					String id = split[0];
+					String sort = null;
+					cmHeheFloorDao.saveSort(sort, id);
+				} else {
+					String id = split[0];
+					String sort = split[1];
+					if (isInteger(sort)) {
+						if (StringUtils.equals("0", sort)) {
+							map.put("success", false);
+							map.put("msg", "排序值只能填写大于等于1的整数");
+							return map;
+						}
+						cmHeheFloorDao.saveSort(sort, id);
+					} else {
+						map.put("success", false);
+						map.put("msg", "排序值只能为数字");
+						return map;
+					}
+				}
+			}
+			map.put("success", true);
+			map.put("msg", "更新排序成功");
+			return map;
+		} catch (Exception e) {
+			map.put("success", false);
+			map.put("msg", "更新排序失败");
+			return map;
+		}
+	}
+
+}

src/main/java/com/caimei/modules/hehe/web/CmHeheFloorProductController.java

@@ -0,0 +1,144 @@
+package com.caimei.modules.hehe.web;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.caimei.modules.hehe.entity.CmHeheProduct;
+import com.caimei.modules.product.entity.Product;
+import com.google.common.collect.Maps;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.thinkgem.jeesite.common.config.Global;
+import com.thinkgem.jeesite.common.persistence.Page;
+import com.thinkgem.jeesite.common.web.BaseController;
+import com.thinkgem.jeesite.common.utils.StringUtils;
+import com.caimei.modules.hehe.entity.CmHeheFloorProduct;
+import com.caimei.modules.hehe.service.CmHeheFloorProductService;
+
+import java.util.Map;
+
+import static com.caimei.modules.newhome.web.NewPageQualitySupplierController.isInteger;
+
+/**
+ * 呵呵商城楼层商品Controller
+ * @author Aslee
+ * @version 2021-06-18
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/hehe/cmHeheFloorProduct")
+public class CmHeheFloorProductController extends BaseController {
+
+	@Autowired
+	private CmHeheFloorProductService cmHeheFloorProductService;
+	
+	@ModelAttribute
+	public CmHeheFloorProduct get(@RequestParam(required=false) String id) {
+		CmHeheFloorProduct entity = null;
+		if (StringUtils.isNotBlank(id)){
+			entity = cmHeheFloorProductService.get(id);
+		}
+		if (entity == null){
+			entity = new CmHeheFloorProduct();
+		}
+		return entity;
+	}
+	
+	@RequestMapping(value = {"list", ""})
+	public String list(CmHeheFloorProduct cmHeheFloorProduct, HttpServletRequest request, HttpServletResponse response, Model model) {
+		Page<CmHeheFloorProduct> page = cmHeheFloorProductService.findPage(new Page<CmHeheFloorProduct>(request, response), cmHeheFloorProduct); 
+		model.addAttribute("page", page);
+		return "modules/hehe/cmHeheFloorProductList";
+	}
+
+	@RequestMapping(value = "form")
+	public String form(CmHeheFloorProduct cmHeheFloorProduct, Model model) {
+		model.addAttribute("cmHeheFloorProduct", cmHeheFloorProduct);
+		return "modules/hehe/cmHeheFloorProductForm";
+	}
+
+	@RequestMapping(value = "save")
+	public String save(CmHeheFloorProduct cmHeheFloorProduct, Model model, RedirectAttributes redirectAttributes) {
+		if (!beanValidator(model, cmHeheFloorProduct)){
+			return form(cmHeheFloorProduct, model);
+		}
+		cmHeheFloorProductService.save(cmHeheFloorProduct);
+		addMessage(redirectAttributes, "保存楼层商品成功");
+		return "redirect:"+Global.getAdminPath()+"/hehe/cmHeheFloorProduct/?repage&floorId=" + cmHeheFloorProduct.getFloorId();
+	}
+	
+	@RequestMapping(value = "delete")
+	public String delete(CmHeheFloorProduct cmHeheFloorProduct, RedirectAttributes redirectAttributes) {
+		cmHeheFloorProductService.delete(cmHeheFloorProduct);
+		addMessage(redirectAttributes, "删除楼层商品成功");
+		return "redirect:" + Global.getAdminPath() + "/hehe/cmHeheFloorProduct/?repage&floorId=" + cmHeheFloorProduct.getFloorId();
+	}
+
+
+	/**
+	 * 批量更新排序值
+	 */
+	@RequestMapping(value = "batchSaveSort")
+	@ResponseBody
+	public Map<String, Object> batchSaveSort(String sortList) {
+		Map<String, Object> map = Maps.newLinkedHashMap();
+		try {
+			String[] newPageLists = sortList.split(",");
+			for (String list : newPageLists) {
+				String[] split = list.split("-");
+				if (split.length == 1 || split.length < 1) {
+					String id = split[0];
+					String sort = null;
+					cmHeheFloorProductService.saveSort(sort, id);
+				} else {
+					String id = split[0];
+					String sort = split[1];
+					if (isInteger(sort)) {
+						if (StringUtils.equals("0", sort)) {
+							map.put("success", false);
+							map.put("msg", "排序值只能填写大于等于1的整数");
+							return map;
+						}
+						cmHeheFloorProductService.saveSort(sort, id);
+					} else {
+						map.put("success", false);
+						map.put("msg", "排序值只能为数字");
+						return map;
+					}
+				}
+			}
+			map.put("success", true);
+			map.put("msg", "更新排序成功");
+			return map;
+		} catch (Exception e) {
+			e.printStackTrace();
+			map.put("success", false);
+			map.put("msg", "更新排序失败");
+			return map;
+		}
+	}
+
+	/**
+	 * 楼层添加商品列表
+	 * @return
+	 */
+	@RequestMapping(value = "findProductPage")
+	public String findProductPage(Product product, Model model, HttpServletRequest request, HttpServletResponse response) {
+		Page<Product> page = cmHeheFloorProductService.findProductPage(new Page<Product>(request, response), product);
+		model.addAttribute("page", page);
+		return "modules/hehe/addFloorProduct";
+	}
+
+	@RequestMapping(value = "addProduct")
+	public Map<String,Object> addProduct(CmHeheFloorProduct cmHeheFloorProduct) {
+		return cmHeheFloorProductService.addProduct(cmHeheFloorProduct);
+	}
+
+}

src/main/java/com/caimei/modules/hehe/web/CmHeheProductController.java

@@ -88,48 +88,6 @@ public class CmHeheProductController extends BaseController {
         return "modules/hehe/heheAddProduct";
     }
 
-    /**
-     * 批量更新排序值
-     */
-    @RequestMapping(value = "batchSaveSort")
-    @ResponseBody
-    public Map<String, Object> batchSaveSort(String sortList) {
-        Map<String, Object> map = Maps.newLinkedHashMap();
-        try {
-            String[] newPageLists = sortList.split(",");
-            for (String list : newPageLists) {
-                String[] split = list.split("-");
-                if (split.length == 1 || split.length < 1) {
-                    String id = split[0];
-                    String sort = null;
-                    cmHeheProductService.saveSort(sort, id);
-                } else {
-                    String id = split[0];
-                    String sort = split[1];
-                    if (isInteger(sort)) {
-                        if (StringUtils.equals("0", sort)) {
-                            map.put("success", false);
-                            map.put("msg", "排序值只能填写大于等于1的整数");
-                            return map;
-                        }
-                        cmHeheProductService.saveSort(sort, id);
-                    } else {
-                        map.put("success", false);
-                        map.put("msg", "排序值只能为数字");
-                        return map;
-                    }
-                }
-            }
-            map.put("success", true);
-            map.put("msg", "更新排序成功");
-            return map;
-        } catch (Exception e) {
-            map.put("success", false);
-            map.put("msg", "更新排序失败");
-            return map;
-        }
-    }
-
     /**
      * 商品上下架
      */
@@ -139,14 +97,5 @@ public class CmHeheProductController extends BaseController {
         return "redirect:" + Global.getAdminPath() + "/hehe/cmHeheProduct/?repage";
     }
 
-    /**
-     * 商品修改推荐
-     */
-    @RequestMapping(value = "updateRecommend")
-    public String updateRecommend(CmHeheProduct cmHeheProduct) {
-        cmHeheProductService.updateRecommend(cmHeheProduct);
-        return "redirect:" + Global.getAdminPath() + "/hehe/cmHeheProduct/?repage";
-    }
-
 
 }

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;        // 评论次数
@@ -180,6 +180,7 @@ public class Product extends DataEntity<Product> {
     private Integer organizeId; //组织Id
     private String productIdStr;//商品Id字符串格式
 
+
     //以下参数是搜索回显参数
     private String searchName;
     private String searchShopName;
@@ -200,7 +201,7 @@ public class Product extends DataEntity<Product> {
     private String editFlag;//编辑标记，1是编辑，其他都不是
     private String source;  //信息来源 1网站 2小程序 3后台 4小程序-协销
     private String dockingPeopleName; //对接人名称
-
+    private Integer floorId;//呵呵商城楼层id
 
     public String getProductIds() {
         return productIds;
@@ -1845,4 +1846,12 @@ public class Product extends DataEntity<Product> {
     public void setDockingPeopleName(String dockingPeopleName) {
         this.dockingPeopleName = dockingPeopleName;
     }
+
+    public Integer getFloorId() {
+        return floorId;
+    }
+
+    public void setFloorId(Integer floorId) {
+        this.floorId = floorId;
+    }
 }

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/hehe/CmHeheFloorMapper.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.caimei.modules.hehe.dao.CmHeheFloorDao">
+    
+	<sql id="cmHeheFloorColumns">
+		a.id AS "id",
+		a.title AS "title",
+		a.description AS "description",
+		a.sort AS "sort",
+		a.status AS "status",
+		a.createTime AS "createTime"
+	</sql>
+	
+	<sql id="cmHeheFloorJoins">
+	</sql>
+    
+	<select id="get" resultType="cmHeheFloor">
+		SELECT 
+			<include refid="cmHeheFloorColumns"/>
+		FROM cm_hehe_floor a
+		<include refid="cmHeheFloorJoins"/>
+		WHERE a.id = #{id}
+	</select>
+	
+	<select id="findList" resultType="cmHeheFloor">
+		SELECT 
+			<include refid="cmHeheFloorColumns"/>
+		FROM cm_hehe_floor a
+		<include refid="cmHeheFloorJoins"/>
+		<where>
+			
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				order by a.sort asc,a.createTime desc
+			</otherwise>
+		</choose>
+	</select>
+	
+	<select id="findAllList" resultType="cmHeheFloor">
+		SELECT 
+			<include refid="cmHeheFloorColumns"/>
+		FROM cm_hehe_floor a
+		<include refid="cmHeheFloorJoins"/>
+		<where>
+			
+		</where>		
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+
+	<insert id="insert" parameterType="cmHeheFloor"  keyProperty="id" useGeneratedKeys="true">
+		INSERT INTO cm_hehe_floor(
+			title,
+			description,
+			sort,
+			status,
+			createTime
+		) VALUES (
+			#{title},
+			#{description},
+			#{sort},
+			#{status},
+		    #{createTime}
+		)
+	</insert>
+	
+	<update id="update">
+		UPDATE cm_hehe_floor SET
+			title = #{title},
+			description = #{description},
+			sort = #{sort},
+			status = #{status}
+		WHERE id = #{id}
+	</update>
+    <update id="updateStatusByFloorId">
+		update cm_hehe_floor set status = #{status} where id = #{floorId}
+	</update>
+	<update id="saveSort">
+		update cm_hehe_floor set sort = #{sort} where id = #{floorId}
+	</update>
+
+	<delete id="delete">
+		DELETE FROM cm_hehe_floor
+		WHERE id = #{id}
+	</delete>
+	
+</mapper>

src/main/resources/mappings/modules/hehe/CmHeheFloorProductMapper.xml

@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.caimei.modules.hehe.dao.CmHeheFloorProductDao">
+    
+	<sql id="cmHeheFloorProductColumns">
+		a.id AS "id",
+		a.floorId,
+		a.productId,
+		a.validFlag,
+		a.recommend,
+		a.sort AS "sort",
+		a.addTime,
+		p.mainImage,
+		p.name as productName,
+		s.name as shopName
+	</sql>
+	
+	<sql id="cmHeheFloorProductJoins">
+		left join cm_hehe_product cp on a.productId = cp.id
+		left join cm_hehe_floor cf on a.floorId = cf.id
+		left join product p on cp.productId = p.productID
+		left join shop s on p.shopID = s.shopID
+	</sql>
+
+
+	<update id="updateSort">
+		update cm_hehe_floor_product set sort = #{sort} where id = #{id}
+	</update>
+
+	<select id="get" resultType="cmHeheFloorProduct">
+		SELECT 
+			<include refid="cmHeheFloorProductColumns"/>
+		FROM cm_hehe_floor_product a
+		<include refid="cmHeheFloorProductJoins"/>
+		WHERE a.id = #{id}
+	</select>
+	
+	<select id="findList" resultType="cmHeheFloorProduct">
+		SELECT 
+			<include refid="cmHeheFloorProductColumns"/>
+		FROM cm_hehe_floor_product a
+		<include refid="cmHeheFloorProductJoins"/>
+		<where>
+			a.floorId = #{floorId}
+			<if test="productId != null">
+				and cp.id = #{productId}
+			</if>
+			<if test="productName != null and productName != ''">
+				and p.name like concat('%',#{productName},'%')
+			</if>
+			<if test="shopName != null and shopName != ''">
+				and s.name like concat('%',#{shopName},'%')
+			</if>
+			<if test="validFlag != null">
+				and a.validFlag = #{validFlag}
+			</if>
+			<if test="recommend != null">
+				and a.recommend = #{recommend}
+			</if>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				order by a.sort asc,a.addTime desc,a.productId desc
+			</otherwise>
+		</choose>
+	</select>
+	
+	<select id="findAllList" resultType="cmHeheFloorProduct">
+		SELECT 
+			<include refid="cmHeheFloorProductColumns"/>
+		FROM cm_hehe_floor_product a
+		<include refid="cmHeheFloorProductJoins"/>
+		<where>
+			
+		</where>		
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+	<select id="findFloorProductId" resultType="java.lang.Integer">
+		select productId from cm_hehe_floor_product where floorId = #{floorId}
+	</select>
+	<select id="findAllProduct" resultType="com.caimei.modules.product.entity.Product">
+		select hp.id as productID,p.mainImage,p.name,s.name as shopName
+		       from cm_hehe_product hp left join product p on hp.productId = p.productID
+				left join shop s on p.shopID = s.shopID
+		<where>
+			hp.validFlag = 1
+			<if test="productID != null" >
+				AND hp.id = #{productID}
+			</if>
+			<if test="name != null and name != ''">
+				AND p.name LIKE concat('%',#{name},'%')
+			</if>
+			<if test="shopName != null and shopName != ''">
+				AND s.name LIKE concat('%',#{shopName},'%')
+			</if>
+			<if test="ids != null and ids.size() > 0 ">
+				AND hp.id NOT IN
+				<foreach collection="ids" open="(" close=")" item="id" separator=",">
+					#{id}
+				</foreach>
+			</if>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				order by hp.id
+			</otherwise>
+		</choose>
+	</select>
+
+
+	<insert id="insert" parameterType="cmHeheFloorProduct"  keyProperty="id" useGeneratedKeys="true">
+		INSERT INTO cm_hehe_floor_product(
+			floorId, productId, validFlag, recommend, sort, addTime
+		) VALUES (
+			#{floorId},
+			#{productId},
+			#{validFlag},
+			#{recommend},
+		    #{sort},
+		    #{addTime}
+		)
+	</insert>
+
+
+	<update id="update" parameterType="cmHeheFloorProduct">
+		update cm_hehe_floor_product set validFlag = #{validFlag},recommend = #{recommend},sort = #{sort}
+		where id = #{id}
+	</update>
+
+<!--    <update id="updateStatusByFloorId">-->
+<!--		update cm_hehe_floor_product set status = #{status} where id = #{floorId}-->
+<!--	</update>-->
+<!--	-->
+<!--	<update id="saveSort">-->
+<!--		update cm_hehe_floor_product set sort = #{sort} where id = #{floorId}-->
+<!--	</update>-->
+
+	<delete id="delete">
+		DELETE FROM cm_hehe_floor_product
+		WHERE id = #{id}
+	</delete>
+	
+</mapper>

src/main/resources/mappings/modules/hehe/CmHeheProductMapper.xml

@@ -5,8 +5,6 @@
 	<sql id="cmHeheProductColumns">
 		a.id AS "id",
 		a.productId AS "productId",
-		a.sort AS "sort",
-		a.recommend AS "recommend",
 		a.validFlag AS "validFlag",
 		a.price AS "price",
 		a.includedTax AS "includedTax",
@@ -62,16 +60,13 @@
 			<if test="shopName != null and shopName != ''">
 				AND s.name LIKE CONCAT('%',#{shopName},'%')
 			</if>
-			<if test="recommend != null and recommend != ''">
-				AND a.recommend = #{recommend}
-			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
-				ORDER BY -sort DESC
+				ORDER BY addTime DESC
 			</otherwise>
 		</choose>
 	</select>
@@ -96,8 +91,6 @@
 	<insert id="insert" parameterType="CmHeheProduct"  keyProperty="id" useGeneratedKeys="true">
 		INSERT INTO cm_hehe_product(
 			productId,
-			sort,
-			recommend,
 			validFlag,
 			price,
 			includedTax,
@@ -107,8 +100,6 @@
 			addTime
 		) VALUES (
 			#{productId},
-			#{sort},
-			#{recommend},
 			#{validFlag},
 			#{price},
 			#{includedTax},
@@ -122,8 +113,6 @@
 	<update id="update">
 		UPDATE cm_hehe_product SET 	
 			productId = #{productId},
-			sort = #{sort},
-			recommend = #{recommend},
 			validFlag = #{validFlag},
 			price = #{price},
 			includedTax = #{includedTax},
@@ -174,10 +163,7 @@
 		</choose>
 	</select>
 
-	<update id="saveSort">
-		UPDATE cm_hehe_product SET sort = #{sort} WHERE id = #{id}
-	</update>
-	
+
 	<update id="deleteActivityProduct">
 		UPDATE cm_hehe_activity_product SET delFlag = 1 WHERE productId = #{productId}
 	</update>

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/addFloorProduct.jsp

@@ -0,0 +1,118 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
+<html>
+<head>
+    <title>选择商品</title>
+    <meta name="decorator" content="default"/>
+    <style type="text/css">
+        .table td i {
+            margin: 0 2px;
+        }
+    </style>
+
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $("#searchForm").validate({
+                submitHandler: function (form) {
+                    var isSubMitFlag = true;
+                    var productID = $("#productID").val();
+                    if (isNaN(productID) || productID.indexOf('0') == 0 ) {
+                        alertx("请输入正确的商品ID");
+                        isSubMitFlag = false;
+                        return false;
+                    }
+                    if (isSubMitFlag) {
+                        form.submit();
+                    }
+                }
+            })
+        });
+    </script>
+</head>
+<body>
+<form:form id="searchForm" modelAttribute="product" action="${ctx}/hehe/cmHeheFloorProduct/findProductPage?floorId=${product.floorId}" method="post"
+           class="breadcrumb form-search">
+    <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+    <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+    <div class="ul-form">
+        <label>商品ID：</label>
+        <form:input path="productID" id="productID" htmlEscape="false" maxlength="8" class="input-mini" onkeyup="onlynum(this)"/>
+        <label>商品名称：</label>
+        <form:input path="name" htmlEscape="false" class="input-medium" maxlength="20"/>
+        <label>供应商名称：</label>
+        <form:input path="shopName" htmlEscape="false" class="input-medium" maxlength="20"/>
+        &nbsp;&nbsp;  <input id="btnSubmit" class="btn btn-primary" type="submit" value="搜索"/>
+        <div class="clearfix"></div>
+    </div>
+    <form:hidden path="floorId"/>
+</form:form>
+<sys:message content="${message}"/>
+<table class="table table-striped table-bordered table-condensed table-hover">
+    <tr>
+        <th style="width:20px;"><input type="checkbox" name="info" onclick="clickAllSelect(this)" /></th>
+        <th>商品ID</th>
+        <th>商品图片</th>
+        <th>商品名称</th>
+        <th>供应商名称</th>
+    </tr>
+    <tbody>
+    <c:if test="${not empty page.list}">
+        <c:forEach items="${page.list}" var="item">
+            <tr id="${item.productID}" class="itemtr">
+                <th>
+                    <input class="check-item" type="checkbox" name="info" value='${item.productID}'/>
+                </th>
+                <td>${item.productID}</td>
+                <td><img class="mainImage" src="${item.mainImage}" width="50px" height="50px"></td>
+                <td class="name">${item.name}</td>
+                <td id="shopName">${item.shopName}</td>
+            </tr>
+        </c:forEach>
+    </c:if>
+    </tbody>
+</table>
+<c:if test="${empty  page.list}">
+    <p style="text-align: center;"><font color="#1e90ff">暂无数据……</font></p>
+</c:if>
+<div class="pagination">${page}</div>
+<script type="text/javascript">
+    $(document).ready(function () {
+        //弹出框去滚动条
+        top.$('#jbox-content').css("overflow-y", "hidden");
+        show_title(30);
+    });
+
+    function page(n, s) {
+        $("#pageNo").val(n);
+        $("#pageSize").val(s);
+        $("#searchForm").submit();
+        return false;
+    }
+
+    function getCheckedItems() {
+        debugger
+        var productIds = '';
+        var $items = $('.check-item:checked');
+        $items.each(function () {
+            productIds += $(this).val()+",";
+        });
+
+        return productIds;
+    }
+
+    function clickAllSelect(ckb) {
+        var isChecked = ckb.checked;
+        $(".check-item").attr('checked', isChecked);
+    }
+
+    /**
+     * @param obj
+     * jquery控制input只能输入数字
+     */
+    function onlynum(obj) {
+        obj.value = obj.value.replace(/[^\d]/g, ""); //清除"数字"以外的字符
+    }
+</script>
+</body>
+</html>
+

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

@@ -0,0 +1,78 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<html>
+<head>
+	<title>商品楼层管理</title>
+	<meta name="decorator" content="default"/>
+	<script type="text/javascript">
+		$(document).ready(function() {
+			//$("#name").focus();
+			$("#inputForm").validate({
+				submitHandler: function(form){
+					loading('正在提交，请稍等...');
+					form.submit();
+				},
+				errorContainer: "#messageBox",
+				errorPlacement: function(error, element) {
+					$("#messageBox").text("输入有误，请先更正。");
+					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+						error.appendTo(element.parent().parent());
+					} else {
+						error.insertAfter(element);
+					}
+				}
+			});
+		});
+	</script>
+</head>
+<body>
+	<ul class="nav nav-tabs">
+		<li><a href="${ctx}/hehe/cmHeheFloor/">商品楼层列表</a></li>
+		<li class="active"><a href="${ctx}/hehe/cmHeheFloor/form?id=${cmHeheFloor.id}">商品楼层${not empty cmHeheFloor.id?'编辑':'添加'}</a></li>
+	</ul><br/>
+	<form:form id="inputForm" modelAttribute="cmHeheFloor" action="${ctx}/hehe/cmHeheFloor/save" method="post" class="form-horizontal">
+		<form:hidden path="id"/>
+		<sys:message content="${message}"/>		
+		<div class="control-group">
+			<label class="control-label"><span class="help-inline"><font color="red">*</font> </span>楼层标题：</label>
+			<div class="controls">
+				<form:input path="title" htmlEscape="false" maxlength="20" class="input-xlarge required"/>
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label"><span class="help-inline"><font color="red">*</font> </span>楼层描述：</label>
+			<div class="controls">
+				<form:input path="description" htmlEscape="false" maxlength="255" class="input-xlarge required"/>
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label"><span class="help-inline"><font color="red">*</font> </span>排序：</label>
+			<div class="controls">
+				<form:input path="sort" htmlEscape="false" onkeyup="onlynum(this)" class="input-xlarge required"/>
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label"><span class="help-inline"><font color="red">*</font> </span>状态：</label>
+			<div class="controls">
+				<form:select path="status" class="input-xlarge required">
+					<form:option value="1">启用</form:option>
+					<form:option value="0">停用</form:option>
+				</form:select>
+			</div>
+		</div>
+		<div class="form-actions">
+			<input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;
+			<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
+		</div>
+	</form:form>
+<script>
+	/**
+	 * @param obj
+	 * jquery控制input只能输入数字
+	 */
+	function onlynum(obj) {
+		obj.value = obj.value.replace(/[^\d]/g, ""); //清除"数字"以外的字符
+	}
+</script>
+</body>
+</html>

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

@@ -0,0 +1,145 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<html>
+<head>
+	<title>商品楼层管理</title>
+	<meta name="decorator" content="default"/>
+	<style type="text/css">
+		.table th{text-align: center;}
+		.table td{text-align: center;}
+	</style>
+	<script type="text/javascript">
+		$(document).ready(function() {
+			
+		});
+		function page(n,s){
+			$("#pageNo").val(n);
+			$("#pageSize").val(s);
+			$("#searchForm").submit();
+        	return false;
+        }
+	</script>
+</head>
+<body>
+	<ul class="nav nav-tabs">
+		<li class="active"><a href="${ctx}/hehe/cmHeheFloor/">商品楼层列表</a></li>
+	</ul>
+	<form:form id="searchForm" modelAttribute="cmHeheFloor" action="${ctx}/hehe/cmHeheFloor/" method="post" class="breadcrumb form-search">
+		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+		<div class="ul-form">
+			&nbsp;&nbsp;<input class="btn btn-primary" style="width: 70px" onclick="batchSaveSort()" value="一键排序" />
+			&nbsp;&nbsp;<input class="btn btn-primary" style="width: 70px" onclick="window.location='${ctx}/hehe/cmHeheFloor/form'" value="添加楼层" />
+			<div class="clearfix"></div>
+		</div>
+		<div style="margin-top: 10px">
+			<label><font color="#a9a9a9">注：排序值越小越靠前</font></label>
+		</div>
+	</form:form>
+	<sys:message content="${message}"/>
+	<table id="contentTable" class="table table-striped table-bordered table-condensed">
+		<thead>
+			<tr>
+				<th>ID</th>
+				<th>楼层标题</th>
+				<th>描述</th>
+				<th>状态</th>
+				<th>排序</th>
+				<th>创建时间</th>
+				<th>操作</th>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach items="${page.list}" var="cmHeheFloor">
+			<tr>
+				<input class="check-item" type="hidden" id="saveSort${cmHeheFloor.id}" value='${cmHeheFloor.id}-${cmHeheFloor.sort}'/>
+				<td>
+					${cmHeheFloor.id}
+				</td>
+				<td>
+					${cmHeheFloor.title}
+				</td>
+				<td>
+					${cmHeheFloor.description}
+				</td>
+				<td>
+					<c:if test="${cmHeheFloor.status eq 1 }">
+						<font color="green">已启用</font>
+						<a href="javascript:void(0);" onclick="updateStatus(0,${cmHeheFloor.id});" >
+							停用
+						</a>
+					</c:if>
+					<c:if test="${cmHeheFloor.status ne 1 }">
+						<font color="red">已停用</font>
+						<a href="javascript:void(0)" onclick="updateStatus(1,${cmHeheFloor.id});">
+							启用
+						</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>
+				<td>
+    				<a href="${ctx}/hehe/cmHeheFloor/form?id=${cmHeheFloor.id}">编辑</a>
+    				<a href="${ctx}/hehe/cmHeheFloorProduct/list?floorId=${cmHeheFloor.id}">商品列表</a>
+					<a href="${ctx}/hehe/cmHeheFloor/delete?id=${cmHeheFloor.id}" onclick="return confirmx('确认要删除该商品楼层吗？', this.href)">删除</a>
+				</td>
+			</tr>
+		</c:forEach>
+		</tbody>
+	</table>
+	<div class="pagination">${page}</div>
+<script>
+	function updateStatus(status, floorId) {
+		var msg='确定启用该楼层吗？';
+		if(0==status) {
+			msg = '确定停用该楼层吗？';
+		}
+		top.$.jBox.confirm(msg,'系统提示',function(v,h,f){
+			if(v=='ok'){
+				$.post("${ctx}/hehe/cmHeheFloor/updateStatus",{'status':status,'floorId':floorId}, function(data) {
+					if(true==data.success){
+						$.jBox.tip(data.msg, 'info');
+					} else {
+						$.jBox.tip(data.msg,'error');
+					}
+					setTimeout(function () {
+						$("#searchForm").submit();
+					},1000)
+				},"JSON");//这里返回的类型有：json,html,xml,text
+			}
+			return;
+		},{buttonsFocus:1,persistent: true});
+	}
+
+	//批量保存排序
+	function batchSaveSort() {
+		var items = new Array();
+		var $items = $('.check-item');
+		$items.each(function(){
+			items.push($(this).val());
+		});
+		//保存批量排序
+		$.post("${ctx}/hehe/cmHeheFloor/batchSaveSort?sortList="+items, function(data) {
+			if(true==data.success){
+				$.jBox.tip(data.msg, 'info');
+				setTimeout(function () {
+					window.location.href = '${ctx}/hehe/cmHeheFloor';
+				},1000)
+			} else {
+				$.jBox.tip(data.msg,'error');
+			}
+		},"JSON");//这里返回的类型有：json,html,xml,text
+	}
+
+	//修改排序值
+	function changeSort(id,sortThis) {
+		var value = sortThis.value;
+		$("#saveSort"+id).val(id+"-"+value);
+	}
+</script>
+</body>
+</html>

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

@@ -0,0 +1,196 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<html>
+<head>
+	<title>呵呵商品管理</title>
+	<meta name="decorator" content="default"/>
+	<style type="text/css">
+		.table th{text-align: center;}
+		.table td{text-align: center;}
+	</style>
+	<script type="text/javascript">
+		$(document).ready(function() {
+			
+		});
+		function page(n,s){
+			$("#pageNo").val(n);
+			$("#pageSize").val(s);
+			$("#searchForm").submit();
+        	return false;
+        }
+	</script>
+</head>
+<body>
+	<ul class="nav nav-tabs">
+		<li><a href="${ctx}/hehe/cmHeheFloor/">商品楼层列表</a></li>
+		<li class="active"><a href="${ctx}/hehe/cmHeheFloorProduct/list?floorId=${cmHeheFloorProduct.floorId}">商品列表</a></li>
+	</ul>
+	<form:form id="searchForm" modelAttribute="cmHeheFloorProduct" action="${ctx}/hehe/cmHeheFloorProduct/list" method="post" class="breadcrumb form-search">
+		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+		<div class="ul-form">
+			<form:hidden path="floorId"/>
+			 <label>商品ID：</label>
+				<form:input path="productId" htmlEscape="false" class="input-medium"/>
+			<label>商品名称：</label>
+				<form:input path="productName" htmlEscape="false" class="input-medium"/>
+			<label>供应商名称：</label>
+				<form:input path="shopName" htmlEscape="false" class="input-medium"/>
+			 <label>商品状态：</label>
+				<form:select path="validFlag" class="input-small">
+					<form:option value="" label="请选择"/>
+					<form:option value="1" label="已上架"/>
+					<form:option value="0" label="已下架"/>
+				</form:select>
+			<label>推荐状态：</label>
+			<form:select path="recommend" class="input-small">
+				<form:option value="" label="请选择"/>
+				<form:option value="1" label="推荐"/>
+				<form:option value="0" label="不推荐"/>
+			</form:select>
+			&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
+			<input class="btn btn-primary" type="button" value="一键排序" onclick="batchSaveSort()" style="margin-left: 15px"/>
+			&nbsp;&nbsp;<input class="btn btn-primary" style="width: 80px" onclick="showSelect()" value="上线商品"/>
+			<div class="clearfix"></div>
+		</div>
+		<div style="margin-top: 10px">
+			<label><font color="#a9a9a9">注：排序值越小越靠前</font></label>
+		</div>
+	</form:form>
+	<sys:message content="${message}"/>
+	<table id="contentTable" class="table table-striped table-bordered table-condensed">
+		<thead>
+			<tr>
+				<th>商品ID</th>
+				<th>商品图片</th>
+				<th>商品名称</th>
+				<th>供应商名称</th>
+				<th>商品状态</th>
+				<th>排序</th>
+				<th>推荐状态</th>
+				<th>添加时间</th>
+				<th>操作</th>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach items="${page.list}" var="product">
+			<tr>
+				<input class="check-item" type="hidden" id="preferredProductSort${product.id}" value='${product.id}-${product.sort}'/>
+				<td>
+					${product.productId}
+				</td>
+				<td>
+					<img src="${product.mainImage}" width="50px" height="50px">
+				</td>
+				<td>
+						${product.productName}
+				</td>
+				<td>
+						${product.shopName}
+				</td>
+				<td>
+					<c:if test="${product.validFlag eq 1}">
+						<font color="green"><b>已上架</b></font>
+					</c:if>
+					<c:if test="${product.validFlag eq 0}">
+						<font color="red"><b>已下架</b></font>
+					</c:if>
+				</td>
+				<td>
+					<input id="sort" name="sort" style="width:50px;" value="${product.sort}" onkeyup="onlynum(this)" onchange="changeSort(${product.id},this)">
+				</td>
+				<td>
+					<img src="/static/images/${product.recommend eq "1" ? "yes" : "no"}.gif" width="15px" border="none"/>
+				</td>
+
+				<td>
+					<fmt:formatDate value="${product.addTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
+				</td>
+				<td>
+					<a href="${ctx}/hehe/cmHeheFloorProduct/save?id=${product.id}&validFlag=${product.validFlag eq 1?0:1}&floorId=${product.floorId}" onclick="return confirmx('确认要${product.validFlag eq 1 ? "下架":"上架"}该商品吗？', this.href)">${product.validFlag eq 1 ? '下架':'上架'}</a>
+					<a href="${ctx}/hehe/cmHeheFloorProduct/save?id=${product.id}&recommend=${product.recommend eq 1?0:1}&floorId=${product.floorId}" onclick="return confirmx('${product.recommend eq 0 ? "确定将该商品设为推荐商品吗？":"确定取消推荐吗？"}', this.href)">${product.recommend eq 0 ? '设为':'取消'}推荐</a>
+					<a href="${ctx}/hehe/cmHeheFloorProduct/delete?id=${product.id}" onclick="return confirmx('确认要删除该商品吗？', this.href)">删除</a>
+				</td>
+			</tr>
+		</c:forEach>
+		</tbody>
+	</table>
+	<div class="pagination">${page}</div>
+
+<script>
+	//修改排序值
+	function changeSort(id, sortThis) {
+		var value = sortThis.value;
+		$("#preferredProductSort" + id).val(id + "-" + value);
+	}
+
+	//批量保存排序
+	function batchSaveSort() {
+		var items = new Array();
+		var $items = $('.check-item');
+		$items.each(function(){
+			items.push($(this).val());
+		});
+		//保存批量排序
+		$.post("${ctx}/hehe/cmHeheFloorProduct/batchSaveSort?sortList="+items, function(data) {
+			if(true==data.success){
+				$.jBox.tip(data.msg, 'info');
+				$("#searchForm").submit();
+			} else {
+				$.jBox.tip(data.msg,'error');
+			}
+		},"JSON");//这里返回的类型有：json,html,xml,text
+	}
+
+	/**
+	 * @param obj
+	 * jquery控制input只能输入数字
+	 */
+	function onlynum(obj) {
+		obj.value = obj.value.replace(/[^\d]/g, ""); //清除"数字"以外的字符
+	}
+
+	/**
+	 *
+	 */
+	<%--function showSelect() {--%>
+	<%--	var url = '${ctx}/hehe/cmHeheFloorProduct/findProductPage?floorId=${cmHeheFloorProduct.floorId}';--%>
+	<%--	window.location=--%>
+	<%--}--%>
+
+	//选择添加商品
+	function showSelect() {
+		var title = '选择商品';
+		var floorId = ${cmHeheFloorProduct.floorId};
+		var productUrl = '${ctx}/hehe/cmHeheFloorProduct/findProductPage?floorId=${cmHeheFloorProduct.floorId}';
+		var addUrl = '${ctx}/hehe/cmHeheFloorProduct/addProduct';
+		title = "选择商品";
+		top.$.jBox("iframe:" + productUrl, {
+			iframeScrolling: 'yes',
+			width: $(top.document).width() - 600,
+			height: $(top.document).height() - 160,
+			persistent: true,
+			title: title,
+			buttons: {"确定": '1', "关闭": '-1'},
+			submit: function (v, h, f) {
+				//确定
+				var $jboxFrame = top.$('#jbox-iframe');
+				var $mainFrame = top.$('#mainFrame');
+				if ('1' == v && 1 == $jboxFrame.size() && 1 == $mainFrame.size()) {
+					var productIds = $jboxFrame[0].contentWindow.getCheckedItems();
+					if (productIds != '') {
+						$.post(addUrl,{"floorId":floorId, "productIds":productIds},function (data) {
+						})
+						$.jBox.tip('上线商品成功', 'info');
+						setTimeout(function () {
+							$("#searchForm").submit();
+						},1000)
+					}
+				}
+				return true;
+			}
+		});
+	}
+</script>
+</body>
+</html>

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

@@ -114,22 +114,6 @@
 				</div>
 			</div>
 		</div>
-		<div class="control-group">
-			<label class="control-label"><font color="red">*</font>排序：</label>
-			<div class="controls">
-				<form:input path="sort" htmlEscape="false" class="input-xlarge required" onkeyup="onlynum(this)"/>
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label"><font color="red">*</font>推荐状态：</label>
-			<div class="controls">
-				<form:select path="recommend" class="input-small required">
-					<form:option value="" label="请选择"/>
-					<form:option value="0" label="不推荐"/>
-					<form:option value="1" label="推荐"/>
-				</form:select>
-			</div>
-		</div>
 		<div class="control-group">
 			<label class="control-label"><font color="red">*</font>商品状态：</label>
 			<div class="controls">

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

@@ -53,15 +53,7 @@
 					<form:option value="2" label="增值税普通发票"/>
 					<form:option value="3" label="不能开票"/>
 				</form:select>
-			<br><br>
-			<label>推荐状态：</label>
-			<form:select path="recommend" class="input-small">
-				<form:option value="" label="请选择"/>
-				<form:option value="0" label="不推荐"/>
-				<form:option value="1" label="推荐"/>
-			</form:select>
 			&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
-			<input class="btn btn-primary" type="button" value="一键排序" onclick="batchSaveSort()" style="margin-left: 15px"/>
 			&nbsp;&nbsp;<input class="btn btn-primary" style="width: 80px" onclick="window.location='${ctx}/hehe/cmHeheProduct/form'" value="上线商品"/>
 			<div class="clearfix"></div>
 		</div>
@@ -81,8 +73,6 @@
 				<th>成本价</th>
 				<th>是否含税</th>
 				<th>商品状态</th>
-				<th>排序值</th>
-				<th>推荐状态</th>
 				<th>添加时间</th>
 				<th>操作</th>
 			</tr>
@@ -90,7 +80,6 @@
 		<tbody>
 		<c:forEach items="${page.list}" var="cmHeheProduct">
 			<tr>
-				<input class="check-item" type="hidden" id="preferredProductSort${cmHeheProduct.id}" value='${cmHeheProduct.id}-${cmHeheProduct.sort}'/>
 				<td>
 					${cmHeheProduct.id}
 				</td>
@@ -121,19 +110,12 @@
 						<font color="red"><b>已下架</b></font>
 					</c:if>
 				</td>
-				<td>
-						<input id="sort" name="sort" style="width:50px;" value="${cmHeheProduct.sort}" onkeyup="onlynum(this)" onchange="changeSort(${cmHeheProduct.id},this)">
-				</td>
-				<td>
-					<img src="/static/images/${cmHeheProduct.recommend eq "1" ? "yes" : "no"}.gif" width="15px" border="none"/>
-				</td>
 				<td>
 					<fmt:formatDate value="${cmHeheProduct.addTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
 				</td>
 				<td>
     				<a href="${ctx}/hehe/cmHeheProduct/form?id=${cmHeheProduct.id}">编辑</a>
 					<a href="${ctx}/hehe/cmHeheProduct/updateValidFlag?id=${cmHeheProduct.id}" onclick="return confirmx('确认要${cmHeheProduct.validFlag eq 1 ? "下架":"上架"}该商品吗？', this.href)">${cmHeheProduct.validFlag eq 1 ? '下架':'上架'}</a>
-					<a href="${ctx}/hehe/cmHeheProduct/updateRecommend?id=${cmHeheProduct.id}" onclick="return confirmx('${cmHeheProduct.recommend eq 0 ? "确定将该商品设为推荐商品吗？":"确定取消推荐吗？"}', this.href)">${cmHeheProduct.recommend eq 0 ? '设为':'取消'}推荐</a>
 					<a href="${ctx}/hehe/cmHeheProduct/delete?id=${cmHeheProduct.id}" onclick="return confirmx('确认要删除该商品吗？', this.href)">删除</a>
 				</td>
 			</tr>
@@ -160,7 +142,7 @@
 		$.post("${ctx}/hehe/cmHeheProduct/batchSaveSort?sortList="+items, function(data) {
 			if(true==data.success){
 				$.jBox.tip(data.msg, 'info');
-				window.location.href = "${ctx}/hehe/cmHeheProduct";
+				$("#searchForm").submit();
 			} else {
 				$.jBox.tip(data.msg,'error');
 			}

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

@@ -610,7 +610,7 @@
         }
 
         function refresh() {
-            window.location.href = "${ctx}/order/orderList/";
+            window.location.href = "${ctx}/hehe/new/order/orderList/";
         }
 
         function checkfun() {

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 = "确定删除该商品吗？删除后不可恢复。";