删除巡演mongo

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

-package com.liquidnet.service.kylin.dto.vo.mongo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@ApiModel
-@Data
-public class KylinRoadShowVo {
-
-    @ApiModelProperty(value = "巡演主键", example = "测试场地")
-    private String roadShowsId;
-    @ApiModelProperty(value = "状态 0停用 1启用", example = "1")
-    private String status;
-    @ApiModelProperty(value = "创建时间", example = "" , hidden = true)
-    private LocalDateTime createdAt;
-    @ApiModelProperty(value = "更新时间", example = "" , hidden = true)
-    private LocalDateTime updatedAt;
-
-}

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

@@ -7,7 +7,6 @@ import com.github.pagehelper.PageInfo;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.kylin.dao.RoadShowAdminListDao;
 import com.liquidnet.service.kylin.dto.param.CreateRoadShowParam;
-import com.liquidnet.service.kylin.dto.vo.mongo.KylinRoadShowVo;
 import com.liquidnet.service.kylin.dto.vo.admin.KylinRoadShowAdminVo;
 import com.liquidnet.service.kylin.entity.KylinRoadShows;
 import com.liquidnet.service.kylin.mapper.KylinRoadShowsMapper;
@@ -55,9 +54,6 @@ public class KylinRoadShowsAdminServiceImpl extends ServiceImpl<KylinRoadShowsMa
             KylinRoadShows roadShows = new KylinRoadShows();
             BeanUtils.copyProperties(createRoadShowParam, roadShows);
             kylinRoadShowsMapper.insert(roadShows);
-            KylinRoadShowVo kylinRoadShowVo = new KylinRoadShowVo();
-            BeanUtils.copyProperties(createRoadShowParam, kylinRoadShowVo);
-            mongoTemplate.insert(roadShows, KylinRoadShowVo.class.getSimpleName());
             return roadShowId;
         } catch (Exception e) {
             return "";
@@ -72,8 +68,6 @@ public class KylinRoadShowsAdminServiceImpl extends ServiceImpl<KylinRoadShowsMa
             createRoadShowParam.setStatus(null);
             BeanUtils.copyProperties(createRoadShowParam, roadShows);
             kylinRoadShowsMapper.update(roadShows, new UpdateWrapper<KylinRoadShows>().eq("road_shows_id", createRoadShowParam.getRoadShowsId()));
-            KylinRoadShowVo kylinRoadShowVo = new KylinRoadShowVo();
-            BeanUtils.copyProperties(createRoadShowParam, kylinRoadShowVo);
 
             BasicDBObject objectRoadShowVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(roadShows));
             mongoTemplate.getCollection(KylinRoadShows.class.getSimpleName()).updateOne(

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

@@ -449,24 +449,24 @@ public class DataUtils {
      * @return
      */
     public BigDecimal getCanRefundOrderEntitiesPrice(KylinOrderTicketVo orderTicketVo, List<KylinOrderRefundsVo> kylinOrderRefundsVoBaseList, String orderTicketEntitiesId) {
-        log.info("orderTicketEntitiesId = "+orderTicketEntitiesId);
+        log.info("orderTicketEntitiesId = " + orderTicketEntitiesId);
         //单票实付价格
         BigDecimal singlePrice = orderTicketVo.getPriceActual().subtract(orderTicketVo.getPriceExpress()).divide(BigDecimal.valueOf(orderTicketVo.getNumber()));
-        log.info("singlePrice = "+singlePrice);
+        log.info("singlePrice = " + singlePrice);
         //单票剩余未退款金额
         BigDecimal canRefundSinglePrice = new BigDecimal("0.00");
         for (KylinOrderTicketEntitiesVo item : orderTicketVo.getEntitiesVoList()) {
             if (item.getOrderTicketEntitiesId().equals(orderTicketEntitiesId)) {
-                log.info("item = "+item);
+                log.info("item = " + item);
                 canRefundSinglePrice = singlePrice.subtract(item.getRefundPrice() == null ? BigDecimal.valueOf(0.00) : item.getRefundPrice());
             }
         }
-        log.info("canRefundSinglePrice = "+canRefundSinglePrice);
+        log.info("canRefundSinglePrice = " + canRefundSinglePrice);
         //订单锁定金额
         BigDecimal orderLockPrice = new BigDecimal("0.00");
         for (KylinOrderRefundsVo refundVo : kylinOrderRefundsVoBaseList) {
             int status = refundVo.getStatus();
-            if (status == 0 || status == 3 ||  status == 7) { //退款流程未完成 金额锁定
+            if (status == 0 || status == 1 || status == 3 || status == 6 || status == 7 || status == 8) { //退款流程未完成 金额锁定
                 List<KylinOrderRefundEntitiesVo> refundEntitiesVos = refundVo.getOrderRefundEntitiesVoList();
                 for (KylinOrderRefundEntitiesVo refundEntitiesVo : refundEntitiesVos) {
                     if (refundEntitiesVo.getOrderTicketEntitiesId().equals(orderTicketEntitiesId)) {
@@ -475,7 +475,7 @@ public class DataUtils {
                 }
             }
         }
-        log.info("orderLockPrice = "+orderLockPrice);
+        log.info("orderLockPrice = " + orderLockPrice);
         //订单可退金额
         BigDecimal refundSinglePrice = canRefundSinglePrice.subtract(orderLockPrice);
         //是否包含快递费