增加入库

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

@@ -258,16 +258,21 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                     vo.setIsCanTransfer(0);
                 }
                 //是否可回退
-                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.getTransferStatus().equals(3)) {
-                        vo.setIsCanBack(1);
-                    } else {
-                        vo.setIsCanBack(0);
-                    }
-                } else {
+//                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.getTransferStatus().equals(3)) {
+//                        vo.setIsCanBack(1);
+//                    } else {
+//                        vo.setIsCanBack(0);
+//                    }
+//                } else {
+//                    vo.setIsCanBack(0);
+//                }
+                if(orderTicketVo.getTransferStatus().equals(3)){
+                    vo.setIsCanBack(1);
+                }else{
                     vo.setIsCanBack(0);
                 }
 
@@ -430,7 +435,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
         for (int i = 0; i < kylinOrderTicketEntitiesVoList.size(); i++) {
             String orderTicketEntitiesId = kylinOrderTicketEntitiesVoList.get(i).getOrderTicketEntitiesId();
             AdamEntersVo adamEntersData = adamEnters.get(i);
-            mongoTemplate.getCollection(KylinOrderTicketEntities.class.getSimpleName()).updateOne(
+            mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
                     Query.query(Criteria.where("orderTicketEntitiesId").is(orderTicketEntitiesId)).getQueryObject(),
                     new Document("$set", new Document("enterType", adamEntersData.getType())
                             .append("enterName", adamEntersData.getName())

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

@@ -184,7 +184,7 @@ public class OrderUtils {
     public List<AdamEntersVo> getEnters(String entersIds, String uid) {
         MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
         headers.add("Accept", "application/json;charset=UTF-8");
-        String returnVo = HttpUtil.get(adamUrl + "/adam/rsc/inquire/enters?entersIds=" + entersIds + "&uid=" + uid, null, headers);
+        String returnVo = HttpUtil.get( "http://testadam.zhengzai.tv"+ "/adam/rsc/inquire/enters?entersIds=" + entersIds + "&uid=" + uid, null, headers);
         ResponseDto<List<AdamEntersVo>> ResponseVo = JsonUtils.fromJson(returnVo, new TypeReference<ResponseDto<List<AdamEntersVo>>>() {
         });
         return ResponseVo.getData();