winter 1 год назад
Родитель
Сommit
a369f6d9c3
5 измененных файлов: 26 добавлений и 15 удалений
  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. +10
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java
  4. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java
  5. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java Просмотреть файл

@@ -163,7 +163,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);


+ 11
- 11
mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java Просмотреть файл

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


+ 10
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java Просмотреть файл

@@ -751,7 +751,16 @@ public class WxAllBillController extends BillBaseController {
record.setOweBillLastTime(billAllHelper.getDateBefore(getOweBillBeforeDays())); record.setOweBillLastTime(billAllHelper.getDateBefore(getOweBillBeforeDays()));
record.setNearBillLastTime(billAllHelper.getDateBefore(getNearBillBeforeDays())); record.setNearBillLastTime(billAllHelper.getDateBefore(getNearBillBeforeDays()));
} }
}
if (StringUtils.isNotBlank(record.getEnergyFeesIdStr())) {
String[] feesIds = record.getEnergyFeesIdStr().split(",");
List<Long> feesIdList = new ArrayList<Long>();
if (null != feesIds && feesIds.length > 0 ) {
for (int i = 0 ; i < feesIds.length ; i ++) {
feesIdList.add(Long.parseLong(feesIds[i]));
}
}
record.setEnergyFeesIds(feesIdList);;
} }
record.setIsPreview(EnumYesOrNo.NO.getCode()); record.setIsPreview(EnumYesOrNo.NO.getCode());
record.setSortColumns("status asc, starttime asc , merchant_id desc"); record.setSortColumns("status asc, starttime asc , merchant_id desc");


+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java Просмотреть файл

@@ -385,4 +385,6 @@ public class WxAllBill extends TenantEntity {
public List<Long> energyFeesIds; public List<Long> energyFeesIds;
@TableField(exist = false) @TableField(exist = false)
public Integer advanceHasMoney; public Integer advanceHasMoney;
@TableField(exist = false)
private String energyFeesIdStr;
} }

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -2935,8 +2935,8 @@ public class WxRentContractServiceImpl implements WxRentContractService {
propertyBillq.setBillType(EnumBillAllType.PROPERTY.getCode()); propertyBillq.setBillType(EnumBillAllType.PROPERTY.getCode());
propertyBillq.setEnergyFeesId(EnumBillAllType.PROPERTY.getEnergyFeesId()); propertyBillq.setEnergyFeesId(EnumBillAllType.PROPERTY.getEnergyFeesId());
propertyBillq.setIsPreview(EnumYesOrNo.NO.getCode()); propertyBillq.setIsPreview(EnumYesOrNo.NO.getCode());
propertyBillq.setStarttimeEqual(rentcontract.getYearsBegin());
propertyBillq.setEndtimeEqual(rentcontract.getYearsEnd());
propertyBillq.setStarttime(rentcontract.getYearsBegin());
propertyBillq.setEndtime(rentcontract.getYearsEnd());
WxBillSum propertyBillSum = wxAllBillMapper.getBillMonthSum(propertyBillq); WxBillSum propertyBillSum = wxAllBillMapper.getBillMonthSum(propertyBillq);
if (null != propertyBillSum) { if (null != propertyBillSum) {
receivepay = receivepay.add(propertyBillSum.getNeedPayNumber()); receivepay = receivepay.add(propertyBillSum.getNeedPayNumber());


Загрузка…
Отмена
Сохранить