station_setting_relation ----> thirdparty_station_relation

This commit is contained in:
Lemon
2023-07-07 14:40:19 +08:00
parent 04b4859bcb
commit a1c8dfd525
12 changed files with 196 additions and 202 deletions

View File

@@ -28,7 +28,7 @@ import com.jsowell.pile.dto.*;
import com.jsowell.pile.service.*;
import com.jsowell.pile.vo.base.ConnectorInfoVO;
import com.jsowell.pile.vo.base.MerchantInfoVO;
import com.jsowell.pile.vo.base.StationSettingRelationVO;
import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO;
import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO;
import com.jsowell.pile.vo.uniapp.BillingPriceVO;
import com.jsowell.pile.vo.web.PileConnectorInfoVO;
@@ -93,7 +93,7 @@ public class LianLianServiceImpl implements LianLianService {
private IThirdPartyPlatformConfigService thirdPartyPlatformConfigService;
@Autowired
private IStationSettingRelationService stationSettingRelationService;
private IThirdPartyStationRelationService thirdPartyStationRelationService;
@Override
public void pushMerchantInfo(Long merchantId) {
@@ -126,16 +126,16 @@ public class LianLianServiceImpl implements LianLianService {
// 通过id查询站点相关信息
PileStationInfo pileStationInfo = pileStationInfoService.selectPileStationInfoById(dto.getStationId());
// 通过站点id查询相关配置信息
StationSettingRelation relation = new StationSettingRelation();
ThirdPartyStationRelation relation = new ThirdPartyStationRelation();
relation.setStationId(dto.getStationId());
StationSettingRelationVO relationInfo = stationSettingRelationService.selectRelationInfo(relation);
ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(relation);
// ThirdPartySettingInfo settingInfo = thirdPartySettingInfoService.getInfoByStationId(dto.getStationId());
if (relationInfo == null) {
// 新增
relation.setThirdPartyType(dto.getThirdPartyType());
stationSettingRelationService.insertStationSettingRelation(relation);
thirdPartyStationRelationService.insertThirdPartyStationRelation(relation);
relationInfo = stationSettingRelationService.selectRelationInfo(relation);
relationInfo = thirdPartyStationRelationService.selectRelationInfo(relation);
}
String operatorId = relationInfo.getOperatorId();
String operatorSecret = relationInfo.getOperatorSecret();
@@ -802,9 +802,9 @@ public class LianLianServiceImpl implements LianLianService {
String pileSn = StringUtils.substring(pileConnectorCode, 0, 14);
PileStationVO stationVO = pileStationInfoService.getStationInfoByPileSn(pileSn);
// 通过站点id查询相关配置信息
StationSettingRelation relation = new StationSettingRelation();
ThirdPartyStationRelation relation = new ThirdPartyStationRelation();
relation.setStationId(Long.parseLong(stationVO.getId()));
StationSettingRelationVO relationInfo = stationSettingRelationService.selectRelationInfo(relation);
ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(relation);
// ThirdPartySettingInfo settingInfo = thirdPartySettingInfoService.getInfoByStationId(Long.parseLong(stationVO.getId()));
if (relationInfo == null) {
return null;
@@ -851,9 +851,9 @@ public class LianLianServiceImpl implements LianLianService {
OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode);
// 通过站点id查询相关配置信息
StationSettingRelation relation = new StationSettingRelation();
ThirdPartyStationRelation relation = new ThirdPartyStationRelation();
relation.setStationId(Long.parseLong(orderBasicInfo.getStationId()));
StationSettingRelationVO relationInfo = stationSettingRelationService.selectRelationInfo(relation);
ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(relation);
// ThirdPartySettingInfo settingInfo = thirdPartySettingInfoService.getInfoByStationId(Long.parseLong(orderBasicInfo.getStationId()));
if (relationInfo == null) {
return null;
@@ -978,9 +978,9 @@ public class LianLianServiceImpl implements LianLianService {
return null;
}
// 通过站点id查询相关配置信息
StationSettingRelation relation = new StationSettingRelation();
ThirdPartyStationRelation relation = new ThirdPartyStationRelation();
relation.setStationId(Long.parseLong(orderInfo.getStationId()));
StationSettingRelationVO relationInfo = stationSettingRelationService.selectRelationInfo(relation);
ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(relation);
// ThirdPartySettingInfo settingInfo = thirdPartySettingInfoService.getInfoByStationId(Long.parseLong(orderBasicInfo.getStationId()));
if (relationInfo == null) {
return null;
@@ -1036,9 +1036,9 @@ public class LianLianServiceImpl implements LianLianService {
// 根据订单号查询订单信息
OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
// 通过站点id查询相关配置信息
StationSettingRelation relation = new StationSettingRelation();
ThirdPartyStationRelation relation = new ThirdPartyStationRelation();
relation.setStationId(Long.parseLong(orderInfo.getStationId()));
StationSettingRelationVO relationInfo = stationSettingRelationService.selectRelationInfo(relation);
ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(relation);
// ThirdPartySettingInfo settingInfo = thirdPartySettingInfoService.getInfoByStationId(Long.parseLong(orderInfo.getStationId()));
if (relationInfo == null) {
return null;
@@ -1093,9 +1093,9 @@ public class LianLianServiceImpl implements LianLianService {
return null;
}
// 通过站点id查询相关配置信息
StationSettingRelation relation = new StationSettingRelation();
ThirdPartyStationRelation relation = new ThirdPartyStationRelation();
relation.setStationId(Long.parseLong(orderInfo.getStationId()));
StationSettingRelationVO relationInfo = stationSettingRelationService.selectRelationInfo(relation);
ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(relation);
// ThirdPartySettingInfo settingInfo = thirdPartySettingInfoService.getInfoByStationId(Long.parseLong(orderInfo.getStationId()));
if (relationInfo == null) {
return null;
@@ -1156,9 +1156,9 @@ public class LianLianServiceImpl implements LianLianService {
OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode);
// 通过站点id查询相关配置信息
StationSettingRelation relation = new StationSettingRelation();
ThirdPartyStationRelation relation = new ThirdPartyStationRelation();
relation.setStationId(Long.parseLong(orderBasicInfo.getStationId()));
StationSettingRelationVO relationInfo = stationSettingRelationService.selectRelationInfo(relation);
ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(relation);
// ThirdPartySettingInfo settingInfo = thirdPartySettingInfoService.getInfoByStationId(Long.parseLong(orderBasicInfo.getStationId()));
if (relationInfo == null) {
return null;
@@ -1257,9 +1257,9 @@ public class LianLianServiceImpl implements LianLianService {
OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
// 通过站点id查询相关配置信息
StationSettingRelation relation = new StationSettingRelation();
ThirdPartyStationRelation relation = new ThirdPartyStationRelation();
relation.setStationId(Long.parseLong(orderBasicInfo.getStationId()));
StationSettingRelationVO relationInfo = stationSettingRelationService.selectRelationInfo(relation);
ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(relation);
// ThirdPartySettingInfo settingInfo = thirdPartySettingInfoService.getInfoByStationId(Long.parseLong(orderBasicInfo.getStationId()));
if (relationInfo == null) {
return null;
@@ -1302,9 +1302,9 @@ public class LianLianServiceImpl implements LianLianService {
}
// 通过站点id查询相关配置信息
StationSettingRelation relation = new StationSettingRelation();
ThirdPartyStationRelation relation = new ThirdPartyStationRelation();
relation.setStationId(Long.parseLong(orderInfo.getStationId()));
StationSettingRelationVO relationInfo = stationSettingRelationService.selectRelationInfo(relation);
ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(relation);
// ThirdPartySettingInfo settingInfo = thirdPartySettingInfoService.getInfoByStationId(Long.parseLong(orderInfo.getStationId()));
if (relationInfo == null) {
return null;
@@ -1378,9 +1378,9 @@ public class LianLianServiceImpl implements LianLianService {
.build();
// 通过站点id查询相关配置信息
StationSettingRelation relation = new StationSettingRelation();
ThirdPartyStationRelation relation = new ThirdPartyStationRelation();
relation.setStationId(Long.parseLong(orderInfo.getStationId()));
StationSettingRelationVO relationInfo = stationSettingRelationService.selectRelationInfo(relation);
ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(relation);
// ThirdPartySettingInfo settingInfo = thirdPartySettingInfoService.getInfoByStationId(Long.parseLong(orderBasicInfo.getStationId()));
if (relationInfo == null) {
return null;