winter 1 год назад
Родитель
Сommit
06c1be9646
3 измененных файлов: 21 добавлений и 17 удалений
  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. +9
    -5
      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("/**", "corsFilter,token,authc");
// filterChainDefinitionMap.put("/**", "anon");
filterChainDefinitionMap.put("/**", "anon");


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(){
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);


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

@@ -2679,7 +2679,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
}else {
sb.append("跳点规则计算金额:"+jumppay.toPlainString()+",合同租金扣点规则计算金额:"+needpay+".");
}
sb.append("取高后总金额为:"+needpay+".");
sb.append("取高后总金额为:["+needpay+"].");
//保存销售额
WxRentContractRevenueSales rs = new WxRentContractRevenueSales();
rs.updateTenantInfo(rentcontract);
@@ -2734,6 +2734,10 @@ public class WxRentContractServiceImpl implements WxRentContractService {
throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"系统配置"+SysConfigConstant.rent_share_bill_rate+"未配置。");
}
moneyShareRates = shareConfig.getConfigItemValue().split(",");
moneyShareRates[0] = new BigDecimal(moneyShareRates[0]).divide(new BigDecimal(100)).toPlainString();
moneyShareRates[1] = new BigDecimal(moneyShareRates[1]).divide(new BigDecimal(100)).toPlainString();
moneyShareRates[2] = new BigDecimal(moneyShareRates[2]).divide(new BigDecimal(100)).toPlainString();
moneyShareRates[3] = new BigDecimal(moneyShareRates[3]).divide(new BigDecimal(100)).toPlainString();
}
String rentRate = moneyShareRates[0];
@@ -2743,7 +2747,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
//更新账单费用
String rentneedpay = new BigDecimal(needpay).multiply(new BigDecimal(rentRate)).setScale(rentcontract.getDecimalSize(),BigDecimal.ROUND_HALF_UP).toPlainString();
if (null != rentBill) {
sb.append("租金原合同租金金额:"+rentBill.getNeedPay()+"元,计算之后为:"+rentneedpay+"元。");
sb.append(" 租金原合同租金金额:"+rentBill.getNeedPay()+"元,分摊比率为:"+rentRate+",计算之后为:"+rentneedpay+"元。");
rentBill.setMoneyChangeDetail(sb.toString());
rentBill.setReceivePay(rentneedpay);
rentBill.setBillRemark("设置销售额,自动计算");
@@ -2828,7 +2832,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
bmbill.setStatus(EnumBillStatus.WAIT_PAY.getCode());
bmbill.setBillRemark(createFrom.getMessage()+",自动计算创建");
bmbill.setExtraCreateFrom(createFrom.getCode());
bmbill.setMoneyChangeDetail("自动计算创建,应收金额为:"+bussinessmoney+"元,");
bmbill.setMoneyChangeDetail("自动计算创建,总计分摊比率为:"+rate+",应收金额为:"+bussinessmoney+"元,");
wxAllBillMapper.insert(bmbill);
}
@@ -2871,7 +2875,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
bmbill.setStatus(EnumBillStatus.WAIT_PAY.getCode());
bmbill.setBillRemark(createFrom.getMessage()+",自动计算创建");
bmbill.setExtraCreateFrom(createFrom.getCode());
bmbill.setMoneyChangeDetail("自动计算创建,应收金额为:"+bussinessmoney+"元,");
bmbill.setMoneyChangeDetail("自动计算创建,总计分摊比率为:"+rate+",应收金额为:"+bussinessmoney+"元,");
wxAllBillMapper.insert(bmbill);
return bmbill;
}
@@ -2900,7 +2904,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
bmbill.setStatus(EnumBillStatus.WAIT_PAY.getCode());
bmbill.setBillRemark(createFrom.getMessage()+",自动计算创建");
bmbill.setExtraCreateFrom(createFrom.getCode());
bmbill.setMoneyChangeDetail("自动计算创建,比例为"+rate+",计算应收金额为:"+money+"元,");
bmbill.setMoneyChangeDetail("自动计算创建,分摊比例为"+rate+",计算应收金额为:"+money+"元,");
wxAllBillMapper.insert(bmbill);
return bmbill;


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