Przeglądaj źródła

fix

release_toaliyun_real
winter 11 miesięcy temu
rodzic
commit
2a3537b9a5
10 zmienionych plików z 74 dodań i 15 usunięć
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java
  2. +11
    -11
      mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileRenevueMapper.java
  4. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileUnDepositMapper.java
  5. +43
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java
  6. +2
    -1
      mallinkService/src/main/resources/mapper/WxRentContractAgileRenevueFeesMapper.xml
  7. +2
    -1
      mallinkService/src/main/resources/mapper/WxRentContractAgileRenevueItemMapper.xml
  8. +5
    -0
      mallinkService/src/main/resources/mapper/WxRentContractAgileRenevueMapper.xml
  9. +2
    -1
      mallinkService/src/main/resources/mapper/WxRentContractAgileUnDepositItemMapper.xml
  10. +4
    -0
      mallinkService/src/main/resources/mapper/WxRentContractAgileUnDepositMapper.xml

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java Wyświetl plik

@@ -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);


+ 11
- 11
mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java Wyświetl plik

@@ -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);


+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileRenevueMapper.java Wyświetl plik

@@ -15,5 +15,7 @@ public interface WxRentContractAgileRenevueMapper extends CommonMapper<WxRentCon
WxRentContractAgileRenevue selectById(@Param("id")Long id,@Param("tenantId")String tenantId);
List<Long> findIdList(WxRentContractAgileRenevue wxBillRent);
void deleteRenevue(WxRentContractAgileRenevue wxBillRent);

}

+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileUnDepositMapper.java Wyświetl plik

@@ -21,5 +21,7 @@ public interface WxRentContractAgileUnDepositMapper extends CommonMapper<WxRentC
void updateJoinRenevueUp(WxRentContractAgileUnDeposit wxBillRent);
void deleteById(@Param("id")Long id,@Param("tenantId")String tenantId);
void deleteByContract(WxRentContractAgileUnDeposit wxBillRent);

}

+ 43
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java Wyświetl plik

@@ -1076,6 +1076,7 @@ public class WxAgileContractServiceImpl implements WxAgileContractService {
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
@Override
public void copyContractConfig(Long destId,WxRentContract orgContract,MallUserInfo user,boolean isReBuildUnDeposit) {
1111
final IdWorker idWorker = IdWorker.get();
WxContractShop csq = new WxContractShop();
csq.updateTenantInfo(user);
@@ -1408,6 +1409,48 @@ public class WxAgileContractServiceImpl implements WxAgileContractService {
@Override
public void deleteContract(Long id, TenantEntity tenantEntity) {
wxRentContractMapper.deleteById(id);
//删除其他相关设置
WxContractShop csq = new WxContractShop();
csq.updateTenantInfo(tenantEntity);
csq.setContractId(id);
wxContractShopMapper.deleteByCondition(csq);
WxRentContractAgileDeposit cadq = new WxRentContractAgileDeposit();
cadq.updateTenantInfo(tenantEntity);
cadq.setRentContractId(id);
wxRentContractAgileDepositMapper.deleteByContractId(cadq);
WxRentContractAgileUnDeposit raudq = new WxRentContractAgileUnDeposit();
raudq.updateTenantInfo(tenantEntity);
raudq.setRentContractId(id);
wxRentContractAgileUnDepositMapper.deleteByContract(raudq);
WxRentContractAgileUnDepositItem udiq = new WxRentContractAgileUnDepositItem();
udiq.updateTenantInfo(tenantEntity);
udiq.setRentContractId(id);
wxRentContractAgileUnDepositItemMapper.deleteByUnDeposit(udiq);
WxRentContractAgileRenevue rq = new WxRentContractAgileRenevue();
rq.updateTenantInfo(tenantEntity);
rq.setRentContractId(id);
wxRentContractAgileRenevueMapper.deleteRenevue(rq);
WxRentContractAgileRenevueItem riq = new WxRentContractAgileRenevueItem();
riq.updateTenantInfo(tenantEntity);
riq.setRentContractId(id);
wxRentContractAgileRenevueItemMapper.deleteByRenevue(riq);
WxRentContractAgileRenevueFees fq = new WxRentContractAgileRenevueFees();
fq.updateTenantInfo(tenantEntity);
fq.setRentContractId(id);
wxRentContractAgileRenevueFeesMapper.deleteByRenevue(fq);
WxRentContractRevenueJump crjq = new WxRentContractRevenueJump();
crjq.updateTenantInfo(tenantEntity);
crjq.setRentContractId(id);
wxRentContractRevenueJumpMapper.deleteByContract(crjq);
//删除草稿状态的账单
WxAllBill brDel = new WxAllBill();
brDel.setRentContractId(id);


+ 2
- 1
mallinkService/src/main/resources/mapper/WxRentContractAgileRenevueFeesMapper.xml Wyświetl plik

@@ -59,7 +59,8 @@
</select>
<delete id="deleteByRenevue" parameterType="com.iformall.domain.po.WxRentContractAgileRenevueFees">
delete from wx_rent_contract_agile_renevue_fees where agile_renevue_id = #{agileRenevueId}
delete from wx_rent_contract_agile_renevue_fees
<include refid="dynamicWhereConditions"/>
</delete>
</mapper>


+ 2
- 1
mallinkService/src/main/resources/mapper/WxRentContractAgileRenevueItemMapper.xml Wyświetl plik

@@ -65,7 +65,8 @@
</select>
<delete id="deleteByRenevue" parameterType="com.iformall.domain.po.WxRentContractAgileRenevueItem">
delete from wx_rent_contract_agile_renevue_item where `renevue_id` = #{renevueId}
delete from wx_rent_contract_agile_renevue_item
<include refid="dynamicWhereConditions"/>
</delete>
</mapper>


+ 5
- 0
mallinkService/src/main/resources/mapper/WxRentContractAgileRenevueMapper.xml Wyświetl plik

@@ -58,5 +58,10 @@
from wx_rent_contract_agile_renevue where id = #{id} and `tenant_id` = #{tenantId}
</select>
<delete id="deleteRenevue" parameterType="com.iformall.domain.po.WxRentContractAgileRenevue">
delete from wx_rent_contract_agile_renevue
<include refid="dynamicWhereConditions"/>
</delete>
</mapper>


+ 2
- 1
mallinkService/src/main/resources/mapper/WxRentContractAgileUnDepositItemMapper.xml Wyświetl plik

@@ -75,7 +75,8 @@
</select>
<delete id="deleteByUnDeposit" parameterType="com.iformall.domain.po.WxRentContractAgileUnDepositItem">
delete from wx_rent_contract_agile_un_deposit_item where `un_deposit_id` = #{unDepositId}
delete from wx_rent_contract_agile_un_deposit_item
<include refid="dynamicWhereConditions"/>
</delete>
</mapper>


+ 4
- 0
mallinkService/src/main/resources/mapper/WxRentContractAgileUnDepositMapper.xml Wyświetl plik

@@ -76,5 +76,9 @@
delete from wx_rent_contract_agile_un_deposit where id = #{id} and `tenant_id` = #{tenantId}
</delete>
<delete id="deleteByContract" parameterType="com.iformall.domain.po.WxRentContractAgileUnDeposit">
delete from wx_rent_contract_agile_un_deposit where rent_contract_id = #{rentContractId} and `tenant_id` = #{tenantId}
</delete>
</mapper>


Ładowanie…
Anuluj
Zapisz