Merge remote-tracking branch 'origin/dev_nft_411' into dev_nft_411

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinPayOrderDetailsVo.java

@@ -27,6 +27,10 @@ public class GoblinPayOrderDetailsVo implements Serializable, Cloneable {
     private String skuPic;
     @ApiModelProperty(position = 21, value = "单品现价[20,2]")
     private BigDecimal price;
+
+    @ApiModelProperty(value = "商铺名称")
+    private String storeName;
+
     @ApiModelProperty(position = 22, value = "数量")
     private Integer num;
     @ApiModelProperty(position = 23, value = "总价")

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/config/ConsumerGalaxySqlNftOrderFailLogConfig.java

@@ -36,7 +36,7 @@ public class ConsumerGalaxySqlNftOrderFailLogConfig extends RedisStreamConfig {
     StringRedisTemplate stringRedisTemplate;
 
     @Bean
-    public List<Subscription> subscriptionSqlNftOrderInfo(RedisConnectionFactory factory) {
+    public List<Subscription> subscriptionSqlNftOrderFailLog(RedisConnectionFactory factory) {
         List<Subscription> subscriptionList = new ArrayList<>();
         MQConst.GalaxyQueue stream = MQConst.GalaxyQueue.SQL_NFT_ORDER_FAIL_LOG;
 

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/router/zxin/service/GalaxyRouterStrategyZxlTradeImpl.java

 package com.liquidnet.service.galaxy.router.zxin.service;
 
+import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.galaxy.constant.GalaxyEnum;
 import com.liquidnet.service.galaxy.dto.param.*;
 import com.liquidnet.service.galaxy.router.strategy.IGalaxyRouterStrategyTrade;
@@ -33,7 +35,7 @@ public class GalaxyRouterStrategyZxlTradeImpl implements IGalaxyRouterStrategyTr
     @Override
     public ResponseDto<GalaxyNftPublishAndBuyRespDto> nftPublishAndBuy(GalaxyNftPublishAndBuyReqDto reqDto) {
         //测试发送队列
-//        queueUtil.sendMsgByRedis(MQConst.GalaxyQueue.JSON_NFT_PUBLISH_AND_BUY.getKey(), JsonUtils.toJson(reqDto));
+        queueUtil.sendMsgByRedis(MQConst.GalaxyQueue.JSON_NFT_PUBLISH_AND_BUY.getKey(), JsonUtils.toJson(reqDto));
 //        return ResponseDto.success();
         return zxinTradeBiz.nftPublishAndBuy(reqDto);
     }

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

@@ -31,14 +31,14 @@ public class GoblinRscController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", dataType = "String", name = "userId", value = "用户ID", example = "1", required = true),
     })
-    public ResponseDto<Boolean> syncNotice(
+    public ResponseDto syncNotice(
             @RequestParam("userId") @NotBlank(message = "用户ID不能为空") String userId
     ) {
         Boolean notice = accountService.syncNotice(userId);
         if (notice) {
-            return ResponseDto.success();
+            return ResponseDto.success("同步成功");
         } else {
-            return ResponseDto.failure();
+            return ResponseDto.failure("未获取到数据");
         }
     }
 

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

 package com.liquidnet.service.goblin.service.impl;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.HttpUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.adam.dto.vo.AdamUserBizAcctVo;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
+import org.springframework.util.MultiValueMap;
 
 @Service
 @Slf4j
@@ -12,11 +21,26 @@ public class GoblinNftNumAccountServiceImpl {
     @Autowired
     private GoblinRedisUtils goblinRedisUtils;
 
+    @Value("${liquidnet.service.adam.url}")
+    private String adamUrl;
+
     public Boolean syncNotice(String userId) {
-        // TODO: jxl 2022/4/6  请求adam
-        // 写入redis
-        goblinRedisUtils.setNftNumAccount(userId);
-        return true;
+        // 请求adam
+        MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
+        headers.add("Accept", MediaType.APPLICATION_JSON_UTF8_VALUE);
+        headers.set("Content-Type", MediaType.APPLICATION_FORM_URLENCODED_VALUE);
+        String returnData = HttpUtil.getByUri(adamUrl.concat("/adam/rsc/inquire/bizacc?bizCode=NFT_ZX&uid=".concat(userId)), headers);
+        ResponseDto<AdamUserBizAcctVo> rsp = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<AdamUserBizAcctVo>>() {
+        });
+        AdamUserBizAcctVo rspData = rsp.getData();
+        if (null != rspData) {
+            // 写入redis
+            goblinRedisUtils.setNftNumAccount(userId);
+            return true;
+        } else {
+            log.info("同步数字账号失败,信息不存在 [userId:{}]", userId);
+            return false;
+        }
     }
 
 }

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

@@ -93,6 +93,9 @@ public class GoblinNftOrderAppServiceImpl implements IGoblinNftOrderAppService {
             GoblinPayOrderDetailsVo payOrderDetailsVo = GoblinPayOrderDetailsVo.getNew().copy(goodsSkuInfoVo);
             payOrderDetailsVo.setNum(1);
             payOrderDetailsVo.setPriceTotal(payOrderDetailsVo.getPrice());
+
+            GoblinStoreInfoVo storeInfoVo = goblinRedisUtils.getStoreInfoVo(goodsSkuInfoVo.getStoreId());
+            payOrderDetailsVo.setStoreName(storeInfoVo.getStoreName());
             return payOrderDetailsVo;
         } else {
             return null;

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

@@ -1399,7 +1399,7 @@ public class GoblinRedisUtils {
     //
     public void setNftNumAccount(String userId) {
         String redisKey = GoblinRedisConst.REDIS_GOBLIN_NFT_NUM_ACCOUNT.concat(userId);
-//        redisUtil.set(redisKey, 1);
+        redisUtil.set(redisKey, 1);
     }
 
     /* ----------------------------------------  ---------------------------------------- */