exit

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

@@ -30,7 +30,7 @@ public class SmileAgentController {
     @PostMapping("/list")
     @ApiOperation("根据PerId获取票提")
     @ResponseBody
-    public AjaxResult getAgent(@RequestParam(name = "performancesId", required = true)String performancesId){
+    public AjaxResult getAgent(@RequestParam(name = "performancesId")String performancesId){
         return smileAgentService.getAgent(performancesId);
     }
 

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

@@ -33,8 +33,7 @@ public class SmileOrganizationController {
     @ApiOperation("获取组织列表")
     @ResponseBody
     public TableDataInfo organizationList(SmileOrganizationParam smileOrganizationParam){
-        TableDataInfo organizationList = smileOrganizationService.organizationList(smileOrganizationParam);
-        return organizationList;
+        return smileOrganizationService.organizationList(smileOrganizationParam);
     }
 
     @PostMapping("/create")
@@ -55,7 +54,7 @@ public class SmileOrganizationController {
     @PostMapping("/getOrgById")
     @ApiOperation("根据组织id获取信息")
     @ResponseBody
-    public AjaxResult getOrgById(@RequestParam(name = "id", required = true)Long id){
+    public AjaxResult getOrgById(@RequestParam(name = "id")Long id){
         SmileOrgAndUserVo orgById = smileOrganizationService.getOrgById(id);
         return AjaxResult.success(orgById);
     }

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

@@ -44,7 +44,7 @@ public class SmileSchoolController {
     @GetMapping("/getSchoolById")
     @ApiOperation("根据id获取学校")
     @ResponseBody
-    public AjaxResult getSchoolById(@RequestParam(name = "id", required = true)Long id){
+    public AjaxResult getSchoolById(@RequestParam(name = "id")Long id){
         return AjaxResult.success(iSmileSchoolService.getSchoolById(id));
     }
 
@@ -65,7 +65,7 @@ public class SmileSchoolController {
     @PostMapping("/del")
     @ApiOperation("根据id删除学校")
     @ResponseBody
-    public AjaxResult del(@RequestParam(name = "id", required = true)Long id){
+    public AjaxResult del(@RequestParam(name = "id")Long id){
         return iSmileSchoolService.del(id);
     }
 }

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

@@ -17,6 +17,7 @@ import org.springframework.util.ResourceUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 /**
@@ -94,17 +95,19 @@ public class SmileUserController extends BaseController {
             String path = JSONUtils.class.getClassLoader().getResource("static/area.json").getPath();
             File jsonFile = ResourceUtils.getFile(path);
             logger.info("path:{}",path);
-//            File jsonFile = ResourceUtils.getFile("classpath:static/area.json");
             InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("static/area.json");
-            Reader reader = new InputStreamReader(inputStream, "utf-8");
+            if (inputStream == null){
+                Reader reader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
                 int ch = 0;
-            StringBuffer sb = new StringBuffer();
+                StringBuilder sb = new StringBuilder();
                 while ((ch = reader.read()) != -1) {
                     sb.append((char) ch);
                 }
                 reader.close();
                 jsonStr = sb.toString();
                 return AjaxResult.success(jsonStr);
+            }
+            return null;
         } catch (Exception ex) {
             ex.printStackTrace();
             return null;

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

@@ -17,9 +17,17 @@ import java.util.List;
  */
 public interface ISmileAgentService extends IService<SmileAgent> {
 
-    SmileAgent listAgentByShowIdAndTicketId(String showId,String ticketId);
-
+    /**
+     * 创建票提
+     * @param smileAgents ：List<SmileAgent>  list票提信息
+     * @return ： AjaxResult
+     */
     AjaxResult create(List<SmileAgent> smileAgents);
 
+    /**
+     * 根据PerId获取票提
+     * @param performancesId ： 演出id
+     * @return ：AjaxResult
+     */
     AjaxResult getAgent(String performancesId);
 }

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

@@ -2,7 +2,6 @@ package com.liquidnet.client.admin.zhengzai.smile.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.github.pagehelper.PageInfo;
 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.SmileOrgAndUserVo;
@@ -20,11 +19,31 @@ import com.liquidnet.service.smile.entity.SmileOrganization;
  */
 public interface ISmileOrganizationService extends IService<SmileOrganization> {
 
+    /**
+     * 组织列表
+     * @param smileOrganizationParam ：
+     * @return　：TableDataInfo
+     */
     TableDataInfo organizationList(SmileOrganizationParam smileOrganizationParam);
 
+    /**
+     *  新增组织
+     * @param smileOrganizationVo ：
+     * @return ：
+     */
     AjaxResult create(SmileOrganizationVo smileOrganizationVo);
 
+    /**
+     *  修改组织
+     * @param smileOrganization ：
+     * @return ：
+     */
     AjaxResult update(SmileOrganization smileOrganization);
 
+    /**
+     * 根据组织id获取信息
+     * @param id：组织id
+     * @return ：
+     */
     SmileOrgAndUserVo getOrgById(Long id);
 }

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

@@ -19,15 +19,45 @@ import com.liquidnet.service.smile.entity.SmileSchool;
  */
 public interface ISmileShowService extends IService<SmileSchool> {
 
+    /**
+     * 演出列表
+     * @param smileShowParam: 查询条件
+     * @return ：TableDataInfo
+     */
     TableDataInfo listShow(SmileShowParam smileShowParam);
 
+    /**
+     * 演出排序
+     * @param showSort ： 演出id和序号
+     * @return ：AjaxResult
+     */
     AjaxResult sort(ShowSort showSort);
 
+    /**
+     * 个人打款打款
+     * @param smilePriceParam：参数 演出id，uid，打款标识
+     * @return ：
+     */
     AjaxResult price(SmilePriceParam smilePriceParam);
 
+    /**
+     * 根据演出id查询演出详情
+     * @param performancesId ：演出id
+     * @return ：AjaxResult
+     */
     AjaxResult getShowById(String performancesId);
 
+    /**
+     * 销售数据
+     * @param performancesId： 演出id
+     * @return ：AjaxResult
+     */
     AjaxResult saleData(String performancesId);
 
+    /**
+     * 演出标识打款
+     * @param smilePriceParam ： SmilePriceParam
+     * @return ： AjaxResult
+     */
     AjaxResult allPrice(SmilePriceParam smilePriceParam);
 }

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

 package com.liquidnet.client.admin.zhengzai.smile.service.impl;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.utils.StringUtils;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileAgentService;
 import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
 import com.liquidnet.service.goblin.dto.vo.SmileAgentVo;
-import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
-import com.liquidnet.service.kylin.mapper.KylinTicketsMapper;
 import com.liquidnet.service.smile.entity.SmileAgent;
 import com.liquidnet.service.smile.entity.dao.SmileAgentDao;
 import com.liquidnet.service.smile.mapper.SmileAgentMapper;
@@ -39,25 +35,6 @@ public class SmileAgentServiceImpl extends ServiceImpl<SmileAgentMapper, SmileAg
     @Autowired
     SmileRedisUtils smileRedisUtils;
 
-    @Autowired
-    KylinTicketsMapper kylinTicketsMapper;
-
-    @Autowired
-    KylinPerformancesMapper kylinPerformancesMapper;
-
-    @Override
-    public SmileAgent listAgentByShowIdAndTicketId(String performanceId, String ticketId) {
-        if (StringUtils.isNotEmpty(performanceId) && StringUtils.isNotEmpty(ticketId)) {
-            LambdaQueryWrapper<SmileAgent> queryWrapper = Wrappers.lambdaQuery(SmileAgent.class);
-            queryWrapper.eq(SmileAgent::getPerformanceId, performanceId);
-            queryWrapper.eq(SmileAgent::getTicketId, ticketId);
-            queryWrapper.eq(SmileAgent::getDelTag,0);
-            smileAgentMapper.selectOne(queryWrapper);
-            return null;
-        }
-        return null;
-    }
-
     @Override
     public AjaxResult create(List<SmileAgent> smileAgents) {
         boolean result = true;

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

@@ -36,8 +36,6 @@ import java.util.Map;
 @Service
 public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSchool> implements ISmileSchoolService {
 
-    private Boolean redisSchoolTag = true;
-
     @Autowired
     SmileSchoolMapper smileSchoolMapper;
 

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

@@ -16,7 +16,6 @@ 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;
 import com.liquidnet.service.smile.entity.SmileAgent;
 import com.liquidnet.service.smile.entity.SmilePrice;
 import com.liquidnet.service.smile.entity.SmileSchool;
@@ -53,23 +52,17 @@ import java.util.stream.Collectors;
 @Service
 public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSchool> implements ISmileShowService {
 
-    @Autowired
-    KylinTicketStatusMapper ticketStatusMapper;
-
     @Autowired
     SmileRedisUtils smileRedisUtils;
 
     @Autowired
     MongoTemplate mongoTemplate;
 
-    @Autowired
-    IKylinPerformancesAdminService kylinPerformancesService;
-
     @Autowired
     KylinPerformancesMapper kylinPerformancesMapper;
 
     @Autowired
-    private KylinOrderTicketRelationsMapper kylinOrderTicketRelationsMapper;
+    KylinOrderTicketRelationsMapper kylinOrderTicketRelationsMapper;
 
     @Autowired
     KylinOrderTicketsMapper kylinOrderTicketsMapper;

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

@@ -10,7 +10,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.ISmileUserService;
 import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
-import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
 import com.liquidnet.service.smile.entity.SmileOrganization;
@@ -32,15 +31,11 @@ import java.util.stream.Collectors;
 
 @Slf4j
 @Service
-@SuppressWarnings("all")
 public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser> implements ISmileUserService {
 
     @Autowired
     SmileUserMapper smileUserMapper;
 
-    @Autowired
-    RedisDataSourceUtil redisDataSourceUtil;
-
     @Autowired
     SmileRedisUtils smileRedisUtils;
 
@@ -236,9 +231,13 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
     //更新redis中的用户数据
     private void updateRedisSetUser(SmileUserVO smileUserVO, String uid, Long orgId, Integer type, String agentId) {
         //组织id
-        if (StringUtils.isNotNull(orgId)) smileUserVO.setOrgId(orgId);
+        if (StringUtils.isNotNull(orgId)) {
+            smileUserVO.setOrgId(orgId);
+        }
         //代理 代理类型（0：未审核，1：总代，2：普代，3：未认证）
-        if (StringUtils.isNotNull(type)) smileUserVO.setType(type);
+        if (StringUtils.isNotNull(type)) {
+            smileUserVO.setType(type);
+        }
         //代理开启标识
         smileUserVO.setAgent(1);
         //清除审核
@@ -256,7 +255,9 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
             smileUserVO1.setState(state);
         } else {
             //状态  0：正常，1：黑名单
-            if (StringUtils.isNotNull(state)) smileUserVO.setState(state);
+            if (StringUtils.isNotNull(state)) {
+                smileUserVO.setState(state);
+            }
         }
         //存入黑白名单状态
         smileRedisUtils.setSmileUserVO(uid, smileUserVO1);
@@ -265,7 +266,9 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
     //审核失败插入原因
     private void updateRedisSetUser(SmileUserVO smileUserVO, String uid, String reason) {
         //审核失败原因
-        if (StringUtils.isNotNull(reason)) smileUserVO.setErrorReason(reason);
+        if (StringUtils.isNotNull(reason)) {
+            smileUserVO.setErrorReason(reason);
+        }
         smileUserVO.setType(4);
         SmileUserVO redisData = smileRedisUtils.getSmileUserVO(uid);
         //存入redis中