elf
/
elf-shop-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(商城): 代码优化

Browse Source
master
wayn 3 years ago
parent d4224fa5d8
commit 0a4f91878d
12 changed files with 39 additions and 52 deletions
Show Stats Download Patch File Download Diff File

18
pom.xml
Unescape Escape View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.3</version>
<version>2.5.5</version>
</parent>
<modules>
<module>waynboot-common</module>
@ -36,23 +36,23 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<spring-boot.version>2.5.3</spring-boot.version>
<mysql.connector.java.version>8.0.19</mysql.connector.java.version>
<spring-boot.version>2.5.5</spring-boot.version>
<mysql.connector.java.version>8.0.25</mysql.connector.java.version>
<lettuce.version>6.1.3.RELEASE</lettuce.version>
<elasticsearch.version>7.13.4</elasticsearch.version>
<lombok.version>1.18.6</lombok.version>
<mybatis-plus.version>3.4.2</mybatis-plus.version>
<druid.version>1.2.6</druid.version>
<mybatis-plus.version>3.4.3.4</mybatis-plus.version>
<druid.version>1.2.8</druid.version>
<commons.io.version>2.8.0</commons.io.version>
<commons.collections.version>3.2.2</commons.collections.version>
<commons.fileupload.version>1.4</commons.fileupload.version>
<commons-lang3.version>3.11</commons-lang3.version>
<fastjson.version>1.2.75</fastjson.version>
<fastjson.version>1.2.78</fastjson.version>
<easy-captcha.version>1.6.2</easy-captcha.version>
<swagger.version>3.0.0</swagger.version>
<easypoi.version>4.2.0</easypoi.version>
<jwt.version>3.14.0</jwt.version>
<qiniu.version>7.4.0</qiniu.version>
<easypoi.version>4.4.0</easypoi.version>
<jwt.version>3.18.2</jwt.version>
<qiniu.version>7.8.0</qiniu.version>
<mail.version>1.4.7</mail.version>
</properties>

13
waynboot-admin-api/src/main/java/com/wayn/admin/framework/config/MybatisPlusConfig.java
Unescape Escape View File

@ -1,7 +1,6 @@
package com.wayn.admin.framework.config;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import org.mybatis.spring.annotation.MapperScan;
@ -15,18 +14,12 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@Configuration
@MapperScan("com.wayn.**.mapper")
public class MybatisPlusConfig {
/**
* 新的分页插件,一缓和二缓遵循mybatis的规则,需要设置 MybatisConfiguration#useDeprecatedExecutor = false 避免缓存出现问题(该属性会在旧插件移除后一同移除)
*/
// 最新版
@Bean
public MybatisPlusInterceptor mybatisPlusInterceptor() {
MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.H2));
return interceptor;
}
@Bean
public ConfigurationCustomizer configurationCustomizer() {
return configuration -> configuration.setUseDeprecatedExecutor(false);
}
}

4
waynboot-common/pom.xml
Unescape Escape View File

@ -147,14 +147,14 @@
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-pay</artifactId>
<version>3.8.0</version>
<version>4.1.9.B</version>
</dependency>
<!--支付宝依赖-->
<dependency>
<groupId>com.alipay.sdk</groupId>
<artifactId>alipay-sdk-java</artifactId>
<version>3.1.0</version>
<version>4.16.57.ALL</version>
</dependency>
<dependency>

3
waynboot-common/src/main/java/com/wayn/common/core/service/system/IRoleService.java
Unescape Escape View File

@ -19,6 +19,7 @@ public interface IRoleService extends IService<Role> {
/**
* 查询角色列表
*
* @param role 查询参数
* @return 角色列表
*/
@ -93,5 +94,5 @@ public interface IRoleService extends IService<Role> {
* @param roleId 角色id
* @return int
*/
int countUserRoleByRoleId(Long roleId);
long countUserRoleByRoleId(Long roleId);
}

8
waynboot-common/src/main/java/com/wayn/common/core/service/system/impl/DeptServiceImpl.java
Unescape Escape View File

@ -1,10 +1,10 @@
package com.wayn.common.core.service.system.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.wayn.common.constant.SysConstants;
import com.wayn.common.core.domain.system.Dept;
import com.wayn.common.core.domain.system.User;
import com.wayn.common.core.domain.vo.TreeVO;
import com.wayn.common.core.mapper.system.DeptMapper;
import com.wayn.common.core.service.system.IDeptService;
@ -45,14 +45,12 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
@Override
public boolean hasChildByDeptId(Long deptId) {
int count = count(new QueryWrapper<Dept>().eq("parent_id", deptId));
return count > 0;
return count(Wrappers.lambdaQuery(Dept.class).eq(Dept::getParentId, deptId)) > 0;
}
@Override
public boolean checkDeptExistUser(Long deptId) {
int count = iUserService.count(new QueryWrapper<User>().eq("dept_id", deptId));
return count > 0;
return count(Wrappers.lambdaQuery(Dept.class).eq(Dept::getDeptId, deptId)) > 0;
}
@Override

7
waynboot-common/src/main/java/com/wayn/common/core/service/system/impl/MenuServiceImpl.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.wayn.common.core.service.system.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.wayn.common.constant.SysConstants;
import com.wayn.common.core.domain.system.Menu;
@ -118,14 +119,12 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
@Override
public boolean hasChildByMenuId(Long menuId) {
int count = count(new QueryWrapper<Menu>().eq("parent_id", menuId));
return count > 0;
return count(Wrappers.lambdaQuery(Menu.class).eq(Menu::getParentId, menuId)) > 0;
}
@Override
public boolean checkMenuExistRole(Long menuId) {
int count = iRoleMenuService.count(new QueryWrapper<RoleMenu>().eq("menu_id", menuId));
return count > 0;
return count(Wrappers.lambdaQuery(Menu.class).eq(Menu::getMenuId, menuId)) > 0;
}
/**

7
waynboot-common/src/main/java/com/wayn/common/core/service/system/impl/RoleServiceImpl.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.wayn.common.core.service.system.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.wayn.common.constant.SysConstants;
@ -93,7 +94,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
for (Long roleId : roleIds) {
checkRoleAllowed(new Role(roleId));
Role role = getById(roleId);
int count = countUserRoleByRoleId(roleId);
long count = countUserRoleByRoleId(roleId);
if (count > 0) {
throw new BusinessException(String.format("%1$s已分配,不能删除", role.getRoleName()));
}
@ -102,8 +103,8 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
}
@Override
public int countUserRoleByRoleId(Long roleId) {
return iUserRoleService.count(new QueryWrapper<UserRole>().eq("role_id", roleId));
public long countUserRoleByRoleId(Long roleId) {
return iUserRoleService.count(Wrappers.lambdaQuery(UserRole.class).eq(UserRole::getRoleId, roleId));
}
@Override

3
waynboot-common/src/main/java/com/wayn/common/core/service/system/impl/UserServiceImpl.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.wayn.common.core.service.system.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.wayn.common.constant.SysConstants;
@ -49,7 +50,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
@Override
public String checkUserNameUnique(String userName) {
int count = count(new QueryWrapper<User>().eq("user_name", userName));
long count = count(Wrappers.lambdaQuery(User.class).eq(User::getUserName, userName));
if (count > 0) {
return SysConstants.NOT_UNIQUE;
}

3
waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/LoginController.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.wayn.mobile.api.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.wayn.common.constant.SysConstants;
import com.wayn.common.core.domain.shop.Member;
import com.wayn.common.core.domain.tool.EmailConfig;
@ -53,7 +54,7 @@ public class LoginController {
return R.error(ReturnCodeEnum.USER_TWO_PASSWORD_NOT_SAME_ERROR);
}
// 验证手机号是否唯一
int count = iMemberService.count(new QueryWrapper<Member>().eq("mobile", registryObj.getMobile()));
long count = iMemberService.count(Wrappers.lambdaQuery(Member.class).eq(Member::getMobile, registryObj.getMobile()));
iMemberService.count(new QueryWrapper<Member>().eq("mobile", registryObj.getMobile()));
if (count > 0) {
return R.error(ReturnCodeEnum.USER_PHONE_HAS_REGISTER_ERROR);

2
waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/impl/CartServiceImpl.java
Unescape Escape View File

@ -106,7 +106,7 @@ public class CartServiceImpl extends ServiceImpl<CartMapper, Cart> implements IC
@Override
public R goodsCount() {
Long userId = MobileSecurityUtils.getUserId();
int count = count(new QueryWrapper<Cart>().eq("user_id", userId));
long count = count(Wrappers.lambdaQuery(Cart.class).eq(Cart::getUserId, userId));
return R.success().add("count", count);
}

11
waynboot-mobile-api/src/main/java/com/wayn/mobile/api/util/OrderSnGenUtil.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.wayn.mobile.api.util;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.wayn.common.core.domain.shop.Order;
import com.wayn.common.util.spring.SpringContextUtil;
import com.wayn.mobile.api.service.IOrderService;
@ -32,11 +32,12 @@ public class OrderSnGenUtil {
* @param userId 用户ID
* @return 该用户今日第几次下单
*/
public static int countByOrderSn(Long userId) {
public static long countByOrderSn(Long userId) {
IOrderService orderService = SpringContextUtil.getBean(IOrderService.class);
return orderService.count(new QueryWrapper<Order>().eq("user_id", userId)
.gt("create_time", LocalDate.now())
.lt("create_time", LocalDate.now().plusDays(1)));
return orderService.count(Wrappers.lambdaQuery(Order.class)
.eq(Order::getUserId, userId)
.gt(Order::getCreateTime, LocalDate.now())
.lt(Order::getCreateTime, LocalDate.now().plusDays(1)));
}
/**

12
waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/MybatisPlusConfig.java
Unescape Escape View File

@ -1,7 +1,6 @@
package com.wayn.mobile.framework.config;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import org.mybatis.spring.annotation.MapperScan;
@ -15,18 +14,11 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@Configuration
@MapperScan("com.wayn.**.mapper")
public class MybatisPlusConfig {
/**
* 新的分页插件,一缓和二缓遵循mybatis的规则,需要设置 MybatisConfiguration#useDeprecatedExecutor = false 避免缓存出现问题(该属性会在旧插件移除后一同移除)
*/
// 最新版
@Bean
public MybatisPlusInterceptor mybatisPlusInterceptor() {
MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.H2));
return interceptor;
}
@Bean
public ConfigurationCustomizer configurationCustomizer() {
return configuration -> configuration.setUseDeprecatedExecutor(false);
}
}

Write Preview
Loading…
Cancel
Save