Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

# Conflicts: # jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java # jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java
2026-04-20 19:15:35 +08:00 · 2023-08-18 11:14:21 +08:00
parent 66fedd8127 74af1bba60
commit 09f1588a99
11 changed files with 1177 additions and 811 deletions
--- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java
@@ -1,7 +1,108 @@
-package com.jsowell.api.uniapp;/**
- * TODO
+package com.jsowell.api.uniapp;
+
+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.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.service.OrderPileOccupyService;
+import com.jsowell.pile.vo.uniapp.OrderPileOccupyVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 占桩订单controller
 *
+ * @author Lemon
 * @Date 2023/8/18 8:55
- * @author  Lemon 
- */public class OccupyOrderController {
+ */
+@Anonymous
+@RestController
+@RequestMapping("/uniapp/occupyOrder")
+public class OccupyOrderController extends BaseController {
+    @Autowired
+    private OrderPileOccupyService orderPileOccupyService;
+
+    /**
+     * 查询站点占桩费率
+     * @param stationId
+     * @return
+     */
+    @GetMapping("/getStationOccupyFee/{stationId}")
+    public RestApiResponse<?> getStationOccupyFee(@PathVariable("stationId") String stationId) {
+        logger.info("查询站点占桩费率 params:{}", stationId);
+        RestApiResponse<?> response = null;
+        try {
+
+        } catch (Exception e) {
+            logger.error("查询站点占桩费率 error,", e);
+            response = new RestApiResponse<>(e);
+        }
+        logger.info("查询站点占桩费率 result:{}", response);
+        return response;
+    }
+
+
+    /**
+     * 生成占桩订单
+     * https://api.jsowellcloud.com/uniapp/occupyOrder/generateOccupyOrder
+     * @param request
+     * @param dto
+     * @return
+     */
+    @PostMapping("/generateOccupyOrder")
+    public RestApiResponse<?> generateOccupyOrder(HttpServletRequest request, @RequestBody GenerateOccupyOrderDTO dto) {
+        logger.info("生成占桩订单 params:{}", JSON.toJSONString(dto));
+        RestApiResponse<?> response = null;
+        try {
+            // 获取memberId
+            String memberId = getMemberIdByAuthorization(request);
+            if (StringUtils.isEmpty(memberId)) {
+                throw new BusinessException(ReturnCodeEnum.CODE_TOKEN_ERROR);
+            }
+            dto.setMemberId(memberId);
+            String occupyOrderCode = orderPileOccupyService.generateOccupyPileOrder(dto);
+            if (StringUtils.isNotBlank(occupyOrderCode)) {
+                response = new RestApiResponse<>(ImmutableMap.of("occupyOrderCode", occupyOrderCode));
+            }
+        } catch (Exception e) {
+            logger.error("生成占桩订单 error,", e);
+            response = new RestApiResponse<>(e);
+        }
+        logger.info("生成占桩订单 result:{}", response);
+        return response;
+    }
+
+    // 查询占桩订单列表页
+    @GetMapping("/getOccupyOrderInfo")
+    public RestApiResponse<?> getOccupyOrderInfo(HttpServletRequest request) {
+        // 获取memberId
+        String memberId = getMemberIdByAuthorization(request);
+        if (StringUtils.isEmpty(memberId)) {
+            throw new BusinessException(ReturnCodeEnum.CODE_TOKEN_ERROR);
+        }
+        logger.info("查询占桩订单列表页 memberId:{}", memberId);
+        RestApiResponse<?> response = null;
+        try {
+            List<OrderPileOccupyVO> orderInfoList = orderPileOccupyService.getOccupyOrderInfo(memberId);
+            response = new RestApiResponse<>(orderInfoList);
+        } catch (Exception e) {
+            logger.error("查询占桩订单列表页 error, ", e);
+            response = new RestApiResponse<>(e);
+        }
+        logger.info("查询占桩订单列表页 result:{}", response);
+        return response;
+    }
+
+
+
+    // 查询占桩订单详情页
 }
--- a/jsowell-admin/src/test/java/SpringBootTestController.java
+++ b/jsowell-admin/src/test/java/SpringBootTestController.java
@@ -208,7 +208,12 @@ public class SpringBootTestController {
 		String memberId = "67569684";
 		String pileSn = "88230000000135";
 		String connectorCode = "01";
-		orderPileOccupyService.generateOccupyPileOrder(memberId, pileSn, connectorCode);
+		GenerateOccupyOrderDTO dto = new GenerateOccupyOrderDTO();
+		dto.setMemberId(memberId);
+		dto.setPileSn(pileSn);
+		dto.setConnectorCode(connectorCode);
+
+		orderPileOccupyService.generateOccupyPileOrder(dto);
 	}

 	@Test