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

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderTicketsAdminServiceImpl.java

@@ -182,6 +182,7 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
             }
             return vo;
         } catch (Exception e) {
+            e.printStackTrace();
             return vo;
         }
     }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java

@@ -417,7 +417,7 @@ public class PerformanceVoUtils {
                         ticketRelationsMapper.update(ticketRelations, new UpdateWrapper<KylinTicketRelations>().eq("ticket_id", tickets.getTicketsId()));
                         BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
                         mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne(
-                                Query.query(Criteria.where("ticketsId").is(ticketItem.getTicketsId())).getQueryObject(),
+                                Query.query(Criteria.where("ticketsId").is(ticketItem.getTicketsId()).and("status").ne(7)).getQueryObject(),
                                 objectTicketVo);
                     }
                 }

liquidnet-bus-feign/liquidnet-api-feign-kylin/src/main/java/com/liquidnet/service/feign/kylin/task/FeignPlatformTaskClient.java

@@ -5,6 +5,7 @@ import feign.hystrix.FallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 @Component
 @FeignClient(name = "liquidnet-service-platform",
@@ -21,5 +22,5 @@ public interface FeignPlatformTaskClient {
     ResponseDto<String> checkPerformanceTime();
 
     @PostMapping("platform/order/checkTransferOrder")
-    ResponseDto<Boolean> checkTransferOrder(Integer minute);
+    ResponseDto<Boolean> checkTransferOrder(@RequestParam("minute") Integer minute);
 }

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/executor/main/handler/KylinTaskHandler.java

@@ -52,7 +52,7 @@ public class KylinTaskHandler {
     public ReturnT<String> checkTransferOrderHandler() {
         try {
             String minute = XxlJobHelper.getJobParam(); //执行参数
-            log.debug("minute = " + minute);
+            log.debug("minute = " + Integer.parseInt(minute));
             boolean result = feignPlatformTaskClient.checkTransferOrder(Integer.parseInt(minute)).getData();
             log.info("checkTransferOrderHandler：结果：" + result);
             return ReturnT.SUCCESS;

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

@@ -836,7 +836,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             enterSize = enterIdList.split(",").length;
         }
         KylinOrderTicketVo orderTicketVo = dataUtils.getTransferOrder(uid);
-        if(orderTicketVo==null){
+        if (orderTicketVo == null) {
             return ResponseDto.failure("无订单");
         }
         if (!orderTicketVo.getTransferStatus().equals(4)) {
@@ -887,6 +887,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 for (AdamEntersVo item : adamEnters) {
                     entersVoList.add(item);
                     if (ticketData.getIsStudent() == 1) {
+                        if(!item.getType().equals(1)){
+                            return ResponseDto.failure("学生票优惠核验失败，无法购买");
+                        }
                         int age = IDCard.getAgeByIdCard(item.getIdCard());
                         if (age > 25) {
                             return ResponseDto.failure(ErrorMapping.get("20017"));//学生票年龄问题
@@ -930,7 +933,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             orderTickets.setUserName(StringUtils.defaultString(((String) token.get("nickname")), ""));
             orderTickets.setUserMobile(StringUtils.defaultString(((String) token.get("mobile")), ""));
             orderTickets.setPerformanceTitle(orderTicketVo.getPerformanceTitle());
-            orderTickets.setOrderCode(orderTicketVo.getOrderCode());
+            orderTickets.setOrderCode(IDGenerator.ticketOrderCode(orderTicketId));
             orderTickets.setPayCode(orderTicketVo.getPayCode());
             orderTickets.setQrCode(orderTicketVo.getQrCode());
             orderTickets.setOrderType(source);
@@ -989,7 +992,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             orderTicketRelations.setIsMember(orderTicketVo.getIsMember());
             orderTicketRelations.setPerformanceId(performanceData.getPerformancesId());
             orderTicketRelations.setTimeId(ticketTimesData.getTimeId());
-            orderTicketRelations.setTicketId(ticketData.getTimeId());
+            orderTicketRelations.setTicketId(ticketData.getTicketsId());
             orderTicketRelations.setCreatedAt(now);
             orderTicketRelations.setUpdatedAt(null);
             sqls.add(SqlMapping.get("kylin_order_ticket_relation.add"));
@@ -1000,7 +1003,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             KylinOrderTicketEntities orderTicketEntities = KylinOrderTicketEntities.getNew();
             LinkedList<Object[]> sqlsDataD = CollectionUtil.linkedListObjectArr();
             sqls.add(SqlMapping.get("kylin_order_ticket_entities.add"));
-            for (KylinOrderTicketEntitiesVo entitiesVo : orderTicketVo.getEntitiesVoList()) {
+            for (int i = 0; i < orderTicketVo.getEntitiesVoList().size(); i++) {
+                KylinOrderTicketEntitiesVo entitiesVo = orderTicketVo.getEntitiesVoList().get(i);
                 String orderTicketEntitiesId = entitiesVo.getOrderTicketEntitiesId();
                 orderTicketEntities.setOrderTicketEntitiesId(orderTicketEntitiesId);
                 orderTicketEntities.setOrderId(orderTicketId);
@@ -1009,9 +1013,17 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 orderTicketEntities.setPerformanceId(performanceData.getPerformancesId());
                 orderTicketEntities.setTimeId(ticketTimesData.getTicketTimesId());
                 orderTicketEntities.setEnterType(entitiesVo.getEnterType());
-                orderTicketEntities.setEnterName(entitiesVo.getEnterName());
-                orderTicketEntities.setEnterMobile(entitiesVo.getEnterMobile());
-                orderTicketEntities.setEnterIdCode(entitiesVo.getEnterIdCode());
+
+                if (entersVoList.size() > 0) {
+                    orderTicketEntities.setEnterName(entersVoList.get(i).getName());
+                    orderTicketEntities.setEnterMobile(entersVoList.get(i).getMobile());
+                    orderTicketEntities.setEnterIdCode(entersVoList.get(i).getIdCard());
+                } else {
+                    orderTicketEntities.setEnterName(entitiesVo.getEnterName());
+                    orderTicketEntities.setEnterMobile(entitiesVo.getEnterMobile());
+                    orderTicketEntities.setEnterIdCode(entitiesVo.getEnterIdCode());
+                }
+
                 orderTicketEntities.setStatus(entitiesVo.getStatus());
                 orderTicketEntities.setSysDamai(entitiesVo.getSysDamai());
                 orderTicketEntities.setCheckClient(entitiesVo.getCheckClient());
@@ -1045,6 +1057,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             dataUtils.delTransferOrder(uid);
             // 生成vo
             orderTicketVo.setTransferStatus(3);
+            orderTicketVo.setOrderCode(orderTickets.getOrderCode());
             orderTicketVo.setCreatedAt(orderTickets.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             orderTicketVo.setChangeDate(orderTickets.getCreatedAt());
             orderUtils.resetOrderListVo(uid, 1, orderTicketVo.getOrderTicketsId(), orderTicketVo);

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.fasterxml.jackson.core.type.TypeReference;
+import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
@@ -12,7 +13,9 @@ 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.http.MediaType;
 import org.springframework.stereotype.Component;
+import org.springframework.util.MultiValueMap;
 
 import javax.xml.ws.Response;
 import java.util.List;
@@ -178,8 +181,10 @@ public class OrderUtils {
     }
 
 
-    public List<AdamEntersVo> getEnters(String entersIds, String uid){
-        String returnVo = HttpUtil.get("https://testadam.zhengzai.tv"+"/adam/rsc/inquire/enters?entersIds="+entersIds+"&uid="+uid,null);
+    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("https://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();