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' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-22 08:14:39 +08:00
parent 295d11ea62 5ea2ec624b
commit 0bbde0245d
7 changed files with 57 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java
View File

@@ -4,12 +4,14 @@ import com.alibaba.fastjson2.JSON;
import com.google.common.collect.ImmutableMap;
import com.jsowell.common.annotation.Anonymous;
import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.core.page.PageResponse;
import com.jsowell.common.enums.ykc.ReturnCodeEnum;
import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.response.RestApiResponse;
import com.jsowell.common.util.StringUtils;
import com.jsowell.pile.domain.OrderPileOccupy;
import com.jsowell.pile.dto.GenerateOccupyOrderDTO;
import com.jsowell.pile.dto.QueryOccupyOrderDTO;
import com.jsowell.pile.service.IPileBillingTemplateService;
import com.jsowell.pile.service.OrderPileOccupyService;
import com.jsowell.pile.vo.uniapp.OccupyOrderDetailVO;
@@ -64,18 +66,19 @@ public class OccupyOrderController extends BaseController {
* @param request
* @return
*/
@GetMapping("/getOccupyOrderInfo")
public RestApiResponse<?> getOccupyOrderInfo(HttpServletRequest request) {
@PostMapping("/getOccupyOrderInfo")
public RestApiResponse<?> getOccupyOrderInfo(HttpServletRequest request, @RequestBody QueryOccupyOrderDTO dto) {
// 获取memberId
String memberId = getMemberIdByAuthorization(request);
if (StringUtils.isEmpty(memberId)) {
throw new BusinessException(ReturnCodeEnum.CODE_TOKEN_ERROR);
}
logger.info("查询占桩订单列表页 memberId:{}", memberId);
logger.info("查询占桩订单列表页 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
dto.setMemberId(memberId);
try {
List<OrderPileOccupyVO> orderInfoList = orderPileOccupyService.getOccupyOrderInfo(memberId);
response = new RestApiResponse<>(orderInfoList);
PageResponse pageInfo = orderPileOccupyService.getOccupyOrderInfo(dto);
response = new RestApiResponse<>(pageInfo);
} catch (Exception e) {
logger.error("查询占桩订单列表页 error, ", e);
response = new RestApiResponse<>(e);