~api:藏品详情+受赠人判断;

+api:adam+根据uid查取脱敏身份信息;

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java

@@ -476,10 +476,20 @@ public class AdamUserController {
     @GetMapping(value = "info/identity")
     public ResponseDto<AdamUserIdentityInfoVo> identityInfoByMobile(@Pattern(regexp = "\\d{11}", message = "手机号格式有误")
                                                                     @RequestParam(required = false) String mobile) {
-        String uid = null == mobile ? CurrentUtil.getCurrentUid() : adamRdmService.getUidByMobile(mobile);
+        return this.identityInfoByUID(null == mobile ? CurrentUtil.getCurrentUid() : adamRdmService.getUidByMobile(mobile));
+    }
+
+    @ApiOperationSupport(order = 12)
+    @ApiOperation(value = "用户身份信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "id", value = "手机号"),
+    })
+    @GetMapping(value = "info/identity")
+    public ResponseDto<AdamUserIdentityInfoVo> identityInfoByUID(@RequestParam(required = false) String id) {
+        String uid = StringUtils.isBlank(id) ? CurrentUtil.getCurrentUid() : id;
         AdamUserInfoVo userInfoVo;
         if (uid == null || null == (userInfoVo = adamRdmService.getUserInfoVoByUid(uid))) {
-            log.warn("###用户不存在[MOBILE:{},UID:{},TOKEN:{}]", mobile, uid, CurrentUtil.getToken());
+            log.warn("###用户不存在[id:{},uid:{},token:{}]", id, uid, CurrentUtil.getToken());
             return ResponseDto.failure(ErrorMapping.get("10114"));
         }
         AdamRealInfoVo realInfoVoByUidPlain = adamRdmService.getRealInfoVoByUidPlain(uid);
@@ -489,11 +499,11 @@ public class AdamUserController {
         AdamUserIdentityInfoVo userIdentityInfoVo = AdamUserIdentityInfoVo.getNew();
         userIdentityInfoVo.setUid(uid);
         userIdentityInfoVo.setName(realInfoVoByUidPlain.getName());
-        userIdentityInfoVo.setMobile(mobile);
+        userIdentityInfoVo.setMobile(userInfoVo.getMobile());
         return ResponseDto.success(userIdentityInfoVo.desensitize());
     }
 
-    @ApiOperationSupport(order = 12)
+    @ApiOperationSupport(order = 13)
     @ApiOperation(value = "验证手机号")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "mobile", value = "手机号[用于验证当前账户所绑定手机号]"),

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinUserDigitalArtworkServiceImpl.java

@@ -195,7 +195,7 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
 
             return artworkInfoVo;
         }*/
-        if (null != userDigitalArtworkVo && userDigitalArtworkVo.getUid().equals(uid)) {
+        if (null != userDigitalArtworkVo && (uid.equals(userDigitalArtworkVo.getUid()) || uid.equals(userDigitalArtworkVo.getReceiverUid()))) {
             GoblinUserDigitalArtworkInfoVo artworkInfoVo = GoblinUserDigitalArtworkInfoVo.getNew().copy(userDigitalArtworkVo);
 
             GoblinGoodsSkuInfoVo goodsSkuInfoVo = goblinRedisUtils.getGoodsSkuInfoVo(userDigitalArtworkVo.getSkuId());