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

update 打印日志

Browse Source
This commit is contained in:
Guoqs
2024-07-26 15:39:21 +08:00
parent 7572c0ff3d
commit 8503a29edd
2 changed files with 31 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java
View File

@@ -50,7 +50,7 @@ public class OrderController extends BaseController {
*/ */
@PostMapping("/generateOrder") @PostMapping("/generateOrder")
public RestApiResponse<?> generateOrder(HttpServletRequest request, @RequestBody GenerateOrderDTO dto) { public RestApiResponse<?> generateOrder(HttpServletRequest request, @RequestBody GenerateOrderDTO dto) {
logger.info("生成订单 param:{}", JSON.toJSONString(dto)); // logger.info("生成订单 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response; RestApiResponse<?> response;
try { try {
if ((StringUtils.isBlank(dto.getPileSn()) || StringUtils.isBlank(dto.getConnectorCode())) && StringUtils.isBlank(dto.getPileConnectorCode())) { if ((StringUtils.isBlank(dto.getPileSn()) || StringUtils.isBlank(dto.getConnectorCode())) && StringUtils.isBlank(dto.getPileConnectorCode())) {
@@ -80,7 +80,7 @@ public class OrderController extends BaseController {
logger.error("生成订单 error, param:{}", JSON.toJSONString(dto), e); logger.error("生成订单 error, param:{}", JSON.toJSONString(dto), e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_GENERATE_ORDER_ERROR); response = new RestApiResponse<>(ReturnCodeEnum.CODE_GENERATE_ORDER_ERROR);
} }
logger.info("生成订单 result:{}", JSON.toJSONString(response)); logger.info("生成订单, param:{}, result:{}", JSON.toJSONString(dto), JSON.toJSONString(response));
return response; return response;
} }
@@ -137,7 +137,7 @@ public class OrderController extends BaseController {
*/ */
@PostMapping("/getOrderList") @PostMapping("/getOrderList")
public RestApiResponse<?> getOrderInfo(HttpServletRequest request, @RequestBody UniAppQueryOrderDTO dto) { public RestApiResponse<?> getOrderInfo(HttpServletRequest request, @RequestBody UniAppQueryOrderDTO dto) {
logger.info("查询订单信息 param:{}", JSON.toJSONString(dto)); // logger.info("查询订单信息 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null; RestApiResponse<?> response = null;
try { try {
String memberId = getMemberIdByAuthorization(request); String memberId = getMemberIdByAuthorization(request);
@@ -154,7 +154,7 @@ public class OrderController extends BaseController {
logger.error("查询订单信息 error", e); logger.error("查询订单信息 error", e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_ORDER_INFO_BY_MEMBER_ID_ERROR); response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_ORDER_INFO_BY_MEMBER_ID_ERROR);
} }
logger.info("查询订单信息, result:{}", JSON.toJSONString(response)); logger.info("查询订单信息, param:{}, result:{}", JSON.toJSONString(dto), JSON.toJSONString(response));
return response; return response;
} }
@@ -167,7 +167,7 @@ public class OrderController extends BaseController {
*/ */
@PostMapping("/getOrderDetail") @PostMapping("/getOrderDetail")
public RestApiResponse<?> getOrderDetail(HttpServletRequest request, @RequestBody UniAppQueryOrderDTO dto) { public RestApiResponse<?> getOrderDetail(HttpServletRequest request, @RequestBody UniAppQueryOrderDTO dto) {
logger.info("小程序获取订单详情 param:{}", JSON.toJSONString(dto)); // logger.info("小程序获取订单详情 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null; RestApiResponse<?> response = null;
try { try {
String memberId = getMemberIdByAuthorization(request); String memberId = getMemberIdByAuthorization(request);
@@ -194,27 +194,27 @@ public class OrderController extends BaseController {
* @param dto * @param dto
* @return * @return
*/ */
@PostMapping("/getOrderDetailV2") // @PostMapping("/getOrderDetailV2")
public RestApiResponse<?> getOrderDetailV2(HttpServletRequest request, @RequestBody UniAppQueryOrderDTO dto) { // public RestApiResponse<?> getOrderDetailV2(HttpServletRequest request, @RequestBody UniAppQueryOrderDTO dto) {
logger.info("小程序获取订单详情V2 param:{}", JSON.toJSONString(dto)); // logger.info("小程序获取订单详情V2 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null; // RestApiResponse<?> response = null;
try { // try {
String memberId = getMemberIdByAuthorization(request); // String memberId = getMemberIdByAuthorization(request);
if (StringUtils.isBlank(memberId)) { // if (StringUtils.isBlank(memberId)) {
throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR); // throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR);
} // }
UniAppOrderDetailVO uniAppOrderDetail = orderService.getUniAppOrderDetailV2(dto.getOrderCode()); // UniAppOrderDetailVO uniAppOrderDetail = orderService.getUniAppOrderDetailV2(dto.getOrderCode());
response = new RestApiResponse<>(uniAppOrderDetail); // response = new RestApiResponse<>(uniAppOrderDetail);
} catch (BusinessException e) { // } catch (BusinessException e) {
logger.warn("小程序获取订单详情V2 warn", e); // logger.warn("小程序获取订单详情V2 warn", e);
response = new RestApiResponse<>(e.getCode(), e.getMessage()); // response = new RestApiResponse<>(e.getCode(), e.getMessage());
} catch (Exception e) { // } catch (Exception e) {
logger.error("小程序获取订单详情V2 error", e); // logger.error("小程序获取订单详情V2 error", e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_ORDER_DETAIL_ERROR); // response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_ORDER_DETAIL_ERROR);
} // }
logger.info("小程序获取订单详情V2, result:{}", JSON.toJSONString(response)); // logger.info("小程序获取订单详情V2, result:{}", JSON.toJSONString(response));
return response; // return response;
} // }
/** /**
* 根据订单号查询充电桩启动状态 * 根据订单号查询充电桩启动状态
@@ -268,7 +268,7 @@ public class OrderController extends BaseController {
*/ */
@PostMapping("/closeStartFailedOrder") @PostMapping("/closeStartFailedOrder")
public RestApiResponse<?> closeStartFailedOrder(@RequestBody QueryOrderDTO dto) { public RestApiResponse<?> closeStartFailedOrder(@RequestBody QueryOrderDTO dto) {
logger.info("关闭支付未启动的订单 param:{}", JSON.toJSONString(dto)); // logger.info("关闭支付未启动的订单 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null; RestApiResponse<?> response = null;
try { try {
orderService.closeStartFailedOrder(dto); orderService.closeStartFailedOrder(dto);
@@ -277,7 +277,7 @@ public class OrderController extends BaseController {
logger.error("关闭支付未启动的订单 error", e); logger.error("关闭支付未启动的订单 error", e);
response = new RestApiResponse<>("00300002", "关闭支付未启动的订单异常"); response = new RestApiResponse<>("00300002", "关闭支付未启动的订单异常");
} }
logger.info("关闭支付未启动的订单 result:{}", response); logger.info("关闭支付未启动的订单, param:{}, result:{}", JSON.toJSONString(dto), response);
return response; return response;
} }
@@ -305,6 +305,7 @@ public class OrderController extends BaseController {
logger.error("查询未开发票订单 error", e); logger.error("查询未开发票订单 error", e);
response = new RestApiResponse<>("00300003", "查询未开发票订单异常"); response = new RestApiResponse<>("00300003", "查询未开发票订单异常");
} }
logger.info("查询未开发票订单 param:{}, result:{}", JSON.toJSONString(dto), JSON.toJSONString(response));
return response; return response;
} }
@@ -317,7 +318,7 @@ public class OrderController extends BaseController {
*/ */
@PostMapping("/queryUninvoicedStationList") @PostMapping("/queryUninvoicedStationList")
public RestApiResponse<?> queryUninvoicedStationList(HttpServletRequest request, @RequestBody QueryOrderDTO dto) { public RestApiResponse<?> queryUninvoicedStationList(HttpServletRequest request, @RequestBody QueryOrderDTO dto) {
logger.info("查询未开发票的站点list param:{}", JSON.toJSONString(dto)); // logger.info("查询未开发票的站点list param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response; RestApiResponse<?> response;
try { try {
String memberId = getMemberIdByAuthorization(request); String memberId = getMemberIdByAuthorization(request);
@@ -334,6 +335,7 @@ public class OrderController extends BaseController {
logger.error("查询未开发票的站点list error", e); logger.error("查询未开发票的站点list error", e);
response = new RestApiResponse<>("00300004", "查询未开发票的站点list异常"); response = new RestApiResponse<>("00300004", "查询未开发票的站点list异常");
} }
logger.info("查询未开发票的站点list param:{}, result:{}", JSON.toJSONString(dto), JSON.toJSONString(response));
return response; return response;
} }

13
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -675,19 +675,6 @@ public class OrderService {
return vo; return vo;
} }
/**
* 小程序订单详情V2
*
* @param orderCode
* @return
*/
public UniAppOrderDetailVO getUniAppOrderDetailV2(String orderCode) {
UniAppOrderDetailVO resultVO = new UniAppOrderDetailVO();
return resultVO;
}
/** /**
* 根据订单号查询充电桩启动状态 * 根据订单号查询充电桩启动状态
* *