From 5ac93618a6f1c0cd4c536ab43178860b1b9e2406 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 29 Apr 2024 09:59:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/ysk/cashier/config/RedisConfig.java | 44 +++++----- .../java/cn/ysk/cashier/utils/RedisUtils.java | 82 +++++++++--------- .../java/cn/ysk/cashier/annotation/Log.java | 10 ++- .../java/cn/ysk/cashier/service/SpelUtil.java | 52 ++++++++++++ .../cashier/service/impl/LogServiceImpl.java | 25 +++--- .../ysk/cashier/config/MybatisPlusConfig.java | 4 +- .../rest/AuthorizationController.java | 41 +++++---- .../security/security/TokenProvider.java | 19 ++++- .../controller/BotButtonConfigController.java | 5 -- .../controller/BotConfigController.java | 5 -- .../cashier/controller/BotUserController.java | 5 -- .../controller/BotUserFlowController.java | 5 -- .../controller/TbPlatformDictController.java | 5 -- .../TbRenewalsPayLogController.java | 5 -- .../controller/TbShopPayTypeController.java | 7 -- .../controller/TbUserInfoController.java | 5 -- .../controller/TbVersionController.java | 4 - .../order/TbCashierCartController.java | 81 ------------------ .../order/TbOrderDetailController.java | 81 ------------------ .../order/TbOrderInfoController.java | 41 ++++----- .../product/TbProductController.java | 9 +- .../product/TbProductGroupController.java | 16 ++-- .../product/TbProductSkuController.java | 5 -- .../product/TbProductSkuResultController.java | 5 -- .../product/TbProductSpecController.java | 8 +- .../TbProductStockDetailController.java | 8 +- .../TbProductStockOperateController.java | 5 -- .../product/TbShopCategoryController.java | 7 +- .../shop/SummaryByDayController.java | 1 - .../shop/TbCouponCategoryController.java | 57 +++++++++++++ .../shop/TbMerchantAccountController.java | 5 -- .../shop/TbMerchantCouponController.java | 26 ++++-- .../shop/TbMerchantRegisterController.java | 4 - .../shop/TbMerchantThirdApplyController.java | 6 -- .../shop/TbPlussShopStaffController.java | 15 ++-- .../shop/TbPrintMachineController.java | 7 +- .../shop/TbPurchaseNoticeController.java | 43 ++++++++++ .../shop/TbReceiptSalesController.java | 6 -- .../controller/shop/TbShopAreaController.java | 8 +- .../shop/TbShopCashSpreadController.java | 6 -- .../shop/TbShopCurrencyController.java | 7 -- .../controller/shop/TbShopInfoController.java | 10 +-- .../shop/TbShopPurveyorController.java | 8 +- .../TbShopPurveyorTransactController.java | 6 -- .../shop/TbShopTableController.java | 8 +- .../controller/shop/TbShopUnitController.java | 8 +- .../controller/shop/TbShopUserController.java | 6 -- .../shop/TbShopVideoController.java | 30 +++---- .../cn/ysk/cashier/dto/TbPlatformDictDto.java | 24 ++++-- .../ysk/cashier/dto/order/TbOrderInfoDto.java | 7 ++ .../ysk/cashier/dto/product/TbProductDto.java | 8 +- .../cashier/dto/shop/TbCouponCategoryDto.java | 25 ++++++ .../shop/TbCouponCategoryQueryCriteria.java | 18 ++++ .../cashier/dto/shop/TbMerchantCouponDto.java | 1 + .../cashier/dto/shop/TbPlussShopStaffDto.java | 14 +++ .../shop/TbPlussShopStaffQueryCriteria.java | 4 + .../cashier/dto/shop/TbPurchaseNoticeDto.java | 48 +++++++++++ .../ysk/cashier/dto/shop/TbShopUserDto.java | 4 + .../mapper/product/TbProductMapper.java | 17 ++++ .../mapper/shop/TbCouponCategoryMapper.java | 17 ++++ .../mapper/shop/TbPrintMachineMapper.java | 2 +- .../mapper/shop/TbPurchaseNoticeMapper.java | 17 ++++ .../ysk/cashier/mnt/rest/AppController.java | 3 - .../cashier/mnt/rest/DatabaseController.java | 5 -- .../cashier/mnt/rest/DeployController.java | 8 -- .../mnt/rest/DeployHistoryController.java | 1 - .../mnt/rest/ServerDeployController.java | 4 - .../ysk/cashier/mybatis/entity/StorageVo.java | 2 +- .../cashier/mybatis/entity/TbUserStorage.java | 2 +- .../mapper/TbMerchantAccountMapper.java | 7 +- .../mybatis/mapper/TbProducSkutMapper.java | 5 +- .../mybatis/mapper/TbProductMapper.java | 5 +- .../mybatis/mapper/TbUserStorageMapper.java | 4 +- .../mybatis/rest/StorageController.java | 10 +-- .../cashier/mybatis/service/ShopService.java | 4 +- .../mybatis/service/impl/ShopServiceImpl.java | 23 +++-- .../cn/ysk/cashier/pojo/TbPlatformDict.java | 37 +++++--- .../ysk/cashier/pojo/order/TbOrderInfo.java | 11 +++ .../ysk/cashier/pojo/product/TbProduct.java | 6 ++ .../cashier/pojo/product/TbProductSku.java | 2 +- .../cashier/pojo/shop/TbCouponCategory.java | 46 ++++++++++ .../cashier/pojo/shop/TbMerchantCoupon.java | 77 +++++++++++------ .../cashier/pojo/shop/TbPlussShopStaff.java | 17 +++- .../shop/TbPrintMachine.java | 2 +- .../cashier/pojo/shop/TbPurchaseNotice.java | 72 ++++++++++++++++ .../cn/ysk/cashier/pojo/shop/TbShopInfo.java | 5 +- .../shop/TbCouponCategoryRepository.java | 13 +++ .../shop/TbPlussShopStaffRepository.java | 3 + .../shop/TbPrintMachineRepository.java | 2 +- .../shop/TbPurchaseNoticeRepository.java | 21 +++++ .../service/impl/TbVersionServiceImpl.java | 2 +- .../productimpl/TbProductServiceImpl.java | 1 + .../TbMerchantRegisterServiceImpl.java | 26 +++--- .../shopimpl/TbPlussShopStaffServiceImpl.java | 65 ++++++++++++-- .../shopimpl/TbPrintMachineServiceImpl.java | 2 +- .../service/shop/TbCouponCategoryService.java | 85 +++++++++++++++++++ .../service/shop/TbPrintMachineService.java | 2 +- .../service/shop/TbPurchaseNoticeService.java | 39 +++++++++ .../cn/ysk/cashier/system/domain/Dict.java | 3 + .../cn/ysk/cashier/system/domain/Menu.java | 5 ++ .../cn/ysk/cashier/system/domain/Role.java | 4 + .../system/repository/MenuRepository.java | 4 + .../cashier/system}/rest/LogController.java | 18 ++-- .../cashier/system/rest/MenuController.java | 25 +++++- .../cashier/system/rest/RoleController.java | 32 +++++-- .../cashier/system/service/MenuService.java | 2 +- .../cashier/system/service/dto/MenuDto.java | 3 + .../system/service/dto/MenuQueryCriteria.java | 3 + .../cashier/system/service/dto/RoleDto.java | 2 + .../system/service/dto/RoleQueryCriteria.java | 3 + .../system/service/impl/MenuServiceImpl.java | 15 +++- .../template/generator/admin/Controller.ftl | 23 +---- .../template/generator/admin/Dto.ftl | 2 - .../template/generator/admin/Entity.ftl | 2 - .../template/generator/admin/Mapper.ftl | 22 +---- .../generator/admin/QueryCriteria.ftl | 18 +--- .../template/generator/admin/Repository.ftl | 15 ---- .../template/generator/admin/Service.ftl | 17 ---- .../template/generator/admin/ServiceImpl.ftl | 15 ---- .../cn/ysk/cashier/rest/QiniuController.java | 4 +- 120 files changed, 1180 insertions(+), 738 deletions(-) create mode 100644 eladmin-logging/src/main/java/cn/ysk/cashier/service/SpelUtil.java delete mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbCashierCartController.java delete mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderDetailController.java create mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbCouponCategoryController.java create mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPurchaseNoticeController.java create mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbCouponCategoryDto.java create mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbCouponCategoryQueryCriteria.java create mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPurchaseNoticeDto.java create mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbCouponCategoryMapper.java create mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbPurchaseNoticeMapper.java create mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbCouponCategory.java rename eladmin-system/src/main/java/cn/ysk/cashier/{controller => pojo}/shop/TbPrintMachine.java (98%) create mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPurchaseNotice.java create mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbCouponCategoryRepository.java create mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbPurchaseNoticeRepository.java create mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbCouponCategoryService.java create mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbPurchaseNoticeService.java rename {eladmin-logging/src/main/java/cn/ysk/cashier => eladmin-system/src/main/java/cn/ysk/cashier/system}/rest/LogController.java (89%) diff --git a/eladmin-common/src/main/java/cn/ysk/cashier/config/RedisConfig.java b/eladmin-common/src/main/java/cn/ysk/cashier/config/RedisConfig.java index a2becde3..de212518 100644 --- a/eladmin-common/src/main/java/cn/ysk/cashier/config/RedisConfig.java +++ b/eladmin-common/src/main/java/cn/ysk/cashier/config/RedisConfig.java @@ -72,29 +72,29 @@ public class RedisConfig extends CachingConfigurerSupport { lettuceConnectionFactory.setDatabase(redisProperties.getDatabase()); return lettuceConnectionFactory; } - @Bean - public RedisConnectionFactory redisConnectionFactory5() { - LettuceConnectionFactory lettuceConnectionFactory = new LettuceConnectionFactory(redisProperties.getHost(), redisProperties.getPort()); - lettuceConnectionFactory.setPassword(redisProperties.getPassword()); - lettuceConnectionFactory.setDatabase(5); - return lettuceConnectionFactory; - } +// @Bean +// public RedisConnectionFactory redisConnectionFactory5() { +// LettuceConnectionFactory lettuceConnectionFactory = new LettuceConnectionFactory(redisProperties.getHost(), redisProperties.getPort()); +// lettuceConnectionFactory.setPassword(redisProperties.getPassword()); +// lettuceConnectionFactory.setDatabase(5); +// return lettuceConnectionFactory; +// } - @Bean(name = "redis5Template") - public RedisTemplate redis5Template(@Qualifier("redisConnectionFactory5") RedisConnectionFactory redisConnectionFactory5) { - RedisTemplate template = new RedisTemplate<>(); - //序列化 - FastJsonRedisSerializer fastJsonRedisSerializer = new FastJsonRedisSerializer<>(Object.class); - // value值的序列化采用fastJsonRedisSerializer - template.setValueSerializer(fastJsonRedisSerializer); - template.setHashValueSerializer(fastJsonRedisSerializer); - // key的序列化采用StringRedisSerializer - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - template.setConnectionFactory(redisConnectionFactory5); - // 配置序列化等信息 - return template; - } +// @Bean(name = "redis5Template") +// public RedisTemplate redis5Template(@Qualifier("redisConnectionFactory5") RedisConnectionFactory redisConnectionFactory5) { +// RedisTemplate template = new RedisTemplate<>(); +// //序列化 +// FastJsonRedisSerializer fastJsonRedisSerializer = new FastJsonRedisSerializer<>(Object.class); +// // value值的序列化采用fastJsonRedisSerializer +// template.setValueSerializer(fastJsonRedisSerializer); +// template.setHashValueSerializer(fastJsonRedisSerializer); +// // key的序列化采用StringRedisSerializer +// template.setKeySerializer(new StringRedisSerializer()); +// template.setHashKeySerializer(new StringRedisSerializer()); +// template.setConnectionFactory(redisConnectionFactory5); +// // 配置序列化等信息 +// return template; +// } /** * 设置 redis 数据默认过期时间，默认2小时 diff --git a/eladmin-common/src/main/java/cn/ysk/cashier/utils/RedisUtils.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/RedisUtils.java index 1e36494e..6b712a5b 100644 --- a/eladmin-common/src/main/java/cn/ysk/cashier/utils/RedisUtils.java +++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/RedisUtils.java @@ -41,22 +41,29 @@ import java.util.concurrent.TimeUnit; public class RedisUtils { private static final Logger log = LoggerFactory.getLogger(RedisUtils.class); private RedisTemplate redisTemplate; - private RedisTemplate redisTemplate5; +// private RedisTemplate redisTemplate5; @Value("${jwt.online-key}") private String onlineKey; - public RedisUtils(RedisTemplate redisTemplate,@Qualifier("redis5Template")RedisTemplate redisTemplate5) { +// public RedisUtils(RedisTemplate redisTemplate,@Qualifier("redis5Template")RedisTemplate redisTemplate5) { +// this.redisTemplate = redisTemplate; +// this.redisTemplate.setHashKeySerializer(new StringRedisSerializer()); +// this.redisTemplate.setKeySerializer(new StringRedisSerializer()); +// this.redisTemplate.setStringSerializer(new StringRedisSerializer()); +// +// +// this.redisTemplate5 = redisTemplate5; +// this.redisTemplate5.setHashKeySerializer(new StringRedisSerializer()); +// this.redisTemplate5.setKeySerializer(new StringRedisSerializer()); +// this.redisTemplate5.setStringSerializer(new StringRedisSerializer()); +// } + + public RedisUtils(RedisTemplate redisTemplate) { this.redisTemplate = redisTemplate; this.redisTemplate.setHashKeySerializer(new StringRedisSerializer()); this.redisTemplate.setKeySerializer(new StringRedisSerializer()); this.redisTemplate.setStringSerializer(new StringRedisSerializer()); - - - this.redisTemplate5 = redisTemplate5; - this.redisTemplate5.setHashKeySerializer(new StringRedisSerializer()); - this.redisTemplate5.setKeySerializer(new StringRedisSerializer()); - this.redisTemplate5.setStringSerializer(new StringRedisSerializer()); } /** @@ -774,16 +781,15 @@ public class RedisUtils { * @param value 值 * @return true成功 false失败 */ - public boolean set5(String key, Object value) { - try { - redisTemplate5.opsForValue().set(key, value); -// redisTemplate.opsForValue().set(key, value); - return true; - } catch (Exception e) { - log.error(e.getMessage(), e); - return false; - } - } +// public boolean set5(String key, Object value) { +// try { +// redisTemplate5.opsForValue().set(key, value); +// return true; +// } catch (Exception e) { +// log.error(e.getMessage(), e); +// return false; +// } +// } /** @@ -792,26 +798,26 @@ public class RedisUtils { * * @param key 可以传一个值 或多个 */ - public void del5(String... keys) { - if (keys != null && keys.length > 0) { - if (keys.length == 1) { - boolean result = redisTemplate5.delete(keys[0]); - log.debug("--------------------------------------------"); - log.debug(new StringBuilder("删除缓存：").append(keys[0]).append("，结果：").append(result).toString()); - log.debug("--------------------------------------------"); - } else { - Set keySet = new HashSet<>(); - for (String key : keys) { - keySet.addAll(redisTemplate5.keys(key)); - } - long count = redisTemplate5.delete(keySet); - log.debug("--------------------------------------------"); - log.debug("成功删除缓存：" + keySet.toString()); - log.debug("缓存删除数量：" + count + "个"); - log.debug("--------------------------------------------"); - } - } - } +// public void del5(String... keys) { +// if (keys != null && keys.length > 0) { +// if (keys.length == 1) { +// boolean result = redisTemplate5.delete(keys[0]); +// log.debug("--------------------------------------------"); +// log.debug(new StringBuilder("删除缓存：").append(keys[0]).append("，结果：").append(result).toString()); +// log.debug("--------------------------------------------"); +// } else { +// Set keySet = new HashSet<>(); +// for (String key : keys) { +// keySet.addAll(redisTemplate5.keys(key)); +// } +// long count = redisTemplate5.delete(keySet); +// log.debug("--------------------------------------------"); +// log.debug("成功删除缓存：" + keySet.toString()); +// log.debug("缓存删除数量：" + count + "个"); +// log.debug("--------------------------------------------"); +// } +// } +// } } diff --git a/eladmin-logging/src/main/java/cn/ysk/cashier/annotation/Log.java b/eladmin-logging/src/main/java/cn/ysk/cashier/annotation/Log.java index e5868b13..9434baeb 100644 --- a/eladmin-logging/src/main/java/cn/ysk/cashier/annotation/Log.java +++ b/eladmin-logging/src/main/java/cn/ysk/cashier/annotation/Log.java @@ -15,10 +15,7 @@ */ package cn.ysk.cashier.annotation; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; /** * @author Zheng Jie @@ -27,5 +24,10 @@ import java.lang.annotation.Target; @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) public @interface Log { + /** + * ("登录授权: #authUser.username") ：必填 + * 实际会存为 登录授权：用户名 + * @return + */ String value() default ""; } diff --git a/eladmin-logging/src/main/java/cn/ysk/cashier/service/SpelUtil.java b/eladmin-logging/src/main/java/cn/ysk/cashier/service/SpelUtil.java new file mode 100644 index 00000000..c60a432b --- /dev/null +++ b/eladmin-logging/src/main/java/cn/ysk/cashier/service/SpelUtil.java @@ -0,0 +1,52 @@ +package cn.ysk.cashier.service; + +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.reflect.MethodSignature; +import org.springframework.core.DefaultParameterNameDiscoverer; +import org.springframework.expression.EvaluationContext; +import org.springframework.expression.Expression; +import org.springframework.expression.spel.standard.SpelExpressionParser; +import org.springframework.expression.spel.support.StandardEvaluationContext; + +import java.lang.reflect.Method; + +public class SpelUtil { + /** + * 用于SpEL表达式解析. + */ + private static final SpelExpressionParser parser = new SpelExpressionParser(); + + /** + * 用于获取方法参数定义名字. + */ + private static final DefaultParameterNameDiscoverer nameDiscoverer = new DefaultParameterNameDiscoverer(); + + /** + * 解析SpEL表达式 + * + * @param spELStr + * @param joinPoint + * @return + */ + public static String generateKeyBySpEL(String spELStr, ProceedingJoinPoint joinPoint) { + // 通过joinPoint获取被注解方法 + MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature(); + Method method = methodSignature.getMethod(); + // 使用Spring的DefaultParameterNameDiscoverer获取方法形参名数组 + String[] paramNames = nameDiscoverer.getParameterNames(method); + // 解析过后的Spring表达式对象 + Expression expression = parser.parseExpression(spELStr); + // Spring的表达式上下文对象 + EvaluationContext context = new StandardEvaluationContext(); + // 通过joinPoint获取被注解方法的形参 + Object[] args = joinPoint.getArgs(); + // 给上下文赋值 + for (int i = 0; i < args.length; i++) { + context.setVariable(paramNames[i], args[i]); + } + if(expression.getValue(context)==null){ + return ""; + } + return expression.getValue(context).toString(); + } +} diff --git a/eladmin-logging/src/main/java/cn/ysk/cashier/service/impl/LogServiceImpl.java b/eladmin-logging/src/main/java/cn/ysk/cashier/service/impl/LogServiceImpl.java index 72c68b55..7e6e2f1d 100644 --- a/eladmin-logging/src/main/java/cn/ysk/cashier/service/impl/LogServiceImpl.java +++ b/eladmin-logging/src/main/java/cn/ysk/cashier/service/impl/LogServiceImpl.java @@ -23,6 +23,7 @@ import cn.ysk.cashier.domain.Log; import cn.ysk.cashier.domain.LogVO; import cn.ysk.cashier.repository.LogRepository; import cn.ysk.cashier.service.LogService; +import cn.ysk.cashier.service.SpelUtil; import cn.ysk.cashier.service.dto.LogQueryCriteria; import cn.ysk.cashier.service.dto.LogQueryCriteriaExt; import cn.ysk.cashier.service.mapstruct.LogErrorMapper; @@ -80,7 +81,7 @@ public class LogServiceImpl implements LogService { @Override @Transactional(rollbackFor = Exception.class) - public void save(String username, String browser, String ip, ProceedingJoinPoint joinPoint, Log log,Integer shopId) { + public void save(String username, String browser, String ip, ProceedingJoinPoint joinPoint, Log log, Integer shopId) { if (log == null) { throw new IllegalArgumentException("Log 不能为 null!"); } @@ -90,17 +91,21 @@ public class LogServiceImpl implements LogService { // 方法路径 String methodName = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()"; - - // 描述 - log.setDescription(aopLog.value()); - + String[] split = aopLog.value().split(":"); + if (split.length == 2) { + String value = SpelUtil.generateKeyBySpEL(split[1], joinPoint); + // 描述 + log.setDescription(split[0] + ":" + value); + }else { + log.setDescription(split[0]); + } log.setRequestIp(ip); log.setAddress(StringUtils.getCityInfo(log.getRequestIp())); log.setMethod(methodName); log.setUsername(username); log.setParams(getParameter(method, joinPoint.getArgs())); // 记录登录用户，隐藏密码信息 - if(signature.getName().equals("login") && StringUtils.isNotEmpty(log.getParams())){ + if (signature.getName().equals("login") && StringUtils.isNotEmpty(log.getParams())) { JSONObject obj = JSONUtil.parseObj(log.getParams()); log.setUsername(obj.getStr("username", "")); log.setParams(JSONUtil.toJsonStr(Dict.create().set("username", log.getUsername()))); @@ -182,7 +187,7 @@ public class LogServiceImpl implements LogService { public Map shopInfoLog(LogQueryCriteriaExt criteria, Pageable pageable) { Page page = logRepository.findAll(((root, criteriaQuery, cb) -> QueryHelp.getPredicate(root, criteria, cb)), pageable); List logVOList = new ArrayList<>(); - for (Log log :page.getContent()) { + for (Log log : page.getContent()) { LogVO logVO = new LogVO(); logVO.setDescription(log.getDescription()); logVO.setCreateTime(log.getCreateTime()); @@ -190,9 +195,9 @@ public class LogServiceImpl implements LogService { logVO.setRequestIp(log.getRequestIp()); logVOList.add(logVO); } - Map map = new LinkedHashMap<>(2); - map.put("content",logVOList); - map.put("totalElements",page.getTotalElements()); + Map map = new LinkedHashMap<>(2); + map.put("content", logVOList); + map.put("totalElements", page.getTotalElements()); return map; } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/config/MybatisPlusConfig.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/MybatisPlusConfig.java index f9e6df14..f998c8ef 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/config/MybatisPlusConfig.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package me.zhengjie.config; +package cn.ysk.cashier.config; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.*; @@ -12,7 +12,7 @@ import java.util.Collections; @Configuration -@MapperScan("me.zhengjie.mybatis.mapper") +@MapperScan("cn.ysk.cashier.mybatis.mapper") @EnableTransactionManagement public class MybatisPlusConfig { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/AuthorizationController.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/AuthorizationController.java index e72e33e5..0b06ef99 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/AuthorizationController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/AuthorizationController.java @@ -18,6 +18,8 @@ package cn.ysk.cashier.config.security.rest; import cn.hutool.core.util.IdUtil; import cn.ysk.cashier.config.security.config.bean.LoginCodeEnum; import cn.ysk.cashier.config.security.security.TokenProvider; +import cn.ysk.cashier.pojo.shop.TbPlussShopStaff; +import cn.ysk.cashier.repository.shop.TbPlussShopStaffRepository; import cn.ysk.cashier.utils.*; import com.wf.captcha.base.Captcha; import io.swagger.annotations.Api; @@ -40,16 +42,19 @@ import cn.ysk.cashier.pojo.shop.TbShopInfo; import cn.ysk.cashier.repository.shop.TbShopInfoRepository; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; + import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.HashMap; import java.util.Map; +import java.util.Set; import java.util.concurrent.TimeUnit; /** @@ -69,10 +74,10 @@ public class AuthorizationController { private final TokenProvider tokenProvider; private final AuthenticationManagerBuilder authenticationManagerBuilder; private final TbShopInfoRepository tbShopInfoRepository; + private final TbPlussShopStaffRepository staffRepository; @Resource private LoginProperties loginProperties; - @Log("用户登录") @ApiOperation("登录授权") @AnonymousPostMapping(value = "/login") public ResponseEntity login(@Validated @RequestBody AuthUserDto authUser, HttpServletRequest request) throws Exception { @@ -97,17 +102,22 @@ public class AuthorizationController { // UserDetails userDetails = userDetailsService.loadUserByUsername(userInfo.getUsername()); // Authentication authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); // SecurityContextHolder.getContext().setAuthentication(authentication); - String token = tokenProvider.createToken(authentication); final JwtUserDto jwtUserDto = (JwtUserDto) authentication.getPrincipal(); - // 返回 token 与 用户信息 - TbShopInfo byAccount = tbShopInfoRepository.findByAccount(jwtUserDto.getUsername()); +// TbShopInfo byAccount = tbShopInfoRepository.findByAccount(jwtUserDto.getUsername()); + TbPlussShopStaff tbPlussShopStaff = staffRepository.queryByAccount(jwtUserDto.getUsername()); + if (tbPlussShopStaff != null && tbPlussShopStaff.getType().equals("staff")) { + Integer isManage = tbPlussShopStaff.getIsManage(); + if (isManage != null && isManage != 1) { + throw new BadRequestException("该账号无权限登录，请联系管理员"); + } + } + TbShopInfo byAccount = tbShopInfoRepository.findById(Integer.valueOf(tbPlussShopStaff.getShopId())).get(); //校验商户商户激活是否到期（未激活） - - + String token = tokenProvider.createToken(authentication, tbPlussShopStaff.getShopId()); Map authInfo = new HashMap(2) {{ put("token", properties.getTokenStartWith() + token); put("user", jwtUserDto); - if (byAccount!= null){ + if (byAccount != null) { put("shopId", byAccount.getId()); put("shopName", byAccount.getShopName()); put("logo", byAccount.getLogo()); @@ -115,7 +125,7 @@ public class AuthorizationController { }}; // 保存在线信息 - onlineUserService.save(jwtUserDto, token, request,byAccount.getId()); + onlineUserService.save(jwtUserDto, token, request, byAccount.getId()); if (loginProperties.isSingleLogin()) { //踢掉之前已经登录的token @@ -126,13 +136,14 @@ public class AuthorizationController { /** * 小程序登录 + * * @param authUser * @param request * @return * @throws Exception */ @PostMapping(value = "/appletsLogin") - public ResponseEntity appletsLogin(@RequestBody AuthUserDto authUser,HttpServletRequest request)throws Exception{ + public ResponseEntity appletsLogin(@RequestBody AuthUserDto authUser, HttpServletRequest request) throws Exception { // 密码解密 String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, authUser.getPassword()); @@ -140,18 +151,18 @@ public class AuthorizationController { new UsernamePasswordAuthenticationToken(authUser.getUsername(), password); Authentication authentication = authenticationManagerBuilder.getObject().authenticate(authenticationToken); SecurityContextHolder.getContext().setAuthentication(authentication); - // 生成令牌与第三方系统获取令牌方式 - String token = tokenProvider.createToken(authentication); final JwtUserDto jwtUserDto = (JwtUserDto) authentication.getPrincipal(); - // 保存在线信息 - onlineUserService.save(jwtUserDto, token,request,null); // 返回 token 与 用户信息 TbShopInfo byAccount = tbShopInfoRepository.findByAccount(jwtUserDto.getUsername()); + // 生成令牌与第三方系统获取令牌方式 + String token = tokenProvider.createToken(authentication, byAccount.getId().toString()); + // 保存在线信息 + onlineUserService.save(jwtUserDto, token, request, null); Map authInfo = new HashMap(2) {{ put("token", properties.getTokenStartWith() + token); put("user", jwtUserDto); - if (byAccount!= null){ - put("shopId",byAccount.getId()); + if (byAccount != null) { + put("shopId", byAccount.getId()); } }}; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/config/security/security/TokenProvider.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/security/TokenProvider.java index 35fb7ec1..510d0c4e 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/config/security/security/TokenProvider.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/security/TokenProvider.java @@ -18,6 +18,8 @@ package cn.ysk.cashier.config.security.security; import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; +import cn.ysk.cashier.utils.SpringContextHolder; +import com.alibaba.fastjson.JSONObject; import io.jsonwebtoken.*; import io.jsonwebtoken.io.Decoders; import io.jsonwebtoken.security.Keys; @@ -47,6 +49,11 @@ public class TokenProvider implements InitializingBean { private JwtParser jwtParser; private JwtBuilder jwtBuilder; + /** + * token秘钥 + */ + private static final String TOKEN_SECRET = "BBDFSDFHFGHSGSRTRESDFSDFS"; + public TokenProvider(SecurityProperties properties, RedisUtils redisUtils) { this.properties = properties; this.redisUtils = redisUtils; @@ -70,11 +77,12 @@ public class TokenProvider implements InitializingBean { * @param authentication / * @return / */ - public String createToken(Authentication authentication) { + public String createToken(Authentication authentication,String shopId) { return jwtBuilder // 加入ID确保生成的 Token 都不一致 .setId(IdUtil.simpleUUID()) .claim(AUTHORITIES_KEY, authentication.getName()) + .claim("shopId",shopId) .setSubject(authentication.getName()) .compact(); } @@ -120,4 +128,13 @@ public class TokenProvider implements InitializingBean { } return null; } + + public String getShopId() { + HttpServletRequest request = SpringContextHolder.getRequest(); + final String requestHeader = request.getHeader(properties.getHeader()); + if (requestHeader != null && requestHeader.startsWith(properties.getTokenStartWith())) { + return getClaims(requestHeader.substring(7)).get("shopId").toString(); + } + return null; + } } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/BotButtonConfigController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/BotButtonConfigController.java index 39f4247c..0d0fb7ce 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/BotButtonConfigController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/BotButtonConfigController.java @@ -43,7 +43,6 @@ public class BotButtonConfigController { private final BotButtonConfigService botButtonConfigService; - @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('botButtonConfig:list')") @@ -52,7 +51,6 @@ public class BotButtonConfigController { } @GetMapping - @Log("查询buttonConfig") @ApiOperation("查询buttonConfig") @PreAuthorize("@el.check('botButtonConfig:list')") public ResponseEntity queryBotButtonConfig(BotButtonConfigQueryCriteria criteria, Pageable pageable){ @@ -60,7 +58,6 @@ public class BotButtonConfigController { } @PostMapping - @Log("新增buttonConfig") @ApiOperation("新增buttonConfig") @PreAuthorize("@el.check('botButtonConfig:add')") public ResponseEntity createBotButtonConfig(@Validated @RequestBody BotButtonConfig resources){ @@ -68,7 +65,6 @@ public class BotButtonConfigController { } @PutMapping - @Log("修改buttonConfig") @ApiOperation("修改buttonConfig") @PreAuthorize("@el.check('botButtonConfig:edit')") public ResponseEntity updateBotButtonConfig(@Validated @RequestBody BotButtonConfig resources){ @@ -77,7 +73,6 @@ public class BotButtonConfigController { } @DeleteMapping - @Log("删除buttonConfig") @ApiOperation("删除buttonConfig") @PreAuthorize("@el.check('botButtonConfig:del')") public ResponseEntity deleteBotButtonConfig(@RequestBody Integer[] ids) { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/BotConfigController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/BotConfigController.java index 2368e53f..f7fc86ce 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/BotConfigController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/BotConfigController.java @@ -43,7 +43,6 @@ public class BotConfigController { private final BotConfigService botConfigService; - @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('botConfig:list')") @@ -52,7 +51,6 @@ public class BotConfigController { } @GetMapping - @Log("查询botConfig") @ApiOperation("查询botConfig") @PreAuthorize("@el.check('botConfig:list')") public ResponseEntity queryBotConfig(BotConfigQueryCriteria criteria, Pageable pageable){ @@ -60,7 +58,6 @@ public class BotConfigController { } @PostMapping - @Log("新增botConfig") @ApiOperation("新增botConfig") @PreAuthorize("@el.check('botConfig:add')") public ResponseEntity createBotConfig(@Validated @RequestBody BotConfig resources){ @@ -68,7 +65,6 @@ public class BotConfigController { } @PutMapping - @Log("修改botConfig") @ApiOperation("修改botConfig") @PreAuthorize("@el.check('botConfig:edit')") public ResponseEntity updateBotConfig(@Validated @RequestBody BotConfig resources){ @@ -77,7 +73,6 @@ public class BotConfigController { } @DeleteMapping - @Log("删除botConfig") @ApiOperation("删除botConfig") @PreAuthorize("@el.check('botConfig:del')") public ResponseEntity deleteBotConfig(@RequestBody Integer[] ids) { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/BotUserController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/BotUserController.java index c5104bfc..40d1d5cc 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/BotUserController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/BotUserController.java @@ -43,7 +43,6 @@ public class BotUserController { private final BotUserService botUserService; - @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('botUser:list')") @@ -52,7 +51,6 @@ public class BotUserController { } @GetMapping - @Log("查询BotUserController") @ApiOperation("查询BotUserController") @PreAuthorize("@el.check('botUser:list')") public ResponseEntity queryBotUser(BotUserQueryCriteria criteria, Pageable pageable){ @@ -60,7 +58,6 @@ public class BotUserController { } @PostMapping - @Log("新增BotUserController") @ApiOperation("新增BotUserController") @PreAuthorize("@el.check('botUser:add')") public ResponseEntity createBotUser(@Validated @RequestBody BotUser resources){ @@ -68,7 +65,6 @@ public class BotUserController { } @PutMapping - @Log("修改BotUserController") @ApiOperation("修改BotUserController") @PreAuthorize("@el.check('botUser:edit')") public ResponseEntity updateBotUser(@Validated @RequestBody BotUser resources){ @@ -77,7 +73,6 @@ public class BotUserController { } @DeleteMapping - @Log("删除BotUserController") @ApiOperation("删除BotUserController") @PreAuthorize("@el.check('botUser:del')") public ResponseEntity deleteBotUser(@RequestBody Integer[] ids) { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/BotUserFlowController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/BotUserFlowController.java index 8ae3aad3..e41c7998 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/BotUserFlowController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/BotUserFlowController.java @@ -43,7 +43,6 @@ public class BotUserFlowController { private final BotUserFlowService botUserFlowService; - @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('botUserFlow:list')") @@ -52,7 +51,6 @@ public class BotUserFlowController { } @GetMapping - @Log("查询accountFlow") @ApiOperation("查询accountFlow") @PreAuthorize("@el.check('botUserFlow:list')") public ResponseEntity queryBotUserFlow(BotUserFlowQueryCriteria criteria, Pageable pageable){ @@ -60,7 +58,6 @@ public class BotUserFlowController { } @PostMapping - @Log("新增accountFlow") @ApiOperation("新增accountFlow") @PreAuthorize("@el.check('botUserFlow:add')") public ResponseEntity createBotUserFlow(@Validated @RequestBody BotUserFlow resources){ @@ -68,7 +65,6 @@ public class BotUserFlowController { } @PutMapping - @Log("修改accountFlow") @ApiOperation("修改accountFlow") @PreAuthorize("@el.check('botUserFlow:edit')") public ResponseEntity updateBotUserFlow(@Validated @RequestBody BotUserFlow resources){ @@ -77,7 +73,6 @@ public class BotUserFlowController { } @DeleteMapping - @Log("删除accountFlow") @ApiOperation("删除accountFlow") @PreAuthorize("@el.check('botUserFlow:del')") public ResponseEntity deleteBotUserFlow(@RequestBody Integer[] ids) { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbPlatformDictController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbPlatformDictController.java index ed6aae19..cb09bf70 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbPlatformDictController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbPlatformDictController.java @@ -27,27 +27,23 @@ public class TbPlatformDictController { private final TbPlatformDictService tbPlatformDictService; @GetMapping - @Log("查询新字典") @ApiOperation("查询新字典") public ResponseEntity queryTbPlatformDict(TbPlatformDictQueryCriteria criteria){ return new ResponseEntity<>(tbPlatformDictService.queryAllPage(criteria),HttpStatus.OK); } @GetMapping("/{id}") - @Log("通过Id查询新字典") @ApiOperation("通过Id查询新字典") public TbPlatformDictDto queryTbOrderInfo(@PathVariable("id") Integer id){ return tbPlatformDictService.findById(id); } @PostMapping - @Log("新增新字典") @ApiOperation("新增新字典") public ResponseEntity createTbPlatformDict(@Validated @RequestBody TbPlatformDict resources){ return new ResponseEntity<>(tbPlatformDictService.create(resources),HttpStatus.CREATED); } @PutMapping - @Log("修改新字典") @ApiOperation("修改新字典") public ResponseEntity updateTbPlatformDict(@Validated @RequestBody TbPlatformDict resources){ tbPlatformDictService.update(resources); @@ -55,7 +51,6 @@ public class TbPlatformDictController { } @DeleteMapping - @Log("删除新字典") @ApiOperation("删除新字典") public ResponseEntity deleteTbPlatformDict(@RequestBody Integer[] ids) { tbPlatformDictService.deleteAll(ids); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbRenewalsPayLogController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbRenewalsPayLogController.java index 57fb516b..7821f3ec 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbRenewalsPayLogController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbRenewalsPayLogController.java @@ -43,7 +43,6 @@ public class TbRenewalsPayLogController { private final TbRenewalsPayLogService tbRenewalsPayLogService; - @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('tbRenewalsPayLog:list')") @@ -52,7 +51,6 @@ public class TbRenewalsPayLogController { } @GetMapping - @Log("查询/shop/renewals") @ApiOperation("查询/shop/renewals") @PreAuthorize("@el.check('tbRenewalsPayLog:list')") public ResponseEntity queryTbRenewalsPayLog(TbRenewalsPayLogQueryCriteria criteria, Pageable pageable){ @@ -60,7 +58,6 @@ public class TbRenewalsPayLogController { } @PostMapping - @Log("新增/shop/renewals") @ApiOperation("新增/shop/renewals") @PreAuthorize("@el.check('tbRenewalsPayLog:add')") public ResponseEntity createTbRenewalsPayLog(@Validated @RequestBody TbRenewalsPayLog resources){ @@ -68,7 +65,6 @@ public class TbRenewalsPayLogController { } @PutMapping - @Log("修改/shop/renewals") @ApiOperation("修改/shop/renewals") @PreAuthorize("@el.check('tbRenewalsPayLog:edit')") public ResponseEntity updateTbRenewalsPayLog(@Validated @RequestBody TbRenewalsPayLog resources){ @@ -77,7 +73,6 @@ public class TbRenewalsPayLogController { } @DeleteMapping - @Log("删除/shop/renewals") @ApiOperation("删除/shop/renewals") @PreAuthorize("@el.check('tbRenewalsPayLog:del')") public ResponseEntity deleteTbRenewalsPayLog(@RequestBody Integer[] ids) { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbShopPayTypeController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbShopPayTypeController.java index 1c176945..ea4aedbc 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbShopPayTypeController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbShopPayTypeController.java @@ -42,7 +42,6 @@ public class TbShopPayTypeController { private final TbShopPayTypeService tbShopPayTypeService; - @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") public void exportTbShopPayType(HttpServletResponse response, TbShopPayTypeQueryCriteria criteria) throws IOException { @@ -50,28 +49,23 @@ public class TbShopPayTypeController { } @GetMapping - @Log("查询/merchant/system/paytype") @ApiOperation("查询/merchant/system/paytype") public ResponseEntity queryTbShopPayType(TbShopPayTypeQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(tbShopPayTypeService.queryAll(criteria,pageable),HttpStatus.OK); } @PostMapping - @Log("新增/merchant/system/paytype") @ApiOperation("新增/merchant/system/paytype") public ResponseEntity createTbShopPayType(@Validated @RequestBody TbShopPayType resources){ return new ResponseEntity<>(tbShopPayTypeService.create(resources),HttpStatus.CREATED); } @GetMapping("/{id}") - @Log("新增/merchant/system/paytype") - @ApiOperation("新增/merchant/system/paytype") public ResponseEntity TbShopPayTypeInfo(@PathVariable Integer id){ return new ResponseEntity<>(tbShopPayTypeService.findById(id),HttpStatus.CREATED); } @PutMapping - @Log("修改/merchant/system/paytype") @ApiOperation("修改/merchant/system/paytype") public ResponseEntity updateTbShopPayType(@Validated @RequestBody TbShopPayType resources){ tbShopPayTypeService.update(resources); @@ -79,7 +73,6 @@ public class TbShopPayTypeController { } @DeleteMapping - @Log("删除/merchant/system/paytype") @ApiOperation("删除/merchant/system/paytype") public ResponseEntity deleteTbShopPayType(@RequestBody Integer[] ids) { tbShopPayTypeService.deleteAll(ids); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbUserInfoController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbUserInfoController.java index fa6a5763..2e06cb39 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbUserInfoController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbUserInfoController.java @@ -43,7 +43,6 @@ public class TbUserInfoController { private final TbUserInfoService tbUserInfoService; - @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('tbUserInfo:list')") @@ -52,21 +51,18 @@ public class TbUserInfoController { } @GetMapping - @Log("查询/userInfo/list") @ApiOperation("查询/userInfo/list") public ResponseEntity queryTbUserInfo(TbUserInfoQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(tbUserInfoService.queryAll(criteria,pageable),HttpStatus.OK); } @PostMapping - @Log("新增/userInfo/list") @ApiOperation("新增/userInfo/list") public ResponseEntity createTbUserInfo(@Validated @RequestBody TbUserInfo resources){ return new ResponseEntity<>(tbUserInfoService.create(resources),HttpStatus.CREATED); } @PutMapping - @Log("修改/userInfo/list") @ApiOperation("修改/userInfo/list") public ResponseEntity updateTbUserInfo(@Validated @RequestBody TbUserInfo resources){ tbUserInfoService.update(resources); @@ -74,7 +70,6 @@ public class TbUserInfoController { } @DeleteMapping - @Log("删除/userInfo/list") @ApiOperation("删除/userInfo/list") public ResponseEntity deleteTbUserInfo(@RequestBody Integer[] ids) { tbUserInfoService.deleteAll(ids); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbVersionController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbVersionController.java index d12e3305..8ddffb0f 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbVersionController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbVersionController.java @@ -22,21 +22,18 @@ public class TbVersionController { private final TbVersionService tbVersionService; @GetMapping - @Log("查询版本") @ApiOperation("查询版本") public ResponseEntity queryTbVersion(TbVersionQueryCriteria criteria){ return new ResponseEntity<>(tbVersionService.queryAllPage(criteria),HttpStatus.OK); } @PostMapping - @Log("新增版本") @ApiOperation("新增版本") public ResponseEntity createTbVersion(@Validated @RequestBody TbVersion resources){ return new ResponseEntity<>(tbVersionService.create(resources),HttpStatus.CREATED); } @PutMapping - @Log("修改版本") @ApiOperation("修改版本") public ResponseEntity updateTbVersion(@Validated @RequestBody TbVersion resources){ tbVersionService.update(resources); @@ -44,7 +41,6 @@ public class TbVersionController { } @DeleteMapping - @Log("删除版本") @ApiOperation("删除版本") public ResponseEntity deleteTbVersion(@RequestBody Integer[] ids) { tbVersionService.deleteAll(ids); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbCashierCartController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbCashierCartController.java deleted file mode 100644 index 0f4657a6..00000000 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbCashierCartController.java +++ /dev/null @@ -1,81 +0,0 @@ -/* -* Copyright 2019-2020 Zheng Jie -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -package cn.ysk.cashier.controller.order; - -import cn.ysk.cashier.annotation.Log; -import cn.ysk.cashier.pojo.order.TbCashierCart; -import cn.ysk.cashier.service.order.TbCashierCartService; -import cn.ysk.cashier.dto.order.TbCashierCartQueryCriteria; -import org.springframework.data.domain.Pageable; -import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; - -/** -* @website https://eladmin.vip -* @author lyf -* @date 2024-03-02 -**/ -@RestController -@RequiredArgsConstructor -@Api(tags = "购物车管理") -@RequestMapping("/api/tbCashierCart") -public class TbCashierCartController { - - private final TbCashierCartService tbCashierCartService; - - @Log("导出数据") - @ApiOperation("导出数据") - @GetMapping(value = "/download") - public void exportTbCashierCart(HttpServletResponse response, TbCashierCartQueryCriteria criteria) throws IOException { - tbCashierCartService.download(tbCashierCartService.queryAll(criteria), response); - } - - @GetMapping - @Log("查询购物车") - @ApiOperation("查询购物车") - public ResponseEntity queryTbCashierCart(TbCashierCartQueryCriteria criteria, Pageable pageable){ - return new ResponseEntity<>(tbCashierCartService.queryAll(criteria,pageable),HttpStatus.OK); - } - - @PostMapping - @Log("新增购物车") - @ApiOperation("新增购物车") - public ResponseEntity createTbCashierCart(@Validated @RequestBody TbCashierCart resources){ - return new ResponseEntity<>(tbCashierCartService.create(resources),HttpStatus.CREATED); - } - - @PutMapping - @Log("修改购物车") - @ApiOperation("修改购物车") - public ResponseEntity updateTbCashierCart(@Validated @RequestBody TbCashierCart resources){ - tbCashierCartService.update(resources); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @DeleteMapping - @Log("删除购物车") - @ApiOperation("删除购物车") - public ResponseEntity deleteTbCashierCart(@RequestBody Integer[] ids) { - tbCashierCartService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } -} \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderDetailController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderDetailController.java deleted file mode 100644 index aaad587c..00000000 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderDetailController.java +++ /dev/null @@ -1,81 +0,0 @@ -/* -* Copyright 2019-2020 Zheng Jie -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -package cn.ysk.cashier.controller.order; - -import cn.ysk.cashier.annotation.Log; -import cn.ysk.cashier.pojo.order.TbOrderDetail; -import cn.ysk.cashier.service.order.TbOrderDetailService; -import cn.ysk.cashier.dto.order.TbOrderDetailQueryCriteria; -import org.springframework.data.domain.Pageable; -import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; - -/** -* @website https://eladmin.vip -* @author lyf -* @date 2024-03-02 -**/ -@RestController -@RequiredArgsConstructor -@Api(tags = "订单详情") -@RequestMapping("/api/tbOrderDetail") -public class TbOrderDetailController { - - private final TbOrderDetailService tbOrderDetailService; - - @Log("导出数据") - @ApiOperation("导出数据") - @GetMapping(value = "/download") - public void exportTbOrderDetail(HttpServletResponse response, TbOrderDetailQueryCriteria criteria) throws IOException { - tbOrderDetailService.download(tbOrderDetailService.queryAll(criteria), response); - } - - @GetMapping - @Log("查询订单详情") - @ApiOperation("查询订单详情") - public ResponseEntity queryTbOrderDetail(TbOrderDetailQueryCriteria criteria, Pageable pageable){ - return new ResponseEntity<>(tbOrderDetailService.queryAll(criteria,pageable),HttpStatus.OK); - } - - @PostMapping - @Log("新增订单详情") - @ApiOperation("新增订单详情") - public ResponseEntity createTbOrderDetail(@Validated @RequestBody TbOrderDetail resources){ - return new ResponseEntity<>(tbOrderDetailService.create(resources),HttpStatus.CREATED); - } - - @PutMapping - @Log("修改订单详情") - @ApiOperation("修改订单详情") - public ResponseEntity updateTbOrderDetail(@Validated @RequestBody TbOrderDetail resources){ - tbOrderDetailService.update(resources); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @DeleteMapping - @Log("删除订单详情") - @ApiOperation("删除订单详情") - public ResponseEntity deleteTbOrderDetail(@RequestBody Integer[] ids) { - tbOrderDetailService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } -} \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderInfoController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderInfoController.java index 60a1ad4a..f8cbe8fe 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderInfoController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderInfoController.java @@ -47,7 +47,6 @@ public class TbOrderInfoController { private final TbOrderInfoService tbOrderInfoService; - @Log("导出数据") @ApiOperation("导出数据") @PostMapping(value = "/download") public void exportTbOrderInfo(HttpServletResponse response, @RequestBody TbOrderInfoQueryCriteria criteria) throws IOException { @@ -55,46 +54,40 @@ public class TbOrderInfoController { } @PostMapping("/date") - @Log("查询订单") @ApiOperation("查询订单") public ResponseEntity queryTbOrderInfo(@RequestBody TbOrderInfoQueryCriteria criteria){ return new ResponseEntity<>(tbOrderInfoService.queryAllPage(criteria),HttpStatus.OK); } @PostMapping("/payCount") - @Log("通过shopId查询支付统计") @ApiOperation("通过shopId查询支付统计") public List queryTbOrderPayCount(@RequestBody TbPayCountQueryCriteria criteria){ return tbOrderInfoService.queryTbOrderPayCount(criteria); } @GetMapping("/{id}") - @Log("通过Id查询订单") @ApiOperation("通过Id查询订单") public TbOrderInfoDto queryTbOrderInfo(@PathVariable("id") Integer id){ return tbOrderInfoService.findById(id); } - @PostMapping - @Log("新增订单") - @ApiOperation("新增订单") - public ResponseEntity createTbOrderInfo(@Validated @RequestBody TbOrderInfo resources){ - return new ResponseEntity<>(tbOrderInfoService.create(resources),HttpStatus.CREATED); - } +// @PostMapping +// @ApiOperation("新增订单") +// public ResponseEntity createTbOrderInfo(@Validated @RequestBody TbOrderInfo resources){ +// return new ResponseEntity<>(tbOrderInfoService.create(resources),HttpStatus.CREATED); +// } - @PutMapping - @Log("修改订单") - @ApiOperation("修改订单") - public ResponseEntity updateTbOrderInfo(@Validated @RequestBody TbOrderInfo resources){ - tbOrderInfoService.update(resources); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } +// @PutMapping +// @ApiOperation("修改订单") +// public ResponseEntity updateTbOrderInfo(@Validated @RequestBody TbOrderInfo resources){ +// tbOrderInfoService.update(resources); +// return new ResponseEntity<>(HttpStatus.NO_CONTENT); +// } - @DeleteMapping - @Log("删除订单") - @ApiOperation("删除订单") - public ResponseEntity deleteTbOrderInfo(@RequestBody Integer[] ids) { - tbOrderInfoService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } +// @DeleteMapping +// @ApiOperation("删除订单") +// public ResponseEntity deleteTbOrderInfo(@RequestBody Integer[] ids) { +// tbOrderInfoService.deleteAll(ids); +// return new ResponseEntity<>(HttpStatus.OK); +// } } \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductController.java index 4f1d300b..7862feea 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductController.java @@ -45,7 +45,6 @@ public class TbProductController { private final TbProductService tbProductService; @GetMapping - @Log("查询/product") @ApiOperation("查询/product") public ResponseEntity queryTbProduct(TbProductQueryCriteria criteria){ return new ResponseEntity<>(tbProductService.queryAll(criteria),HttpStatus.OK); @@ -58,13 +57,11 @@ public class TbProductController { } @GetMapping("/{product}") - @Log("查询/product") @ApiOperation("查询/product") public Object queryTbProductInfo(@PathVariable("product") Integer product)throws Exception{ return tbProductService.findByProductId(product); } @GetMapping ("/productList") - @Log("查询/product") @ApiOperation("查询/product") public Object queryTbProductInfo(@RequestParam List productList){ return tbProductService.findByProductList(productList); @@ -72,14 +69,14 @@ public class TbProductController { @PostMapping - @Log("新增/product") + @Log("新增商品:#resources.name") @ApiOperation("新增/product") public ResponseEntity createTbProduct(@Validated @RequestBody TbProductVo resources){ return new ResponseEntity<>(tbProductService.create(resources),HttpStatus.CREATED); } @PutMapping - @Log("修改/product") + @Log("修改商品:#resources.name") @ApiOperation("修改/product") public ResponseEntity updateTbProduct(@Validated @RequestBody TbProductVo resources){ tbProductService.update(resources); @@ -87,7 +84,7 @@ public class TbProductController { } @DeleteMapping - @Log("删除/product") + @Log("删除商品:#ids") @ApiOperation("删除/product") public ResponseEntity deleteTbProduct(@RequestBody Integer[] ids) { tbProductService.deleteAll(ids); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductGroupController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductGroupController.java index 69543865..cf590f76 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductGroupController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductGroupController.java @@ -50,7 +50,6 @@ public class TbProductGroupController { @Resource private TbProductService tbProductService; - @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('tbProductGroup:list')") @@ -59,14 +58,12 @@ public class TbProductGroupController { } @GetMapping - @Log("查询product/group") @ApiOperation("查询product/group") public ResponseEntity queryTbProductGroup(TbProductGroupQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(tbProductGroupService.queryAll(criteria,pageable),HttpStatus.OK); } @GetMapping("/{productGroup}") - @Log("查询product/group") @ApiOperation("查询product/group") public ResponseEntity queryTbProductGroup(@PathVariable("productGroup") Integer productGroup){ return new ResponseEntity<>(tbProductGroupService.findByIdProduct(productGroup),HttpStatus.OK); @@ -74,23 +71,23 @@ public class TbProductGroupController { @PostMapping - @Log("新增product/group") - @ApiOperation("新增product/group") + @Log("新增商品分组:#resources.name") + @ApiOperation("新增商品分组") public ResponseEntity createTbProductGroup(@Validated @RequestBody TbProductGroup resources){ return new ResponseEntity<>(tbProductGroupService.create(resources),HttpStatus.CREATED); } @PutMapping - @Log("修改product/group") - @ApiOperation("修改product/group") + @Log("修改商品分组:#resources.name") + @ApiOperation("修改商品分组") public ResponseEntity updateTbProductGroup(@Validated @RequestBody TbProductGroup resources){ tbProductGroupService.update(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @DeleteMapping - @Log("删除product/group") - @ApiOperation("删除product/group") + @Log("删除商品分组:#ids") + @ApiOperation("删除商品分组") public ResponseEntity deleteTbProductGroup(@RequestBody Integer[] ids) { tbProductGroupService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); @@ -111,6 +108,7 @@ public class TbProductGroupController { * @param userName * @return */ + @Log("商品分组增加商品") @PostMapping("/addProductInfo") public ResponseEntity addProductInfo(@RequestBody AddProduct addProduct,@RequestAttribute(value = "userName", required = false) String userName){ return new ResponseEntity<>(tbProductGroupService.updateProductIds(addProduct,userName),HttpStatus.OK); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductSkuController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductSkuController.java index 421e3f27..e5463176 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductSkuController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductSkuController.java @@ -43,7 +43,6 @@ public class TbProductSkuController { private final TbProductSkuService tbProductSkuService; - @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('tbProductSku:list')") @@ -52,7 +51,6 @@ public class TbProductSkuController { } @GetMapping - @Log("查询/product/sku") @ApiOperation("查询/product/sku") @PreAuthorize("@el.check('tbProductSku:list')") public ResponseEntity queryTbProductSku(TbProductSkuQueryCriteria criteria, Pageable pageable){ @@ -60,7 +58,6 @@ public class TbProductSkuController { } @PostMapping - @Log("新增/product/sku") @ApiOperation("新增/product/sku") @PreAuthorize("@el.check('tbProductSku:add')") public ResponseEntity createTbProductSku(@Validated @RequestBody TbProductSku resources){ @@ -68,7 +65,6 @@ public class TbProductSkuController { } @PutMapping - @Log("修改/product/sku") @ApiOperation("修改/product/sku") @PreAuthorize("@el.check('tbProductSku:edit')") public ResponseEntity updateTbProductSku(@Validated @RequestBody TbProductSku resources){ @@ -77,7 +73,6 @@ public class TbProductSkuController { } @DeleteMapping - @Log("删除/product/sku") @ApiOperation("删除/product/sku") @PreAuthorize("@el.check('tbProductSku:del')") public ResponseEntity deleteTbProductSku(@RequestBody Integer[] ids) { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductSkuResultController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductSkuResultController.java index c83f85f1..65ee7e8d 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductSkuResultController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductSkuResultController.java @@ -43,7 +43,6 @@ public class TbProductSkuResultController { private final TbProductSkuResultService tbProductSkuResultService; - @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('tbProductSkuResult:list')") @@ -52,7 +51,6 @@ public class TbProductSkuResultController { } @GetMapping - @Log("查询/skuResult") @ApiOperation("查询/skuResult") @PreAuthorize("@el.check('tbProductSkuResult:list')") public ResponseEntity queryTbProductSkuResult(TbProductSkuResultQueryCriteria criteria, Pageable pageable){ @@ -60,7 +58,6 @@ public class TbProductSkuResultController { } @PostMapping - @Log("新增/skuResult") @ApiOperation("新增/skuResult") @PreAuthorize("@el.check('tbProductSkuResult:add')") public ResponseEntity createTbProductSkuResult(@Validated @RequestBody TbProductSkuResult resources){ @@ -68,7 +65,6 @@ public class TbProductSkuResultController { } @PutMapping - @Log("修改/skuResult") @ApiOperation("修改/skuResult") @PreAuthorize("@el.check('tbProductSkuResult:edit')") public ResponseEntity updateTbProductSkuResult(@Validated @RequestBody TbProductSkuResult resources){ @@ -77,7 +73,6 @@ public class TbProductSkuResultController { } @DeleteMapping - @Log("删除/skuResult") @ApiOperation("删除/skuResult") @PreAuthorize("@el.check('tbProductSkuResult:del')") public ResponseEntity deleteTbProductSkuResult(@RequestBody Integer[] ids) { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductSpecController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductSpecController.java index 29bc2b10..5db4264b 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductSpecController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductSpecController.java @@ -44,7 +44,6 @@ public class TbProductSpecController { private final TbProductSpecService tbProductSpecService; - @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('tbProductSpec:list')") @@ -53,21 +52,20 @@ public class TbProductSpecController { } @GetMapping - @Log("查询product/spec") @ApiOperation("查询product/spec") public ResponseEntity queryTbProductSpec(TbProductSpecQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(tbProductSpecService.queryAll(criteria,pageable),HttpStatus.OK); } @PostMapping - @Log("新增product/spec") + @Log("新增商品规格:#resources.name") @ApiOperation("新增product/spec") public ResponseEntity createTbProductSpec(@Validated @RequestBody SpecDto resources){ return new ResponseEntity<>(tbProductSpecService.create(resources),HttpStatus.CREATED); } @PutMapping - @Log("修改product/spec") + @Log("修改商品规格:#resources.name") @ApiOperation("修改product/spec") public ResponseEntity updateTbProductSpec(@Validated @RequestBody TbProductSpec resources){ tbProductSpecService.update(resources); @@ -75,7 +73,7 @@ public class TbProductSpecController { } @DeleteMapping - @Log("删除product/spec") + @Log("删除商品规格:#ids") @ApiOperation("删除product/spec") public ResponseEntity deleteTbProductSpec(@RequestBody Integer[] ids) { tbProductSpecService.deleteAll(ids); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockDetailController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockDetailController.java index 369beb72..7bd4110e 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockDetailController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockDetailController.java @@ -43,7 +43,6 @@ public class TbProductStockDetailController { private final TbProductStockDetailService tbProductStockDetailService; - @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") public void exportTbProductStockDetail(HttpServletResponse response, TbProductStockDetailQueryCriteria criteria) throws IOException { @@ -51,20 +50,17 @@ public class TbProductStockDetailController { } @GetMapping - @Log("查询/product/Stock") @ApiOperation("查询/product/Stock") public ResponseEntity queryTbProductStockDetail(TbProductStockDetailQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(tbProductStockDetailService.queryAll(criteria,pageable),HttpStatus.OK); } @PostMapping("/stock") - @Log("查询/product/Stock") @ApiOperation("查询/product/Stock") public ResponseEntity queryPage(@RequestBody TbProductStockDetailQueryCriteria criteria){ return new ResponseEntity<>(tbProductStockDetailService.queryPage(criteria),HttpStatus.OK); } @GetMapping("/sum") - @Log("查询/product/Stock") public ResponseEntity sumType(TbProductStockDetailQueryCriteria criteria){ return new ResponseEntity<>(tbProductStockDetailService.sumStockNumber(criteria.getProductId()),HttpStatus.OK); } @@ -76,14 +72,13 @@ public class TbProductStockDetailController { * @return */ @PostMapping - @Log("新增/product/Stock") + @Log("出入库:#resources.productName") @ApiOperation("新增/product/Stock") public ResponseEntity createTbProductStockDetail(@Validated @RequestBody TbProductStockDetail resources){ return new ResponseEntity<>(tbProductStockDetailService.create(resources),HttpStatus.CREATED); } @PutMapping - @Log("修改/product/Stock") @ApiOperation("修改/product/Stock") public ResponseEntity updateTbProductStockDetail(@Validated @RequestBody TbProductStockDetail resources){ tbProductStockDetailService.update(resources); @@ -91,7 +86,6 @@ public class TbProductStockDetailController { } @DeleteMapping - @Log("删除/product/Stock") @ApiOperation("删除/product/Stock") public ResponseEntity deleteTbProductStockDetail(@RequestBody Long[] ids) { tbProductStockDetailService.deleteAll(ids); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockOperateController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockOperateController.java index a327c874..8c0fe476 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockOperateController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockOperateController.java @@ -43,7 +43,6 @@ public class TbProductStockOperateController { private final TbProductStockOperateService tbProductStockOperateService; - @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('tbProductStockOperate:list')") @@ -69,7 +68,6 @@ public class TbProductStockOperateController { @PostMapping - @Log("新增/product/StockOperate") @ApiOperation("新增/product/StockOperate") @PreAuthorize("@el.check('tbProductStockOperate:add')") public ResponseEntity createTbProductStockOperate(@Validated @RequestBody TbProductStockOperate resources){ @@ -77,7 +75,6 @@ public class TbProductStockOperateController { } @PostMapping("/outAndOn") - @Log("新增/product/StockOperate") @ApiOperation("新增/product/StockOperate") // @PreAuthorize("@el.check('tbProductStockOperate:add')") public ResponseEntity createOutAndONOperate(@RequestBody OutAndOnDto outAndOnDto){ @@ -85,7 +82,6 @@ public class TbProductStockOperateController { } @PutMapping - @Log("修改/product/StockOperate") @ApiOperation("修改/product/StockOperate") @PreAuthorize("@el.check('tbProductStockOperate:edit')") public ResponseEntity updateTbProductStockOperate(@Validated @RequestBody TbProductStockOperate resources){ @@ -94,7 +90,6 @@ public class TbProductStockOperateController { } @DeleteMapping - @Log("删除/product/StockOperate") @ApiOperation("删除/product/StockOperate") @PreAuthorize("@el.check('tbProductStockOperate:del')") public ResponseEntity deleteTbProductStockOperate(@RequestBody Integer[] ids) { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbShopCategoryController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbShopCategoryController.java index 251253a7..17b41a01 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbShopCategoryController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbShopCategoryController.java @@ -52,21 +52,20 @@ public class TbShopCategoryController { // } @GetMapping - @Log("查询product/category") @ApiOperation("查询product/category") public ResponseEntity queryTbShopCategory(TbShopCategoryQueryCriteria criteria){ return new ResponseEntity<>(tbShopCategoryService.queryAll(criteria),HttpStatus.OK); } @PostMapping - @Log("新增product/category") + @Log("新增商品分类:#resources.name") @ApiOperation("新增product/category") public ResponseEntity createTbShopCategory(@Validated @RequestBody TbShopCategory resources){ return new ResponseEntity<>(tbShopCategoryService.create(resources),HttpStatus.CREATED); } @PutMapping - @Log("修改product/category") + @Log("修改商品分类:#resources.name") @ApiOperation("修改product/category") public ResponseEntity updateTbShopCategory(@Validated @RequestBody TbShopCategory resources){ tbShopCategoryService.update(resources); @@ -74,7 +73,7 @@ public class TbShopCategoryController { } @DeleteMapping - @Log("删除product/category") + @Log("删除商品分类:#ids") @ApiOperation("删除product/category") public ResponseEntity deleteTbShopCategory(@RequestBody Integer[] ids) { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/SummaryByDayController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/SummaryByDayController.java index dbee2ca2..fd15d20c 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/SummaryByDayController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/SummaryByDayController.java @@ -27,7 +27,6 @@ public class SummaryByDayController { @Autowired private SummaryService summaryService; - @Log("导出数据") @ApiOperation("导出数据") @PostMapping(value = "download") public void exportTbOrderInfo(HttpServletResponse response, @RequestBody ShopSummaryDto exportRequest) throws IOException { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbCouponCategoryController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbCouponCategoryController.java new file mode 100644 index 00000000..a6fc4257 --- /dev/null +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbCouponCategoryController.java @@ -0,0 +1,57 @@ +package cn.ysk.cashier.controller.shop; + +import cn.ysk.cashier.annotation.Log; +import cn.ysk.cashier.pojo.shop.TbCouponCategory; +import cn.ysk.cashier.dto.shop.TbCouponCategoryQueryCriteria; +import cn.ysk.cashier.service.shop.TbCouponCategoryService; +import org.springframework.data.domain.Pageable; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.*; + +/** + * @website https://eladmin.vip + * @author ww + * @date 2024-04-25 + **/ +@RestController +@RequiredArgsConstructor +@Api(tags = "团购卷类别管理") +@RequestMapping("/api/tbCouponCategory") +public class TbCouponCategoryController { + + private final TbCouponCategoryService tbCouponCategoryService; + + @GetMapping + @Log("查询团购卷类别") + @ApiOperation("查询团购卷类别") + public ResponseEntity queryTbCouponCategory(TbCouponCategoryQueryCriteria criteria, Pageable pageable){ + return new ResponseEntity<>(tbCouponCategoryService.queryAll(criteria,pageable),HttpStatus.OK); + } + + @PostMapping + @Log("新增团购卷类别") + @ApiOperation("新增团购卷类别") + public ResponseEntity createTbCouponCategory(@Validated @RequestBody TbCouponCategory resources){ + return new ResponseEntity<>(tbCouponCategoryService.create(resources),HttpStatus.CREATED); + } + + @PutMapping + @Log("修改团购卷类别") + @ApiOperation("修改团购卷类别") + public ResponseEntity updateTbCouponCategory(@Validated @RequestBody TbCouponCategory resources){ + tbCouponCategoryService.update(resources); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @DeleteMapping + @Log("删除团购卷类别") + @ApiOperation("删除团购卷类别") + public ResponseEntity deleteTbCouponCategory(@RequestBody Integer[] ids) { + tbCouponCategoryService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantAccountController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantAccountController.java index 60fb7c09..e86ad9e2 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantAccountController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantAccountController.java @@ -43,7 +43,6 @@ public class TbMerchantAccountController { private final TbMerchantAccountService tbMerchantAccountService; - @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('tbMerchantAccount:list')") @@ -52,7 +51,6 @@ public class TbMerchantAccountController { } @GetMapping - @Log("查询/merchant/account") @ApiOperation("查询/merchant/account") @PreAuthorize("@el.check('tbMerchantAccount:list')") public ResponseEntity queryTbMerchantAccount(TbMerchantAccountQueryCriteria criteria, Pageable pageable){ @@ -60,7 +58,6 @@ public class TbMerchantAccountController { } @PostMapping - @Log("新增/merchant/account") @ApiOperation("新增/merchant/account") @PreAuthorize("@el.check('tbMerchantAccount:add')") public ResponseEntity createTbMerchantAccount(@Validated @RequestBody TbMerchantAccount resources){ @@ -68,7 +65,6 @@ public class TbMerchantAccountController { } @PutMapping - @Log("修改/merchant/account") @ApiOperation("修改/merchant/account") @PreAuthorize("@el.check('tbMerchantAccount:edit')") public ResponseEntity updateTbMerchantAccount(@Validated @RequestBody TbMerchantAccount resources){ @@ -77,7 +73,6 @@ public class TbMerchantAccountController { } @DeleteMapping - @Log("删除/merchant/account") @ApiOperation("删除/merchant/account") @PreAuthorize("@el.check('tbMerchantAccount:del')") public ResponseEntity deleteTbMerchantAccount(@RequestBody Integer[] ids) { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantCouponController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantCouponController.java index 91b823bf..00d93cfd 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantCouponController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantCouponController.java @@ -16,9 +16,13 @@ package cn.ysk.cashier.controller.shop; import cn.ysk.cashier.annotation.Log; +import cn.ysk.cashier.dto.shop.TbMerchantCouponDto; import cn.ysk.cashier.pojo.shop.TbMerchantCoupon; +import cn.ysk.cashier.pojo.shop.TbPurchaseNotice; +import cn.ysk.cashier.repository.shop.TbPurchaseNoticeRepository; import cn.ysk.cashier.service.shop.TbMerchantCouponService; import cn.ysk.cashier.dto.shop.TbMerchantCouponQueryCriteria; +import cn.ysk.cashier.service.shop.TbPurchaseNoticeService; import org.springframework.data.domain.Pageable; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; @@ -27,6 +31,8 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.*; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; import javax.servlet.http.HttpServletResponse; /** @@ -41,34 +47,44 @@ import javax.servlet.http.HttpServletResponse; public class TbMerchantCouponController { private final TbMerchantCouponService tbMerchantCouponService; + private final TbPurchaseNoticeRepository noticeRepository; - @Log("导出数据") @ApiOperation("导出数据") public void exportTbMerchantCoupon(HttpServletResponse response, TbMerchantCouponQueryCriteria criteria) throws IOException { tbMerchantCouponService.download(tbMerchantCouponService.queryAll(criteria), response); } @GetMapping - @Log("查询/shop/coupon") public ResponseEntity queryTbMerchantCoupon(TbMerchantCouponQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(tbMerchantCouponService.queryAll(criteria,pageable),HttpStatus.OK); } + @GetMapping("/{id}") + @ApiOperation("查询优惠卷") + public ResponseEntity queryTbMerchantCouponById(@PathVariable("id")Integer id){ + Map result=new HashMap<>(); + TbMerchantCouponDto coupon = tbMerchantCouponService.findById(id); + result.put("coupon",coupon); + TbPurchaseNotice notice = noticeRepository.findByCouponId(id); + result.put("notice",notice); + return new ResponseEntity<>(result,HttpStatus.OK); + } + @PostMapping - @Log("新增/shop/coupon") + @Log("新增商家优惠卷:#resources.title") public ResponseEntity createTbMerchantCoupon(@Validated @RequestBody TbMerchantCoupon resources){ return new ResponseEntity<>(tbMerchantCouponService.create(resources),HttpStatus.CREATED); } @PutMapping - @Log("修改/shop/coupon") + @Log("修改商家优惠卷:#resources.title") public ResponseEntity updateTbMerchantCoupon(@Validated @RequestBody TbMerchantCoupon resources){ tbMerchantCouponService.update(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @DeleteMapping - @Log("删除/shop/coupon") + @Log("删除商家优惠卷:#ids") public ResponseEntity deleteTbMerchantCoupon(@RequestBody Integer[] ids) { tbMerchantCouponService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantRegisterController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantRegisterController.java index 8edcf87e..e146e913 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantRegisterController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantRegisterController.java @@ -50,7 +50,6 @@ public class TbMerchantRegisterController { // } @PostMapping("/list") - @Log("查询/shop/register") @ApiOperation("查询/shop/register") @PreAuthorize("@el.check('tbMerchantRegister:list')") public ResponseEntity queryTbMerchantRegister(@RequestBody TbMerchantRegisterQueryCriteria criteria){ @@ -58,7 +57,6 @@ public class TbMerchantRegisterController { } @PostMapping - @Log("新增/shop/register") @ApiOperation("新增/shop/register") @PreAuthorize("@el.check('tbMerchantRegister:add')") public ResponseEntity createTbMerchantRegister(@Validated @RequestBody TbMerchantRegisterDto resources){ @@ -66,7 +64,6 @@ public class TbMerchantRegisterController { } @PutMapping - @Log("修改/shop/register") @ApiOperation("修改/shop/register") @PreAuthorize("@el.check('tbMerchantRegister:edit')") public ResponseEntity updateTbMerchantRegister(@Validated @RequestBody TbMerchantRegister resources){ @@ -75,7 +72,6 @@ public class TbMerchantRegisterController { } @DeleteMapping - @Log("删除/shop/register") @ApiOperation("删除/shop/register") @PreAuthorize("@el.check('tbMerchantRegister:del')") public ResponseEntity deleteTbMerchantRegister(@RequestBody Integer[] ids) { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantThirdApplyController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantThirdApplyController.java index fa0ddb25..4c6324d2 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantThirdApplyController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantThirdApplyController.java @@ -44,7 +44,6 @@ public class TbMerchantThirdApplyController { private final TbMerchantThirdApplyService tbMerchantThirdApplyService; - @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('tbMerchantThirdApply:list')") @@ -53,9 +52,7 @@ public class TbMerchantThirdApplyController { } @GetMapping - @Log("查询/shop/thirdApply") @ApiOperation("查询/shop/thirdApply") - public ResponseEntity queryTbMerchantThirdApply(TbMerchantThirdApplyQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(tbMerchantThirdApplyService.queryAll(criteria,pageable),HttpStatus.OK); } @@ -70,7 +67,6 @@ public class TbMerchantThirdApplyController { } @PostMapping - @Log("新增/shop/thirdApply") @ApiOperation("新增/shop/thirdApply") @PreAuthorize("@el.check('tbMerchantThirdApply:add')") public ResponseEntity createTbMerchantThirdApply(@Validated @RequestBody TbMerchantThirdApply resources){ @@ -78,7 +74,6 @@ public class TbMerchantThirdApplyController { } @PutMapping - @Log("修改/shop/thirdApply") @ApiOperation("修改/shop/thirdApply") @PreAuthorize("@el.check('tbMerchantThirdApply:edit')") public ResponseEntity updateTbMerchantThirdApply(@Validated @RequestBody TbMerchantThirdApply resources){ @@ -87,7 +82,6 @@ public class TbMerchantThirdApplyController { } @DeleteMapping - @Log("删除/shop/thirdApply") @ApiOperation("删除/shop/thirdApply") @PreAuthorize("@el.check('tbMerchantThirdApply:del')") public ResponseEntity deleteTbMerchantThirdApply(@RequestBody Integer[] ids) { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPlussShopStaffController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPlussShopStaffController.java index f0e28ecc..ec8dd15f 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPlussShopStaffController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPlussShopStaffController.java @@ -19,6 +19,7 @@ import cn.ysk.cashier.annotation.Log; import cn.ysk.cashier.pojo.shop.TbPlussShopStaff; import cn.ysk.cashier.service.shop.TbPlussShopStaffService; import cn.ysk.cashier.dto.shop.TbPlussShopStaffQueryCriteria; +import io.swagger.models.auth.In; import org.springframework.data.domain.Pageable; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; @@ -42,7 +43,6 @@ public class TbPlussShopStaffController { private final TbPlussShopStaffService tbPlussShopStaffService; - @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") public void exportTbPlussShopStaff(HttpServletResponse response, TbPlussShopStaffQueryCriteria criteria) throws IOException { @@ -50,21 +50,26 @@ public class TbPlussShopStaffController { } @GetMapping - @Log("查询/shop/shopStaff") @ApiOperation("查询/shop/shopStaff") public ResponseEntity queryTbPlussShopStaff(TbPlussShopStaffQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(tbPlussShopStaffService.queryAll(criteria,pageable),HttpStatus.OK); } + @GetMapping("/{id}") + @ApiOperation("查询/shop/shopStaff") + public ResponseEntity queryShopStaffByid(@PathVariable("id") Integer id){ + return new ResponseEntity<>(tbPlussShopStaffService.findById(id),HttpStatus.OK); + } + @PostMapping - @Log("新增/shop/shopStaff") + @Log("新增员工:#resources.name") @ApiOperation("新增/shop/shopStaff") public ResponseEntity createTbPlussShopStaff(@Validated @RequestBody TbPlussShopStaff resources){ return new ResponseEntity<>(tbPlussShopStaffService.create(resources),HttpStatus.CREATED); } @PutMapping - @Log("修改/shop/shopStaff") + @Log("修改员工:#resources.name") @ApiOperation("修改/shop/shopStaff") public ResponseEntity updateTbPlussShopStaff(@Validated @RequestBody TbPlussShopStaff resources){ tbPlussShopStaffService.update(resources); @@ -72,7 +77,7 @@ public class TbPlussShopStaffController { } @DeleteMapping - @Log("删除/shop/shopStaff") + @Log("删除员工:#ids") @ApiOperation("删除/shop/shopStaff") public ResponseEntity deleteTbPlussShopStaff(@RequestBody Integer[] ids) { tbPlussShopStaffService.deleteAll(ids); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPrintMachineController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPrintMachineController.java index 93e67ade..3776a22d 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPrintMachineController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPrintMachineController.java @@ -48,14 +48,13 @@ public class TbPrintMachineController { // } @GetMapping - @Log("查询/shop/print") @ApiOperation("查询/shop/print") public ResponseEntity queryTbPrintMachine(TbPrintMachineQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(tbPrintMachineService.queryAll(criteria,pageable),HttpStatus.OK); } @PostMapping - @Log("新增/shop/print") + @Log("新增打印机:#resources.name") @ApiOperation("新增/shop/print") public ResponseEntity createTbPrintMachine(@Validated @RequestBody PrintMachineDto resources){ return new ResponseEntity<>(tbPrintMachineService.create(resources),HttpStatus.CREATED); @@ -66,7 +65,7 @@ public class TbPrintMachineController { } @PutMapping - @Log("修改/shop/print") + @Log("修改打印机:#resources.name") @ApiOperation("修改/shop/print") public ResponseEntity updateTbPrintMachine(@Validated @RequestBody PrintMachineDto resources){ tbPrintMachineService.update(resources); @@ -74,7 +73,7 @@ public class TbPrintMachineController { } @DeleteMapping - @Log("删除/shop/print") + @Log("删除打印机:#ids") @ApiOperation("删除/shop/print") public ResponseEntity deleteTbPrintMachine(@RequestBody Integer[] ids) { tbPrintMachineService.deleteAll(ids); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPurchaseNoticeController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPurchaseNoticeController.java new file mode 100644 index 00000000..18d30086 --- /dev/null +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPurchaseNoticeController.java @@ -0,0 +1,43 @@ +package cn.ysk.cashier.controller.shop; + +import cn.ysk.cashier.pojo.shop.TbPurchaseNotice; +import cn.ysk.cashier.service.shop.TbPurchaseNoticeService; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.*; + +/** + * @author ww + * @date 2024-04-25 + **/ +@RestController +@RequiredArgsConstructor +@Api(tags = "购买须知/价格说明管理") +@RequestMapping("/api/tbPurchaseNotice") +public class TbPurchaseNoticeController { + + private final TbPurchaseNoticeService tbPurchaseNoticeService; + + @PostMapping + @ApiOperation("新增购买须知/价格说明") + public ResponseEntity createTbPurchaseNotice(@Validated @RequestBody TbPurchaseNotice resources){ + return new ResponseEntity<>(tbPurchaseNoticeService.create(resources),HttpStatus.CREATED); + } + + @PutMapping + @ApiOperation("修改购买须知/价格说明") + public ResponseEntity updateTbPurchaseNotice(@Validated @RequestBody TbPurchaseNotice resources){ + tbPurchaseNoticeService.update(resources); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @DeleteMapping + @ApiOperation("删除购买须知/价格说明") + public ResponseEntity deleteTbPurchaseNotice(@RequestBody Integer[] ids) { + tbPurchaseNoticeService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbReceiptSalesController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbReceiptSalesController.java index c019be66..9681be81 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbReceiptSalesController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbReceiptSalesController.java @@ -43,7 +43,6 @@ public class TbReceiptSalesController { private final TbReceiptSalesService tbReceiptSalesService; - @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('tbReceiptSales:list')") @@ -52,7 +51,6 @@ public class TbReceiptSalesController { } @GetMapping - @Log("查询/shop/receiptSales") @ApiOperation("查询/shop/receiptSales") @PreAuthorize("@el.check('tbReceiptSales:list')") public ResponseEntity queryTbReceiptSales(TbReceiptSalesQueryCriteria criteria, Pageable pageable){ @@ -60,7 +58,6 @@ public class TbReceiptSalesController { } @GetMapping("/{shopId}") - @Log("查询/shop/receiptSales") @ApiOperation("查询/shop/receiptSales") @PreAuthorize("@el.check('tbReceiptSales:info')") public Object queryTbReceiptSalesInfo(@PathVariable("shopId")Integer shopId){ @@ -70,7 +67,6 @@ public class TbReceiptSalesController { @PostMapping - @Log("新增/shop/receiptSales") @ApiOperation("新增/shop/receiptSales") @PreAuthorize("@el.check('tbReceiptSales:add')") public ResponseEntity createTbReceiptSales(@Validated @RequestBody TbReceiptSales resources){ @@ -78,7 +74,6 @@ public class TbReceiptSalesController { } @PutMapping - @Log("修改/shop/receiptSales") @ApiOperation("修改/shop/receiptSales") @PreAuthorize("@el.check('tbReceiptSales:edit')") public ResponseEntity updateTbReceiptSales(@Validated @RequestBody TbReceiptSales resources){ @@ -87,7 +82,6 @@ public class TbReceiptSalesController { } @DeleteMapping - @Log("删除/shop/receiptSales") @ApiOperation("删除/shop/receiptSales") @PreAuthorize("@el.check('tbReceiptSales:del')") public ResponseEntity deleteTbReceiptSales(@RequestBody Integer[] ids) { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopAreaController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopAreaController.java index 25f27a37..f93439ba 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopAreaController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopAreaController.java @@ -43,7 +43,6 @@ public class TbShopAreaController { private final TbShopAreaService tbShopAreaService; - @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('tbShopArea:list')") @@ -52,21 +51,20 @@ public class TbShopAreaController { } @GetMapping - @Log("查询/shop/area") @ApiOperation("查询/shop/area") public ResponseEntity queryTbShopArea(TbShopAreaQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(tbShopAreaService.queryAll(criteria,pageable),HttpStatus.OK); } @PostMapping - @Log("新增/shop/area") + @Log("新增区域:#resources.name") @ApiOperation("新增/shop/area") public ResponseEntity createTbShopArea(@Validated @RequestBody TbShopArea resources){ return new ResponseEntity<>(tbShopAreaService.create(resources),HttpStatus.CREATED); } @PutMapping - @Log("修改/shop/area") + @Log("修改区域:#resources.name") @ApiOperation("修改/shop/area") public ResponseEntity updateTbShopArea(@Validated @RequestBody TbShopArea resources){ tbShopAreaService.update(resources); @@ -74,7 +72,7 @@ public class TbShopAreaController { } @DeleteMapping - @Log("删除/shop/area") + @Log("删除区域:#ids") @ApiOperation("删除/shop/area") public ResponseEntity deleteTbShopArea(@RequestBody Integer[] ids) { tbShopAreaService.deleteAll(ids); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopCashSpreadController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopCashSpreadController.java index 5d5fd9ef..5fa647ef 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopCashSpreadController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopCashSpreadController.java @@ -44,7 +44,6 @@ public class TbShopCashSpreadController { private final TbShopCashSpreadService tbShopCashSpreadService; - @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('tbShopCashSpread:list')") @@ -53,14 +52,12 @@ public class TbShopCashSpreadController { } @GetMapping - @Log("查询/shop/spread") @ApiOperation("查询/shop/spread") @PreAuthorize("@el.check('tbShopCashSpread:list')") public ResponseEntity queryTbShopCashSpread(TbShopCashSpreadQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(tbShopCashSpreadService.queryAll(criteria,pageable),HttpStatus.OK); } @GetMapping("/{shopId}") - @Log("查询/shop/spread/info") @ApiOperation("查询/shop/spread/info") @PreAuthorize("@el.check('tbShopCashSpread:info')") public Object queryTbShopCashSpreadInfo(@PathVariable("shopId") Integer shopId){ @@ -69,7 +66,6 @@ public class TbShopCashSpreadController { return StringUtils.stringChangeMap(screenConfig); } @PostMapping - @Log("新增/shop/spread") @ApiOperation("新增/shop/spread") @PreAuthorize("@el.check('tbShopCashSpread:add')") public ResponseEntity createTbShopCashSpread(@Validated @RequestBody TbShopCashSpread resources){ @@ -77,7 +73,6 @@ public class TbShopCashSpreadController { } @PutMapping - @Log("修改/shop/spread") @ApiOperation("修改/shop/spread") @PreAuthorize("@el.check('tbShopCashSpread:edit')") public ResponseEntity updateTbShopCashSpread(@Validated @RequestBody TbShopCashSpread resources){ @@ -91,7 +86,6 @@ public class TbShopCashSpreadController { } @DeleteMapping - @Log("删除/shop/spread") @ApiOperation("删除/shop/spread") @PreAuthorize("@el.check('tbShopCashSpread:del')") public ResponseEntity deleteTbShopCashSpread(@RequestBody String[] ids) { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopCurrencyController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopCurrencyController.java index 8fb2819d..83a579e5 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopCurrencyController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopCurrencyController.java @@ -15,7 +15,6 @@ */ package cn.ysk.cashier.controller.shop; -import cn.ysk.cashier.annotation.Log; import cn.ysk.cashier.pojo.shop.TbShopCurrency; import cn.ysk.cashier.service.shop.TbShopCurrencyService; import cn.ysk.cashier.dto.shop.TbShopCurrencyQueryCriteria; @@ -43,7 +42,6 @@ public class TbShopCurrencyController { private final TbShopCurrencyService tbShopCurrencyService; - @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('tbShopCurrency:list')") @@ -52,28 +50,24 @@ public class TbShopCurrencyController { } @GetMapping - @Log("查询/shop/currency") @ApiOperation("查询/shop/currency") public ResponseEntity queryTbShopCurrency(TbShopCurrencyQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(tbShopCurrencyService.queryAll(criteria,pageable),HttpStatus.OK); } @GetMapping("/{shopId}") - @Log("查询/shop/currency/info") @ApiOperation("查询/shop/currency/info") public Object queryTbShopCurrencyInfo(@PathVariable("shopId") String shopId){ return tbShopCurrencyService.findByShopId(shopId); } @PostMapping - @Log("新增/shop/currency") @ApiOperation("新增/shop/currency") public ResponseEntity createTbShopCurrency(@Validated @RequestBody TbShopCurrency resources){ return new ResponseEntity<>(tbShopCurrencyService.create(resources),HttpStatus.CREATED); } @PutMapping - @Log("修改/shop/currency") @ApiOperation("修改/shop/currency") public ResponseEntity updateTbShopCurrency(@Validated @RequestBody TbShopCurrency resources){ tbShopCurrencyService.update(resources); @@ -81,7 +75,6 @@ public class TbShopCurrencyController { } @DeleteMapping - @Log("删除/shop/currency") @ApiOperation("删除/shop/currency") public ResponseEntity deleteTbShopCurrency(@RequestBody Integer[] ids) { tbShopCurrencyService.deleteAll(ids); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopInfoController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopInfoController.java index e356182a..e5fec78b 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopInfoController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopInfoController.java @@ -59,7 +59,6 @@ public class TbShopInfoController { // } @GetMapping - @Log("查询/shop/list") @ApiOperation("查询/shop/list") @PreAuthorize("@el.check('tbShopInfo:list')") public ResponseEntity queryTbShopInfo(TbShopInfoQueryCriteria criteria){ @@ -67,14 +66,13 @@ public class TbShopInfoController { } @GetMapping("/{shopId}") - @Log("查询/shop/list") @ApiOperation("查询/shop/list") public Object queryInfo(@PathVariable("shopId") Integer shopId){ return tbShopInfoService.findById(shopId); } @PostMapping - @Log("新增/shop/list") + @Log("新增商户:#resources.shopName") @ApiOperation("新增/shop/list") @PreAuthorize("@el.check('tbShopInfo:add')") public ResponseEntity createTbShopInfo(@Validated @RequestBody TbShopInfoDto resources){ @@ -92,7 +90,7 @@ public class TbShopInfoController { } @PutMapping - @Log("修改/shop/list") + @Log("修改商户:#resources.shopName") @ApiOperation("修改/shop/list") public ResponseEntity updateTbShopInfo(@Validated @RequestBody TbShopInfo resources){ tbShopInfoService.update(resources); @@ -100,14 +98,14 @@ public class TbShopInfoController { } @PutMapping("/shop") - @Log("修改/shop/list") + @Log("修改商户:#resources.shopName") public ResponseEntity updateShopInfoShopId(@Validated @RequestBody TbShopInfo resources){ tbShopInfoService.updateShopId(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @DeleteMapping - @Log("删除/shop/list") + @Log("删除商户:#ids") @ApiOperation("删除/shop/list") @PreAuthorize("@el.check('tbShopInfo:del')") public ResponseEntity deleteTbShopInfo(@RequestBody Integer[] ids) { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopPurveyorController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopPurveyorController.java index 92df0e3f..f119086b 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopPurveyorController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopPurveyorController.java @@ -43,7 +43,6 @@ public class TbShopPurveyorController { private final TbShopPurveyorService tbShopPurveyorService; - @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('tbShopPurveyor:list')") @@ -52,21 +51,20 @@ public class TbShopPurveyorController { } @GetMapping - @Log("查询/shop/purveyor") @ApiOperation("查询/shop/purveyor") public ResponseEntity queryTbShopPurveyor(TbShopPurveyorQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(tbShopPurveyorService.queryAll(criteria,pageable),HttpStatus.OK); } @PostMapping - @Log("新增/shop/purveyor") + @Log("新增供应商:#resources.name") @ApiOperation("新增/shop/purveyor") public ResponseEntity createTbShopPurveyor(@Validated @RequestBody TbShopPurveyor resources){ return new ResponseEntity<>(tbShopPurveyorService.create(resources),HttpStatus.CREATED); } @PutMapping - @Log("修改/shop/purveyor") + @Log("修改供应商:#resources.name") @ApiOperation("修改/shop/purveyor") public ResponseEntity updateTbShopPurveyor(@Validated @RequestBody TbShopPurveyor resources){ tbShopPurveyorService.update(resources); @@ -74,7 +72,7 @@ public class TbShopPurveyorController { } @DeleteMapping - @Log("删除/shop/purveyor") + @Log("删除供应商:#ids") @ApiOperation("删除/shop/purveyor") public ResponseEntity deleteTbShopPurveyor(@RequestBody Integer[] ids) { tbShopPurveyorService.deleteAll(ids); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopPurveyorTransactController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopPurveyorTransactController.java index 98dc395b..c51f67ea 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopPurveyorTransactController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopPurveyorTransactController.java @@ -44,7 +44,6 @@ public class TbShopPurveyorTransactController { private final TbShopPurveyorTransactService tbShopPurveyorTransactService; - @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('tbShopPurveyorTransact:list')") @@ -59,7 +58,6 @@ public class TbShopPurveyorTransactController { * @return */ @GetMapping - @Log("查询/shop/purveyorTransact") @ApiOperation("查询/shop/purveyorTransact") public ResponseEntity queryTbShopPurveyorTransactSum(TbShopPurveyorTransactQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(tbShopPurveyorTransactService.queryTransactDate(criteria,pageable),HttpStatus.OK); @@ -71,7 +69,6 @@ public class TbShopPurveyorTransactController { * @return */ @PostMapping("/info") - @Log("查询/shop/purveyorTransact") public ResponseEntity queryPurveyorTransact(@RequestBody TbShopPurveyorTransactQueryCriteria criteria){ return new ResponseEntity<>(tbShopPurveyorTransactService.queryPurveyorTransact(criteria),HttpStatus.OK); } @@ -87,14 +84,12 @@ public class TbShopPurveyorTransactController { } @PostMapping - @Log("新增/shop/purveyorTransact") @ApiOperation("新增/shop/purveyorTransact") public ResponseEntity createTbShopPurveyorTransact(@Validated @RequestBody TbShopPurveyorTransact resources){ return new ResponseEntity<>(tbShopPurveyorTransactService.create(resources),HttpStatus.CREATED); } @PutMapping - @Log("修改/shop/purveyorTransact") @ApiOperation("修改/shop/purveyorTransact") public ResponseEntity updateTbShopPurveyorTransact(@Validated @RequestBody TbShopPurveyorTransact resources){ tbShopPurveyorTransactService.update(resources); @@ -102,7 +97,6 @@ public class TbShopPurveyorTransactController { } @DeleteMapping - @Log("删除/shop/purveyorTransact") @ApiOperation("删除/shop/purveyorTransact") public ResponseEntity deleteTbShopPurveyorTransact(@RequestBody Integer[] ids) { tbShopPurveyorTransactService.deleteAll(ids); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopTableController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopTableController.java index f43e0b3e..feea6fb7 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopTableController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopTableController.java @@ -43,7 +43,6 @@ public class TbShopTableController { private final TbShopTableService tbShopTableService; - @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('tbShopTable:list')") @@ -52,14 +51,13 @@ public class TbShopTableController { } @GetMapping - @Log("查询/shop/table") @ApiOperation("查询/shop/table") public ResponseEntity queryTbShopTable(TbShopTableQueryCriteria criteria){ return new ResponseEntity<>(tbShopTableService.queryAllNoPage(criteria),HttpStatus.OK); } @PostMapping - @Log("新增/shop/table") + @Log("新增台桌:#resources.name") @ApiOperation("新增/shop/table") public ResponseEntity createTbShopTable(@Validated @RequestBody TbShopTable resources){ return new ResponseEntity<>(tbShopTableService.create(resources),HttpStatus.CREATED); @@ -72,7 +70,7 @@ public class TbShopTableController { } @PutMapping - @Log("修改/shop/table") + @Log("修改台桌:#resources.name") @ApiOperation("修改/shop/table") public ResponseEntity updateTbShopTable(@Validated @RequestBody TbShopTable resources){ tbShopTableService.update(resources); @@ -80,7 +78,7 @@ public class TbShopTableController { } @DeleteMapping - @Log("删除/shop/table") + @Log("删除台桌:#ids") @ApiOperation("删除/shop/table") public ResponseEntity deleteTbShopTable(@RequestBody Integer[] ids) { tbShopTableService.deleteAll(ids); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopUnitController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopUnitController.java index 7a38a6f6..b318b2ba 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopUnitController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopUnitController.java @@ -43,7 +43,6 @@ public class TbShopUnitController { private final TbShopUnitService tbShopUnitService; - @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('tbShopUnit:list')") @@ -52,21 +51,20 @@ public class TbShopUnitController { } @GetMapping - @Log("查询/shop/unit") @ApiOperation("查询/shop/unit") public ResponseEntity queryTbShopUnit(TbShopUnitQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(tbShopUnitService.queryAll(criteria,pageable),HttpStatus.OK); } @PostMapping - @Log("新增/shop/unit") + @Log("新增单位:#resources.name") @ApiOperation("新增/shop/unit") public ResponseEntity createTbShopUnit(@Validated @RequestBody TbShopUnit resources)throws Exception{ return new ResponseEntity<>(tbShopUnitService.create(resources),HttpStatus.CREATED); } @PutMapping - @Log("修改/shop/unit") + @Log("修改单位:#resources.name") @ApiOperation("修改/shop/unit") public ResponseEntity updateTbShopUnit(@Validated @RequestBody TbShopUnit resources){ tbShopUnitService.update(resources); @@ -74,7 +72,7 @@ public class TbShopUnitController { } @DeleteMapping - @Log("删除/shop/unit") + @Log("删除单位:#ids") @ApiOperation("删除/shop/unit") public ResponseEntity deleteTbShopUnit(@RequestBody Integer[] ids) { tbShopUnitService.deleteAll(ids); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopUserController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopUserController.java index c479a845..f3e7df54 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopUserController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopUserController.java @@ -42,7 +42,6 @@ public class TbShopUserController { private final TbShopUserService tbShopUserService; - @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") public void exportTbShopUser(HttpServletResponse response, TbShopUserQueryCriteria criteria) throws IOException { @@ -50,14 +49,12 @@ public class TbShopUserController { } @GetMapping - @Log("查询/shop/user") @ApiOperation("查询/shop/user") public ResponseEntity queryTbShopUser(TbShopUserQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(tbShopUserService.queryAll(criteria,pageable),HttpStatus.OK); } @GetMapping("queryAllShopUser") - @Log("查询商家用户") @ApiOperation("查询商家用户") public ResponseEntity queryAllShopUser(TbShopUserQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(tbShopUserService.queryAllShopUser(criteria,pageable),HttpStatus.OK); @@ -65,14 +62,12 @@ public class TbShopUserController { @PostMapping - @Log("新增/shop/user") @ApiOperation("新增/shop/user") public ResponseEntity createTbShopUser(@Validated @RequestBody TbShopUser resources){ return new ResponseEntity<>(tbShopUserService.create(resources),HttpStatus.CREATED); } @PutMapping - @Log("修改/shop/user") @ApiOperation("修改/shop/user") public ResponseEntity updateTbShopUser(@Validated @RequestBody TbShopUser resources){ tbShopUserService.update(resources); @@ -80,7 +75,6 @@ public class TbShopUserController { } @DeleteMapping - @Log("删除/shop/user") @ApiOperation("删除/shop/user") public ResponseEntity deleteTbShopUser(@RequestBody Integer[] ids) { tbShopUserService.deleteAll(ids); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopVideoController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopVideoController.java index 89e12cad..ad8e0443 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopVideoController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopVideoController.java @@ -24,31 +24,29 @@ public class TbShopVideoController { private final TbShopVideoService tbShopVideoService; @GetMapping - @Log("查询商户视频号") @ApiOperation("查询商户视频号") public ResponseEntity queryTbShopVideo(TbShopVideoQueryCriteria criteria){ criteria.setType(3); return new ResponseEntity<>(tbShopVideoService.queryAllPage(criteria), HttpStatus.OK); } + + @GetMapping("/{id}") + @ApiOperation("查询商户视频号") + public Object queryInfo(@PathVariable("id") Integer id){ + return tbShopVideoService.findById(id); + } + + @GetMapping("media") - @Log("查询公众号") @ApiOperation("查询公众号") public ResponseEntity queryMediaPlatform(TbShopVideoQueryCriteria criteria){ criteria.setType(1); return new ResponseEntity<>(tbShopVideoService.queryAllPage(criteria), HttpStatus.OK); } - - @GetMapping("/{id}") - @Log("查询商户视频号") - @ApiOperation("查询商户视频号") - public Object queryInfo(@PathVariable("id") Integer id){ - return tbShopVideoService.findById(id); - } - @PostMapping("media") - @Log("新增公众号") + @Log("新增公众号:#resources.name") @ApiOperation("新增公众号") public ResponseEntity createMediaPlatform(@Validated @RequestBody TbShopVideo resources){ resources.setType(1); @@ -56,7 +54,7 @@ public class TbShopVideoController { } @PostMapping - @Log("新增商户视频号") + @Log("新增商户视频号:#resources.name") @ApiOperation("新增商户视频号") public ResponseEntity createTbShopVideo(@Validated @RequestBody TbShopVideo resources){ resources.setType(3); @@ -64,16 +62,16 @@ public class TbShopVideoController { } @PutMapping - @Log("修改商户视频号") - @ApiOperation("修改商户视频号") + @Log("修改商户视频号:#resources.name") + @ApiOperation("修改商户视频号/公众号管理") public ResponseEntity updateTbShopVideo(@Validated @RequestBody TbShopVideo resources){ tbShopVideoService.update(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @DeleteMapping - @Log("删除商户视频号") - @ApiOperation("删除商户视频号") + @Log("删除商户视频号/公众号管理:#ids") + @ApiOperation("删除资源") public ResponseEntity deleteTbShopVideo(@RequestBody Integer[] ids) { tbShopVideoService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/TbPlatformDictDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/TbPlatformDictDto.java index 97b19589..df3f1aae 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/TbPlatformDictDto.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/TbPlatformDictDto.java @@ -7,30 +7,36 @@ public class TbPlatformDictDto implements Serializable { private Integer id; + /** 标签前小图标 */ + private String shareImg; + /** 描述 */ private String name; + /** 字体色 */ + private String fontColor; + + /** 背景色 */ + private String backColor; + + /** 类型: scan：拉起相机；relative：内部页面；absolute：外链url */ + private String jumpType; + + /** 绝对跳转地址 */ + private String absUrl; + /** 轮播图；首页小菜单； */ private String type; /** 封面图 */ private String coverImg; - /** 分享图 */ - private String shareImg; - /** 视频URL地址 */ private String video; /** 视频封面图 */ private String videoCoverImg; - /** 相对跳转地址 */ - private String relUrl; - - /** 绝对跳转地址 */ - private String absUrl; - /** 创建时间 */ private Long createdAt; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoDto.java index df1b0edf..8f429c25 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoDto.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoDto.java @@ -19,6 +19,7 @@ import cn.ysk.cashier.pojo.order.TbOrderDetail; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.persistence.Column; import java.math.BigDecimal; import java.io.Serializable; import java.util.List; @@ -161,4 +162,10 @@ public class TbOrderInfoDto implements Serializable { private String payRemark; private Integer isRefund; + + private String tableName; + + private String isBuyCoupon; + + private String isUseCoupon; } \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductDto.java index 67d5804e..4a69498d 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductDto.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductDto.java @@ -15,9 +15,8 @@ */ package cn.ysk.cashier.dto.product; -import lombok.Data; import cn.ysk.cashier.pojo.product.TbProductSku; - +import lombok.Data; import java.math.BigDecimal; import java.io.Serializable; import java.util.List; @@ -213,6 +212,11 @@ public class TbProductDto implements Serializable { /** 税率 */ private String taxConfigId; + /** + * 团购卷分类Id + */ + List groupCategoryId; + /** * 商品sku信息 */ diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbCouponCategoryDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbCouponCategoryDto.java new file mode 100644 index 00000000..9cb12988 --- /dev/null +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbCouponCategoryDto.java @@ -0,0 +1,25 @@ +package cn.ysk.cashier.dto.shop; + +import lombok.Data; +import java.sql.Timestamp; +import java.io.Serializable; + +/** + * @author ww + * @date 2024-04-25 + **/ +@Data +public class TbCouponCategoryDto implements Serializable { + + private Integer id; + + /** 分类名称 */ + private String name; + + private Timestamp createTime; + + private Timestamp updateTime; + + /** 0：不展示；1：展示； */ + private Integer status; +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbCouponCategoryQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbCouponCategoryQueryCriteria.java new file mode 100644 index 00000000..e9099b59 --- /dev/null +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbCouponCategoryQueryCriteria.java @@ -0,0 +1,18 @@ +package cn.ysk.cashier.dto.shop; + +import lombok.Data; +import java.util.List; +import cn.ysk.cashier.annotation.Query; + +/** + * @website https://eladmin.vip + * @author ww + * @date 2024-04-25 + **/ +@Data +public class TbCouponCategoryQueryCriteria{ + + @Query(type = Query.Type.INNER_LIKE) + private String name; + +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantCouponDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantCouponDto.java index 9060c0c7..8170f15d 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantCouponDto.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantCouponDto.java @@ -123,4 +123,5 @@ public class TbMerchantCouponDto implements Serializable { /** 商户Id */ private String merchantId; + private String categoryId; } \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPlussShopStaffDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPlussShopStaffDto.java index af23511b..c5045081 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPlussShopStaffDto.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPlussShopStaffDto.java @@ -15,6 +15,7 @@ */ package cn.ysk.cashier.dto.shop; +import cn.ysk.cashier.system.service.dto.UserDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -57,6 +58,19 @@ public class TbPlussShopStaffDto implements Serializable { /** shopId */ private String shopId; + /** + * 是否允许管理端端登录 + * 0：不允许；1：允许 + */ + private Integer isManage; + + /** + * 是否允许pc端登录 + * 0：不允许；1：允许 + */ + private Integer isPc; + + private UserDto user; private Long createdAt; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPlussShopStaffQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPlussShopStaffQueryCriteria.java index 801e4726..c90914ea 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPlussShopStaffQueryCriteria.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPlussShopStaffQueryCriteria.java @@ -29,4 +29,8 @@ public class TbPlussShopStaffQueryCriteria{ /** 精确 */ @Query private String shopId; + + //指定为员工 + @Query + private String type="staff"; } \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPurchaseNoticeDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPurchaseNoticeDto.java new file mode 100644 index 00000000..4f013f1a --- /dev/null +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPurchaseNoticeDto.java @@ -0,0 +1,48 @@ +package cn.ysk.cashier.dto.shop; + +import lombok.Data; +import java.io.Serializable; + +/** + * @author ww + * @date 2024-04-25 + **/ +@Data +public class TbPurchaseNoticeDto implements Serializable { + + /** 自增 */ + private Integer id; + + /** 商户卷Id */ + private Integer couponId; + + /** 使用日期说明 */ + private String dateUsed; + + /** 可用时间说明 */ + private String availableTime; + + /** 预约方式 */ + private String bookingType; + + /** 退款说明 */ + private String refundPolicy; + + /** 使用规则(富文本) */ + private String usageRules; + + /** 发票说明 */ + private String invoiceInfo; + + /** 团购价说明 */ + private String groupPurInfo; + + /** 门市价/划线价说明 */ + private String marketPriceInfo; + + /** 折扣说明 */ + private String discountInfo; + + /** 平台温馨提示 */ + private String platformTips; +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopUserDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopUserDto.java index 0f6ca19d..d29ea5b6 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopUserDto.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopUserDto.java @@ -15,6 +15,7 @@ */ package cn.ysk.cashier.dto.shop; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; import java.io.Serializable; @@ -93,6 +94,9 @@ public class TbShopUserDto implements Serializable { /** 是否股东（分销商） */ private Integer isShareholder; + /** 是否参与优惠券活动 true false */ + private String isOpenYhq; + /** 层级1-顶级 2-次级 3最低 */ private Integer level; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mapper/product/TbProductMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/product/TbProductMapper.java index be839f5a..430be901 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mapper/product/TbProductMapper.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/product/TbProductMapper.java @@ -18,9 +18,13 @@ package cn.ysk.cashier.mapper.product; import cn.ysk.cashier.base.BaseMapper; import cn.ysk.cashier.pojo.product.TbProduct; import cn.ysk.cashier.dto.product.TbProductDto; +import cn.ysk.cashier.utils.ListUtil; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; +import java.util.List; +import java.util.stream.Collectors; + /** * @website https://eladmin.vip * @author lyf @@ -28,5 +32,18 @@ import org.mapstruct.ReportingPolicy; **/ @Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) public interface TbProductMapper extends BaseMapper { + default List map(String value) { + return ListUtil.stringChangeIntegerList(value); + } + // 如果需要从DTO转回实体，也可能需要实现反向的映射方法 + default String map(List values) { + if (values == null || values.isEmpty()) { + return ""; + } + // 将整数列表转换为由逗号分隔的字符串 + return values.stream() + .map(String::valueOf) + .collect(Collectors.joining(",")); + } } \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbCouponCategoryMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbCouponCategoryMapper.java new file mode 100644 index 00000000..e27c3a76 --- /dev/null +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbCouponCategoryMapper.java @@ -0,0 +1,17 @@ +package cn.ysk.cashier.mapper.shop; + +//import base.cn.ysk.cashier.BaseMapper; +import cn.ysk.cashier.base.BaseMapper; +import cn.ysk.cashier.dto.shop.TbCouponCategoryDto; +import cn.ysk.cashier.pojo.shop.TbCouponCategory; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +/** + * @author ww + * @date 2024-04-25 + **/ +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface TbCouponCategoryMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbPrintMachineMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbPrintMachineMapper.java index d2d8b14f..25b5e5da 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbPrintMachineMapper.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbPrintMachineMapper.java @@ -16,7 +16,7 @@ package cn.ysk.cashier.mapper.shop; import cn.ysk.cashier.base.BaseMapper; -import cn.ysk.cashier.controller.shop.TbPrintMachine; +import cn.ysk.cashier.pojo.shop.TbPrintMachine; import cn.ysk.cashier.dto.shop.TbPrintMachineDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbPurchaseNoticeMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbPurchaseNoticeMapper.java new file mode 100644 index 00000000..cce04c6d --- /dev/null +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbPurchaseNoticeMapper.java @@ -0,0 +1,17 @@ +package cn.ysk.cashier.mapper.shop; + +import cn.ysk.cashier.base.BaseMapper; +import cn.ysk.cashier.dto.shop.TbPurchaseNoticeDto; +import cn.ysk.cashier.pojo.shop.TbPurchaseNotice; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +/** + * @website https://eladmin.vip + * @author ww + * @date 2024-04-25 + **/ +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface TbPurchaseNoticeMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/AppController.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/AppController.java index 8b187a2f..4cbba00d 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/AppController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/AppController.java @@ -58,7 +58,6 @@ public class AppController { return new ResponseEntity<>(appService.queryAll(criteria,pageable),HttpStatus.OK); } - @Log("新增应用") @ApiOperation(value = "新增应用") @PostMapping @PreAuthorize("@el.check('app:add')") @@ -67,7 +66,6 @@ public class AppController { return new ResponseEntity<>(HttpStatus.CREATED); } - @Log("修改应用") @ApiOperation(value = "修改应用") @PutMapping @PreAuthorize("@el.check('app:edit')") @@ -76,7 +74,6 @@ public class AppController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @Log("删除应用") @ApiOperation(value = "删除应用") @DeleteMapping @PreAuthorize("@el.check('app:del')") diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/DatabaseController.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/DatabaseController.java index 151d755e..2fb7cfeb 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/DatabaseController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/DatabaseController.java @@ -66,7 +66,6 @@ public class DatabaseController { return new ResponseEntity<>(databaseService.queryAll(criteria,pageable),HttpStatus.OK); } - @Log("新增数据库") @ApiOperation(value = "新增数据库") @PostMapping @PreAuthorize("@el.check('database:add')") @@ -75,7 +74,6 @@ public class DatabaseController { return new ResponseEntity<>(HttpStatus.CREATED); } - @Log("修改数据库") @ApiOperation(value = "修改数据库") @PutMapping @PreAuthorize("@el.check('database:edit')") @@ -84,7 +82,6 @@ public class DatabaseController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @Log("删除数据库") @ApiOperation(value = "删除数据库") @DeleteMapping @PreAuthorize("@el.check('database:del')") @@ -93,7 +90,6 @@ public class DatabaseController { return new ResponseEntity<>(HttpStatus.OK); } - @Log("测试数据库链接") @ApiOperation(value = "测试数据库链接") @PostMapping("/testConnect") @PreAuthorize("@el.check('database:testConnect')") @@ -101,7 +97,6 @@ public class DatabaseController { return new ResponseEntity<>(databaseService.testConnection(resources),HttpStatus.CREATED); } - @Log("执行SQL脚本") @ApiOperation(value = "执行SQL脚本") @PostMapping(value = "/upload") @PreAuthorize("@el.check('database:add')") diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/DeployController.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/DeployController.java index 9cfd48ba..651a5b9f 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/DeployController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/DeployController.java @@ -68,7 +68,6 @@ public class DeployController { return new ResponseEntity<>(deployService.queryAll(criteria,pageable),HttpStatus.OK); } - @Log("新增部署") @ApiOperation(value = "新增部署") @PostMapping @PreAuthorize("@el.check('deploy:add')") @@ -77,7 +76,6 @@ public class DeployController { return new ResponseEntity<>(HttpStatus.CREATED); } - @Log("修改部署") @ApiOperation(value = "修改部署") @PutMapping @PreAuthorize("@el.check('deploy:edit')") @@ -86,7 +84,6 @@ public class DeployController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @Log("删除部署") @ApiOperation(value = "删除部署") @DeleteMapping @PreAuthorize("@el.check('deploy:del')") @@ -95,7 +92,6 @@ public class DeployController { return new ResponseEntity<>(HttpStatus.OK); } - @Log("上传文件部署") @ApiOperation(value = "上传文件部署") @PostMapping(value = "/upload") @PreAuthorize("@el.check('deploy:edit')") @@ -118,7 +114,6 @@ public class DeployController { map.put("id",fileName); return new ResponseEntity<>(map,HttpStatus.OK); } - @Log("系统还原") @ApiOperation(value = "系统还原") @PostMapping(value = "/serverReduction") @PreAuthorize("@el.check('deploy:edit')") @@ -126,7 +121,6 @@ public class DeployController { String result = deployService.serverReduction(resources); return new ResponseEntity<>(result,HttpStatus.OK); } - @Log("服务运行状态") @ApiOperation(value = "服务运行状态") @PostMapping(value = "/serverStatus") @PreAuthorize("@el.check('deploy:edit')") @@ -134,7 +128,6 @@ public class DeployController { String result = deployService.serverStatus(resources); return new ResponseEntity<>(result,HttpStatus.OK); } - @Log("启动服务") @ApiOperation(value = "启动服务") @PostMapping(value = "/startServer") @PreAuthorize("@el.check('deploy:edit')") @@ -142,7 +135,6 @@ public class DeployController { String result = deployService.startServer(resources); return new ResponseEntity<>(result,HttpStatus.OK); } - @Log("停止服务") @ApiOperation(value = "停止服务") @PostMapping(value = "/stopServer") @PreAuthorize("@el.check('deploy:edit')") diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/DeployHistoryController.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/DeployHistoryController.java index a9ce5c5d..a723ab60 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/DeployHistoryController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/DeployHistoryController.java @@ -56,7 +56,6 @@ public class DeployHistoryController { return new ResponseEntity<>(deployhistoryService.queryAll(criteria,pageable),HttpStatus.OK); } - @Log("删除DeployHistory") @ApiOperation(value = "删除部署历史") @DeleteMapping @PreAuthorize("@el.check('deployHistory:del')") diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/ServerDeployController.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/ServerDeployController.java index 11a1fccd..02b5a651 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/ServerDeployController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/ServerDeployController.java @@ -58,7 +58,6 @@ public class ServerDeployController { return new ResponseEntity<>(serverDeployService.queryAll(criteria,pageable),HttpStatus.OK); } - @Log("新增服务器") @ApiOperation(value = "新增服务器") @PostMapping @PreAuthorize("@el.check('serverDeploy:add')") @@ -67,7 +66,6 @@ public class ServerDeployController { return new ResponseEntity<>(HttpStatus.CREATED); } - @Log("修改服务器") @ApiOperation(value = "修改服务器") @PutMapping @PreAuthorize("@el.check('serverDeploy:edit')") @@ -76,7 +74,6 @@ public class ServerDeployController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @Log("删除服务器") @ApiOperation(value = "删除Server") @DeleteMapping @PreAuthorize("@el.check('serverDeploy:del')") @@ -85,7 +82,6 @@ public class ServerDeployController { return new ResponseEntity<>(HttpStatus.OK); } - @Log("测试连接服务器") @ApiOperation(value = "测试连接服务器") @PostMapping("/testConnect") @PreAuthorize("@el.check('serverDeploy:add')") diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/StorageVo.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/StorageVo.java index 98a9d4ef..e80b91d0 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/StorageVo.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/StorageVo.java @@ -1,4 +1,4 @@ -package me.zhengjie.mybatis.entity; +package cn.ysk.cashier.mybatis.entity; import lombok.Data; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbUserStorage.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbUserStorage.java index a4821d70..1fc09db8 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbUserStorage.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbUserStorage.java @@ -1,4 +1,4 @@ -package me.zhengjie.mybatis.entity; +package cn.ysk.cashier.mybatis.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMerchantAccountMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMerchantAccountMapper.java index 97fa7574..548792b8 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMerchantAccountMapper.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMerchantAccountMapper.java @@ -13,13 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.mybatis.mapper; +package cn.ysk.cashier.mybatis.mapper; +import cn.ysk.cashier.pojo.shop.TbMerchantAccount; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import me.zhengjie.modules.shopInfo.merchantAccount.domain.TbMerchantAccount; -import me.zhengjie.mybatis.entity.TbUserStorage; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; /** * @website https://eladmin.vip diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbProducSkutMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbProducSkutMapper.java index ba8e0856..41598a2e 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbProducSkutMapper.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbProducSkutMapper.java @@ -1,8 +1,7 @@ -package me.zhengjie.mybatis.mapper; +package cn.ysk.cashier.mybatis.mapper; +import cn.ysk.cashier.pojo.product.TbProductSku; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import me.zhengjie.modules.productInfo.product.domain.TbProduct; -import me.zhengjie.modules.productInfo.productSku.domain.TbProductSku; public interface TbProducSkutMapper extends BaseMapper { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbProductMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbProductMapper.java index 0e9c1915..ada95698 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbProductMapper.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbProductMapper.java @@ -1,8 +1,7 @@ -package me.zhengjie.mybatis.mapper; +package cn.ysk.cashier.mybatis.mapper; +import cn.ysk.cashier.pojo.product.TbProduct; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import me.zhengjie.modules.productInfo.product.domain.TbProduct; -import me.zhengjie.mybatis.entity.TbUserStorage; public interface TbProductMapper extends BaseMapper { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbUserStorageMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbUserStorageMapper.java index efa2e1b2..2e175574 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbUserStorageMapper.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbUserStorageMapper.java @@ -1,7 +1,7 @@ -package me.zhengjie.mybatis.mapper; +package cn.ysk.cashier.mybatis.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import me.zhengjie.mybatis.entity.TbUserStorage; +import cn.ysk.cashier.mybatis.entity.TbUserStorage; public interface TbUserStorageMapper extends BaseMapper { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/rest/StorageController.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/rest/StorageController.java index f0f7d3e1..75cf8140 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/rest/StorageController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/rest/StorageController.java @@ -1,11 +1,11 @@ -package me.zhengjie.mybatis.rest; +package cn.ysk.cashier.mybatis.rest; import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; -import me.zhengjie.annotation.Log; -import me.zhengjie.mybatis.entity.StorageVo; -import me.zhengjie.mybatis.service.ShopService; -import me.zhengjie.utils.SecurityUtils; +import cn.ysk.cashier.annotation.Log; +import cn.ysk.cashier.mybatis.entity.StorageVo; +import cn.ysk.cashier.mybatis.service.ShopService; +import cn.ysk.cashier.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/ShopService.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/ShopService.java index 9607cf52..fb0238ff 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/ShopService.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/ShopService.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.mybatis.service; +package cn.ysk.cashier.mybatis.service; -import me.zhengjie.mybatis.entity.StorageVo; +import cn.ysk.cashier.mybatis.entity.StorageVo; import org.springframework.data.domain.Pageable; /** diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/ShopServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/ShopServiceImpl.java index 4f0dd66d..4a35c668 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/ShopServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/ShopServiceImpl.java @@ -13,22 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.mybatis.service.impl; +package cn.ysk.cashier.mybatis.service.impl; +import cn.ysk.cashier.pojo.shop.TbMerchantAccount; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import me.zhengjie.exception.NewBadRequestException; -import me.zhengjie.modules.productInfo.productSku.domain.TbProductSku; -import me.zhengjie.modules.shopInfo.merchantAccount.domain.TbMerchantAccount; -import me.zhengjie.mybatis.entity.StorageVo; -import me.zhengjie.mybatis.entity.TbUserStorage; -import me.zhengjie.mybatis.mapper.TbMerchantAccountMapper; -import me.zhengjie.mybatis.mapper.TbProducSkutMapper; -import me.zhengjie.mybatis.mapper.TbProductMapper; -import me.zhengjie.mybatis.mapper.TbUserStorageMapper; -import me.zhengjie.mybatis.service.ShopService; -import me.zhengjie.utils.*; +import cn.ysk.cashier.exception.NewBadRequestException; +import cn.ysk.cashier.mybatis.entity.StorageVo; +import cn.ysk.cashier.mybatis.entity.TbUserStorage; +import cn.ysk.cashier.mybatis.mapper.TbMerchantAccountMapper; +import cn.ysk.cashier.mybatis.mapper.TbProducSkutMapper; +import cn.ysk.cashier.mybatis.mapper.TbProductMapper; +import cn.ysk.cashier.mybatis.mapper.TbUserStorageMapper; +import cn.ysk.cashier.mybatis.service.ShopService; +import cn.ysk.cashier.utils.*; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/TbPlatformDict.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/TbPlatformDict.java index 9a0e8fe1..7446913f 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/TbPlatformDict.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/TbPlatformDict.java @@ -18,23 +18,39 @@ public class TbPlatformDict implements Serializable { @ApiModelProperty(value = "id") private Integer id; + @Column(name = "`share_img`") + @ApiModelProperty(value = "标签前 小图标") + private String shareImg; + @Column(name = "`name`",nullable = false) @NotBlank @ApiModelProperty(value = "描述") private String name; - @Column(name = "`type`",nullable = false) - @NotBlank - @ApiModelProperty(value = "轮播图；首页小菜单；") - private String type; + @Column(name = "`font_color`") + @ApiModelProperty(value = "字体色") + private String fontColor; + + @Column(name = "`back_color`") + @ApiModelProperty(value = "背景色") + private String backColor; + + @Column(name = "`jump_type`") + @ApiModelProperty(value = "类型: scan：拉起相机；relative：内部页面；absolute：外链url ") + private String jumpType; + + @Column(name = "`abs_url`") + @ApiModelProperty(value = "绝对跳转地址") + private String absUrl; @Column(name = "`cover_img`") @ApiModelProperty(value = "封面图") private String coverImg; - @Column(name = "`share_img`") - @ApiModelProperty(value = "分享图") - private String shareImg; + @Column(name = "`type`",nullable = false) + @NotBlank + @ApiModelProperty(value = "homeDistrict--金刚区（首页） carousel--轮播图 proTag--商品标签 shopTag店铺标签") + private String type; @Column(name = "`video`") @ApiModelProperty(value = "视频URL地址") @@ -44,13 +60,6 @@ public class TbPlatformDict implements Serializable { @ApiModelProperty(value = "视频封面图") private String videoCoverImg; - @Column(name = "`rel_url`") - @ApiModelProperty(value = "相对跳转地址") - private String relUrl; - - @Column(name = "`abs_url`") - @ApiModelProperty(value = "绝对跳转地址") - private String absUrl; @Column(name = "`created_at`") @ApiModelProperty(value = "创建时间") diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderInfo.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderInfo.java index 77305531..bdf13117 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderInfo.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderInfo.java @@ -212,6 +212,17 @@ public class TbOrderInfo implements Serializable { @ApiModelProperty(value = "payRemark") private String payRemark; + @Column(name = "`table_name`") + @ApiModelProperty(value = "桌码") + private String tableName; + + @Column(name = "`is_buy_coupon`") + @ApiModelProperty(value = "是否购买优惠券") + private String isBuyCoupon; + + @Column(name = "`is_use_coupon`") + @ApiModelProperty(value = "是否使用优惠券") + private String isUseCoupon; public void copy(TbOrderInfo source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java index 3714d634..719574f7 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java @@ -311,6 +311,12 @@ public class TbProduct implements Serializable { @Column(name = "spec_table_headers") @ApiModelProperty(value = "specTableHeaders") private String specTableHeaders; + + @Column(name = "group_category_id") + @ApiModelProperty(value = "团购卷分类Id") + private String groupCategoryId; + + public void copy(TbProduct source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java index 9e2a7ce6..12df97c8 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.productInfo.productSku.domain; +package cn.ysk.cashier.pojo.product; import cn.hutool.json.JSON; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbCouponCategory.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbCouponCategory.java new file mode 100644 index 00000000..db5058cd --- /dev/null +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbCouponCategory.java @@ -0,0 +1,46 @@ +package cn.ysk.cashier.pojo.shop; + +import lombok.Data; +import cn.hutool.core.bean.BeanUtil; +import io.swagger.annotations.ApiModelProperty; +import cn.hutool.core.bean.copier.CopyOptions; +import javax.persistence.*; +import java.sql.Timestamp; +import java.io.Serializable; + +/** + * @website https://eladmin.vip + * @description / + * @author ww + * @date 2024-04-25 + **/ +@Entity +@Data +@Table(name="tb_coupon_category") +public class TbCouponCategory implements Serializable { + + @Id + @Column(name = "`id`") + @ApiModelProperty(value = "id") + private Integer id; + + @Column(name = "`name`") + @ApiModelProperty(value = "分类名称") + private String name; + + @Column(name = "`create_time`") + @ApiModelProperty(value = "createTime") + private Timestamp createTime; + + @Column(name = "`update_time`") + @ApiModelProperty(value = "updateTime") + private Timestamp updateTime; + + @Column(name = "`status`") + @ApiModelProperty(value = "0：不展示；1：展示；") + private Integer status; + + public void copy(TbCouponCategory source){ + BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); + } +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbMerchantCoupon.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbMerchantCoupon.java index 79675f92..c700e643 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbMerchantCoupon.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbMerchantCoupon.java @@ -1,24 +1,25 @@ /* -* Copyright 2019-2020 Zheng Jie -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + * Copyright 2019-2020 Zheng Jie + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package cn.ysk.cashier.pojo.shop; import lombok.Data; import cn.hutool.core.bean.BeanUtil; import io.swagger.annotations.ApiModelProperty; import cn.hutool.core.bean.copier.CopyOptions; + import javax.persistence.*; import javax.validation.constraints.*; import java.math.BigDecimal; @@ -26,13 +27,13 @@ import java.io.Serializable; import java.sql.Timestamp; /** -* @website https://eladmin.vip -* @description / -* @author lyf -* @date 2024-03-20 -**/ + * @author lyf + * @website https://eladmin.vip + * @description / + * @date 2024-03-20 + **/ @Entity -@Table(name="tb_merchant_coupon") +@Table(name = "tb_merchant_coupon") public class TbMerchantCoupon implements Serializable { @Id @@ -49,7 +50,7 @@ public class TbMerchantCoupon implements Serializable { @ApiModelProperty(value = " 优惠券名称") private String title; - @Column(name = "`template_id`",nullable = false) + @Column(name = "`template_id`", nullable = false) @NotBlank @ApiModelProperty(value = "templateId") private String templateId = "0"; @@ -78,7 +79,11 @@ public class TbMerchantCoupon implements Serializable { @ApiModelProperty(value = "发放数量") private Integer number; - @Column(name = "`left_number`",nullable = false) + @Column(name = "`use_number`") + @ApiModelProperty(value = "已核销数量") + private Integer useNumber; + + @Column(name = "`left_number`", nullable = false) @ApiModelProperty(value = "剩余数量") private Integer leftNumber; @@ -144,12 +149,12 @@ public class TbMerchantCoupon implements Serializable { @ApiModelProperty(value = "说明") private String note; - @Column(name = "`created_at`",nullable = false) + @Column(name = "`created_at`", nullable = false) @NotNull @ApiModelProperty(value = "createdAt") private Long createdAt; - @Column(name = "`updated_at`",nullable = false) + @Column(name = "`updated_at`", nullable = false) @NotNull @ApiModelProperty(value = "updatedAt") private Long updatedAt; @@ -178,8 +183,12 @@ public class TbMerchantCoupon implements Serializable { @ApiModelProperty(value = "商户Id") private String merchantId; - public void copy(TbMerchantCoupon source){ - BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); + @Column(name = "`category_id`") + @ApiModelProperty(value = "分类id") + private String categoryId; + + public void copy(TbMerchantCoupon source) { + BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true)); } public Integer getId() { @@ -262,6 +271,14 @@ public class TbMerchantCoupon implements Serializable { this.number = number; } + public Integer getUseNumber() { + return useNumber; + } + + public void setUseNumber(Integer useNumber) { + this.useNumber = useNumber; + } + public Integer getLeftNumber() { return leftNumber; } @@ -453,4 +470,12 @@ public class TbMerchantCoupon implements Serializable { public void setMerchantId(String merchantId) { this.merchantId = merchantId; } + + public String getCategoryId() { + return categoryId; + } + + public void setCategoryId(String categoryId) { + this.categoryId = categoryId; + } } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPlussShopStaff.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPlussShopStaff.java index a6bd1189..240e76ec 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPlussShopStaff.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPlussShopStaff.java @@ -81,7 +81,22 @@ public class TbPlussShopStaff implements Serializable { private Long updatedAt; @Column(name = "type") @ApiModelProperty(value = "master商户账号staff员工") - private String type; + private String type="staff"; + + @Column(name = "`is_manage`") + @ApiModelProperty(value = "是否允许管理端登录 0：不允许；1：允许") + private Integer isManage; + + @Column(name = "`is_pc`") + @ApiModelProperty(value = "是否允许pc端登录 0：不允许；1：允许") + private Integer isPc; + + @Transient + private Long roleId; + + @Transient + private String phone; + public void copy(TbPlussShopStaff source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPrintMachine.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPrintMachine.java similarity index 98% rename from eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPrintMachine.java rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPrintMachine.java index dc98786b..9cb43445 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPrintMachine.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPrintMachine.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.ysk.cashier.controller.shop; +package cn.ysk.cashier.pojo.shop; import lombok.Data; import cn.hutool.core.bean.BeanUtil; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPurchaseNotice.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPurchaseNotice.java new file mode 100644 index 00000000..1fe29b48 --- /dev/null +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPurchaseNotice.java @@ -0,0 +1,72 @@ +package cn.ysk.cashier.pojo.shop; + +import lombok.Data; +import cn.hutool.core.bean.BeanUtil; +import io.swagger.annotations.ApiModelProperty; +import cn.hutool.core.bean.copier.CopyOptions; +import javax.persistence.*; +import java.io.Serializable; + +/** + * @author ww + * @date 2024-04-25 + **/ +@Entity +@Data +@Table(name="tb_purchase_notice") +public class TbPurchaseNotice implements Serializable { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "`id`") + @ApiModelProperty(value = "自增") + private Integer id; + + @Column(name = "`coupon_id`") + @ApiModelProperty(value = "商户卷Id") + private Integer couponId; + + @Column(name = "`date_used`") + @ApiModelProperty(value = "使用日期说明") + private String dateUsed; + + @Column(name = "`available_time`") + @ApiModelProperty(value = "可用时间说明") + private String availableTime; + + @Column(name = "`booking_type`") + @ApiModelProperty(value = "预约方式") + private String bookingType; + + @Column(name = "`refund_policy`") + @ApiModelProperty(value = "退款说明") + private String refundPolicy; + + @Column(name = "`usage_rules`") + @ApiModelProperty(value = "使用规则(富文本)") + private String usageRules; + + @Column(name = "`invoice_info`") + @ApiModelProperty(value = "发票说明") + private String invoiceInfo; + + @Column(name = "`group_pur_info`") + @ApiModelProperty(value = "团购价说明") + private String groupPurInfo; + + @Column(name = "`market_price_Info`") + @ApiModelProperty(value = "门市价/划线价说明") + private String marketPriceInfo; + + @Column(name = "`discount_Info`") + @ApiModelProperty(value = "折扣说明") + private String discountInfo; + + @Column(name = "`platform_tips`") + @ApiModelProperty(value = "平台温馨提示") + private String platformTips; + + public void copy(TbPurchaseNotice source){ + BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); + } +} diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java index 535beacf..fe558787 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java @@ -217,9 +217,8 @@ public class TbShopInfo implements Serializable { @Column(name = "profiles") @ApiModelProperty(value = "未激活 no 试用probation 正式release") private String profiles=""; -// @Column(name = "is_open_yhq") -// @ApiModelProperty(value = "是否参与优惠券活动 0否 1是") - @Transient + @Column(name = "is_open_yhq") + @ApiModelProperty(value = "是否参与优惠券活动 true false") private String isOpenYhq; @Column(name = "shop_qrcode") diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbCouponCategoryRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbCouponCategoryRepository.java new file mode 100644 index 00000000..6fc5a19d --- /dev/null +++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbCouponCategoryRepository.java @@ -0,0 +1,13 @@ +package cn.ysk.cashier.repository.shop; + +import cn.ysk.cashier.pojo.shop.TbCouponCategory; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; + +/** + * @website https://eladmin.vip + * @author ww + * @date 2024-04-25 + **/ +public interface TbCouponCategoryRepository extends JpaRepository, JpaSpecificationExecutor { +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbPlussShopStaffRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbPlussShopStaffRepository.java index 5eaa68a4..8675952b 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbPlussShopStaffRepository.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbPlussShopStaffRepository.java @@ -39,4 +39,7 @@ public interface TbPlussShopStaffRepository extends JpaRepository, JpaSpecificationExecutor { + + /** + * 根据 couponId 查询 + * @param couponId couponId + * @return / + */ + TbPurchaseNotice findByCouponId(Integer couponId); +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbVersionServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbVersionServiceImpl.java index c9d29434..d53a7d91 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbVersionServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbVersionServiceImpl.java @@ -80,7 +80,7 @@ public class TbVersionServiceImpl implements TbVersionService { public void update(TbVersion resources) { TbVersion tbVersion = tbVersionRepository.findById(resources.getId()).orElseGet(TbVersion::new); ValidationUtil.isNull(tbVersion.getId(), "TbVersion", "id", resources.getId()); - redisUtils.del5(tbVersion.getSource() + "_VERSION:" + tbVersion.getType() + ":" + tbVersion.getVersion()); + redisUtils.del(tbVersion.getSource() + "_VERSION:" + tbVersion.getType() + ":" + tbVersion.getVersion()); tbVersion.copy(resources); tbVersion.setUpdatedAt(Instant.now().toEpochMilli()); tbVersionRepository.save(tbVersion); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java index 5e83979e..1e8a894b 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java @@ -303,6 +303,7 @@ public class TbProductServiceImpl implements TbProductService { //套餐内容 if (!resources.getGroupSnap().isEmpty()) { product.setGroupSnap(ListUtil.JSONArrayChangeString(resources.getGroupSnap())); + product.setIsCombo(1); } TbProduct save = tbProductRepository.save(product); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbMerchantRegisterServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbMerchantRegisterServiceImpl.java index a3d860b0..08344909 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbMerchantRegisterServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbMerchantRegisterServiceImpl.java @@ -13,26 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.shopInfo.shopRegister.service.impl; +package cn.ysk.cashier.service.impl.shopimpl; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.shopInfo.shopRegister.domain.TbMerchantRegister; -import me.zhengjie.utils.ValidationUtil; -import me.zhengjie.utils.FileUtil; +import cn.ysk.cashier.dto.shop.TbMerchantRegisterDto; +import cn.ysk.cashier.dto.shop.TbMerchantRegisterQueryCriteria; +import cn.ysk.cashier.exception.BadRequestException; +import cn.ysk.cashier.mapper.shop.TbMerchantRegisterMapper; +import cn.ysk.cashier.pojo.shop.TbMerchantRegister; +import cn.ysk.cashier.repository.shop.TbMerchantRegisterRepository; +import cn.ysk.cashier.service.shop.TbMerchantRegisterService; +import cn.ysk.cashier.utils.ValidationUtil; +import cn.ysk.cashier.utils.FileUtil; import lombok.RequiredArgsConstructor; -import me.zhengjie.modules.shopInfo.shopRegister.repository.TbMerchantRegisterRepository; -import me.zhengjie.modules.shopInfo.shopRegister.service.TbMerchantRegisterService; -import me.zhengjie.modules.shopInfo.shopRegister.service.dto.TbMerchantRegisterDto; -import me.zhengjie.modules.shopInfo.shopRegister.service.dto.TbMerchantRegisterQueryCriteria; -import me.zhengjie.modules.shopInfo.shopRegister.service.mapstruct.TbMerchantRegisterMapper; +import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import me.zhengjie.utils.PageUtil; -import me.zhengjie.utils.QueryHelp; +import cn.ysk.cashier.utils.PageUtil; +import cn.ysk.cashier.utils.QueryHelp; import java.time.Instant; import java.util.*; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java index 8780b3a9..010f349c 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java @@ -17,6 +17,13 @@ package cn.ysk.cashier.service.impl.shopimpl; import cn.ysk.cashier.exception.BadRequestException; import cn.ysk.cashier.pojo.shop.TbPlussShopStaff; +import cn.ysk.cashier.system.domain.Dept; +import cn.ysk.cashier.system.domain.Job; +import cn.ysk.cashier.system.domain.Role; +import cn.ysk.cashier.system.domain.User; +import cn.ysk.cashier.system.repository.UserRepository; +import cn.ysk.cashier.system.service.UserService; +import cn.ysk.cashier.system.service.dto.UserDto; import cn.ysk.cashier.utils.*; import lombok.RequiredArgsConstructor; import cn.ysk.cashier.repository.shop.TbPlussShopStaffRepository; @@ -24,18 +31,16 @@ import cn.ysk.cashier.service.shop.TbPlussShopStaffService; import cn.ysk.cashier.dto.shop.TbPlussShopStaffDto; import cn.ysk.cashier.dto.shop.TbPlussShopStaffQueryCriteria; import cn.ysk.cashier.mapper.shop.TbPlussShopStaffMapper; +import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import java.time.Instant; -import java.util.List; -import java.util.Map; +import java.util.*; import java.io.IOException; import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @website https://eladmin.vip @@ -50,6 +55,10 @@ public class TbPlussShopStaffServiceImpl implements TbPlussShopStaffService { private final TbPlussShopStaffRepository tbPlussShopStaffRepository; private final TbPlussShopStaffMapper tbPlussShopStaffMapper; + private final UserRepository userRepository; + private final PasswordEncoder passwordEncoder; + private final UserService userService; + @Override public Map queryAll(TbPlussShopStaffQueryCriteria criteria, Pageable pageable){ Page page = tbPlussShopStaffRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); @@ -66,7 +75,10 @@ public class TbPlussShopStaffServiceImpl implements TbPlussShopStaffService { public TbPlussShopStaffDto findById(Integer id) { TbPlussShopStaff tbPlussShopStaff = tbPlussShopStaffRepository.findById(id).orElseGet(TbPlussShopStaff::new); ValidationUtil.isNull(tbPlussShopStaff.getId(),"TbPlussShopStaff","id",id); - return tbPlussShopStaffMapper.toDto(tbPlussShopStaff); + TbPlussShopStaffDto dto = tbPlussShopStaffMapper.toDto(tbPlussShopStaff); + UserDto userDto = userService.findByName(tbPlussShopStaff.getAccount()); + dto.setUser(userDto); + return dto; } @Override @@ -77,7 +89,31 @@ public class TbPlussShopStaffServiceImpl implements TbPlussShopStaffService { } resources.setPassword(MD5Utils.md5("123456")); resources.setCreatedAt(Instant.now().toEpochMilli()); - resources.setUpdatedAt(Instant.now().toEpochMilli()); + + //添加收银系统后台账号 + User user = new User(); + user.setPassword(passwordEncoder.encode(resources.getPassword())); + user.setUsername(resources.getAccount()); + user.setNickName(resources.getName()); + user.setPhone(resources.getPhone()); + user.setEnabled(true); + + Dept dept = new Dept(); + dept.setId(18L); + user.setDept(dept); + + Set roles = new HashSet<>(); + Role role = new Role(); + role.setId(2L); + roles.add(role); + user.setRoles(roles); + + Set jobs = new HashSet<>(); + Job job = new Job(); + job.setId(10L); + jobs.add(job); + user.setJobs(jobs); + userRepository.save(user); return tbPlussShopStaffMapper.toDto(tbPlussShopStaffRepository.save(resources)); } @@ -85,17 +121,32 @@ public class TbPlussShopStaffServiceImpl implements TbPlussShopStaffService { @Transactional(rollbackFor = Exception.class) public void update(TbPlussShopStaff resources) { TbPlussShopStaff tbPlussShopStaff = tbPlussShopStaffRepository.findById(resources.getId()).orElseGet(TbPlussShopStaff::new); - resources.setUpdatedAt(tbPlussShopStaff.getUpdatedAt()); + resources.setUpdatedAt(Instant.now().toEpochMilli()); ValidationUtil.isNull( tbPlussShopStaff.getId(),"TbPlussShopStaff","id",resources.getId()); tbPlussShopStaff.copy(resources); tbPlussShopStaffRepository.save(tbPlussShopStaff); + //修改 sysUser账号 + User sysUser = userRepository.findByUsername(tbPlussShopStaff.getAccount()); + Set roles = new HashSet<>(); + Role role = new Role(); + role.setId(resources.getRoleId()); + roles.add(role); + sysUser.setRoles(roles); + sysUser.setNickName(resources.getName()); + sysUser.setPhone(resources.getPhone()); + userRepository.save(sysUser); } @Override public void deleteAll(Integer[] ids) { + Set sysUserIds=new HashSet<>(); for (Integer id : ids) { + TbPlussShopStaff tbPlussShopStaff = tbPlussShopStaffRepository.findById(id).get(); + User sysUser = userRepository.findByUsername(tbPlussShopStaff.getAccount()); tbPlussShopStaffRepository.deleteById(id); + sysUserIds.add(sysUser.getId()); } + userService.delete(sysUserIds); } @Override diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPrintMachineServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPrintMachineServiceImpl.java index 2a439e77..34094907 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPrintMachineServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPrintMachineServiceImpl.java @@ -16,7 +16,7 @@ package cn.ysk.cashier.service.impl.shopimpl; import cn.ysk.cashier.exception.BadRequestException; -import cn.ysk.cashier.controller.shop.TbPrintMachine; +import cn.ysk.cashier.pojo.shop.TbPrintMachine; import cn.ysk.cashier.dto.shop.PrintMachineDto; import cn.ysk.cashier.utils.FileUtil; import cn.ysk.cashier.utils.ListUtil; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbCouponCategoryService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbCouponCategoryService.java new file mode 100644 index 00000000..759fad1b --- /dev/null +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbCouponCategoryService.java @@ -0,0 +1,85 @@ +package cn.ysk.cashier.service.shop; + +import cn.ysk.cashier.dto.shop.TbCouponCategoryDto; +import cn.ysk.cashier.dto.shop.TbCouponCategoryQueryCriteria; +import cn.ysk.cashier.mapper.shop.TbCouponCategoryMapper; +import cn.ysk.cashier.pojo.shop.TbCouponCategory; +import cn.ysk.cashier.repository.shop.TbCouponCategoryRepository; +import cn.ysk.cashier.utils.FileUtil; +import cn.ysk.cashier.utils.PageUtil; +import cn.ysk.cashier.utils.QueryHelp; +import cn.ysk.cashier.utils.ValidationUtil; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.data.domain.Pageable; + +import java.sql.Timestamp; +import java.util.*; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +@Service +@RequiredArgsConstructor +public class TbCouponCategoryService { + private final TbCouponCategoryRepository tbCouponCategoryRepository; + private final TbCouponCategoryMapper tbCouponCategoryMapper; + + + public Map queryAll(TbCouponCategoryQueryCriteria criteria, Pageable pageable){ + Page page = tbCouponCategoryRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); + return PageUtil.toPage(page.map(tbCouponCategoryMapper::toDto)); + } + + + public List queryAll(TbCouponCategoryQueryCriteria criteria){ + return tbCouponCategoryMapper.toDto(tbCouponCategoryRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); + } + + + @Transactional + public TbCouponCategoryDto findById(Integer id) { + TbCouponCategory tbCouponCategory = tbCouponCategoryRepository.findById(id).orElseGet(TbCouponCategory::new); + ValidationUtil.isNull(tbCouponCategory.getId(),"TbCouponCategory","id",id); + return tbCouponCategoryMapper.toDto(tbCouponCategory); + } + + + @Transactional(rollbackFor = Exception.class) + public TbCouponCategoryDto create(TbCouponCategory resources) { + resources.setCreateTime(new Timestamp(System.currentTimeMillis())); + return tbCouponCategoryMapper.toDto(tbCouponCategoryRepository.save(resources)); + } + + + @Transactional(rollbackFor = Exception.class) + public void update(TbCouponCategory resources) { + TbCouponCategory tbCouponCategory = tbCouponCategoryRepository.findById(resources.getId()).orElseGet(TbCouponCategory::new); + ValidationUtil.isNull( tbCouponCategory.getId(),"TbCouponCategory","id",resources.getId()); + tbCouponCategory.copy(resources); + tbCouponCategory.setUpdateTime(new Timestamp(System.currentTimeMillis())); + tbCouponCategoryRepository.save(tbCouponCategory); + } + + + public void deleteAll(Integer[] ids) { + for (Integer id : ids) { + tbCouponCategoryRepository.deleteById(id); + } + } + + + public void download(List all, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (TbCouponCategoryDto tbCouponCategory : all) { + Map map = new LinkedHashMap<>(); + map.put("分类名称", tbCouponCategory.getName()); + map.put(" createTime", tbCouponCategory.getCreateTime()); + map.put(" updateTime", tbCouponCategory.getUpdateTime()); + map.put("0：不展示；1：展示；", tbCouponCategory.getStatus()); + list.add(map); + } + FileUtil.downloadExcel(list, response); + } +} diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbPrintMachineService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbPrintMachineService.java index b8410f1f..4746cb06 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbPrintMachineService.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbPrintMachineService.java @@ -15,7 +15,7 @@ */ package cn.ysk.cashier.service.shop; -import cn.ysk.cashier.controller.shop.TbPrintMachine; +import cn.ysk.cashier.pojo.shop.TbPrintMachine; import cn.ysk.cashier.dto.shop.PrintMachineDto; import cn.ysk.cashier.dto.shop.TbPrintMachineDto; import cn.ysk.cashier.dto.shop.TbPrintMachineQueryCriteria; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbPurchaseNoticeService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbPurchaseNoticeService.java new file mode 100644 index 00000000..23f94764 --- /dev/null +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbPurchaseNoticeService.java @@ -0,0 +1,39 @@ +package cn.ysk.cashier.service.shop; + +import cn.ysk.cashier.dto.shop.TbPurchaseNoticeDto; +import cn.ysk.cashier.mapper.shop.TbPurchaseNoticeMapper; +import cn.ysk.cashier.pojo.shop.TbPurchaseNotice; +import cn.ysk.cashier.repository.shop.TbPurchaseNoticeRepository; +import cn.ysk.cashier.utils.ValidationUtil; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class TbPurchaseNoticeService{ + + private final TbPurchaseNoticeRepository tbPurchaseNoticeRepository; + private final TbPurchaseNoticeMapper tbPurchaseNoticeMapper; + + @Transactional(rollbackFor = Exception.class) + public TbPurchaseNoticeDto create(TbPurchaseNotice resources) { + return tbPurchaseNoticeMapper.toDto(tbPurchaseNoticeRepository.save(resources)); + } + + + @Transactional(rollbackFor = Exception.class) + public void update(TbPurchaseNotice resources) { + TbPurchaseNotice tbPurchaseNotice = tbPurchaseNoticeRepository.findById(resources.getId()).orElseGet(TbPurchaseNotice::new); + ValidationUtil.isNull( tbPurchaseNotice.getId(),"TbPurchaseNotice","id",resources.getId()); + tbPurchaseNotice.copy(resources); + tbPurchaseNoticeRepository.save(tbPurchaseNotice); + } + + + public void deleteAll(Integer[] ids) { + for (Integer id : ids) { + tbPurchaseNoticeRepository.deleteById(id); + } + } +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Dict.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Dict.java index 391da42f..626705d4 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Dict.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Dict.java @@ -56,6 +56,9 @@ public class Dict extends BaseEntity implements Serializable { @ApiModelProperty(value = "描述") private String description; + @ApiModelProperty(value = "类型：通用-common；首页-home；热销-hot；") + private String type; + @Column(name = "is_child") @ApiModelProperty(value = "描述 是否有子类0否1是") private Integer isChild; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Menu.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Menu.java index 1e030f8a..f448ec9f 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Menu.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Menu.java @@ -93,6 +93,11 @@ public class Menu extends BaseEntity implements Serializable { @ApiModelProperty(value = "是否选中父级菜单") private String activeMenu; + + @Column(name = "is_shop") + @ApiModelProperty(value = "商户使用 0：否；1：是；") + private Integer isShop; + @Override public boolean equals(Object o) { if (this == o) { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Role.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Role.java index c14a5fe1..e4f49d91 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Role.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Role.java @@ -80,6 +80,10 @@ public class Role extends BaseEntity implements Serializable { @ApiModelProperty(value = "描述") private String description; + @Column(name = "shop_id") + @ApiModelProperty(value = "商户Id") + private Integer shopId; + @Override public boolean equals(Object o) { if (this == o) { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/system/repository/MenuRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/repository/MenuRepository.java index 89f5fba4..c47b8939 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/system/repository/MenuRepository.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/repository/MenuRepository.java @@ -51,12 +51,16 @@ public interface MenuRepository extends JpaRepository, JpaSpecificat */ List findByPidOrderByMenuSort(long pid); + List findByPidAndIsShopOrderByMenuSort(long pid,Integer isShop); + /** * 查询顶级菜单 * @return / */ List findByPidIsNullOrderByMenuSort(); + List findByPidIsNullAndIsShopOrderByMenuSort(Integer isShop); + /** * 根据角色ID与菜单类型查询菜单 * @param roleIds roleIDs diff --git a/eladmin-logging/src/main/java/cn/ysk/cashier/rest/LogController.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/rest/LogController.java similarity index 89% rename from eladmin-logging/src/main/java/cn/ysk/cashier/rest/LogController.java rename to eladmin-system/src/main/java/cn/ysk/cashier/system/rest/LogController.java index 89cd8cd9..bd7e2231 100644 --- a/eladmin-logging/src/main/java/cn/ysk/cashier/rest/LogController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/rest/LogController.java @@ -13,9 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.ysk.cashier.rest; +package cn.ysk.cashier.system.rest; import cn.ysk.cashier.annotation.Log; +import cn.ysk.cashier.config.security.security.TokenProvider; +import cn.ysk.cashier.exception.BadRequestException; import cn.ysk.cashier.service.LogService; import cn.ysk.cashier.service.dto.LogQueryCriteria; import cn.ysk.cashier.service.dto.LogQueryCriteriaExt; @@ -43,11 +45,11 @@ import java.util.Map; public class LogController { private final LogService logService; + private final TokenProvider tokenProvider; @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") - @PreAuthorize("@el.check()") public void exportLog(HttpServletResponse response, LogQueryCriteria criteria) throws IOException { criteria.setLogType("INFO"); logService.download(logService.queryAll(criteria), response); @@ -63,8 +65,11 @@ public class LogController { } @GetMapping @ApiOperation("日志查询") - @PreAuthorize("@el.check()") public ResponseEntity queryLog(LogQueryCriteria criteria, Pageable pageable){ + String shopId = tokenProvider.getShopId(); + if (!shopId.equals("1")) { + criteria.setShopId(Integer.valueOf(shopId)); + } criteria.setLogType("INFO"); return new ResponseEntity<>(logService.queryAll(criteria,pageable), HttpStatus.OK); } @@ -87,14 +92,12 @@ public class LogController { @GetMapping(value = "/error/{id}") @ApiOperation("日志异常详情查询") - @PreAuthorize("@el.check()") public ResponseEntity queryErrorLogDetail(@PathVariable Long id){ return new ResponseEntity<>(logService.findByErrDetail(id), HttpStatus.OK); } @DeleteMapping(value = "/del/error") @Log("删除所有ERROR日志") @ApiOperation("删除所有ERROR日志") - @PreAuthorize("@el.check()") public ResponseEntity delAllErrorLog(){ logService.delAllByError(); return new ResponseEntity<>(HttpStatus.OK); @@ -103,8 +106,11 @@ public class LogController { @DeleteMapping(value = "/del/info") @Log("删除所有INFO日志") @ApiOperation("删除所有INFO日志") - @PreAuthorize("@el.check()") public ResponseEntity delAllInfoLog(){ + String shopId = tokenProvider.getShopId(); + if (!shopId.equals("1")) { + throw new BadRequestException("无操作权限"); + } logService.delAllByInfo(); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/system/rest/MenuController.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/rest/MenuController.java index 5e651053..793ad878 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/system/rest/MenuController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/rest/MenuController.java @@ -16,6 +16,7 @@ package cn.ysk.cashier.system.rest; import cn.hutool.core.collection.CollectionUtil; +import cn.ysk.cashier.config.security.security.TokenProvider; import cn.ysk.cashier.system.domain.Menu; import cn.ysk.cashier.system.service.dto.MenuDto; import cn.ysk.cashier.system.service.dto.MenuQueryCriteria; @@ -50,12 +51,16 @@ public class MenuController { private final MenuService menuService; private final MenuMapper menuMapper; + private final TokenProvider tokenProvider; private static final String ENTITY_NAME = "menu"; @ApiOperation("导出菜单数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('menu:list')") public void exportMenu(HttpServletResponse response, MenuQueryCriteria criteria) throws Exception { + if (!tokenProvider.getShopId().equals("1")) { + criteria.setIsShop(1); + } menuService.download(menuService.queryAll(criteria, false), response); } @@ -71,7 +76,10 @@ public class MenuController { @GetMapping(value = "/lazy") @PreAuthorize("@el.check('menu:list','roles:list')") public ResponseEntity queryAllMenu(@RequestParam Long pid){ - return new ResponseEntity<>(menuService.getMenus(pid),HttpStatus.OK); + if (!tokenProvider.getShopId().equals("1")) { + return new ResponseEntity<>(menuService.getMenus(pid,1),HttpStatus.OK); + } + return new ResponseEntity<>(menuService.getMenus(pid,null),HttpStatus.OK); } @ApiOperation("根据菜单ID返回所有子节点ID，包含自身ID") @@ -79,7 +87,12 @@ public class MenuController { @PreAuthorize("@el.check('menu:list','roles:list')") public ResponseEntity childMenu(@RequestParam Long id){ Set menuSet = new HashSet<>(); - List menuList = menuService.getMenus(id); + List menuList=new ArrayList<>(); + if (!tokenProvider.getShopId().equals("1")) { + menuList = menuService.getMenus(id,1); + }else { + menuList = menuService.getMenus(id,null); + } menuSet.add(menuService.findOne(id)); menuSet = menuService.getChildMenus(menuMapper.toEntity(menuList), menuSet); Set ids = menuSet.stream().map(Menu::getId).collect(Collectors.toSet()); @@ -106,7 +119,11 @@ public class MenuController { } return new ResponseEntity<>(menuService.buildTree(new ArrayList<>(menuDtos)),HttpStatus.OK); } - return new ResponseEntity<>(menuService.getMenus(null),HttpStatus.OK); + if (!tokenProvider.getShopId().equals("1")) { + return new ResponseEntity<>(menuService.getMenus(null,1),HttpStatus.OK); + }else { + return new ResponseEntity<>(menuService.getMenus(null,null),HttpStatus.OK); + } } @Log("新增菜单") @@ -137,7 +154,7 @@ public class MenuController { public ResponseEntity deleteMenu(@RequestBody Set ids){ Set menuSet = new HashSet<>(); for (Long id : ids) { - List menuList = menuService.getMenus(id); + List menuList = menuService.getMenus(id,null); menuSet.add(menuService.findOne(id)); menuSet = menuService.getChildMenus(menuMapper.toEntity(menuList), menuSet); } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/system/rest/RoleController.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/rest/RoleController.java index 0ec7d01f..62712280 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/system/rest/RoleController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/rest/RoleController.java @@ -16,6 +16,7 @@ package cn.ysk.cashier.system.rest; import cn.hutool.core.lang.Dict; +import cn.ysk.cashier.config.security.security.TokenProvider; import cn.ysk.cashier.system.domain.Role; import cn.ysk.cashier.system.service.dto.RoleDto; import cn.ysk.cashier.system.service.dto.RoleQueryCriteria; @@ -27,6 +28,7 @@ import cn.ysk.cashier.exception.BadRequestException; import cn.ysk.cashier.system.service.RoleService; import cn.ysk.cashier.system.service.dto.RoleSmallDto; import cn.ysk.cashier.utils.SecurityUtils; +import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -48,9 +50,11 @@ import java.util.stream.Collectors; @RequiredArgsConstructor @Api(tags = "系统：角色管理") @RequestMapping("/api/roles") +@Slf4j public class RoleController { private final RoleService roleService; + private final TokenProvider tokenProvider; private static final String ENTITY_NAME = "role"; @@ -65,20 +69,32 @@ public class RoleController { @GetMapping(value = "/download") @PreAuthorize("@el.check('role:list')") public void exportRole(HttpServletResponse response, RoleQueryCriteria criteria) throws IOException { + String shopId = tokenProvider.getShopId(); + if (!shopId.equals("1")) { + criteria.setShopId(Integer.valueOf(shopId)); + } roleService.download(roleService.queryAll(criteria), response); } @ApiOperation("返回全部的角色") @GetMapping(value = "/all") @PreAuthorize("@el.check('roles:list','user:add','user:edit')") - public ResponseEntity queryAllRole(){ - return new ResponseEntity<>(roleService.queryAll(),HttpStatus.OK); + public ResponseEntity queryAllRole(RoleQueryCriteria criteria){ + String shopId = tokenProvider.getShopId(); + if (!shopId.equals("1")) { + criteria.setShopId(Integer.valueOf(shopId)); + } + return new ResponseEntity<>(roleService.queryAll(criteria),HttpStatus.OK); } @ApiOperation("查询角色") @GetMapping @PreAuthorize("@el.check('roles:list')") public ResponseEntity queryRole(RoleQueryCriteria criteria, Pageable pageable){ + String shopId = tokenProvider.getShopId(); + if (!shopId.equals("1")) { + criteria.setShopId(Integer.valueOf(shopId)); + } return new ResponseEntity<>(roleService.queryAll(criteria,pageable),HttpStatus.OK); } @@ -88,11 +104,15 @@ public class RoleController { return new ResponseEntity<>(Dict.create().set("level", getLevels(null)),HttpStatus.OK); } - @Log("新增角色") + @Log("新增角色:#resources.getName()") @ApiOperation("新增角色") @PostMapping @PreAuthorize("@el.check('roles:add')") public ResponseEntity createRole(@Validated @RequestBody Role resources){ + String shopId = tokenProvider.getShopId(); + if (!shopId.equals("1")) { + resources.setShopId(Integer.valueOf(shopId)); + } if (resources.getId() != null) { throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID"); } @@ -101,7 +121,7 @@ public class RoleController { return new ResponseEntity<>(HttpStatus.CREATED); } - @Log("修改角色") + @Log("修改角色:#resources.getName()") @ApiOperation("修改角色") @PutMapping @PreAuthorize("@el.check('roles:edit')") @@ -111,7 +131,7 @@ public class RoleController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @Log("修改角色菜单") + @Log("修改角色菜单:#resources.getName()") @ApiOperation("修改角色菜单") @PutMapping(value = "/menu") @PreAuthorize("@el.check('roles:edit')") @@ -122,7 +142,7 @@ public class RoleController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @Log("删除角色") + @Log("删除角色:#ids") @ApiOperation("删除角色") @DeleteMapping @PreAuthorize("@el.check('roles:del')") diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/system/service/MenuService.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/service/MenuService.java index 4887275e..32bbc74e 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/system/service/MenuService.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/service/MenuService.java @@ -106,7 +106,7 @@ public interface MenuService { * @param pid / * @return / */ - List getMenus(Long pid); + List getMenus(Long pid,Integer isShop); /** * 根据ID获取同级与上级数据 diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/system/service/dto/MenuDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/service/dto/MenuDto.java index 4490286b..3a9a57b1 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/system/service/dto/MenuDto.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/service/dto/MenuDto.java @@ -62,6 +62,9 @@ public class MenuDto extends BaseDTO implements Serializable { private String activeMenu; + private Integer isShop; + + public Boolean getHasChildren() { return subCount > 0; } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/system/service/dto/MenuQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/service/dto/MenuQueryCriteria.java index 8d363c8f..514d2c89 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/system/service/dto/MenuQueryCriteria.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/service/dto/MenuQueryCriteria.java @@ -38,4 +38,7 @@ public class MenuQueryCriteria { @Query private Long pid; + + @Query + private Integer isShop; } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/system/service/dto/RoleDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/service/dto/RoleDto.java index 211e2ca1..e2f92dcf 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/system/service/dto/RoleDto.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/service/dto/RoleDto.java @@ -44,6 +44,8 @@ public class RoleDto extends BaseDTO implements Serializable { private String description; + private Integer shopId; + @Override public boolean equals(Object o) { if (this == o) { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/system/service/dto/RoleQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/service/dto/RoleQueryCriteria.java index c7934592..b42ac9bd 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/system/service/dto/RoleQueryCriteria.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/service/dto/RoleQueryCriteria.java @@ -33,4 +33,7 @@ public class RoleQueryCriteria { @Query(type = Query.Type.BETWEEN) private List createTime; + + @Query + private Integer shopId; } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/system/service/impl/MenuServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/service/impl/MenuServiceImpl.java index e8a6fe9c..8dd0f2ab 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/system/service/impl/MenuServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/service/impl/MenuServiceImpl.java @@ -182,6 +182,7 @@ public class MenuServiceImpl implements MenuService { menu.setPermission(resources.getPermission()); menu.setType(resources.getType()); menu.setActiveMenu(resources.getActiveMenu()); + menu.setIsShop(resources.getIsShop()); menuRepository.save(menu); // 计算父级菜单节点数目 updateSubCnt(oldPid); @@ -215,12 +216,20 @@ public class MenuServiceImpl implements MenuService { } @Override - public List getMenus(Long pid) { + public List getMenus(Long pid,Integer isShop) { List menus; if(pid != null && !pid.equals(0L)){ - menus = menuRepository.findByPidOrderByMenuSort(pid); + if(isShop!=null){ + menus = menuRepository.findByPidAndIsShopOrderByMenuSort(pid,isShop); + }else { + menus = menuRepository.findByPidOrderByMenuSort(pid); + } } else { - menus = menuRepository.findByPidIsNullOrderByMenuSort(); + if(isShop!=null){ + menus = menuRepository.findByPidIsNullAndIsShopOrderByMenuSort(isShop); + }else { + menus = menuRepository.findByPidIsNullOrderByMenuSort(); + } } return menuMapper.toDto(menus); } diff --git a/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl b/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl index b4c03498..8b863d9f 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl @@ -1,29 +1,13 @@ -/* -* Copyright 2019-2020 Zheng Jie -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -package ${package}.rest; +package ${package}.controller; -import annotation.cn.ysk.cashier.Log; -import ${package}.domain.${className}; +import cn.ysk.cashier.annotation.Log; +import ${package}.pojo.${className}; import ${package}.service.${className}Service; import ${package}.service.dto.${className}QueryCriteria; import org.springframework.data.domain.Pageable; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.*; @@ -31,7 +15,6 @@ import java.io.IOException; import javax.servlet.http.HttpServletResponse; /** -* @website https://eladmin.vip * @author ${author} * @date ${date} **/ diff --git a/eladmin-system/src/main/resources/template/generator/admin/Dto.ftl b/eladmin-system/src/main/resources/template/generator/admin/Dto.ftl index ac81d988..f474b89d 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/Dto.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/Dto.ftl @@ -29,8 +29,6 @@ import com.alibaba.fastjson.serializer.ToStringSerializer; /** -* @website https://eladmin.vip -* @description / * @author ${author} * @date ${date} **/ diff --git a/eladmin-system/src/main/resources/template/generator/admin/Entity.ftl b/eladmin-system/src/main/resources/template/generator/admin/Entity.ftl index 2e85cea8..87c0dc69 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/Entity.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/Entity.ftl @@ -37,8 +37,6 @@ import java.math.BigDecimal; import java.io.Serializable; /** -* @website https://eladmin.vip -* @description / * @author ${author} * @date ${date} **/ diff --git a/eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl b/eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl index 37a9ba60..9b09bdd6 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl @@ -1,28 +1,12 @@ -/* -* Copyright 2019-2020 Zheng Jie -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ package ${package}.service.mapstruct; -import base.cn.ysk.cashier.BaseMapper; -import ${package}.domain.${className}; -import ${package}.service.dto.${className}Dto; +import cn.ysk.cashier.base.BaseMapper; +import ${package}.pojo.${className}; +import ${package}.dto.${className}Dto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; /** -* @website https://eladmin.vip * @author ${author} * @date ${date} **/ diff --git a/eladmin-system/src/main/resources/template/generator/admin/QueryCriteria.ftl b/eladmin-system/src/main/resources/template/generator/admin/QueryCriteria.ftl index daf8b34f..31b18a22 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/QueryCriteria.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/QueryCriteria.ftl @@ -1,18 +1,3 @@ -/* -* Copyright 2019-2020 Zheng Jie -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ package ${package}.service.dto; import lombok.Data; @@ -26,11 +11,10 @@ import java.math.BigDecimal; import java.util.List; <#if queryColumns??> -import annotation.cn.ysk.cashier.Query; +import cn.ysk.cashier.annotation.Query; /** -* @website https://eladmin.vip * @author ${author} * @date ${date} **/ diff --git a/eladmin-system/src/main/resources/template/generator/admin/Repository.ftl b/eladmin-system/src/main/resources/template/generator/admin/Repository.ftl index dac1e924..ba883ace 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/Repository.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/Repository.ftl @@ -1,18 +1,3 @@ -/* -* Copyright 2019-2020 Zheng Jie -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ package ${package}.repository; import ${package}.domain.${className}; diff --git a/eladmin-system/src/main/resources/template/generator/admin/Service.ftl b/eladmin-system/src/main/resources/template/generator/admin/Service.ftl index ef337149..7c6b7c32 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/Service.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/Service.ftl @@ -1,18 +1,3 @@ -/* -* Copyright 2019-2020 Zheng Jie -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ package ${package}.service; import ${package}.domain.${className}; @@ -25,8 +10,6 @@ import java.io.IOException; import javax.servlet.http.HttpServletResponse; /** -* @website https://eladmin.vip -* @description 服务接口 * @author ${author} * @date ${date} **/ diff --git a/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl b/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl index e816068a..a43011af 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl @@ -1,18 +1,3 @@ -/* -* Copyright 2019-2020 Zheng Jie -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ package ${package}.service.impl; import ${package}.domain.${className}; diff --git a/eladmin-tools/src/main/java/cn/ysk/cashier/rest/QiniuController.java b/eladmin-tools/src/main/java/cn/ysk/cashier/rest/QiniuController.java index e36601d0..8acd9808 100644 --- a/eladmin-tools/src/main/java/cn/ysk/cashier/rest/QiniuController.java +++ b/eladmin-tools/src/main/java/cn/ysk/cashier/rest/QiniuController.java @@ -16,6 +16,8 @@ package cn.ysk.cashier.rest; import cn.ysk.cashier.annotation.Log; +import cn.ysk.cashier.annotation.rest.AnonymousGetMapping; +import cn.ysk.cashier.annotation.rest.AnonymousPostMapping; import cn.ysk.cashier.domain.QiniuConfig; import cn.ysk.cashier.domain.QiniuContent; import cn.ysk.cashier.service.QiNiuService; @@ -77,7 +79,7 @@ public class QiniuController { @Log("上传文件") @ApiOperation("上传文件") - @PostMapping + @AnonymousPostMapping public ResponseEntity uploadQiNiu(@RequestParam MultipartFile file){ QiniuContent qiniuContent = qiNiuService.upload(file,qiNiuService.findCloud()); Map map = new HashMap<>(3);