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

update 生成订单保存运营商id

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-07-04 15:03:12 +08:00
parent 3ea5589592
commit bb9758dba0
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -1059,7 +1059,12 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
// 交易流水号
orderBasicInfo.setTransactionCode(data.getTransactionCode());
// 站点id
orderBasicInfo.setStationId(pileInfoVO.getStationId());
String stationId = pileInfoVO.getStationId();
orderBasicInfo.setStationId(stationId);
// 运营商id
PileStationInfo pileStationInfo = pileStationInfoService.selectPileStationInfoById(Long.valueOf(stationId));
String merchantId = pileStationInfo != null ? String.valueOf(pileStationInfo.getMerchantId()) : "";
orderBasicInfo.setMerchantId(merchantId);
// 充电桩编号
orderBasicInfo.setPileSn(data.getPileSn());
// 枪口号
@@ -1603,9 +1608,10 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
// 通过桩号查询所属站点
PileBasicInfo pileBasicInfo = pileBasicInfoService.selectPileBasicInfoBySN(pileSn);
Long stationId = pileBasicInfo.getStationId();
PileStationInfo pileStationInfo = pileStationInfoService.selectPileStationInfoById(stationId);
String merchantId = pileStationInfo != null ? String.valueOf(pileStationInfo.getMerchantId()) : "";
// 自动余额全部支付订单 个人桩站点不计费
// 将此订单信息存入订单表
String orderCode = IdUtils.getOrderCode();
// 订单基本信息
@@ -1615,6 +1621,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
.orderStatus(OrderStatusEnum.NOT_START.getValue())
.memberId(memberVO.getMemberId())
.stationId(String.valueOf(stationId))
.merchantId(merchantId)
.pileSn(pileSn)
.connectorCode(connectorCode)
.pileConnectorCode(pileSn + connectorCode)
@@ -1704,7 +1711,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
// 通过桩号查询所属站点
PileBasicInfo pileBasicInfo = pileBasicInfoService.selectPileBasicInfoBySN(pileSn);
Long stationId = pileBasicInfo.getStationId();
PileStationInfo pileStationInfo = pileStationInfoService.selectPileStationInfoById(stationId);
String merchantId = pileStationInfo != null ? String.valueOf(pileStationInfo.getMerchantId()) : "";
// 将此订单信息存入订单表
// 订单基本信息
OrderBasicInfo orderBasicInfo = OrderBasicInfo.builder()
@@ -1713,6 +1721,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
.orderStatus(OrderStatusEnum.NOT_START.getValue())
// .memberId(memberVO.getMemberId()) // 会员memberId
.stationId(String.valueOf(stationId))
.merchantId(merchantId)
.pileSn(pileSn)
.connectorCode(connectorCode)
.pileConnectorCode(pileConnectorCode)

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
View File

@@ -113,8 +113,6 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService {
if (StringUtils.isNotBlank(pileStationInfo.getQrcodePrefix())) {
vo.setQrcodePrefix(pileStationInfo.getQrcodePrefix());
}
// vo.setMerchantId(pileStationInfo.getMerchantId().toString());
// vo.setMerchantName(pileStationInfo.getmer());
vo.setMerchantAdminName(pileStationInfo.getStationAdminName());
vo.setStationStatus(Integer.parseInt(pileStationInfo.getStationStatus()));
vo.setStationType(pileStationInfo.getStationType());