Merge remote-tracking branch 'origin/dev' into dev

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

@@ -464,7 +464,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                     Query.query(Criteria.where("orderTicketsId").is(orderTicketsId)).getQueryObject(),
                     orderObject
             );
-            dataUtils.delOrderTicketRedis(orderTicketsId);
             orderUtils.resetOrderListVo(orderTicketVo.getUserId(), 2, orderTicketsId, null);
 
             // 入场人
@@ -510,7 +509,15 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 kylinOrderTicketEntitiesVo.setIsPayment(newIsPayment);
                 kylinOrderTicketEntitiesVo.setUpdatedAt(strTime);
                 kylinOrderTicketEntitiesVo.setChangeDate(time);
-                kylinOrderTicketEntitiesVo.setRefundPrice(null);
+//                for (KylinOrderRefundEntitiesVo item2:orderRefundsVo.getOrderRefundEntitiesVoList()){
+//                    if(item2.getOrderTicketEntitiesId().equalsIgnoreCase(item.getOrderTicketEntitiesId())){
+//                        log.info("entitiesVo.getRefundPrice() = "+entitiesVo.getRefundPrice());
+//                        log.info("item2.getRefundPrice() = "+item2.getRefundPrice());
+                        kylinOrderTicketEntitiesVo.setRefundPrice(entitiesVo.getRefundPrice());
+//                    }
+//                }
+
+                log.info("entitiesVo.getRefundPrice() = "+entitiesVo.getRefundPrice());
                 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(),
@@ -536,6 +543,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
 
             dataUtils.delOrderRefundVo(orderRefundsId);
             dataUtils.delOrderRefundVoByOrderId(orderTicketsId);
+            dataUtils.delOrderTicketRedis(orderTicketsId);
+
 
             sqls.add(SqlMapping.get("kylin_order_ticket_status.withDraw"));
             sqls.add(SqlMapping.get("kylin_order_ticket_entities.withDraw"));

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

@@ -233,9 +233,18 @@ public class KylinRefundsStatusServiceImpl {
             entitiesTable.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT2);
             entitiesTable.setUpdatedAt(time);
 
+            BigDecimal oldRefundPrice = BigDecimal.valueOf(0);
+            for (KylinOrderTicketEntitiesVo item :orderInfo.getEntitiesVoList()) {
+                if(item.getOrderTicketEntitiesId().equalsIgnoreCase(orderEntitiesId)){
+                    oldRefundPrice = item.getRefundPrice();
+                    break;
+                }
+            }
+
 
             KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = KylinOrderTicketEntitiesVo.getNew();
             kylinOrderTicketEntitiesVo.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT2);
+            kylinOrderTicketEntitiesVo.setRefundPrice(oldRefundPrice.add(BigDecimal.valueOf(refundPrice)));
             kylinOrderTicketEntitiesVo.setUpdatedAt(strTime);
             BasicDBObject entitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketEntitiesVo)));
             mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(

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

@@ -449,6 +449,7 @@ public class DataUtils {
      * @return
      */
     public BigDecimal getCanRefundOrderEntitiesPrice(KylinOrderTicketVo orderTicketVo, List<KylinOrderRefundsVo> kylinOrderRefundsVoBaseList, String orderTicketEntitiesId) {
+        log.info("orderTicketEntitiesId = "+orderTicketEntitiesId);
         //单票实付价格
         BigDecimal singlePrice = orderTicketVo.getPriceActual().subtract(orderTicketVo.getPriceExpress()).divide(BigDecimal.valueOf(orderTicketVo.getNumber()));
         log.info("singlePrice = "+singlePrice);
@@ -456,6 +457,7 @@ public class DataUtils {
         BigDecimal canRefundSinglePrice = new BigDecimal("0.00");
         for (KylinOrderTicketEntitiesVo item : orderTicketVo.getEntitiesVoList()) {
             if (item.getOrderTicketEntitiesId().equals(orderTicketEntitiesId)) {
+                log.info("item = "+item);
                 canRefundSinglePrice = singlePrice.subtract(item.getRefundPrice() == null ? BigDecimal.valueOf(0.00) : item.getRefundPrice());
             }
         }