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

Merge branch 'dev-new' into dev-new-rabbitmq

Browse Source 
# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
This commit is contained in:
Guoqs
2024-12-30 13:58:40 +08:00
parent 25d0daa116 eff073a4ce
commit 729c47cc0c
8 changed files with 86 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jsowell-admin/src/main/java/com/jsowell/api/thirdparty/GuangXiPlatformController.java vendored
View File

@@ -5,6 +5,7 @@ import com.jsowell.common.annotation.Anonymous;
import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.enums.thirdparty.ThirdPartyReturnCodeEnum;
import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum;
import com.jsowell.common.response.RestApiResponse;
import com.jsowell.pile.dto.QueryStartChargeDTO;
import com.jsowell.pile.dto.QueryStationInfoDTO;
import com.jsowell.pile.thirdparty.CommonParamsDTO;
@@ -88,6 +89,14 @@ public class GuangXiPlatformController extends ThirdPartyBaseController {
return CommonResult.failed("查询充电站信息发生异常");
}
@PostMapping("/queryStationInfo")
public RestApiResponse<?> queryStationInfo(@RequestBody QueryStationInfoDTO queryStationInfoDTO) {
Map<String, String> map = platformLogic.queryStationsInfo(queryStationInfoDTO);
RestApiResponse<?> response = new RestApiResponse<>(map);
return response;
}
/**
* 查询充电站状态信息
* query_station_status

2
jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PayController.java
View File

@@ -145,7 +145,7 @@ public class PayController extends BaseController {
}
response = new RestApiResponse<>(map);
} catch (BusinessException e) {
logger.warn("支付订单接口 warn param:{}", dto, e);
logger.error("支付订单接口 warn param:{}", dto, e);
response = new RestApiResponse<>(e.getCode(), e.getMessage());
} catch (Exception e) {
logger.error("支付订单接口 error param:{}", dto, e);