exit school and show getList

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

@@ -28,7 +28,7 @@ public class SmileShowController {
     @PostMapping("/list")
     @ApiOperation("演出列表")
     @ResponseBody
-    public TableDataInfo schoolList(@RequestBody SmileShowParam smileShowParam) {
+    public TableDataInfo schoolList(SmileShowParam smileShowParam) {
         PageInfo<ShowVo> list = smileShowService.listShow(smileShowParam);
         TableDataInfo rspData = new TableDataInfo();
         rspData.setCode(0);

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

@@ -39,7 +39,7 @@ public class ShowVo {
     /**
      * 总销售代理
      */
-    private Integer totalOutAgent;
+    private Long totalOutAgent;
 
     /**
      * 演出结束时间

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

@@ -73,6 +73,7 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
         queryWrapper.eq(SmileSchool::getName, smileSchool.getName());
         if (smileSchoolMapper.selectOne(queryWrapper) == null) {
             int id = smileSchoolMapper.insert(smileSchool);
+            smileRedisUtils.set(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(String.valueOf(smileSchool.getId())),smileSchool.getName());
             if (id > 0 && redisSchoolTag) {
                 //查询二十个学校放入redis中
                 updateSchoolRedis();
@@ -90,6 +91,7 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
         if (smileSchoolMapper.update(smileSchool, queryWrapper) > 0) {
             //更新User表  根据学校id修改用户学校名称
             smileUserMapper.updateUserSchoolBySchoolId(smileSchool.getId().toString(), smileSchool.getName());
+            smileRedisUtils.set(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(String.valueOf(smileSchool.getId())),smileSchool.getName());
             //更新redis
             updateSchoolRedis();
             return AjaxResult.success();
@@ -99,9 +101,9 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
 
     @Override
     public AjaxResult del(Long id) {
-        smileUserMapper.deleteById(id);
+        smileSchoolMapper.updateDel(id);
+        smileRedisUtils.del(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(String.valueOf(id)));
         return AjaxResult.success();
-
     }
 
 
@@ -118,9 +120,6 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
             }
         });
         smileRedisUtils.set(SmileRedisConst.SMILE_SCHOOL, smileSchoolVos);
-        if (smileSchoolVos.size() >= 20) {
-            redisSchoolTag = false;
-        }
     }
 
 

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

@@ -48,8 +48,11 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
             //查询通过审核通过的用户 type！=0、1   未删除用户
             Map<String, Object> map = BeanUtil.convertBeanToMap(smileUserParam);
             List<SmileUserVo> smileUserVos = smileUserMapper.selectUserList(map).stream().map(smileUser -> {
+                //获取学校名
                 SmileUserVo smileUserVo = new SmileUserVo();
                 BeanUtils.copyProperties(smileUser, smileUserVo);
+                smileUserVo.setSchoolName(getSchoolNameById(smileUser.getSchoolId()));
+
                 return smileUserVo;
             }).collect(Collectors.toList());
             pageInfo = new PageInfo<SmileUserVo>(smileUserVos);
@@ -60,6 +63,11 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
         return pageInfo;
     }
 
+    private String getSchoolNameById(String schoolId) {
+        //从redis获取学校名称
+        return (String) smileRedisUtils.get(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId));
+    }
+
     @Override
     public SmileUser getUserById(String uid) {
         log.debug("查询用户uid:{}", uid);

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/ShowAgentDao.java

@@ -15,7 +15,7 @@ public class ShowAgentDao {
     /**
      * 演出id
      */
-    private String performanceId;
+    private String performancesId;
 
     /**
      * 票id

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

@@ -16,5 +16,5 @@ public interface KylinOrderTicketRelationsMapper extends BaseMapper<KylinOrderTi
 
     Integer concatByAgent(@Param("performancesId") String performancesId);
 
-    Integer concatByAgentDed(@Param("performancesId") String performancesId);
+    Long concatByAgentDed(@Param("performancesId") String performancesId);
 }

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

@@ -2,11 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.liquidnet.service.kylin.mapper.KylinOrderTicketRelationsMapper">
 
-    <select id="concatByAgent" resultType="BigInteger">
+    <select id="concatByAgent" resultType="Long">
         SELECT count(*) FROM kylin_order_ticket_relations WHERE agent_id != 0 AND performance_id = #{performancesId};
     </select>
 
-    <select id="concatByAgentDed" resultType="BigInteger">
+    <select id="concatByAgentDed" resultType="Long">
         SELECT count(*) FROM kylin_order_ticket_relations WHERE agent_id != 0 AND performance_id = #{performancesId} group by agent_id;
     </select>
 

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

@@ -103,16 +103,7 @@
         </foreach>
     </select>
 
-    <resultMap id="showAgentDao" type="com.liquidnet.service.kylin.dao.ShowAgentDao">
-        <collection column="id" property="id"/>
-        <collection column="performance_id" property="performanceId"/>
-        <collection column="ticket_id" property="ticketId"/>
-        <collection column="title" property="title"/>
-        <collection column="total_carry" property="totalCarry"/>
-        <collection column="ord_carry" property="ordCarry"/>
-    </resultMap>
-
-    <select id="selectOneByPerIdAndTicketId" resultMap="showAgentDao">
+    <select id="selectOneByPerIdAndTicketId" resultType="com.liquidnet.service.kylin.dao.ShowAgentDao">
         SELECT sa.id,
                sa.performance_id,
                sa.ticket_id,

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/SmileSchool.java

@@ -66,5 +66,10 @@ public class SmileSchool implements Serializable {
      */
     private String area;
 
+    /**
+     * 删除  0 正常 1 已删除
+     */
+    private Integer delTag;
+
 
 }

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

@@ -10,7 +10,7 @@ import java.util.Map;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author liquidnet
@@ -22,4 +22,5 @@ public interface SmileSchoolMapper extends BaseMapper<SmileSchool> {
 
     List<SmileSchool> selectSchoolList(Map<String, Object> map);
 
+    void updateDel(@Param("id") Long id);
 }

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

@@ -3,17 +3,22 @@
 <mapper namespace="com.liquidnet.service.smile.mapper.SmileSchoolMapper">
 
     <select id="selectListLimit" resultType="com.liquidnet.service.smile.entity.SmileSchool">
-        select id,name from smile_school limit 20;
+        select id,name from smile_school where  `del_tag` = 0 limit 20;
     </select>
 
     <select id="selectSchoolList" parameterType="java.util.Map" resultType="com.liquidnet.service.smile.entity.SmileSchool">
         select *
         from smile_school
         <where>
+            del_tag = 0
             <if test="name!=''">
                 AND `name` LIKE concat('%',#{name},'%')
             </if>
         </where>
     </select>
 
+    <update id="updateDel">
+        update smile_school set `del_tag` = 1 where id = #{id}
+    </update>
+
 </mapper>

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

@@ -89,7 +89,7 @@
         smile_user
         <where>
             state = 0 AND del_tag = 0 AND
-            `type` != 1 AND `type` != 2
+            `type` != 1 AND `type` != 2 AND `type` != 4
             <if test="phone!=''">
                 AND phone like concat('%',#{phone},'%')
             </if>