update 支付宝小程序

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

@@ -247,9 +247,10 @@ public class MemberService {
 		String decrypt = Factory.Util.AES().decrypt(dto.getMobileNumberCiphertext());
 		String mobileNumber = JSON.parseObject(decrypt).getString("mobile");
 
+		// 获取buyer_id
+
 		// 根据appid查询merchantId
-		String firstLevelMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByWxAppId(dto.getAppId());
-		firstLevelMerchantId = "1";
+		String firstLevelMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByAliAppId(dto.getAppId());
 
 		// 查询手机号码是否注册过
 		MemberRegisterAndLoginDTO loginDTO = MemberRegisterAndLoginDTO.builder()

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

@@ -555,4 +555,17 @@ public class PileService {
 		}
 		return 1;
 	}
+
+	/**
+	 * 查询充电桩预约记录
+	 */
+
+
+	/**
+	 * 取消预约充电
+	 * @param dto
+	 */
+	public void canalReserved(QueryPersonPileDTO dto) {
+
+	}
 }