add show，userCheck

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

@@ -28,7 +28,7 @@ public class SmileSchoolController {
     ISmileSchoolService iSmileSchoolService;
 
 
-    @GetMapping("/schoolList")
+    @GetMapping("/list")
     @ApiOperation("获取学校列表")
     @ResponseBody
     public AjaxResult schoolList(@RequestParam(name = "name", required = false) String name) {

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.domain.AjaxResult;
+import com.liquidnet.client.admin.zhengzai.smile.service.ISmileShowService;
+import com.liquidnet.service.smile.entity.SmileShow;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-03-15
+ */
+@RestController
+@RequestMapping("/smile/show")
+public class SmileShowController {
+
+    @Autowired
+    ISmileShowService smileShowService;
+
+    @GetMapping("/list")
+    @ApiOperation("获得演出列表")
+    @ResponseBody
+    public AjaxResult showList(@RequestParam(name = "name", required = false) String name,@RequestParam(name = "city", required = false) String city){
+        List<SmileShow> showList = smileShowService.showList(name,city);
+        return AjaxResult.success(showList);
+    }
+
+    @PostMapping("create")
+    @ApiOperation("新建票提")
+    @ResponseBody
+    public AjaxResult create(@RequestBody List<SmileShow> showList){
+        if (smileShowService.create(showList)){
+            return AjaxResult.success();
+        }
+        return AjaxResult.error();
+    }
+}

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

+package com.liquidnet.client.admin.web.controller.zhengzai.smile;
+
+
+import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserCheckService;
+import com.liquidnet.client.admin.zhengzai.smile.vo.UserCheckVo;
+import com.liquidnet.service.smile.entity.SmileUserCheck;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-03-15
+ */
+@RestController
+@RequestMapping("/smile/user/check")
+public class SmileUserCheckController {
+
+    @Autowired
+    ISmileUserCheckService smileUserCheckService;
+
+    @GetMapping("/list")
+    @ApiOperation("获取审核列表")
+    @ResponseBody
+    public AjaxResult list() {
+        List<UserCheckVo> list = smileUserCheckService.listUserCheck();
+        return AjaxResult.success(list);
+    }
+
+    @PostMapping("/create")
+    @ApiOperation("创建审核")
+    @ResponseBody
+    public AjaxResult create(@RequestBody SmileUserCheck smileUserCheck) {
+        if (smileUserCheckService.create(smileUserCheck)) {
+            return AjaxResult.success();
+        }
+        return AjaxResult.error();
+    }
+
+    @PostMapping("/updateById")
+    @ApiOperation("修改审核")
+    @ResponseBody
+    public AjaxResult updateById(@RequestBody SmileUserCheck smileUserCheck) {
+        if (smileUserCheckService.updateById(smileUserCheck)){
+            return AjaxResult.success();
+        }
+        return AjaxResult.error();
+
+    }
+}

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

@@ -30,7 +30,7 @@ public class SmileUserController extends BaseController {
     @Autowired
     ISmileUserService iSmileUserService;
 
-    @GetMapping("/userList")
+    @GetMapping("/list")
     @ApiOperation(value = "获取用户列表")
     @ResponseBody
     public AjaxResult userList(@RequestParam(value = "phone", required = false)String phone){

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

+package com.liquidnet.client.admin.zhengzai.smile.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.smile.entity.SmileShow;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-03-15
+ */
+public interface ISmileShowService extends IService<SmileShow> {
+
+    List<SmileShow> showList(String name, String city);
+
+    boolean create(List<SmileShow> showList);
+}

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

+package com.liquidnet.client.admin.zhengzai.smile.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.client.admin.zhengzai.smile.vo.UserCheckVo;
+import com.liquidnet.service.smile.entity.SmileUserCheck;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-03-15
+ */
+public interface ISmileUserCheckService extends IService<SmileUserCheck> {
+
+    List<UserCheckVo> listUserCheck();
+
+    boolean create(SmileUserCheck smileUserCheck);
+}

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

@@ -5,9 +5,10 @@ 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.zhengzai.smile.service.ISmileSchoolService;
-import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
+import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
 import com.liquidnet.service.smile.entity.SmileSchool;
 import com.liquidnet.service.smile.mapper.SmileSchoolMapper;
+import com.liquidnet.service.smile.mapper.SmileUserMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +32,10 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
     SmileSchoolMapper smileSchoolMapper;
 
     @Autowired
-    private RedisDataSourceUtil redisDataSourceUtil;
+    SmileUserMapper smileUserMapper;
+
+    @Autowired
+    SmileRedisUtils smileRedisUtils;
 
     @Override
     public List<SmileSchool> schoolList(String name) {
@@ -58,7 +62,6 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
             if (id > 0) {
                 //更新redis
                 log.info("school, id:{},smileSchool:{}", smileSchool.getId(), smileSchool);
-//                redisDataSourceUtil.getRedisSmileUtil().set(SmileRedisConst.SMILE_SCHOOL + id, smileSchool);
                 return true;
             }
         }
@@ -70,12 +73,17 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
         LambdaQueryWrapper<SmileSchool> queryWrapper = Wrappers.lambdaQuery(SmileSchool.class);
         queryWrapper.eq(SmileSchool::getId, smileSchool.getId());
         if (smileSchoolMapper.update(smileSchool, queryWrapper) > 0) {
+            //更新User表  根据学校id修改用户学校名称
+            smileUserMapper.updateUserSchoolBySchoolId(smileSchool.getId(),smileSchool.getName());
             //更新redis
             log.info("school, id:{},smileSchool:{}", smileSchool.getId(), smileSchool);
+
             return true;
         }
         return false;
     }
 
 
+
+
 }

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

+package com.liquidnet.client.admin.zhengzai.smile.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.client.admin.zhengzai.smile.service.ISmileShowService;
+import com.liquidnet.service.kylin.mapper.KylinTicketStatusMapper;
+import com.liquidnet.service.smile.entity.SmileShow;
+import com.liquidnet.service.smile.mapper.SmileShowMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-03-15
+ */
+@Service
+public class SmileShowServiceImpl extends ServiceImpl<SmileShowMapper,SmileShow> implements ISmileShowService {
+
+    @Autowired
+    KylinTicketStatusMapper kylinTicketStatusMapper;
+
+    @Autowired
+    SmileShowMapper smileShowMapper;
+
+    @Override
+    public List<SmileShow> showList(String name, String city) {
+        //查询开启代理的演出列表
+
+        //
+        return null;
+    }
+
+    @Override
+    public boolean create(List<SmileShow> showList) {
+        if (smileShowMapper.insertAll(showList)>0){
+            return true;
+        }
+        return false;
+    }
+
+
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileUserCheckServiceImpl.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.zhengzai.smile.service.ISmileUserCheckService;
+import com.liquidnet.client.admin.zhengzai.smile.vo.UserCheckVo;
+import com.liquidnet.service.smile.entity.SmileUser;
+import com.liquidnet.service.smile.entity.SmileUserCheck;
+import com.liquidnet.service.smile.mapper.SmileSchoolMapper;
+import com.liquidnet.service.smile.mapper.SmileUserCheckMapper;
+import com.liquidnet.service.smile.mapper.SmileUserMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-03-15
+ */
+@Service
+public class SmileUserCheckServiceImpl extends ServiceImpl<SmileUserCheckMapper, SmileUserCheck> implements ISmileUserCheckService {
+
+    @Autowired
+    SmileUserCheckMapper smileUserCheckMapper;
+
+    @Autowired
+    SmileUserMapper smileUserMapper;
+
+    @Autowired
+    SmileSchoolMapper smileSchoolMapper;
+
+    @Override
+    public List<UserCheckVo> listUserCheck() {
+        //查询审核列表
+        List<UserCheckVo> userCheckVos = smileUserCheckMapper.selectList(null).stream().map(smileUserCheck -> {
+            //查询用户详情
+            LambdaQueryWrapper<SmileUser> queryWrapper = Wrappers.lambdaQuery(SmileUser.class);
+            queryWrapper.eq(SmileUser::getUid, smileUserCheck.getUid());
+            queryWrapper.eq(SmileUser::getDelTag, 0);
+            SmileUser smileUser = smileUserMapper.selectOne(queryWrapper);
+            return UserCheckVo.builder()
+                    .id(smileUserCheck.getId())
+                    .uid(smileUserCheck.getUid())
+                    .state(smileUserCheck.getState())
+                    .reason(smileUserCheck.getReason())
+                    .img(smileUser.getImg())
+                    .name(smileUser.getName())
+                    .birthday(smileUser.getBirthday())
+                    .sex(smileUser.getSex())
+                    .phone(smileUser.getPhone())
+                    .provinceKey(smileUser.getProvinceKey())
+                    .province(smileUser.getProvince())
+                    .city(smileUser.getCity())
+                    .cityKey(smileUser.getCityKey())
+                    .area(smileUser.getArea())
+                    .areaKey(smileUser.getAreaKey())
+                    .address(smileUser.getAddress())
+                    .schoolName(smileUser.getSchoolName())
+                    .identity(smileUser.getIdentity())
+                    .build();
+        }).collect(Collectors.toList());
+        return userCheckVos;
+    }
+
+    @Override
+    public boolean create(SmileUserCheck smileUserCheck) {
+        if (smileUserCheck.getUid() != null) {
+            LambdaQueryWrapper<SmileUserCheck> queryWrapper = Wrappers.lambdaQuery(SmileUserCheck.class);
+            queryWrapper.eq(SmileUserCheck::getUid, smileUserCheck.getUid());
+            if (smileUserCheckMapper.selectOne(queryWrapper) == null) {
+                smileUserCheck.setCreatedDate(LocalDateTime.now());
+                smileUserCheck.setUpdatedDate(LocalDateTime.now());
+                smileUserCheck.setDelTag(0);
+                return smileUserCheckMapper.insert(smileUserCheck) > 0;
+            }
+        }
+        return false;
+    }
+
+
+}

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

@@ -26,8 +26,6 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
     @Autowired
     SmileUserMapper smileUserMapper;
 
-
-
     @Override
     public List<SmileUserVo> userList(String phone) {
         //查询未删除，未通过审核的用户

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/utils/SmileRedisUtils.java

@@ -10,4 +10,13 @@ public class SmileRedisUtils {
     @Autowired
     RedisDataSourceUtil redisDataSourceUtil;
 
+    public Boolean set(String key, Object value){
+        return redisDataSourceUtil.getRedisSweetUtil().set(key, value);
+    }
+
+    public Boolean hset(String key, String item, Object value){
+        return redisDataSourceUtil.getRedisSweetUtil().hset(key,item, value);
+    }
+
+
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/vo/SmileUserVo.java

@@ -95,6 +95,11 @@ public class SmileUserVo {
      */
     private String idCard;
 
+    /**
+     * 学校ID
+     */
+    private String schoolId;
+
     /**
      * 学校名称
      */

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/vo/UserCheckVo.java

+package com.liquidnet.client.admin.zhengzai.smile.vo;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * @author TT
+ */
+@Data
+@Builder
+public class UserCheckVo {
+
+    private Long id;
+
+    private Long uid;
+
+    /**
+     * 照片
+     */
+    private String img;
+
+    /**
+     * 真实姓名
+     */
+    private String name;
+
+    /**
+     * 生日YYYY-MM-DD
+     */
+    private LocalDate birthday;
+
+    /**
+     * 性别(1：男（默认），2：女)
+     */
+    private Integer sex;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 省key
+     */
+    private String provinceKey;
+
+    /**
+     * 省
+     */
+    private String province;
+
+    /**
+     * 市key
+     */
+    private String cityKey;
+
+    /**
+     * 市
+     */
+    private String city;
+
+    /**
+     * 区key
+     */
+    private String areaKey;
+
+    /**
+     * 区
+     */
+    private String area;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
+    /**
+     * 学校名称
+     */
+    private String schoolName;
+
+    /**
+     * 身份（1:在校学生（默认），2已毕业）
+     */
+    private Integer identity;
+
+    /**
+     * 状态 1：待审核，2：通过，3：驳回
+
+     */
+    private Integer state;
+
+    /**
+     * 驳回原因
+     */
+    private String reason;
+
+}

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisUtil.java

@@ -38,7 +38,8 @@ public final class RedisUtil extends AbstractRedisUtil{
         };
         for (String key : keys) {
             long value = key.hashCode();
-            int idx = ((int) (value ^ (value >>> 32)) % 250);
+//            int idx = ((int) (value ^ (value >>> 32)) % 250);
+            int idx = 15;
             System.out.printf("\n[%s] - idx:%s", key, idx);
         }
     }

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

+package com.liquidnet.service.smile.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-03-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SmileShow implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    /**
+     * 演出ID
+     */
+    private Long showId;
+
+    /**
+     * 票种
+     */
+    private String ticketType;
+
+    /**
+     * 总代票提
+     */
+    private Double totalCarry;
+
+    /**
+     * 普代票提
+     */
+    private Double ordCarry;
+
+
+}

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

@@ -110,6 +110,11 @@ public class SmileUser implements Serializable {
      */
     private String idCard;
 
+    /**
+     * 学校ID
+     */
+    private String schoolId;
+
     /**
      * 学校名称
      */
@@ -179,5 +184,7 @@ public class SmileUser implements Serializable {
 
     private LocalDateTime updatedDate;
 
-
+    public SmileUser(String schoolName) {
+        this.schoolName = schoolName;
+    }
 }

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

+package com.liquidnet.service.smile.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-03-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SmileUserCheck implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    private Long uid;
+
+    /**
+     * 状态 1：待审核，2：通过，3：驳回
+
+     */
+    private Integer state;
+
+    /**
+     * 驳回原因
+     */
+    private String reason;
+
+    /**
+     * 状态（0：删除，1正常）
+     */
+    private Integer delTag;
+
+    private LocalDateTime createdDate;
+
+    private LocalDateTime updatedDate;
+
+
+}

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

+package com.liquidnet.service.smile.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.smile.entity.SmileShow;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-03-15
+ */
+public interface SmileShowMapper extends BaseMapper<SmileShow> {
+
+    int insertAll(@Param("showList")List<SmileShow> showList);
+}

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

+package com.liquidnet.service.smile.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.smile.entity.SmileUserCheck;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-03-15
+ */
+public interface SmileUserCheckMapper extends BaseMapper<SmileUserCheck> {
+
+}

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

@@ -19,4 +19,6 @@ public interface SmileUserMapper extends BaseMapper<SmileUser> {
      * @return
      */
     String selectUserNameById(@Param("id") Long agentId);
+
+    Integer updateUserSchoolBySchoolId(@Param("schoolId") Long id,@Param("schoolName") String name);
 }

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.smile.mapper.SmileShowMapper">
+
+    <insert id="insertAll" >
+        insert into smile_show (show_id,ticket_type,total_carry,ord_carry)
+        values
+        <foreach collection="showList" item="show" index="index" separator=",">
+            (#{show.showId},#{show.ticketType},#{show.totalCarry},#{show.orgCarry})
+        </foreach>
+    </insert>
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.smile.mapper.SmileUserCheckMapper">
+
+</mapper>

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

@@ -8,4 +8,8 @@
     <select id="selectUserNameById" resultType="String">
         select name from  smile_user where id = #{id};
     </select>
+
+    <update id="updateUserSchoolBySchoolId">
+        update smile_user set school_name = #{schoolName}  where school_id = #{schoolName};
+    </update>
 </mapper>