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

Merge branch 'dev' into feature-integrated_with_JCPP

Browse Source
This commit is contained in:
Guoqs
2026-01-04 14:55:17 +08:00
parent 755a823212 1e6f8edd96
commit 3a83908302
14 changed files with 462 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessOrderController.java
View File

@@ -1,18 +1,19 @@
package com.jsowell.api.uniapp.business;
import com.alibaba.fastjson2.JSONObject;
import com.google.common.collect.ImmutableMap;
import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.response.RestApiResponse;
import com.jsowell.pile.dto.business.QueryBusinessOrderDTO;
import com.jsowell.pile.service.OrderBasicInfoService;
import com.jsowell.pile.vo.uniapp.business.BusinessConnectorInfoVO;
import com.jsowell.pile.vo.uniapp.business.BusinessOrderBillingInfoVO;
import com.jsowell.pile.vo.uniapp.business.BusinessOrderQueryResultVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.xml.ws.soap.Addressing;
import java.util.List;
import java.util.List;
/**
@@ -65,4 +66,27 @@ public class BusinessOrderController extends BaseController {
logger.info("通过订单编号查询订单各时段计费明细 orderCode:{}, result:{}", orderCode, response);
return response;
}
/**
* 运营端小程序查询订单
* @param dto 查询条件
* @return 订单查询结果
*/
@PostMapping("/queryBusinessOrder")
public RestApiResponse<?> queryBusinessOrder(@RequestBody QueryBusinessOrderDTO dto) {
RestApiResponse<?> response = null;
try {
BusinessOrderQueryResultVO result = orderBasicInfoService.queryBusinessOrder(dto);
response = new RestApiResponse<>(result);
} catch (BusinessException e) {
logger.warn("运营端小程序查询订单 warn", e);
response = new RestApiResponse<>(e.getCode(), e.getMessage());
} catch (Exception e) {
logger.error("运营端小程序查询订单 error", e);
response = new RestApiResponse<>(e);
}
logger.info("运营端小程序查询订单 params:{}, result:{}", JSONObject.toJSONString(dto), response);
return response;
}
}

22
jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessStationInfoController.java
View File

@@ -3,15 +3,20 @@ package com.jsowell.api.uniapp.business;
import com.alibaba.fastjson2.JSONObject;
import com.google.common.collect.ImmutableMap;
import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.core.page.TableDataInfo;
import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.response.RestApiResponse;
import com.jsowell.common.util.StringUtils;
import com.jsowell.pile.dto.QueryStationDTO;
import com.jsowell.pile.dto.business.StationBusinessAnalyzeInfoDTO;
import com.jsowell.pile.dto.business.StationStatisticsInfoDTO;
import com.jsowell.pile.service.OrderBasicInfoService;
import com.jsowell.pile.service.PileStationInfoService;
import com.jsowell.pile.vo.uniapp.business.StationBusinessAnalyzeInfoVO;
import com.jsowell.pile.vo.uniapp.business.StationStatisticsInfosVO;
import com.jsowell.pile.vo.web.StationSelectVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -32,6 +37,23 @@ public class BusinessStationInfoController extends BaseController {
@Autowired
private OrderBasicInfoService orderBasicInfoService;
/**
* 查询充电站下拉列表
* @param stationName 站点名称（可选，支持模糊查询）
*/
@GetMapping("/getStationSelectList")
public TableDataInfo getStationSelectList(@RequestParam(required = false) String stationName) {
QueryStationDTO dto = new QueryStationDTO();
if (StringUtils.isNotBlank(stationName)) {
dto.setStationName(stationName);
}
List<StationSelectVO> list = pileStationInfoService.getStationSelectList(dto);
return getDataTable(list);
}
/**
* 获取站点统计信息
* @param dto