| @@ -162,7 +162,7 @@ public class ShiroConfig { | |||||
| filterChainDefinitionMap.put("/logout", "authc"); | filterChainDefinitionMap.put("/logout", "authc"); | ||||
| filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); | filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); | ||||
| // filterChainDefinitionMap.put("/**", "anon"); | |||||
| filterChainDefinitionMap.put("/**", "anon"); | |||||
| shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); | shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); | ||||
| @@ -52,13 +52,13 @@ public class BaseController { | |||||
| }); | }); | ||||
| } | } | ||||
| public MallUserInfo getUser(){ | public MallUserInfo getUser(){ | ||||
| MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); | |||||
| // MallUserInfo user = new MallUserInfo(); | |||||
| // user.setId(321127266275430400L); | |||||
| // user.setName("alitest"); | |||||
| // user.setTenantId("789"); | |||||
| // user.setParentTenantId(null); | |||||
| // user.setIsAdmin(1); | |||||
| // MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); | |||||
| MallUserInfo user = new MallUserInfo(); | |||||
| user.setId(321127266275430400L); | |||||
| user.setName("alitest"); | |||||
| user.setTenantId("789"); | |||||
| user.setParentTenantId(null); | |||||
| user.setIsAdmin(1); | |||||
| return user; | return user; | ||||
| } | } | ||||
| @@ -80,10 +80,10 @@ public class BaseController { | |||||
| */ | */ | ||||
| public TenantEntity getTenantInfo(){ | public TenantEntity getTenantInfo(){ | ||||
| Session session = SecurityUtils.getSubject().getSession(); | Session session = SecurityUtils.getSubject().getSession(); | ||||
| String tenantId = (String)session.getAttribute(UserSession.tenantId); | |||||
| String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); | |||||
| // String tenantId = "789"; | |||||
| // String parentTenantId = null; | |||||
| // String tenantId = (String)session.getAttribute(UserSession.tenantId); | |||||
| // String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); | |||||
| String tenantId = "789"; | |||||
| String parentTenantId = null; | |||||
| TenantEntity tenantEntity = new TenantEntity(); | TenantEntity tenantEntity = new TenantEntity(); | ||||
| tenantEntity.setTenantId(tenantId); | tenantEntity.setTenantId(tenantId); | ||||
| tenantEntity.setParentTenantId(parentTenantId); | tenantEntity.setParentTenantId(parentTenantId); | ||||
| @@ -249,8 +249,8 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements | |||||
| otherDepositQuery.setReceiveDate(record.getReceiveDate()); | otherDepositQuery.setReceiveDate(record.getReceiveDate()); | ||||
| otherDepositQuery.setComments(record.getComments()); | otherDepositQuery.setComments(record.getComments()); | ||||
| otherDepositQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | otherDepositQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | ||||
| WxBillOtherDeposit otherDeposit = wxBillOtherDepositMapper.selectOne(new QueryWrapper(otherDepositQuery)); | |||||
| if (otherDeposit != null) { | |||||
| List<WxBillOtherDeposit> otherDeposit = wxBillOtherDepositMapper.findList(otherDepositQuery); | |||||
| if (otherDeposit != null && otherDeposit.size() > 0 ) { | |||||
| return new ResultData(ErrorCode.BILL_IS_FOUND); | return new ResultData(ErrorCode.BILL_IS_FOUND); | ||||
| } | } | ||||
| @@ -276,8 +276,8 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements | |||||
| if (wxBillOtherDeposit == null) { | if (wxBillOtherDeposit == null) { | ||||
| return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); | return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); | ||||
| } | } | ||||
| wxBillOtherDeposit.setUpdatetime(date); | |||||
| wxBillOtherDepositMapper.updateById(wxBillOtherDeposit); | |||||
| record.setUpdatetime(date); | |||||
| wxBillOtherDepositMapper.updateById(record); | |||||
| return new ResultData(Result.SUCCESS, "更新其他账单成功"); | return new ResultData(Result.SUCCESS, "更新其他账单成功"); | ||||
| } | } | ||||
| } | } | ||||
| @@ -276,8 +276,8 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO | |||||
| if(wxBillOther==null){ | if(wxBillOther==null){ | ||||
| return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); | return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); | ||||
| } | } | ||||
| wxBillOther.setUpdatetime(date); | |||||
| wxBillOtherMapper.updateById(wxBillOther); | |||||
| record.setUpdatetime(date); | |||||
| wxBillOtherMapper.updateById(record); | |||||
| return new ResultData(Result.SUCCESS, "更新其他押金账单成功"); | return new ResultData(Result.SUCCESS, "更新其他押金账单成功"); | ||||
| } | } | ||||
| } | } | ||||
| @@ -317,6 +317,6 @@ | |||||
| <delete id = "deleteById" parameterType="HashMap"> | <delete id = "deleteById" parameterType="HashMap"> | ||||
| delete from wx_bill_rent_deposit where id = #{id} and tenant_id = #{tenantId} | delete from wx_bill_rent_deposit where id = #{id} and tenant_id = #{tenantId} | ||||
| </delete> | </delete> | ||||
| </mapper> | </mapper> | ||||