mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-05-09 04:20:08 +08:00
update 甘肃省平台
This commit is contained in:
117
jsowell-admin/src/main/java/com/jsowell/api/thirdparty/GanSuController.java
vendored
Normal file
117
jsowell-admin/src/main/java/com/jsowell/api/thirdparty/GanSuController.java
vendored
Normal file
@@ -0,0 +1,117 @@
|
|||||||
|
package com.jsowell.api.thirdparty;
|
||||||
|
|
||||||
|
import com.alibaba.fastjson2.JSON;
|
||||||
|
import com.jsowell.common.annotation.Anonymous;
|
||||||
|
import com.jsowell.common.enums.thirdparty.ThirdPartyReturnCodeEnum;
|
||||||
|
import com.jsowell.pile.dto.QueryStationInfoDTO;
|
||||||
|
import com.jsowell.pile.thirdparty.CommonParamsDTO;
|
||||||
|
import com.jsowell.thirdparty.lianlian.common.CommonResult;
|
||||||
|
import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.beans.factory.annotation.Qualifier;
|
||||||
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
|
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;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 甘肃省平台Controller
|
||||||
|
*
|
||||||
|
* @author Lemon
|
||||||
|
* @Date 2024/11/9 13:22:05
|
||||||
|
*/
|
||||||
|
@Anonymous
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/gansu")
|
||||||
|
public class GanSuController extends ThirdPartyBaseController{
|
||||||
|
private final String platformName = "甘肃省平台";
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
@Qualifier("ganSuPlatformServiceImpl")
|
||||||
|
private ThirdPartyPlatformService platformLogic;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* getToken
|
||||||
|
*/
|
||||||
|
@PostMapping("/v1/query_token")
|
||||||
|
public CommonResult<?> queryToken(@RequestBody CommonParamsDTO dto) {
|
||||||
|
// logger.info("{}-请求令牌 params:{}", platformName, JSON.toJSONString(dto));
|
||||||
|
try {
|
||||||
|
Map<String, String> map = platformLogic.queryToken(dto);
|
||||||
|
logger.info("{}-请求令牌, params:{}, result:{}", platformName, JSON.toJSONString(dto), JSON.toJSONString(map));
|
||||||
|
return CommonResult.success(0, "请求令牌成功!", map.get("Data"), map.get("Sig"));
|
||||||
|
} catch (Exception e) {
|
||||||
|
logger.error("{}-获取token接口, 异常, params:{}", platformName, JSON.toJSONString(dto), e);
|
||||||
|
return CommonResult.failed("获取token发生异常");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询充电站信息
|
||||||
|
* query_stations_info
|
||||||
|
*/
|
||||||
|
@PostMapping("/v1/query_stations_info")
|
||||||
|
public CommonResult<?> query_stations_info(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
|
||||||
|
logger.info("{}-查询充电站信息 params:{}", platformName, JSON.toJSONString(dto));
|
||||||
|
try {
|
||||||
|
// 校验令牌
|
||||||
|
if (!verifyToken(request.getHeader("Authorization"))) {
|
||||||
|
// 校验失败
|
||||||
|
return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 校验签名
|
||||||
|
if (!verifySignature(dto)) {
|
||||||
|
// 签名错误
|
||||||
|
return CommonResult.failed(ThirdPartyReturnCodeEnum.SIGN_ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 解析入参
|
||||||
|
QueryStationInfoDTO queryStationInfoDTO = parseParamsDTO(dto, QueryStationInfoDTO.class);
|
||||||
|
|
||||||
|
// 执行逻辑
|
||||||
|
Map<String, String> map = platformLogic.queryStationsInfo(queryStationInfoDTO);
|
||||||
|
|
||||||
|
return CommonResult.success(0, "查询充电站信息成功!", map.get("Data"), map.get("Sig"));
|
||||||
|
} catch (Exception e) {
|
||||||
|
logger.info("{}-查询充电站信息 error:", platformName, e);
|
||||||
|
}
|
||||||
|
return CommonResult.failed("查询充电站信息发生异常");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询充电站状态信息
|
||||||
|
* query_station_status
|
||||||
|
*/
|
||||||
|
@PostMapping("/v1/query_station_status")
|
||||||
|
public CommonResult<?> queryStationStatus(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
|
||||||
|
logger.info("{}-查询充电站状态信息 params:{}", platformName, JSON.toJSONString(dto));
|
||||||
|
try {
|
||||||
|
// 校验令牌
|
||||||
|
if (!verifyToken(request.getHeader("Authorization"))) {
|
||||||
|
// 校验失败
|
||||||
|
return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 校验签名
|
||||||
|
if (!verifySignature(dto)) {
|
||||||
|
// 签名错误
|
||||||
|
return CommonResult.failed(ThirdPartyReturnCodeEnum.SIGN_ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 解析入参
|
||||||
|
QueryStationInfoDTO queryStationInfoDTO = parseParamsDTO(dto, QueryStationInfoDTO.class);
|
||||||
|
|
||||||
|
// 执行逻辑
|
||||||
|
Map<String, String> map = platformLogic.queryStationStatus(queryStationInfoDTO);
|
||||||
|
|
||||||
|
return CommonResult.success(0, "查询充电站状态信息成功!", map.get("Data"), map.get("Sig"));
|
||||||
|
} catch (Exception e) {
|
||||||
|
logger.error("{}-查询充电站状态信息 error:", platformName, e);
|
||||||
|
}
|
||||||
|
return CommonResult.failed("查询充电站状态信息发生异常");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,12 +1,14 @@
|
|||||||
package com.jsowell.thirdparty.platform.common;
|
package com.jsowell.thirdparty.platform.common;
|
||||||
|
|
||||||
import com.alibaba.fastjson2.annotation.JSONField;
|
import com.alibaba.fastjson2.annotation.JSONField;
|
||||||
|
import com.jsowell.thirdparty.platform.domain.SupChargeDetails;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 充电订单明细
|
* 充电订单明细
|
||||||
@@ -188,4 +190,27 @@ public class ChargeOrderInfo {
|
|||||||
@JSONField(name = "EndMeterNum")
|
@JSONField(name = "EndMeterNum")
|
||||||
private BigDecimal endMeterNum;
|
private BigDecimal endMeterNum;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 电表起值
|
||||||
|
*/
|
||||||
|
@JSONField(name = "MeterNumStart")
|
||||||
|
private BigDecimal meterNumStart;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 电表停止值
|
||||||
|
*/
|
||||||
|
@JSONField(name = "MeterNumEnd")
|
||||||
|
private BigDecimal meterNumEnd;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 充电明细信息列表
|
||||||
|
* ChargeDetails
|
||||||
|
* 详见充电明细信息(SupChargeDetails)
|
||||||
|
* 否
|
||||||
|
* SupChargeDetails数组
|
||||||
|
*/
|
||||||
|
@JSONField(name = "ChargeDetails")
|
||||||
|
private List<SupChargeDetails> chargeDetails;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,10 +3,12 @@ package com.jsowell.thirdparty.platform.service.impl;
|
|||||||
import com.alibaba.fastjson2.JSON;
|
import com.alibaba.fastjson2.JSON;
|
||||||
import com.alibaba.fastjson2.JSONObject;
|
import com.alibaba.fastjson2.JSONObject;
|
||||||
import com.github.pagehelper.PageInfo;
|
import com.github.pagehelper.PageInfo;
|
||||||
|
import com.google.common.collect.Lists;
|
||||||
import com.jsowell.common.constant.Constants;
|
import com.jsowell.common.constant.Constants;
|
||||||
import com.jsowell.common.core.redis.RedisCache;
|
import com.jsowell.common.core.redis.RedisCache;
|
||||||
import com.jsowell.common.enums.thirdparty.BusinessInformationExchangeEnum;
|
import com.jsowell.common.enums.thirdparty.BusinessInformationExchangeEnum;
|
||||||
import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum;
|
import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum;
|
||||||
|
import com.jsowell.common.enums.ykc.BillingTimeTypeEnum;
|
||||||
import com.jsowell.common.enums.ykc.OrderStatusEnum;
|
import com.jsowell.common.enums.ykc.OrderStatusEnum;
|
||||||
import com.jsowell.common.enums.ykc.ReturnCodeEnum;
|
import com.jsowell.common.enums.ykc.ReturnCodeEnum;
|
||||||
import com.jsowell.common.exception.BusinessException;
|
import com.jsowell.common.exception.BusinessException;
|
||||||
@@ -15,6 +17,7 @@ import com.jsowell.common.util.JWTUtils;
|
|||||||
import com.jsowell.common.util.PageUtils;
|
import com.jsowell.common.util.PageUtils;
|
||||||
import com.jsowell.common.util.StringUtils;
|
import com.jsowell.common.util.StringUtils;
|
||||||
import com.jsowell.pile.domain.OrderBasicInfo;
|
import com.jsowell.pile.domain.OrderBasicInfo;
|
||||||
|
import com.jsowell.pile.domain.OrderDetail;
|
||||||
import com.jsowell.pile.dto.QueryStationInfoDTO;
|
import com.jsowell.pile.dto.QueryStationInfoDTO;
|
||||||
import com.jsowell.pile.service.*;
|
import com.jsowell.pile.service.*;
|
||||||
import com.jsowell.pile.thirdparty.CommonParamsDTO;
|
import com.jsowell.pile.thirdparty.CommonParamsDTO;
|
||||||
@@ -23,10 +26,13 @@ import com.jsowell.pile.vo.ThirdPartySecretInfoVO;
|
|||||||
import com.jsowell.pile.vo.base.ConnectorInfoVO;
|
import com.jsowell.pile.vo.base.ConnectorInfoVO;
|
||||||
import com.jsowell.pile.vo.base.MerchantInfoVO;
|
import com.jsowell.pile.vo.base.MerchantInfoVO;
|
||||||
import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO;
|
import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO;
|
||||||
|
import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO;
|
||||||
import com.jsowell.pile.vo.web.PileConnectorInfoVO;
|
import com.jsowell.pile.vo.web.PileConnectorInfoVO;
|
||||||
import com.jsowell.thirdparty.lianlian.domain.ConnectorStatusInfo;
|
import com.jsowell.thirdparty.lianlian.domain.ConnectorStatusInfo;
|
||||||
import com.jsowell.thirdparty.lianlian.domain.StationStatusInfo;
|
import com.jsowell.thirdparty.lianlian.domain.StationStatusInfo;
|
||||||
import com.jsowell.thirdparty.lianlian.vo.AccessTokenVO;
|
import com.jsowell.thirdparty.lianlian.vo.AccessTokenVO;
|
||||||
|
import com.jsowell.thirdparty.platform.common.ChargeOrderInfo;
|
||||||
|
import com.jsowell.thirdparty.platform.domain.SupChargeDetails;
|
||||||
import com.jsowell.thirdparty.platform.domain.SupEquipChargeStatusInfo;
|
import com.jsowell.thirdparty.platform.domain.SupEquipChargeStatusInfo;
|
||||||
import com.jsowell.thirdparty.platform.domain.SupStationInfo;
|
import com.jsowell.thirdparty.platform.domain.SupStationInfo;
|
||||||
import com.jsowell.thirdparty.platform.factory.ThirdPartyPlatformFactory;
|
import com.jsowell.thirdparty.platform.factory.ThirdPartyPlatformFactory;
|
||||||
@@ -37,6 +43,7 @@ import com.jsowell.thirdparty.platform.util.ThirdPartyPlatformUtils;
|
|||||||
import com.jsowell.thirdparty.service.ThirdpartySecretInfoService;
|
import com.jsowell.thirdparty.service.ThirdpartySecretInfoService;
|
||||||
import org.apache.commons.collections4.CollectionUtils;
|
import org.apache.commons.collections4.CollectionUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
@@ -49,6 +56,7 @@ import java.util.stream.Collectors;
|
|||||||
* @author Lemon
|
* @author Lemon
|
||||||
* @Date 2024/11/5 13:31:06
|
* @Date 2024/11/5 13:31:06
|
||||||
*/
|
*/
|
||||||
|
@Service
|
||||||
public class GanSuPlatformServiceImpl implements ThirdPartyPlatformService {
|
public class GanSuPlatformServiceImpl implements ThirdPartyPlatformService {
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
@@ -69,6 +77,9 @@ public class GanSuPlatformServiceImpl implements ThirdPartyPlatformService {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private PileStationInfoService pileStationInfoService;
|
private PileStationInfoService pileStationInfoService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private PileBillingTemplateService pileBillingTemplateService;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private RedisCache redisCache;
|
private RedisCache redisCache;
|
||||||
|
|
||||||
@@ -361,6 +372,120 @@ public class GanSuPlatformServiceImpl implements ThirdPartyPlatformService {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 推送充电订单数据
|
||||||
|
* @param orderCode
|
||||||
|
* @param secretInfoVO
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public String notificationChargeOrderInfo(String orderCode, ThirdPartySecretInfoVO secretInfoVO) {
|
||||||
|
// 根据订单号查询出信息
|
||||||
|
OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
|
||||||
|
if (orderBasicInfo == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
String operatorId = Constants.OPERATORID_JIANG_SU;
|
||||||
|
String operatorSecret = secretInfoVO.getTheirOperatorSecret();
|
||||||
|
String signSecret = secretInfoVO.getTheirSigSecret();
|
||||||
|
String dataSecret = secretInfoVO.getTheirDataSecret();
|
||||||
|
String dataSecretIv = secretInfoVO.getTheirDataSecretIv();
|
||||||
|
String urlAddress = secretInfoVO.getTheirUrlPrefix();
|
||||||
|
|
||||||
|
// 推送地址
|
||||||
|
String url = urlAddress + BusinessInformationExchangeEnum.NOTIFICATION_CHARGE_ORDER_INFO.getValue();
|
||||||
|
|
||||||
|
// 根据订单号查询订单详情
|
||||||
|
OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode);
|
||||||
|
if (orderDetail == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
ChargeOrderInfo chargeOrderInfo = ChargeOrderInfo.builder()
|
||||||
|
.startChargeSeq(orderCode)
|
||||||
|
.connectorId(orderBasicInfo.getPileConnectorCode())
|
||||||
|
.startTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderBasicInfo.getChargeStartTime()))
|
||||||
|
.endTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderBasicInfo.getChargeEndTime()))
|
||||||
|
.totalPower(orderDetail.getTotalUsedElectricity())
|
||||||
|
.totalElecMoney(orderDetail.getTotalElectricityAmount())
|
||||||
|
.totalSeviceMoney(orderDetail.getTotalServiceAmount())
|
||||||
|
.totalMoney(orderDetail.getTotalOrderAmount())
|
||||||
|
.stopReason(2)
|
||||||
|
.meterNumStart(BigDecimal.ZERO)
|
||||||
|
.meterNumEnd(BigDecimal.ZERO)
|
||||||
|
|
||||||
|
.build();
|
||||||
|
List<BillingPriceVO> billingList = pileBillingTemplateService.queryBillingPrice(orderBasicInfo.getStationId());
|
||||||
|
// 先将list按照 尖、峰、平、谷 时段排序
|
||||||
|
// List<BillingPriceVO> collect = billingList.stream().sorted(Comparator.comparing(BillingPriceVO::getTimeType)).collect(Collectors.toList());
|
||||||
|
// 再循环该list,拼装对应的充电价格、费率
|
||||||
|
List<SupChargeDetails> chargeDetails = transformSupChargeDetails(orderDetail, billingList);
|
||||||
|
chargeOrderInfo.setChargeDetails(chargeDetails);
|
||||||
|
|
||||||
|
// 获取令牌
|
||||||
|
String token = getToken(urlAddress, operatorId, operatorSecret, dataSecretIv, signSecret, dataSecret);
|
||||||
|
if (StringUtils.isBlank(token)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
// 调用联联平台接口
|
||||||
|
String jsonString = JSON.toJSONString(chargeOrderInfo);
|
||||||
|
String result = HttpRequestUtil.sendPost(token, jsonString, url, dataSecret, dataSecretIv, operatorId, signSecret);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 转换时段充电明细
|
||||||
|
* @param orderDetail
|
||||||
|
* @param billingList
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
private List<SupChargeDetails> transformSupChargeDetails(OrderDetail orderDetail, List<BillingPriceVO> billingList) {
|
||||||
|
List<SupChargeDetails> resultList = Lists.newArrayList();
|
||||||
|
SupChargeDetails detail;
|
||||||
|
for (BillingPriceVO billingPriceVO : billingList) {
|
||||||
|
detail = new SupChargeDetails();
|
||||||
|
if (StringUtils.equals(billingPriceVO.getTimeType(), BillingTimeTypeEnum.SHARP.getValue())) {
|
||||||
|
// 尖时段
|
||||||
|
detail.setDetailStartTime(billingPriceVO.getStartTime());
|
||||||
|
detail.setDetailEndTime(billingPriceVO.getEndTime());
|
||||||
|
detail.setElecPrice(new BigDecimal(billingPriceVO.getElectricityPrice()).setScale(4, BigDecimal.ROUND_HALF_UP));
|
||||||
|
detail.setSevicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP));
|
||||||
|
detail.setDetailPower(orderDetail.getSharpUsedElectricity());
|
||||||
|
detail.setDetailElecMoney(orderDetail.getSharpElectricityPrice());
|
||||||
|
detail.setDetailSeviceMoney(orderDetail.getSharpServicePrice());
|
||||||
|
} else if (StringUtils.equals(billingPriceVO.getTimeType(), BillingTimeTypeEnum.PEAK.getValue())) {
|
||||||
|
// 峰时段
|
||||||
|
detail.setDetailStartTime(billingPriceVO.getStartTime());
|
||||||
|
detail.setDetailEndTime(billingPriceVO.getEndTime());
|
||||||
|
detail.setElecPrice(new BigDecimal(billingPriceVO.getElectricityPrice()).setScale(4, BigDecimal.ROUND_HALF_UP));
|
||||||
|
detail.setSevicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP));
|
||||||
|
detail.setDetailPower(orderDetail.getPeakUsedElectricity());
|
||||||
|
detail.setDetailElecMoney(orderDetail.getPeakElectricityPrice());
|
||||||
|
detail.setDetailSeviceMoney(orderDetail.getPeakServicePrice());
|
||||||
|
} else if (StringUtils.equals(billingPriceVO.getTimeType(), BillingTimeTypeEnum.FLAT.getValue())) {
|
||||||
|
// 平时段
|
||||||
|
detail.setDetailStartTime(billingPriceVO.getStartTime());
|
||||||
|
detail.setDetailEndTime(billingPriceVO.getEndTime());
|
||||||
|
detail.setElecPrice(new BigDecimal(billingPriceVO.getElectricityPrice()).setScale(4, BigDecimal.ROUND_HALF_UP));
|
||||||
|
detail.setSevicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP));
|
||||||
|
detail.setDetailPower(orderDetail.getFlatUsedElectricity());
|
||||||
|
detail.setDetailElecMoney(orderDetail.getFlatElectricityPrice());
|
||||||
|
detail.setDetailSeviceMoney(orderDetail.getFlatServicePrice());
|
||||||
|
} else if (StringUtils.equals(billingPriceVO.getTimeType(), BillingTimeTypeEnum.VALLEY.getValue())) {
|
||||||
|
// 谷时段
|
||||||
|
detail.setDetailStartTime(billingPriceVO.getStartTime());
|
||||||
|
detail.setDetailEndTime(billingPriceVO.getEndTime());
|
||||||
|
detail.setElecPrice(new BigDecimal(billingPriceVO.getElectricityPrice()).setScale(4, BigDecimal.ROUND_HALF_UP));
|
||||||
|
detail.setSevicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP));
|
||||||
|
detail.setDetailPower(orderDetail.getValleyUsedElectricity());
|
||||||
|
detail.setDetailElecMoney(orderDetail.getValleyElectricityPrice());
|
||||||
|
detail.setDetailSeviceMoney(orderDetail.getValleyServicePrice());
|
||||||
|
}
|
||||||
|
resultList.add(detail);
|
||||||
|
}
|
||||||
|
return resultList;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取甘肃平台密钥
|
* 获取甘肃平台密钥
|
||||||
|
|||||||
@@ -156,7 +156,7 @@ public class HttpRequestUtil {
|
|||||||
|
|
||||||
String hutoolRequest = HttpRequest.post(url).header("Authorization", "Bearer " + token).body(postData).execute().body();
|
String hutoolRequest = HttpRequest.post(url).header("Authorization", "Bearer " + token).body(postData).execute().body();
|
||||||
|
|
||||||
log.info("发送请求 接收到返回数据:{}", hutoolRequest);
|
log.info(label + "发送请求 接收到返回数据:{}", hutoolRequest);
|
||||||
|
|
||||||
if (StringUtils.isBlank(hutoolRequest)) {
|
if (StringUtils.isBlank(hutoolRequest)) {
|
||||||
return "返回数据为空";
|
return "返回数据为空";
|
||||||
|
|||||||
Reference in New Issue
Block a user