Merge branch 'master' into new_member

# Conflicts:
#	liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketsService.java
#	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinOrderTicketsController.java
#	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
#	liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/OrderRefundOvertimeServiceImpl.java

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

@@ -31,6 +31,9 @@ public interface IKylinOrderTicketsService {
     //订单未支付数量
     ResponseDto<Integer> orderUnPayCount();
 
+    //补充入场人
+    ResponseDto<Boolean> supplementEnter(String orderId, String enterList);
+
     //发起转赠订单
     ResponseDto<String> orderTransfer(String orderId, String transferUid, String transferMobile);
 

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

@@ -80,8 +80,8 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
             obj1.setSystemId(taobaoTicketUtils.getSystemId());
 
             req.setPushProjectParam(obj1);
+            log.info("[同步演出] 演出名称 = " + performanceData.getTitle() + " 大麦演出id =" + performanceKey);
             AlibabaDamaiMevOpenPushprojectResponse rsp = client.execute(req);
-            log.info("performance=" + rsp.getBody());
             if (rsp.getResult().getSuccess()) {
                 List<KylinTicketTimeRelation> timeRelation = ticketTimeRelationMapper.selectList(new UpdateWrapper<KylinTicketTimeRelation>().eq("performance_id", performanceId));
                 for (int i = 0; i < timeRelation.size(); i++) {
@@ -117,8 +117,8 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
             obj1.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());
             obj1.setSystemId(taobaoTicketUtils.getSystemId());
             req.setPushPerformParam(obj1);
+            log.info("[同步场次] 场次名称 = " + timesData.getTitle() + " 大麦场次id =" + ticketTimesKey);
             AlibabaDamaiMevOpenPushperformResponse rsp = client.execute(req);
-            log.info("times = " + rsp.getBody());
             if (rsp.getResult().getSuccess()) {
                 List<KylinTicketRelations> ticketRelation = ticketRelationsMapper.selectList(new UpdateWrapper<KylinTicketRelations>().eq("times_id", timesData.getTicketTimesId()));
                 for (int i = 0; i < ticketRelation.size(); i++) {
@@ -155,8 +155,8 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
             obj1.setSystemId(taobaoTicketUtils.getSystemId());
 //            obj1.setRemark("0");
             req.setPushItemParam(obj1);
+            log.info("[同步票种] 票种名称 = " + ticketsData.getTitle() + " 大麦票种id =" + ticketIdKey);
             AlibabaDamaiMevOpenPushitemResponse rsp = client.execute(req);
-            log.info("ticket = " + rsp.getBody());
             if (rsp.getResult().getSuccess()) {
                 return sycOrder(timemId, ticketsData.getTicketsId(), ticketIdKey);
 //                return true;
@@ -175,7 +175,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
             TaobaoClient client = taobaoTicketUtils.initTaobaoClient();
             AlibabaDamaiMevOpenBatchpushticketRequest req = new AlibabaDamaiMevOpenBatchpushticketRequest();
             List<OrderPushDamaiDto> data = orderTicketsMapper.pushDamaiDetailsList(ticketsId);
-            log.info("data = " + data.size() + " ticketsId=" + ticketsId);
+            log.info("[同步订单] 票种张数 = " + data.size() + " 票种id =" + ticketsId);
             int forSize = 100;
             int forCount = data.size() % forSize == 0 ? data.size() / forSize : (data.size() / forSize) + 1;
             for (int i = 0; i < forCount; i++) {
@@ -196,7 +196,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
                     long orderIdKey = IDGenerator.getDamaiCode(item.getOrderTicketsId());
                     if (item.getIsPayment() == 3) {
                         taobaoTicketUtils.withdrawDamaiOrder(timemId, orderTicketEntitiesKey);
-                    } else if (item.getTransferStatus() == 2) {
+                    } else if (item.getTransferStatus() == 2 || item.getTransferStatus() == 6) {
                         taobaoTicketUtils.withdrawDamaiOrder(timemId, orderTicketEntitiesKey);
                     } else {
                         list2.add(obj3);
@@ -217,7 +217,6 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
                     }
                 }
                 req.setThirdTicketSetOpenParamList(list2);
-                log.info("list2 = " + list2.size());
                 if (list2.size() == 0) {
                     return true;
                 } else {

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml

@@ -255,8 +255,7 @@
                  LEFT JOIN kylin_order_ticket_relations AS otr ON otr.order_id = ot.order_tickets_id
                  LEFT JOIN kylin_order_ticket_entities AS ote ON ote.order_id = ot.order_tickets_id
                  LEFT JOIN kylin_ticket_status AS kys ON kys.ticket_id = otr.ticket_id
-        WHERE (ots.status = 1 or ots.status = 3)
-          AND kys.sync_damai = 1
+        WHERE (ots.status = 1 or ots.status = 3 or ots.status = 4 or ots.status = 6)
           AND ote.ticket_id = ${ticketsId}
     </select>
 

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

@@ -5,13 +5,20 @@ import com.github.pagehelper.PageInfo;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 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.impl.KylinOrderTicketsServiceImpl;
 import io.swagger.annotations.*;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.HashMap;
@@ -79,6 +86,14 @@ public class KylinOrderTicketsController {
         }
     }
 
+    @GetMapping("supplementEnter")
+    @ApiOperation("补充入场人")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<Boolean> supplementEnter(@RequestParam(value = "orderId", required = true) @NotNull(message = "订单ID不能为空") String orderId,
+                                                @RequestParam(value = "enterList", required = true) @NotNull(message = "入场人id(逗号隔开)") String enterList) {
+        return orderTicketsService.supplementEnter(orderId, enterList);
+    }
+
     @GetMapping("orderUnPayCount")
     @ApiOperation("待支付演出订单数量")
     @ApiResponse(code = 200, message = "接口返回对象参数")
@@ -104,6 +119,7 @@ public class KylinOrderTicketsController {
         return orderTicketsService.orderTransfer(orderId, transferUid, transferMobile);
     }
 
+
     @PostMapping("transferWithDraw")
     @ApiOperation("转赠订单撤回")
     @ApiResponse(code = 200, message = "接口返回对象参数")

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

 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.AdamAddressesVo;
 import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
@@ -11,13 +13,18 @@ import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderRefundEntitiesVo;
 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.*;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.service.IKylinOrderTicketsService;
-import com.liquidnet.service.kylin.utils.*;
+import com.liquidnet.service.kylin.utils.DataUtils;
+import com.liquidnet.service.kylin.utils.ObjectUtil;
+import com.liquidnet.service.kylin.utils.OrderUtils;
+import com.liquidnet.service.kylin.utils.QueueUtils;
+import com.mongodb.BasicDBObject;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.bson.Document;
@@ -54,6 +61,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
     private MongoTemplate mongoTemplate;
     @Autowired
     private QueueUtils queueUtils;
+    @Autowired
+    private KylinRefundsStatusServiceImpl refundsStatusService;
 
     @Override
     public PageInfo<List<KylinOrderListVo>> orderList() {
@@ -223,7 +232,7 @@ 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)
+                    if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate) && orderTicketVo.getExpressAddress().trim().equals("")
                             && ticketVo.getCounts() == 1 && lockPrice.compareTo(orderTicketVo.getPriceActual()) != 0
                             && (orderTicketVo.getStatus().equals(1) || orderTicketVo.getStatus().equals(3) || orderTicketVo.getStatus().equals(6))
                             && (orderTicketVo.getTransferStatus().equals(0) || orderTicketVo.getTransferStatus().equals(5))) {
@@ -249,15 +258,20 @@ 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);
-                    }
+//                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) && LocalDateTime.now().isBefore(DateUtil.Formatter.yyyyMMddHHmmss.parse(orderTicketVo.getUseStart()))) {
+                    vo.setIsCanBack(1);
                 } else {
                     vo.setIsCanBack(0);
                 }
@@ -307,6 +321,74 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
         return ResponseDto.success(unPayCount);
     }
 
+    @Override
+    public ResponseDto<Boolean> supplementEnter(String orderId, String enterList) {
+        String uid = CurrentUtil.getCurrentUid();
+        KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
+        if (uid.equals("809406") || uid.equals("773650")) {
+        } else {
+            if (!orderTicketVo.getUserId().equals(uid)) {
+                return ResponseDto.failure(ErrorMapping.get("20003"));
+            }
+        }
+        KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderTicketVo.getPerformanceId());
+        List<KylinOrderTicketEntitiesVo> kylinOrderTicketEntitiesVoList = orderTicketVo.getEntitiesVoList();
+        KylinTicketVo ticketVo = null;
+
+        //获取购票数据
+        for (int x = 0; x < performanceVo.getTicketTimeList().size(); x++) {
+            KylinTicketTimesVo timeItem = performanceVo.getTicketTimeList().get(x);
+            for (int y = 0; y < timeItem.getTicketList().size(); y++) {
+                KylinTicketVo ticketItem = timeItem.getTicketList().get(y);
+                if (ticketItem.getTicketsId().equals(orderTicketVo.getTicketId())) {
+                    ticketVo = ticketItem;
+                    break;
+                }
+            }
+        }
+        if (ticketVo == null || ticketVo.getIsTrueName() == 0) {
+            return ResponseDto.failure("错误请求");
+        }
+
+        List<AdamEntersVo> adamEnters = orderUtils.getEnters(enterList, uid);
+        if (adamEnters == null) {
+            return ResponseDto.failure("入场人数据异常");//乱七八糟异常
+        }
+        if (adamEnters.size() != kylinOrderTicketEntitiesVoList.size()) {
+            return ResponseDto.failure("入场人数量错误");
+        }
+
+        LinkedList<String> sqls = CollectionUtil.linkedListString();
+        LinkedList<Object[]> sqlsData = CollectionUtil.linkedListObjectArr();
+        sqls.add(SqlMapping.get("kylin_order_refund_entities.supplementEnter"));
+
+        for (int i = 0; i < kylinOrderTicketEntitiesVoList.size(); i++) {
+            KylinOrderTicketEntitiesVo data = kylinOrderTicketEntitiesVoList.get(i);
+            String orderTicketEntitiesId = data.getOrderTicketEntitiesId();
+            if(data.getEnterName().trim().length()>0){
+                return ResponseDto.failure("订单已实名不可更改");
+            }
+            AdamEntersVo adamEntersData = adamEnters.get(i);
+            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())
+                            .append("enterMobile", adamEntersData.getMobile())
+                            .append("enterIdCode", adamEntersData.getIdCard())
+                            .append("updatedAt", DateUtil.Formatter.yyyyMMddHHmmss.format(LocalDateTime.now())))
+            );
+
+            sqlsData.add(new Object[]{
+                    adamEntersData.getType(), adamEntersData.getName(), adamEntersData.getMobile(), adamEntersData.getIdCard(), LocalDateTime.now(), orderTicketEntitiesId
+            });
+        }
+        //入库
+        queueUtils.sendMsgByRedis(MQConst.KylinQueue.SQL_PERFORMANCE_LACK.getKey(),
+                SqlMapping.gets(sqls, sqlsData));
+        dataUtils.delOrderTicketRedis(orderId);
+        return ResponseDto.success();
+    }
+
     @Override
     public ResponseDto<String> orderTransfer(String orderId, String transferUid, String transferMobile) {
         String uid = CurrentUtil.getCurrentUid();
@@ -327,6 +409,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 {
@@ -777,11 +860,11 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
         //必须开启退款
         String performanceId = vo.getPerformanceId();
         KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(performanceId);
-        LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
-        LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
-        if (!(performanceVo.getIsCanRefund().equals(1) && LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate))) {
-            return ResponseDto.failure("未开启退款，不支持回退");
-        }
+//        LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
+//        LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
+//        if (!(performanceVo.getIsCanRefund().equals(1) && LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate))) {
+//            return ResponseDto.failure("未开启退款，不支持回退");
+//        }
         if (!vo.getTransferStatus().equals(3)) {
             return ResponseDto.failure("无法退回");
         }

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( adamUrl+ "/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();

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/sqlmap.properties

@@ -44,3 +44,5 @@ kylin_order_task.delete = DELETE FROM kylin_order_task WHERE order_id = ?;
 kylin_order_ticket_status.transfer.update = UPDATE kylin_order_ticket_status SET transfer_status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_order_ticket_relation.transfer.update = UPDATE kylin_order_ticket_relations SET transfer_uid = ?, transfer_id = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 
+# ------------------------ 订单补充入场人 ----------------------------
+kylin_order_refund_entities.supplementEnter = UPDATE kylin_order_ticket_entities SET enter_type = ?,enter_name = ?,enter_mobile = ?,enter_id_code = ?,updated_at = ? WHERE order_ticket_entities_id = ?

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

@@ -72,11 +72,11 @@ public class OrderRefundOvertimeServiceImpl implements IKylinOrderRefundsService
         );
         if (res) {
             // 超时直接退还库存
-            for (KylinOrderTicketEntitiesVo entitiesInfo : entitiesList) {
-                // 因固定状态为未支付 所以无需判断 entitiesInfo.getIsPayment() == KylinTableStatusConst.ENTITIES_IS_PAYMENT3
-                dataUtils.changeSurplusGeneral(entitiesInfo.getTicketId(), 1);
-                dataUtils.changeBuyInfo(orderInfo.getUserId(), entitiesInfo.getEnterIdCode(), orderInfo.getPerformanceId(), entitiesInfo.getTicketId(), -1);
-            }
+//            for (KylinOrderTicketEntitiesVo entitiesInfo : entitiesList) {
+//                // 因固定状态为未支付 所以无需判断 entitiesInfo.getIsPayment() == KylinTableStatusConst.ENTITIES_IS_PAYMENT3
+//                dataUtils.changeSurplusGeneral(entitiesInfo.getTicketId(), 1);
+//                dataUtils.changeBuyInfo(orderInfo.getUserId(), entitiesInfo.getEnterIdCode(), orderInfo.getPerformanceId(), entitiesInfo.getTicketId(), -1);
+//            }
             // 退所有优惠券
             ArrayList<KylinOrderCoupons> orderCoupon = dataUtils.getOrderCoupon(orderTicketsId);
             if (!CollectionUtil.isEmpty(orderCoupon)) {