Merge branch 'test6.9.11' of http://git.yoho.cn/ufo/ufo-platform into test6.9.11

+package com.yoho.ufo.constants;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+
+public enum ActivityStatusEnum {
+
+	_0(0, "关闭"),
+	_1(1, "开启"),
+	_2(2, "生效中"),
+	_3(3, "已失效")
+
+	;
+
+	private int status;
+	private String message;
+
+	ActivityStatusEnum(int status, String message) {
+		this.status = status;
+		this.message = message;
+	}
+
+	
+	/**
+	 * 返回json格式的数据
+	 * @param value
+	 * @return
+	 */
+	public static JSONArray toJSON(int value) {
+		JSONArray arr = new JSONArray(10);
+		JSONObject json = null;
+		for (ActivityStatusEnum e : values()) {
+			json = new JSONObject();
+			json.put("value", e.getClass());
+			json.put("text", e.getMessage());
+			arr.add(json);
+		}
+		return arr;
+	}
+
+	public int getStatus() {
+		return status;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+}
\ No newline at end of file

@@ -9,6 +9,7 @@ import com.yoho.ufo.dal.UfoProductPoolMapper;
 import com.yoho.ufo.dal.model.PromotionActivity;
 import com.yoho.ufo.dal.model.PromotionProductScope;
 import com.yoho.ufo.dal.model.PromotionTypeCondition;
+import com.yoho.ufo.service.impl.UserHelper;
 import com.yoho.ufo.service.model.ApiResponse;
 import com.yoho.ufo.service.model.PageResponseBO;
 import com.yoho.ufo.util.DateUtil;
@@ -81,7 +82,8 @@ public class PromotionServiceImpl implements IPromotionService {
 
     @Override
     public ApiResponse savePromotionActivity(PromotionActivityReq req) {
-        log.info("begin savePromotionActivity with req:{}",req);
+        UserHelper operator = new UserHelper();
+        log.info("begin savePromotionActivity with req:{},user is {}",req, operator.getUserId());
         //1. 校验参数
         ApiResponse checkResult = checkParams(req);
         if(checkResult.getCode() != 200){
@@ -99,7 +101,7 @@ public class PromotionServiceImpl implements IPromotionService {
         //4. 写入商品适用范围表
         insertProductScope(req, currentTime);
 
-        log.info("end savePromotionActivity with promotionId:{}, req:{}", req.getId(), req);
+        log.info("end savePromotionActivity with promotionId:{}, req:{}, user is {}", req.getId(), req, operator.getUserId());
         return new ApiResponse.ApiResponseBuilder().code(200).message("添加成功").build();
     }
 
@@ -121,7 +123,7 @@ public class PromotionServiceImpl implements IPromotionService {
         activityRsp.setPromotionType(activity.getPromotionType());
         activityRsp.setJoinLimitTimes(activity.getJoinLimitTimes());
         activityRsp.setProductLimitType(activity.getProductLimitType());
-        if(activity.getProductLimitType().split(",").length == 6){
+        if(activity.getProductLimitType().split(",").length == 9){//是否选择全部商品类型
             activityRsp.setIsProductTypeAll(1);
         }else {
             activityRsp.setIsProductTypeAll(0);
@@ -159,7 +161,8 @@ public class PromotionServiceImpl implements IPromotionService {
 
     @Override
     public ApiResponse updateDetailById(PromotionActivityReq req) {
-        log.info("begin updateDetailById with req:{}",req);
+        UserHelper operator = new UserHelper();
+        log.info("begin updateDetailById with req:{}, user is {}",req, operator.getUserId());
         //1. 校验参数
         ApiResponse checkResult = checkParams(req);
         if(checkResult.getCode() != 200){
@@ -176,16 +179,17 @@ public class PromotionServiceImpl implements IPromotionService {
         //4.更新商品使用范围参数表 删除原记录 写入新的记录
         productScopeMapper.deleteByPromotionId(req.getId());
         insertProductScope(req, currentTime);
-        log.info("end updateDetailById with req:{}",req);
+        log.info("end updateDetailById with req:{}, user is {}",req, operator.getUserId());
         return new ApiResponse.ApiResponseBuilder().code(200).message("更新营销活动成功").build();
     }
 
     @Override
     public ApiResponse updateStatusById(Integer id, Integer status) {
-        log.info("updateStatusById with id:{},status:{}",id,status);
+        UserHelper operator = new UserHelper();
+        log.info("updateStatusById with id:{},status:{},user:{}",id,status,operator.getUserId());
         if(status == 1) {
-            PromotionActivity activityOld = activityMapper.selectByPrimaryKey(id);
-            PromotionActivity activityCheck = activityMapper.selectActivityWithinTime(activityOld.getStartTime(), activityOld.getEndTime(), id);
+            PromotionActivity activity = activityMapper.selectByPrimaryKey(id);//获取当前活动的开始结束时间
+            PromotionActivity activityCheck = activityMapper.selectActivityWithinTime(activity.getStartTime(), activity.getEndTime(), id);
             if (activityCheck != null) {
                 return new ApiResponse.ApiResponseBuilder().code(201).message("活动生效期间有其他活动开启中，无法开启此活动").build();
             }
@@ -195,8 +199,8 @@ public class PromotionServiceImpl implements IPromotionService {
         activity.setStatus(status);
         activity.setUpdateTime(DateUtil.getCurrentTimeSeconds());
         int result = activityMapper.updateByPrimaryKeySelective(activity);
-        log.info("end updateStatusById with id:{},status:{},result:{}",id,status,result);
-        return new ApiResponse.ApiResponseBuilder().data(result).build();
+        log.info("end updateStatusById with id:{},status:{},result:{},user:{}",id,status,result,operator.getUserId());
+        return new ApiResponse.ApiResponseBuilder().code(200).message("修改活动状态成功").build();
     }
 
     private int insertPromotionActivity(PromotionActivityReq req, Integer currentTime){
@@ -207,7 +211,7 @@ public class PromotionServiceImpl implements IPromotionService {
         activity.setUpdateTime(currentTime);
         activity.setPromotionType(req.getPromotionType());
         activity.setJoinLimitTimes(req.getJoinLimitTimes());
-        activity.setJoinLimitType(req.getPromotionType());
+        activity.setJoinLimitType(req.getJoinLimitType());
         activity.setProductLimitType(req.getProductTypeLimitList());
         activity.setStartTime(DateUtil.getTimeSecondsFromStr(req.getStartTimeStr(),DateUtil.DATE_TIME_FORMAT));
         activity.setEndTime(DateUtil.getTimeSecondsFromStr(req.getEndTimeStr(), DateUtil.DATE_TIME_FORMAT));
@@ -220,7 +224,7 @@ public class PromotionServiceImpl implements IPromotionService {
         PromotionActivity activity = new PromotionActivity();
         activity.setId(req.getId());
         activity.setActivityName(req.getActivityName());
-        activity.setJoinLimitType(req.getPromotionType());
+        activity.setJoinLimitType(req.getJoinLimitType());
         activity.setJoinLimitTimes(req.getJoinLimitTimes());
         activity.setStatus(req.getStatus());
         activity.setPromotionType(req.getPromotionType());
@@ -267,11 +271,8 @@ public class PromotionServiceImpl implements IPromotionService {
     //保存营销活动是校验
     private ApiResponse checkParams(PromotionActivityReq req){
         Integer startTime = DateUtil.getTimeSecondsFromStr(req.getStartTimeStr(), DateUtil.DATE_TIME_FORMAT);
-        if(startTime == null || startTime < DateUtil.getCurrentTimeSeconds()){
-            return new ApiResponse.ApiResponseBuilder().code(201).message("开始时间必须大于当前时间").build();
-        }
         Integer endTime = DateUtil.getTimeSecondsFromStr(req.getEndTimeStr(), DateUtil.DATE_TIME_FORMAT);
-        if(endTime == null || endTime < startTime){
+        if(startTime == null || endTime == null || endTime < startTime){
             return new ApiResponse.ApiResponseBuilder().code(201).message("结束时间必须大于开始时间").build();
         }
         if(req.getInitStatus().equals(PromotionStatusEnum.OPEN.getCode())
@@ -282,7 +283,7 @@ public class PromotionServiceImpl implements IPromotionService {
             PromotionProductScopeBo scopeBo = JSON.parseObject(params, PromotionProductScopeBo.class);
             Integer poolId = Integer.valueOf(scopeBo.getScopeValue());
             if(ufoProductPoolMapper.selectOneById(poolId) == null){
-                return new ApiResponse.ApiResponseBuilder().code(201).message("商品池Id无效：" + poolId).build();
+                return new ApiResponse.ApiResponseBuilder().code(201).message("商品池Id无效").build();
             }
         }
         for(String params : req.getPromotionAmountConditions().split("-")){

+package com.yoho.ufo.dal;
+
+import com.yoho.ufo.dal.model.ResourcesPoolAndCode;
+import com.yohobuy.ufo.resource.req.ResourcePoolAndCodeReqBo;
+
+import java.util.List;
+
+public interface ResourcesPoolAndCodeMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(ResourcesPoolAndCode record);
+
+    int insertSelective(ResourcesPoolAndCode record);
+
+    ResourcesPoolAndCode selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(ResourcesPoolAndCode record);
+
+    int updateByPrimaryKey(ResourcesPoolAndCode record);
+
+    int selectPoolAndCodeCount(ResourcePoolAndCodeReqBo req);
+
+    List<ResourcesPoolAndCode> selectPoolAndCodeList(ResourcePoolAndCodeReqBo req);
+}
\ No newline at end of file

+package com.yoho.ufo.dal.model;
+
+public class ResourcesPoolAndCode {
+    private Integer id;
+
+    private String activityName;
+
+    private Integer poolId;
+
+    private String code;
+
+    private Integer status;
+
+    private Integer startTime;
+
+    private Integer endTime;
+
+    private Integer createTime;
+
+    private Integer updateTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getActivityName() {
+        return activityName;
+    }
+
+    public void setActivityName(String activityName) {
+        this.activityName = activityName == null ? null : activityName.trim();
+    }
+
+    public Integer getPoolId() {
+        return poolId;
+    }
+
+    public void setPoolId(Integer poolId) {
+        this.poolId = poolId;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Integer getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Integer startTime) {
+        this.startTime = startTime;
+    }
+
+    public Integer getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Integer endTime) {
+        this.endTime = endTime;
+    }
+
+    public Integer getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Integer createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Integer updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file

@@ -11,7 +11,7 @@
         id, shelf_code, status
     </sql>
     
-    <select id="selectShelfCodesByShelfCodes" resultType="java.util.List">
+    <select id="selectShelfCodesByShelfCodes" resultType="java.lang.String">
         select shelf_code
         from deposit_shelf_code where 1=1
         <if test="shelfCodeList != null and shelfCodeList.size()>0">  

+<?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.yoho.ufo.dal.ResourcesPoolAndCodeMapper">
+  <resultMap id="BaseResultMap" type="com.yoho.ufo.dal.model.ResourcesPoolAndCode">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="activity_name" jdbcType="VARCHAR" property="activityName" />
+    <result column="pool_id" jdbcType="INTEGER" property="poolId" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="status" jdbcType="TINYINT" property="status" />
+    <result column="start_time" jdbcType="INTEGER" property="startTime" />
+    <result column="end_time" jdbcType="INTEGER" property="endTime" />
+    <result column="create_time" jdbcType="INTEGER" property="createTime" />
+    <result column="update_time" jdbcType="INTEGER" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, activity_name, pool_id, code, status, start_time, end_time, create_time, update_time
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from resources_pool_and_code
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from resources_pool_and_code
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.yoho.ufo.dal.model.ResourcesPoolAndCode">
+    insert into resources_pool_and_code (id, activity_name, pool_id, 
+      code, status, start_time, 
+      end_time, create_time, update_time
+      )
+    values (#{id,jdbcType=INTEGER}, #{activityName,jdbcType=VARCHAR}, #{poolId,jdbcType=INTEGER}, 
+      #{code,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT}, #{startTime,jdbcType=INTEGER}, 
+      #{endTime,jdbcType=INTEGER}, #{createTime,jdbcType=INTEGER}, #{updateTime,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.yoho.ufo.dal.model.ResourcesPoolAndCode">
+    insert into resources_pool_and_code
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="activityName != null">
+        activity_name,
+      </if>
+      <if test="poolId != null">
+        pool_id,
+      </if>
+      <if test="code != null">
+        code,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="startTime != null">
+        start_time,
+      </if>
+      <if test="endTime != null">
+        end_time,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="activityName != null">
+        #{activityName,jdbcType=VARCHAR},
+      </if>
+      <if test="poolId != null">
+        #{poolId,jdbcType=INTEGER},
+      </if>
+      <if test="code != null">
+        #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=TINYINT},
+      </if>
+      <if test="startTime != null">
+        #{startTime,jdbcType=INTEGER},
+      </if>
+      <if test="endTime != null">
+        #{endTime,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.yoho.ufo.dal.model.ResourcesPoolAndCode">
+    update resources_pool_and_code
+    <set>
+      <if test="activityName != null">
+        activity_name = #{activityName,jdbcType=VARCHAR},
+      </if>
+      <if test="poolId != null">
+        pool_id = #{poolId,jdbcType=INTEGER},
+      </if>
+      <if test="code != null">
+        code = #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=TINYINT},
+      </if>
+      <if test="startTime != null">
+        start_time = #{startTime,jdbcType=INTEGER},
+      </if>
+      <if test="endTime != null">
+        end_time = #{endTime,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.yoho.ufo.dal.model.ResourcesPoolAndCode">
+    update resources_pool_and_code
+    set activity_name = #{activityName,jdbcType=VARCHAR},
+      pool_id = #{poolId,jdbcType=INTEGER},
+      code = #{code,jdbcType=VARCHAR},
+      status = #{status,jdbcType=TINYINT},
+      start_time = #{startTime,jdbcType=INTEGER},
+      end_time = #{endTime,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=INTEGER},
+      update_time = #{updateTime,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+    <sql id="listCondition">
+        WHERE 1=1
+        <if test="status != null and status == 0">
+            and status = 0
+        </if>
+      <if test="status != null and status == 1">
+        and status =  1 and start_time > #{nowTime}
+      </if>
+      <if test="status != null and nowTime != null and status == 2">
+        and status =  1 and end_time > #{nowTime} and start_time &lt; #{nowTime}
+      </if>
+      <if test="status != null and nowTime != null and status == 3">
+        and status =  1 and end_time &lt; #{nowTime}
+      </if>
+    </sql>
+    <select id="selectPoolAndCodeCount" parameterType="com.yohobuy.ufo.resource.req.ResourcePoolAndCodeReqBo"
+            resultType="java.lang.Integer">
+        SELECT count(1) FROM resources_pool_and_code
+        <include refid="listCondition"/>
+    </select>
+    <select id="selectPoolAndCodeList" parameterType="com.yohobuy.ufo.resource.req.ResourcePoolAndCodeReqBo"
+            resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM resources_pool_and_code
+        <include refid="listCondition"/>
+        order by create_time desc
+        <if test="rows != null and rows != 0">
+            limit #{start, jdbcType=INTEGER},#{rows, jdbcType=INTEGER}
+        </if>
+    </select>
+</mapper>
\ No newline at end of file

 package com.yoho.ufo.resource.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.yoho.ufo.resource.service.IResourcePoolAndCodeService;
 import com.yoho.ufo.resource.service.IResourceService;
 import com.yoho.ufo.service.model.ApiResponse;
 import com.yoho.ufo.service.model.PageRequestBO;
+import com.yohobuy.ufo.model.common.PageResponseBO;
 import com.yohobuy.ufo.resource.req.ResContentDataModifyBo;
 import com.yohobuy.ufo.resource.req.ResGoodsPoolEditBo;
 import com.yohobuy.ufo.resource.req.ResourceReqBo;
+import com.yohobuy.ufo.resource.req.ResourcePoolAndCodeReqBo;
 import com.yohobuy.ufo.resource.resp.ResourceGetBo;
+import com.yohobuy.ufo.resource.resp.ResourcePoolAndCodeBo;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -31,6 +35,9 @@ public class ResourceController {
     @Autowired
     private IResourceService resourceService;
 
+    @Autowired
+    private IResourcePoolAndCodeService resourcePoolAndCodeServiceService;
+
     @RequestMapping(value = "/getResources")
     public ApiResponse getResources(PageRequestBO req) {
         LOGGER.info("enter getResources,param is {}",req);
@@ -91,4 +98,41 @@ public class ResourceController {
         resourceService.addOrUpdateResourceDeatil(req);
         return new ApiResponse.ApiResponseBuilder().code(200).data("修改成功").build();
     }
+
+    /**
+     * 获取详情banner列表
+     * @param req
+     * @return
+     */
+    @RequestMapping(value = "/getPoolAndCodeList")
+    public ApiResponse getPoolAndCodeList(ResourcePoolAndCodeReqBo req) {
+        LOGGER.info("enter getPoolAndCodeList,param is {}",req);
+        PageResponseBO<ResourcePoolAndCodeBo> result = resourcePoolAndCodeServiceService.getPoolAndCodeList(req);
+        return new ApiResponse.ApiResponseBuilder().code(200).data(result).build();
+    }
+
+    /**
+     * 编辑详情banner
+     * @param req
+     * @return
+     */
+    @RequestMapping(value = "/editPoolAndCode")
+    public ApiResponse editPoolAndCode(ResourcePoolAndCodeReqBo req) {
+        LOGGER.info("enter editPoolAndCode,param is {}",req);
+        resourcePoolAndCodeServiceService.editPoolAndCode(req);
+        return new ApiResponse.ApiResponseBuilder().code(200).data("ok").build();
+    }
+
+    /**
+     * 更新状态（开启、关闭）
+     * @param req
+     * @return
+     */
+    @RequestMapping(value = "/updateStatus")
+    public ApiResponse updateStatus(ResourcePoolAndCodeReqBo req) {
+        LOGGER.info("enter editPoolAndCode,param is {}",req);
+        resourcePoolAndCodeServiceService.editPoolAndCode(req);
+        return new ApiResponse.ApiResponseBuilder().code(200).data("ok").build();
+    }
+
 }

+package com.yoho.ufo.resource.service;
+
+import com.yohobuy.ufo.model.common.PageResponseBO;
+import com.yohobuy.ufo.resource.req.ResourcePoolAndCodeReqBo;
+import com.yohobuy.ufo.resource.resp.ResourcePoolAndCodeBo;
+
+/**
+ * Created by shaofeng.zhou on 2019-8-26 10:15:16.
+ */
+public interface IResourcePoolAndCodeService {
+
+    PageResponseBO<ResourcePoolAndCodeBo> getPoolAndCodeList(ResourcePoolAndCodeReqBo req);
+
+    void editPoolAndCode(ResourcePoolAndCodeReqBo req);
+
+    void updateStatus(ResourcePoolAndCodeReqBo req);
+}

+package com.yoho.ufo.resource.service.impl;
+
+import com.yoho.core.rest.client.ServiceCaller;
+import com.yoho.error.exception.ServiceException;
+import com.yoho.ufo.dal.ResourcesPoolAndCodeMapper;
+import com.yoho.ufo.dal.model.ResourcesPoolAndCode;
+import com.yoho.ufo.resource.service.IResourcePoolAndCodeService;
+import com.yohobuy.ufo.model.common.PageResponseBO;
+import com.yoho.ufo.util.CollectionUtil;
+import com.yoho.ufo.util.DateUtil;
+import com.yoho.ufo.util.OrikaUtils;
+import com.yohobuy.ufo.resource.req.ResourcePoolAndCodeReqBo;
+import com.yohobuy.ufo.resource.resp.ResourcePoolAndCodeBo;
+import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
+import com.yoho.ufo.constants.ActivityStatusEnum;
+/**
+ * Created by shaofeng.zhou on 2019-8-26 10:16:43.
+ */
+@Service
+public class ResourcePoolAndCodeServiceImpl implements IResourcePoolAndCodeService{
+    private static final Logger LOGGER = LoggerFactory.getLogger(ResourcePoolAndCodeServiceImpl.class);
+    @Autowired
+    private ResourcesPoolAndCodeMapper resourcesPoolAndCodeMapper;
+
+    @Autowired
+    private ServiceCaller serviceCaller;
+    
+    private ExecutorService exe = Executors.newFixedThreadPool(1);
+
+
+	/**
+	 * 获取列表
+	 * @param req
+	 * @return
+	 */
+	@Override
+	public PageResponseBO<ResourcePoolAndCodeBo> 	getPoolAndCodeList(ResourcePoolAndCodeReqBo req) {
+		LOGGER.info("getPoolAndCodeList param = {}", req);
+		req.setNowTime(DateUtil.getCurrentTimeSeconds());
+		int count = resourcesPoolAndCodeMapper.selectPoolAndCodeCount(req);
+		if (count == 0) {
+			LOGGER.warn("getSearchWordPageList count is 0, param = {}", req);
+			return new PageResponseBO<>();
+		}
+		List<ResourcesPoolAndCode> poolAndCodeList = resourcesPoolAndCodeMapper.selectPoolAndCodeList(req);
+		if(CollectionUtils.isEmpty(poolAndCodeList)){
+			LOGGER.warn("getSearchWordPageList count is 0, param = {}", req);
+			return new PageResponseBO<>();
+		}
+
+		List<ResourcePoolAndCodeBo> poolAndCodeRespBoList = poolAndCodeList.stream().map(poolAndCode -> {
+			ResourcePoolAndCodeBo poolAndCodeBo = OrikaUtils.map(poolAndCode, ResourcePoolAndCodeBo.class);
+			poolAndCodeBo.setStatus(getStatus(poolAndCodeBo));
+			return poolAndCodeBo;
+		}).collect(Collectors.toList());
+
+		return new PageResponseBO<>(count, poolAndCodeRespBoList, req.getPage(), req.getRows());
+	}
+
+	/**
+	 * activity 状态
+	 * @param poolAndCodeBo
+	 * @return
+	 */
+	private Integer getStatus (ResourcePoolAndCodeBo poolAndCodeBo) {
+
+		Integer status = poolAndCodeBo.getStatus();
+		Integer nowTime = DateUtil.getCurrentTimeSeconds();
+
+		// 关闭
+		if (status == 0) {
+			return ActivityStatusEnum._0.getStatus();
+		}
+
+		// 开启
+		if (poolAndCodeBo.getStartTime() > nowTime) {
+			return ActivityStatusEnum._1.getStatus();
+		}
+
+		// 生效中
+		if (poolAndCodeBo.getStartTime() < nowTime && nowTime < poolAndCodeBo.getEndTime()) {
+			return ActivityStatusEnum._2.getStatus();
+		}
+
+		// 已失效
+		return ActivityStatusEnum._3.getStatus();
+	}
+
+	/**
+	 * 编辑详情banner
+	 * @param req
+	 */
+	@Override
+	public void editPoolAndCode(ResourcePoolAndCodeReqBo req) {
+
+		LOGGER.info("editPoolAndCode param = {}", req);
+		ResourcesPoolAndCode record = OrikaUtils.map(req, ResourcesPoolAndCode.class);
+		Integer nowTime = DateUtil.getCurrentTimeSeconds();
+		try {
+			// 编辑
+			if (null != req.getId()) {
+				record.setUpdateTime(nowTime);
+				resourcesPoolAndCodeMapper.updateByPrimaryKeySelective(record);
+			}
+
+			// 新增
+			else {
+				record.setCreateTime(nowTime);
+				record.setUpdateTime(nowTime);
+				resourcesPoolAndCodeMapper.insertSelective(record);
+			}
+		} catch (Exception error) {
+			LOGGER.error("editPoolAndCode err = {}", error);
+			throw new ServiceException(500, "详情banner更新失败！");
+		}
+
+	}
+
+	/**
+	 * 编辑详情banner
+	 * @param req
+	 */
+	@Override
+	public void updateStatus(ResourcePoolAndCodeReqBo req) {
+		LOGGER.info("updateStatus param = {}", req);
+
+		if (null == req.getId() || null == req.getStatus()) {
+			LOGGER.error("updateStatus 参数错误 param = {}", req);
+			throw new ServiceException(500, "详情banner更新失败, 参数错误！");
+		}
+
+		ResourcesPoolAndCode record = new ResourcesPoolAndCode();
+		record.setUpdateTime(DateUtil.getCurrentTimeSeconds());
+		record.setStatus(req.getStatus());
+
+		try {
+			resourcesPoolAndCodeMapper.updateByPrimaryKeySelective(record);
+		} catch (Exception error) {
+			LOGGER.error("editPoolAndCode err = {}", error);
+			throw new ServiceException(500, "详情banner更新状态失败！");
+		}
+	}
+
+
+}

@@ -82,6 +82,7 @@ datasources:
      - com.yoho.ufo.dal.ResourcesContentMapper
      - com.yoho.ufo.dal.ResourcesContentDataMapper
      - com.yoho.ufo.dal.ResourcesGoodsPoolMapper
+     - com.yoho.ufo.dal.ResourcesPoolAndCodeMapper
 
    erp_product:
       servers:

@@ -83,6 +83,7 @@ datasources:
         - com.yoho.ufo.dal.ResourcesContentMapper
         - com.yoho.ufo.dal.ResourcesContentDataMapper
         - com.yoho.ufo.dal.ResourcesGoodsPoolMapper
+        - com.yoho.ufo.dal.ResourcesPoolAndCodeMapper
 
    erp_product:
       servers:

@@ -2,7 +2,6 @@
 
 <div id="promotionEditDiv" class="easyui-layout" fit="true" style="overflow-y: scroll">
     <form name="promotionEditForm" id="promotionEditForm" method="post">
-        <input type="hidden" name="isCoupon" id="isCoupon"/>
         <div style="margin-top: 20px;margin-left: 30px">
             <table border="0" style="width:95%;margin-top:5px;line-height:30px;" id="tab">
                 <tr style="height: 60px" >
@@ -21,7 +20,7 @@
                 <tr style="height: 60px">
                     <td width="10%"><span style="color:red">*</span><label>标签：</label></td>
                     <td colspan="3">
-                        <input class="easyui-textbox" id="label" name="label" style="width: 280px;"/>
+                        <input class="easyui-textbox" id="label" name="label"  data-options="required:true" style="width: 280px;"/>
                     </td>
                 </tr>
                 <tr style="height: 60px">
@@ -30,31 +29,14 @@
                         <input class="easyui-combobox" id="promotionType" name="promotionType" style="width: 200px;"/>
                     </td>
                 </tr>
-               <!-- <tr style="height: 60px;display: none" id="limitCrashTr">
-                    <td width="10%"><span style="color:red">*</span><label>优惠条件：</label></td>
-                    <td colspan="3">
-                        <div id="limitCrashDiv">
-                            <div id="limitCrashDiv1" name="limitCrashDiv" >
-                                商品金额大于等于<input class="easyui-numberbox" id="limitAmount_1" name="limitAmount" style="width: 60px;" data-options="min:0,precision:0">元，
-                                减 <input class="easyui-numberbox" id="offerAmount_1" name="offerAmount" style="width: 60px;" data-options="min:0,precision:0">元
-                                最高优惠<input class="easyui-numberbox" id="offerMaxAmount_1" name="offerMaxAmount" style="width: 60px;" data-options="min:0,precision:0">元
-                                &lt;!&ndash;&nbsp;&nbsp;<a id="limitAddBtn" name="limitAddBtn" href="#" class="easyui-linkbutton btn-success">+</a>&ndash;&gt;
-                                <input type="hidden" value="1" id="addLimitCount">
-                            </div>
-                        </div>
-
-                    </td>
-
-                </tr>-->
                 <tr style="height: 60px;display: none" id="limitDisCountTr">
                     <td width="10%"><span style="color:red">*</span><label>优惠条件：</label></td>
                     <td colspan="3">
                         <div id="limitDisCountDiv">
-                            商品金额大于等于<input class="easyui-numberbox" id="limitAmount_0" style="width: 60px;" data-options="min:0,precision:0">元，
-                            折扣为 <input class="easyui-numberbox" id="offerAmount_0" style="width: 60px;" data-options="min:0,precision:2">；
+                            商品金额大于等于<input class="easyui-numberbox" id="limitAmount_0" style="width: 60px" data-options="min:0,precision:0">元，
+                            折扣为 <input class="easyui-numberbox" id="offerAmount_0" style="width: 60px;" data-options="min:0,precision:2">，
                             最高优惠<input class="easyui-numberbox" id="offerMaxLimit" style="width: 60px;" data-options="min:0,precision:0">元
                         </div>
-
                     </td>
 
                 </tr>
@@ -67,18 +49,18 @@
                 <tr style="height: 60px">
                     <td width="10%"><span style="color:red">*</span><label>适用范围：</label></td>
                     <td>
-                        <input class="easyui-combobox" id="productScopeType" name="productScopeType" style="width: 200px;"/>
+                        <input class="easyui-combobox" id="productScopeType" name="productScopeType" data-options="required:true"  style="width: 200px;"/>
                     </td>
                     <td>
-                        <input class="easyui-combobox" id="limitType" name="limitType" style="width: 200px;"/>
+                        <input class="easyui-combobox" id="limitType" name="limitType" style="width: 200px;" data-options="required:true" />
                     </td>
                     <td>
-                        <input class="easyui-textbox" id="limitValues" name="limitValues" style="width: 280px;"/>
+                        <input class="easyui-numberbox" id="limitValues" name="limitValues" style="width: 280px;" data-options="required:true" />
                     </td>
                 </tr>
 
                 <tr style="height: 60px">
-                    <td width="10%"><span style="color:red">*</span><label>可用商品类型：</label></td>
+                    <td width="10%"><span style="color:red">*</span><label>可用订单类型：</label></td>
                     <td colspan="3">
                         <label>
                             <input type="checkbox" name="isAll"
@@ -90,20 +72,27 @@
                     <td></td>
                     <td colspan="3">
                         <input type="checkbox" name="productLimitChose" id="productLimit1" value="1">现货发货
-                        <input type="checkbox" name="productLimitChose" id="productLimit18" value="18" >闪存寄存
+                        <input type="checkbox" name="productLimitChose" id="productLimit72" value="72" >闪购寄存
                         <input type="checkbox" name="productLimitChose" id="productLimit4" value="4" >预售
-                        <input type="checkbox" name="productLimitChose" id="productLimit7" value="7" >现货寄存
+                        <input type="checkbox" name="productLimitChose" id="productLimit71" value="71" >现货寄存
                         <input type="checkbox" name="productLimitChose" id="productLimit17" value="17" >香港极速仓
                         <input type="checkbox" name="productLimitChose" id="productLimit6" value="6" >二手
-                        <input type="checkbox" name="productLimitChose" id="productLimit2" value="2" >闪购发货
-                        <input type="checkbox" name="productLimitChose" id="productLimit3" value="3" >极速发货
+                        <input type="checkbox" name="productLimitChose" id="productLimit3" value="3" >闪购发货
+                        <input type="checkbox" name="productLimitChose" id="productLimit9" value="9" >极速发货
                         <input type="checkbox" name="productLimitChose" id="productLimit5" value="5" >全新瑕疵
                     </td>
                 </tr>
                 <tr style="height: 60px">
                     <td width="10%"><span style="color:red">*</span><label>活动期间内总次数限制：</label></td>
                     <td colspan="3">
-                        <input class="easyui-numberbox" id="joinLimitTimes" name="joinLimitTimes" style="width: 120px;"/>次
+                        <input class="easyui-numberbox" id="joinLimitTimes" name="joinLimitTimes" data-options="required:true"  style="width: 120px;"/>次
+                    </td>
+                </tr>
+
+                <tr style="height: 60px">
+                    <td width="10%"><span style="color:red">*</span><label>活动是否开启：</label></td>
+                    <td colspan="3">
+                        <input class="easyui-combobox" id="initStatus" name="initStatus" style="width: 200px;"/>
                     </td>
                 </tr>
             </table>
@@ -143,7 +132,7 @@
     $("#promotionEditForm #promotionType").combobox({
         textField : "text",
         valueField : "value",
-        url : contextPath + "/PromotionController/getPromotionTypeEnums",
+        data:[{text:"折扣",value:"2"}],
         panelHeight : 80,
         onSelect : function(record){
             if(record.value == 1){
@@ -169,26 +158,33 @@
     $("#promotionEditForm #limitType").combobox({
         textField : "text",
         valueField : "value",
+        panelHeight : 80,
         data:[{text:"属于",value:"1"},{text:"不属于",value:"2"}],
         onLoadSuccess : function(){
             $("#promotionEditForm #limitType").combobox("setValue",1);
         }
+    });
 
-    })
+    $("#promotionEditForm #initStatus").combobox({
+        textField : "text",
+        valueField : "value",
+        panelHeight : 80,
+        data:[{text:"开启",value:"1"},{text:"关闭",value:"2"}],
+        onLoadSuccess : function(){
+            $("#promotionEditForm #initStatus").combobox("setValue",2);
+        }
+    });
 
     $("#promotionEditForm #productScopeType").combobox({
         textField : "text",
         valueField : "value",
+        panelHeight : 80,
         data:[{text:"商品池",value:"2"}],
         onLoadSuccess : function(){
             $("#promotionEditForm #productScopeType").combobox("setValue",2);
         }
     });
 
-   /* $("#promotionEditForm #sknFile").filebox({
-        buttonAlign: 'right',
-        accept: '.xlsx'
-    });*/
 
     $("#promotionEditForm #limitValues").textbox({
         prompt : "请输入商品池id"

@@ -9,7 +9,7 @@
 </head>
 <body class="easyui-layout">
 
-<div region="north" style="height:230px;">
+<div region="north" style="height:260px;">
     <script>
         document.write(addHead('促销管理', '促销活动'));
     </script>
@@ -129,8 +129,7 @@
                 width: 80,
                 align: "center",
                 formatter: function (value, rowData) {
-                    //var str = "<a role='view' dataId='" + rowData.id + "'  style='margin-left:10px;background-color: #5bc0de'>查看</a>";
-                    var str = "";
+                    var str = "<a role='view' dataId='" + rowData.id + "'  style='margin-left:10px;background-color: #5bc0de'>查看</a>";
                     if(rowData.status == 1){
                         str += "<a role='close' dataId='" + rowData.id + "' style='margin-left:10px;background-color: red'>关闭</a>";
                     }else if(rowData.status == 2){
@@ -202,6 +201,28 @@
             return param;
         }
 
+        function view(id){
+            paramObject.promotionId = id;
+            var div = $("<div>").appendTo($(document.body));
+            var title = "查看促销活动";
+            $(div).myDialog({
+                width: "60%",
+                height: "90%",
+                title: title,
+                href: contextPath + "/html/promotionManage/promotionEdit.html",
+                modal: true,
+                collapsible: true,
+                cache: false,
+                buttons: [{
+                    text: "关闭",
+                    iconCls: "icon-cancel",
+                    handler: function () {
+                        $(div).dialog("close");
+                    }
+                }]
+            });
+        }
+
         function edit(id) {
             paramObject.promotionId = id;
             var div = $("<div>").appendTo($(document.body));
@@ -319,12 +340,16 @@
                                         });
                                     }
                                 }
+                                if(productLimitType == ""){
+                                    $.messager.alert("提示", "请选择可用商品类型！", "error");
+                                    return false;
+                                }
                                 param.id = id;
                                 param.promotionAmountConditions = promotionTypeParamses;
                                 param.productTypeLimitList = productLimitType.substring(0,productLimitType.length - 1);
                                 param.promotionProductScopes = productScope;
                                 param.joinLimitType= 1;
-                                param.initStatus = 2;
+                                param.initStatus = $("#promotionEditForm #initStatus").combobox("getValue");
                                 $.messager.progress({
                                     title: "正在执行",
                                     msg: "正在执行，请稍后..."

@@ -3,83 +3,95 @@
     <form name="promotionEditForm" id="promotionEditForm" method="post">
         <div style="margin-top: 20px;margin-left: 30px">
             <table border="0" style="width:95%;margin-top:5px;line-height:30px;" id="tab">
-                <tr style="height: 60px">
+                <tr style="height: 60px" >
                     <td width="10%"><span style="color:red">*</span><label>活动名称：</label></td>
-                    <td>
-                        <input class="easyui-textbox" id="activityName" name="activityName" style="width: 380px;" readonly/>
+                    <td colspan="3">
+                        <input class="easyui-textbox" id="activityName" name="activityName" data-options="validType:'length[1,50]'" style="width: 280px;"/>
                     </td>
                 </tr>
-                <tr style="height: 60px">
+                <tr style="height: 60px" >
                     <td width="10%"><span style="color:red">*</span><label>活动时间：</label></td>
-                    <td>
-                        <input class="easyui-datetimebox" name="startTime" id="startTime" data-options="required:true,showSeconds:false" style="width:150px" readonly> ~
-                        <input class="easyui-datetimebox" name="endTime" id="endTime" data-options="required:true,showSeconds:false" style="width:150px" readonly>
+                    <td colspan="3">
+                        <input class="easyui-datetimebox" name="startTimeStr" id="startTimeStr" data-options="required:true,showSeconds:false" style="width:200px"> ~
+                        <input class="easyui-datetimebox" name="endTimeStr" id="endTimeStr" data-options="required:true,showSeconds:false" style="width:200px">
                     </td>
                 </tr>
-
                 <tr style="height: 60px">
-                    <td width="10%"><span style="color:red">*</span><label>列表标签：</label></td>
-                    <td>
-                        <input class="easyui-datetimebox" name="label" id="label" data-options="required:true,showSeconds:false" style="width:150px" readonly>
+                    <td width="10%"><span style="color:red">*</span><label>标签：</label></td>
+                    <td colspan="3">
+                        <input class="easyui-textbox" id="label" name="label" style="width: 280px;"/>
                     </td>
                 </tr>
                 <tr style="height: 60px">
                     <td width="10%"><span style="color:red">*</span><label>促销类型：</label></td>
-                    <td>
-                        <input class="easyui-textbox" id="promotionType" name="promotionType" style="width: 380px;" readonly/>
+                    <td colspan="3">
+                        <input class="easyui-combobox" id="promotionType" name="promotionType" style="width: 200px;"/>
                     </td>
                 </tr>
-                <tr style="height: 60px">
+                <tr style="height: 60px;display: none" id="limitDisCountTr">
                     <td width="10%"><span style="color:red">*</span><label>优惠条件：</label></td>
-                    <td>
-                        商品金额大于等于
-                        <input class="easyui-numberbox" id="limitAmount" name="limitAmount" style="width: 180px;"/>元，
-                        减<input class="easyui-numberbox" id="offerAmount" name="offerAmount" style="width: 180px;"/>元
+                    <td colspan="3">
+                        <div id="limitDisCountDiv">
+                            商品金额大于等于<input class="easyui-numberbox" id="limitAmount_0" style="width: 60px" data-options="min:0,precision:0">元，
+                            折扣为 <input class="easyui-numberbox" id="offerAmount_0" style="width: 60px;" data-options="min:0,precision:2">，
+                            最高优惠<input class="easyui-numberbox" id="offerMaxLimit" style="width: 60px;" data-options="min:0,precision:0">元
+                        </div>
                     </td>
 
                 </tr>
                 <tr>
                     <td></td>
-                    <td>
-                        <span style="color:red">提示：1、折扣填写0-1之间的两位小数。例如，0.85表示85折</span><br>
+                    <td colspan="3">
+                        <span style="color:red">提示：折扣填写0-1之间的两位小数。例如：0.85表示85折</span><br>
                     </td>
                 </tr>
                 <tr style="height: 60px">
                     <td width="10%"><span style="color:red">*</span><label>适用范围：</label></td>
                     <td>
-                        <input class="easyui-textbox" id="productScopeType" name="productScopeType" style="width: 380px;" readonly/>
+                        <input class="easyui-combobox" id="productScopeType" name="productScopeType" style="width: 200px;"/>
                     </td>
                     <td>
-                        <input class="easyui-textbox" id="limitType" name="limitType" style="width: 380px;" readonly/>
+                        <input class="easyui-combobox" id="limitType" name="limitType" style="width: 200px;"/>
                     </td>
                     <td>
-                        <input class="easyui-textbox" id="limitValues" name="limitValues" style="width:300px">
+                        <input class="easyui-textbox" id="limitValues" name="limitValues" style="width: 280px;"/>
                     </td>
                 </tr>
+
                 <tr style="height: 60px">
                     <td width="10%"><span style="color:red">*</span><label>可用商品类型：</label></td>
-                    <td>
-                        <input data-toggle="topjui-checkbox" name="isAll" value="isAll" label="全部">
+                    <td colspan="3">
+                        <label>
+                            <input type="checkbox" name="isAll"
+                                   id="isAll" onclick="isAllClick(this)">全部商品
+                        </label>
                     </td>
                 </tr>
                 <tr style="height: 60px">
                     <td></td>
-                    <td>
-                        <input data-toggle="topjui-checkbox" name="productLimitType" value="1" label="现货发货">
-                        <input data-toggle="topjui-checkbox" name="productLimitType" value="2" label="闪购寄存">
-                        <input data-toggle="topjui-checkbox" name="productLimitType" value="3" label="预售">
-                        <input data-toggle="topjui-checkbox" name="productLimitType" value="4" label="现货寄存">
-                        <input data-toggle="topjui-checkbox" name="productLimitType" value="5" label="香港急速仓">
-                        <input data-toggle="topjui-checkbox" name="productLimitType" value="6" label="二手">
-                        <input data-toggle="topjui-checkbox" name="productLimitType" value="6" label="闪购发货">
-                        <input data-toggle="topjui-checkbox" name="productLimitType" value="6" label="急速发货">
-                        <input data-toggle="topjui-checkbox" name="productLimitType" value="6" label="全新瑕疵">
+                    <td colspan="3">
+                        <input type="checkbox" name="productLimitChose" id="productLimit1" value="1">现货发货
+                        <input type="checkbox" name="productLimitChose" id="productLimit18" value="18" >闪存寄存
+                        <input type="checkbox" name="productLimitChose" id="productLimit4" value="4" >预售
+                        <input type="checkbox" name="productLimitChose" id="productLimit7" value="7" >现货寄存
+                        <input type="checkbox" name="productLimitChose" id="productLimit17" value="17" >香港极速仓
+                        <input type="checkbox" name="productLimitChose" id="productLimit6" value="6" >二手
+                        <input type="checkbox" name="productLimitChose" id="productLimit2" value="2" >闪购发货
+                        <input type="checkbox" name="productLimitChose" id="productLimit3" value="3" >极速发货
+                        <input type="checkbox" name="productLimitChose" id="productLimit5" value="5" >全新瑕疵
                     </td>
                 </tr>
                 <tr style="height: 60px">
                     <td width="10%"><span style="color:red">*</span><label>活动期间内总次数限制：</label></td>
-                    <td>
-                        <input class="easyui-textbox" id="joinLimitTimes" name="joinLimitTimes" style="width: 380px;"/>次
+                    <td colspan="3">
+                        <input class="easyui-numberbox" id="joinLimitTimes" name="joinLimitTimes" style="width: 120px;"/>次
+                    </td>
+                </tr>
+
+                <tr style="height: 60px">
+                    <td width="10%"><span style="color:red">*</span><label>活动是否开启：</label></td>
+                    <td colspan="3">
+                        <input class="easyui-combobox" id="initStatus" name="initStatus" style="width: 200px;"/>
                     </td>
                 </tr>
             </table>
@@ -116,6 +128,5 @@
         onChange : function(checked){
             debugger;
         }
-
     });
 </script>
\ No newline at end of file

+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="UTF-8"/>
+        <title>Yoho!Buy运营平台</title>
+        
+        <script src="/ufoPlatform/js/include.js"></script>
+
+
+    <style>
+    .app {
+        padding: 50px;
+    }
+    </style>
+</head>
+<body class="easyui-layout">
+
+<div id="tradeBillsList" region="center">
+    <div id="app" style="padding: 50px 20px" class="app-box">
+        <i-form :label-width="120">
+
+            <Form-item label="活动名称">
+                <i-input v-model="info.activityName" placeholder="请输入"></i-input>
+            </Form-item>
+            <Form-item label="商品范围">
+                <Radio-group v-model="productOptionValue" @on-change="changeProductOption">
+                    <Radio label="0">全部商品</Radio>
+                    <Radio label="1">商品池ID</Radio>
+                </Radio-group>
+
+                <i-input v-if="productOptionValue == '1'" v-model="info.poolId" style="width: 60px;"></i-input>
+
+            </Form-item>
+
+            <Form-item label="资源位位置码">
+                <i-input v-model="info.code" placeholder="请输入"></i-input>
+            </Form-item>
+            <Form-item label="展示时间段">
+                <Row>
+                    <i-col span="12">
+                        <Date-picker type="datetime" :value="startTimeStr" placeholder="开始时间" style="width: 180px"  @on-change="changeStartTime"></Date-picker>
+                    </i-col>
+
+                    <i-col span="12">
+                        <Date-picker type="datetime" :value="endTimeStr" placeholder="结束时间" style="width: 180px" @on-change="changeEndTime"></Date-picker>
+                    </i-col>
+                </Row>
+            </Form-item>
+        </i-form>
+
+    </div>
+</div>
+
+<script>
+    console.log(formData);
+    var app = new Vue({
+        el: '#app',
+        data: {
+            info: {},
+            startTimeOption: {},
+            endTimeOption: {},
+            productOptionValue: 0,
+            startTimeStr: '',
+            endTimeStr: '',
+        },
+        created: function () {
+            this.info = info || {};
+            this.productOptionValue = this.info.poolId > 0 ? "1" : "0";
+            this.startTimeStr = this.info.startTime ? moment(this.info.startTime*1000).format('YYYYMMDD h:mm:ss') : "";
+            this.endTimeStr = this.info.endTime ? moment(this.info.endTime*1000).format('YYYYMMDD h:mm:ss') : "";
+        },
+
+        methods: {
+            onStartTimeChange: function(startTime, type) {
+                console.log('onStartTimeChange', startTime, type);
+            },
+
+            onEndTimeChange: function (endTime, type) {
+                console.log('onEndTimeChange', endTime, type);
+            },
+
+            changeProductOption: function (val) {
+                this.info.poolId = 0;
+            },
+
+            changeStartTime: function (data) {
+                this.info.startTime = moment(data).valueOf() / 1000;
+                console.log(this.info);
+            },
+
+            changeEndTime: function (data) {
+                this.info.endTime = moment(data).valueOf() / 1000;
+                console.log(this.info);
+            }
+        },
+        computed: {
+            showPool: function () {
+                return this.productOptionValue == 0 ? false : true
+            }
+        },
+        watch: {
+            info: {
+                handler: function () {
+                    formData = this.info;
+                },
+                deep: true
+            }
+        }
+    });
+
+</script>
+</body>
+</html>
\ No newline at end of file

+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8"/>
+    <title>Yoho!Buy运营平台</title>
+    <script src="/ufoPlatform/js/include.js"></script>
+    <script src="/ufoPlatform/js/ajaxfileupload.js"></script>
+    <link rel="stylesheet" href="/ufoPlatform/css/iview.css">
+</head>
+<body class="easyui-layout" fit="true">
+<div region="north" style="height: 230px">
+    <script>
+        document.write(addHead('资源管理 /详情banner', ''));
+    </script>
+    <style>
+        .div_search input {
+            margin-top: 20px;
+        }
+
+        .div_search .textbox {
+            margin-top: 20px;
+        }
+
+        .div_search .easyui-linkbutton {
+            margin-top: 20px;
+        }
+    </style>
+    <div style="margin-left: 30px;" class="div_search">
+        <a id="addPoolAndCode" class="easyui-linkbutton btn-success">新增活动配置</a>
+    </div>
+    <div style="margin-left: 30px;" class="div_search">
+        <select id="status" class="easyui-combobox" style="width:150px;"  >
+            <option value="">选择选择状态</option>
+            <option value="1">开启</option>
+            <option value="0">关闭</option>
+            <option value="2">进行中</option>
+            <option value="3">已失效</option>
+        </select>
+
+        <a id="searchLinkButton" class="easyui-linkbutton btn-info" data-options="iconCls:'icon-search'">搜索</a>
+        <a id="searchAllLinkButton" class="easyui-linkbutton btn-info" data-options="iconCls:'icon-search'">全部</a>
+    </div>
+</div>
+<div region="center">
+    <div style="margin-left: 30px;margin-top: 20px;height: 660px">
+        <table id="listTable"></table>
+    </div>
+</div>
+<script type="text/javascript" src="/ufoPlatform/js/moment.min.js"></script>
+<script type="text/javascript" src="/ufoPlatform/js/vue/vue-2.3.4.js"></script>
+<script type="text/javascript" src="/ufoPlatform/js/iview.min.js"></script>
+<script type="text/javascript">
+    var searchWordId;
+    var dataList;
+    var info = {};
+    var formData = {};
+    $(function () {
+        $("#searchWord").textbox({
+            prompt: "搜索词"
+        });
+        $('#addPoolAndCode').linkbutton({
+            iconCls: "icon-edit",
+            onClick: function () {
+                editRow(0);
+            }
+        });
+
+
+
+        $("#listTable").myDatagrid({
+            fit: true,
+            fitColumns: true,
+            nowrap: false,
+            url: contextPath + "/resource/getPoolAndCodeList",
+            method: 'POST',
+            loadFilter: function (data) {
+                var temp = defaultLoadFilter(data);
+                temp.rows = temp.list;
+                return temp;
+            },
+            columns: [[{
+                title: "序号",
+                field: "id",
+                width: 40,
+                align: "center"
+            }, {
+                title: "活动名称",
+                field: "activityName",
+                width: 80,
+                align: "center"
+            }, {
+                title: "商品池",
+                field: "poolId",
+                width: 100,
+                align: "center",
+                formatter: function (value) {
+                    if (value == 0) {
+                        return "全部商品";
+                    } else {
+                        return value;
+                    }
+                }
+            }, {
+                title: "位置码",
+                field: "code",
+                width: 80,
+                align: "center"
+            },{
+                title: "展示时间",
+                field: "orderBy",
+                width: 80,
+                align: "center",
+                formatter: function (value, rowData) {
+                    console.log(rowData.startTime, rowData.endTime);
+                    return moment(rowData.startTime*1000).format('YYYYMMDD h:mm:ss') + "至" + moment(rowData.endTime*1000).format('YYYYMMDD h:mm:ss');
+                }
+            },{
+                title: "状态",
+                field: "status",
+                width: 170,
+                align: "center",
+                formatter: function (value, rowData) {
+                    if (value == 0) {
+                        return "关闭";
+                    }
+
+                    else if (value == 1) {
+                        return "开启";
+                    }
+
+                    else if (value == 2) {
+                        return "生效中";
+                    }
+
+                    else if (value == 3) {
+                        return "已失效";
+                    }
+                }
+            }, {
+                title: "操作",
+                field: "operations",
+                width: 80,
+                align: "center",
+                formatter: function (value, rowData, index) {
+                    var str = "";
+                    var edit = "<a role='editor' data-id='" + rowData.id + "'  style='margin-left:10px;'>编辑</a>";
+                    var open = "<a role='updateStatus' data-id='" + rowData.id + "' data-status='1'  style='margin-left:10px;'>开启</a>";
+                    var close = "<a role='updateStatus' data-id='" + rowData.id + "' data-status='0'  style='margin-left:10px; background: #f00'>关闭</a>";
+
+                    if (rowData.status == 0) {
+                        str = edit + open;
+                    }
+
+                    else if (rowData.status == 1 || rowData.status == 2) {
+                        str = close;
+                    }
+
+                    return str;
+                }
+            }]],
+            cache: false,
+            pagination: true,
+            pageSize: 10,
+            pageList: [10],
+            idField: "id",
+            singleSelect: false,
+            checkOnSelect: false,
+            onLoadSuccess: function (data) {
+                dataList = data.list;
+                // 编辑
+                $(this).myDatagrid("getPanel").find("a[role='editor']").linkbutton({
+                    iconCls: "icon-edit",
+                    onClick: function () {
+                        var id = $(this).data("id");
+                        editRow(id);
+                    }
+                });
+
+                // 开启/关闭
+                $(this).myDatagrid("getPanel").find("a[role='updateStatus']").linkbutton({
+                    iconCls: "icon-more",
+                    onClick: function () {
+                        var id = $(this).data("id");
+                        var status = $(this).data("status");
+                        updateStatus(id, status);
+                    }
+                });
+            }
+        });
+
+        // 搜索
+        $("#searchLinkButton").linkbutton({
+            onClick: function () {
+                var param = getParams();
+                $("#listTable").myDatagrid("load", param);
+            }
+        });
+
+        // 搜索全部
+        $("#searchAllLinkButton").linkbutton({
+            onClick: function () {
+                $('#status').combobox('clear');
+                var param = {};
+                $("#listTable").myDatagrid("load", param);
+            }
+        });
+
+        /**
+         * 提取出搜索参数
+         */
+        function getParams() {
+
+            // 状态
+            var status = $('#status').combobox('getValue');
+            var param = {};
+            if (undefined !== status && null !== status && "" !== status) {
+                param.status = status;
+            }
+
+            return param;
+        }
+
+        /**
+         * 开启/关闭
+         * @param id
+         * @param status
+         */
+        function updateStatus(id, status) {
+            // console.log(id, status);
+            // return;
+            $.ajax({
+                url: contextPath + "/resource/updateStatus",
+                type: "POST",
+                dataType: "json",
+                data: {
+                    id: id,
+                    status: status
+                },
+                success: function (data) {
+                    $.messager.progress("close");
+                    if (data.code == 200) {
+                        $("#listTable").myDatagrid("reload");
+                        $.messager.show({
+                            title: "提示",
+                            msg: "操作成功！",
+                            height: 120
+                        });
+                    } else {
+                        $.messager.alert("失败", data.message, "error");
+                    }
+                },
+                error: function (err) {
+                    console.log(err)
+                },
+                complete: function () {
+
+                }
+            })
+        }
+
+        /**
+         * 新增/编辑
+         * @param id
+         */
+        function editRow(id){
+            var div = $("<div>").appendTo($(document.body));
+            var title = "编辑活动";
+            var message = "确认修改活动信息吗？";
+
+            if (id == 0) {
+                title = "添加活动";
+                message = "确认添加活动吗？";
+            } else {
+                for(var key in dataList) {
+                    if (dataList[key].id == id) {
+                        info = dataList[key];
+                        break;
+                    }
+                }
+            }
+
+            $(div).myDialog({
+                width: "700px",
+                height: "580px",
+                title: title,
+                href: contextPath + "/html/resourceManage/poolAndCodeEdit.html?time_version=" + new Date().getTime(),
+                queryParams: {
+                    id: id
+                },
+                modal: true,
+                collapsible: true,
+                cache: false,
+                buttons: [{
+                    id: "saveBtn",
+                    text: "保存",
+                    handler: function () {
+                        $.messager.confirm("确认", message, function (flag) {
+                            if (flag) {
+                                if (formData.activityName == "") {
+                                    $.messager.alert("提示", '请输入活动名称!', "error");
+                                }
+
+                                if (formData.code == "") {
+                                    $.messager.alert("提示", '请输入资源位码!', "error");
+                                }
+
+                                if (formData.startTime == 0 || formData.startTime == 0) {
+                                    $.messager.alert("提示", '请选择展示时间!', "error");
+                                }
+                                $.messager.progress({
+                                    title: "正在执行",
+                                    msg: "正在执行，请稍后..."
+                                });
+                                $.ajax({
+                                    url: contextPath + "/resource/editPoolAndCode",
+                                    type: "POST",
+                                    dataType: "json",
+                                    data: formData,
+                                    success: function (data) {
+                                        $.messager.progress("close");
+                                        if (data.code == 200) {
+                                            $(div).dialog("close");
+                                            $("#listTable").myDatagrid("reload");
+                                            $.messager.show({
+                                                title: "提示",
+                                                msg: title + "成功！",
+                                                height: 120
+                                            });
+                                        } else {
+                                            $.messager.alert("失败", data.message, "error");
+                                        }
+                                    },
+                                    error: function (err) {
+                                        console.log(err)
+                                    },
+                                    complete: function () {
+
+                                    }
+                                })
+                            }
+                        });
+                    }
+                }, {
+                    text: "关闭",
+                    iconCls: "icon-cancel",
+                    handler: function () {
+                        $(div).dialog("close");
+                    }
+                }]
+            });
+        }
+    });
+
+
+</script>
+
+</body>
+</html>
\ No newline at end of file

+//! moment.js
+//! version : 2.10.6
+//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
+//! license : MIT
+//! momentjs.com
+!function(a,b){"object"==typeof exports&&"undefined"!=typeof module?module.exports=b():"function"==typeof define&&define.amd?define(b):a.moment=b()}(this,function(){"use strict";function a(){return Hc.apply(null,arguments)}function b(a){Hc=a}function c(a){return"[object Array]"===Object.prototype.toString.call(a)}function d(a){return a instanceof Date||"[object Date]"===Object.prototype.toString.call(a)}function e(a,b){var c,d=[];for(c=0;c<a.length;++c)d.push(b(a[c],c));return d}function f(a,b){return Object.prototype.hasOwnProperty.call(a,b)}function g(a,b){for(var c in b)f(b,c)&&(a[c]=b[c]);return f(b,"toString")&&(a.toString=b.toString),f(b,"valueOf")&&(a.valueOf=b.valueOf),a}function h(a,b,c,d){return Ca(a,b,c,d,!0).utc()}function i(){return{empty:!1,unusedTokens:[],unusedInput:[],overflow:-2,charsLeftOver:0,nullInput:!1,invalidMonth:null,invalidFormat:!1,userInvalidated:!1,iso:!1}}function j(a){return null==a._pf&&(a._pf=i()),a._pf}function k(a){if(null==a._isValid){var b=j(a);a._isValid=!(isNaN(a._d.getTime())||!(b.overflow<0)||b.empty||b.invalidMonth||b.invalidWeekday||b.nullInput||b.invalidFormat||b.userInvalidated),a._strict&&(a._isValid=a._isValid&&0===b.charsLeftOver&&0===b.unusedTokens.length&&void 0===b.bigHour)}return a._isValid}function l(a){var b=h(NaN);return null!=a?g(j(b),a):j(b).userInvalidated=!0,b}function m(a,b){var c,d,e;if("undefined"!=typeof b._isAMomentObject&&(a._isAMomentObject=b._isAMomentObject),"undefined"!=typeof b._i&&(a._i=b._i),"undefined"!=typeof b._f&&(a._f=b._f),"undefined"!=typeof b._l&&(a._l=b._l),"undefined"!=typeof b._strict&&(a._strict=b._strict),"undefined"!=typeof b._tzm&&(a._tzm=b._tzm),"undefined"!=typeof b._isUTC&&(a._isUTC=b._isUTC),"undefined"!=typeof b._offset&&(a._offset=b._offset),"undefined"!=typeof b._pf&&(a._pf=j(b)),"undefined"!=typeof b._locale&&(a._locale=b._locale),Jc.length>0)for(c in Jc)d=Jc[c],e=b[d],"undefined"!=typeof e&&(a[d]=e);return a}function n(b){m(this,b),this._d=new Date(null!=b._d?b._d.getTime():NaN),Kc===!1&&(Kc=!0,a.updateOffset(this),Kc=!1)}function o(a){return a instanceof n||null!=a&&null!=a._isAMomentObject}function p(a){return 0>a?Math.ceil(a):Math.floor(a)}function q(a){var b=+a,c=0;return 0!==b&&isFinite(b)&&(c=p(b)),c}function r(a,b,c){var d,e=Math.min(a.length,b.length),f=Math.abs(a.length-b.length),g=0;for(d=0;e>d;d++)(c&&a[d]!==b[d]||!c&&q(a[d])!==q(b[d]))&&g++;return g+f}function s(){}function t(a){return a?a.toLowerCase().replace("_","-"):a}function u(a){for(var b,c,d,e,f=0;f<a.length;){for(e=t(a[f]).split("-"),b=e.length,c=t(a[f+1]),c=c?c.split("-"):null;b>0;){if(d=v(e.slice(0,b).join("-")))return d;if(c&&c.length>=b&&r(e,c,!0)>=b-1)break;b--}f++}return null}function v(a){var b=null;if(!Lc[a]&&"undefined"!=typeof module&&module&&module.exports)try{b=Ic._abbr,require("./locale/"+a),w(b)}catch(c){}return Lc[a]}function w(a,b){var c;return a&&(c="undefined"==typeof b?y(a):x(a,b),c&&(Ic=c)),Ic._abbr}function x(a,b){return null!==b?(b.abbr=a,Lc[a]=Lc[a]||new s,Lc[a].set(b),w(a),Lc[a]):(delete Lc[a],null)}function y(a){var b;if(a&&a._locale&&a._locale._abbr&&(a=a._locale._abbr),!a)return Ic;if(!c(a)){if(b=v(a))return b;a=[a]}return u(a)}function z(a,b){var c=a.toLowerCase();Mc[c]=Mc[c+"s"]=Mc[b]=a}function A(a){return"string"==typeof a?Mc[a]||Mc[a.toLowerCase()]:void 0}function B(a){var b,c,d={};for(c in a)f(a,c)&&(b=A(c),b&&(d[b]=a[c]));return d}function C(b,c){return function(d){return null!=d?(E(this,b,d),a.updateOffset(this,c),this):D(this,b)}}function D(a,b){return a._d["get"+(a._isUTC?"UTC":"")+b]()}function E(a,b,c){return a._d["set"+(a._isUTC?"UTC":"")+b](c)}function F(a,b){var c;if("object"==typeof a)for(c in a)this.set(c,a[c]);else if(a=A(a),"function"==typeof this[a])return this[a](b);return this}function G(a,b,c){var d=""+Math.abs(a),e=b-d.length,f=a>=0;return(f?c?"+":"":"-")+Math.pow(10,Math.max(0,e)).toString().substr(1)+d}function H(a,b,c,d){var e=d;"string"==typeof d&&(e=function(){return this[d]()}),a&&(Qc[a]=e),b&&(Qc[b[0]]=function(){return G(e.apply(this,arguments),b[1],b[2])}),c&&(Qc[c]=function(){return this.localeData().ordinal(e.apply(this,arguments),a)})}function I(a){return a.match(/\[[\s\S]/)?a.replace(/^\[|\]$/g,""):a.replace(/\\/g,"")}function J(a){var b,c,d=a.match(Nc);for(b=0,c=d.length;c>b;b++)Qc[d[b]]?d[b]=Qc[d[b]]:d[b]=I(d[b]);return function(e){var f="";for(b=0;c>b;b++)f+=d[b]instanceof Function?d[b].call(e,a):d[b];return f}}function K(a,b){return a.isValid()?(b=L(b,a.localeData()),Pc[b]=Pc[b]||J(b),Pc[b](a)):a.localeData().invalidDate()}function L(a,b){function c(a){return b.longDateFormat(a)||a}var d=5;for(Oc.lastIndex=0;d>=0&&Oc.test(a);)a=a.replace(Oc,c),Oc.lastIndex=0,d-=1;return a}function M(a){return"function"==typeof a&&"[object Function]"===Object.prototype.toString.call(a)}function N(a,b,c){dd[a]=M(b)?b:function(a){return a&&c?c:b}}function O(a,b){return f(dd,a)?dd[a](b._strict,b._locale):new RegExp(P(a))}function P(a){return a.replace("\\","").replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,function(a,b,c,d,e){return b||c||d||e}).replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}function Q(a,b){var c,d=b;for("string"==typeof a&&(a=[a]),"number"==typeof b&&(d=function(a,c){c[b]=q(a)}),c=0;c<a.length;c++)ed[a[c]]=d}function R(a,b){Q(a,function(a,c,d,e){d._w=d._w||{},b(a,d._w,d,e)})}function S(a,b,c){null!=b&&f(ed,a)&&ed[a](b,c._a,c,a)}function T(a,b){return new Date(Date.UTC(a,b+1,0)).getUTCDate()}function U(a){return this._months[a.month()]}function V(a){return this._monthsShort[a.month()]}function W(a,b,c){var d,e,f;for(this._monthsParse||(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[]),d=0;12>d;d++){if(e=h([2e3,d]),c&&!this._longMonthsParse[d]&&(this._longMonthsParse[d]=new RegExp("^"+this.months(e,"").replace(".","")+"$","i"),this._shortMonthsParse[d]=new RegExp("^"+this.monthsShort(e,"").replace(".","")+"$","i")),c||this._monthsParse[d]||(f="^"+this.months(e,"")+"|^"+this.monthsShort(e,""),this._monthsParse[d]=new RegExp(f.replace(".",""),"i")),c&&"MMMM"===b&&this._longMonthsParse[d].test(a))return d;if(c&&"MMM"===b&&this._shortMonthsParse[d].test(a))return d;if(!c&&this._monthsParse[d].test(a))return d}}function X(a,b){var c;return"string"==typeof b&&(b=a.localeData().monthsParse(b),"number"!=typeof b)?a:(c=Math.min(a.date(),T(a.year(),b)),a._d["set"+(a._isUTC?"UTC":"")+"Month"](b,c),a)}function Y(b){return null!=b?(X(this,b),a.updateOffset(this,!0),this):D(this,"Month")}function Z(){return T(this.year(),this.month())}function $(a){var b,c=a._a;return c&&-2===j(a).overflow&&(b=c[gd]<0||c[gd]>11?gd:c[hd]<1||c[hd]>T(c[fd],c[gd])?hd:c[id]<0||c[id]>24||24===c[id]&&(0!==c[jd]||0!==c[kd]||0!==c[ld])?id:c[jd]<0||c[jd]>59?jd:c[kd]<0||c[kd]>59?kd:c[ld]<0||c[ld]>999?ld:-1,j(a)._overflowDayOfYear&&(fd>b||b>hd)&&(b=hd),j(a).overflow=b),a}function _(b){a.suppressDeprecationWarnings===!1&&"undefined"!=typeof console&&console.warn&&console.warn("Deprecation warning: "+b)}function aa(a,b){var c=!0;return g(function(){return c&&(_(a+"\n"+(new Error).stack),c=!1),b.apply(this,arguments)},b)}function ba(a,b){od[a]||(_(b),od[a]=!0)}function ca(a){var b,c,d=a._i,e=pd.exec(d);if(e){for(j(a).iso=!0,b=0,c=qd.length;c>b;b++)if(qd[b][1].exec(d)){a._f=qd[b][0];break}for(b=0,c=rd.length;c>b;b++)if(rd[b][1].exec(d)){a._f+=(e[6]||" ")+rd[b][0];break}d.match(ad)&&(a._f+="Z"),va(a)}else a._isValid=!1}function da(b){var c=sd.exec(b._i);return null!==c?void(b._d=new Date(+c[1])):(ca(b),void(b._isValid===!1&&(delete b._isValid,a.createFromInputFallback(b))))}function ea(a,b,c,d,e,f,g){var h=new Date(a,b,c,d,e,f,g);return 1970>a&&h.setFullYear(a),h}function fa(a){var b=new Date(Date.UTC.apply(null,arguments));return 1970>a&&b.setUTCFullYear(a),b}function ga(a){return ha(a)?366:365}function ha(a){return a%4===0&&a%100!==0||a%400===0}function ia(){return ha(this.year())}function ja(a,b,c){var d,e=c-b,f=c-a.day();return f>e&&(f-=7),e-7>f&&(f+=7),d=Da(a).add(f,"d"),{week:Math.ceil(d.dayOfYear()/7),year:d.year()}}function ka(a){return ja(a,this._week.dow,this._week.doy).week}function la(){return this._week.dow}function ma(){return this._week.doy}function na(a){var b=this.localeData().week(this);return null==a?b:this.add(7*(a-b),"d")}function oa(a){var b=ja(this,1,4).week;return null==a?b:this.add(7*(a-b),"d")}function pa(a,b,c,d,e){var f,g=6+e-d,h=fa(a,0,1+g),i=h.getUTCDay();return e>i&&(i+=7),c=null!=c?1*c:e,f=1+g+7*(b-1)-i+c,{year:f>0?a:a-1,dayOfYear:f>0?f:ga(a-1)+f}}function qa(a){var b=Math.round((this.clone().startOf("day")-this.clone().startOf("year"))/864e5)+1;return null==a?b:this.add(a-b,"d")}function ra(a,b,c){return null!=a?a:null!=b?b:c}function sa(a){var b=new Date;return a._useUTC?[b.getUTCFullYear(),b.getUTCMonth(),b.getUTCDate()]:[b.getFullYear(),b.getMonth(),b.getDate()]}function ta(a){var b,c,d,e,f=[];if(!a._d){for(d=sa(a),a._w&&null==a._a[hd]&&null==a._a[gd]&&ua(a),a._dayOfYear&&(e=ra(a._a[fd],d[fd]),a._dayOfYear>ga(e)&&(j(a)._overflowDayOfYear=!0),c=fa(e,0,a._dayOfYear),a._a[gd]=c.getUTCMonth(),a._a[hd]=c.getUTCDate()),b=0;3>b&&null==a._a[b];++b)a._a[b]=f[b]=d[b];for(;7>b;b++)a._a[b]=f[b]=null==a._a[b]?2===b?1:0:a._a[b];24===a._a[id]&&0===a._a[jd]&&0===a._a[kd]&&0===a._a[ld]&&(a._nextDay=!0,a._a[id]=0),a._d=(a._useUTC?fa:ea).apply(null,f),null!=a._tzm&&a._d.setUTCMinutes(a._d.getUTCMinutes()-a._tzm),a._nextDay&&(a._a[id]=24)}}function ua(a){var b,c,d,e,f,g,h;b=a._w,null!=b.GG||null!=b.W||null!=b.E?(f=1,g=4,c=ra(b.GG,a._a[fd],ja(Da(),1,4).year),d=ra(b.W,1),e=ra(b.E,1)):(f=a._locale._week.dow,g=a._locale._week.doy,c=ra(b.gg,a._a[fd],ja(Da(),f,g).year),d=ra(b.w,1),null!=b.d?(e=b.d,f>e&&++d):e=null!=b.e?b.e+f:f),h=pa(c,d,e,g,f),a._a[fd]=h.year,a._dayOfYear=h.dayOfYear}function va(b){if(b._f===a.ISO_8601)return void ca(b);b._a=[],j(b).empty=!0;var c,d,e,f,g,h=""+b._i,i=h.length,k=0;for(e=L(b._f,b._locale).match(Nc)||[],c=0;c<e.length;c++)f=e[c],d=(h.match(O(f,b))||[])[0],d&&(g=h.substr(0,h.indexOf(d)),g.length>0&&j(b).unusedInput.push(g),h=h.slice(h.indexOf(d)+d.length),k+=d.length),Qc[f]?(d?j(b).empty=!1:j(b).unusedTokens.push(f),S(f,d,b)):b._strict&&!d&&j(b).unusedTokens.push(f);j(b).charsLeftOver=i-k,h.length>0&&j(b).unusedInput.push(h),j(b).bigHour===!0&&b._a[id]<=12&&b._a[id]>0&&(j(b).bigHour=void 0),b._a[id]=wa(b._locale,b._a[id],b._meridiem),ta(b),$(b)}function wa(a,b,c){var d;return null==c?b:null!=a.meridiemHour?a.meridiemHour(b,c):null!=a.isPM?(d=a.isPM(c),d&&12>b&&(b+=12),d||12!==b||(b=0),b):b}function xa(a){var b,c,d,e,f;if(0===a._f.length)return j(a).invalidFormat=!0,void(a._d=new Date(NaN));for(e=0;e<a._f.length;e++)f=0,b=m({},a),null!=a._useUTC&&(b._useUTC=a._useUTC),b._f=a._f[e],va(b),k(b)&&(f+=j(b).charsLeftOver,f+=10*j(b).unusedTokens.length,j(b).score=f,(null==d||d>f)&&(d=f,c=b));g(a,c||b)}function ya(a){if(!a._d){var b=B(a._i);a._a=[b.year,b.month,b.day||b.date,b.hour,b.minute,b.second,b.millisecond],ta(a)}}function za(a){var b=new n($(Aa(a)));return b._nextDay&&(b.add(1,"d"),b._nextDay=void 0),b}function Aa(a){var b=a._i,e=a._f;return a._locale=a._locale||y(a._l),null===b||void 0===e&&""===b?l({nullInput:!0}):("string"==typeof b&&(a._i=b=a._locale.preparse(b)),o(b)?new n($(b)):(c(e)?xa(a):e?va(a):d(b)?a._d=b:Ba(a),a))}function Ba(b){var f=b._i;void 0===f?b._d=new Date:d(f)?b._d=new Date(+f):"string"==typeof f?da(b):c(f)?(b._a=e(f.slice(0),function(a){return parseInt(a,10)}),ta(b)):"object"==typeof f?ya(b):"number"==typeof f?b._d=new Date(f):a.createFromInputFallback(b)}function Ca(a,b,c,d,e){var f={};return"boolean"==typeof c&&(d=c,c=void 0),f._isAMomentObject=!0,f._useUTC=f._isUTC=e,f._l=c,f._i=a,f._f=b,f._strict=d,za(f)}function Da(a,b,c,d){return Ca(a,b,c,d,!1)}function Ea(a,b){var d,e;if(1===b.length&&c(b[0])&&(b=b[0]),!b.length)return Da();for(d=b[0],e=1;e<b.length;++e)(!b[e].isValid()||b[e][a](d))&&(d=b[e]);return d}function Fa(){var a=[].slice.call(arguments,0);return Ea("isBefore",a)}function Ga(){var a=[].slice.call(arguments,0);return Ea("isAfter",a)}function Ha(a){var b=B(a),c=b.year||0,d=b.quarter||0,e=b.month||0,f=b.week||0,g=b.day||0,h=b.hour||0,i=b.minute||0,j=b.second||0,k=b.millisecond||0;this._milliseconds=+k+1e3*j+6e4*i+36e5*h,this._days=+g+7*f,this._months=+e+3*d+12*c,this._data={},this._locale=y(),this._bubble()}function Ia(a){return a instanceof Ha}function Ja(a,b){H(a,0,0,function(){var a=this.utcOffset(),c="+";return 0>a&&(a=-a,c="-"),c+G(~~(a/60),2)+b+G(~~a%60,2)})}function Ka(a){var b=(a||"").match(ad)||[],c=b[b.length-1]||[],d=(c+"").match(xd)||["-",0,0],e=+(60*d[1])+q(d[2]);return"+"===d[0]?e:-e}function La(b,c){var e,f;return c._isUTC?(e=c.clone(),f=(o(b)||d(b)?+b:+Da(b))-+e,e._d.setTime(+e._d+f),a.updateOffset(e,!1),e):Da(b).local()}function Ma(a){return 15*-Math.round(a._d.getTimezoneOffset()/15)}function Na(b,c){var d,e=this._offset||0;return null!=b?("string"==typeof b&&(b=Ka(b)),Math.abs(b)<16&&(b=60*b),!this._isUTC&&c&&(d=Ma(this)),this._offset=b,this._isUTC=!0,null!=d&&this.add(d,"m"),e!==b&&(!c||this._changeInProgress?bb(this,Ya(b-e,"m"),1,!1):this._changeInProgress||(this._changeInProgress=!0,a.updateOffset(this,!0),this._changeInProgress=null)),this):this._isUTC?e:Ma(this)}function Oa(a,b){return null!=a?("string"!=typeof a&&(a=-a),this.utcOffset(a,b),this):-this.utcOffset()}function Pa(a){return this.utcOffset(0,a)}function Qa(a){return this._isUTC&&(this.utcOffset(0,a),this._isUTC=!1,a&&this.subtract(Ma(this),"m")),this}function Ra(){return this._tzm?this.utcOffset(this._tzm):"string"==typeof this._i&&this.utcOffset(Ka(this._i)),this}function Sa(a){return a=a?Da(a).utcOffset():0,(this.utcOffset()-a)%60===0}function Ta(){return this.utcOffset()>this.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()}function Ua(){if("undefined"!=typeof this._isDSTShifted)return this._isDSTShifted;var a={};if(m(a,this),a=Aa(a),a._a){var b=a._isUTC?h(a._a):Da(a._a);this._isDSTShifted=this.isValid()&&r(a._a,b.toArray())>0}else this._isDSTShifted=!1;return this._isDSTShifted}function Va(){return!this._isUTC}function Wa(){return this._isUTC}function Xa(){return this._isUTC&&0===this._offset}function Ya(a,b){var c,d,e,g=a,h=null;return Ia(a)?g={ms:a._milliseconds,d:a._days,M:a._months}:"number"==typeof a?(g={},b?g[b]=a:g.milliseconds=a):(h=yd.exec(a))?(c="-"===h[1]?-1:1,g={y:0,d:q(h[hd])*c,h:q(h[id])*c,m:q(h[jd])*c,s:q(h[kd])*c,ms:q(h[ld])*c}):(h=zd.exec(a))?(c="-"===h[1]?-1:1,g={y:Za(h[2],c),M:Za(h[3],c),d:Za(h[4],c),h:Za(h[5],c),m:Za(h[6],c),s:Za(h[7],c),w:Za(h[8],c)}):null==g?g={}:"object"==typeof g&&("from"in g||"to"in g)&&(e=_a(Da(g.from),Da(g.to)),g={},g.ms=e.milliseconds,g.M=e.months),d=new Ha(g),Ia(a)&&f(a,"_locale")&&(d._locale=a._locale),d}function Za(a,b){var c=a&&parseFloat(a.replace(",","."));return(isNaN(c)?0:c)*b}function $a(a,b){var c={milliseconds:0,months:0};return c.months=b.month()-a.month()+12*(b.year()-a.year()),a.clone().add(c.months,"M").isAfter(b)&&--c.months,c.milliseconds=+b-+a.clone().add(c.months,"M"),c}function _a(a,b){var c;return b=La(b,a),a.isBefore(b)?c=$a(a,b):(c=$a(b,a),c.milliseconds=-c.milliseconds,c.months=-c.months),c}function ab(a,b){return function(c,d){var e,f;return null===d||isNaN(+d)||(ba(b,"moment()."+b+"(period, number) is deprecated. Please use moment()."+b+"(number, period)."),f=c,c=d,d=f),c="string"==typeof c?+c:c,e=Ya(c,d),bb(this,e,a),this}}function bb(b,c,d,e){var f=c._milliseconds,g=c._days,h=c._months;e=null==e?!0:e,f&&b._d.setTime(+b._d+f*d),g&&E(b,"Date",D(b,"Date")+g*d),h&&X(b,D(b,"Month")+h*d),e&&a.updateOffset(b,g||h)}function cb(a,b){var c=a||Da(),d=La(c,this).startOf("day"),e=this.diff(d,"days",!0),f=-6>e?"sameElse":-1>e?"lastWeek":0>e?"lastDay":1>e?"sameDay":2>e?"nextDay":7>e?"nextWeek":"sameElse";return this.format(b&&b[f]||this.localeData().calendar(f,this,Da(c)))}function db(){return new n(this)}function eb(a,b){var c;return b=A("undefined"!=typeof b?b:"millisecond"),"millisecond"===b?(a=o(a)?a:Da(a),+this>+a):(c=o(a)?+a:+Da(a),c<+this.clone().startOf(b))}function fb(a,b){var c;return b=A("undefined"!=typeof b?b:"millisecond"),"millisecond"===b?(a=o(a)?a:Da(a),+a>+this):(c=o(a)?+a:+Da(a),+this.clone().endOf(b)<c)}function gb(a,b,c){return this.isAfter(a,c)&&this.isBefore(b,c)}function hb(a,b){var c;return b=A(b||"millisecond"),"millisecond"===b?(a=o(a)?a:Da(a),+this===+a):(c=+Da(a),+this.clone().startOf(b)<=c&&c<=+this.clone().endOf(b))}function ib(a,b,c){var d,e,f=La(a,this),g=6e4*(f.utcOffset()-this.utcOffset());return b=A(b),"year"===b||"month"===b||"quarter"===b?(e=jb(this,f),"quarter"===b?e/=3:"year"===b&&(e/=12)):(d=this-f,e="second"===b?d/1e3:"minute"===b?d/6e4:"hour"===b?d/36e5:"day"===b?(d-g)/864e5:"week"===b?(d-g)/6048e5:d),c?e:p(e)}function jb(a,b){var c,d,e=12*(b.year()-a.year())+(b.month()-a.month()),f=a.clone().add(e,"months");return 0>b-f?(c=a.clone().add(e-1,"months"),d=(b-f)/(f-c)):(c=a.clone().add(e+1,"months"),d=(b-f)/(c-f)),-(e+d)}function kb(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")}function lb(){var a=this.clone().utc();return 0<a.year()&&a.year()<=9999?"function"==typeof Date.prototype.toISOString?this.toDate().toISOString():K(a,"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]"):K(a,"YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]")}function mb(b){var c=K(this,b||a.defaultFormat);return this.localeData().postformat(c)}function nb(a,b){return this.isValid()?Ya({to:this,from:a}).locale(this.locale()).humanize(!b):this.localeData().invalidDate()}function ob(a){return this.from(Da(),a)}function pb(a,b){return this.isValid()?Ya({from:this,to:a}).locale(this.locale()).humanize(!b):this.localeData().invalidDate()}function qb(a){return this.to(Da(),a)}function rb(a){var b;return void 0===a?this._locale._abbr:(b=y(a),null!=b&&(this._locale=b),this)}function sb(){return this._locale}function tb(a){switch(a=A(a)){case"year":this.month(0);case"quarter":case"month":this.date(1);case"week":case"isoWeek":case"day":this.hours(0);case"hour":this.minutes(0);case"minute":this.seconds(0);case"second":this.milliseconds(0)}return"week"===a&&this.weekday(0),"isoWeek"===a&&this.isoWeekday(1),"quarter"===a&&this.month(3*Math.floor(this.month()/3)),this}function ub(a){return a=A(a),void 0===a||"millisecond"===a?this:this.startOf(a).add(1,"isoWeek"===a?"week":a).subtract(1,"ms")}function vb(){return+this._d-6e4*(this._offset||0)}function wb(){return Math.floor(+this/1e3)}function xb(){return this._offset?new Date(+this):this._d}function yb(){var a=this;return[a.year(),a.month(),a.date(),a.hour(),a.minute(),a.second(),a.millisecond()]}function zb(){var a=this;return{years:a.year(),months:a.month(),date:a.date(),hours:a.hours(),minutes:a.minutes(),seconds:a.seconds(),milliseconds:a.milliseconds()}}function Ab(){return k(this)}function Bb(){return g({},j(this))}function Cb(){return j(this).overflow}function Db(a,b){H(0,[a,a.length],0,b)}function Eb(a,b,c){return ja(Da([a,11,31+b-c]),b,c).week}function Fb(a){var b=ja(this,this.localeData()._week.dow,this.localeData()._week.doy).year;return null==a?b:this.add(a-b,"y")}function Gb(a){var b=ja(this,1,4).year;return null==a?b:this.add(a-b,"y")}function Hb(){return Eb(this.year(),1,4)}function Ib(){var a=this.localeData()._week;return Eb(this.year(),a.dow,a.doy)}function Jb(a){return null==a?Math.ceil((this.month()+1)/3):this.month(3*(a-1)+this.month()%3)}function Kb(a,b){return"string"!=typeof a?a:isNaN(a)?(a=b.weekdaysParse(a),"number"==typeof a?a:null):parseInt(a,10)}function Lb(a){return this._weekdays[a.day()]}function Mb(a){return this._weekdaysShort[a.day()]}function Nb(a){return this._weekdaysMin[a.day()]}function Ob(a){var b,c,d;for(this._weekdaysParse=this._weekdaysParse||[],b=0;7>b;b++)if(this._weekdaysParse[b]||(c=Da([2e3,1]).day(b),d="^"+this.weekdays(c,"")+"|^"+this.weekdaysShort(c,"")+"|^"+this.weekdaysMin(c,""),this._weekdaysParse[b]=new RegExp(d.replace(".",""),"i")),this._weekdaysParse[b].test(a))return b}function Pb(a){var b=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=a?(a=Kb(a,this.localeData()),this.add(a-b,"d")):b}function Qb(a){var b=(this.day()+7-this.localeData()._week.dow)%7;return null==a?b:this.add(a-b,"d")}function Rb(a){return null==a?this.day()||7:this.day(this.day()%7?a:a-7)}function Sb(a,b){H(a,0,0,function(){return this.localeData().meridiem(this.hours(),this.minutes(),b)})}function Tb(a,b){return b._meridiemParse}function Ub(a){return"p"===(a+"").toLowerCase().charAt(0)}function Vb(a,b,c){return a>11?c?"pm":"PM":c?"am":"AM"}function Wb(a,b){b[ld]=q(1e3*("0."+a))}function Xb(){return this._isUTC?"UTC":""}function Yb(){return this._isUTC?"Coordinated Universal Time":""}function Zb(a){return Da(1e3*a)}function $b(){return Da.apply(null,arguments).parseZone()}function _b(a,b,c){var d=this._calendar[a];return"function"==typeof d?d.call(b,c):d}function ac(a){var b=this._longDateFormat[a],c=this._longDateFormat[a.toUpperCase()];return b||!c?b:(this._longDateFormat[a]=c.replace(/MMMM|MM|DD|dddd/g,function(a){return a.slice(1)}),this._longDateFormat[a])}function bc(){return this._invalidDate}function cc(a){return this._ordinal.replace("%d",a)}function dc(a){return a}function ec(a,b,c,d){var e=this._relativeTime[c];return"function"==typeof e?e(a,b,c,d):e.replace(/%d/i,a)}function fc(a,b){var c=this._relativeTime[a>0?"future":"past"];return"function"==typeof c?c(b):c.replace(/%s/i,b)}function gc(a){var b,c;for(c in a)b=a[c],"function"==typeof b?this[c]=b:this["_"+c]=b;this._ordinalParseLenient=new RegExp(this._ordinalParse.source+"|"+/\d{1,2}/.source)}function hc(a,b,c,d){var e=y(),f=h().set(d,b);return e[c](f,a)}function ic(a,b,c,d,e){if("number"==typeof a&&(b=a,a=void 0),a=a||"",null!=b)return hc(a,b,c,e);var f,g=[];for(f=0;d>f;f++)g[f]=hc(a,f,c,e);return g}function jc(a,b){return ic(a,b,"months",12,"month")}function kc(a,b){return ic(a,b,"monthsShort",12,"month")}function lc(a,b){return ic(a,b,"weekdays",7,"day")}function mc(a,b){return ic(a,b,"weekdaysShort",7,"day")}function nc(a,b){return ic(a,b,"weekdaysMin",7,"day")}function oc(){var a=this._data;return this._milliseconds=Wd(this._milliseconds),this._days=Wd(this._days),this._months=Wd(this._months),a.milliseconds=Wd(a.milliseconds),a.seconds=Wd(a.seconds),a.minutes=Wd(a.minutes),a.hours=Wd(a.hours),a.months=Wd(a.months),a.years=Wd(a.years),this}function pc(a,b,c,d){var e=Ya(b,c);return a._milliseconds+=d*e._milliseconds,a._days+=d*e._days,a._months+=d*e._months,a._bubble()}function qc(a,b){return pc(this,a,b,1)}function rc(a,b){return pc(this,a,b,-1)}function sc(a){return 0>a?Math.floor(a):Math.ceil(a)}function tc(){var a,b,c,d,e,f=this._milliseconds,g=this._days,h=this._months,i=this._data;return f>=0&&g>=0&&h>=0||0>=f&&0>=g&&0>=h||(f+=864e5*sc(vc(h)+g),g=0,h=0),i.milliseconds=f%1e3,a=p(f/1e3),i.seconds=a%60,b=p(a/60),i.minutes=b%60,c=p(b/60),i.hours=c%24,g+=p(c/24),e=p(uc(g)),h+=e,g-=sc(vc(e)),d=p(h/12),h%=12,i.days=g,i.months=h,i.years=d,this}function uc(a){return 4800*a/146097}function vc(a){return 146097*a/4800}function wc(a){var b,c,d=this._milliseconds;if(a=A(a),"month"===a||"year"===a)return b=this._days+d/864e5,c=this._months+uc(b),"month"===a?c:c/12;switch(b=this._days+Math.round(vc(this._months)),a){case"week":return b/7+d/6048e5;case"day":return b+d/864e5;case"hour":return 24*b+d/36e5;case"minute":return 1440*b+d/6e4;case"second":return 86400*b+d/1e3;case"millisecond":return Math.floor(864e5*b)+d;default:throw new Error("Unknown unit "+a)}}function xc(){return this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*q(this._months/12)}function yc(a){return function(){return this.as(a)}}function zc(a){return a=A(a),this[a+"s"]()}function Ac(a){return function(){return this._data[a]}}function Bc(){return p(this.days()/7)}function Cc(a,b,c,d,e){return e.relativeTime(b||1,!!c,a,d)}function Dc(a,b,c){var d=Ya(a).abs(),e=ke(d.as("s")),f=ke(d.as("m")),g=ke(d.as("h")),h=ke(d.as("d")),i=ke(d.as("M")),j=ke(d.as("y")),k=e<le.s&&["s",e]||1===f&&["m"]||f<le.m&&["mm",f]||1===g&&["h"]||g<le.h&&["hh",g]||1===h&&["d"]||h<le.d&&["dd",h]||1===i&&["M"]||i<le.M&&["MM",i]||1===j&&["y"]||["yy",j];return k[2]=b,k[3]=+a>0,k[4]=c,Cc.apply(null,k)}function Ec(a,b){return void 0===le[a]?!1:void 0===b?le[a]:(le[a]=b,!0)}function Fc(a){var b=this.localeData(),c=Dc(this,!a,b);return a&&(c=b.pastFuture(+this,c)),b.postformat(c)}function Gc(){var a,b,c,d=me(this._milliseconds)/1e3,e=me(this._days),f=me(this._months);a=p(d/60),b=p(a/60),d%=60,a%=60,c=p(f/12),f%=12;var g=c,h=f,i=e,j=b,k=a,l=d,m=this.asSeconds();return m?(0>m?"-":"")+"P"+(g?g+"Y":"")+(h?h+"M":"")+(i?i+"D":"")+(j||k||l?"T":"")+(j?j+"H":"")+(k?k+"M":"")+(l?l+"S":""):"P0D"}var Hc,Ic,Jc=a.momentProperties=[],Kc=!1,Lc={},Mc={},Nc=/(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Q|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g,Oc=/(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g,Pc={},Qc={},Rc=/\d/,Sc=/\d\d/,Tc=/\d{3}/,Uc=/\d{4}/,Vc=/[+-]?\d{6}/,Wc=/\d\d?/,Xc=/\d{1,3}/,Yc=/\d{1,4}/,Zc=/[+-]?\d{1,6}/,$c=/\d+/,_c=/[+-]?\d+/,ad=/Z|[+-]\d\d:?\d\d/gi,bd=/[+-]?\d+(\.\d{1,3})?/,cd=/[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i,dd={},ed={},fd=0,gd=1,hd=2,id=3,jd=4,kd=5,ld=6;H("M",["MM",2],"Mo",function(){return this.month()+1}),H("MMM",0,0,function(a){return this.localeData().monthsShort(this,a)}),H("MMMM",0,0,function(a){return this.localeData().months(this,a)}),z("month","M"),N("M",Wc),N("MM",Wc,Sc),N("MMM",cd),N("MMMM",cd),Q(["M","MM"],function(a,b){b[gd]=q(a)-1}),Q(["MMM","MMMM"],function(a,b,c,d){var e=c._locale.monthsParse(a,d,c._strict);null!=e?b[gd]=e:j(c).invalidMonth=a});var md="January_February_March_April_May_June_July_August_September_October_November_December".split("_"),nd="Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),od={};a.suppressDeprecationWarnings=!1;var pd=/^\s*(?:[+-]\d{6}|\d{4})-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,qd=[["YYYYYY-MM-DD",/[+-]\d{6}-\d{2}-\d{2}/],["YYYY-MM-DD",/\d{4}-\d{2}-\d{2}/],["GGGG-[W]WW-E",/\d{4}-W\d{2}-\d/],["GGGG-[W]WW",/\d{4}-W\d{2}/],["YYYY-DDD",/\d{4}-\d{3}/]],rd=[["HH:mm:ss.SSSS",/(T| )\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss",/(T| )\d\d:\d\d:\d\d/],["HH:mm",/(T| )\d\d:\d\d/],["HH",/(T| )\d\d/]],sd=/^\/?Date\((\-?\d+)/i;a.createFromInputFallback=aa("moment construction falls back to js Date. This is discouraged and will be removed in upcoming major release. Please refer to https://github.com/moment/moment/issues/1407 for more info.",function(a){a._d=new Date(a._i+(a._useUTC?" UTC":""))}),H(0,["YY",2],0,function(){return this.year()%100}),H(0,["YYYY",4],0,"year"),H(0,["YYYYY",5],0,"year"),H(0,["YYYYYY",6,!0],0,"year"),z("year","y"),N("Y",_c),N("YY",Wc,Sc),N("YYYY",Yc,Uc),N("YYYYY",Zc,Vc),N("YYYYYY",Zc,Vc),Q(["YYYYY","YYYYYY"],fd),Q("YYYY",function(b,c){c[fd]=2===b.length?a.parseTwoDigitYear(b):q(b)}),Q("YY",function(b,c){c[fd]=a.parseTwoDigitYear(b)}),a.parseTwoDigitYear=function(a){return q(a)+(q(a)>68?1900:2e3)};var td=C("FullYear",!1);H("w",["ww",2],"wo","week"),H("W",["WW",2],"Wo","isoWeek"),z("week","w"),z("isoWeek","W"),N("w",Wc),N("ww",Wc,Sc),N("W",Wc),N("WW",Wc,Sc),R(["w","ww","W","WW"],function(a,b,c,d){b[d.substr(0,1)]=q(a)});var ud={dow:0,doy:6};H("DDD",["DDDD",3],"DDDo","dayOfYear"),z("dayOfYear","DDD"),N("DDD",Xc),N("DDDD",Tc),Q(["DDD","DDDD"],function(a,b,c){c._dayOfYear=q(a)}),a.ISO_8601=function(){};var vd=aa("moment().min is deprecated, use moment.min instead. https://github.com/moment/moment/issues/1548",function(){var a=Da.apply(null,arguments);return this>a?this:a}),wd=aa("moment().max is deprecated, use moment.max instead. https://github.com/moment/moment/issues/1548",function(){var a=Da.apply(null,arguments);return a>this?this:a});Ja("Z",":"),Ja("ZZ",""),N("Z",ad),N("ZZ",ad),Q(["Z","ZZ"],function(a,b,c){c._useUTC=!0,c._tzm=Ka(a)});var xd=/([\+\-]|\d\d)/gi;a.updateOffset=function(){};var yd=/(\-)?(?:(\d*)\.)?(\d+)\:(\d+)(?:\:(\d+)\.?(\d{3})?)?/,zd=/^(-)?P(?:(?:([0-9,.]*)Y)?(?:([0-9,.]*)M)?(?:([0-9,.]*)D)?(?:T(?:([0-9,.]*)H)?(?:([0-9,.]*)M)?(?:([0-9,.]*)S)?)?|([0-9,.]*)W)$/;Ya.fn=Ha.prototype;var Ad=ab(1,"add"),Bd=ab(-1,"subtract");a.defaultFormat="YYYY-MM-DDTHH:mm:ssZ";var Cd=aa("moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.",function(a){return void 0===a?this.localeData():this.locale(a)});H(0,["gg",2],0,function(){return this.weekYear()%100}),H(0,["GG",2],0,function(){return this.isoWeekYear()%100}),Db("gggg","weekYear"),Db("ggggg","weekYear"),Db("GGGG","isoWeekYear"),Db("GGGGG","isoWeekYear"),z("weekYear","gg"),z("isoWeekYear","GG"),N("G",_c),N("g",_c),N("GG",Wc,Sc),N("gg",Wc,Sc),N("GGGG",Yc,Uc),N("gggg",Yc,Uc),N("GGGGG",Zc,Vc),N("ggggg",Zc,Vc),R(["gggg","ggggg","GGGG","GGGGG"],function(a,b,c,d){b[d.substr(0,2)]=q(a)}),R(["gg","GG"],function(b,c,d,e){c[e]=a.parseTwoDigitYear(b)}),H("Q",0,0,"quarter"),z("quarter","Q"),N("Q",Rc),Q("Q",function(a,b){b[gd]=3*(q(a)-1)}),H("D",["DD",2],"Do","date"),z("date","D"),N("D",Wc),N("DD",Wc,Sc),N("Do",function(a,b){return a?b._ordinalParse:b._ordinalParseLenient}),Q(["D","DD"],hd),Q("Do",function(a,b){b[hd]=q(a.match(Wc)[0],10)});var Dd=C("Date",!0);H("d",0,"do","day"),H("dd",0,0,function(a){return this.localeData().weekdaysMin(this,a)}),H("ddd",0,0,function(a){return this.localeData().weekdaysShort(this,a)}),H("dddd",0,0,function(a){return this.localeData().weekdays(this,a)}),H("e",0,0,"weekday"),H("E",0,0,"isoWeekday"),z("day","d"),z("weekday","e"),z("isoWeekday","E"),N("d",Wc),N("e",Wc),N("E",Wc),N("dd",cd),N("ddd",cd),N("dddd",cd),R(["dd","ddd","dddd"],function(a,b,c){var d=c._locale.weekdaysParse(a);null!=d?b.d=d:j(c).invalidWeekday=a}),R(["d","e","E"],function(a,b,c,d){b[d]=q(a)});var Ed="Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),Fd="Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),Gd="Su_Mo_Tu_We_Th_Fr_Sa".split("_");H("H",["HH",2],0,"hour"),H("h",["hh",2],0,function(){return this.hours()%12||12}),Sb("a",!0),Sb("A",!1),z("hour","h"),N("a",Tb),N("A",Tb),N("H",Wc),N("h",Wc),N("HH",Wc,Sc),N("hh",Wc,Sc),Q(["H","HH"],id),Q(["a","A"],function(a,b,c){c._isPm=c._locale.isPM(a),c._meridiem=a}),Q(["h","hh"],function(a,b,c){b[id]=q(a),j(c).bigHour=!0});var Hd=/[ap]\.?m?\.?/i,Id=C("Hours",!0);H("m",["mm",2],0,"minute"),z("minute","m"),N("m",Wc),N("mm",Wc,Sc),Q(["m","mm"],jd);var Jd=C("Minutes",!1);H("s",["ss",2],0,"second"),z("second","s"),N("s",Wc),N("ss",Wc,Sc),Q(["s","ss"],kd);var Kd=C("Seconds",!1);H("S",0,0,function(){return~~(this.millisecond()/100)}),H(0,["SS",2],0,function(){return~~(this.millisecond()/10)}),H(0,["SSS",3],0,"millisecond"),H(0,["SSSS",4],0,function(){return 10*this.millisecond()}),H(0,["SSSSS",5],0,function(){return 100*this.millisecond()}),H(0,["SSSSSS",6],0,function(){return 1e3*this.millisecond()}),H(0,["SSSSSSS",7],0,function(){return 1e4*this.millisecond()}),H(0,["SSSSSSSS",8],0,function(){return 1e5*this.millisecond()}),H(0,["SSSSSSSSS",9],0,function(){return 1e6*this.millisecond()}),z("millisecond","ms"),N("S",Xc,Rc),N("SS",Xc,Sc),N("SSS",Xc,Tc);var Ld;for(Ld="SSSS";Ld.length<=9;Ld+="S")N(Ld,$c);for(Ld="S";Ld.length<=9;Ld+="S")Q(Ld,Wb);var Md=C("Milliseconds",!1);H("z",0,0,"zoneAbbr"),H("zz",0,0,"zoneName");var Nd=n.prototype;Nd.add=Ad,Nd.calendar=cb,Nd.clone=db,Nd.diff=ib,Nd.endOf=ub,Nd.format=mb,Nd.from=nb,Nd.fromNow=ob,Nd.to=pb,Nd.toNow=qb,Nd.get=F,Nd.invalidAt=Cb,Nd.isAfter=eb,Nd.isBefore=fb,Nd.isBetween=gb,Nd.isSame=hb,Nd.isValid=Ab,Nd.lang=Cd,Nd.locale=rb,Nd.localeData=sb,Nd.max=wd,Nd.min=vd,Nd.parsingFlags=Bb,Nd.set=F,Nd.startOf=tb,Nd.subtract=Bd,Nd.toArray=yb,Nd.toObject=zb,Nd.toDate=xb,Nd.toISOString=lb,Nd.toJSON=lb,Nd.toString=kb,Nd.unix=wb,Nd.valueOf=vb,Nd.year=td,Nd.isLeapYear=ia,Nd.weekYear=Fb,Nd.isoWeekYear=Gb,Nd.quarter=Nd.quarters=Jb,Nd.month=Y,Nd.daysInMonth=Z,Nd.week=Nd.weeks=na,Nd.isoWeek=Nd.isoWeeks=oa,Nd.weeksInYear=Ib,Nd.isoWeeksInYear=Hb,Nd.date=Dd,Nd.day=Nd.days=Pb,Nd.weekday=Qb,Nd.isoWeekday=Rb,Nd.dayOfYear=qa,Nd.hour=Nd.hours=Id,Nd.minute=Nd.minutes=Jd,Nd.second=Nd.seconds=Kd,
+    Nd.millisecond=Nd.milliseconds=Md,Nd.utcOffset=Na,Nd.utc=Pa,Nd.local=Qa,Nd.parseZone=Ra,Nd.hasAlignedHourOffset=Sa,Nd.isDST=Ta,Nd.isDSTShifted=Ua,Nd.isLocal=Va,Nd.isUtcOffset=Wa,Nd.isUtc=Xa,Nd.isUTC=Xa,Nd.zoneAbbr=Xb,Nd.zoneName=Yb,Nd.dates=aa("dates accessor is deprecated. Use date instead.",Dd),Nd.months=aa("months accessor is deprecated. Use month instead",Y),Nd.years=aa("years accessor is deprecated. Use year instead",td),Nd.zone=aa("moment().zone is deprecated, use moment().utcOffset instead. https://github.com/moment/moment/issues/1779",Oa);var Od=Nd,Pd={sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},Qd={LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},Rd="Invalid date",Sd="%d",Td=/\d{1,2}/,Ud={future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},Vd=s.prototype;Vd._calendar=Pd,Vd.calendar=_b,Vd._longDateFormat=Qd,Vd.longDateFormat=ac,Vd._invalidDate=Rd,Vd.invalidDate=bc,Vd._ordinal=Sd,Vd.ordinal=cc,Vd._ordinalParse=Td,Vd.preparse=dc,Vd.postformat=dc,Vd._relativeTime=Ud,Vd.relativeTime=ec,Vd.pastFuture=fc,Vd.set=gc,Vd.months=U,Vd._months=md,Vd.monthsShort=V,Vd._monthsShort=nd,Vd.monthsParse=W,Vd.week=ka,Vd._week=ud,Vd.firstDayOfYear=ma,Vd.firstDayOfWeek=la,Vd.weekdays=Lb,Vd._weekdays=Ed,Vd.weekdaysMin=Nb,Vd._weekdaysMin=Gd,Vd.weekdaysShort=Mb,Vd._weekdaysShort=Fd,Vd.weekdaysParse=Ob,Vd.isPM=Ub,Vd._meridiemParse=Hd,Vd.meridiem=Vb,w("en",{ordinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(a){var b=a%10,c=1===q(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c}}),a.lang=aa("moment.lang is deprecated. Use moment.locale instead.",w),a.langData=aa("moment.langData is deprecated. Use moment.localeData instead.",y);var Wd=Math.abs,Xd=yc("ms"),Yd=yc("s"),Zd=yc("m"),$d=yc("h"),_d=yc("d"),ae=yc("w"),be=yc("M"),ce=yc("y"),de=Ac("milliseconds"),ee=Ac("seconds"),fe=Ac("minutes"),ge=Ac("hours"),he=Ac("days"),ie=Ac("months"),je=Ac("years"),ke=Math.round,le={s:45,m:45,h:22,d:26,M:11},me=Math.abs,ne=Ha.prototype;ne.abs=oc,ne.add=qc,ne.subtract=rc,ne.as=wc,ne.asMilliseconds=Xd,ne.asSeconds=Yd,ne.asMinutes=Zd,ne.asHours=$d,ne.asDays=_d,ne.asWeeks=ae,ne.asMonths=be,ne.asYears=ce,ne.valueOf=xc,ne._bubble=tc,ne.get=zc,ne.milliseconds=de,ne.seconds=ee,ne.minutes=fe,ne.hours=ge,ne.days=he,ne.weeks=Bc,ne.months=ie,ne.years=je,ne.humanize=Fc,ne.toISOString=Gc,ne.toString=Gc,ne.toJSON=Gc,ne.locale=rb,ne.localeData=sb,ne.toIsoString=aa("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",Gc),ne.lang=Cd,H("X",0,0,"unix"),H("x",0,0,"valueOf"),N("x",_c),N("X",bd),Q("X",function(a,b,c){c._d=new Date(1e3*parseFloat(a,10))}),Q("x",function(a,b,c){c._d=new Date(q(a))}),a.version="2.10.6",b(Da),a.fn=Od,a.min=Fa,a.max=Ga,a.utc=h,a.unix=Zb,a.months=jc,a.isDate=d,a.locale=w,a.invalid=l,a.duration=Ya,a.isMoment=o,a.weekdays=lc,a.parseZone=$b,a.localeData=y,a.isDuration=Ia,a.monthsShort=kc,a.weekdaysMin=nc,a.defineLocale=x,a.weekdaysShort=mc,a.normalizeUnits=A,a.relativeTimeThreshold=Ec;var oe=a;return oe});
\ No newline at end of file