暂时 提交

增加 adam 的url 配置

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

@@ -58,8 +58,8 @@ public interface IKylinOrderTicketsService {
     ResponseDto<String> orderTransferWithdraw(String orderId);
 
     //接受转赠订单
-    ResponseDto<String> orderTransferAccept(String orderId);
+    ResponseDto<String> orderTransferAccept(String enterIdList);
 
     //拒绝转赠订单
-    ResponseDto<String> orderTransferReject(String orderId);
+    ResponseDto<String> orderTransferReject();
 }

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -62,8 +62,6 @@ liquidnet:
         check: http://devdragon.zhengzai.tv/dragon/pay/checkOrder
         localUrl: http://devkylin.zhengzai.tv/kylin/order/syncOrder
     order:
-      adam:
-        url: http://devadam.zhengzai.tv/adam
       url-pay:
         pay: http://devdragon.zhengzai.tv/dragon/pay/dragonPay
         check: http://devdragon.zhengzai.tv/dragon/pay/checkOrder

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-dev.yml

@@ -24,3 +24,5 @@ liquidnet:
     pay: ${liquidnet.service.kylin.url-pay.pay}
     check: ${liquidnet.service.kylin.url-pay.check}
     localUrl: ${liquidnet.service.kylin.url-pay.localUrl}
+  adam:
+    url:${liquidnet.service.adam.url}

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-test.yml

@@ -24,3 +24,5 @@ liquidnet:
     pay: ${liquidnet.service.kylin.url-pay.pay}
     check: ${liquidnet.service.kylin.url-pay.check}
     localUrl: ${liquidnet.service.kylin.url-pay.localUrl}
+  adam:
+    url:${liquidnet.service.adam.url}
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-service-order-dev.yml

@@ -25,4 +25,4 @@ liquidnet:
     check: ${liquidnet.service.order.url-pay.check}
     localUrl: ${liquidnet.service.order.url-pay.localUrl}
   adam:
-    url:${liquidnet.service.order.adam.url}
+    url:${liquidnet.service.adam.url}

liquidnet-bus-config/liquidnet-config/liquidnet-service-order-test.yml

@@ -25,4 +25,4 @@ liquidnet:
     check: ${liquidnet.service.order.url-pay.check}
     localUrl: ${liquidnet.service.order.url-pay.localUrl}
   adam:
-    url:${liquidnet.service.order.adam.url}
+    url:${liquidnet.service.adam.url}

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

@@ -160,4 +160,11 @@ public class KylinOrderTicketsController {
     public ResponseDto<String> orderTransferWithdraw(@RequestParam(value = "orderId") @NotNull @NotBlank String orderId) {
         return orderTicketsService.orderTransferWithdraw(orderId);
     }
+
+    @PostMapping("transferReject")
+    @ApiOperation("转赠订单退回")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<String> orderTransferReject() {
+        return orderTicketsService.orderTransferReject();
+    }
 }

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.commons.lang.util.*;
+import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
@@ -238,6 +239,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                     LocalDateTime transferStartTime = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getTransferStartTime());
                     LocalDateTime transferEndTime = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getTransferEndTime());
                     if (LocalDateTime.now().isAfter(transferStartTime) && LocalDateTime.now().isBefore(transferEndTime)
+                            && orderTicketVo.getExpressAddress().trim().equals("")
                             && orderTicketVo.getStatus().equals(1) && orderTicketVo.getTransferStatus().equals(0)) {
                         vo.setIsCanTransfer(1);
                     } else {
@@ -397,7 +399,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             if (null != performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) {
                 LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
                 LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
-                if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate) && orderTicketVo.getExpressAddress().trim().equals("") && ticketVo.getCounts() == 1) {
+                if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate)
+                        && orderTicketVo.getExpressAddress().trim().equals("") && ticketVo.getCounts() == 1) {
 
                 } else {
                     return "暂不支持退款";
@@ -672,6 +675,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 LocalDateTime transferStartTime = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getTransferStartTime());
                 LocalDateTime transferEndTime = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getTransferEndTime());
                 if (LocalDateTime.now().isAfter(transferStartTime) && LocalDateTime.now().isBefore(transferEndTime)
+                        && orderTicketVo.getExpressAddress().trim().equals("")
                         && orderTicketVo.getStatus().equals(1) && orderTicketVo.getTransferStatus().equals(0)) {
                     isCanTransfer = true;
                 } else {
@@ -718,7 +722,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             sqls.add(SqlMapping.get("kylin_order_ticket_relation.transfer.update"));
             LinkedList<Object[]> sqlsDataC = CollectionUtil.linkedListObjectArr();
             sqlsDataC.add(new Object[]{
-                    transferUid,orderTicketVo.getOrderTicketsId(), now, orderTicketVo.getOrderTicketsId(), now, now
+                    transferUid, orderTicketVo.getOrderTicketsId(), now, orderTicketVo.getOrderTicketsId(), now, now
             });
 
             //生成被转赠订单独立redis
@@ -773,7 +777,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             sqls.add(SqlMapping.get("kylin_order_ticket_relation.transfer.update"));
             LinkedList<Object[]> sqlsDataC = CollectionUtil.linkedListObjectArr();
             sqlsDataC.add(new Object[]{
-                    "","", now, orderTicketVo.getOrderTicketsId(), now, now
+                    "", "", now, orderTicketVo.getOrderTicketsId(), now, now
             });
             //删除被转赠订单独立redis
             dataUtils.delTransferOrder(orderTicketVo.getTransferUid());
@@ -787,7 +791,56 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
     }
 
     @Override
-    public ResponseDto<String> orderTransferAccept(String orderId) {
+    public ResponseDto<String> orderTransferAccept(String enterIdList) {
+        String uid = CurrentUtil.getCurrentUid();
+        Integer enterSize = enterIdList.split(",").length;
+        KylinOrderTicketVo orderTicketVo = dataUtils.getTransferOrder(uid);
+        LocalDateTime now = LocalDateTime.now();
+        if (orderTicketVo != null) {
+            KylinPerformanceVo performanceData = dataUtils.getPerformanceVo(orderTicketVo.getPerformanceId());
+            KylinTicketTimesVo ticketTimesData ;
+            KylinTicketVo ticketData = null;
+            for (int x = 0; x < performanceData.getTicketTimeList().size(); x++) {
+                KylinTicketTimesVo timeItem = performanceData.getTicketTimeList().get(x);
+                if (timeItem.getTimeId().equals(orderTicketVo.getTimeId())) {
+                    ticketTimesData = timeItem;
+                    for (int y = 0; y < ticketTimesData.getTicketList().size(); y++) {
+                        KylinTicketVo ticketItem = ticketTimesData.getTicketList().get(y);
+                        if (ticketItem.getTicketsId().equals(orderTicketVo.getTicketId())) {
+                            ticketData = ticketItem;
+                            break;
+                        }
+                    }
+                    break;
+                }
+            }
+
+            int isTrueName = ticketData.getIsTrueName();//是否演出实名
+            //实名判断
+            if (isTrueName == 1 && enterSize <= 0) {
+                return ResponseDto.failure(ErrorMapping.get("20015"));//需要实名 未实名
+            }
+            if (isTrueName == 1 && enterSize != orderTicketVo.getNumber()) {
+                return ResponseDto.failure(ErrorMapping.get("20015"));//入场人数量错误
+            }
+
+            //学生票 判断
+            List<AdamEntersVo> entersVoList = ObjectUtil.cloneArrayListObject();
+            if (isTrueName == 1) {
+                List<AdamEntersVo> adamEnters = orderUtils.getEnters(enterIdList,uid);
+                for (AdamEntersVo item : adamEnters) {
+                    entersVoList.add(item);
+                    if (ticketData.getIsStudent() == 1) {
+                        int age = IDCard.getAgeByIdCard(item.getIdCard());
+                        if (age > 25) {
+                            return ResponseDto.failure(ErrorMapping.get("20017"));//学生票年龄问题
+                        }
+                    }
+                }
+            }
+        } else {
+
+        }
         return null;
     }
 
@@ -828,7 +881,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             sqls.add(SqlMapping.get("kylin_order_ticket_relation.transfer.update"));
             LinkedList<Object[]> sqlsDataC = CollectionUtil.linkedListObjectArr();
             sqlsDataC.add(new Object[]{
-                    "","", now, orderTicketVoTransfer.getOrderTicketsId(), now, now
+                    "", "", now, orderTicketVoTransfer.getOrderTicketsId(), now, now
             });
             //删除被转赠订单独立redis
             dataUtils.delTransferOrder(orderTicketVo.getUserId());

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

 package com.liquidnet.service.kylin.utils;
 
+import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
 import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
@@ -24,6 +25,8 @@ public class ObjectUtil {
     private static final ArrayList<KylinOrderListVo> kylinOrderListVoArrayList = new ArrayList<>();
     private static final ArrayList<KylinBanners> kylinBannerListArrayList = new ArrayList<>();
     private static final PagedResult<KylinStationPerformanceVo> kylinStationPerformanceVoPagedResult = new PagedResult<>();
+    private static final ArrayList<AdamEntersVo> arrayListObject = new ArrayList<>();
+
 
     public static ArrayList<KylinStationPerformanceVo> getKylinStationPerformanceVoArrayList() {
         return (ArrayList<KylinStationPerformanceVo>) kylinStationPerformanceVoArrayList.clone();
@@ -72,4 +75,8 @@ public class ObjectUtil {
     public static PagedResult<KylinStationPerformanceVo> getKylinStationPerformanceVoPagedResult() {
         return kylinStationPerformanceVoPagedResult.clone();
     }
+
+    public static ArrayList<AdamEntersVo> cloneArrayListObject() {
+        return (ArrayList<AdamEntersVo>) arrayListObject.clone();
+    }
 }

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

 package com.liquidnet.service.kylin.utils;
 
+import com.liquidnet.commons.lang.util.HttpUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
+import com.liquidnet.service.kylin.dto.vo.returns.PayInnerResultVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import javax.xml.ws.Response;
 import java.util.List;
 
 @Component
@@ -15,6 +21,8 @@ public class OrderUtils {
 
     @Autowired
     private DataUtils dataUtils;
+    @Value("${liquidnet.adam.url}")
+    private DataUtils adamUrl;
 
     /**
      * @param userId  用户id
@@ -77,4 +85,11 @@ public class OrderUtils {
                 return false;
         }
     }
+
+
+    public List<AdamEntersVo> getEnters(String entersIds, String uid){
+        String returnVo = HttpUtil.get(adamUrl+"/adam/rsc/inquire/enters?entersIds="+entersIds+"&uid="+uid,null);
+//        List<AdamEntersVo> adamEntersVo = JsonUtils.fromJson(returnVo,null);
+        return null;
+    }
 }