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

jsowell-admin/src/main/java/com/jsowell/service/PileService.java

@@ -283,6 +283,10 @@ public class PileService {
 			// 不一致则此桩不是个人桩
 			throw new BusinessException(ReturnCodeEnum.CODE_THIS_PILE_NOT_PERSONAL_PILE);
 		}
+
+		// 初始化个人桩预约信息
+		pileReservationInfoService.initPersonalPileReservation(dto.getPileSn(), null);
+
 		// 检查桩是否已经被绑定
 		PileMemberRelation pileMemberRelation = new PileMemberRelation();
 		pileMemberRelation.setPileSn(dto.getPileSn());
@@ -298,7 +302,7 @@ public class PileService {
 		}
 		// 密钥正确，且桩未被绑定，则此用户为管理员
 		pileMemberRelation.setMemberId(dto.getMemberId());
-		pileMemberRelation.setType("1"); // 1-管理员
+		pileMemberRelation.setType(Constants.ONE); // 1-管理员
 		return pileMemberRelationService.insertPileMemberRelation(pileMemberRelation);
 	}
 
@@ -602,4 +606,6 @@ public class PileService {
 		return String.valueOf(i);
 	}
 
+
+
 }