fix receive

rankin-api-web/src/main/java/cn/rankin/apiweb/controller/UserController.java

@@ -1,10 +1,32 @@
 package cn.rankin.apiweb.controller;
 
+import cn.rankin.apiweb.assist.resolver.NeedUser;
+import cn.rankin.apiweb.code.ApiWebCode;
+import cn.rankin.apiweb.service.user.UserService;
+import cn.rankin.common.utils.api.model.APIResult;
+import cn.rankin.data.api.app.vo.DeviceUserVo;
+import cn.rankin.data.api.app.vo.UserInfoVo;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping(value = "/user")
 public class UserController {
 
+    @Autowired
+    private UserService userService;
+
+    @RequestMapping(method = RequestMethod.GET)
+    public APIResult<UserInfoVo> getUserInfo(@NeedUser DeviceUserVo deviceUserVo) {
+        String uid = deviceUserVo.getUid();
+        if (StringUtils.isEmpty(uid)) {
+            return APIResult.error(ApiWebCode.NOT_EXISTS);
+        }
+
+        UserInfoVo userInfoVo = userService.getUserInfo(uid);
+        return APIResult.ok(userInfoVo);
+    }
 }

rankin-api-web/src/main/java/cn/rankin/apiweb/service/user/UserService.java

@@ -67,7 +67,7 @@ public class UserService {
         // 保存至缓存
         this.save(deviceUserVo);
 
-        UserInfoVo userInfoVo = toUserInfoVo(deviceUserVo);
+        UserInfoVo userInfoVo = toUserInfoVo(deviceUserVo, true);
         log.info("user={} login success, userInfo={}", eid, JSON.toJSONString(userInfoVo));
 
         return APIResult.ok(userInfoVo);
@@ -109,6 +109,11 @@ public class UserService {
         return deviceUserVo;
     }
 
+    public UserInfoVo getUserInfo(String uid) {
+        DeviceUserVo deviceUserVo = this.load(uid);
+        return toUserInfoVo(deviceUserVo, false);
+    }
+
     public DeviceUserVo getDeviceUserVo(String uid) {
         APIResult<TerminalDeviceVo> deviceAPIResult = userClient.findDeviceByUid(uid);
         if (!deviceAPIResult.getSuccess()) {
@@ -164,7 +169,7 @@ public class UserService {
         refreshToken(deviceUserVo);
         save(deviceUserVo);
 
-        UserInfoVo userInfoVo = toUserInfoVo(deviceUserVo);
+        UserInfoVo userInfoVo = toUserInfoVo(deviceUserVo, false);
         return APIResult.ok(userInfoVo);
     }
 
@@ -178,7 +183,7 @@ public class UserService {
         return String.format(USER_FORMAT_KEY, uid);
     }
 
-    public static UserInfoVo toUserInfoVo(DeviceUserVo deviceUserVo) {
+    public static UserInfoVo toUserInfoVo(DeviceUserVo deviceUserVo, Boolean withToken) {
         UserInfoVo userInfoVo = new UserInfoVo();
         userInfoVo.setUid(deviceUserVo.getUid());
         userInfoVo.setEid(deviceUserVo.getEid());
@@ -186,7 +191,9 @@ public class UserService {
         userInfoVo.setMerchantName(deviceUserVo.getMerchantName());
         userInfoVo.setMerchantContactName(deviceUserVo.getMerchantContactName());
         userInfoVo.setMerchantContactMobile(deviceUserVo.getMerchantContactMobile());
-        userInfoVo.setToken(deviceUserVo.getToken());
+        if (withToken) {
+            userInfoVo.setToken(deviceUserVo.getToken());
+        }
         return userInfoVo;
     }
 

rankin-cms-web/src/main/java/cn/rankin/cmsweb/service/trade/order/OrderClient.java

@@ -43,6 +43,6 @@ public interface OrderClient {
     @RequestMapping(value = "/order/send/{detailId}", method = RequestMethod.POST)
     APIResult<Boolean> send(@PathVariable("detailId") String detailId, @RequestBody OrderSendDTO sendDTO);
 
-    @RequestMapping(value = "/receive/{detailId}", method = RequestMethod.POST)
+    @RequestMapping(value = "/order/receive/{detailId}", method = RequestMethod.POST)
     APIResult<Boolean> receive(@PathVariable("detailId") String detailId);
 }