no message

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

@@ -283,9 +283,10 @@ public class UserController {
     @ApiOperation(value = "师傅手机号登录")
     public ResponseHelper<UserWxBean> workerMobileLogin(
             @ApiParam(value = "手机号",required = true) @RequestParam String mobile,
-            @ApiParam(value = "短信code",required = true) @RequestParam String messageCode
+            @ApiParam(value = "短信code",required = true) @RequestParam String messageCode,
+            @ApiParam(value = "经度,纬度") @RequestParam(required = false) String locate
     ) throws Exception {
-        UserWxBean userWxBean = userLogic.workerMobileLogin(mobile, messageCode);
+        UserWxBean userWxBean = userLogic.workerMobileLogin(mobile, messageCode, locate);
         userLogic.addVisit(userWxBean);
         return ResponseHelper.success(userWxBean);
     }

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/OrderLogic.java

@@ -568,10 +568,6 @@ public class OrderLogic {
             if (StringUtils.equals(orderStatus, OrderStatusEnum.CLOSE.toString())) {
                 orderStatusList.add(OrderStatusEnum.REFUND.toString());
                 orderStatusList.add(OrderStatusEnum.DTK.toString());
-            } else if (StringUtils.equals(orderStatus, OrderStatusEnum.DJH.toString())) {
-                orderStatusList.add(OrderStatusEnum.JHZ.toString());
-            } else if (StringUtils.equals(orderStatus, OrderStatusEnum.DPS.toString())) {
-                orderStatusList.add(OrderStatusEnum.PSZ.toString());
             }
         }
 

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

@@ -723,7 +723,7 @@ public class UserLogic {
     }
 
     @Transactional
-    public UserWxBean workerMobileLogin(String mobile, String messageCode) throws Exception {
+    public UserWxBean workerMobileLogin(String mobile, String messageCode, String locate) throws Exception {
         Object validMessageCode = redisUtil.get(Constant.RedisPrefix.SMS + ":" + mobile);
         if (Objects.isNull(validMessageCode)) {
             throw new RemoteServiceException("短信验证码过期");
@@ -733,17 +733,12 @@ public class UserLogic {
             throw new RemoteServiceException("短信验证码错误");
         }
 
-//        final AdminCompanyWechat wechat = adminCompanyWechatService.lambdaQuery()
-//                .last("limit 1")
-//                .one();
-        final AdminCompanyWechat wechat = null;
-
-        User user = this.initAppUser(wechat, mobile);
+        User user = this.initAppUser(mobile, locate);
 
         return this.appUser(user);
     }
 
-    private User initAppUser(AdminCompanyWechat wechat, String mobile) throws Exception {
+    private User initAppUser(String mobile, String locate) throws Exception {
         String key = Constant.RedisPrefix.LOCK_AUTH + ":" + mobile;
         Lock obtain = redisLockRegistry.obtain(key);
         if (!obtain.tryLock(2, TimeUnit.SECONDS)) {
@@ -796,6 +791,7 @@ public class UserLogic {
                 throw new RemoteServiceException("用户已被冻结");
             }
             user.setLastLoginTime(new Date());
+            user.setCurLocate(locate);
             //授权手机号
             user.updateById();