Просмотр исходного кода

Merge branch 'release_real_202008' of https://git.malls.iformall.com/server/formallProject into release_real_202008

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
a2507125a7
5 измененных файлов: 15 добавлений и 14 удалений
  1. +1
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java
  2. +6
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMall.java
  4. +5
    -7
      mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml
  5. +0
    -4
      mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml

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

@@ -64,7 +64,6 @@ public class WxLevelConfigController extends BaseController {
public ResultData add(@RequestBody List<WxLevelConfig> levelConfigs) {
logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add");
try {

if (StringUtils.isNotBlank(ifParentUpdateTenantInfo().getParentTenantId())) {
return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限");
}
@@ -98,7 +97,7 @@ public class WxLevelConfigController extends BaseController {
@SystemControllerLog(description = "会员等级权益-删除")
public ResultData delete(@RequestBody WxLevelConfig wxLevelConfig) {
logger.debug("[" + getIpAddr() + "] WxLevelConfigController::delete");
if (StringUtils.isNotBlank(getTenantInfo().getParentTenantId())) {
if (StringUtils.isNotBlank(ifParentUpdateTenantInfo().getParentTenantId())) {
return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限");
}
wxLevelConfigService.deleteById(wxLevelConfig.getId());


+ 6
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java Просмотреть файл

@@ -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 Просмотреть файл

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



+ 5
- 7
mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml Просмотреть файл

@@ -146,10 +146,10 @@
</if>

<if test=" null != tenantInfo.tenantId and '' != tenantInfo.tenantId">
and wcu.`tenant_id` = #{tenantId}
and wcu.`tenant_id` = #{tenantInfo.tenantId}
</if>
<if test=" null != tenantInfo.parentTenantId and '' != tenantInfo.parentTenantId">
and wcu.`parent_tenant_id` = #{parentTenantId}
and wcu.`parent_tenant_id` = #{tenantInfo.parentTenantId}
</if>

<if test=" null != basicInfo.phone ">
@@ -203,7 +203,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>

@@ -537,7 +537,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
@@ -554,7 +553,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}
@@ -613,10 +611,10 @@
and wcu.`parent_tenant_id` = #{tenantInfo.parentTenantId}
</if>
<if test=" null != basicInfo.startTime ">
and wcubi.create_date &gt;= #{startTime}
and wcubi.create_date &gt;= #{basicInfo.startTime}
</if>
<if test=" null != basicInfo.endTime">
and wcubi.create_date &lt; #{endTime}
and wcubi.create_date &lt; #{basicInfo.endTime}
</if>
<if test="1 == basicInfo.reportType or 2 == basicInfo.reportType or 3 == basicInfo.reportType">
group by wcubi.reportTime


+ 0
- 4
mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml Просмотреть файл

@@ -28,9 +28,6 @@
<if test=" null != tenantId and '' != tenantId">
and wlc.`tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and wm.`parent_tenant_id` = #{parentTenantId}
</if>

<if test=" null != points ">
and wlc.`points` = #{points}
@@ -70,7 +67,6 @@
select
<include refid="allColumns"/>
from wx_level_config wlc
left join wx_mall wm on wm.tenant_id = wlc.tenant_id
<include refid="dynamicWhereConditions"/>
</select>



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