Merge remote-tracking branch 'origin/dev' into dev

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.SyncOrderParam;
+import com.liquidnet.service.kylin.dto.vo.returns.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 订单 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-20
+ */
+public interface IKylinOrderTicketsOrderService {
+
+    // 下单前判断接口(判断是否可锁定库存)(无订单->待支付->可支付)
+    ResponseDto<PayResultVo> checkCanOrder(PayOrderParam payOrderParam);
+
+    // 再次支付(待支付->可支付->倒计时结束释放库存)
+    ResponseDto<PayResultVo> payAgain(PayAgainParam payAgainParam);
+
+    // 支付回调(待支付->已支付->中断倒计时)
+    String syncOrder(SyncOrderParam syncOrderParam);
+
+    //去 PHP pay检查 订单状态
+    ResponseDto<Integer> checkOrderResult(String orderId);
+
+}

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

@@ -22,26 +22,12 @@ import java.util.List;
  */
 public interface IKylinOrderTicketsService  {
 
-    // 下单前判断接口(判断是否可锁定库存)(无订单->待支付->可支付)
-    ResponseDto<PayResultVo> checkCanOrder(PayOrderParam payOrderParam);
-
-    // 再次支付(待支付->可支付->倒计时结束释放库存)
-    ResponseDto<PayResultVo> payAgain(PayAgainParam payAgainParam);
-
-    // 支付回调(待支付->已支付->中断倒计时)
-    String syncOrder(SyncOrderParam syncOrderParam);
-
-    // 同步大麦数据接口
-
     //订单列表(状态 待支付 已支付 倒计时 已失效)
     PageInfo<List<KylinOrderListVo>> orderList();
 
     //订单详情
     OrderDetailsVo orderDetails(String orderId);
 
-    //去 PHP pay检查 订单状态
-    ResponseDto<Integer> checkOrderResult(String orderId);
-
     //订单未支付数量
     ResponseDto<Integer> orderUnPayCount();
 
@@ -63,15 +49,4 @@ public interface IKylinOrderTicketsService  {
 
     //退款撤回
     ResponseDto<Boolean> orderRefundWithdraw(String orderRefundsId);
-
-    //退款再次申请
-    Boolean orderRefundAgain(String orderRefundsId);
-
-
-    // 下单接口(无订单->待支付->可支付)
-    // 删除订单
-    // 代理票务 可买状态判断
-    // 取消支付(待支付->订单失效->释放库存->中断倒计时)
-    // ResponseDto<PayResultVo> order(PayOrderParam payOrderParam, String uid, boolean isMember, int isTrueName, KylinPerformanceVo performanceData, KylinTicketVo ticketData,Object adamEntersList);
-
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/pom.xml

@@ -33,14 +33,6 @@
             <artifactId>spring-boot-starter-data-mongodb</artifactId>
         </dependency>
         <!-- other -->
-        <dependency>
-            <groupId>taobao-sdk-impl</groupId>
-            <artifactId>taobao-sdk-impl</artifactId>
-            <version>0.0.2</version>
-            <type>jar</type>
-            <scope>system</scope>
-            <systemPath>${basedir}/lib/taobao-sdk-java-auto_1600401599540-20210607-impl.jar</systemPath>
-        </dependency>
         <dependency>
             <groupId>com.liquidnet</groupId>
             <artifactId>liquidnet-service-kylin-api</artifactId>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/TaobaoTicketUtils.java

-package com.liquidnet.service.kylin.utils;
-
-import com.taobao.api.DefaultTaobaoClient;
-import com.taobao.api.TaobaoClient;
-import org.springframework.stereotype.Service;
-
-@Service
-public class TaobaoTicketUtils {
-
-    private String URL = "http://gw.api.taobao.com/router/rest";
-    private String APPKEY = "27542597";
-    private String SECRET = "900025efc616fd2446344bb8fa21d039";
-    private String SUPPLIER_SECRET= "444d0752439f921a75eaf5951a8bc03c";
-    private Long SYSTEM_ID= 15669L;
-//    private String url = "http://gw.api.tbsandbox.com/router/rest";
-//    private String appkey = "4272";
-//    private String secret = "0ebbcccfee18d7ad1aebc5b135ffa906";
-    private TaobaoClient client = null;
-
-    public TaobaoClient initTaobaoClient() {
-        if (client == null) {
-            client = new DefaultTaobaoClient(URL, APPKEY, SECRET);
-        }
-        return client;
-    }
-
-    public String getSupplierSecret(){
-        return SUPPLIER_SECRET;
-    }
-
-    public Long getSystemId(){
-        return SYSTEM_ID;
-    }
-}

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

 package com.liquidnet.service.order.controller;
 
 
-import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ErrorMapping;
 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.SyncOrderParam;
 import com.liquidnet.service.kylin.dto.vo.returns.*;
-import com.liquidnet.service.kylin.service.IKylinOrderTicketsService;
+import com.liquidnet.service.kylin.service.IKylinOrderTicketsOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -19,7 +18,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import java.util.HashMap;
-import java.util.List;
 
 /**
  * <p>
@@ -36,20 +34,20 @@ import java.util.List;
 public class KylinOrderTicketsController {
 
     @Autowired
-    IKylinOrderTicketsService orderTicketsService;
+    IKylinOrderTicketsOrderService orderTicketsOrderService;
 
     @PostMapping("pre")
     @ApiOperation("下单")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<PayResultVo> checkCanOrder(@RequestBody @Valid PayOrderParam payOrderParam) {
-        return orderTicketsService.checkCanOrder(payOrderParam);
+        return orderTicketsOrderService.checkCanOrder(payOrderParam);
     }
 
     @PostMapping("payAgain")
     @ApiOperation("再次支付")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<PayResultVo> payAgain(@RequestBody @Valid PayAgainParam payAgainParam) {
-        PayResultVo vo = orderTicketsService.payAgain(payAgainParam).getData();
+        PayResultVo vo = orderTicketsOrderService.payAgain(payAgainParam).getData();
         if (null == vo) {
             return ResponseDto.failure(ErrorMapping.get("20024"));
         } else {
@@ -61,14 +59,14 @@ public class KylinOrderTicketsController {
     @ApiOperation("支付回调")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public String syncOrder(@ModelAttribute @Valid SyncOrderParam syncOrderParam) {
-        return orderTicketsService.syncOrder(syncOrderParam);
+        return orderTicketsOrderService.syncOrder(syncOrderParam);
     }
 
     @GetMapping("checkPayment")
     @ApiOperation("订单状态")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<HashMap> checkOrderResult(@RequestParam("orderId") @NotNull(message = "订单id不能为空") String orderId) {
-        Integer status = orderTicketsService.checkOrderResult(orderId).getData();
+        Integer status = orderTicketsOrderService.checkOrderResult(orderId).getData();
         if (null == status) {
             return ResponseDto.failure(ErrorMapping.get("20003"));
         } else {

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

@@ -27,6 +27,7 @@ import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.returns.*;
 import com.liquidnet.service.kylin.entity.*;
+import com.liquidnet.service.kylin.service.IKylinOrderTicketsOrderService;
 import com.liquidnet.service.kylin.service.IKylinOrderTicketsService;
 import com.liquidnet.service.order.utils.*;
 import com.mongodb.BasicDBObject;
@@ -63,7 +64,7 @@ import java.util.*;
  */
 @Service
 @Slf4j
-public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
+public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderService {
 
     @Value("${liquidnet.url-pay.pay}")
     private String payUrl;
@@ -95,7 +96,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
     @Autowired
     private OrderRefundOvertimeServiceImpl orderRefundsCallbackService;
 
-
     ArrayList<Integer> canBuyStatus = new ArrayList() {{
         add(6);
         add(8);
@@ -103,7 +103,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
         add(10);
     }};
 
-
     @Override
     public ResponseDto<PayResultVo> checkCanOrder(PayOrderParam payOrderParam) {
         Long currentTime;
@@ -951,44 +950,4 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             return false;
         }
     }
-
-    @Override
-    public PageInfo<List<KylinOrderListVo>> orderList() {
-        return null;
-    }
-
-    @Override
-    public OrderDetailsVo orderDetails(String orderId) {
-        return null;
-    }
-
-    @Override
-    public ResponseDto<Integer> orderUnPayCount() {
-        return null;
-    }
-
-    @Override
-    public KylinOrderTicketPreVo toOrderRefundDetails(String orderId) {
-        return null;
-    }
-
-    @Override
-    public OrderRefundVo orderRefundDetails(String orderId, String orderRefundId) {
-        return null;
-    }
-
-    @Override
-    public String sendOrderRefund(String orderId, String orderTicketEntitiesId, String reason, String picList) {
-        return null;
-    }
-
-    @Override
-    public ResponseDto<Boolean> orderRefundWithdraw(String orderRefundsId) {
-        return null;
-    }
-
-    @Override
-    public Boolean orderRefundAgain(String orderRefundsId) {
-        return null;
-    }
 }