1.APP记录配送员当前坐标

2.PC端增加接口返回配送员当前坐标

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/user/UserController.java

@@ -298,4 +298,14 @@ public class UserController {
         userLogic.workerMobileLogout(request);
         return ResponseHelper.success();
     }
+
+    @PostMapping("/upload/locate")
+    @ApiOperation(value = "上传定位")
+    public ResponseHelper<UserWxBean> uploadLocate(
+            @ApiParam(value = "经度") @RequestParam(required = false) String lng,
+            @ApiParam(value = "纬度") @RequestParam(required = false) String lat
+    ) throws Exception {
+        userLogic.uploadLocate(lng, lat);
+        return ResponseHelper.success();
+    }
 }

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/UserLogic.java

@@ -816,4 +816,12 @@ public class UserLogic {
         String token = CommonUtils.getToken(request);
         redisUtil.del(Constant.RedisPrefix.TOKEN_WX + token, Constant.RedisPrefix.TOKEN_APP_USER + token);
     }
+
+    public void uploadLocate(String lng, String lat) {
+        CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
+        userService.lambdaUpdate()
+                .set(User::getCurLocate, lng + "," + lat)
+                .eq(User::getUserId, currentCompanyWechat.getUserId())
+                .update();
+    }
 }

mall-server-api/src/main/java/com/gree/mall/manager/bean/order/OrderDetailBeanVO.java

@@ -38,5 +38,4 @@ public class OrderDetailBeanVO extends OrderInfo {
     @ApiModelProperty("打印次数")
     private Integer printRecordCount;
 
-
 }

mall-server-api/src/main/java/com/gree/mall/manager/controller/order/OrderController.java

@@ -473,4 +473,13 @@ public class OrderController {
         OrderStatusCountBean bean = orderLogic.statusCount();
         return ResponseHelper.success(bean);
     }
+
+    @PostMapping("/delivery/locate")
+    @ApiOperation("配送员当前坐标")
+    public ResponseHelper<String> deliveryLocate(
+            @ApiParam(value = "配送员id", required = true) @RequestParam String userId
+    ) {
+        String locate = orderLogic.deliveryLocate(userId);
+        return ResponseHelper.success(locate);
+    }
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/order/OrderLogic.java

@@ -893,7 +893,6 @@ public class OrderLogic {
 
         orderDetailBean.setPrintRecordCount(printCount);
 
-
         return orderDetailBean;
     }
 
@@ -1481,4 +1480,9 @@ public class OrderLogic {
         }
         return bean;
     }
+
+    public String deliveryLocate(String userId) {
+        final User user = userService.getById(userId);
+        return user.getCurLocate();
+    }
 }