ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/model/Agreement.java
File was deleted ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserRoleFallbackFactory.java
@@ -2,6 +2,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.system.api.feignClient.SysUserRoleClient; import com.ruoyi.system.api.model.SysUserRoleVo; import org.springframework.stereotype.Component; import java.util.List; ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/GenTable.java
File was deleted ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/GenTableColumn.java
File was deleted ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysConfig.java
File was deleted ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysDept.java
File was deleted ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysDictData.java
File was deleted ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysDictType.java
File was deleted ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysJob.java
File was deleted ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysJobLog.java
File was deleted ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysLoginLog.java
File was deleted ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysMenu.java
File was deleted ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysNotice.java
File was deleted ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysOperLog.java
File was deleted ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysPost.java
File was deleted ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysRole.java
File was deleted ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysRoleDept.java
File was deleted ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysRoleMenu.java
File was deleted ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysUser.java
File was deleted ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysUserPost.java
File was deleted ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysUserRole.java
File was deleted ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
@@ -2,8 +2,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.chargingPile.api.feignClient.SiteClient; import com.ruoyi.chargingPile.api.model.Site; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.controller.BaseController; @@ -14,8 +12,6 @@ import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.other.api.domain.TRoleSite; import com.ruoyi.other.api.feignClient.RoleSiteClient; import com.ruoyi.system.api.domain.SysDept; import com.ruoyi.system.api.domain.SysRole; import com.ruoyi.system.api.domain.SysUser; @@ -72,12 +68,6 @@ @Resource private SysMenuMapper menuMapper; @Resource private RoleSiteClient roleSiteClient; @Resource private SiteClient siteClient; @ApiOperation(value = "获取角色列表", tags = {"管理后台-系统用户管理"}) @GetMapping("/list") @@ -99,12 +89,6 @@ PageInfo<SysRole> page = roleService.page(pageInfo, wrapper.orderByDesc(SysRole::getCreateTime)); for (SysRole record : page.getRecords()) { List<Integer> data = roleSiteClient.getSiteIds(record.getRoleId()).getData(); List<Site> sites = siteClient.getSiteByIds(data).getData(); if (null != sites) { List<String> collect = sites.stream().map(Site::getName).collect(Collectors.toList()); record.setSiteNames(collect); } long count = sysUserRoleService.count(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getRoleId, record.getRoleId())); record.setNumber(count); } @@ -134,15 +118,6 @@ role.setCreateBy(SecurityUtils.getUsername()); role.setCreateTime(new Date()); roleService.insertRole(role); //添加站点权限 List<TRoleSite> roleSites = new ArrayList<>(); for (Integer siteId : dto.getSiteIds()) { TRoleSite roleSite = new TRoleSite(); roleSite.setRoleId(role.getRoleId().intValue()); roleSite.setSiteId(siteId); roleSites.add(roleSite); } roleSiteClient.addRoleSite(roleSites); return AjaxResult.success(); } @@ -179,13 +154,6 @@ } roleInfoVo.setMenus(menusId); roleInfoVo.setRemark(role.getRemark()); List<Integer> siteIds = roleSiteClient.getSiteIds(role.getRoleId()).getData(); if (null != siteIds && siteIds.size() > 0) { List<Site> sites = siteClient.getSiteByIds(siteIds).getData(); List<String> siteNames = sites.stream().map(Site::getName).collect(Collectors.toList()); roleInfoVo.setSiteNames(siteNames); roleInfoVo.setSiteIds(siteIds); } return AjaxResult.success(roleInfoVo); } @@ -229,19 +197,6 @@ sysRoleMenus.add(sysRoleMenu); } sysRoleMenuMapper.batchRoleMenu(sysRoleMenus); //删除旧站点数据 roleSiteClient.delRoleSite(dto.getRoleId()); //添加站点权限 List<TRoleSite> roleSites = new ArrayList<>(); if(null != dto.getSiteIds()){ for (Integer siteId : dto.getSiteIds()) { TRoleSite roleSite = new TRoleSite(); roleSite.setRoleId(role.getRoleId().intValue()); roleSite.setSiteId(siteId); roleSites.add(roleSite); } } roleSiteClient.addRoleSite(roleSites); return AjaxResult.success(); }
@@ -15,8 +15,8 @@ import com.ruoyi.system.api.domain.SysRole; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.model.LoginUser; import com.ruoyi.system.api.model.SysUserRole; import com.ruoyi.system.api.query.ChangeUserQuery; import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.query.GetSysUserList; import com.ruoyi.system.query.ShopUserStart; import com.ruoyi.system.service.*; ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserRoleController.java
@@ -8,8 +8,8 @@ import com.ruoyi.common.core.web.page.TableDataInfo; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.system.api.model.SysUserRole; import com.ruoyi.system.api.model.SysUserRoleVo; import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.service.ISysUserRoleService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/filter/AuthFilter.java
@@ -69,7 +69,7 @@ //小程序用户 if ("applet".equals(userType)) { AppUser appUser = appUserClient.getAppUserById(Long.valueOf(userid)); if(null == appUser || 1 == appUser.getDelFlag() || 3 == appUser.getStatus()){ if(null == appUser || appUser.getDelFlag() || 3 == appUser.getStatus()){ log.error("[账户异常处理]请求账户id:{}", userid); unauthorizedResponse(response,"无效的账户"); return; ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GenTableColumnMapper.java
File was deleted ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GenTableMapper.java
File was deleted ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysJobLogMapper.java
File was deleted ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysJobMapper.java
File was deleted ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java
@@ -1,7 +1,7 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.api.model.SysUserRole; import com.ruoyi.system.domain.SysUserRole; import org.apache.ibatis.annotations.Param; import java.util.List; ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/GenTableColumnService.java
File was deleted ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/GenTableService.java
File was deleted ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserRoleService.java
@@ -1,7 +1,7 @@ package com.ruoyi.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.system.api.model.SysUserRole; import com.ruoyi.system.domain.SysUserRole; import java.util.List;
File was deleted ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GenTableServiceImpl.java
File was deleted ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysJobLogServiceImpl.java
File was deleted ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysJobServiceImpl.java
File was deleted ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -7,14 +7,15 @@ import com.ruoyi.common.security.service.TokenService; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.domain.SysRole; import com.ruoyi.system.api.model.SysUserRole; import com.ruoyi.system.domain.SysMenu; import com.ruoyi.system.domain.SysMenus; import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.domain.vo.MetaVo; import com.ruoyi.system.domain.vo.RouterVo; import com.ruoyi.system.domain.vo.TreeSelect; import com.ruoyi.system.mapper.*; import com.ruoyi.system.service.ISysMenuService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -31,19 +32,19 @@ { public static final String PREMISSION_STRING = "perms[\"{0}\"]"; @Resource @Autowired private SysMenuMapper menuMapper; @Resource @Autowired private SysRoleMapper roleMapper; @Resource @Autowired private SysRoleMenuMapper roleMenuMapper; @Resource @Autowired private TokenService tokenService; @Resource @Autowired private SysUserRoleMapper sysUserRoleMapper; @Resource ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java
@@ -29,6 +29,7 @@ /** * 获取角色数据权限 * * @param userId 用户Id * @return 角色权限信息 */ @Override @@ -50,6 +51,7 @@ /** * 获取菜单数据权限 * * @param userId 用户Id * @return 菜单权限信息 */ @Override ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleDeptServiceImpl.java
File was deleted ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleMenuServiceImpl.java
File was deleted ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserPostServiceImpl.java
File was deleted ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserRoleServiceImpl.java
@@ -1,12 +1,12 @@ package com.ruoyi.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.api.model.SysUserRole; import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.mapper.SysUserRoleMapper; import com.ruoyi.system.service.ISysUserRoleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; /** @@ -17,7 +17,7 @@ */ @Service public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUserRole> implements ISysUserRoleService { @Resource @Autowired private SysUserRoleMapper sysUserRoleMapper; /** ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -2,8 +2,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.chargingPile.api.feignClient.SiteClient; import com.ruoyi.chargingPile.api.model.Site; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.utils.SpringUtils; @@ -13,8 +11,6 @@ import com.ruoyi.common.datascope.annotation.DataScope; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.other.api.feignClient.RoleSiteClient; import com.ruoyi.other.api.feignClient.UserSiteClient; import com.ruoyi.system.api.domain.SysRole; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.query.ChangeUserQuery; @@ -73,15 +69,6 @@ @Resource private ISysUserRoleService sysUserRoleService; @Resource private RoleSiteClient roleSiteClient; @Resource private UserSiteClient userSiteClient; @Resource private SiteClient siteClient; @Resource private ISysRoleService sysRoleService; @@ -525,24 +512,6 @@ List<SysUser> list = this.baseMapper.getList(pageInfo, getSysUserList); for (SysUser sysUser : list) { List<SysUserRole> list1 = sysUserRoleService.list(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, sysUser.getUserId())); List<Integer> data1 = userSiteClient.getSiteIds(sysUser.getUserId()).getData(); if (null == data1) { data1 = new ArrayList<>(); } for (SysUserRole sysUserRole : list1) { List<Integer> data = roleSiteClient.getSiteIds(sysUserRole.getRoleId()).getData(); if (null == data) { continue; } data1.addAll(data); } Set<Integer> siteIds = new HashSet<>(data1); List<Site> data = siteClient.getSiteByIds(siteIds.stream().collect(Collectors.toList())).getData(); if (null != data) { List<String> siteNames = data.stream().map(Site::getName).collect(Collectors.toList()); sysUser.setSiteNames(siteNames); sysUser.setSiteIds(data.stream().map(Site::getId).collect(Collectors.toList())); } List<String> roleNames = new ArrayList<>(); for (SysUserRole sysUserRole : list1) { SysRole sysRole = sysRoleService.selectRoleById(sysUserRole.getRoleId()); ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java
@@ -2,11 +2,12 @@ import com.alibaba.fastjson.JSON; import com.ruoyi.account.api.model.AppUser; import com.ruoyi.account.service.IAppUserService; import com.ruoyi.account.service.AppUserService; import com.ruoyi.common.core.constant.TokenConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.feignClient.SysUserClient; import org.apache.logging.log4j.core.config.Order; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +35,7 @@ @Lazy @Resource private IAppUserService appUserService; private AppUserService appUserService; @Lazy @Resource @@ -73,7 +74,7 @@ //小程序用户 if ("applet".equals(userType)) { AppUser appUser = appUserService.getById(userid); if(null == appUser || appUser.getDelFlag() == 1 || 3 == appUser.getStatus()){ if(null == appUser || appUser.getDelFlag() || 3 == appUser.getStatus()){ log.error("[账户异常处理]请求账户id:{}", userid); unauthorizedResponse(response,"无效的账户"); return; ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
@@ -10,7 +10,7 @@ import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.system.api.vo.LoginUser; import com.ruoyi.system.api.model.LoginUser; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -69,8 +69,8 @@ loginVo.setPhone(appUser.getPhone()); //构建token LoginUser loginUser = new LoginUser(); loginUser.setUserId(appUser.getId()); loginUser.setName(appUser.getName()); loginUser.setUserid(appUser.getId()); loginUser.setUsername(appUser.getName()); Map<String, Object> tokenApplet = tokenService.createTokenApplet(loginUser); loginVo.setToken(tokenApplet.get("access_token").toString()); loginVo.setFailureTime(Long.valueOf(tokenApplet.get("expires_in").toString())); @@ -108,8 +108,8 @@ loginVo.setPhone(appUser.getPhone()); //构建token LoginUser loginUser = new LoginUser(); loginUser.setUserId(appUser.getId()); loginUser.setName(appUser.getName()); loginUser.setUserid(appUser.getId()); loginUser.setUsername(appUser.getName()); Map<String, Object> tokenApplet = tokenService.createTokenApplet(loginUser); loginVo.setToken(tokenApplet.get("access_token").toString()); loginVo.setFailureTime(Long.valueOf(tokenApplet.get("expires_in").toString())); ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/weChat/WeChatUtil.java
@@ -24,13 +24,10 @@ @Value("${wx.appletsAppSecret}") private String wxAppletsAppSecret; @Value("{wx.officialAccountAppSecret}") private String officialAccountAppSecret; @Value("${wx.appid}") // @Value("${wx.appid}") private String webAppId; @Value("${wx.appSecret}") // @Value("${wx.appSecret}") private String webAppSecret;
ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AppUserMapper.xml
ruoyi-service/ruoyi-account/src/main/resources/mapper/account/BalanceChangeRecordMapper.xml
ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserAddressMapper.xml
ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserCancellationLogMapper.xml
ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserChangeLogMapper.xml
ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserClickLogMapper.xml
ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserCouponMapper.xml
ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserPointMapper.xml
ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserSignRecordMapper.xml
ruoyi-service/ruoyi-account/src/main/resources/mapper/account/WithdrawalRequestsMapper.xml
ruoyi-service/ruoyi-order/pom.xml
@@ -58,11 +58,6 @@ <groupId>com.alibaba.cloud</groupId> <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId> </dependency> <dependency> <groupId>com.alibaba.cloud</groupId> <artifactId>spring-cloud-starter-alibaba-seata</artifactId> </dependency> <!-- SpringBoot Actuator --> <dependency> ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -62,7 +62,7 @@ */ @ApiOperation(value = "扫码校验", tags = {"小程序-个人中心-门店管理-扫码核销校验"}) @ApiImplicitParams({ @ApiImplicitParam(value = "分享id", name = "shareId", required = true, dataType = "int"), @ApiImplicitParam(value = "分享id", name = "shareId", required = true, dataType = "int", paramType="query"), }) @GetMapping("/check/{orderId}/{shopId}") public R<Boolean> check(@PathVariable("orderId") Long orderId, @PathVariable("shopId") Long shopId){ ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/filter/AuthFilter.java
@@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.feignClient.SysUserClient; import org.apache.logging.log4j.core.config.Order; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,16 +32,16 @@ @Component public class AuthFilter implements Filter { private static final Logger log = LoggerFactory.getLogger(AuthFilter.class); @Lazy @Resource private AppUserClient appUserClient; @Lazy @Resource private SysUserClient sysUserClient; @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { HttpServletRequest request = (HttpServletRequest) servletRequest; @@ -68,7 +69,7 @@ //小程序用户 if ("applet".equals(userType)) { AppUser appUser = appUserClient.getAppUserById(Long.valueOf(userid)); if(null == appUser || appUser.getDelFlag() == 1 || 3 == appUser.getStatus()){ if(null == appUser || appUser.getDelFlag() || 3 == appUser.getStatus()){ log.error("[账户异常处理]请求账户id:{}", userid); unauthorizedResponse(response,"无效的账户"); return; @@ -81,9 +82,9 @@ } filterChain.doFilter(servletRequest, servletResponse); } private void unauthorizedResponse(HttpServletResponse response, String msg) { response.setStatus(HttpStatus.OK.value()); response.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_UTF8_VALUE); @@ -97,9 +98,9 @@ writer.flush(); writer.close(); } /** * 获取请求token */ @@ -111,6 +112,6 @@ } return token; } } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderGoodMapper.java
@@ -1,7 +1,7 @@ package com.ruoyi.order.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import model.RefundPassOrderGood; import model.OrderGood; /** * <p> ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/RefundPassMapper.java
@@ -1,7 +1,7 @@ package com.ruoyi.order.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import model.RefundPassRefundPass; import model.RefundPass; /** * <p> ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderGoodService.java
@@ -2,7 +2,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import model.OrderGood; import model.RefundPassOrderGood; /** * <p> ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderGoodServiceImpl.java
@@ -1,9 +1,9 @@ package com.ruoyi.order.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.account.mapper.OrderGoodMapper; import model.RefundPassOrderGood; import com.ruoyi.account.service.OrderGoodService; import com.ruoyi.order.mapper.OrderGoodMapper; import com.ruoyi.order.service.OrderGoodService; import model.OrderGood; import org.springframework.stereotype.Service; /** ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java
@@ -1,9 +1,9 @@ package com.ruoyi.order.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.account.mapper.RefundPassMapper; import model.RefundPassRefundPass; import com.ruoyi.account.service.RefundPassService; import com.ruoyi.order.mapper.RefundPassMapper; import com.ruoyi.order.service.RefundPassService; import model.RefundPass; import org.springframework.stereotype.Service; /** ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml
@@ -43,70 +43,6 @@ shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} --- seata: enabled: true application-id: ${spring.application.name} tx-service-group: seata_tx_group #此处配置自定义的seata事务分组名称 enable-auto-data-source-proxy: false #关闭数据库代理 service: vgroup-mapping: seata_tx_group: default data-source-proxy-mode: AT config: type: nacos nacos: # 开发环境 server-addr: 192.168.110.169:8848 namespace: cdf47c5f-2bf9-4dec-a616-a8dc653aceb9 group: DEFAULT_GROUP data-id: seata-server.properties username: nacos password: nacos # 生产环境 # server-addr: 192.168.0.137:8848,192.168.0.123:8848 # namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a # group: DEFAULT_GROUP # data-id: seata-server.properties # username: nacos # password: nacos registry: type: nacos nacos: application: seata-server # 开发环境 server-addr: 192.168.110.169:8848 namespace: cdf47c5f-2bf9-4dec-a616-a8dc653aceb9 group: DEFAULT_GROUP username: nacos password: nacos # 生产环境 # server-addr: 192.168.0.137:8848,192.168.0.123:8848 # namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a # group: DEFAULT_GROUP # username: nacos # password: nacos cloud: nacos: discovery: # 开发环境 server-addr: 192.168.110.169:8848 namespace: cdf47c5f-2bf9-4dec-a616-a8dc653aceb9 # 命名空间 group: DEFAULT_GROUP application: seata-server #Nacos 中 Seata 名称 username: nacos password: nacos # 生产环境 # server-addr: 192.168.0.137:8848,192.168.0.123:8848 # namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a # group: DEFAULT_GROUP # application: seata-server #Nacos 中 Seata 名称 # username: nacos # password: nacos sentinel: transport: dashboard: 127.0.0.1:8080 # Sentinel控制台地址 eager: true --- spring: config: activate: ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderGoodMapper.xml
New file @@ -0,0 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.account.mapper.OrderGoodMapper"> </mapper> ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
New file @@ -0,0 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.account.mapper.OrderMapper"> </mapper> ruoyi-service/ruoyi-order/src/main/resources/mapper/order/RefundPassMapper.xml
New file @@ -0,0 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.account.mapper.RefundPassMapper"> </mapper> ruoyi-service/ruoyi-order/src/main/resources/mapping/OrderGoodMapper.xml
File was deleted ruoyi-service/ruoyi-order/src/main/resources/mapping/OrderMapper.xml
File was deleted ruoyi-service/ruoyi-order/src/main/resources/mapping/RefundPassMapper.xml
File was deleted ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/AgreementController.java
@@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ruoyi.common.core.domain.R; import com.ruoyi.other.api.model.Agreement; import com.ruoyi.other.api.domain.Agreement; import com.ruoyi.other.service.IAgreementService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/filter/AuthFilter.java
@@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.feignClient.SysUserClient; import org.apache.logging.log4j.core.config.Order; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -68,7 +69,7 @@ //小程序用户 if ("applet".equals(userType)) { AppUser appUser = appUserClient.getAppUserById(Long.valueOf(userid)); if(null == appUser || 1 == appUser.getDelFlag() || 3 == appUser.getStatus()){ if(null == appUser || appUser.getDelFlag() || 3 == appUser.getStatus()){ log.error("[账户异常处理]请求账户id:{}", userid); unauthorizedResponse(response,"无效的账户"); return; ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/AgreementMapper.java
@@ -1,7 +1,7 @@ package com.ruoyi.other.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.other.api.model.Agreement; import com.ruoyi.other.api.domain.Agreement; /** * @author zhibing.pu ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/IAgreementService.java
@@ -1,7 +1,7 @@ package com.ruoyi.other.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.other.api.model.Agreement; import com.ruoyi.other.api.domain.Agreement; /** * @author zhibing.pu ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/AgreementServiceImpl.java
@@ -1,7 +1,7 @@ package com.ruoyi.other.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.other.api.model.Agreement; import com.ruoyi.other.api.domain.Agreement; import com.ruoyi.other.mapper.AgreementMapper; import com.ruoyi.other.service.IAgreementService; import org.springframework.stereotype.Service; ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TechnicianSubscribeMapper.xml
@@ -1,10 +1,8 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.other.mapper.TechnicianSubscribeMapper"> <select id="getTechnicianSubscribeByUserAndShop" resultType="com.ruoyi.other.vo.TechnicianSubscribeVO"> <select id="getTechnicianSubscribeByUserAndShop" resultType="com.ruoyi.other.vo.TechnicianSubscribeVO"> SELECT tts.user_address, ts.`name` shopName,
