diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java
index eeafe6344..e005c99d1 100644
--- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java
@@ -117,7 +117,7 @@ public class PersonPileController extends BaseController {
             if (StringUtils.isNotBlank(appId)) {
                 String firstLevelMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByWxAppId(appId);
                 if (StringUtils.isNotBlank(firstLevelMerchantId)) {
-                    dto.setMerchantId(firstLevelMerchantId);
+                    dto.setFirstLevelMerchantId(firstLevelMerchantId);
                 }
             }
             String memberId = getMemberIdByAuthorization(request);
@@ -135,6 +135,36 @@ public class PersonPileController extends BaseController {
         return response;
     }
 
+    /**
+     * 个人桩停止充电
+     * 管理员可以停自己启动的和别人启动的
+     * 其他人员只能停止自己启动的
+     */
+    @PostMapping("/personPileStopCharging")
+    public RestApiResponse<?> personPileStopCharging(HttpServletRequest request, PersonPileStopChargingDTO dto) {
+        RestApiResponse<?> response = null;
+        try {
+            String appId = request.getHeader("appId");
+            if (StringUtils.isNotBlank(appId)) {
+                String firstLevelMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByWxAppId(appId);
+                if (StringUtils.isNotBlank(firstLevelMerchantId)) {
+                    dto.setFirstLevelMerchantId(firstLevelMerchantId);
+                }
+            }
+            String memberId = getMemberIdByAuthorization(request);
+            dto.setMemberId(memberId);
+            pileService.personPileStopCharging(dto);
+            response = new RestApiResponse<>();
+        } catch (BusinessException e) {
+            logger.error("个人桩停止充电error", e);
+            response = new RestApiResponse<>(e.getCode(), e.getMessage());
+        } catch (Exception e) {
+            logger.error("个人桩停止充电error", e);
+            response = new RestApiResponse<>(ReturnCodeEnum.CODE_PERSON_PILE_STOP_CHARGING_ERROR);
+        }
+        return response;
+    }
+
 
     /**
      * 通过memberId查个人桩列表
diff --git a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java
index a125815ee..5ed7cfd76 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java
@@ -339,7 +339,7 @@ public class PileService {
 	 */
 	public void adminIssuePile(PileMemberBindingDTO dto) {
 		// 通过前端传的手机号查询是否有此用户
-		MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber(), dto.getMerchantId());
+		MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber(), dto.getFirstLevelMerchantId());
 		if (memberBasicInfo == null) {
 			// 为空说明此用户未注册平台账号
 			throw new BusinessException(ReturnCodeEnum.CODE_USER_IS_NOT_REGISTER);
@@ -377,7 +377,7 @@ public class PileService {
 			PileMemberRelation info = new PileMemberRelation();
 			info.setPileSn(dto.getPileSn());
 			info.setMemberId(memberBasicInfo.getMemberId());
-			info.setType("2");
+			info.setType(Constants.TWO);
 			pileMemberRelationService.insertPileMemberRelation(info);
 		}
 	}
@@ -656,4 +656,12 @@ public class PileService {
 		// System.out.println(i);
 		return String.valueOf(i);
 	}
+
+	/**
+	 * 个人桩停止充电
+	 * @param dto
+	 */
+	public void personPileStopCharging(PersonPileStopChargingDTO dto) {
+
+	}
 }
diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java
index 72c8b2676..48ceef8bf 100644
--- a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java
+++ b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java
@@ -179,6 +179,8 @@ public enum ReturnCodeEnum {
 
 	CODE_RESERVATION_ALREADY_EXISTS_ERROR("00400017", "已经存在生效中的预约，请关闭后再试"),
 
+	CODE_PERSON_PILE_STOP_CHARGING_ERROR("00400018", "个人桩停止充电异常"),
+
 	/* 个人桩 end */
 
 	CODE_THIS_CARNO_HAS_BEEN_BINDING("00500001", "当前车牌号已经绑定，请检查！"),
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PersonPileStopChargingDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PersonPileStopChargingDTO.java
new file mode 100644
index 000000000..8f275fa29
--- /dev/null
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PersonPileStopChargingDTO.java
@@ -0,0 +1,24 @@
+package com.jsowell.pile.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class PersonPileStopChargingDTO {
+    private String memberId;
+    private String firstLevelMerchantId;
+
+    private String pileSn;
+
+    private String ConnectorCode;
+
+    /**
+     * 桩枪口号
+     */
+    private String pileConnectorCode;
+}
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileMemberBindingDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileMemberBindingDTO.java
index 8bfa748f0..d3a5d1e5a 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileMemberBindingDTO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileMemberBindingDTO.java
@@ -38,5 +38,5 @@ public class PileMemberBindingDTO {
     /**
      * 一级运营商id
      */
-    private String merchantId;
+    private String firstLevelMerchantId;
 }