提交代码

hai-service/src/main/java/com/hai/common/utils/BaiduUtils.java

@@ -21,9 +21,14 @@ public class BaiduUtils {
      * @return
      */
     public static JSONObject ipLocation(String ip) {
-        JSONObject response = HttpsUtils.doGet("https://api.map.baidu.com/location/ip?ak=X4sSdXsohVOMb1tNiLZloD9ows5FaNjq&ip=" + ip);
+        if (ip != null) {
-        log.info(response.toJSONString());
+            JSONObject response = HttpsUtils.doGet("https://api.map.baidu.com/location/ip?ak=X4sSdXsohVOMb1tNiLZloD9ows5FaNjq&ip=" + ip);
-        return response;
+            log.info(response.toJSONString());
+            return response;
+
+        } else {
+            return null;
+        }
     }
 
 

hai-service/src/main/java/com/hai/service/impl/HighDiscountAgentCodeServiceImpl.java

@@ -267,7 +267,7 @@ public class HighDiscountAgentCodeServiceImpl implements HighDiscountAgentCodeSe
                 useDiscount(discountAgentCodeId);
             }
         } catch (Exception e) {
-
+            throw e;
         } finally {
             // 删除key，释放锁
             redisTemplate.delete(key);

hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java

@@ -84,6 +84,7 @@ public class HighUserServiceImpl implements HighUserService {
     public SessionObject loginAndRegister(LoginPlatform platform,String phone, Long popularizeUserId, Map<String, Object> other,HttpServletRequest request, HttpServletResponse response) throws Exception {
         // 记录登录信息
         String requestIp = RequestUtils.getRequestIp();
+        System.out.println(requestIp);
         HighUserLoginLog loginLog = new HighUserLoginLog();
         loginLog.setUserPhone(phone);
         loginLog.setPlatformCode(platform.getCode());