exit 演出列表展示

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileAgentController.java

@@ -38,10 +38,7 @@ public class SmileAgentController {
     @ApiOperation("创建/修改 票提")
     @ResponseBody
     public AjaxResult create(@RequestBody List<SmileAgent> smileAgents){
-        if (smileAgentService.create(smileAgents)){
-            return AjaxResult.success();
-        }
-        return AjaxResult.error();
+        return smileAgentService.create(smileAgents);
     }
 
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileShowController.java

@@ -27,8 +27,7 @@ public class SmileShowController {
     @ApiOperation("演出列表")
     @ResponseBody
     public TableDataInfo schoolList(SmileShowParam smileShowParam) {
-        TableDataInfo rspData = smileShowService.listShow(smileShowParam);
-        return rspData;
+        return smileShowService.listShow(smileShowParam);
     }
 
     @GetMapping("/getShowById")

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

@@ -34,7 +34,7 @@ public class ShowVo {
      * 总销售数量  -张   saleGeneral
      */
     @ApiModelProperty(value ="总销售数量")
-    private Integer open;
+    private BigDecimal open;
 
     /**
      * 总销售金额  totalSalePrice

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

@@ -19,7 +19,7 @@ public interface ISmileAgentService extends IService<SmileAgent> {
 
     SmileAgent listAgentByShowIdAndTicketId(String showId,String ticketId);
 
-    boolean create(List<SmileAgent> smileAgents);
+    AjaxResult create(List<SmileAgent> smileAgents);
 
     AjaxResult getAgent(String performancesId);
 }

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

@@ -61,7 +61,7 @@ public class SmileAgentServiceImpl extends ServiceImpl<SmileAgentMapper, SmileAg
     }
 
     @Override
-    public boolean create(List<SmileAgent> smileAgents) {
+    public AjaxResult create(List<SmileAgent> smileAgents) {
         boolean result = true;
         if (StringUtils.isNotEmpty(smileAgents)) {
             for (SmileAgent agent : smileAgents) {
@@ -106,14 +106,14 @@ public class SmileAgentServiceImpl extends ServiceImpl<SmileAgentMapper, SmileAg
                                     smileAgent.getTicketId());
                         }*/
                     });
-                    return true;
+                    return AjaxResult.success();
                 } catch (Exception e) {
                     e.printStackTrace();
-                    return false;
+                    return AjaxResult.warn("请重试");
                 }
             }
         }
-        return false;
+        return AjaxResult.success();
     }
 
     @Override

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

@@ -110,7 +110,12 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
             //城市
             vo.setCityName(kylinPerformances.getCityName());
             //根据演出id  查询所有订单
-            List<KylinOrderTicketAndAgentVo> kylinOrderTicketsList = kylinOrderTicketsMapper.selectListByPerformanceId(kylinPerformances.getPerformancesId(), null);
+            Map map = kylinOrderTicketsMapper.selectByPerformanceId(kylinPerformances.getPerformancesId());
+            vo.setOpen((BigDecimal) map.get("open"));
+
+            vo.setTotalSalePrice((BigDecimal) map.get("price"));
+
+            /*List<KylinOrderTicketAndAgentVo> kylinOrderTicketsList = kylinOrderTicketsMapper.selectListByPerformanceId(kylinPerformances.getPerformancesId(), null);
 
             int open = 0;
             BigDecimal totalSalePrice = BigDecimal.valueOf(0);
@@ -125,8 +130,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
             }
             vo.setOpen(open);
 
-            vo.setTotalSalePrice(totalSalePrice);
-
+            vo.setTotalSalePrice(totalSalePrice);*/
             //根据演出id查询销售代理
             List<Long> ordNum = kylinOrderTicketRelationsMapper.concatByAgentDed(kylinPerformances.getPerformancesId());
             vo.setTotalOutAgent(ordNum.stream().reduce(Long::sum).orElse(0L));

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

@@ -56,5 +56,7 @@ public interface KylinOrderTicketsMapper extends BaseMapper<KylinOrderTickets> {
 
     List<KylinOrderTicketAndAgentVo> selectListByPerformanceId(@Param("performancesId") String performancesId,@Param("ticketId")String ticketId);
 
+    Map selectByPerformanceId(@Param("performancesId") String performancesId);
+
     List<String> getAgentIdListByPerId(@Param("performancesId") String performancesId);
 }

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

@@ -531,6 +531,31 @@
 
     </select>
 
+    <select id="selectByPerformanceId" resultType="java.util.Map">
+        SELECT
+            kk.performance_id,
+            sum( kot.number - kot.refund_number ) AS `open`,
+            sum( kot.price_actual - kot.price_refund ) AS price
+        FROM
+            kylin_order_tickets AS kot
+                LEFT JOIN (
+                SELECT
+                    kotr.order_id,
+                    kotr.agent_id,
+                    kotr.performance_id,
+                    kotr.agent_distributions,
+                    kotr.agent_id_master,
+                    kotr.agent_distributions_master,
+                    kotr.ticket_id
+                FROM
+                    kylin_order_ticket_relations AS kotr
+                        LEFT JOIN kylin_order_ticket_status AS kots ON kotr.order_id = kots.order_id
+            ) AS kk ON kot.order_tickets_id = kk.order_id
+        WHERE
+            kk.agent_id != 0
+	AND kk.performance_id = #{performancesId}
+    </select>
+
     <select id="getAgentIdListByPerId" resultType="String">
         SELECT agent_id
         FROM kylin_order_ticket_relations