From 2e422ae6b1dc9b6b74e431767120d4b61ef5fd80 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 30 May 2024 13:44:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E7=A0=81=E6=89=8B=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E6=83=85=E5=86=B5=E6=97=A5=E5=BF=97?= =?UTF-8?q?=20=E9=99=84=E8=BF=91=E4=B8=80=E5=8D=83=E7=B1=B3=E7=9A=84type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/controller/LoginContoller.java | 7 ++++++- .../system/cashierservice/service/ProductService.java | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java index 2911e96..590149e 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java @@ -127,8 +127,13 @@ public class LoginContoller { return Result.fail("签名校验失败"); } String data = WxMaCryptUtils.decrypt(sessionKey, encryptedData, ivStr); + String phone = ""; log.info("登录传参：解码获取手机号{}",data); - String phone =JSONObject.parseObject(data).get("phoneNumber").toString(); + if (ObjectUtil.isNotEmpty(data) && JSONObject.parseObject(data).containsKey("phoneNumber")) { + phone =JSONObject.parseObject(data).get("phoneNumber").toString(); + }else { + log.info("登录传参：获取手机号失败{}",data); + } String nickName = rawDataJson.getString("nickName"); String avatarUrl = rawDataJson.getString("avatarUrl"); try { diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java index 34832c6..b168420 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java @@ -187,6 +187,7 @@ public class ProductService { homeDto.setSize(4); } if (homeDto.getType().equals("near")) { + homeDto.setType(""); homeDto.setDistanceInKm("1"); } PageHelper.startPage(homeDto.getPage(), homeDto.getSize());