diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberGroupController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberGroupController.java index 7a1a845ea..7fb95cad5 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberGroupController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberGroupController.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.controller; +package com.jsowell.web.controller.pile; import com.alibaba.fastjson2.JSON; import com.jsowell.common.annotation.Log; @@ -142,4 +142,12 @@ public class MemberGroupController extends BaseController { startPage(); return getDataTable(memberGroupService.queryStationList(dto)); } + + /** + * 集团组移除站点 + */ + @PostMapping("/removeStationFromMemberGroup") + public AjaxResult removeStationFromMemberGroup(@RequestBody MemberGroupDTO dto) { + return toAjax(memberGroupService.removeStationFromMemberGroup(dto)); + } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateOrUpdateBillingTemplateDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateOrUpdateBillingTemplateDTO.java index 260bf4d68..e2a3ad50f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateOrUpdateBillingTemplateDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateOrUpdateBillingTemplateDTO.java @@ -22,9 +22,9 @@ public class CreateOrUpdateBillingTemplateDTO { private String name; /** - * 时段类型(1-尖时;2-峰时;3-平时;4-谷时) + * 车辆类型(1-电动汽车;2-电动自行车) */ - @ApiModelProperty("时段类型") + @ApiModelProperty("车辆类型") private String type; /** diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/MemberGroupDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/MemberGroupDTO.java index 196d488cd..4557def36 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/MemberGroupDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/MemberGroupDTO.java @@ -19,4 +19,6 @@ public class MemberGroupDTO extends BaseEntity { private String groupCode; private List merchantIdList; + + private String stationId; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupService.java index 3ecd92362..12ae7c6b6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupService.java @@ -102,4 +102,6 @@ public interface MemberGroupService { * @return */ List queryStationList(MemberGroupDTO dto); + + int removeStationFromMemberGroup(MemberGroupDTO dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBillingTemplateService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBillingTemplateService.java index ff32dd43f..33aec46d6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBillingTemplateService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBillingTemplateService.java @@ -170,6 +170,8 @@ public interface PileBillingTemplateService { List queryBillingDetailById(Long id); + int deletePreferentialBillingTemplate(String stationId); + // 批量查询站点计费模板 List selectBillingTemplateByStationIdList(List stationIdList); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java index 3e9942899..f8f5ddf81 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java @@ -26,6 +26,7 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.util.List; +import java.util.Objects; /** * 会员组Service业务层处理 @@ -264,6 +265,29 @@ public class MemberGroupServiceImpl implements MemberGroupService { return memberGroupMapper.queryStationList(dto); } + @Override + public int removeStationFromMemberGroup(MemberGroupDTO dto) { + String stationId = dto.getStationId(); + String groupCode = dto.getGroupCode(); + if (StringUtils.isBlank(stationId) || StringUtils.isBlank(groupCode)) { + return 0; + } + MemberGroup memberGroup = memberGroupMapper.selectByGroupCode(groupCode); + if (Objects.isNull(memberGroup)) { + return 0; + } + List stationIds = Lists.newArrayList(StringUtils.split(memberGroup.getStationId(), ",")); + if (CollectionUtils.isNotEmpty(stationIds)) { + stationIds.remove(stationId); + memberGroup.setStationId(StringUtils.join(stationIds, ",")); + memberGroupMapper.updateMemberGroup(memberGroup); + } + + // 删除该站点的会员优惠计费模板 + pileBillingTemplateService.deletePreferentialBillingTemplate(stationId); + return 0; + } + /** * 会员与集团的关系保存到数据库 * @param memberId 会员id diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java index de0397991..97f2c9901 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java @@ -236,7 +236,7 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic // 查询站点信息 billingTemplate.setName(dto.getName()); - billingTemplate.setType(String.valueOf(dto.getType())); + billingTemplate.setType(dto.getType()); billingTemplate.setTemplateRemark(dto.getTemplateRemark()); billingTemplate.setUpdateBy(SecurityUtils.getUsername()); billingTemplate.setFreeTime(dto.getFreeTime()); @@ -524,6 +524,16 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic return pileBillingTemplateMapper.queryPreferentialBillingTemplate(stationId); } + @Override + public int deletePreferentialBillingTemplate(String stationId) { + int i = 0; + BillingTemplateVO billingTemplate = queryPreferentialBillingTemplate(stationId); + if (Objects.nonNull(billingTemplate)) { + i = pileBillingTemplateMapper.deletePileBillingTemplateById(Long.parseLong(billingTemplate.getTemplateId())); + } + return i; + } + @Override public List selectBillingTemplateByStationIdList(List stationIdList) { if (CollectionUtils.isEmpty(stationIdList)) {