mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-21 03:25:12 +08:00
update 电单车协议
This commit is contained in:
@@ -23,7 +23,7 @@ import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO;
|
||||
import com.jsowell.pile.vo.uniapp.customer.PersonPileConnectorSumInfoVO;
|
||||
import com.jsowell.pile.vo.uniapp.customer.PersonPileRealTimeVO;
|
||||
import com.jsowell.pile.vo.uniapp.customer.PileConnectorDetailVO;
|
||||
import com.jsowell.pile.vo.uniapp.customer.PileConnectorVO;
|
||||
import com.jsowell.pile.vo.uniapp.customer.AppletPileDetailVO;
|
||||
import com.jsowell.pile.vo.web.PileDetailVO;
|
||||
import com.jsowell.pile.vo.web.PileStationVO;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
@@ -159,7 +159,7 @@ public class PileService {
|
||||
/**
|
||||
* 前端扫码跳转接口
|
||||
*/
|
||||
public PileConnectorVO getPileDetailByPileSn(String param) throws ExecutionException, InterruptedException {
|
||||
public AppletPileDetailVO getPileDetailByPileSn(String param) throws ExecutionException, InterruptedException {
|
||||
if (StringUtils.isBlank(param)) {
|
||||
throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR);
|
||||
}
|
||||
@@ -207,7 +207,7 @@ public class PileService {
|
||||
MerchantInfoVO merchantInfoVO = merchantInfoVOFuture.get();
|
||||
List<BillingPriceVO> billingPriceVOS = billingPriceFuture.get();
|
||||
|
||||
PileConnectorVO vo = PileConnectorVO.builder()
|
||||
AppletPileDetailVO vo = AppletPileDetailVO.builder()
|
||||
.pileInfo(pileInfoVO)
|
||||
.connectorInfoList(connectorInfoList)
|
||||
.merchantInfo(merchantInfoVO)
|
||||
@@ -225,7 +225,7 @@ public class PileService {
|
||||
* @throws ExecutionException
|
||||
* @throws InterruptedException
|
||||
*/
|
||||
public PileConnectorVO getConnectorDetail(String pileConnectorCode) throws ExecutionException, InterruptedException {
|
||||
public AppletPileDetailVO getConnectorDetail(String pileConnectorCode) throws ExecutionException, InterruptedException {
|
||||
PileConnectorDetailVO pileConnectorDetailVO = queryPileConnectorDetail(pileConnectorCode);
|
||||
if (pileConnectorDetailVO == null) {
|
||||
return null;
|
||||
@@ -235,7 +235,7 @@ public class PileService {
|
||||
throw new BusinessException(ReturnCodeEnum.CODE_PILE_CONNECTOR_STATUS_ERROR);
|
||||
}
|
||||
String pileSn = pileConnectorDetailVO.getPileSn();
|
||||
PileConnectorVO resultVO = getPileDetailByPileSn(pileSn);
|
||||
AppletPileDetailVO resultVO = getPileDetailByPileSn(pileSn);
|
||||
List<ConnectorInfoVO> connectorInfoList = resultVO.getConnectorInfoList();
|
||||
if (connectorInfoList.size() > 1) {
|
||||
List<ConnectorInfoVO> list = Lists.newArrayList();
|
||||
|
||||
Reference in New Issue
Block a user