Aslee 3 роки тому
батько
коміт
31074f5c7f

+ 19 - 0
src/main/java/com/caimei/modules/hehe/dao/CmHeheDiscountActivityDao.java

@@ -0,0 +1,19 @@
+package com.caimei.modules.hehe.dao;
+
+import com.caimei.modules.hehe.entity.CmHeheReduction;
+import com.thinkgem.jeesite.common.persistence.CrudDao;
+import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
+import com.caimei.modules.hehe.entity.CmHeheDiscountActivity;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 限时特价活动DAO接口
+ * @author Aslee
+ * @version 2022-03-24
+ */
+@MyBatisDao
+public interface CmHeheDiscountActivityDao extends CrudDao<CmHeheDiscountActivity> {
+    void updateStatus(@Param("id") String id, @Param("status") Integer status);
+
+    void updateTime(CmHeheDiscountActivity cmHeheDiscountActivity);
+}

+ 75 - 0
src/main/java/com/caimei/modules/hehe/entity/CmHeheDiscountActivity.java

@@ -0,0 +1,75 @@
+package com.caimei.modules.hehe.entity;
+
+import org.hibernate.validator.constraints.Length;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.thinkgem.jeesite.common.persistence.DataEntity;
+
+/**
+ * 限时特价活动Entity
+ * @author Aslee
+ * @version 2022-03-24
+ */
+public class CmHeheDiscountActivity extends DataEntity<CmHeheDiscountActivity> {
+	
+	private static final long serialVersionUID = 1L;
+	private String name;		// 活动名称
+	private Date onlineTime;		// 上架时间
+	private Date offlineTime;		// 下架时间
+	private Date addTime;		// 创建时间
+
+	private Integer status;		// 状态:1待上架,2已上架,3已下架
+	
+	public CmHeheDiscountActivity() {
+		super();
+	}
+
+	public CmHeheDiscountActivity(String id){
+		super(id);
+	}
+
+	@Length(min=0, max=60, message="活动名称长度必须介于 0 和 60 之间")
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	public Date getOnlineTime() {
+		return onlineTime;
+	}
+
+	public void setOnlineTime(Date onlineTime) {
+		this.onlineTime = onlineTime;
+	}
+	
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	public Date getOfflineTime() {
+		return offlineTime;
+	}
+
+	public void setOfflineTime(Date offlineTime) {
+		this.offlineTime = offlineTime;
+	}
+	
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	public Date getAddTime() {
+		return addTime;
+	}
+
+	public void setAddTime(Date addTime) {
+		this.addTime = addTime;
+	}
+
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+}

+ 76 - 0
src/main/java/com/caimei/modules/hehe/service/CmHeheDiscountActivityService.java

@@ -0,0 +1,76 @@
+package com.caimei.modules.hehe.service;
+
+import java.util.Date;
+import java.util.List;
+
+import com.caimei.modules.hehe.entity.CmHeheActivity;
+import com.caimei.modules.hehe.entity.CmHeheReduction;
+import org.springframework.beans.factory.annotation.Autowired;
+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.CmHeheDiscountActivity;
+import com.caimei.modules.hehe.dao.CmHeheDiscountActivityDao;
+
+/**
+ * 限时特价活动Service
+ * @author Aslee
+ * @version 2022-03-24
+ */
+@Service
+@Transactional(readOnly = true)
+public class CmHeheDiscountActivityService extends CrudService<CmHeheDiscountActivityDao, CmHeheDiscountActivity> {
+	@Autowired
+	private CmHeheDiscountActivityDao cmHeheDiscountActivityDao;
+	
+	public CmHeheDiscountActivity get(String id) {
+		return super.get(id);
+	}
+	
+	public List<CmHeheDiscountActivity> findList(CmHeheDiscountActivity cmHeheDiscountActivity) {
+		return super.findList(cmHeheDiscountActivity);
+	}
+	
+	public Page<CmHeheDiscountActivity> findPage(Page<CmHeheDiscountActivity> page, CmHeheDiscountActivity cmHeheDiscountActivity) {
+		Page<CmHeheDiscountActivity> activityPage = super.findPage(page, cmHeheDiscountActivity);
+		List<CmHeheDiscountActivity> activityList = activityPage.getList();
+		activityList.forEach(this::setActivityStatus);
+		return activityPage;
+	}
+	
+	@Transactional(readOnly = false)
+	public void save(CmHeheDiscountActivity cmHeheDiscountActivity) {
+		super.save(cmHeheDiscountActivity);
+	}
+	
+	@Transactional(readOnly = false)
+	public void delete(CmHeheDiscountActivity cmHeheDiscountActivity) {
+		super.delete(cmHeheDiscountActivity);
+	}
+
+
+	public void setActivityStatus(CmHeheDiscountActivity cmHeheDiscountActivity) {
+		Date date = new Date();
+		if (cmHeheDiscountActivity != null) {
+			if (date.compareTo(cmHeheDiscountActivity.getOnlineTime()) < 0) {
+				cmHeheDiscountActivity.setStatus(1);
+			} else if (date.compareTo(cmHeheDiscountActivity.getOfflineTime()) > 0) {
+				cmHeheDiscountActivity.setStatus(3);
+			} else {
+				cmHeheDiscountActivity.setStatus(2);
+			}
+		}
+	}
+
+	@Transactional(readOnly = false)
+	public void updateStatus(CmHeheDiscountActivity cmHeheDiscountActivity) {
+		cmHeheDiscountActivityDao.updateStatus(cmHeheDiscountActivity.getId(), cmHeheDiscountActivity.getStatus());
+	}
+
+	@Transactional(readOnly = false)
+	public void updateTime(CmHeheDiscountActivity cmHeheDiscountActivity) {
+		cmHeheDiscountActivityDao.updateTime(cmHeheDiscountActivity);
+	}
+}

+ 92 - 0
src/main/java/com/caimei/modules/hehe/web/CmHeheDiscountActivityController.java

@@ -0,0 +1,92 @@
+package com.caimei.modules.hehe.web;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.caimei.modules.hehe.entity.CmHeheDiscountActivity;
+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.CmHeheDiscountActivity;
+import com.caimei.modules.hehe.service.CmHeheDiscountActivityService;
+
+/**
+ * 限时特价活动Controller
+ * @author Aslee
+ * @version 2022-03-24
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/hehe/cmHeheDiscountActivity")
+public class CmHeheDiscountActivityController extends BaseController {
+
+	@Autowired
+	private CmHeheDiscountActivityService cmHeheDiscountActivityService;
+	
+	@ModelAttribute
+	public CmHeheDiscountActivity get(@RequestParam(required=false) String id) {
+		CmHeheDiscountActivity entity = null;
+		if (StringUtils.isNotBlank(id)){
+			entity = cmHeheDiscountActivityService.get(id);
+		}
+		if (entity == null){
+			entity = new CmHeheDiscountActivity();
+		}
+		return entity;
+	}
+	
+	@RequestMapping(value = {"list", ""})
+	public String list(CmHeheDiscountActivity cmHeheDiscountActivity, HttpServletRequest request, HttpServletResponse response, Model model) {
+		Page<CmHeheDiscountActivity> page = cmHeheDiscountActivityService.findPage(new Page<CmHeheDiscountActivity>(request, response), cmHeheDiscountActivity); 
+		model.addAttribute("page", page);
+		return "modules/hehe/cmHeheDiscountActivityList";
+	}
+
+	@RequestMapping(value = "form")
+	public String form(CmHeheDiscountActivity cmHeheDiscountActivity, Model model) {
+		model.addAttribute("cmHeheDiscountActivity", cmHeheDiscountActivity);
+		return "modules/hehe/cmHeheDiscountActivityForm";
+	}
+
+	@RequestMapping(value = "save")
+	public String save(CmHeheDiscountActivity cmHeheDiscountActivity, Model model, RedirectAttributes redirectAttributes) {
+		if (!beanValidator(model, cmHeheDiscountActivity)){
+			return form(cmHeheDiscountActivity, model);
+		}
+		cmHeheDiscountActivityService.save(cmHeheDiscountActivity);
+		addMessage(redirectAttributes, "保存活动成功");
+		return "redirect:"+Global.getAdminPath()+"/hehe/cmHeheDiscountActivity/?repage";
+	}
+	
+	@RequestMapping(value = "delete")
+	public String delete(CmHeheDiscountActivity cmHeheDiscountActivity, RedirectAttributes redirectAttributes) {
+		cmHeheDiscountActivityService.delete(cmHeheDiscountActivity);
+		addMessage(redirectAttributes, "删除活动成功");
+		return "redirect:"+Global.getAdminPath()+"/hehe/cmHeheDiscountActivity/?repage";
+	}
+
+	@RequestMapping(value = "updateTime")
+	@ResponseBody
+	public String updateTime(CmHeheDiscountActivity cmHeheDiscountActivity) {
+		cmHeheDiscountActivityService.updateTime(cmHeheDiscountActivity);
+		return "修改成功";
+	}
+
+	@RequestMapping(value = "updateStatus")
+	@ResponseBody
+	public String updateStatus(CmHeheDiscountActivity cmHeheDiscountActivity) {
+		cmHeheDiscountActivityService.updateStatus(cmHeheDiscountActivity);
+		return "修改成功";
+	}
+
+}

+ 120 - 0
src/main/resources/mappings/modules/hehe/CmHeheDiscountActivityMapper.xml

@@ -0,0 +1,120 @@
+<?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.CmHeheDiscountActivityDao">
+    
+	<sql id="cmHeheDiscountActivityColumns">
+		a.id AS "id",
+		a.name AS "name",
+		a.onlineTime AS "onlineTime",
+		a.offlineTime AS "offlineTime",
+		a.addTime AS "addTime"
+	</sql>
+	
+	<sql id="cmHeheDiscountActivityJoins">
+	</sql>
+    
+	<select id="get" resultType="CmHeheDiscountActivity">
+		SELECT 
+			<include refid="cmHeheDiscountActivityColumns"/>
+		FROM cm_hehe_discount_activity a
+		<include refid="cmHeheDiscountActivityJoins"/>
+		WHERE a.id = #{id}
+	</select>
+	
+	<select id="findList" resultType="CmHeheDiscountActivity">
+		SELECT 
+			<include refid="cmHeheDiscountActivityColumns"/>
+		FROM cm_hehe_discount_activity a
+		<include refid="cmHeheDiscountActivityJoins"/>
+		<where>
+			
+			<if test="name != null and name != ''">
+				AND a.name LIKE 
+					<if test="dbName == 'oracle'">'%'||#{name}||'%'</if>
+					<if test="dbName == 'mssql'">'%'+#{name}+'%'</if>
+					<if test="dbName == 'mysql'">concat('%',#{name},'%')</if>
+			</if>
+			<if test="status != null">
+				<if test="status == 1">
+					and NOW() <![CDATA[ < ]]> a.onlineTime
+				</if>
+				<if test="status == 2">
+					and NOW() <![CDATA[ >= ]]> a.onlineTime and NOW() <![CDATA[ <= ]]> a.offlineTime
+				</if>
+				<if test="status == 3">
+					and NOW() <![CDATA[ > ]]> a.offlineTime
+				</if>
+			</if>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				order by a.addTime desc
+			</otherwise>
+		</choose>
+	</select>
+	
+	<select id="findAllList" resultType="CmHeheDiscountActivity">
+		SELECT 
+			<include refid="cmHeheDiscountActivityColumns"/>
+		FROM cm_hehe_discount_activity a
+		<include refid="cmHeheDiscountActivityJoins"/>
+		<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="CmHeheDiscountActivity"  keyProperty="id" useGeneratedKeys="true">
+		INSERT INTO cm_hehe_discount_activity(
+			name,
+			onlineTime,
+			offlineTime,
+			addTime
+		) VALUES (
+			#{name},
+			#{onlineTime},
+			#{offlineTime},
+			NOW()
+		)
+	</insert>
+	
+	<update id="update">
+		UPDATE cm_hehe_discount_activity SET 	
+			name = #{name},
+			onlineTime = #{onlineTime},
+			offlineTime = #{offlineTime}
+		WHERE id = #{id}
+	</update>
+
+	<update id="updateStatus">
+		update cm_hehe_discount_activity set
+		<if test="status == 3">
+			offlineTime = NOW()
+		</if>
+		<if test="status == 2">
+			onlineTime = NOW()
+		</if>
+		where id = #{id}
+	</update>
+
+	<update id="updateTime">
+		update cm_hehe_discount_activity
+		set onlineTime = #{onlineTime}, offlineTime = #{offlineTime}
+		where id = #{id}
+	</update>
+
+	<delete id="delete">
+		DELETE FROM cm_hehe_discount_activity
+		WHERE id = #{id}
+	</delete>
+	
+</mapper>

+ 71 - 0
src/main/webapp/WEB-INF/views/modules/hehe/cmHeheDiscountActivityForm.jsp

@@ -0,0 +1,71 @@
+<%@ 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){
+					var onlineTime = $("#onlineTime").val();
+					var offlineTime = $("#offlineTime").val();
+					console.log(onlineTime);
+					if (onlineTime >= offlineTime) {
+						alertx("下架时间不能早于上架时间");
+						return false;
+					}
+					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/cmHeheDiscountActivity/">活动列表</a></li>
+		<li class="active"><a href="${ctx}/hehe/cmHeheDiscountActivity/form?id=${cmHeheDiscountActivity.id}">活动${not empty cmHeheDiscountActivity.id?'编辑':'添加'}</a></li>
+	</ul><br/>
+	<form:form id="inputForm" modelAttribute="cmHeheDiscountActivity" action="${ctx}/hehe/cmHeheDiscountActivity/save" method="post" class="form-horizontal">
+		<form:hidden path="id"/>
+		<sys:message content="${message}"/>		
+		<div class="control-group">
+			<label class="control-label">活动名称:</label>
+			<div class="controls">
+				<form:input path="name" htmlEscape="false" maxlength="30" class="input-xlarge "/>
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label">上架时间:</label>
+			<div class="controls">
+				<input id="onlineTime" name="onlineTime" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate "
+					value="<fmt:formatDate value="${cmHeheDiscountActivity.onlineTime}" pattern="yyyy-MM-dd HH:mm:ss"/>"
+					onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm',isShowClear:false});"/>
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label">下架时间:</label>
+			<div class="controls">
+				<input id="offlineTime" name="offlineTime" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate "
+					value="<fmt:formatDate value="${cmHeheDiscountActivity.offlineTime}" pattern="yyyy-MM-dd HH:mm:ss"/>"
+					onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm',isShowClear:false});"/>
+			</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>
+</body>
+</html>

+ 171 - 0
src/main/webapp/WEB-INF/views/modules/hehe/cmHeheDiscountActivityList.jsp

@@ -0,0 +1,171 @@
+<%@ 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/cmHeheDiscountActivity/">活动列表</a></li>
+		<li><a href="${ctx}/hehe/cmHeheDiscountActivity/form">活动添加</a></li>
+	</ul>
+	<form:form id="searchForm" modelAttribute="cmHeheDiscountActivity" action="${ctx}/hehe/cmHeheDiscountActivity/" 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>活动名称:</label>
+				<form:input path="name" htmlEscape="false" maxlength="60" class="input-medium"/>
+			<label>状态:</label>
+			<form:select path="status" class="input-medium">
+				<form:option value="" label="全部"/>
+				<form:option value="1" label="待上架"/>
+				<form:option value="2" label="已上架"/>
+				<form:option value="3" label="已下架"/>
+			</form:select>
+			&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
+			<div class="clearfix"></div>
+		</div>
+	</form:form>
+	<sys:message content="${message}"/>
+	<table id="contentTable" class="table table-striped table-bordered table-condensed">
+		<thead>
+			<tr>
+				<th>序号</th>
+				<th>活动名称</th>
+				<th>上架时间</th>
+				<th>下架时间</th>
+				<th>状态</th>
+				<th>创建时间</th>
+				<th>操作</th>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach items="${page.list}" var="cmHeheDiscountActivity">
+			<tr>
+				<td>
+					${cmHeheDiscountActivity.id}
+				</td>
+				<td>
+					${cmHeheDiscountActivity.name}
+				</td>
+				<td>
+					<fmt:formatDate value="${cmHeheDiscountActivity.onlineTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
+				</td>
+				<td>
+					<fmt:formatDate value="${cmHeheDiscountActivity.offlineTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
+				</td>
+				<td>
+					<font color="${cmHeheDiscountActivity.status eq 1?'#40ABE9':(cmHeheDiscountActivity.status eq 2?'red':'#666666')}">
+							${cmHeheDiscountActivity.status eq 1?'待上架':(cmHeheDiscountActivity.status eq 2?'已上架':'已下架')}
+					</font>
+				</td>
+				<td>
+					<fmt:formatDate value="${cmHeheDiscountActivity.addTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
+				</td>
+				<td>
+					<a href="javascript:;" onclick="updateStatus(${cmHeheDiscountActivity.id},${cmHeheDiscountActivity.status})">
+							${cmHeheDiscountActivity.status eq 2?'下架':'上架'}
+					</a>
+    				<a href="${ctx}/hehe/cmHeheDiscountActivity/form?id=${cmHeheDiscountActivity.id}">编辑</a>
+					<a href="${ctx}/hehe/cmHeheDiscountActivity/delete?id=${cmHeheDiscountActivity.id}" onclick="return confirmx('确认要删除该活动吗?', this.href)">删除</a>
+				</td>
+			</tr>
+		</c:forEach>
+		</tbody>
+	</table>
+	<div class="pagination">${page}</div>
+<script>
+	function updateStatus(activityId,status) {
+		if (status !== 3) {
+			if (status === 2) {
+				status = 3;
+				// 已上架活动下架
+				var submit = function (v, h, f) {
+					if (v == true) {
+						$.post("${ctx}/hehe/cmHeheDiscountActivity/updateStatus?id="+activityId+"&status="+status,function (data) {
+							top.$.jBox.tip('下架活动成功');
+							setTimeout(function () {
+								$("#searchForm").submit();
+							}, 1000);
+						});
+					}
+				};
+				$.jBox.confirm("确定下架该活动吗?", "提示", submit, {buttons: {'确认': true, '取消': false}});
+			} else {
+				status = 2;
+				// 待上架活动上架
+				var submit = function (v, h, f) {
+					if (v == true) {
+						$.post("${ctx}/hehe/cmHeheDiscountActivity/updateStatus?id=" + activityId + "&status=" + status, function (data) {
+							top.$.jBox.tip('上架活动成功');
+							setTimeout(function () {
+								$("#searchForm").submit();
+							}, 1000);
+						});
+					}
+				};
+				$.jBox.confirm("确定立即上架该活动吗?", "提示", submit, {buttons: {'确认': true, '取消': false}});
+			}
+		} else {
+			//已下架活动上架需重新设置上下架时间
+			var url = "${ctx}/hehe/cmHeheReduction/resetTimePage";
+			var title = "提示";
+			top.$.jBox("iframe:"+url, {
+				iframeScrolling: 'yes',
+				width: 800,
+				height: 350,
+				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 items = $jboxFrame[0].contentWindow.getCheckedItems(0);
+						if (items.length > 0) {
+							var startTime = items[0].startTime;
+							var endTime = items[0].endTime;
+							if (startTime === '') {
+								top.$.jBox.tip("请选择上架时间");
+								return false;
+							}
+							if (endTime === '') {
+								top.$.jBox.tip("请选择下架时间");
+								return false;
+							}
+							$.post("${ctx}/hehe/cmHeheDiscountActivity/updateTime?id=" + activityId + "&onlineTime=" + startTime + "&offlineTime=" + endTime, function (data) {
+								top.$.jBox.tip("修改成功");
+								setTimeout(function () {
+									$("#searchForm").submit();
+								}, 1000);
+							});
+						} else {
+							top.$.jBox.tip("请先勾选商品...");
+							return false;
+						}
+					}
+					return true;
+				}
+			});
+		}
+	}
+</script>
+</body>
+</html>

+ 0 - 2
src/main/webapp/WEB-INF/views/modules/hehe/cmHeheReductionList.jsp

@@ -117,7 +117,6 @@
 				};
 				$.jBox.confirm("确定下架该活动吗?", "提示", submit, {buttons: {'确认': true, '取消': false}});
 			} else {
-				debugger
 				status = 2;
 				// 待上架活动上架
 				var submit = function (v, h, f) {
@@ -157,7 +156,6 @@
 					var $jboxFrame = top.$('#jbox-iframe');
 					var $mainFrame = top.$('#mainFrame');
 					if ('1' == v && 1 == $jboxFrame.size() && 1 == $mainFrame.size()) {
-						debugger
 						var items = $jboxFrame[0].contentWindow.getCheckedItems(0);
 						if (items.length > 0) {
 							var startTime = items[0].startTime;