diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/StationSplitConfigController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/StationSplitConfigController.java new file mode 100644 index 000000000..61f344ba5 --- /dev/null +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/StationSplitConfigController.java @@ -0,0 +1,28 @@ +package com.jsowell.web.controller.pile; + +import com.jsowell.common.core.controller.BaseController; +import com.jsowell.common.core.domain.AjaxResult; +import com.jsowell.pile.dto.SplitConfigDTO; +import com.jsowell.pile.service.StationSplitConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; + +/** + * 站点分成配置controller + */ +@RestController +@RequestMapping("/station/splitconfig") +public class StationSplitConfigController extends BaseController { + @Autowired + private StationSplitConfigService stationSplitConfigService; + + @RequestMapping("/insertSplitConfig") + public AjaxResult insertSplitConfig(HttpServletRequest request, @RequestBody SplitConfigDTO splitDetailDTO) { + int result = stationSplitConfigService.insertSplitConfig(splitDetailDTO); + return result > 0 ? success() : error(); + } +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/StationSplitConfigMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/StationSplitConfigMapper.java index bbf4c9f6c..7a88b5ee3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/StationSplitConfigMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/StationSplitConfigMapper.java @@ -1,6 +1,7 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.StationSplitConfig; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -17,4 +18,9 @@ public interface StationSplitConfigMapper { * 批量插入站点分账配置 */ int batchInsert(List splitConfigList); + + /** + * 根据运营商id和站点id逻辑删除 + */ + int deleteByMerchantIdAndStationId(@Param("merchantId") String merchantId, @Param("stationId") String stationId); } \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java index 5f61a8c75..a622df0db 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java @@ -1,6 +1,9 @@ package com.jsowell.pile.service.impl; import com.google.common.collect.Lists; +import com.jsowell.common.enums.DelFlagEnum; +import com.jsowell.common.util.DateUtils; +import com.jsowell.common.util.SecurityUtils; import com.jsowell.pile.domain.StationSplitConfig; import com.jsowell.pile.dto.SplitConfigDTO; import com.jsowell.pile.dto.SplitUserDetailDTO; @@ -10,6 +13,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; +import java.util.Date; import java.util.List; @Service @@ -41,7 +45,11 @@ public class StationSplitConfigServiceImpl implements StationSplitConfigService{ return 0; } + // 先删除该充电站的所有分成配置 + stationSplitConfigMapper.deleteByMerchantIdAndStationId(splitConfigDTO.getMerchantId(), splitConfigDTO.getStationId()); // 保存到数据库 + String createBy = SecurityUtils.getLoginUser().getUsername(); + Date nowDate = DateUtils.getNowDate(); List splitConfigList = Lists.newArrayList(); for (SplitUserDetailDTO splitUserDetailDTO : splitUserDetailList) { StationSplitConfig splitConfig = StationSplitConfig.builder() @@ -50,6 +58,9 @@ public class StationSplitConfigServiceImpl implements StationSplitConfigService{ .adapayMemberId(splitUserDetailDTO.getAdapayMemberId()) .electricitySplitRatio(splitUserDetailDTO.getElectricitySplitRatio()) .serviceSplitRatio(splitUserDetailDTO.getServiceSplitRatio()) + .createBy(createBy) + .createTime(nowDate) + .delFlag(DelFlagEnum.NORMAL.getValue()) .build(); splitConfigList.add(splitConfig); } diff --git a/jsowell-pile/src/main/resources/mapper/pile/StationSplitConfigMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/StationSplitConfigMapper.xml index 6f3228898..dac7ea914 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/StationSplitConfigMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/StationSplitConfigMapper.xml @@ -44,4 +44,11 @@ #{item.delFlag,jdbcType=CHAR}) + + + update station_split_config + set del_flag = '1' + where merchant_id = #{merchantId} + and station_id = #{stationId} + \ No newline at end of file