Merge branch 'dev' into test

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

@@ -793,8 +793,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         KylinOrderTicketEntities orderTicketEntities = new KylinOrderTicketEntities();
 
         if (orderTicketData.getStatus() == 2) {
-            orderRefundsCallbackService.refundApply(orderTicketData.getOrderTicketsId());
             mongoVoUtils.resetOrderListVo(orderTicketData.getUserId(), 2, orderTicketData.getOrderTicketsId(), null);
+            log.error("订单号位 {} 的订单超时支付", syncOrderParam.getOrder_code());
+            orderRefundsCallbackService.refundApply(orderTicketData.getOrderTicketsId());
         } else if (orderTicketData.getStatus() == 3 || orderTicketData.getStatus() == 4) {
             log.error("订单号位 {} 的订单正在退款 或者已退款", syncOrderParam.getOrder_code());
         } else {
@@ -1031,7 +1032,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                     vo.setKuaidi_status(-2);
                 }
 
-                if (performanceVo.getIsCanRefund() == 1) {
+                if (null!=performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) {
                     Date refundOpenDate = DateUtil.parse(performanceVo.getRefundOpenTime(), "yyyy-MM-dd HH:mm:ss");
                     Date refundCloseDate = DateUtil.parse(performanceVo.getRefundCloseTime(), "yyyy-MM-dd HH:mm:ss");
                     if (DateUtil.compareDay(nowDate, refundCloseDate) < 0 && DateUtil.compareDay(nowDate, refundOpenDate) > 0) {

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.liquidnet.common.mq.constant.MQConst;
 import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.base.SqlMapping;
+import com.liquidnet.service.base.UserPathDto;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
 import com.liquidnet.service.kylin.dto.vo.mongo.*;
@@ -202,14 +203,19 @@ public class KylinRefundsStatusServiceImpl {
                 new UpdateWrapper<KylinOrderRefunds>().in("order_refunds_id", refundInfo.getOrderRefundsId())
         );
 
+        log.info(UserPathDto.setData("开始处理库存", "info", "info"));
         if (refundInfo.getType() == KylinTableStatusConst.ORDER_REFUND_TYPE_APPLY) {
+            log.info(UserPathDto.setData("开始处理库存 1", "info", "info"));
             // 退还库存
             for (String entitiesId : orderTicketEntitiesIdsArr) {
+                log.info(UserPathDto.setData("entitiesId", "entitiesId=" + entitiesId, "info"));
                 KylinOrderTicketEntities entitiesInfo = kylinOrderTicketEntitiesMapper.selectOne(
                         new QueryWrapper<KylinOrderTicketEntities>().eq("order_ticket_entities_id", entitiesId)
                 );
+                log.info(UserPathDto.setData("IsPayment", "IsPayment=" + entitiesInfo.getIsPayment(), "info"));
                 if (entitiesInfo.getIsPayment() == KylinTableStatusConst.ENTITIES_IS_PAYMENT3) {
                     dataUtils.changeSurplusGeneral(entitiesInfo.getTicketId(), 1);
+                    log.info(UserPathDto.setData("changeBuyInfo", "UserId=" + orderInfo.getUserId() + " PerformanceId=" + orderRelations.getPerformanceId() + " TicketId=" + entitiesInfo.getTicketId(), "info"));
                     dataUtils.changeBuyInfo(orderInfo.getUserId(), "", orderRelations.getPerformanceId(), entitiesInfo.getTicketId(), -1);
                 }
             }

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

@@ -95,7 +95,7 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky
             for (KylinCheckUserPerformances item : data) {
                 CheckPerformanceRelationParam performanceRelationParam = new CheckPerformanceRelationParam();
                 performanceRelationParam.setCanDownTime(item.getCanDownTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-                performanceRelationParam.setPerformanceId(item.getCheckUserPerformanceId());
+                performanceRelationParam.setPerformanceId(item.getPerformanceId());
                 performanceRelationParamsList.add(performanceRelationParam);
             }
             userPerformanceVo.setCheckUserId(param.getCheckUserId());
@@ -123,7 +123,7 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky
             for (KylinCheckUserPerformances item : data) {
                 CheckPerformanceRelationParam performanceRelationParam = new CheckPerformanceRelationParam();
                 performanceRelationParam.setCanDownTime(item.getCanDownTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-                performanceRelationParam.setPerformanceId(item.getCheckUserPerformanceId());
+                performanceRelationParam.setPerformanceId(item.getPerformanceId());
                 performanceRelationParamsList.add(performanceRelationParam);
             }
             userPerformanceVo.setCheckUserId(checkUserId);

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

@@ -39,3 +39,6 @@ kylin_order_refund.refund=INSERT INTO kylin_order_refunds (order_refunds_id,orde
 kylin_order_refund_entities.refund=INSERT INTO kylin_order_refund_entities (order_refunds_entities_id,order_refunds_id,refund_price,order_ticket_entities_id,created_at) VALUES(?,?,?,?,?)
 kylin_order_refund_pic.refund=INSERT INTO kylin_order_refund_pic (refund_pic_id,order_refunds_id,pic_url,created_at) VALUES (?,?,?,?)
 
+# ------------------------用户发起订单退款撤回----------------------------
+
+# ------------------------用户发起订单退款----------------------------