autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 02:55:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-new' into dev-new-rabbitmq

Browse Source 
# Conflicts:
#	jsowell-admin/src/test/java/SpringBootTestController.java
This commit is contained in:
Guoqs
2025-01-02 16:59:01 +08:00
parent f4157ba3e3 bd98e8e197
commit 97f33a3c84
2 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jsowell-admin/src/test/java/SpringBootTestController.java
View File

@@ -286,6 +286,13 @@ public class SpringBootTestController {
System.out.println(YKCUtils.getNewLogicStationIdList());
}
@Test
public void querySplitConfigByStationIdTest() {
String stationId = "1";
List<SplitConfigVO> list = stationSplitConfigService.querySplitConfigByStationId(stationId);
System.out.println(JSON.toJSONString(list));
}
@Test
public void saveSOCTest() {
String transactionCode = "12345";

29
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java
View File

@@ -62,6 +62,33 @@ public class StationSplitConfigServiceImpl implements StationSplitConfigService{
@Override
public List<SplitConfigVO> querySplitConfigByStationId(String stationId) {
List<StationSplitConfig> stationSplitConfigs = stationSplitConfigMapper.queryByStationId(stationId);
// 如果查询为空, 初始化数据, 本站点对应的运营商分成100%
if (CollectionUtils.isEmpty(stationSplitConfigs)) {
// 根据运营商查询汇付会员信息
AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByStationId(stationId);
if (adapayMemberAccount == null) {
throw new BusinessException("", "未查询到该站点的汇付会员信息");
}
// 保存到数据库
List<StationSplitConfig> splitConfigList = Lists.newArrayList();
StationSplitConfig splitConfig = StationSplitConfig.builder()
.merchantId(adapayMemberAccount.getMerchantId())
.stationId(stationId)
.adapayMemberId(adapayMemberAccount.getAdapayMemberId())
.electricitySplitRatio(new BigDecimal(100))
.serviceSplitRatio(new BigDecimal(100))
.feeFlag(Constants.ONE)
.createBy("system")
.createTime(DateUtils.getNowDate())
.delFlag(DelFlagEnum.NORMAL.getValue())
.build();
splitConfigList.add(splitConfig);
stationSplitConfigMapper.batchInsert(splitConfigList);
// 再次查询
stationSplitConfigs = stationSplitConfigMapper.queryByStationId(stationId);
}
List<SplitConfigVO> resultList = Lists.newArrayList();
for (StationSplitConfig stationSplitConfig : stationSplitConfigs) {
SplitConfigVO vo = new SplitConfigVO();
@@ -161,7 +188,7 @@ public class StationSplitConfigServiceImpl implements StationSplitConfigService{
throw new BusinessException("", "服务费分成比例相加必须为100.0%");
}
String userName = SecurityUtils.getLoginUser().getUsername();
// 先删除该充电站的所有分成配置
// 先删除该充电站的所有分成配置 逻辑删除
stationSplitConfigMapper.deleteByMerchantIdAndStationId(splitConfigDTO.getMerchantId(), splitConfigDTO.getStationId(), userName, DateUtils.getNowDate());
// 保存到数据库
List<StationSplitConfig> splitConfigList = Lists.newArrayList();