新增 占桩订单相关接口

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

@@ -32,7 +32,7 @@ public class OccupyOrderController extends BaseController {
     private OrderPileOccupyService orderPileOccupyService;
 
     /**
-     * 查询站点占桩费率
+     * todo 查询站点占桩费率
      * @param stationId
      * @return
      */
@@ -81,7 +81,12 @@ public class OccupyOrderController extends BaseController {
         return response;
     }
 
-    // 查询占桩订单列表页
+    /**
+     * 查询占桩订单列表页
+     * https://api.jsowellcloud.com/uniapp/occupyOrder/getOccupyOrderInfo
+     * @param request
+     * @return
+     */
     @GetMapping("/getOccupyOrderInfo")
     public RestApiResponse<?> getOccupyOrderInfo(HttpServletRequest request) {
         // 获取memberId

jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java

@@ -1,7 +1,9 @@
 package com.jsowell.api.uniapp;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.google.common.collect.ImmutableMap;
 import com.jsowell.common.annotation.Anonymous;
+import com.jsowell.common.constant.Constants;
 import com.jsowell.common.core.controller.BaseController;
 import com.jsowell.common.core.page.PageResponse;
 import com.jsowell.common.enums.ykc.ReturnCodeEnum;
@@ -9,6 +11,7 @@ import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.response.RestApiResponse;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.pile.domain.ykcCommond.RemoteControlGroundLockCommand;
+import com.jsowell.pile.dto.GenerateOccupyOrderDTO;
 import com.jsowell.pile.dto.QueryConnectorListDTO;
 import com.jsowell.pile.dto.QueryStationDTO;
 import com.jsowell.pile.service.*;
@@ -45,6 +48,9 @@ public class PileController extends BaseController {
 	@Autowired
 	private IPileMerchantInfoService pileMerchantInfoService;
 
+	@Autowired
+	private OrderPileOccupyService orderPileOccupyService;
+
 
 	/**
 	 * 查询充电站信息列表(主页)
@@ -142,16 +148,34 @@ public class PileController extends BaseController {
 	}
 
 	/**
-	 * 远程遥控地锁指令
+	 * 远程遥控地锁指令 + 生成占桩订单
 	 * @param command
 	 * @return
 	 */
 	@PostMapping("/remoteGroundLock")
-	public RestApiResponse<?> remoteGroundLock(@RequestBody RemoteControlGroundLockCommand command) {
+	public RestApiResponse<?> remoteGroundLock(HttpServletRequest request, @RequestBody RemoteControlGroundLockCommand command) {
 		logger.info("遥控地锁指令 params:{}", JSONObject.toJSONString(command));
 		RestApiResponse<?> response = null;
 		try {
 			ykcPushCommandService.pushRemoteControlGroundLock(command);
+			if (StringUtils.equals(command.getOperate(), Constants.ONE)) {
+				// 升锁不生成占桩订单
+				return new RestApiResponse<>();
+			}
+			// 获取memberId
+			String memberId = getMemberIdByAuthorization(request);
+			if (StringUtils.isEmpty(memberId)) {
+				throw new BusinessException(ReturnCodeEnum.CODE_TOKEN_ERROR);
+			}
+			GenerateOccupyOrderDTO dto = new GenerateOccupyOrderDTO();
+			dto.setMemberId(memberId);
+			dto.setPileSn(command.getPileSn());
+			dto.setConnectorCode(command.getConnectorCode());
+			// 生成占桩订单(草稿单)
+			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);