Merge branch 'dev' into test

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinOrderTicketVo.java

 package com.liquidnet.service.kylin.dto.vo.mongo;
 
+import com.liquidnet.service.kylin.dto.vo.returns.OrderRefundListVo;
 import com.liquidnet.service.kylin.entity.KylinOrderTicketRelations;
 import com.liquidnet.service.kylin.entity.KylinOrderTicketStatus;
 import com.liquidnet.service.kylin.entity.KylinOrderTickets;
@@ -100,7 +101,7 @@ public class KylinOrderTicketVo implements Serializable {
     private String updatedAt;
 
 //    private Integer isCanRefund;
-    private Integer isHaveRefundDetails;
+    private List<OrderRefundListVo> orderRefundListVos;
 
     private LocalDateTime changeDate;
 

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderTicketPreVo.java

@@ -49,5 +49,6 @@ public class KylinOrderTicketPreVo implements Serializable {
     private String timeId;
     private String ticketId;
     private String fieldName;
+    private Integer isTrueName;
     private List<KylinOrderTicketEntitiesPreRefundVo> entitiesPreRefundVos;
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/OrderRefundListVo.java

+package com.liquidnet.service.kylin.dto.vo.returns;
+
+import lombok.Data;
+
+@Data
+public class OrderRefundListVo {
+    private String orderRefundsId;
+    private String orderRefundCode;
+    private Integer status;
+}

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

@@ -108,15 +108,15 @@ public class KylinOrderTicketsController {
     }
 
     @GetMapping("orderRefundDetails")
-    @ApiOperation("发起退款申请")
+    @ApiOperation("退款申请详情")
     @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));
     }
 
-    @PostMapping("sendOrderRefund")
-    @ApiOperation("发起退款申请")
+    @PostMapping("orderRefundWithdraw")
+    @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/KylinOrderTicketsServiceImpl.java

@@ -33,6 +33,7 @@ import com.liquidnet.service.kylin.utils.*;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;
+import com.mongodb.client.result.UpdateResult;
 import com.taobao.api.TaobaoClient;
 import com.taobao.api.request.AlibabaDamaiMevOpenBatchpushticketRequest;
 import com.taobao.api.response.AlibabaDamaiMevOpenBatchpushticketResponse;
@@ -1039,11 +1040,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                         vo.setIsCanRefund(1);
                     } else {
                         vo.setIsCanRefund(0);
-                        orderTicketVo.setIsHaveRefundDetails(0);
                     }
                 } else {
                     vo.setIsCanRefund(0);
-                    orderTicketVo.setIsHaveRefundDetails(0);
                 }
 
                 List<KylinOrderRefundsOrderCodeVo> orderRefundsVoBaseList = new ArrayList<>();
@@ -1054,6 +1053,17 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                     data.setStatus(item.getStatus());
                 }
 
+                List<KylinOrderRefundsVoBase> orderRefundsVoList = dataUtils.getOrderRefundVoByOrderId(orderId);
+                List<OrderRefundListVo> orderRefundListVos = new ArrayList<>();
+                for (KylinOrderRefundsVoBase item : orderRefundsVoList){
+                    OrderRefundListVo data = new OrderRefundListVo();
+                    data.setOrderRefundCode(item.getOrderRefundCode().substring(item.getOrderRefundCode().length()-10));
+                    data.setOrderRefundsId(item.getOrderRefundsId());
+                    data.setStatus(item.getStatus());
+                    orderRefundListVos.add(data);
+                }
+                orderTicketVo.setOrderRefundListVos(orderRefundListVos);
+                orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length()-10));
                 vo.setOrderRefundsVoList(orderRefundsVoBaseList);
                 vo.setOrderTicketVo(orderTicketVo);
                 vo.setEnterDescribe(dataUtils.getEnterInfo("1"));
@@ -1234,6 +1244,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             orderTicketVo.setFieldName(performanceVo.getFieldName());
 
             BeanUtils.copyProperties(orderTicketVo,vo);
+            vo.setIsTrueName(performanceVo.getIsTrueName());
             vo.setEntitiesPreRefundVos(kylinOrderTicketEntitiesPreRefundVos);
             return vo;
         }catch (Exception e){
@@ -1348,10 +1359,10 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             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);
 
@@ -1371,15 +1382,15 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                     }
                 }
                 KylinOrderTicketEntitiesVo entitiesVo = null;
-                if (refundingEntitiesCount > 0) { // 存在其他正在退款的该入场人订单
-                    newIsPayment = KylinTableStatusConst.ENTITIES_IS_PAYMENT2;
-                } else {
                 for (KylinOrderTicketEntitiesVo entitiesVo1 : orderTicketVo.getEntitiesVoList()) {
                     if (entitiesVo1.getOrderTicketEntitiesId().equals(item.getOrderTicketEntitiesId())) {
                         entitiesVo = entitiesVo1;
                         break;
                     }
                 }
+                if (refundingEntitiesCount > 0) { // 存在其他正在退款的该入场人订单
+                    newIsPayment = KylinTableStatusConst.ENTITIES_IS_PAYMENT2;
+                } else {
                     if (entitiesVo.getRefundPrice().doubleValue() > 0) { // 已经有退完的 那就是部分退款了
                         newIsPayment = KylinTableStatusConst.ENTITIES_IS_PAYMENT4;
                     } else {
@@ -1399,10 +1410,10 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 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());
             }
@@ -1416,10 +1427,10 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             orderRefundsVoBase.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL);
             orderRefundsVoBase.setUpdatedAt(strTime);
             BasicDBObject refundObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(orderRefundsVoBase)));
-            mongoTemplate.getCollection(KylinOrderTicketVo.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
@@ -1429,7 +1440,6 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             sqls.add(SqlMapping.get("kylin_order_ticket_entities.withDraw"));
             sqls.add(SqlMapping.get("kylin_order_refund.withDraw"));
 
-            //TODO 生成新QUERY
             rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_WITHDRAW, MQConst.ROUTING_KEY_SQL_ORDER_WITHDRAW,
                     SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC));
             return true;