新增3个 查询订单支付状态接口 多返回 购买id

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsCheckVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class GoblinGoodsCheckVo implements Serializable, Cloneable {
+    @ApiModelProperty(value = "名单id")
+    private Integer status;
+    @ApiModelProperty(value = "优先购名称")
+    private List<String> spuId;
+
+    private static final GoblinGoodsCheckVo obj = new GoblinGoodsCheckVo();
+
+    public static GoblinGoodsCheckVo getNew() {
+        try {
+            return (GoblinGoodsCheckVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new GoblinGoodsCheckVo();
+    }
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinMixCheckVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class GoblinMixCheckVo implements Serializable, Cloneable {
+    @ApiModelProperty(value = "名单id")
+    private Integer status;
+    @ApiModelProperty(value = "优先购名称")
+    private String mixId;
+
+    private static final GoblinMixCheckVo obj = new GoblinMixCheckVo();
+
+    public static GoblinMixCheckVo getNew() {
+        try {
+            return (GoblinMixCheckVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new GoblinMixCheckVo();
+    }
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftCheckVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class GoblinNftCheckVo implements Serializable, Cloneable {
+    @ApiModelProperty(value = "名单id")
+    private Integer status;
+    @ApiModelProperty(value = "优先购名称")
+    private String skuId;
+
+    private static final GoblinNftCheckVo obj = new GoblinNftCheckVo();
+
+    public static GoblinNftCheckVo getNew() {
+        try {
+            return (GoblinNftCheckVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new GoblinNftCheckVo();
+    }
+}

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

 package com.liquidnet.service.goblin.service;
 
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.dto.vo.GoblinNftCheckVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinNftPayResultVo;
 import com.liquidnet.service.goblin.param.GoblinNftOrderPayAgainParam;
 import com.liquidnet.service.goblin.param.GoblinNftOrderPayCallbackParam;
@@ -22,6 +23,9 @@ public interface IGoblinNftOrderService {
 
     ResponseDto<Integer> checkOrderResult(String orderId);
 
+    ResponseDto<GoblinNftCheckVo> checkOrderResult2(String orderId);
+
+
     String syncOrder(GoblinNftOrderPayCallbackParam syncOrderParam);
 
     String refundSyncOrder(GoblinNftOrderRefundCallbackParam refundCallbackParam);

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

@@ -2,6 +2,7 @@ package com.liquidnet.service.goblin.service;
 
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.manage.GoblinOrderParam;
+import com.liquidnet.service.goblin.dto.vo.GoblinGoodsCheckVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinMailVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinPayInnerResultVo;
 import com.liquidnet.service.goblin.param.PayAgainParam;
@@ -25,6 +26,8 @@ public interface IGoblinOrderService {
 
     ResponseDto<Integer> checkOrderResultMaterCode(String materCode);
 
+    ResponseDto<GoblinGoodsCheckVo> checkOrderResultMaterCode2(String materCode);
+
     String huiFuSync(HttpServletRequest request);
 
 

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.goblin.service;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.manage.GoblinOrderParam;
 import com.liquidnet.service.goblin.dto.manage.MixOrderParam;
+import com.liquidnet.service.goblin.dto.vo.GoblinMixCheckVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinPayInnerResultVo;
 import com.liquidnet.service.goblin.param.PayAgainParam;
 import com.liquidnet.service.goblin.param.RefundCallbackParam;
@@ -18,5 +19,5 @@ public interface IMixOrderService {
 
     ResponseDto<Integer> checkOrderResultMaterCode(String materCode);
 
-
+    ResponseDto<GoblinMixCheckVo> checkOrderResultMaterCode2(String materCode);
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketsOrderService.java

 package com.liquidnet.service.kylin.service;
 
-import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.param.PayAgainParam;
 import com.liquidnet.service.kylin.dto.param.PayOrderParam;
-import com.liquidnet.service.kylin.dto.param.SyncOrderDtoParam;
 import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
 import com.liquidnet.service.kylin.dto.vo.returns.*;
 
 import java.util.HashMap;
-import java.util.List;
 
 /**
  * <p>

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.order.controller;
 import com.liquidnet.commons.lang.constant.LnsRegex;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.codec.vo.EncryptedReq;
+import com.liquidnet.service.goblin.dto.vo.GoblinNftCheckVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinNftPayResultVo;
 import com.liquidnet.service.goblin.param.GoblinNftOrderPayAgainParam;
 import com.liquidnet.service.goblin.param.GoblinNftOrderPayCallbackParam;
@@ -58,6 +59,16 @@ public class GoblinNftOrderController {
         return iGoblinNftOrderService.checkOrderResult(orderId);
     }
 
+    @PostMapping("checkPayment2")
+    @ApiOperation("查询订单状态2")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderId", value = "订单ID", example = "1"),
+    })
+    public ResponseDto<GoblinNftCheckVo> checkOrderResult2(@RequestParam("orderId") @NotBlank(message = "订单ID不能为空") String orderId) {
+        return iGoblinNftOrderService.checkOrderResult2(orderId);
+    }
+
     @PostMapping("syncOrder")
     @ApiOperation("支付回调")
     @ApiResponse(code = 200, message = "接口返回对象参数")

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

@@ -4,6 +4,7 @@ import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.codec.vo.EncryptedReq;
 import com.liquidnet.service.goblin.dto.manage.GoblinOrderParam;
+import com.liquidnet.service.goblin.dto.vo.GoblinGoodsCheckVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinPayInnerResultVo;
 import com.liquidnet.service.goblin.param.PayAgainParam;
 import com.liquidnet.service.goblin.param.RefundCallbackParam;
@@ -88,6 +89,16 @@ public class GoblinOrderController {
         return goblinAppOrderService.checkOrderResultMaterCode(masterCode);
     }
 
+    @PostMapping("checkPaymentMaster2")
+    @ApiOperation("订单状态[主订单号]2")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "masterCode", value = "masterCode", example = "1"),
+    })
+    public ResponseDto<GoblinGoodsCheckVo> checkOrderResultMasterCode2(@RequestParam("masterCode") @Valid String masterCode) {
+        return goblinAppOrderService.checkOrderResultMaterCode2(masterCode);
+    }
+
 
     @PostMapping("zhengzai/fc7bce6d6c2213b866f76493f92224b7")
     @ApiOperation("正在下单-下单")

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

@@ -5,6 +5,7 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.codec.vo.EncryptedReq;
 import com.liquidnet.service.goblin.dto.manage.GoblinOrderParam;
 import com.liquidnet.service.goblin.dto.manage.MixOrderParam;
+import com.liquidnet.service.goblin.dto.vo.GoblinMixCheckVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinPayInnerResultVo;
 import com.liquidnet.service.goblin.param.PayAgainParam;
 import com.liquidnet.service.goblin.param.RefundCallbackParam;
@@ -77,4 +78,13 @@ public class MixOrderController {
     }
 
 
+    @PostMapping("checkPaymentMaster2")
+    @ApiOperation("订单状态[主订单号]2")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "masterCode", value = "masterCode", example = "1"),
+    })
+    public ResponseDto<GoblinMixCheckVo> checkOrderResultMasterCode2(@RequestParam("masterCode") @Valid String masterCode) {
+        return mixOrderService.checkOrderResultMaterCode2(masterCode);
+    }
 }

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

@@ -677,6 +677,29 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
         }
     }
 
+    @Override
+    public ResponseDto<GoblinNftCheckVo> checkOrderResult2(String orderId) {
+        String uid = CurrentUtil.getCurrentUid();
+        GoblinNftCheckVo vo = GoblinNftCheckVo.getNew();
+        GoblinNftOrderVo nftOrder = nftOrderUtils.getNftOrder(orderId);
+        if (null == nftOrder || !nftOrder.getUserId().equals(uid)) {
+            return ResponseDto.failure("订单不存在");
+        } else {
+            vo.setSkuId(nftOrder.getSkuId());
+            DragonPayOrderQueryRespDto respDto = dragonOrdersService.checkOrderStatusByCode(nftOrder.getPayCode());
+            if (respDto.getStatus() == 1) {
+                //处理订单
+                GoblinNftOrderPayCallbackParam goblinNftOrderPayCallbackParam = GoblinNftOrderPayCallbackParam.getNew().copy(respDto);
+                syncOrder(goblinNftOrderPayCallbackParam);
+                vo.setStatus(1);
+                return ResponseDto.success(vo);
+            } else {
+                vo.setStatus(0);
+                return ResponseDto.success(vo);
+            }
+        }
+    }
+
     @Override
     public String syncOrder(GoblinNftOrderPayCallbackParam syncOrderParam) {
         log.info("NFT支付回调 参数: " + syncOrderParam.toString());

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

@@ -579,7 +579,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             sqlDataOrder.add(new Object[]{
                     storeOrder.getMasterOrderCode(), storeOrder.getOrderId(), storeOrder.getStoreId(), storeOrder.getStoreName(), storeOrder.getOrderCode(), storeOrder.getUserId(), storeOrder.getUserName(), storeOrder.getUserMobile(), storeOrder.getPriceTotal(), storeOrder.getPayCode(),
                     storeOrder.getPriceActual(), storeOrder.getPriceRefund(), storeOrder.getPriceExpress(), storeOrder.getPriceCoupon(), storeOrder.getStorePriceCoupon(), storeOrder.getPriceVoucher(), storeOrder.getStatus(), storeOrder.getUcouponId(), storeOrder.getStoreCouponId(), storeOrder.getPayType(), storeOrder.getDeviceFrom(),
-                    storeOrder.getSource(), storeOrder.getVersion(), storeOrder.getIsMember(), storeOrder.getOrderType(), storeOrder.getWriteOffCode(), storeOrder.getPayCountdownMinute(), storeOrder.getIpAddress(), storeOrder.getMarketId(), storeOrder.getMarketType(), storeOrder.getCreatedAt(), "",""
+                    storeOrder.getSource(), storeOrder.getVersion(), storeOrder.getIsMember(), storeOrder.getOrderType(), storeOrder.getWriteOffCode(), storeOrder.getPayCountdownMinute(), storeOrder.getIpAddress(), storeOrder.getMarketId(), storeOrder.getMarketType(), storeOrder.getCreatedAt(), "", ""
             });
             GoblinOrderAttr orderAttr = item.getOrderAttr();
             sqlDataAttr.add(new Object[]{
@@ -806,7 +806,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                 storeOrder.setUpdatedAt(now);
                 sqls.add(SqlMapping.get("goblin_order.pay.order"));
                 sqlDataOrder.add(new Object[]{
-                        storeOrder.getPaymentType(), storeOrder.getPaymentId(), storeOrder.getPayCode(), storeOrder.getPayTime(), storeOrder.getWriteOffCode(), storeOrder.getZhengzaiStatus(), storeOrder.getStatus(), storeOrder.getUpdatedAt(),storeOrder.getPushTime(),
+                        storeOrder.getPaymentType(), storeOrder.getPaymentId(), storeOrder.getPayCode(), storeOrder.getPayTime(), storeOrder.getWriteOffCode(), storeOrder.getZhengzaiStatus(), storeOrder.getStatus(), storeOrder.getUpdatedAt(), storeOrder.getPushTime(),
                         orderId, now, now
                 });
                 sqls.add(SqlMapping.get("goblin_order.pay.sku"));
@@ -848,7 +848,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                     mongoUtils.insertGoblinOrderLogVo(logVo);
                     //mysql
                     sqlDataSku.add(new Object[]{
-                            orderSkuVo.getStatus(), now,orderSkuVo.getStatus()==4?now:null,
+                            orderSkuVo.getStatus(), now, orderSkuVo.getStatus() == 4 ? now : null,
                             orderSkuVo.getOrderSkuId(), now, now
                     });
                 }
@@ -958,6 +958,48 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
         }
     }
 
+    @Override
+    public ResponseDto<GoblinGoodsCheckVo> checkOrderResultMaterCode2(String masterCode) {
+        String[] orderIds = redisUtils.getMasterCode(masterCode);
+        GoblinGoodsCheckVo vo = GoblinGoodsCheckVo.getNew();
+        if (orderIds == null) {
+            return ResponseDto.failure("订单不存在");
+        } else {
+            for (String orderId : orderIds) {
+                GoblinStoreOrderVo storeOrderVo = redisUtils.getGoblinOrder(orderId);
+                List<String> list = CollectionUtil.linkedListString();
+                for (String orderSkuId : storeOrderVo.getOrderSkuVoIds()) {
+                    list.add(redisUtils.getGoblinOrderSkuVo(orderSkuId).getSpuId());
+                }
+                vo.setSpuId(list);
+                DragonPayOrderQueryRespDto data = dragonOrdersService.checkOrderStatusByCode(storeOrderVo.getPayCode());
+                SyncOrderParam syncOrderDtoParam = SyncOrderParam.getNew();
+                syncOrderDtoParam.setCode(data.getCode());
+                syncOrderDtoParam.setOrderCode(data.getOrderCode());
+                syncOrderDtoParam.setOrderCodeId(data.getOrderCodeId());
+                syncOrderDtoParam.setOrderId(data.getOrderCodeId());
+                syncOrderDtoParam.setPaymentAt(data.getPaymentAt());
+                syncOrderDtoParam.setPaymentId(data.getPaymentId());
+                syncOrderDtoParam.setPaymentType(data.getPaymentType());
+                syncOrderDtoParam.setPrice(data.getPrice());
+                syncOrderDtoParam.setStatus(data.getStatus());
+                syncOrderDtoParam.setType(data.getType());
+                if (syncOrderDtoParam.getStatus() == 1) {
+                    //处理订单
+                    syncOrder(syncOrderDtoParam);
+                    vo.setStatus(1);
+                    return ResponseDto.success(vo);
+                } else {
+                    vo.setStatus(0);
+                    return ResponseDto.success(vo);
+                }
+            }
+            vo.setSpuId(CollectionUtil.linkedListString());
+            vo.setStatus(1);
+            return ResponseDto.success(vo);
+        }
+    }
+
     @Override
     public String refundSyncOrder(RefundCallbackParam refundCallbackParam) {
         LocalDateTime now = LocalDateTime.now();
@@ -1134,7 +1176,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                     storeOrder.setPushTime(now);
                     sqls.add(SqlMapping.get("goblin_order.pay.order"));
                     sqlDataOrder.add(new Object[]{
-                            storeOrder.getPaymentType(), storeOrder.getPaymentId(), storeOrder.getPayCode(), storeOrder.getPayTime(), storeOrder.getWriteOffCode(), storeOrder.getZhengzaiStatus(), storeOrder.getStatus(), storeOrder.getUpdatedAt(),storeOrder.getPushTime(),
+                            storeOrder.getPaymentType(), storeOrder.getPaymentId(), storeOrder.getPayCode(), storeOrder.getPayTime(), storeOrder.getWriteOffCode(), storeOrder.getZhengzaiStatus(), storeOrder.getStatus(), storeOrder.getUpdatedAt(), storeOrder.getPushTime(),
                             orderId, now, now
                     });
                     sqls.add(SqlMapping.get("goblin_order.pay.sku"));
@@ -1171,7 +1213,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                         mongoUtils.insertGoblinOrderLogVo(logVo);
                         //mysql
                         sqlDataSku.add(new Object[]{
-                                orderSkuVo.getStatus(), now,now,
+                                orderSkuVo.getStatus(), now, now,
                                 orderSkuVo.getOrderSkuId(), now, now
                         });
                     }

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

@@ -800,6 +800,48 @@ public class MixOrderServiceImpl implements IMixOrderService {
         return ResponseDto.success(1);
     }
 
+    @Override
+    public ResponseDto<GoblinMixCheckVo> checkOrderResultMaterCode2(String materCode) {
+        String uid = CurrentUtil.getCurrentUid();
+        GoblinMixCheckVo vo = GoblinMixCheckVo.getNew();
+
+        HashMap<String, String[]> map = redisUtils.getMixMasterCode(materCode);
+        String[] nft = map.get("nft");
+        String[] goblin = map.get("goblin");
+        for (String orderId : nft) {
+            if ("".equals(orderId)) {
+                break;
+            }
+            String nftR = nftCheck(uid, orderId);
+            if(vo.getMixId()==null){
+                vo.setMixId(nftOrderUtils.getNftOrder(orderId).getMixId());
+            }
+            if ("订单不存在".equals(nftR)) {
+                return ResponseDto.failure("订单不存在");
+            } else if ("0".equals(nftR)) {
+                vo.setStatus(0);
+                return ResponseDto.success(vo);
+            }
+        }
+        for (String orderId : goblin) {
+            if ("".equals(orderId)) {
+                break;
+            }
+            String goblinR = goblinCheck(uid, orderId);
+            if(vo.getMixId()==null){
+                vo.setMixId(redisUtils.getGoblinOrder(orderId).getMixId());
+            }
+            if ("订单不存在".equals(goblinR)) {
+                return ResponseDto.failure("订单不存在");
+            } else if ("0".equals(goblinR)) {
+                vo.setStatus(0);
+                return ResponseDto.success(vo);
+            }
+        }
+        vo.setStatus(1);
+        return ResponseDto.success(vo);
+    }
+
 
     private String nftCheck(String uid, String orderId) {
         GoblinNftOrderVo nftOrder = nftOrderUtils.getNftOrder(orderId);