getStatus+格式化

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

@@ -35,59 +35,59 @@ public class OrderApplePayServiceImpl {
 
     public boolean pay(String orderId, String type, String receiptData, String transactionId) {
         try {
-        log.info("苹果支付成功通知参数 [orderId:{},type:{},receiptData:{},transactionId:{}]", orderId, type, receiptData, transactionId);
-        GoblinNftOrderVo nftOrder = nftOrderUtils.getNftOrder(orderId);
-        if (null == nftOrder) {
-            log.info("未找到该订单 [orderId:{}]", orderId);
-            return false;
-        }
-        LinkedMultiValueMap<String, String> httpData = CollectionUtil.linkedMultiValueMapStringString();
-        httpData.add("type", type);
-        httpData.add("price", nftOrder.getPriceActual().toString());
-        httpData.add("name", nftOrder.getStoreName());
-        GoblinGoodsSkuInfoVo skuVo = goblinRedisUtils.getGoodsSkuInfoVo(nftOrder.getSkuId());
-        httpData.add("detail", skuVo.getName());
-        httpData.add("orderCode", nftOrder.getOrderCode());
-        httpData.add("orderId", nftOrder.getOrderId());
-        httpData.add("clientIp", CurrentUtil.getCliIpAddr());
-        httpData.add("notifyUrl", "");
-        httpData.add("createDate", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        httpData.add("expireTime", "5");
-        httpData.add("payType", nftOrder.getPayType());
-        httpData.add("deviceFrom", nftOrder.getDeviceFrom());
-        httpData.add("openId", "");
-        httpData.add("showUrl", "");
-        httpData.add("returnUrl", "");
-        httpData.add("receiptData", receiptData);
-        httpData.add("transactionId", transactionId);
+            log.info("苹果支付成功通知参数 [orderId:{},type:{},receiptData:{},transactionId:{}]", orderId, type, receiptData, transactionId);
+            GoblinNftOrderVo nftOrder = nftOrderUtils.getNftOrder(orderId);
+            if (null == nftOrder) {
+                log.info("未找到该订单 [orderId:{}]", orderId);
+                return false;
+            }
+            LinkedMultiValueMap<String, String> httpData = CollectionUtil.linkedMultiValueMapStringString();
+            httpData.add("type", type);
+            httpData.add("price", nftOrder.getPriceActual().toString());
+            httpData.add("name", nftOrder.getStoreName());
+            GoblinGoodsSkuInfoVo skuVo = goblinRedisUtils.getGoodsSkuInfoVo(nftOrder.getSkuId());
+            httpData.add("detail", skuVo.getName());
+            httpData.add("orderCode", nftOrder.getOrderCode());
+            httpData.add("orderId", nftOrder.getOrderId());
+            httpData.add("clientIp", CurrentUtil.getCliIpAddr());
+            httpData.add("notifyUrl", "");
+            httpData.add("createDate", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            httpData.add("expireTime", "5");
+            httpData.add("payType", nftOrder.getPayType());
+            httpData.add("deviceFrom", nftOrder.getDeviceFrom());
+            httpData.add("openId", "");
+            httpData.add("showUrl", "");
+            httpData.add("returnUrl", "");
+            httpData.add("receiptData", receiptData);
+            httpData.add("transactionId", transactionId);
 
-        LinkedMultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
-        header.add("Accept", "application/json;charset=UTF-8");
-        String returnData = HttpUtil.post(payUrl, httpData, header);
-        log.info("苹果支付调用DRAGON结果 = " + returnData);
-        ResponseDto<GoblinApplePayInnerResultVo> dto = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<GoblinApplePayInnerResultVo>>() {
-        });
-        GoblinApplePayInnerResultVo dtoData = dto.getData();
-        if (null == dtoData || StringUtil.isEmpty(dtoData.getProductId())) {
-            return false;
-        } else {
-            // 支付成功
-            GoblinNftOrderPayCallbackParam NftOrderPayCallbackParam = GoblinNftOrderPayCallbackParam.getNew();
-            NftOrderPayCallbackParam.setCode(dtoData.getCode());
-            NftOrderPayCallbackParam.setOrderCode(nftOrder.getOrderCode());
-            NftOrderPayCallbackParam.setPaymentAt(DateUtil.format(LocalDateTime.now(), DateUtil.Formatter.yyyyMMddHHmmss));
-            NftOrderPayCallbackParam.setPrice(nftOrder.getPriceActual());
-            NftOrderPayCallbackParam.setPaymentId(transactionId);
-            NftOrderPayCallbackParam.setPaymentType(nftOrder.getDeviceFrom().concat(nftOrder.getPayType()).toUpperCase());
-            NftOrderPayCallbackParam.setStatus(1);
-            if (type.equals("NFT")) {
-                String isSync = goblinNftOrderService.syncOrder(NftOrderPayCallbackParam);
-                if (!isSync.equals("success")) {
-                    return false;
+            LinkedMultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
+            header.add("Accept", "application/json;charset=UTF-8");
+            String returnData = HttpUtil.post(payUrl, httpData, header);
+            log.info("苹果支付调用DRAGON结果 = " + returnData);
+            ResponseDto<GoblinApplePayInnerResultVo> dto = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<GoblinApplePayInnerResultVo>>() {
+            });
+            GoblinApplePayInnerResultVo dtoData = dto.getData();
+            if (null == dtoData || dtoData.getStatus() != 0) {
+                return false;
+            } else {
+                // 支付成功
+                GoblinNftOrderPayCallbackParam NftOrderPayCallbackParam = GoblinNftOrderPayCallbackParam.getNew();
+                NftOrderPayCallbackParam.setCode(dtoData.getCode());
+                NftOrderPayCallbackParam.setOrderCode(nftOrder.getOrderCode());
+                NftOrderPayCallbackParam.setPaymentAt(DateUtil.format(LocalDateTime.now(), DateUtil.Formatter.yyyyMMddHHmmss));
+                NftOrderPayCallbackParam.setPrice(nftOrder.getPriceActual());
+                NftOrderPayCallbackParam.setPaymentId(transactionId);
+                NftOrderPayCallbackParam.setPaymentType(nftOrder.getDeviceFrom().concat(nftOrder.getPayType()).toUpperCase());
+                NftOrderPayCallbackParam.setStatus(1);
+                if (type.equals("NFT")) {
+                    String isSync = goblinNftOrderService.syncOrder(NftOrderPayCallbackParam);
+                    if (!isSync.equals("success")) {
+                        return false;
+                    }
                 }
+                return true;
             }
-            return true;
-        }
         } catch (Exception e) {
             log.error("OrderApplePayServiceImplE e:{}", e);
             return false;