提交撤回

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

@@ -62,7 +62,7 @@ public interface IKylinOrderTicketsService  {
     ResponseDto<String> sendOrderRefund(String orderId, String orderTicketEntitiesId, String reason, String picList);
 
     //退款撤回
-    Boolean orderRefundWithdraw(String orderRefundsId);
+    ResponseDto<Boolean> orderRefundWithdraw(String orderRefundsId);
 
     //退款再次申请
     Boolean orderRefundAgain(String orderRefundsId);

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

@@ -122,7 +122,7 @@ public class KylinOrderTicketsController {
     @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();
+        return orderTicketsService.orderRefundWithdraw(orderRefundId);
     }
 
 

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

@@ -1205,7 +1205,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
     }
 
     @Override
-    public Boolean orderRefundWithdraw(String orderRefundsId) {
+    public ResponseDto<Boolean> orderRefundWithdraw(String orderRefundsId) {
 
         LinkedList<String> sqls = new LinkedList<>();
         LinkedList<Object[]> sqlsDataA = new LinkedList<>();
@@ -1216,6 +1216,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
         String strTime = DateUtil.Formatter.yyyyMMddHHmmss.format(time);
         try {
             KylinOrderRefundsVoBase orderRefundsVo = dataUtils.getOrderRefundVo(orderRefundsId);
+            if(!orderRefundsVo.getStatus().equals(0)){
+                return ResponseDto.failure("当前状态不可撤回");
+            }
             List<KylinOrderRefundEntitiesVo> refundEntities = orderRefundsVo.getOrderRefundEntitiesVoList();
             String orderTicketsId = orderRefundsVo.getOrderTicketsId();
             KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderTicketsId);
@@ -1256,10 +1259,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             kylinOrderTicketVo.setUpdatedAt(strTime);
             kylinOrderTicketVo.setChangeDate(time);
             BasicDBObject orderObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketVo)));
-//            mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
-//                    Query.query(Criteria.where("orderTicketsId").is(orderTicketsId)).getQueryObject(),
-//                    orderObject
-//            );
+            mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
+                    Query.query(Criteria.where("orderTicketsId").is(orderTicketsId)).getQueryObject(),
+                    orderObject
+            );
             dataUtils.delOrderTicketRedis(orderTicketsId);
             mongoVoUtils.resetOrderListVo(orderTicketVo.getUserId(), 2, orderTicketsId, null);
 
@@ -1307,10 +1310,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 kylinOrderTicketEntitiesVo.setUpdatedAt(strTime);
                 kylinOrderTicketEntitiesVo.setChangeDate(time);
                 BasicDBObject entitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketEntitiesVo)));
-//                mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
-//                        Query.query(Criteria.where("orderTicketEntitiesId").is(item.getOrderTicketEntitiesId())).getQueryObject(),
-//                        entitiesObject
-//                );
+                mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
+                        Query.query(Criteria.where("orderTicketEntitiesId").is(item.getOrderTicketEntitiesId())).getQueryObject(),
+                        entitiesObject
+                );
 
                 dataUtils.delOrderTicketEntitiesRedis(item.getOrderTicketEntitiesId());
             }
@@ -1324,10 +1327,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             orderRefundsVoBase.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL);
             orderRefundsVoBase.setUpdatedAt(strTime);
             BasicDBObject refundObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(orderRefundsVoBase)));
-//            mongoTemplate.getCollection(KylinOrderRefundsVoBase.class.getSimpleName()).updateOne(
-//                    Query.query(Criteria.where("orderRefundsId").is(orderRefundsId)).getQueryObject(),
-//                    refundObject
-//            );
+            mongoTemplate.getCollection(KylinOrderRefundsVoBase.class.getSimpleName()).updateOne(
+                    Query.query(Criteria.where("orderRefundsId").is(orderRefundsId)).getQueryObject(),
+                    refundObject
+            );
 
             sqlsDataC.add(new Object[]{
                     orderRefundsVoBase.getStatus(), orderRefundsVoBase.getUpdatedAt(), orderRefundsId
@@ -1339,10 +1342,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
 
             rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_WITHDRAW, MQConst.ROUTING_KEY_SQL_ORDER_WITHDRAW,
                     SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC));
-            return true;
+            return ResponseDto.success(true);
         } catch (Exception e) {
             e.printStackTrace();
-            return false;
+            return ResponseDto.failure("当前状态不可撤回");
         }
     }
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/PerformanceVoTask.java

@@ -325,6 +325,7 @@ public class PerformanceVoTask {
                     KylinTicketRelations ticketRelations = new KylinTicketRelations();
                     BeanUtils.copyProperties(kylinTicketPartnerVo, ticketRelations);
 
+                    tickets.setPayCountdownMinute(kylinPerformanceMisVo.getPayCountdownMinute());
                     tickets.setPriceExpress(new BigDecimal("0.00"));
                     tickets.setPriceDiscountMember(new BigDecimal("0.00"));
                     tickets.setPriceDiscount(new BigDecimal("0.00"));