暂时提交代码

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinUserBizAcctVo.java → liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/AdamUserBizAcctVo.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
 @ApiModel(value = "AdamUserBizAcctVo", description = "用户业务账号信息")
 @JsonIgnoreProperties(ignoreUnknown = true)
 @Data
-public class GoblinUserBizAcctVo implements Serializable, Cloneable {
+public class AdamUserBizAcctVo implements Serializable, Cloneable {
     private static final long serialVersionUID = 7428532456309328881L;
     @ApiModelProperty(position = 11, value = "业务码[NFT_ZX-至信数字藏品账号]")
     private String bizCode;
@@ -20,17 +20,17 @@ public class GoblinUserBizAcctVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 13, value = "业务账号ID")
     private String uuid;
 
-    private static final GoblinUserBizAcctVo obj = new GoblinUserBizAcctVo();
+    private static final AdamUserBizAcctVo obj = new AdamUserBizAcctVo();
 
-    public static GoblinUserBizAcctVo getNew() {
+    public static AdamUserBizAcctVo getNew() {
         try {
-            return (GoblinUserBizAcctVo) obj.clone();
+            return (AdamUserBizAcctVo) obj.clone();
         } catch (CloneNotSupportedException e) {
-            return new GoblinUserBizAcctVo();
+            return new AdamUserBizAcctVo();
         }
     }
 
-    public GoblinUserBizAcctVo copy(AdamUserBusiAcct source) {
+    public AdamUserBizAcctVo copy(AdamUserBusiAcct source) {
         if (null == source) return this;
         this.setBizCode(source.getBusi());
         this.setUuid(source.getUuid());

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinNftUserService.java

 package com.liquidnet.service.goblin.service;
 
-import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.goblin.dto.vo.GoblinNftOrderDetailsVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinPayOrderDetailsVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinUserBizAcctVo;
+import com.liquidnet.service.goblin.dto.vo.AdamUserBizAcctVo;
 
 public interface IGoblinNftUserService {
 
-    ResponseDto<GoblinUserBizAcctVo> openNftAccount(String uid, String bizCode, String name, String idCard,String mobile);
+    ResponseDto<AdamUserBizAcctVo> openNftAccount(String uid, String bizCode, String name, String idCard, String mobile);
 }

liquidnet-bus-do/liquidnet-service-adam-do/src/main/resources/com/liquidnet/service/adam/mapper/AdamUserBusiAcctMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.liquidnet.service.adam.mapper.AdamUserBusiAcctMapper">
+<mapper namespace="com.liquidnet.service.goblin.mapper.AdamUserBusiAcctMapper">
 
 </mapper>

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/mapper/AdamUserBusiAcctMapper.java → liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/mapper/AdamUserBusiAcctMapper.java

-package com.liquidnet.service.adam.mapper;
+package com.liquidnet.service.goblin.mapper;
 
-import com.liquidnet.service.adam.entity.AdamUserBusiAcct;
+import com.liquidnet.service.goblin.entity.AdamUserBusiAcct;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

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

@@ -5,10 +5,9 @@ import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.commons.lang.constant.LnsRegex;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.IDCardUtil;
-import com.liquidnet.service.adam.dto.vo.AdamUserBizAcctVo;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.goblin.dto.vo.GoblinUserBizAcctVo;
+import com.liquidnet.service.goblin.dto.vo.AdamUserBizAcctVo;
 import com.liquidnet.service.goblin.service.IGoblinNftUserService;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
 import io.swagger.annotations.Api;
@@ -16,7 +15,6 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -41,10 +39,10 @@ public class GoblinNFTUserController {
             @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "idCard", value = "身份证号"),
     })
     @PostMapping(value = "open/account")
-    public ResponseDto<GoblinUserBizAcctVo> openAccount(@Pattern(regexp = "\\b(NFT_ZX)\\b", message = "业务码无效")
+    public ResponseDto<AdamUserBizAcctVo> openAccount(@Pattern(regexp = "\\b(NFT_ZX)\\b", message = "业务码无效")
                                                         @RequestParam String bizCode,
-                                                        @RequestParam(required = false) String name,
-                                                        @RequestParam(required = false) String idCard) {
+                                                      @RequestParam(required = false) String name,
+                                                      @RequestParam(required = false) String idCard) {
         if (!java.util.regex.Pattern.matches(LnsRegex.Valid.CN_HANZI, name)) {
             return ResponseDto.failure(ErrorMapping.get("10103"));
         }
@@ -58,7 +56,7 @@ public class GoblinNFTUserController {
         String currentUid = CurrentUtil.getCurrentUid();
         String mobile = (String) CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_MOBILE);
         try {
-            ResponseDto<GoblinUserBizAcctVo> vo = goblinNftUserService.openNftAccount(currentUid, bizCode, name, idCard, mobile);
+            ResponseDto<AdamUserBizAcctVo> vo = goblinNftUserService.openNftAccount(currentUid, bizCode, name, idCard, mobile);
             goblinRedisUtils.setNftNumAccount(currentUid);
             return vo;
         } catch (Exception e) {

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

 package com.liquidnet.service.goblin.service.impl;
 
-import com.liquidnet.commons.lang.util.CollectionUtil;
-import com.liquidnet.commons.lang.util.HttpUtil;
-import com.liquidnet.commons.lang.util.IDCardUtil;
-import com.liquidnet.service.adam.constant.AdamEnum;
-import com.liquidnet.service.adam.dto.vo.AdamRealInfoVo;
-import com.liquidnet.service.adam.dto.vo.AdamUserBizAcctVo;
-import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.base.SqlMapping;
-import com.liquidnet.service.base.constant.MQConst;
-import com.liquidnet.service.goblin.dto.vo.GoblinUserBizAcctVo;
+import com.liquidnet.service.goblin.dto.vo.AdamUserBizAcctVo;
 import com.liquidnet.service.goblin.service.IGoblinNftUserService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.LinkedMultiValueMap;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Optional;
 
 @Slf4j
 @Service
 public class GoblinNftUserServiceImpl implements IGoblinNftUserService {
     @Override
-    public ResponseDto<GoblinUserBizAcctVo> openNftAccount(String uid, String bizCode, String name, String idCard, String mobile) {
+    public ResponseDto<AdamUserBizAcctVo> openNftAccount(String uid, String bizCode, String name, String idCard, String mobile) {
 //        List<AdamUserBizAcctVo> userBizAcctVoList = adamRdmService.getBizAcctVosByUid(uid);
 //        if (!CollectionUtils.isEmpty(userBizAcctVoList)) {
 //            Optional<AdamUserBizAcctVo> optional = userBizAcctVoList.stream().filter(r -> r.getBizCode().equals(bizCode)).findAny();