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

Merge branch 'dev-new' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev-new

Browse Source
This commit is contained in:
Lemon
2024-12-12 15:25:28 +08:00
parent b24c5df37c a8b8865348
commit 0374405420
10 changed files with 91 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
View File

@@ -666,6 +666,7 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService {
* 0x23信息设置缓存 (缓存时间3天)
* @param data
*/
@Override
public void saveBMSDemandAndChargerOutputInfo2Redis(BMSDemandAndChargerOutputData data) {
if (StringUtils.equals(data.getTransactionCode(), Constants.ILLEGAL_TRANSACTION_CODE)) {
return;

1
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMemberRelationServiceImpl.java
View File

@@ -116,6 +116,7 @@ public class PileMemberRelationServiceImpl implements PileMemberRelationService
return selectPileMemberRelationList(pileMemberRelation);
}
@Override
public List<MemberVO> selectMemberList(String pileSn) {
return pileMemberRelationMapper.selectMemberList(pileSn);
}

18
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java
View File

@@ -16,6 +16,7 @@ import com.jsowell.common.enums.ykc.OrderPayRecordEnum;
import com.jsowell.common.enums.ykc.OrderStatusEnum;
import com.jsowell.common.util.DateUtils;
import com.jsowell.common.util.StringUtils;
import com.jsowell.common.util.YKCUtils;
import com.jsowell.pile.domain.*;
import com.jsowell.pile.domain.ebike.deviceupload.EBikeMessageCmd03;
import com.jsowell.pile.dto.*;
@@ -242,6 +243,23 @@ public abstract class AbstractProgramLogic implements InitializingBean {
orderBasicInfo.setSettlementTime(DateUtils.getNowDate()); // 结算时间
}
orderBasicInfo.setRefundAmount(residue); // 结算退款金额
if (StringUtils.isBlank(orderBasicInfo.getStartSoc()) || StringUtils.isBlank(orderBasicInfo.getEndSoc())) {
try {
Map<String, String> socMap = YKCUtils.getSOCMap(orderBasicInfo.getTransactionCode());
if (Objects.nonNull(socMap)) {
if (StringUtils.isBlank(orderBasicInfo.getStartSoc())) {
orderBasicInfo.setStartSoc(socMap.get("startSoc"));
}
if (StringUtils.isBlank(orderBasicInfo.getEndSoc())) {
orderBasicInfo.setEndSoc(socMap.get("endSoc"));
}
}
} catch (Exception e) {
logger.error("获取订单充电开始结束SOC失败:{}", e.getMessage());
}
}
}
/**