diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java index 240c1a079..806769c36 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java @@ -2,6 +2,7 @@ package com.jsowell.api.uniapp; import com.alibaba.fastjson2.JSON; import com.google.common.collect.ImmutableMap; +import com.jsowell.common.UserAgentUtils; import com.jsowell.common.annotation.Anonymous; import com.jsowell.common.constant.Constants; import com.jsowell.common.core.controller.BaseController; @@ -67,6 +68,9 @@ public class OrderController extends BaseController { dto.setMemberId(memberId); // 生成订单 dto.setStartMode(Constants.ONE); // 启动方式 1-app启动 + + // 请求来源 + dto.setRequestSource(UserAgentUtils.determineRequestSource(request)); String orderCode = orderService.generateOrderV2(dto); response = new RestApiResponse<>(ImmutableMap.of("orderCode", orderCode)); } catch (BusinessException e) { diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java index c49265a29..2dc63b057 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java @@ -143,12 +143,12 @@ public class PileController extends BaseController { public RestApiResponse selectStationConnectorList(HttpServletRequest request, @RequestBody QueryConnectorListDTO dto) { logger.info("查询充电枪口列表 params:{}", JSON.toJSONString(dto)); RestApiResponse response = null; - try { - // 查询对接第三方平台的枪口状态 - selectThirdPartyConnectorStatus(dto); - } catch (Exception e) { - logger.error("修改对接第三方平台的枪口状态 error"); - } + // try { + // // 查询对接第三方平台的枪口状态 + // selectThirdPartyConnectorStatus(dto); + // } catch (Exception e) { + // logger.error("修改对接第三方平台的枪口状态 error"); + // } try { PageResponse pageResponse = pileConnectorInfoService.selectStationConnectorList(dto); diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java index beaf394f7..a34a417c4 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java @@ -83,12 +83,12 @@ public class PileConnectorInfoController extends BaseController { @PostMapping("/getConnectorInfoListByParams") public TableDataInfo getConnectorInfoListByParams(@RequestBody QueryConnectorListDTO dto) { logger.info("查询接口列表 param:{}", JSON.toJSONString(dto)); - try { - // 修改对接第三方平台的枪口状态 - selectThirdPartyConnectorStatus(dto); - } catch (Exception e) { - logger.error("修改对接第三方平台的枪口状态 error"); - } + // try { + // // 修改对接第三方平台的枪口状态 + // selectThirdPartyConnectorStatus(dto); + // } catch (Exception e) { + // logger.error("修改对接第三方平台的枪口状态 error"); + // } List list = pileConnectorInfoService.getConnectorInfoListByParams(dto); logger.info("查询接口列表 result:{}", JSON.toJSONString(list)); return getDataTable(list); diff --git a/jsowell-common/src/main/java/com/jsowell/common/core/domain/BaseEntity.java b/jsowell-common/src/main/java/com/jsowell/common/core/domain/BaseEntity.java index 16cebae87..012bf63ad 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/core/domain/BaseEntity.java +++ b/jsowell-common/src/main/java/com/jsowell/common/core/domain/BaseEntity.java @@ -60,6 +60,11 @@ public class BaseEntity implements Serializable { // 有权限的站点 private List stationDeptIds; + /** + * 请求来源, 参见{@link com.jsowell.common.enums.adapay.AdapayPayChannelEnum} + */ + private String requestSource; + public String getSearchValue() { return searchValue; }