库存redis参数增加身份证 超时支付

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinOrderTicketEntitiesMapper.java

@@ -33,4 +33,6 @@ public interface KylinOrderTicketEntitiesMapper extends BaseMapper<KylinOrderTic
             @Param("orderRefundStatus") Integer orderRefundStatus,
             @Param("entitiesId") String entitiesId
     );
+
+    List<KylinOrderTicketEntitiesDao> getOvertimeRefundEntitiesList(String orderTicketsId);
 }

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

@@ -46,4 +46,16 @@
             AND b.order_ticket_entities_id = #{entitiesId}
         </where>
     </select>
+    <select id="getOvertimeRefundEntitiesList"
+            resultType="com.liquidnet.service.kylin.dao.KylinOrderTicketEntitiesDao">
+        SELECT a.order_ticket_entities_id, a.enter_name, a.status AS is_out, a.is_payment,
+        b.title, b.price, b.use_start, b.use_end,
+        c.get_ticket_type
+        FROM kylin_order_ticket_entities AS a
+        JOIN kylin_tickets AS b ON a.ticket_id = b.tickets_id
+        JOIN kylin_order_tickets AS c ON c.order_tickets_id = a.order_id
+        <where>
+            a.order_id = #{orderTicketsId}
+        </where>
+    </select>
 </mapper>

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

@@ -203,20 +203,16 @@ 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);
+                    log.info(UserPathDto.setData("changeBuyInfo", "UserId=" + orderInfo.getUserId() + "idCard=" + entitiesInfo.getEnterIdCode() + " PerformanceId=" + orderRelations.getPerformanceId() + " TicketId=" + entitiesInfo.getTicketId(), "info"));
+                    dataUtils.changeBuyInfo(orderInfo.getUserId(), entitiesInfo.getEnterIdCode(), orderRelations.getPerformanceId(), entitiesInfo.getTicketId(), -1);
                 }
             }
         }

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

@@ -121,7 +121,7 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
         Double RefundPriceExpress = orderInfo.getPriceExpress().doubleValue() - refundPriceExpressSum;
 
         // 查询订单入场人
-        List<KylinOrderTicketEntitiesDao> entitiesListTemp = kylinOrderTicketEntitiesMapper.getRefundEntitiesList(orderTicketsId);
+        List<KylinOrderTicketEntitiesDao> entitiesListTemp = kylinOrderTicketEntitiesMapper.getOvertimeRefundEntitiesList(orderTicketsId);
         List<KylinOrderTicketEntitiesDao> entitiesList = new ArrayList<>();
 
         if(entitiesListTemp.size() > 0) {
@@ -130,7 +130,7 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
             int allEntitiesCount = kylinOrderTicketEntitiesMapper.selectCount(// 总入场人数量 排出未付款的 用来计算单入场人的价格
                     new QueryWrapper<KylinOrderTicketEntities>()
                             .eq("order_id", orderInfo.getOrderTicketsId())
-                            .ne("is_payment", KylinTableStatusConst.ENTITIES_IS_PAYMENT0)
+//                            .ne("is_payment", KylinTableStatusConst.ENTITIES_IS_PAYMENT0)
             );
             double onePrice = (priceActual - priceExpress) / allEntitiesCount;//单价
             for (KylinOrderTicketEntitiesDao entities : entitiesListTemp) {
@@ -169,7 +169,7 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
                     );
                     if (entitiesInfo.getIsPayment() == KylinTableStatusConst.ENTITIES_IS_PAYMENT3) {
                         dataUtils.changeSurplusGeneral(entitiesInfo.getTicketId(), 1);
-                        dataUtils.changeBuyInfo(orderInfo.getUserId(), "", orderRelations.getPerformanceId(), entitiesInfo.getTicketId(), -1);
+                        dataUtils.changeBuyInfo(orderInfo.getUserId(), entitiesInfo.getEnterIdCode(), orderRelations.getPerformanceId(), entitiesInfo.getTicketId(), -1);
                     }
                 }
             return true;