Merge branch 'dev-dragon&order' of...

Merge branch 'dev-dragon&order' of gitlab.zhengzai.tv:dongjingwei/liquidnet-bus-v1 into dev-dragon&order

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinNftOrderServiceImpl.java

@@ -496,7 +496,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
                     dragonPayBaseReqDto.setCreateDate(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                     dragonPayBaseReqDto.setExpireTime("5");
                     ResponseDto<DragonPayBaseRespDto> responseDto = dragonOrdersService.dragonPay(dragonPayBaseReqDto);
-                    String returnData = JSON.toJSONString(responseDto);
+                    String returnData = JsonUtils.toJson(responseDto);
                     log.info("NFT支付调用 DRAGON 结果 = " + returnData);
                     ResponseDto<GoblinPayInnerResultVo> dto = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<GoblinPayInnerResultVo>>() {
                     });

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/OrderApplePayServiceImpl.java

@@ -2,7 +2,6 @@ package com.liquidnet.service.order.service.impl;
 
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
-import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
 import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
 import com.liquidnet.service.dragon.service.IDragonOrdersService;

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/GoblinNftOrderUtils.java

 package com.liquidnet.service.order.utils;
 
-import com.alibaba.fastjson.JSON;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.*;
@@ -410,9 +409,9 @@ public class GoblinNftOrderUtils {
                 orderVo.getPaymentType(),
                 orderVo.getPaymentId(),
                 price);
-        String returnString = JSON.toJSONString(returnData);
+        String returnString = JsonUtils.toJson(returnData);
         log.info("NFT退款请求 结果：[returnString:{}]", returnString);
-        return JsonUtils.toJson(returnString);
+        return returnString;
     }
 
     public boolean isVipMember(String uid) {