Procházet zdrojové kódy

login

release_toaliyun_real
xhxu před 5 roky
rodič
revize
7177e1c6f6
3 změnil soubory, kde provedl 5 přidání a 10 odebrání
  1. +1
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java
  2. +4
    -4
      mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml
  3. +0
    -4
      mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml

+ 1
- 2
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java Zobrazit soubor

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

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


+ 4
- 4
mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml Zobrazit soubor

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


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


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


+ 0
- 4
mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml Zobrazit soubor

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


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




Načítá se…
Zrušit
Uložit