|
@@ -1,52 +1,36 @@
|
|
|
package org.jeecg.modules.business.controller;
|
|
package org.jeecg.modules.business.controller;
|
|
|
|
|
|
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
|
-import java.util.Date;
|
|
|
|
|
-import java.util.List;
|
|
|
|
|
-import java.util.Map;
|
|
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
-import java.io.IOException;
|
|
|
|
|
-import java.io.UnsupportedEncodingException;
|
|
|
|
|
-import java.net.URLDecoder;
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
|
|
-import cn.hutool.core.date.DateTime;
|
|
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
|
-import org.apache.tomcat.util.modeler.Util;
|
|
|
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.api.vo.Result;
|
|
|
|
|
+import org.jeecg.common.exception.JeecgBootException;
|
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
|
-import org.jeecg.common.util.oConvertUtils;
|
|
|
|
|
|
|
+import org.jeecg.common.system.vo.LoginUser;
|
|
|
|
|
+import org.jeecg.common.util.TokenUtils;
|
|
|
import org.jeecg.modules.business.dto.UserGroupDto;
|
|
import org.jeecg.modules.business.dto.UserGroupDto;
|
|
|
import org.jeecg.modules.business.dto.UserLabelDto;
|
|
import org.jeecg.modules.business.dto.UserLabelDto;
|
|
|
import org.jeecg.modules.business.entity.*;
|
|
import org.jeecg.modules.business.entity.*;
|
|
|
import org.jeecg.modules.business.service.*;
|
|
import org.jeecg.modules.business.service.*;
|
|
|
|
|
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
|
|
|
-import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
|
|
|
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
|
|
|
|
-import org.jeecgframework.poi.excel.entity.ExportParams;
|
|
|
|
|
-import org.jeecgframework.poi.excel.entity.ImportParams;
|
|
|
|
|
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
|
|
|
|
|
|
|
+import org.jeecg.modules.business.vo.MemberCardStatVo;
|
|
|
import org.jeecg.common.system.base.controller.JeecgController;
|
|
import org.jeecg.common.system.base.controller.JeecgController;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
-import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
-import org.springframework.web.multipart.MultipartHttpServletRequest;
|
|
|
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
|
-import com.alibaba.fastjson.JSON;
|
|
|
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
|
|
-import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
|
|
|
|
|
|
|
|
- /**
|
|
|
|
|
|
|
+/**
|
|
|
* @Description: bus_member_card
|
|
* @Description: bus_member_card
|
|
|
* @Author: jeecg-boot
|
|
* @Author: jeecg-boot
|
|
|
* @Date: 2023-03-10
|
|
* @Date: 2023-03-10
|
|
@@ -118,6 +102,12 @@ public class BusMemberCardController extends JeecgController<BusMemberCard, IBus
|
|
|
});
|
|
});
|
|
|
return Result.OK(pageList);
|
|
return Result.OK(pageList);
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ @GetMapping(value = "/stat")
|
|
|
|
|
+ public Result stat(@RequestParam(name="hotelId") String hotelId) {
|
|
|
|
|
+ MemberCardStatVo vo = busMemberCardService.stat(hotelId);
|
|
|
|
|
+ return Result.OK(vo);
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 添加
|
|
* 添加
|
|
@@ -130,6 +120,20 @@ public class BusMemberCardController extends JeecgController<BusMemberCard, IBus
|
|
|
//@RequiresPermissions("business:bus_member_card:add")
|
|
//@RequiresPermissions("business:bus_member_card:add")
|
|
|
@PostMapping(value = "/add")
|
|
@PostMapping(value = "/add")
|
|
|
public Result<String> add(@RequestBody BusMemberCard busMemberCard) {
|
|
public Result<String> add(@RequestBody BusMemberCard busMemberCard) {
|
|
|
|
|
+ LoginUser user = TokenUtils.getAuthUser();
|
|
|
|
|
+ if (user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")) {
|
|
|
|
|
+ busMemberCard.setTenantId(user.getRelTenantIds());
|
|
|
|
|
+ } else {
|
|
|
|
|
+ throw new JeecgBootException("当前登录人租户信息错误");
|
|
|
|
|
+ }
|
|
|
|
|
+ LambdaQueryWrapper<BusMemberCard> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
+ queryWrapper.eq(BusMemberCard::getMobile, busMemberCard.getMobile());
|
|
|
|
|
+ queryWrapper.eq(BusMemberCard::getHotelId,busMemberCard.getHotelId()).last("limit 1");
|
|
|
|
|
+ BusMemberCard memeber = busMemberCardService.getOne(queryWrapper);
|
|
|
|
|
+ if (memeber != null) {
|
|
|
|
|
+ return Result.error("该手机号已存在!");
|
|
|
|
|
+ }
|
|
|
|
|
+ busMemberCardService.getOne(queryWrapper);
|
|
|
busMemberCardService.save(busMemberCard);
|
|
busMemberCardService.save(busMemberCard);
|
|
|
return Result.OK("添加成功!");
|
|
return Result.OK("添加成功!");
|
|
|
}
|
|
}
|
|
@@ -145,6 +149,14 @@ public class BusMemberCardController extends JeecgController<BusMemberCard, IBus
|
|
|
//@RequiresPermissions("business:bus_member_card:edit")
|
|
//@RequiresPermissions("business:bus_member_card:edit")
|
|
|
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
|
|
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
|
|
|
public Result<String> edit(@RequestBody BusMemberCard busMemberCard) {
|
|
public Result<String> edit(@RequestBody BusMemberCard busMemberCard) {
|
|
|
|
|
+ LambdaQueryWrapper<BusMemberCard> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
+ queryWrapper.eq(BusMemberCard::getMobile, busMemberCard.getMobile());
|
|
|
|
|
+ queryWrapper.eq(BusMemberCard::getHotelId,busMemberCard.getHotelId());
|
|
|
|
|
+ queryWrapper.ne(BusMemberCard::getId,busMemberCard.getId()).last("limit 1");
|
|
|
|
|
+ BusMemberCard memeber = busMemberCardService.getOne(queryWrapper);
|
|
|
|
|
+ if (memeber != null) {
|
|
|
|
|
+ return Result.error("该手机号已存在!");
|
|
|
|
|
+ }
|
|
|
busMemberCardService.updateById(busMemberCard);
|
|
busMemberCardService.updateById(busMemberCard);
|
|
|
return Result.OK("编辑成功!");
|
|
return Result.OK("编辑成功!");
|
|
|
}
|
|
}
|