From dc706196ae075034e1435cf17e5997a22630af7f Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Fri, 24 Aug 2018 20:27:10 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BC=9A=E5=91=98=E7=AD=89=E7=BA=A7=E6=9D=83?= =?UTF-8?q?=E7=9B=8A][=E4=BF=AE=E6=94=B9]=E6=B7=BB=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxLevelConfigController.java | 31 +++++++++---- .../simple/domain/dto/WxLevelConfigDto.java | 45 +++++++++++++++++++ .../com/simple/domain/po/WxScoreRules.java | 32 ++++++------- .../simple/mapper/WxLevelConfigMapper.java | 2 +- .../simple/service/WxLevelConfigService.java | 3 +- .../impl/WxLevelConfigServiceImpl.java | 6 +++ .../resources/mapper/WxLevelConfigMapper.xml | 5 ++- .../resources/mapper/WxScoreRulesMapper.xml | 14 +++--- 8 files changed, 101 insertions(+), 37 deletions(-) create mode 100644 mallinkService/src/main/java/com/simple/domain/dto/WxLevelConfigDto.java diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxLevelConfigController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxLevelConfigController.java index c13f11c56..13ec0b946 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxLevelConfigController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxLevelConfigController.java @@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController; import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; +import com.simple.domain.dto.WxLevelConfigDto; import com.simple.domain.po.WxLevelConfig; import com.simple.service.WxLevelConfigService; @@ -43,20 +44,32 @@ public class WxLevelConfigController extends BaseController @ApiOperation("新增接口") @PostMapping("add") - public ResultData add(@RequestBody WxLevelConfig wxLevelConfig) { + public ResultData add(@RequestBody WxLevelConfigDto dto) { //Assert.notNull(wxLevelConfig.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxLevelConfig.setTenantId(getTenantId()); - wxLevelConfigService.saveOrUpdate(wxLevelConfig); + String[] points = dto.getPoints().split("|"); + String[] level = dto.getLevel().split("|"); + String[] descs =dto.getDescription().split("|"); + String tenantId = getTenantId(); + wxLevelConfigService.deleteAll(); + for(int i=0;i { List findList(WxLevelConfig wxLevelConfig); - + void deleteAll(); diff --git a/mallinkService/src/main/java/com/simple/service/WxLevelConfigService.java b/mallinkService/src/main/java/com/simple/service/WxLevelConfigService.java index dc3771151..0bf3b162e 100644 --- a/mallinkService/src/main/java/com/simple/service/WxLevelConfigService.java +++ b/mallinkService/src/main/java/com/simple/service/WxLevelConfigService.java @@ -1,6 +1,5 @@ package com.simple.service; -import java.util.*; import com.github.pagehelper.PageInfo; import com.simple.domain.po.WxLevelConfig; @@ -39,7 +38,7 @@ public interface WxLevelConfigService { void deleteById(Long id); - + void deleteAll(); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxLevelConfigServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxLevelConfigServiceImpl.java index 87f991409..eadcc89e5 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxLevelConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxLevelConfigServiceImpl.java @@ -43,6 +43,12 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { public void deleteById(Long id) { wxLevelConfigMapper.deleteByPrimaryKey(id); } + + @Override + public void deleteAll() { + wxLevelConfigMapper.deleteAll(); + + } diff --git a/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml index 8daad3625..e7fdb3570 100644 --- a/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml @@ -60,8 +60,9 @@ - - + + delete from wx_level_config; + diff --git a/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml b/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml index 9056f9221..b61e4d16a 100644 --- a/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml @@ -5,15 +5,15 @@ - + - + - `id`,`tenant_id`,`consumption_amount`,`score_number`,`create_date`,`update_date`,`login_count`,`type` + `id`,`tenant_id`,`consumption_amount`,`login_score_number`,`create_date`,`update_date`,`login_count`,`consumption_score_number` @@ -34,8 +34,8 @@ - - and `score_number` = #{scoreNumber} + + and `login_score_number` = #{loginScoreNumber} @@ -54,8 +54,8 @@ - - and `type` = #{type} + + and `consumption_score_number` = #{consumptionScoreNumber}