提交 order

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/PayInnerResultVo.java

@@ -10,19 +10,12 @@ import java.math.BigDecimal;
 public class PayInnerResultVo implements Serializable {
 
     private String code;
-
     private String orderCode;
-
     private Integer status;
-
     private String orderId;
-
     private String showUrl;
-
     private String returnUrl;
-
     private BigDecimal price;
-
     private PayDataVo payData;
 
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/PayResultVo.java

@@ -13,5 +13,5 @@ public class PayResultVo implements Serializable {
 
     private String code;
     private String message;
-    private PayInnerResultVo payInnerResultVo;
+    private PayInnerResultVo data;
 }

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

@@ -20,10 +20,10 @@ import java.util.List;
 public interface IKylinOrderTicketsOrderService {
 
     // 下单前判断接口(判断是否可锁定库存)(无订单->待支付->可支付)
-    ResponseDto<PayResultVo> checkCanOrder(PayOrderParam payOrderParam);
+    ResponseDto<PayInnerResultVo> checkCanOrder(PayOrderParam payOrderParam);
 
     // 再次支付(待支付->可支付->倒计时结束释放库存)
-    ResponseDto<PayResultVo> payAgain(PayAgainParam payAgainParam);
+    ResponseDto<PayInnerResultVo> payAgain(PayAgainParam payAgainParam);
 
     // 支付回调(待支付->已支付->中断倒计时)
     String syncOrder(SyncOrderParam syncOrderParam);

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

@@ -41,7 +41,7 @@ public class KylinOrderTicketsController {
     @PostMapping("pre")
     @ApiOperation("下单")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<PayResultVo> checkCanOrder(@RequestBody @Valid PayOrderParam payOrderParam) {
+    public ResponseDto<PayInnerResultVo> checkCanOrder(@RequestBody @Valid PayOrderParam payOrderParam) {
         return orderTicketsOrderService.checkCanOrder(payOrderParam);
     }
 
@@ -49,7 +49,7 @@ public class KylinOrderTicketsController {
     @PostMapping("pre2")
     @ApiOperation("下单2")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<PayResultVo> checkCanOrder2(@RequestBody @Valid EncryptedReq<PayOrderParam> encryptedReq) {
+    public ResponseDto<PayInnerResultVo> checkCanOrder2(@RequestBody @Valid EncryptedReq<PayOrderParam> encryptedReq) {
         PayOrderParam payOrderParam = encryptedReq.getData();
         return orderTicketsOrderService.checkCanOrder(payOrderParam);
     }
@@ -57,8 +57,8 @@ public class KylinOrderTicketsController {
     @PostMapping("payAgain")
     @ApiOperation("再次支付")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<PayResultVo> payAgain(@RequestBody @Valid PayAgainParam payAgainParam) {
-        PayResultVo vo = orderTicketsOrderService.payAgain(payAgainParam).getData();
+    public ResponseDto<PayInnerResultVo> payAgain(@RequestBody @Valid PayAgainParam payAgainParam) {
+        PayInnerResultVo vo = orderTicketsOrderService.payAgain(payAgainParam).getData();
         if (null == vo) {
             return ResponseDto.failure(ErrorMapping.get("20024"));
         } else {

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

@@ -18,6 +18,7 @@ import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
 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.PayInnerResultVo;
 import com.liquidnet.service.kylin.dto.vo.returns.PayResultVo;
 import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
 import com.liquidnet.service.kylin.entity.KylinOrderTicketRelations;
@@ -100,7 +101,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
     }};
 
     @Override
-    public ResponseDto<PayResultVo> checkCanOrder(PayOrderParam payOrderParam) {
+    public ResponseDto<PayInnerResultVo> checkCanOrder(PayOrderParam payOrderParam) {
         Long currentTime;
         boolean isDownGeneral = false;
         List<AdamEntersVo> entersVoList = new ArrayList<>();
@@ -305,7 +306,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 
                 }
 
-                ResponseDto<PayResultVo> resultData = order(payOrderParam, uid, isMember, isTrueName, performanceData, ticketData, entersVoList, isStudent, ticketTimesData, currentTime);
+                ResponseDto<PayInnerResultVo> resultData = order(payOrderParam, uid, isMember, isTrueName, performanceData, ticketData, entersVoList, isStudent, ticketTimesData, currentTime);
                 isDownGeneral = false;
                 redisLockUtil.unlock(lock);
                 return resultData;
@@ -333,7 +334,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         }
     }
 
-    private ResponseDto<PayResultVo> order(PayOrderParam payOrderParam, String uid, boolean isMember, int isTrueName, KylinPerformanceVo performanceData, KylinTicketVo ticketData, List<AdamEntersVo> entersVoList, Integer isStudent, KylinTicketTimesVo ticketTimesData, Long currentTime) {
+    private ResponseDto<PayInnerResultVo> order(PayOrderParam payOrderParam, String uid, boolean isMember, int isTrueName, KylinPerformanceVo performanceData, KylinTicketVo ticketData, List<AdamEntersVo> entersVoList, Integer isStudent, KylinTicketTimesVo ticketTimesData, Long currentTime) {
         LinkedList<String> sqls = new LinkedList<>();
         String source = CurrentUtil.getCliSource() == null ? "" : CurrentUtil.getCliSource();
         String version = CurrentUtil.getCliVersion() == null ? "" : CurrentUtil.getCliVersion();
@@ -557,16 +558,16 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         currentTime = System.currentTimeMillis() - currentTime;
         log.debug("调用 PHP 支付 -> time:" + (currentTime) + "毫秒");
         PayResultVo payResultVo = JsonUtils.fromJson(returnData, PayResultVo.class);
-        payResultVo.getPayInnerResultVo().setOrderId(orderTicketId);
-        payResultVo.getPayInnerResultVo().setPrice(orderTickets.getPriceActual());
-        orderTickets.setPayCode(payResultVo.getPayInnerResultVo().getCode());
+        payResultVo.getData().setOrderId(orderTicketId);
+        payResultVo.getData().setPrice(orderTickets.getPriceActual());
+        orderTickets.setPayCode(payResultVo.getData().getCode());
         sqls.add(SqlMapping.get("kylin_order_ticket.add"));
         LinkedList<Object[]> sqlsDataA = new LinkedList<>();
         sqlsDataA.add(orderTickets.getAddObject());
 
         if (payOrderParam.getPayType().equals("alipay") && payOrderParam.getDeviceFrom().equals("wap")) {
-            payResultVo.getPayInnerResultVo().setShowUrl(payOrderParam.getShowUrl() + orderTicketId);
-            payResultVo.getPayInnerResultVo().setReturnUrl(payOrderParam.getReturnUrl() + orderTicketId);
+            payResultVo.getData().setShowUrl(payOrderParam.getShowUrl() + orderTicketId);
+            payResultVo.getData().setReturnUrl(payOrderParam.getReturnUrl() + orderTicketId);
         }
         // 生成vo
         KylinOrderTicketVo orderTicketVo = new KylinOrderTicketVo();
@@ -597,12 +598,12 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 sqlData);
         currentTime = System.currentTimeMillis() - currentTime;
         log.debug("MQ 发送 -> time:" + (currentTime) + "毫秒");
-        log.info(UserPathDto.setData("下单(唤起支付)", payOrderParam, payResultVo));
-        return ResponseDto.success(payResultVo);
+        log.info(UserPathDto.setData("下单(唤起支付)", payOrderParam, payResultVo.getData()));
+        return ResponseDto.success(payResultVo.getData());
     }
 
     @Override
-    public ResponseDto<PayResultVo> payAgain(PayAgainParam payAgainParam) {
+    public ResponseDto<PayInnerResultVo> payAgain(PayAgainParam payAgainParam) {
         try {
             String uid = CurrentUtil.getCurrentUid();
 //            checkOrderTime(uid);
@@ -624,7 +625,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             }
             String returnCheckData = HttpUtil.get(checkUrl + "?code=" + orderTicketData.getPayCode(), null);
             PayResultVo checkVo = JsonUtils.fromJson(returnCheckData, PayResultVo.class);
-            if (checkVo.getPayInnerResultVo().getStatus() == 1) {
+            if (checkVo.getData().getStatus() == 1) {
                 return ResponseDto.failure(ErrorMapping.get("20027"));
             }
             if (!orderTicketData.getPayType().equals("no")) {
@@ -659,11 +660,11 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 
                 String returnData = HttpUtil.post(payUrl + payAgainParam.getDeviceFrom() + "/" + payAgainParam.getPayType(), httpData);
                 PayResultVo payResultVo = JsonUtils.fromJson(returnData, PayResultVo.class);
-                payResultVo.getPayInnerResultVo().setOrderId(orderTicketData.getOrderTicketsId());
-                payResultVo.getPayInnerResultVo().setPrice(orderTicketData.getPriceActual());
+                payResultVo.getData().setOrderId(orderTicketData.getOrderTicketsId());
+                payResultVo.getData().setPrice(orderTicketData.getPriceActual());
                 if (payAgainParam.getPayType().equals("alipay") && payAgainParam.getDeviceFrom().equals("wap")) {
-                    payResultVo.getPayInnerResultVo().setShowUrl(payAgainParam.getShowUrl());
-                    payResultVo.getPayInnerResultVo().setReturnUrl(payAgainParam.getReturnUrl());
+                    payResultVo.getData().setShowUrl(payAgainParam.getShowUrl());
+                    payResultVo.getData().setReturnUrl(payAgainParam.getReturnUrl());
                 }
 
                 KylinOrderTickets orderTickets = new KylinOrderTickets();
@@ -702,8 +703,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 
                 String sqlData = SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD);
                 rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_AGAIN, MQConst.ROUTING_KEY_SQL_ORDER_AGAIN, sqlData);
-                log.info(UserPathDto.setData("再次支付", payAgainParam, payResultVo));
-                return ResponseDto.success(payResultVo);
+                log.info(UserPathDto.setData("再次支付", payAgainParam, payResultVo.getData()));
+                return ResponseDto.success(payResultVo.getData());
             }
             return ResponseDto.failure(ErrorMapping.get("20029"));
         } catch (Exception e) {
@@ -899,7 +900,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         } else {
             String returnCheckData = HttpUtil.get(checkUrl + "?code=" + orderTicketData.getPayCode(), null);
             PayResultVo checkVo = JsonUtils.fromJson(returnCheckData, PayResultVo.class);
-            if (checkVo.getPayInnerResultVo().getStatus() == 1) {
+            if (checkVo.getData().getStatus() == 1) {
                 return ResponseDto.success(1);
             } else {
                 return ResponseDto.success(0);