Merge branch 'dev' into test

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

@@ -225,12 +225,13 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
             return ResponseDto.failure("无退款订单");
         }
         Integer[] orderRefundStatus = null;
-        Integer orderType = KylinTableStatusConst.ORDER_REFUND_TYPE_APPLY;
+        Integer orderType = null;
         switch (type) {
             default:
                 return ResponseDto.failure("type类型错误");
             case "cancel":
                 orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
+                orderType = KylinTableStatusConst.ORDER_REFUND_TYPE_APPLY;
                 break;
             case "reapply":
                 orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
@@ -249,12 +250,12 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
                 break;
         }
 
-        List<KylinOrderRefunds> refundList = kylinOrderRefundsMapper.selectList(
-                new QueryWrapper<KylinOrderRefunds>()
-                        .eq("type", orderType)
-                        .in("order_refunds_id", orderRefundsIdList)
-                        .in("status", orderRefundStatus)
-        );
+        QueryWrapper<KylinOrderRefunds> listQuery = new QueryWrapper();
+        listQuery.in("order_refunds_id", orderRefundsIdList).in("status", orderRefundStatus);
+        if (null != orderType) {
+            listQuery.eq("type", orderType);
+        }
+        List<KylinOrderRefunds> refundList = kylinOrderRefundsMapper.selectList(listQuery);
         if (orderRefundsIdList.size() != refundList.size()) {
             return ResponseDto.failure("当前状态不允许操作");
         }

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/controller/KylinOrderTicketsController.java

@@ -115,7 +115,14 @@ public class KylinOrderTicketsController {
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<OrderRefundVo> orderRefundDetails(@RequestParam(value = "orderId", required = true) @NotNull(message = "订单id不能为空") String orderId,
                                                          @RequestParam(value = "orderRefundId", required = true) @NotNull(message = "退款订单id不能为空") String orderRefundId) {
-        return ResponseDto.success(orderTicketsService.orderRefundDetails(orderId,orderRefundId));
+        return ResponseDto.success(orderTicketsService.orderRefundDetails(orderId, orderRefundId));
+    }
+
+    @PostMapping("sendOrderRefund")
+    @ApiOperation("发起退款申请")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<Boolean> orderRefundWithdraw(@RequestParam(value = "orderRefundId", required = true) @NotNull(message = "退款订单id不能为空") String orderRefundId) {
+        return orderTicketsService.orderRefundWithdraw(orderRefundId) == null ? ResponseDto.failure() : ResponseDto.success();
     }
 
 

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);
                 }
             }
         }
@@ -468,6 +464,7 @@ public class KylinRefundsStatusServiceImpl {
                     orderRefundPic.getOrderRefundsId(), orderRefundPic.getOrderRefundsId(), orderRefundPic.getPicUrl(), orderRefundPic.getCreatedAt()
             });
 
+            //TODO 生成新QUERY
             rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_PAY, MQConst.ROUTING_KEY_SQL_ORDER_PAY,
                     SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD, sqlsDataE));
 

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;

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

@@ -40,5 +40,9 @@ kylin_order_refund_entities.refund=INSERT INTO kylin_order_refund_entities (orde
 kylin_order_refund_pic.refund=INSERT INTO kylin_order_refund_pic (refund_pic_id,order_refunds_id,pic_url,created_at) VALUES (?,?,?,?)
 
 # ------------------------用户发起订单退款撤回----------------------------
+kylin_order_ticket_status.withDraw=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_ticket_entities.withDraw=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_refund.withDraw=UPDATE kylin_order_refunds SET status = ? ,updated_at = ?  WHERE order_refunds_id = ?
+
+
 
-# ------------------------用户发起订单退款----------------------------