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

@@ -822,6 +822,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             String uid = CurrentUtil.getCurrentUid();
             checkOrderTime(uid);
             KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
+            if(orderTicketVo.getUserId().equals(uid)){
+                return new OrderDetailsVo();
+            }
             if (null != orderTicketVo) {
                 //TODO 顺丰快递
                 Object expresses = null;

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

@@ -117,14 +117,12 @@ public class KylinRefundsStatusServiceImpl {
         double onePrice = (priceActual - priceExpress) / allEntitiesCount;//单价
         int refundNumber = 0;
         for (String entitiesId : orderTicketEntitiesIdsArr) {
-            Double refundedPrice = kylinOrderTicketEntitiesMapper.getRefundOverEntitiesPrice(//已退完成的
-                    orderTicketsId,
-                    KylinTableStatusConst.ORDER_REFUND_STATUS_REFUNDED,
-                    entitiesId
+            KylinOrderTicketEntities EntitiesInfo = kylinOrderTicketEntitiesMapper.selectOne(//已退完成的
+                    new QueryWrapper<KylinOrderTicketEntities>()
+                            .eq("order_ticket_entities_id", entitiesId)
             );
-            if (null == refundedPrice) {
-                refundedPrice = 0.0;
-            }
+            BigDecimal refundedPrice = EntitiesInfo.getRefundPrice();
+
             KylinOrderRefundEntities refundEntitiesInfo = kylinOrderRefundsEntitiesMapper.selectOne(
                     new QueryWrapper<KylinOrderRefundEntities>()
                             .eq("order_refunds_id", refundInfo.getOrderRefundsId())
@@ -179,7 +177,7 @@ public class KylinRefundsStatusServiceImpl {
         orderVo.put("status", newStatus);
         orderVo.put("refundNumber", num);
         BasicDBObject orderVov = new BasicDBObject("$set", mongoConverter.convertToMongoType(orderVo));
-        UpdateResult orderUpdateResult = mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
+        UpdateResult orderUpdateResult = mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
                 Query.query(Criteria.where("orderTicketsId").is(orderTicketsId)).getQueryObject(),
                 orderVov
         );