Browse Source

bug

release_toaliyun_real
xhxu 5 years ago
parent
commit
1e2a871b12
3 changed files with 7 additions and 4 deletions
  1. +3
    -0
      mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java
  2. +2
    -2
      mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
  3. +2
    -2
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

+ 3
- 0
mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java View File

@@ -67,6 +67,9 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
//设置userId到request里,后续根据userId,获取用户信息
request.setAttribute(Constant.LOGIN_USER_KEY, wxBuser.getId());
request.setAttribute(Constant.TENANT_ID, wxBuser.getTenantId());
if (StringUtils.isNotBlank(wxBuser.getParentTenantId())) {
request.setAttribute(Constant.PARENT_TENANT_ID, wxBuser.getParentTenantId());
}

//如果是要不需要自动设置tenantI信息


+ 2
- 2
mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml View File

@@ -278,7 +278,7 @@
</select>

<update id="insertBillAction">
insert into wx_bill_action(id,user_name,`action`,bill_id,details,tenant_id)
insert into wx_bill_action(id,user_name,`action`,bill_id,details,tenant_id,parent_tenant_id)
select
(select unix_timestamp(now()) + CEILING(RAND()*90000+10000) + CEILING(RAND()*90000+10000) + CEILING(RAND()*90000+10000)) id
,'系统端' user_name,7 `action`,b.id bill_id,
@@ -292,7 +292,7 @@
b.owe * (c.late_pay_ratio) /10000
,2)
)
,'元') details,b.tenant_id
,'元') details,b.tenant_id,b.parent_tenant_id
from wx_bill_property b left join wx_property_contract c on(b.`property_contract_id`=c.id)
where c.late_pay_ratio >0
and DATEDIFF(now(), date_add(b.receive_date,interval(c.late_pay_day) day)) >0


+ 2
- 2
mallinkService/src/main/resources/mapper/WxBillRentMapper.xml View File

@@ -279,7 +279,7 @@
</select>

<update id="insertBillAction">
insert into wx_bill_action(id,user_name,`action`,bill_id,details,tenant_id)
insert into wx_bill_action(id,user_name,`action`,bill_id,details,tenant_id,parent_tenant_id)
select
(select unix_timestamp(now()) + CEILING(RAND()*90000+10000) + CEILING(RAND()*90000+10000)+ CEILING(RAND()*90000+10000) ) id
,'系统端' user_name,7 `action`,b.id bill_id,
@@ -293,7 +293,7 @@
b.owe * (c.late_pay_ratio) /10000
,2)
)
,'元') details,b.tenant_id
,'元') details,b.tenant_id,b.parent_tenant_id
from wx_bill_rent b left join wx_rent_contract c on(b.rent_contract_id=c.id)
where c.late_pay_ratio >0
and DATEDIFF(now(), date_add(b.receive_date,interval(c.late_pay_day) day)) >0


Loading…
Cancel
Save