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());