exit

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/ShowVo.java

@@ -3,7 +3,7 @@ package com.liquidnet.client.admin.zhengzai.smile.dto;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.time.LocalDateTime;
 
 /**
  * @author TT
@@ -29,7 +29,7 @@ public class ShowVo {
     /**
      * 总销售数量  -张   saleGeneral
      */
-    private BigInteger open;
+    private Integer open;
 
     /**
      * 总销售金额  totalSalePrice
@@ -39,12 +39,12 @@ public class ShowVo {
     /**
      * 总销售代理
      */
-    private String totalOutAgent;
+    private Integer totalOutAgent;
 
     /**
      * 演出结束时间
      */
-    private String timeEnd;
+    private LocalDateTime timeEnd;
 
     /**
      * 演出结束时间

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java

@@ -11,8 +11,6 @@ import com.liquidnet.client.admin.zhengzai.smile.dto.SmileShowParam;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileShowService;
 import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
 import com.liquidnet.service.goblin.constant.SmileRedisConst;
-import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao;
-import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.entity.KylinOrderTickets;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 import com.liquidnet.service.kylin.mapper.KylinOrderTicketRelationsMapper;
@@ -25,10 +23,9 @@ import com.liquidnet.service.smile.mapper.SmileSchoolMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
-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.util.List;
 import java.util.stream.Collectors;
 
@@ -71,74 +68,37 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
     @Override
     public List<ShowVo> listShow(SmileShowParam smileShowParam) {
         PageInfo<KylinPerformances> pageInfo;
-
+        //查询所有代理的演出id
         List<KylinPerformances>  kylinPerformancesList = kylinPerformancesMapper.selectPerIdByAgent();
 
         List<ShowVo> collect = kylinPerformancesList.stream().map(kylinPerformances -> {
             ShowVo vo = new ShowVo();
+            //演出id
             vo.setPerformancesId(kylinPerformances.getPerformancesId());
+            //演出名称
             vo.setTitle(kylinPerformances.getTitle());
-            //根据演出id查询订单  查询订单
+            //城市
+            vo.setCityName(kylinPerformances.getCityName());
+            //根据演出id  查询所有订单
             List<KylinOrderTickets> kylinOrderTicketsList = kylinOrderTicketsMapper.selectListByPerformanceId(kylinPerformances.getPerformancesId());
 
-            //根据演出id查询查询销售数量
-            vo.setOpen(kylinOrderTicketRelationsMapper.concatByAgent(kylinPerformances.getPerformancesId()));
+            Integer open = 0;
+            BigDecimal totalAmount = BigDecimal.valueOf(0);
+            for (KylinOrderTickets kylinOrderTickets:kylinOrderTicketsList){
+                //演出张数
+                 open+=(kylinOrderTickets.getNumber() - kylinOrderTickets.getRefundNumber());
                 //总销售金额
-
-            //订单
-
+                totalAmount = totalAmount.add(kylinOrderTickets.getPriceActual()).subtract(kylinOrderTickets.getPriceRefund());
+            }
             //根据演出id查询销售代理
-            vo.setOpen(kylinOrderTicketRelationsMapper.concatByAgentDed(kylinPerformances.getPerformancesId()));
+            vo.setTotalOutAgent(kylinOrderTicketRelationsMapper.concatByAgentDed(kylinPerformances.getPerformancesId()));
+            //演出结束时间
+            vo.setTimeEnd(kylinPerformances.getTimeEnd());
 
             return vo;
         }).collect(Collectors.toList());
 
 
-        //获取演出排列顺序  演出排序ID
-        List<Object> list = smileRedisUtils.lGet(SmileRedisConst.SMILE_SHOW, 0, -1);
-
-
-
-
-
-
-        //从redis 中查出开启代理的演出
-        List<Object> performancesIds = smileRedisUtils.lGet(SmileRedisConst.SMILE_SHOW.concat(":performancesId"), 0, -1);
-        //根据演出ID获取演出信息
-        performancesIds.stream().map(performancesId -> {
-
-            String id = performancesId.toString();
-            //根据performancesId查询演出详情
-            KylinPerformanceVo kylinPerformanceVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(id)), KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
-            //查询销售统计
-            List<PerformanceOrderStatisticalDao> result = kylinPerformancesService.getPerformanceOrderStatisticalList(id);
-
-
-            //返回演出列表
-            ShowVo showVo = new ShowVo();
-            assert kylinPerformanceVo != null;
-            showVo.setPerformancesId(id);
-            showVo.setTitle(kylinPerformanceVo.getTitle());
-            showVo.setTimeEnd(kylinPerformanceVo.getTimeEnd());
-            showVo.setCityName(kylinPerformanceVo.getCityName());
-            //演出顺序
-
-
-
-            showVo.setOrderNum(null);
-            //获取打款状态
-
-            if (result.size() >= 2) {
-                PerformanceOrderStatisticalDao resdao = result.get(result.size() - 1);
-                showVo.setTotalAmount(resdao.getTotalSalePrice());
-
-            }
-
-
-            return showVo;
-        }).collect(Collectors.toList());
-
-
         return null;
     }
 

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinOrderTicketRelationsMapper.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.liquidnet.service.kylin.entity.KylinOrderTicketRelations;
 import org.apache.ibatis.annotations.Param;
 
-import java.math.BigInteger;
-
 /**
  * <p>
  * 订单关系 Mapper 接口
@@ -16,7 +14,7 @@ import java.math.BigInteger;
  */
 public interface KylinOrderTicketRelationsMapper extends BaseMapper<KylinOrderTicketRelations> {
 
-    BigInteger concatByAgent(@Param("performancesId") String performancesId);
+    Integer concatByAgent(@Param("performancesId") String performancesId);
 
-    BigInteger concatByAgentDed(@Param("performancesId") String performancesId);
+    Integer concatByAgentDed(@Param("performancesId") String performancesId);
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml

@@ -456,8 +456,8 @@
             kot.user_id,
             kot.performance_title,
             kot.number,
-            kot.price,
             kot.refund_number,
+            kot.price_actual,
             kot.price_refund
         FROM
             kylin_order_tickets AS kot