diff --git a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java index 3463ea458..ab71e3397 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java @@ -163,7 +163,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/logout", "authc"); filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); -// filterChainDefinitionMap.put("/**", "anon"); + filterChainDefinitionMap.put("/**", "anon"); shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java index fa0b4e34a..247597318 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -52,13 +52,13 @@ public class BaseController { }); } 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; } @@ -80,10 +80,10 @@ public class BaseController { */ public TenantEntity getTenantInfo(){ 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.setTenantId(tenantId); tenantEntity.setParentTenantId(parentTenantId); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileRenevueMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileRenevueMapper.java index 2d7becdc8..61e941480 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileRenevueMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileRenevueMapper.java @@ -15,5 +15,7 @@ public interface WxRentContractAgileRenevueMapper extends CommonMapper findIdList(WxRentContractAgileRenevue wxBillRent); + + void deleteRenevue(WxRentContractAgileRenevue wxBillRent); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileUnDepositMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileUnDepositMapper.java index 9dfb859ee..29acaa439 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileUnDepositMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileUnDepositMapper.java @@ -21,5 +21,7 @@ public interface WxRentContractAgileUnDepositMapper extends CommonMapper - delete from wx_rent_contract_agile_renevue_fees where agile_renevue_id = #{agileRenevueId} + delete from wx_rent_contract_agile_renevue_fees + diff --git a/mallinkService/src/main/resources/mapper/WxRentContractAgileRenevueItemMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractAgileRenevueItemMapper.xml index cc097b267..9f6242d8b 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractAgileRenevueItemMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractAgileRenevueItemMapper.xml @@ -65,7 +65,8 @@ - delete from wx_rent_contract_agile_renevue_item where `renevue_id` = #{renevueId} + delete from wx_rent_contract_agile_renevue_item + diff --git a/mallinkService/src/main/resources/mapper/WxRentContractAgileRenevueMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractAgileRenevueMapper.xml index b89e6b466..bb687f2d4 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractAgileRenevueMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractAgileRenevueMapper.xml @@ -58,5 +58,10 @@ from wx_rent_contract_agile_renevue where id = #{id} and `tenant_id` = #{tenantId} + + delete from wx_rent_contract_agile_renevue + + + diff --git a/mallinkService/src/main/resources/mapper/WxRentContractAgileUnDepositItemMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractAgileUnDepositItemMapper.xml index e25d4d2a4..9be9d1290 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractAgileUnDepositItemMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractAgileUnDepositItemMapper.xml @@ -75,7 +75,8 @@ - delete from wx_rent_contract_agile_un_deposit_item where `un_deposit_id` = #{unDepositId} + delete from wx_rent_contract_agile_un_deposit_item + diff --git a/mallinkService/src/main/resources/mapper/WxRentContractAgileUnDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractAgileUnDepositMapper.xml index aa2b873dd..795b5381d 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractAgileUnDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractAgileUnDepositMapper.xml @@ -76,5 +76,9 @@ delete from wx_rent_contract_agile_un_deposit where id = #{id} and `tenant_id` = #{tenantId} + + delete from wx_rent_contract_agile_un_deposit where rent_contract_id = #{rentContractId} and `tenant_id` = #{tenantId} + +