订单状态 payAgain-del

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

@@ -37,7 +37,7 @@ public class GoblinNftOrderController {
     }
 
     @PostMapping("payAgain")
-    @ApiOperation("再次支付")
+//    @ApiOperation("再次支付")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<GoblinNftPayResultVo> payAgain(@RequestBody @Valid GoblinNftOrderPayAgainParam param) {
         return iGoblinNftOrderService.payAgain(param);

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

@@ -2,7 +2,6 @@ package com.liquidnet.service.order.service.impl;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.liquidnet.commons.lang.util.*;
-import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.UserPathDto;
@@ -19,7 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -295,7 +293,8 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
 
     @Override
     public ResponseDto<GoblinNftPayResultVo> payAgain(GoblinNftOrderPayAgainParam param) {
-        String uid = CurrentUtil.getCurrentUid();
+        return ResponseDto.failure("暂不支持此接口");
+        /*String uid = CurrentUtil.getCurrentUid();
         LocalDateTime now = LocalDateTime.now();
         //检查订单时间 是否关闭
         GoblinStoreOrderVo storeOrderVo = goblinRedisUtils.getGoblinOrder(param.getOrderId());
@@ -326,18 +325,6 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
             price = price.add(orderVo.getPriceActual());
         }
         GoblinNftPayResultVo NftPayResultVo = GoblinNftPayResultVo.getNew();
-//        if (!storeOrderVo.getPayType().equals("FREE") && storeOrderVo.getPayType().equals(param.getPayType()) && storeOrderVo.getDeviceFrom().equals(param.getDeviceFrom())) {
-//            payInnerResultVo.setCode(checkVo.getData().getCode());
-//            payInnerResultVo.setOrderCode(checkVo.getData().getOrderCode());
-//            payInnerResultVo.setPayData(checkVo.getData().getPayData());
-//            payInnerResultVo.setOrderId(param.getOrderId());
-//            payInnerResultVo.setPayType(param.getPayType());
-//            payInnerResultVo.setPrice(storeOrderVo.getPriceActual());
-//            storeOrderVo.setPayCode(payInnerResultVo.getCode());
-//            payInnerResultVo.setShowUrl(param.getShowUrl() + storeOrderVo.getOrderId());
-//            payInnerResultVo.setReturnUrl(param.getReturnUrl() + storeOrderVo.getOrderId());
-//            log.info(UserPathDto.setData("再次支付[原支付方式]", param, payInnerResultVo));
-//        } else
         if (!storeOrderVo.getPayType().equals("FREE")) {
             // 调用支付
             LinkedMultiValueMap<String, String> httpData = CollectionUtil.linkedMultiValueMapStringString();
@@ -346,7 +333,6 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
             httpData.add("name", goblinRedisUtils.getStoreInfoVo(storeOrderVo.getStoreId()).getStoreName());
             httpData.add("detail", "查找最初订单");
             httpData.add("orderCode", storeOrderVo.getMasterOrderCode());
-//            httpData.add("orderId", storeOrderVo.getOrderId());
             httpData.add("clientIp", storeOrderVo.getIpAddress());
             httpData.add("notifyUrl", synUrl);
             httpData.add("createDate", storeOrderVo.getCreatedAt());
@@ -357,17 +343,6 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
             if (param.getDeviceFrom().equals("js") || param.getDeviceFrom().equals("applet")) {
                 httpData.add("openId", param.getOpenId());
             }
-//            if (param.getPayType().equals("alipay") && param.getDeviceFrom().equals("wap")) {
-//                httpData.add("showUrl", param.getShowUrl() + storeOrderVo.getMasterOrderCode());
-//                httpData.add("returnUrl", param.getReturnUrl() + storeOrderVo.getMasterOrderCode());
-//            }
-//            if (param.getPayType().equals("douyinpay")) {
-//                httpData.add("showUrl", param.getShowUrl() + storeOrderVo.getMasterOrderCode());
-//                httpData.add("returnUrl", param.getReturnUrl() + storeOrderVo.getMasterOrderCode());
-//            }
-//            if (param.getPayType().equals("unionpay")) {
-//                httpData.add("returnUrl", param.getReturnUrl() + storeOrderVo.getMasterOrderCode());
-//            }
             httpData.add("showUrl", param.getShowUrl() + storeOrderVo.getMasterOrderCode());
             httpData.add("returnUrl", param.getReturnUrl() + storeOrderVo.getMasterOrderCode());
             String returnData = HttpUtil.post(payUrl, httpData);
@@ -394,20 +369,17 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
                     SqlMapping.get("goblin_order.pay.again", param.getPayType(), param.getDeviceFrom(), NftPayResultVo.getCode(), param.getOrderId(), now, now));
             log.info(UserPathDto.setData("再次支付[新支付方式]", param, NftPayResultVo));
         }
-        return ResponseDto.success(NftPayResultVo);
+        return ResponseDto.success(NftPayResultVo);*/
     }
 
     @Override
     public ResponseDto<Integer> checkOrderResult(String orderId) {
         String uid = CurrentUtil.getCurrentUid();
-        GoblinStoreOrderVo storeOrderVo = goblinRedisUtils.getGoblinOrder(orderId);
-        if (storeOrderVo == null) {
+        GoblinNftOrderVo nftOrder = nftOrderUtils.getNftOrder(orderId);
+        if (null == nftOrder || !nftOrder.getUserId().equals(uid)) {
             return ResponseDto.failure("订单不存在");
         } else {
-            if (!storeOrderVo.getUserId().equals(uid)) {
-                return null;
-            }
-            String returnCheckData = HttpUtil.get(checkUrl + "?code=" + storeOrderVo.getPayCode(), null);
+            String returnCheckData = HttpUtil.get(checkUrl + "?code=" + nftOrder.getPayCode(), null);
             ResponseDto<GoblinNftOrderPayCallbackParam> syncOrderDtoParam = JsonUtils.fromJson(returnCheckData, new TypeReference<ResponseDto<GoblinNftOrderPayCallbackParam>>() {
             });
             if (syncOrderDtoParam.getData().getStatus() == 1) {