Ver código fonte

login

release_toaliyun_real
xhxu 5 anos atrás
pai
commit
dbe33877fa
3 arquivos alterados com 10 adições e 4 exclusões
  1. +6
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMall.java
  3. +1
    -3
      mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml

+ 6
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java Ver arquivo

@@ -175,10 +175,15 @@ public class WxUserGrantController extends BaseController {
List<WxMall> mallList = null;
if(StringUtils.isNotBlank(wxMall.getParentTenantId())){
mallList = mallService.getSubByParentTenantId(wxMall.getParentTenantId());
resultMap.put("subMalls", JSON.toJSONString(mallList));
}
if (wxAuthorizerInfo.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) {
mallList = mallService.getSubByParentTenantId(wxMall.getTenantId());
}
if(mallList != null && mallList.size() >0){
mallList.stream().forEach(cs -> {
WxAppinfo cAppInfo = wxAppinfoService.getCAppInfo(cs.getTenantInfo(), EnumPayWay.PAY_WAY_WECHAT);
cs.setAppId(cAppInfo.getAppId());
});
resultMap.put("subMalls", JSON.toJSONString(mallList));
}



+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMall.java Ver arquivo

@@ -92,6 +92,9 @@ public class WxMall extends BaseEntity {
@TableField(exist = false)
protected List<WxMallBuilding> buildings;

@TableField(exist = false)
private String appId;

@TableField(exist = false)
private boolean valid;



+ 1
- 3
mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml Ver arquivo

@@ -198,7 +198,7 @@
<if test=" null != basicInfo.name ">
and wcubi.`name` like concat('%', #{basicInfo.name},'%')
</if>
<if test=" null != basicInfo.startTime and null! = basicInfo.endTime">
<if test=" null != basicInfo.startTime and null != basicInfo.endTime">
and wcubi.`create_date` between #{basicInfo.startTime} and #{basicInfo.endTime}
</if>

@@ -532,7 +532,6 @@

<if test="1 == reportType or 2 == reportType or 3 == reportType">
(select count(distinct wcubi.id) from wx_c_user_basic_info wcubi
left join wx_c_user wcu on wcu.user_id = wcubi.id
where 1=1
<if test="1 == reportType ">
date_format(wcubi.create_date, '%Y-%m-%d') &lt;= reportTime
@@ -549,7 +548,6 @@
) as totalCount
</if>
from wx_c_user_basic_info wcubi
left join wx_c_user wcu on wcu.user_id = wcubi.id
where 1=1
<if test=" null != finalTenantId and '' != finalTenantId">
and wcubi.`final_tenant_id` = #{finalTenantId}


Carregando…
Cancelar
Salvar