演出列表详情

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

@@ -60,6 +60,12 @@ public class ShowVo {
     @ApiModelProperty(value ="演出开始时间")
     private LocalDateTime timeStart;
 
+    @ApiModelProperty(value = "演出状态")
+    private Integer showStatus;
+
+    @ApiModelProperty(value = "演出状态")
+    private String statusName;
+
     /**
      * 打款状态
      */
@@ -71,4 +77,37 @@ public class ShowVo {
      */
     @ApiModelProperty(value ="演出排列顺序")
     private String comment;
+
+    public void setShowStatus(Integer status){
+        this.showStatus=status;
+        switch (status){
+            case 1:
+                this.statusName="审核中";
+                break;
+            case 3:
+                this.statusName="审核通过";
+                break;
+            case 4:
+                this.statusName="审核拒绝";
+                break;
+            case 6:
+                this.statusName="售卖中";
+                break;
+            case 7:
+                this.statusName="已下架";
+                break;
+            case 8:
+                this.statusName="售罄";
+                break;
+            case 9:
+                this.statusName="未开始";
+                break;
+            case 10:
+                this.statusName="已结束";
+                break;
+            default:
+                this.statusName="其他";
+                break;
+        }
+    }
 }

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
-import com.liquidnet.client.admin.common.utils.StringUtils;
 import com.liquidnet.client.admin.common.utils.bean.BeanUtils;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrgAndUserVo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrganizationParam;
@@ -87,18 +86,15 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
 
     @Override
     public AjaxResult update(SmileOrganization smileOrganization) {
-        if (StringUtils.isNotEmpty(smileOrganization.getAgentId())){
-            smileOrganization.setUpdatedDate(LocalDateTime.now());
-            smileOrganizationMapper.updateById(smileOrganization);
-            return AjaxResult.success();
-        }
-       return AjaxResult.warn("总代理不能为空");
+        smileOrganization.setUpdatedDate(LocalDateTime.now());
+        smileOrganizationMapper.updateById(smileOrganization);
+        return AjaxResult.success();
     }
 
     @Override
     public SmileOrgAndUserVo getOrgById(Long id) {
         SmileOrgAndUserVo smileOrgAndUserVo = new SmileOrgAndUserVo();
-        //查询代理信息
+        //根据组id查询代理信息
         LambdaQueryWrapper<SmileOrganization> orgQueryWrapper = Wrappers.lambdaQuery(SmileOrganization.class);
         orgQueryWrapper.eq(SmileOrganization::getId, id);
         orgQueryWrapper.eq(SmileOrganization::getDelTag, 0);

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

@@ -15,6 +15,7 @@ import com.liquidnet.service.goblin.dto.vo.SellDataVO;
 import com.liquidnet.service.kylin.dao.KylinOrderTicketAndAgentVo;
 import com.liquidnet.service.kylin.dao.TicketAndStatusDao;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import com.liquidnet.service.kylin.entity.KylinPerformanceStatus;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
@@ -87,6 +88,9 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
     @Autowired
     SmilePriceMapper smilePriceMapper;
 
+    @Autowired
+    KylinPerformanceStatusMapper kylinPerformanceStatusMapper;
+
     @Override
     public PageInfo<ShowVo> listShow(SmileShowParam smileShowParam) {
         PageInfo<ShowVo> pageInfo;
@@ -129,6 +133,11 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
             //演出开始时间
             vo.setTimeStart(kylinPerformances.getTimeStart());
 
+            //演出状态
+            LambdaQueryWrapper<KylinPerformanceStatus> queryWrapper = Wrappers.lambdaQuery(KylinPerformanceStatus.class);
+            queryWrapper.eq(KylinPerformanceStatus::getPerformanceId,kylinPerformances.getPerformancesId());
+            vo.setShowStatus(kylinPerformanceStatusMapper.selectOne(queryWrapper).getStatus());
+
             //打款状态
             vo.setStatus((String) smileRedisUtils.get(SmileRedisConst.SMILE_SHOW.concat(kylinPerformances.getPerformancesId())));
 
@@ -197,49 +206,50 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
             //代理票的id
             List<String> ticketsIdList = smileAgents.stream().map(SmileAgent::getTicketId).collect(Collectors.toList());
 
-            //根据票提IDs查询票信息
-            List<TicketAndStatusDao> ticketAndStatusDaoList = kylinTicketsMapper.selectTicketsByIds(ticketsIdList);
-
-            for (TicketAndStatusDao ticketAndStatusDao : ticketAndStatusDaoList) {
-                SmileAgent smileAgent = map.get(ticketAndStatusDao.getTicketsId());
-
-                ShowAgentVo showAgentVo = getShowAgentVo(performancesId, ticketAndStatusDao, smileAgent);
-
-                ShowTicketVo showTicketVo = new ShowTicketVo();
-                showTicketVo.setTitle(ticketAndStatusDao.getTitle());
-                //单价
-                showTicketVo.setPrice(ticketAndStatusDao.getPrice());
-                showTicketVo.setType(ticketAndStatusDao.getType());
-                showTicketVo.setUseEnd(ticketAndStatusDao.getUseEnd());
-                showTicketVo.setUseStart(ticketAndStatusDao.getUseStart());
-                showTicketVo.setTotalGeneral(ticketAndStatusDao.getTotalGeneral());
-
-                //根据演出id查询处所有订单
-                List<KylinOrderTicketAndAgentVo> kylinOrderTicketsList = kylinOrderTicketsMapper.selectListByPerformanceId(performancesId);
-                //代理销售数量
-                int agentSaleNum = 0;
-                //总销售金额
-                BigDecimal totalPrice = BigDecimal.valueOf(0);
-                //总代票提
-                for (KylinOrderTicketAndAgentVo kylinOrderTicketAndAgentVo : kylinOrderTicketsList) {
-                    int num = kylinOrderTicketAndAgentVo.getNumber() - kylinOrderTicketAndAgentVo.getRefundNumber();
-                    if (num > 0) {
-                        agentSaleNum += num;
-                        //单价*(总代票提+抽成票提）*数量
-                        totalPrice = totalPrice.add(
-                                (ticketAndStatusDao.getPrice().multiply(kylinOrderTicketAndAgentVo.getAgentDistributions().add(kylinOrderTicketAndAgentVo.getAgentDistributionsMaster())))
-                                        .multiply(BigDecimal.valueOf(num)));
+            if (ticketsIdList.size()>0){
+                //根据票提IDs查询票信息
+                List<TicketAndStatusDao> ticketAndStatusDaoList = kylinTicketsMapper.selectTicketsByIds(ticketsIdList);
+
+                for (TicketAndStatusDao ticketAndStatusDao : ticketAndStatusDaoList) {
+                    SmileAgent smileAgent = map.get(ticketAndStatusDao.getTicketsId());
+
+                    ShowAgentVo showAgentVo = getShowAgentVo(performancesId, ticketAndStatusDao, smileAgent);
+
+                    ShowTicketVo showTicketVo = new ShowTicketVo();
+                    showTicketVo.setTitle(ticketAndStatusDao.getTitle());
+                    //单价
+                    showTicketVo.setPrice(ticketAndStatusDao.getPrice());
+                    showTicketVo.setType(ticketAndStatusDao.getType());
+                    showTicketVo.setUseEnd(ticketAndStatusDao.getUseEnd());
+                    showTicketVo.setUseStart(ticketAndStatusDao.getUseStart());
+                    showTicketVo.setTotalGeneral(ticketAndStatusDao.getTotalGeneral());
+
+                    //根据演出id查询处所有订单
+                    List<KylinOrderTicketAndAgentVo> kylinOrderTicketsList = kylinOrderTicketsMapper.selectListByPerformanceId(performancesId);
+                    //代理销售数量
+                    int agentSaleNum = 0;
+                    //总销售金额
+                    BigDecimal totalPrice = BigDecimal.valueOf(0);
+                    //总代票提
+                    for (KylinOrderTicketAndAgentVo kylinOrderTicketAndAgentVo : kylinOrderTicketsList) {
+                        int num = kylinOrderTicketAndAgentVo.getNumber() - kylinOrderTicketAndAgentVo.getRefundNumber();
+                        if (num > 0) {
+                            agentSaleNum += num;
+                            //单价*(总代票提+抽成票提）*数量
+                            totalPrice = totalPrice.add(
+                                    (ticketAndStatusDao.getPrice().multiply(kylinOrderTicketAndAgentVo.getAgentDistributions().add(kylinOrderTicketAndAgentVo.getAgentDistributionsMaster())))
+                                            .multiply(BigDecimal.valueOf(num)));
+                        }
                     }
-                }
 
-                showTicketVo.setAgentSaleNum(agentSaleNum);
-                showTicketVo.setTotalPrice(totalPrice);
+                    showTicketVo.setAgentSaleNum(agentSaleNum);
+                    showTicketVo.setTotalPrice(totalPrice);
 
-                showAgentVoList.add(showAgentVo);
-                showTicketVoList.add(showTicketVo);
+                    showAgentVoList.add(showAgentVo);
+                    showTicketVoList.add(showTicketVo);
 
+                }
             }
-
             /*ShowTicketVo showTicketVo = new ShowTicketVo();
             //代理销售总张数
             showTicketVo.setTitle("总计");

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileUserMapper.xml

@@ -26,7 +26,7 @@
     <select id="strip" resultType="Integer">
         select count(*)
         from smile_user
-        where org_id = #{orgId};
+        where org_id = #{orgId} AND del_tag = 0;
     </select>
 
     <select id="selectUserNameById" resultType="String">