exit

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

@@ -60,13 +60,6 @@ public class SmileShowBaseController extends BaseController {
             response.setCharacterEncoding(StandardCharsets.UTF_8.name());
             servletOutputStream = response.getOutputStream();
             //数据查询
-/*
-            SaleDataVo saleDataVo = smileShowService.saleData(performancesId);
-            List<UserDataExcel> rowsToExcels = new ArrayList<>();
-            saleDataVo.getUserDataList().forEach(userData -> rowsToExcels.add(UserDataExcel.getNew().copy(userData)));
-            EasyExcel.write(servletOutputStream,UserDataExcel.class).sheet(saleDataVo.getTitle() + "演出销售列表导出").doWrite(rowsToExcels);
-
-*/
             smileShowService.exportData(servletOutputStream,perId);
 
         } catch (IOException e) {

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

 package com.liquidnet.client.admin.web.controller.zhengzai.smile;
 
-
-import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
-import com.liquidnet.client.admin.zhengzai.smile.dto.SaleDataVo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.ShowSort;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmilePriceParam;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileShowParam;
@@ -12,8 +9,6 @@ import com.liquidnet.client.admin.zhengzai.smile.service.ISmileShowService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
 /**

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

@@ -11,7 +11,6 @@ import com.liquidnet.client.admin.zhengzai.smile.dto.SmileShowParam;
 import com.liquidnet.service.smile.entity.SmileSchool;
 
 import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
 
 /**
  * <p>

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

@@ -11,12 +11,10 @@ import com.liquidnet.service.smile.entity.SmileAgent;
 import com.liquidnet.service.smile.entity.dao.SmileAgentDao;
 import com.liquidnet.service.smile.mapper.SmileAgentMapper;
 import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.annotation.Before;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.List;

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

@@ -21,10 +21,8 @@ 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.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

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

@@ -3,7 +3,6 @@ package com.liquidnet.client.admin.zhengzai.smile.service.impl;
 
 import com.alibaba.excel.EasyExcelFactory;
 import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.support.ExcelTypeEnum;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.WriteTable;
 import com.alibaba.fastjson.JSON;
@@ -19,7 +18,6 @@ import com.liquidnet.client.admin.common.utils.StringUtils;
 import com.liquidnet.client.admin.zhengzai.smile.dto.*;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileShowService;
 import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
-import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.galaxy.utils.ObjectUtil;
 import com.liquidnet.service.goblin.constant.SmileRedisConst;
 import com.liquidnet.service.kylin.dao.TicketAndStatusDao;
@@ -45,7 +43,6 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.ServletOutputStream;
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -581,8 +578,6 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
         String saleData = "销售数据";
         headTitles.add(Lists.newArrayList(basicInfo, basicInfo, "uid"));
         headTitles.add(Lists.newArrayList(basicInfo, basicInfo, "姓名"));
-       /* headTitles.add(Lists.newArrayList(basicInfo, basicInfo, "性别"));
-        headTitles.add(Lists.newArrayList(basicInfo, basicInfo, "手机号"));*/
         headTitles.add(Lists.newArrayList(basicInfo, basicInfo, "所属地区"));
         headTitles.add(Lists.newArrayList(basicInfo, basicInfo, "身份"));
 
@@ -618,7 +613,6 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
             } else {
                 arrayList.add("未知");
             }
-
             //便利票数据
             List<UserDataAgentVo> dataAgentVos = userData.getDataAgentVos();
             Map<String, UserDataAgentVo> agentVoMap = dataAgentVos.stream().collect(Collectors.toMap(UserDataAgentVo::getTicketsId, Function.identity()));
@@ -633,19 +627,10 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                     arrayList.add(0);
                 }
             }
-
-           /* for (UserDataAgentVo userDataAgentVo : dataAgentVos) {
-                num = num.add(new BigDecimal(userDataAgentVo.getNumber().toString()));
-                price = price.add(userDataAgentVo.getPrice().multiply(userDataAgentVo.getNumber()));
-                commission = commission.add(userDataAgentVo.getCommission());
-                arrayList.add(userDataAgentVo.getNumber());
-            }*/
-
             arrayList.add(num);
             arrayList.add(price);
             arrayList.add(userData.getTotalCommission());
             arrayList.add(userData.getPriceStatus() != null && userData.getPriceStatus() == 0 ? "已打款" : "待打款");
-
             contentList.add(arrayList);
         });
         return contentList;

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

@@ -95,12 +95,12 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
         queryWrapper.eq(SmileUser::getUid, uid);
         SmileUser smileUser = smileUserMapper.selectOne(queryWrapper);
         //判断是否为特邀代理
-        SmileUserVo smileUserVo = null;
+        SmileUserVo smileUserVo;
         if (smileUser.getType() == 5) {
             smileUserVo = new SmileUserVo().copyInvited(smileUser);
             LambdaQueryWrapper<SmileAgent> agentLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            agentLambdaQueryWrapper.eq(SmileAgent::getTicketId,smileUserVo.getUid());
-            agentLambdaQueryWrapper.eq(SmileAgent::getDelTag,0);
+            agentLambdaQueryWrapper.eq(SmileAgent::getTicketId, smileUserVo.getUid());
+            agentLambdaQueryWrapper.eq(SmileAgent::getDelTag, 0);
             SmileAgent smileAgent = smileAgentMapper.selectOne(agentLambdaQueryWrapper);
             smileUserVo.setTicket(smileAgent.getTotalCarry().multiply(new BigDecimal("100")));
             //获取演出名
@@ -108,8 +108,8 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
                     .eq(KylinPerformances::getPerformancesId, smileAgent.getPerformanceId())
                     .select(KylinPerformances::getTitle));
             smileUserVo.setTitle(kylinPerformances.getTitle());
-        }else {
-            smileUserVo =  new SmileUserVo().copy(smileUser);
+        } else {
+            smileUserVo = new SmileUserVo().copy(smileUser);
         }
         return smileUserVo;
     }