Merge branch 'dev_0608kids' into pre

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

@@ -15,6 +15,7 @@ import com.liquidnet.client.admin.zhengzai.slime.service.ISlimeAuthorizationReco
 import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
 import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.goblin.dto.vo.SmileAgentVo;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dao.*;
 import com.liquidnet.service.kylin.dto.param.*;
@@ -598,7 +599,6 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
             ticketStatus.setIsAgent(status);
             ticketStatusMapper.update(ticketStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketId));
             performanceVoUtils.performanceVoStatus(performancesId);
-            List<KylinPerformances> kylinPerformances = kylinPerformancesMapper.selectPerIdByAgent();
             //存入票提默认 总代 普代都为0  默认0.000
             SmileAgent smileAgent = new SmileAgent();
             smileAgent.setPerformanceId(performancesId);
@@ -617,25 +617,43 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                 smileAgentMapper.update(smileAgent,queryWrapper);
                 //删除票提redis
                 smileRedisUtils.delAgent(performancesId,ticketId);
+                //查询是否还有设置过开启的票种
+                agentCarryGtZeroByPerId(performancesId);
             }
-
-            //查询所有演出id
-//            List<String> showIds = smileRedisUtils.getShowIds();
-//            showIds.add(performancesId);
-//            smileRedisUtils.setShowIds(showIds);
-
-
-           /* List<String> collect = kylinPerformances.stream().map(KylinPerformances::getPerformancesId).collect(Collectors.toList());
-            String perId = StringUtils.join(collect,",");
-            if (!"".equals(perId)){
-                smileRedisUtils.setShowIds(perId);
-            }*/
             return true;
         } catch (Exception e) {
             return false;
         }
     }
 
+    //校验该演出是否有其他票提设置  用于删除redis中演出id List
+    private void agentCarryGtZeroByPerId(String performancesId) {
+        List<SmileAgent> agents = smileAgentMapper.selectAgentCarryGtZeroByPerId(performancesId);
+        if (agents.size()>0){
+            //是否设置过票提
+            boolean tag = true;
+            for (SmileAgent agent : agents) {
+                SmileAgentVo agent1 = smileRedisUtils.getAgent(agent.getPerformanceId(), agent.getTicketId());
+                if (agent1!=null){
+                    tag = false;
+                    break;
+                }
+            }
+            if (tag) {
+                //redis中删除演出id
+                log.debug("查询没有设置过perId:{},删除演出列表id", performancesId);
+                List<String> showIds = smileRedisUtils.getShowIds();
+                showIds.remove(performancesId);
+                smileRedisUtils.setShowIds(showIds);
+            }
+        }else {
+            //删除演出ids
+            List<String> showIds = smileRedisUtils.getShowIds();
+            showIds.remove(performancesId);
+            smileRedisUtils.setShowIds(showIds);
+        }
+    }
+
     @Override
     public boolean changeTicketPayTxt(String performancesId, String ticketId, String payTxt) {
         dataUtils.setTicketPayTxt(ticketId, payTxt);

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

@@ -717,6 +717,7 @@ GROUP BY user_mobile;
                  left join kylin_ticket_relations as ktr on ktr.times_id = kttr.times_id
                  inner join kylin_ticket_status as kts on kts.ticket_id = ktr.ticket_id
         where kts.is_agent = 1
+          AND kp.performances_id IN ( SELECT sa.performance_id FROM smile_agent sa WHERE sa.del_tag = 0 GROUP BY sa.performance_id )
         group by kp.performances_id
         order by kp.comment desc, kp.time_start asc
     </select>

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/mapper/SmileAgentMapper.java

@@ -29,4 +29,6 @@ public interface SmileAgentMapper extends BaseMapper<SmileAgent> {
     Map getUserOrgByPerIdAndUidAndAgentMaster(@Param("performancesId") String performancesId,@Param("uid") String uid,@Param("ticketId") String ticketId);
 
     List<SmileAgentDao> selectAgentList(@Param("performancesId") String performancesId);
+
+    List<SmileAgent> selectAgentCarryGtZeroByPerId(@Param("performancesId")String performancesId);
 }

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

@@ -108,4 +108,13 @@
           AND sa.del_tag = 0
     </select>
 
+    <select id="selectAgentCarryGtZeroByPerId" resultType="com.liquidnet.service.smile.entity.SmileAgent">
+        SELECT id,
+               performance_id,
+               ticket_id
+        FROM smile_agent
+        WHERE performance_id = #{performancesId}
+          AND del_tag = 0
+    </select>
+
 </mapper>

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/controller/SmileUserController.java

 package com.liquidnet.service.controller;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.liquidnet.commons.lang.util.CurrentUtil;
-import com.liquidnet.commons.lang.util.IdentityUtils;
-import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.commons.lang.util.StringUtil;
-import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.service.manage.SmileFrontService;
@@ -16,7 +12,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.ObjectError;
 import org.springframework.validation.annotation.Validated;
@@ -99,6 +94,9 @@ public class SmileUserController {
             if(smileUserVORedis.getAuthStatus()==1&&null!=smileUserVORedis.getType()&&(smileUserVORedis.getType()==1||smileUserVORedis.getType()==2)){
                 return ResponseDto.success(true);
             } else{
+                if(!(smileUserVORedis.getTag().contains("1")&&smileUserVORedis.getTag().contains("2")&&smileUserVORedis.getTag().contains("3"))){
+                   return ResponseDto.failure("用户信息不全，请填写后提交认证");
+                }
                 if(null!=smileUserVORedis.getType()&&smileUserVORedis.getType()==4){
                     smileFrontService.deleteUser(userId);
                 }
@@ -132,6 +130,7 @@ public class SmileUserController {
             //说明已经验证过
             return ResponseDto.failure("用户状态不对");
         }
+        smileUserVO.setTag("1");
         smileFrontService.saveOrUpdateUser(smileUserVO,smileUserVORedis,"1");
         return  ResponseDto.success();
     }
@@ -155,6 +154,7 @@ public class SmileUserController {
                     //说明已经验证过
                     return ResponseDto.failure("用户状态不对");
                 }
+                smileUserVO.setTag("2");
                 smileFrontService.saveOrUpdateUser(smileUserVO,smileUserVORedis,"2");
             }else {
                 return  ResponseDto.failure("验证身份证失败！");
@@ -181,6 +181,7 @@ public class SmileUserController {
             //说明已经验证过
             return ResponseDto.failure("用户状态不对");
         }
+        smileUserVO.setTag("3");
         smileFrontService.saveOrUpdateUser(smileUserVO,smileUserVORedis,"3");
         return  ResponseDto.success();
     }

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/service/impl/SmileFrontServiceImpl.java

@@ -3,7 +3,6 @@ package com.liquidnet.service.service.impl;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
-import com.liquidnet.service.goblin.constant.SmileRedisConst;
 import com.liquidnet.service.goblin.dto.vo.SmileSellDataDetailVO;
 import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
 import com.liquidnet.service.goblin.service.manage.SmileFrontService;
@@ -177,7 +176,7 @@ public class SmileFrontServiceImpl implements SmileFrontService {
             redisVo.setSchoolId(smileUserVO.getSchoolId());
             redisVo.setSchoolMajor(smileUserVO.getSchoolMajor());
             redisVo.setIdentity(smileUserVO.getIdentity());
-            redisVo.setTag(smileUserVO.getTag());
+            redisVo.setTag(redisVo.getTag()+smileUserVO.getTag());
             redisVo.setUpdatedDate(LocalDateTime.now());
             redisVo.setUid(smileUserVO.getUid());
             redisVo.setDelTag(0);
@@ -191,6 +190,7 @@ public class SmileFrontServiceImpl implements SmileFrontService {
             redisVo.setUpdatedDate(LocalDateTime.now());
             redisVo.setUid(smileUserVO.getUid());
             redisVo.setDelTag(0);
+            redisVo.setTag(redisVo.getTag()+smileUserVO.getTag());
             //redisVo.setType(smileUserVO.getType());
         } else if (type.equals("3")) {
             redisVo.setIntroduce(smileUserVO.getIntroduce());
@@ -200,6 +200,7 @@ public class SmileFrontServiceImpl implements SmileFrontService {
             redisVo.setUpdatedDate(LocalDateTime.now());
             redisVo.setUid(smileUserVO.getUid());
             redisVo.setDelTag(0);
+            redisVo.setTag(redisVo.getTag()+smileUserVO.getTag());
             //redisVo.setType(smileUserVO.getType());
         }
     }