wf hjc ajb

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

@@ -26,5 +26,6 @@ public interface IGoblinNftOrderService {
 
     String refundSyncOrder(GoblinNftOrderRefundCallbackParam refundCallbackParam);
 
-    ResponseDto<Boolean> exchange(String code, String uid, String deviceFrom, int orderType);
+    ResponseDto<String> exchange(String code, String uid, String deviceFrom, int orderType);
+
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinGagoController.java

@@ -8,11 +8,13 @@ import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.client.admin.zhengzai.goblin.utils.GoblinRedisUtils;
 import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.candy.vo.CandyCouponVo;
+import com.liquidnet.service.galaxy.dto.param.GalaxyNftPublishAndBuyReqDto;
 import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -94,9 +96,15 @@ public class GoblinGagoController extends BaseController {
         MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
         header.add("Accept", "application/json;charset=UTF-8");
         String returnData = HttpUtil.post(orderUrl.concat("/goblin/nft/airdropInner"), params, header);
-        ResponseDto<Boolean> innerReturnVo = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<Boolean>>() {
+        ResponseDto<String> innerReturnVo = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<String>>() {
         });
-        if (innerReturnVo.getData()) {
+        if (innerReturnVo.isSuccess()) {
+            GalaxyNftPublishAndBuyReqDto dto = GalaxyNftPublishAndBuyReqDto.getNew();
+            dto.setBuyTimestamp(DateUtil.getNowTime());
+            dto.setNftOrderPayId(innerReturnVo.getData());
+            dto.setSkuId(skuId);
+            dto.setUserId(uid);
+            goblinRedisUtils.setNftNumDetails(nftNum+"",skuId,dto);
             return AjaxResult.success();
         } else {
             return AjaxResult.error();

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

@@ -82,7 +82,12 @@ public class GoblinNftOrderController {
             @RequestParam("code") @NotBlank(message = "兑换码不能为空") String code,
             @RequestParam("deviceFrom") @NotBlank(message = "支付终端不能为空") @Pattern(regexp = LnsRegex.Valid.TRIPLE_PF_FOR_PAY_TERMINAL, message = "支付终端类型无效") String deviceFrom
     ) {
-        return iGoblinNftOrderService.exchange(code, null, deviceFrom, 2);
+        ResponseDto<String> dto = iGoblinNftOrderService.exchange(code, null, deviceFrom, 2);
+        if (dto.isSuccess()) {
+            return ResponseDto.success();
+        } else {
+            return ResponseDto.failure(dto.getMessage());
+        }
     }
 
 }

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/controller/inner/GoblinInnerNftController.java

@@ -35,7 +35,12 @@ public class GoblinInnerNftController {
             @RequestParam("userId") @NotBlank(message = "用户ID不能为空") String userId
 
     ) {
-        return iGoblinNftOrderService.exchange(code, userId, "systemAdmin", 4);
+        ResponseDto<String> dto = iGoblinNftOrderService.exchange(code, null, "systemAdmin", 4);
+        if (dto.isSuccess()) {
+            return ResponseDto.success();
+        } else {
+            return ResponseDto.failure(dto.getMessage());
+        }
     }
 
     @PostMapping("airdropInner")
@@ -44,7 +49,7 @@ public class GoblinInnerNftController {
             @ApiImplicitParam(type = "from", required = true, dataType = "String", name = "skuId", value = "skuId", example = "0"),
             @ApiImplicitParam(type = "from", required = true, dataType = "String", name = "userId", value = "用户ID", example = "1"),
     })
-    public ResponseDto<Boolean> exchangeInner(
+    public ResponseDto<String> exchangeInner(
             @RequestParam("skuId") @NotBlank(message = "skuId不能为空") String skuId,
             @RequestParam("userId") @NotBlank(message = "用户ID不能为空") String userId
 

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

@@ -814,8 +814,10 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
         return "success";
     }
 
+
+
     @Override
-    public ResponseDto<Boolean> exchange(String code, String uid, String deviceFrom, int orderType) {
+    public ResponseDto<String> exchange(String code, String uid, String deviceFrom, int orderType) {
         if (null == uid) {
             uid = CurrentUtil.getCurrentUid();
         }
@@ -924,7 +926,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
                 nftOrderUtils.addNftOrderList(uid, orderVo.getOrderId());
                 // TODO: jxl 2022/4/24  判断技术部NFT记录Redis setBuyNftTec
 
-                return ResponseDto.success();
+                return ResponseDto.success(orderVo.getOrderId());
             } catch (Exception e) {
                 log.error("NFT兑换异常", e);
                 return ResponseDto.failure("兑换失败，请稍后重试！");