修改打卡接口添加获取不到定位提示

happy-job-base-common/src/main/java/com/jeeplus/modules/utils/ErrorCode.java

@@ -46,6 +46,7 @@ public interface ErrorCode {
     final int code_2102 = 2102;   //超出打下班卡时间
     final int code_2103 = 2103;   //超出打卡范围"
     final int code_2104 = 2104;   //已打上班卡"
+    final int code_2105 = 2105;   //获取不到定位"
     final int code_3001 = 3001;   //企业未注册
     final int code_3002 = 3002;   //用户未注册
     final int code_3003 = 3003;   //用户未被邀请

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/api/wsmanager/WsPunchClockControllerAPI.java

@@ -45,7 +45,9 @@ public class WsPunchClockControllerAPI extends BaseAppController {
                 obj = errorResult(ErrorCode.code_2008, "用户信息验证失败");
             }else if ("2010".equals(returnMap.get("success"))) {
                 obj = errorResult(ErrorCode.code_2010, Global.getNoLogin());
-            } else {
+            } else if ("2105".equals(returnMap.get("success"))) {
+                 obj = errorResult(ErrorCode.code_2105, "定位失败，请刷新重试");
+             }else {
                 obj = successResult(ErrorCode.code_1000, "获取数据成功", returnMap);
             }
 
@@ -84,6 +86,8 @@ public class WsPunchClockControllerAPI extends BaseAppController {
                 obj = errorResult(ErrorCode.code_2103, "超出打卡范围");
             } else if ("2104".equals(returnMap.get("success"))) {
                 obj = errorResult(ErrorCode.code_2104, "已打上班卡");
+            } else if ("2105".equals(returnMap.get("success"))) {
+                obj = errorResult(ErrorCode.code_2105, "定位失败，请刷新重试");
             }else if ("2102".equals(returnMap.get("success"))) {
                 obj = errorResult(ErrorCode.code_2102, "超过打下班卡时间，请刷新重试");
             }else {

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/wspunch/service/WsPunchClockService.java

@@ -15,6 +15,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.jeeplus.common.config.Global;
+import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.modules.sys.entity.HpMember;
 import com.jeeplus.modules.sys.service.HpMemberService;
 import com.jeeplus.modules.sys.utils.businessAccountUtils;
@@ -92,6 +93,10 @@ public class WsPunchClockService extends CrudService<WsPunchClockMapper, WsPunch
 			if (TokenUtil.validateToken(userId, userToken)) {
 				String longitude = requestMap.get("longitude");  //经度
 				String latitude = requestMap.get("latitude");  //纬度
+				if(StringUtils.isBlank(longitude) || StringUtils.isBlank(latitude)){
+					returnMap.put("success", "2105");
+					return returnMap;
+				}
 				int clockType=1;  //1:上班打卡  2：下班打卡  3：超出范围  4：已完成 5:审核中
                 int sumDuration=0;  //定义本周总打卡时长
 				Double sumMoney=0.00;  //本周预支
@@ -257,6 +262,10 @@ public class WsPunchClockService extends CrudService<WsPunchClockMapper, WsPunch
 			if (TokenUtil.validateToken(userId, userToken)) {
 				String longitude = requestMap.get("longitude");  //经度
 				String latitude = requestMap.get("latitude");  //纬度
+				if(StringUtils.isBlank(longitude) || StringUtils.isBlank(latitude)){
+					returnMap.put("success", "2105");
+					return returnMap;
+				}
 				String clockType=requestMap.get("clockType"); //打卡状态 1：上班打卡 2：下班打卡
 				//获取打卡设置信息
 				List<WsSetting> wsSettingList=wsSettingService.findList(new WsSetting());