Merge remote-tracking branch 'origin/dev-smile' into dev-smile

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

@@ -4,9 +4,9 @@ package com.liquidnet.client.admin.web.controller.zhengzai.smile;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.zhengzai.smile.dto.UserCheckParam;
-import com.liquidnet.client.admin.zhengzai.smile.dto.UserCheckVo;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserCheckService;
 import com.liquidnet.service.smile.entity.SmileUserCheck;
+import com.liquidnet.service.smile.entity.dao.SmileUserCheckDao;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +32,7 @@ public class SmileUserCheckController {
     @ApiOperation("获取审核列表")
     @ResponseBody
     public AjaxResult list(UserCheckParam userCheckParam) {
-        PageInfo<UserCheckVo> list = smileUserCheckService.listUserCheck(userCheckParam);
+        PageInfo<SmileUserCheckDao> list = smileUserCheckService.listUserCheck(userCheckParam);
         return AjaxResult.success(list);
     }
 

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

 package com.liquidnet.client.admin.zhengzai.smile.dto;
 
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
@@ -10,7 +9,6 @@ import javax.validation.constraints.NotNull;
  * @author TT
  */
 @Data
-@Builder
 public class UserCheckParam {
 
     @ApiModelProperty(value = "审核id", example = "")

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

@@ -4,8 +4,8 @@ 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.zhengzai.smile.dto.UserCheckParam;
-import com.liquidnet.client.admin.zhengzai.smile.dto.UserCheckVo;
 import com.liquidnet.service.smile.entity.SmileUserCheck;
+import com.liquidnet.service.smile.entity.dao.SmileUserCheckDao;
 
 /**
  * <p>
@@ -17,7 +17,7 @@ import com.liquidnet.service.smile.entity.SmileUserCheck;
  */
 public interface ISmileUserCheckService extends IService<SmileUserCheck> {
 
-    PageInfo<UserCheckVo> listUserCheck(UserCheckParam userCheckParam);
+    PageInfo<SmileUserCheckDao> listUserCheck(UserCheckParam userCheckParam);
 
     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/SmileAgentServiceImpl.java

@@ -28,10 +28,10 @@ public class SmileAgentServiceImpl extends ServiceImpl<SmileAgentMapper, SmileAg
     SmileAgentMapper smileAgentMapper;
 
     @Override
-    public List<SmileAgent> listAgentByShowIdAndTicketId(String showId, String ticketId) {
-        if (StringUtils.isNotEmpty(showId)&&StringUtils.isNotEmpty(ticketId)){
+    public List<SmileAgent> listAgentByShowIdAndTicketId(String performanceId, String ticketId) {
+        if (StringUtils.isNotEmpty(performanceId)&&StringUtils.isNotEmpty(ticketId)){
             LambdaQueryWrapper<SmileAgent> queryWrapper = Wrappers.lambdaQuery(SmileAgent.class);
-            queryWrapper.eq(true,SmileAgent::getShowId,showId);
+            queryWrapper.eq(true,SmileAgent::getPerformanceId,performanceId);
             queryWrapper.eq(true,SmileAgent::getTicketId,ticketId);
             return smileAgentMapper.selectList(queryWrapper);
         }

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

@@ -6,11 +6,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.UserCheckParam;
-import com.liquidnet.client.admin.zhengzai.smile.dto.UserCheckVo;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserCheckService;
 import com.liquidnet.commons.lang.util.BeanUtil;
-import com.liquidnet.service.smile.entity.SmileUser;
 import com.liquidnet.service.smile.entity.SmileUserCheck;
+import com.liquidnet.service.smile.entity.dao.SmileUserCheckDao;
 import com.liquidnet.service.smile.mapper.SmileSchoolMapper;
 import com.liquidnet.service.smile.mapper.SmileUserCheckMapper;
 import com.liquidnet.service.smile.mapper.SmileUserMapper;
@@ -20,7 +19,6 @@ import org.springframework.stereotype.Service;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -43,47 +41,17 @@ public class SmileUserCheckServiceImpl extends ServiceImpl<SmileUserCheckMapper,
     SmileSchoolMapper smileSchoolMapper;
 
     @Override
-    public PageInfo<UserCheckVo> listUserCheck(UserCheckParam userCheckParam) {
-        PageInfo<UserCheckVo> pageInfo;
-
+    public PageInfo<SmileUserCheckDao> listUserCheck(UserCheckParam userCheckParam) {
+        PageInfo<SmileUserCheckDao> pageInfo;
         try {
             Map<String, Object> map = BeanUtil.convertBeanToMap(userCheckParam);
-            smileUserMapper.selectUserCheck(map);
-            pageInfo =new PageInfo<>();
+            List<SmileUserCheckDao> smileUserCheckDaos = smileUserMapper.selectUserCheck(map);
+            pageInfo =new PageInfo<>(smileUserCheckDaos);
         } catch (Exception e) {
             e.printStackTrace();
+            return null;
         }
-
-
-        //查询审核列表
-        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 null;
+        return pageInfo;
     }
 
     @Override

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

+package com.liquidnet.service.smile.entity.dao;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Data
+public class SmileUserCheckDao {
+
+    private String uid;
+
+    private String img;
+
+    private String name;
+
+    private LocalDate birthday;
+
+    private Integer sex;
+
+    private String phone;
+
+    private String provinceId;
+
+    private String province;
+
+    private String cityId;
+
+    private String city;
+
+    private String areaId;
+
+    private String area;
+
+    private String address;
+
+    private Integer state;
+
+}

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

@@ -2,7 +2,7 @@ package com.liquidnet.service.smile.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.liquidnet.service.smile.entity.SmileUser;
-import com.liquidnet.service.smile.entity.SmileUserCheck;
+import com.liquidnet.service.smile.entity.dao.SmileUserCheckDao;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -28,5 +28,5 @@ public interface SmileUserMapper extends BaseMapper<SmileUser> {
 
     List<SmileUser> selectUserList(Map<String, Object> map);
 
-    List<SmileUserCheck> selectUserCheck(Map<String, Object> map);
+    List<SmileUserCheckDao> selectUserCheck(Map<String, Object> map);
 }

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileUserMapper.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.SmileUserMapper">
+
+    <resultMap id="smileUserCheckDao" type="com.liquidnet.service.smile.entity.dao.SmileUserCheckDao">
+        <result column="uid" property="uid"/>
+        <result column="img" property="img"/>
+        <result column="name" property="name"/>
+        <result column="birthday" property="birthday"/>
+        <result column="sex" property="sex"/>
+        <result column="province_id" property="provinceId"/>
+        <result column="province" property="province"/>
+        <result column="city_id" property="cityId"/>
+        <result column="city" property="city"/>
+        <result column="area_id" property="areaId"/>
+        <result column="area" property="area"/>
+        <result column="address" property="address"/>
+        <result column="state" property="state"/>
+    </resultMap>
+
     <select id="strip" resultType="Integer">
         select count from smile_user where org_id = #{orgId};
     </select>
@@ -22,14 +39,34 @@
         </where>
     </select>
 
-    <select id="selectUserCheck" parameterType="java.util.Map" resultType="com.liquidnet.service.smile.entity.SmileUserCheck">
-        select
-
-        from smile_user su ,smile_user_check suc
+    <select id="selectUserCheck" parameterType="java.util.Map" resultMap="smileUserCheckDao">
+        SELECT
+            su.uid,
+            su.img,
+            su.`NAME`,
+            su.birthday,
+            su.sex,
+            su.phone,
+            su.identity,
+            su.school_name,
+            su.province_id,
+            su.province,
+            su.city_id,
+            su.city,
+            su.area_id,
+            su.area,
+            su.address,
+            suc.`state`
+        FROM
+            smile_user su,
+            smile_user_check suc
+        WHERE
+            su.uid = suc.uid
         <where>
-            <if test="">
-
+            <if test="phone!=''">
+                AND phone like concat('%',#{phone},'%')
             </if>
         </where>
+
     </select>
 </mapper>