diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxLevelConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxLevelConfigController.java index a1ec54ef0..20e3049ed 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxLevelConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxLevelConfigController.java @@ -52,14 +52,18 @@ public class WxLevelConfigController extends BaseController { String[] points = dto.getPoints().split("&"); String[] level = dto.getLevel().split("&"); String[] descs =dto.getDescription().split("&"); + if (points.length != level.length) { + return new ResultData(Result.ERROR, "请同时设置成长值和等级"); + } String tenantId = getTenantId(); - wxLevelConfigService.deleteAll(); + wxLevelConfigService.deleteAll(tenantId); for(int i=0;i 0 && i < descs.length) + wxLevelConfig.setDescription(descs[i]); wxLevelConfigService.saveOrUpdate(wxLevelConfig); } return new ResultData(); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxLevelConfigMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxLevelConfigMapper.java index 18f5c2b0e..54daa248a 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxLevelConfigMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxLevelConfigMapper.java @@ -10,7 +10,7 @@ public interface WxLevelConfigMapper extends CommonMapper { List findList(WxLevelConfig wxLevelConfig); - void deleteAll(); + void deleteAll(@Param("tenantId")String tenantId); String getLevel(@Param("tenantId")String tenantId,@Param("poins")Integer poins); diff --git a/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java b/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java index 70e894f4a..9dd2de352 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java @@ -47,7 +47,7 @@ public interface WxLevelConfigService { void deleteById(Long id); - void deleteAll(); + void deleteAll(String tenantId); /** * 根据积分获取会员等级 * @param tenantId diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java index 560155eb5..30a87e41c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java @@ -57,8 +57,8 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { } @Override - public void deleteAll() { - wxLevelConfigMapper.deleteAll(); + public void deleteAll(String tenantId) { + wxLevelConfigMapper.deleteAll(tenantId); } diff --git a/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml index 852c28334..2f58658b1 100644 --- a/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml @@ -1,72 +1,68 @@ - - - - - - - - - - + + + + + + + + + + `id`,`points`,`level`,`description`,`create_date`,`tenant_id` - - where 1 = 1 - - - and `id` = #{id} - - - - - and `points` = #{points} - - - - - and `level` like concat('%', #{level},'%') - - - - - and `description` like concat('%', #{description},'%') - - - - - and `create_date` = #{createDate} - - - - - and `tenant_id` = #{tenantId} - - - - and id in - - #{idItem} - - - order by ${sortColumns} - - - - - - delete from wx_level_config; - + + where 1 = 1 + + + and `id` = #{id} + + + + and `points` = #{points} + + + + and `level` like concat('%', #{level},'%') + + + + and `description` like concat('%', #{description},'%') + - + select + + from wx_level_config + + + + + delete from wx_level_config where `tenant_id` = #{tenantId}; + + + - - + +