blame | history | patch | commit | commitdiff | ignore whitespace
xiaoyong931011
2021-04-12 a13a93a493e7e94e28b2225c26e7e13b52d3288c 
 zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopActivitiesAction.java


@@ -1,29 +1,32 @@


package com.matrix.system.shopXcx.action;




import com.matrix.core.constance.MatrixConstance;


import com.matrix.core.constance.SystemMessageCode;


import com.matrix.core.pojo.PaginationVO;


import com.matrix.core.tools.*;


import com.matrix.core.web.BaseAction;


import com.matrix.core.constance.SystemErrorCode;


import com.matrix.core.anotations.RemoveRequestToken;


import com.matrix.core.anotations.SaveRequestToken;


import com.matrix.core.constance.MatrixConstance;


import com.matrix.core.constance.SystemErrorCode;


import com.matrix.core.constance.SystemMessageCode;


import com.matrix.core.exception.GlobleException;


import com.matrix.core.pojo.AjaxResult;


import com.matrix.core.pojo.PaginationVO;


import com.matrix.core.tools.DateUtil;


import com.matrix.core.tools.ModelUtils;


import com.matrix.core.tools.StringUtils;


import com.matrix.core.tools.WebUtil;


import com.matrix.system.common.bean.SysUsers;


import com.matrix.system.hive.plugin.util.CollectionUtils;


import com.matrix.system.shopXcx.bean.*;


import com.matrix.system.shopXcx.dao.*;


import com.matrix.system.shopXcx.dto.SalonDTO;


import com.matrix.system.shopXcx.dto.SecKillDTO;


import org.springframework.stereotype.Controller;


import com.matrix.core.exception.GlobleException;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.web.bind.annotation.*;


import com.matrix.core.anotations.SaveRequestToken;


import com.matrix.core.pojo.AjaxResult;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Controller;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.web.bind.annotation.PathVariable;


import org.springframework.web.bind.annotation.RequestBody;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.ResponseBody;


import org.springframework.web.servlet.ModelAndView;




import java.math.BigDecimal;


import java.util.Arrays;


import java.util.Comparator;


import java.util.List;


import java.util.Map;


@@ -308,13 +311,8 @@




        shopActivitiesDao.deleteById(actId);


        shopActivitiesGroupInfoDao.deleteByActId(actId);


        int i = shopActivitiesGroupPriceDao.deleteByActId(actId);




        if (i > 0) {


            return new AjaxResult(AjaxResult.STATUS_SUCCESS, SystemMessageCode.DELETE_SUCCES, i);


        } else {


            throw new GlobleException(SystemErrorCode.DATA_DELETE_FAIL);


        }


        shopActivitiesGroupPriceDao.deleteByActId(actId);


        return new AjaxResult(AjaxResult.STATUS_SUCCESS, SystemMessageCode.DELETE_SUCCES);


    }




    @RequestMapping(value = "/closeAct")