Merge branch 'dev-sql-error-repair' into container

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamNftVo.java

+package com.liquidnet.service.adam.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "AdamNftVo", description = "个人藏品响应数据")
+@Data
+public class AdamNftVo implements java.io.Serializable, Cloneable{
+    private static final long serialVersionUID = 1L; // 手动指定
+
+    @ApiModelProperty(position = 1, value = "是否存在NFT 1：存在 2：不存在")
+    private int hasNft;
+
+    @ApiModelProperty(position = 2, value = "是否存在NFT订单 1：存在 2：不存在")
+    private int hasNftOrder;
+
+
+    private static final AdamNftVo obj = new AdamNftVo();
+
+    public static AdamNftVo getNew() {
+        try {
+            return (AdamNftVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new AdamNftVo();
+        }
+    }
+}

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamUserProfileVo.java

@@ -22,6 +22,9 @@ public class AdamUserProfileVo implements java.io.Serializable, Cloneable {
     private AdamUserMemberVo userMemberVo;
     @ApiModelProperty(position = 16, value = "会员卡信息")
     private AdamMemberJoinusVo memberJoinusVo;
+
+    @ApiModelProperty(position = 17, value = "藏品信息")
+    private AdamNftVo adamNftVo;
 //    @ApiModelProperty(position = 17, value = "业务账号信息")
 //    private List<AdamUserBizAcctVo> bizAcctVoList;
 

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

@@ -434,6 +434,11 @@ public class AdamUserController {
         }
         userProfileVo.setMemberJoinusVo(memberJoinusVo);
 
+        AdamNftVo adamNftVo = AdamNftVo.getNew();
+        adamNftVo.setHasNft(adamRdmService.hasNft(currentUid) ? 1 : 2);
+        adamNftVo.setHasNftOrder(adamRdmService.hasNftOrder(currentUid) ? 1 : 2);
+        userProfileVo.setAdamNftVo(adamNftVo);
+
         return ResponseDto.success(userProfileVo);
     }
 

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

@@ -29,10 +29,7 @@ import java.time.LocalDateTime;
 import java.time.temporal.ChronoField;
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.TemporalAdjusters;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -1082,6 +1079,26 @@ public class AdamRdmService {
         Object o = redisUtil.get(AdamRedisConst.INCR_USER_ENTERS.concat(uid));
         return null == o ? -1 : (int) o;
     }
+
+    public boolean hasNft(String currentUid) {
+        final String rdsKey = "goblin:u_d_art_ct:" + currentUid;
+        Object o = redisUtil.get(rdsKey);
+
+        if (Objects.isNull(o)) {
+            return false;
+        }
+        int num = (int) o;
+        return num > 0;
+    }
+
+    public boolean hasNftOrder(String currentUid) {
+        final String rdsKey = "goblin:nft:order:idList:" + currentUid;
+        Object obj = redisUtil.get(rdsKey);
+        if (obj != null) {
+            return true;
+        }
+        return false;
+    }
     /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |  */
     /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |  */
 

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

@@ -292,7 +292,7 @@ public class GoblinRechargeWristbandServiceImpl extends ServiceImpl<GoblinRechar
                         sqls.add(SqlMapping.get("goblin_bracelet_order_update_refund"));
                         LinkedList<Object[]> sqlDataOrder = CollectionUtil.linkedListObjectArr();
                         sqlDataOrder.add(new Object[]{
-                                orderVo.getStatus(), orderVo.getRefundStatus(), orderVo.getRefundStatusNote(), LocalDateTime.now()
+                                orderVo.getStatus(), orderVo.getRefundStatus(), orderVo.getRefundStatusNote(), LocalDateTime.now(), orderId
                         });
                         queueUtils.sendMsgByRedis(
                                 MQConst.GoblinQueue.GOBLIN_NFT_ORDER.getKey(),