修改演出订单

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

+package com.liquidnet.service.kylin.dto.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: PerformanceOrderStatisticalVo
+ * @Package com.liquidnet.service.kylin.dto.vo
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/6/19 16:44
+ */
+@Data
+public class PerformanceOrderStatisticalVo {
+    private String performancesId;
+    private String ticketsId;
+    @ApiModelProperty(value = "票种名称")
+    private String title;
+    @ApiModelProperty(value = "单价")
+    private BigDecimal price;
+    @ApiModelProperty(value = "票种类型")
+    private Integer type;
+    @ApiModelProperty(value = "适用时间")
+    private String useStart;
+    @ApiModelProperty(value = "总库存")
+    private BigDecimal totalGeneral = BigDecimal.ZERO;
+    @ApiModelProperty(value = "销售数量")
+    private BigDecimal saleGeneral = BigDecimal.ZERO;
+    @ApiModelProperty(value = "剩余库存")
+    private BigDecimal surplusGeneral = BigDecimal.ZERO;
+    @ApiModelProperty(value = "销售额")
+    private BigDecimal totalSalePrice = BigDecimal.ZERO;
+    @ApiModelProperty(value = "兑换数量")
+    private BigDecimal totalExchange = BigDecimal.ZERO;
+    @ApiModelProperty(value = "退款数量")
+    private BigDecimal totalRefundGeneral = BigDecimal.ZERO;
+    @ApiModelProperty(value = "退款金额")
+    private BigDecimal totalRefundPrice = BigDecimal.ZERO;
+    @ApiModelProperty(value = "会员销售数量")
+    private BigDecimal totalMemberNumber = BigDecimal.ZERO;
+    @ApiModelProperty(value = "正在支付数量")
+    private BigDecimal totalPayingNumber = BigDecimal.ZERO;
+    @ApiModelProperty(value = "购买人数")
+    private BigDecimal totalBuyUsers = BigDecimal.ZERO;
+}

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

@@ -3,12 +3,12 @@ package com.liquidnet.service.kylin.service.partner;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao;
 import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
 import com.liquidnet.service.kylin.dto.param.PerformancePartnerListParam;
 import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
 import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
 import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
+import com.liquidnet.service.kylin.dto.vo.PerformanceOrderStatisticalVo;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 
 import java.util.List;
@@ -129,5 +129,5 @@ public interface IKylinPerformancesPartnerService extends IService<KylinPerforma
      */
     ResponseDto<String> withdraw(String performancesId);
 
-    List<PerformanceOrderStatisticalDao> getPerformanceOrderStatisticalList(String performancesId);
+    List<PerformanceOrderStatisticalVo> getPerformanceOrderStatisticalList(String performancesId);
 }

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

@@ -2,12 +2,12 @@ package com.liquidnet.service.kylin.controller.partner;
 
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao;
 import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
-import com.liquidnet.service.kylin.dto.param.*;
-import com.liquidnet.service.kylin.dto.vo.middle.message.MessageConfigVo;
-import com.liquidnet.service.kylin.dto.vo.middle.message.MessageDataVo;
-import com.liquidnet.service.kylin.service.impl.partner.KylinPerformancesPartnerServiceImpl;
+import com.liquidnet.service.kylin.dto.param.PerformancePartnerListParam;
+import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
+import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
+import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
+import com.liquidnet.service.kylin.dto.vo.PerformanceOrderStatisticalVo;
 import com.liquidnet.service.kylin.service.partner.IKylinPerformancesPartnerService;
 import com.liquidnet.service.kylin.utils.OtherUtils;
 import io.swagger.annotations.Api;
@@ -118,8 +118,8 @@ public class PerformancePartnerController {
     @GetMapping(value = "orderStatistical")
     @ApiOperation(value = "演出订单统计",position = 9)
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<List<PerformanceOrderStatisticalDao>> performanceOrderStatisticalList(@RequestParam("performancesId") @NotNull String performancesId) {
-        List<PerformanceOrderStatisticalDao> list =performancesPartnerService.getPerformanceOrderStatisticalList(performancesId);
+    public ResponseDto<List<PerformanceOrderStatisticalVo>> performanceOrderStatisticalList(@RequestParam("performancesId") @NotNull String performancesId) {
+        List<PerformanceOrderStatisticalVo> list =performancesPartnerService.getPerformanceOrderStatisticalList(performancesId);
         return ResponseDto.success(list);
     }
 }

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

@@ -13,20 +13,17 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao;
 import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
-import com.liquidnet.service.kylin.dto.param.*;
-import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
-import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
-import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
-import com.liquidnet.service.kylin.dto.vo.ignore.KylinPerformanceIgnoreVo;
-import com.liquidnet.service.kylin.dto.vo.ignore.KylinTicketIgnoreVo;
-import com.liquidnet.service.kylin.dto.vo.ignore.KylinTicketTimesIgnoreVo;
+import com.liquidnet.service.kylin.dto.param.PerformancePartnerListParam;
+import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
+import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
+import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
+import com.liquidnet.service.kylin.dto.vo.PerformanceOrderStatisticalVo;
 import com.liquidnet.service.kylin.dto.vo.partner.*;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.partner.IKylinPerformancesPartnerService;
 import com.liquidnet.service.kylin.timerTask.PerformanceVoTask;
 import com.liquidnet.service.kylin.utils.DataUtils;
-import com.liquidnet.service.kylin.utils.MongoVoUtils;
 import com.mongodb.BasicDBObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -40,7 +37,6 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -634,12 +630,17 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
     }
 
     @Override
-    public List<PerformanceOrderStatisticalDao> getPerformanceOrderStatisticalList(String performancesId) {
+    public List<PerformanceOrderStatisticalVo> getPerformanceOrderStatisticalList(String performancesId) {
         PerformanceOrderStatisticalDao countBean = new PerformanceOrderStatisticalDao();
         countBean.setTitle("总计：");
 
+        List<PerformanceOrderStatisticalVo> voList = new ArrayList<>();
         List<PerformanceOrderStatisticalDao> dtoList = performancesMapper.getPerformanceOrderStatisticalList(performancesId);
         dtoList.forEach(dto -> {
+            PerformanceOrderStatisticalVo vo = new PerformanceOrderStatisticalVo();
+            BeanUtil.copy(dto,vo);
+            voList.add(vo);
+
             countBean.setTotalGeneral(countBean.getTotalGeneral().add(dto.getTotalGeneral()));
             countBean.setSaleGeneral(countBean.getSaleGeneral().add(dto.getSaleGeneral()));
             countBean.setSurplusGeneral(countBean.getSurplusGeneral().add(dto.getSurplusGeneral()));
@@ -651,7 +652,9 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             countBean.setTotalPayingNumber(countBean.getTotalPayingNumber().add(dto.getTotalPayingNumber()));
             countBean.setTotalBuyUsers(dto.getTotalBuyUsers());
         });
-        dtoList.add(countBean);
-        return dtoList;
+        PerformanceOrderStatisticalVo vo = new PerformanceOrderStatisticalVo();
+        BeanUtil.copy(countBean,vo);
+        voList.add(vo);
+        return voList;
     }
 }