exit

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

@@ -3,6 +3,7 @@ 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.SmileOrgAndUserVo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrganizationParam;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrganizationVo;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileOrganizationService;
@@ -26,32 +27,43 @@ import org.springframework.web.bind.annotation.*;
 public class SmileOrganizationController {
 
     @Autowired
-    ISmileOrganizationService imsOrganizationService;
+    ISmileOrganizationService smileOrganizationService;
 
     @PostMapping("/list")
     @ApiOperation("获取组织列表")
     @ResponseBody
     public AjaxResult organizationList(SmileOrganizationParam smileOrganizationParam){
-        PageInfo<SmileOrganizationVo> organizationList = imsOrganizationService.organizationList(smileOrganizationParam);
+        PageInfo<SmileOrganizationVo> organizationList = smileOrganizationService.organizationList(smileOrganizationParam);
         return AjaxResult.success(organizationList);
     }
 
     @PostMapping("/create")
     @ApiOperation("新增组织")
     @ResponseBody
-    public AjaxResult create(@RequestBody SmileOrganization smileOrganization){
-        return AjaxResult.success(imsOrganizationService.create(smileOrganization));
+    public AjaxResult create(@RequestBody SmileOrganizationVo smileOrganizationVo){
+        if (smileOrganizationService.create(smileOrganizationVo)){
+            return AjaxResult.success();
+        }
+        return AjaxResult.warn("组织已添加");
     }
 
     @PostMapping("/updateOrg")
     @ApiOperation("修改组织")
     @ResponseBody
     public AjaxResult updateOrg(@RequestBody SmileOrganization smileOrganization){
-        if (imsOrganizationService.update(smileOrganization)){
+        if (smileOrganizationService.update(smileOrganization)){
             return AjaxResult.success();
         }else {
             return AjaxResult.error();
         }
     }
 
+    @PostMapping("/getOrgById")
+    @ApiOperation("根据组织id获取信息")
+    @ResponseBody
+    public AjaxResult getOrgById(@RequestParam(name = "id", required = true)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/SmileUserCheckController.java

@@ -3,6 +3,7 @@ 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.SmileUserCheckVo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.UserCheckParam;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserCheckService;
 import com.liquidnet.service.smile.entity.SmileUserCheck;
@@ -49,10 +50,8 @@ public class SmileUserCheckController {
     @PostMapping("/updateById")
     @ApiOperation("修改审核")
     @ResponseBody
-    public AjaxResult updateById(@RequestBody SmileUserCheck smileUserCheck) {
-        if (smileUserCheckService.updateUserCheckById(smileUserCheck)){
-            return AjaxResult.success();
-        }
-        return AjaxResult.error();
+    public AjaxResult updateById(@RequestBody SmileUserCheckVo smileUserCheckVo) {
+        return smileUserCheckService.updateUserCheckById(smileUserCheckVo);
+
     }
 }

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

+package com.liquidnet.client.admin.zhengzai.smile.dto;
+
+import lombok.Data;
+import lombok.ToString;
+
+import java.util.List;
+
+@Data
+@ToString
+public class SmileOrgAndUserVo {
+
+    private Long id;
+
+    /**
+     * 组织信息
+     */
+    private String name;
+
+    /**
+     * 省Id
+     */
+    private String provinceId;
+
+    /**
+     * 省
+     */
+    private String province;
+
+    /**
+     * 市Id
+     */
+    private String cityId;
+
+    /**
+     * 市
+     */
+    private String city;
+
+    /**
+     * 区Id
+     */
+    private String areaId;
+
+    /**
+     * 区
+     */
+    private String area;
+
+    /**
+     * 地区(省份/地区/详细地址)
+     */
+    private String address;
+
+    /**
+     * 总代信息
+     */
+    private SmileUserVoOrg smileUserVoOrgListTotal;
+
+    /**
+     * 普代信息
+     */
+    private List<SmileUserVoOrg> smileUserVoOrgListOrdinary;
+
+
+
+}

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

@@ -58,17 +58,13 @@ public class SmileOrganizationVo{
     /**
      * 总代理
      */
-    private Long agentId;
+    private String agentId;
 
     /**
      * 人数
      */
     private Integer proper;
 
-    /**
-     * 总代理名称
-     */
-    private String agentName;
 
     /**
      * 0：删除，1正常

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

+package com.liquidnet.client.admin.zhengzai.smile.dto;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-03-15
+ */
+@Data
+public class SmileUserCheckVo {
+
+
+    private Long id;
+
+    /**
+     * 组织ID
+     */
+    private Long orgId;
+
+    /**
+     * 用户id
+     */
+    private String uid;
+
+    /**
+     * 状态 1：待审核，2：通过，3：驳回
+
+     */
+    private Integer state;
+
+    /**
+     * 1：总代，2：普代
+     */
+    private Integer type;
+
+    /**
+     * 驳回原因
+     */
+    private String reason;
+
+
+}

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

@@ -2,6 +2,9 @@ package com.liquidnet.client.admin.zhengzai.smile.dto;
 
 import lombok.*;
 
+/**
+ * @author TT
+ */
 @Data
 @ToString
 @NoArgsConstructor
@@ -11,6 +14,8 @@ public class SmileUserVoOrg {
 
     private Long id;
 
+    private String uid;
+
     /**
      * 真实姓名
      */

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

@@ -3,6 +3,7 @@ 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.SmileOrgAndUserVo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrganizationParam;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrganizationVo;
 import com.liquidnet.service.smile.entity.SmileOrganization;
@@ -19,7 +20,9 @@ public interface ISmileOrganizationService extends IService<SmileOrganization> {
 
     PageInfo<SmileOrganizationVo> organizationList(SmileOrganizationParam smileOrganizationParam);
 
-    Integer create(SmileOrganization smileOrganization);
+    Boolean create(SmileOrganizationVo smileOrganizationVo);
 
     Boolean update(SmileOrganization smileOrganization);
+
+    SmileOrgAndUserVo getOrgById(Long id);
 }

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

@@ -3,6 +3,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.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserCheckVo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.UserCheckParam;
 import com.liquidnet.service.smile.entity.SmileUserCheck;
 import com.liquidnet.service.smile.entity.dao.SmileUserCheckDao;
@@ -21,5 +23,5 @@ public interface ISmileUserCheckService extends IService<SmileUserCheck> {
 
     boolean create(SmileUserCheck smileUserCheck);
 
-    boolean updateUserCheckById(SmileUserCheck smileUserCheck);
+    AjaxResult updateUserCheckById(SmileUserCheckVo smileUserCheck);
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileOrganizationServiceImpl.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.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.utils.bean.BeanUtils;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrgAndUserVo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrganizationParam;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrganizationVo;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserVoOrg;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileOrganizationService;
 import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.service.smile.entity.SmileOrganization;
+import com.liquidnet.service.smile.entity.SmileUser;
 import com.liquidnet.service.smile.mapper.SmileOrganizationMapper;
 import com.liquidnet.service.smile.mapper.SmileUserMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -16,13 +21,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author liquidnet
@@ -53,7 +59,7 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
                 return smileOrganizationVo;
             }).collect(Collectors.toList());
             pageInfo = new PageInfo<>(smileOrganizationVos);
-        }catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
             return null;
         }
@@ -61,12 +67,19 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
     }
 
     @Override
-    public Integer create(SmileOrganization smileOrganization) {
-        log.info("smileOrganization:{}",smileOrganization);
-        smileOrganization.setCreatedDate(LocalDateTime.now());
-        smileOrganization.setUpdatedDate(LocalDateTime.now());
-        smileOrganization.setDelTag(0);
-        return smileOrganizationMapper.insert(smileOrganization);
+    public Boolean create(SmileOrganizationVo smileOrganizationVo) {
+        log.info("smileOrganizationVo:{}", smileOrganizationVo);
+        LambdaQueryWrapper<SmileOrganization> queryWrapper = Wrappers.lambdaQuery(SmileOrganization.class);
+        queryWrapper.eq(SmileOrganization::getName, smileOrganizationVo.getName());
+        if (smileOrganizationMapper.selectOne(queryWrapper) == null) {
+            SmileOrganization smileOrganization = new SmileOrganization();
+            BeanUtils.copyProperties(smileOrganizationVo, smileOrganization);
+            smileOrganization.setCreatedDate(LocalDateTime.now());
+            smileOrganization.setUpdatedDate(LocalDateTime.now());
+            smileOrganization.setDelTag(0);
+            return smileOrganizationMapper.insert(smileOrganization) > 0;
+        }
+        return false;
     }
 
     @Override
@@ -76,5 +89,37 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
         return true;
     }
 
+    @Override
+    public SmileOrgAndUserVo getOrgById(Long id) {
+        SmileOrgAndUserVo smileOrgAndUserVo = new SmileOrgAndUserVo();
+        //查询代理信息
+        LambdaQueryWrapper<SmileOrganization> orgQueryWrapper = Wrappers.lambdaQuery(SmileOrganization.class);
+        orgQueryWrapper.eq(SmileOrganization::getId, id);
+        orgQueryWrapper.eq(SmileOrganization::getDelTag,0);
+        SmileOrganization smileOrganization = smileOrganizationMapper.selectOne(orgQueryWrapper);
+        if (smileOrganization != null) {
+            BeanUtils.copyProperties(smileOrganization,smileOrgAndUserVo);
+            LambdaQueryWrapper<SmileUser> userQueryWrapper = Wrappers.lambdaQuery(SmileUser.class);
+            userQueryWrapper.eq(SmileUser::getOrgId,id);
+            userQueryWrapper.eq(SmileUser::getDelTag,0);
+            List<SmileUser> smileUsers = smileUserMapper.selectList(userQueryWrapper);
+            List<SmileUserVoOrg> smileUserVoOrgList = new ArrayList<>();
+            smileUsers.forEach(smileUser -> {
+               if (smileOrganization.getAgentId().equals(smileUser.getId())){
+                   SmileUserVoOrg smileUserVoOrg = new SmileUserVoOrg();
+                   BeanUtils.copyProperties(smileUser,smileUserVoOrg);
+                   smileOrgAndUserVo.setSmileUserVoOrgListTotal(smileUserVoOrg);
+               }else {
+                   SmileUserVoOrg smileUserVoOrg = new SmileUserVoOrg();
+                   BeanUtils.copyProperties(smileUser,smileUserVoOrg);
+                   smileUserVoOrgList.add(smileUserVoOrg);
+               }
+            });
+            smileOrgAndUserVo.setSmileUserVoOrgListOrdinary(smileUserVoOrgList);
+            return smileOrgAndUserVo;
+        }
+        return null;
+    }
+
 
 }

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

@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
 @Service
 public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSchool> implements ISmileSchoolService {
 
-    private Boolean redisSchoolTag;
+    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/SmileUserCheckServiceImpl.java

@@ -5,14 +5,19 @@ 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.github.pagehelper.PageInfo;
+import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserCheckVo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.UserCheckParam;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserCheckService;
 import com.liquidnet.commons.lang.util.BeanUtil;
+import com.liquidnet.service.smile.entity.SmileOrganization;
 import com.liquidnet.service.smile.entity.SmileUserCheck;
 import com.liquidnet.service.smile.entity.dao.SmileUserCheckDao;
+import com.liquidnet.service.smile.mapper.SmileOrganizationMapper;
 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.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -40,6 +45,9 @@ public class SmileUserCheckServiceImpl extends ServiceImpl<SmileUserCheckMapper,
     @Autowired
     SmileSchoolMapper smileSchoolMapper;
 
+    @Autowired
+    SmileOrganizationMapper smileOrganizationMapper;
+
     @Override
     public PageInfo<SmileUserCheckDao> listUserCheck(UserCheckParam userCheckParam) {
         PageInfo<SmileUserCheckDao> pageInfo;
@@ -60,7 +68,7 @@ public class SmileUserCheckServiceImpl extends ServiceImpl<SmileUserCheckMapper,
             //uid=uid   state！=1
             LambdaQueryWrapper<SmileUserCheck> queryWrapper = Wrappers.lambdaQuery(SmileUserCheck.class);
             queryWrapper.eq(SmileUserCheck::getUid, smileUserCheck.getUid());
-            queryWrapper.eq(false, SmileUserCheck::getState, 1);
+            queryWrapper.eq(SmileUserCheck::getState, 1);
             if (smileUserCheckMapper.selectOne(queryWrapper) == null) {
                 smileUserCheck.setCreatedDate(LocalDateTime.now());
                 smileUserCheck.setUpdatedDate(LocalDateTime.now());
@@ -73,11 +81,39 @@ public class SmileUserCheckServiceImpl extends ServiceImpl<SmileUserCheckMapper,
     }
 
     @Override
-    public boolean updateUserCheckById(SmileUserCheck smileUserCheck) {
-        //state 为1  才可以修改
-        LambdaQueryWrapper<SmileUserCheck> queryWrapper = Wrappers.lambdaQuery(SmileUserCheck.class);
-        smileUserCheck.setUpdatedDate(LocalDateTime.now());
-        return smileUserCheckMapper.update(smileUserCheck, queryWrapper) > 0;
+    public AjaxResult updateUserCheckById(SmileUserCheckVo smileUserCheckVo) {
+        //判断是否通过
+        if (smileUserCheckVo.getState().equals(3)) {
+            //申请被驳回
+            SmileUserCheck smileUserCheck = new SmileUserCheck();
+            BeanUtils.copyProperties(smileUserCheckVo, smileUserCheck);
+            smileUserCheck.setUpdatedDate(LocalDateTime.now());
+            smileUserCheckMapper.updateById(smileUserCheck);
+        } else {
+            //通过审核
+            //判断是否是总代
+            if (smileUserCheckVo.getType().equals(1)) {
+                //查询组织是否有总代   没有则设置  有则返回异常
+                LambdaQueryWrapper<SmileOrganization> orgQueryWrapper = Wrappers.lambdaQuery(SmileOrganization.class);
+                orgQueryWrapper.eq(SmileOrganization::getId, smileUserCheckVo.getOrgId());
+                orgQueryWrapper.eq(SmileOrganization::getDelTag, 0);
+                SmileOrganization smileOrganization = smileOrganizationMapper.selectOne(orgQueryWrapper);
+                if (smileOrganization != null && smileOrganization.getAgentId() == null) {
+                    //没有总代  修改代理
+                    smileOrganization.setUpdatedDate(LocalDateTime.now());
+                    smileOrganization.setAgentId(smileUserCheckVo.getUid());
+                    smileOrganizationMapper.updateById(smileOrganization);
+                } else {
+                    //有总代
+                    return AjaxResult.warn("该分组已经存在总代身份");
+                }
+            }
+            //修改审核信息
+            smileUserCheckMapper.updateCheck(smileUserCheckVo.getId());
+            //修改user代理 id
+            smileUserMapper.updateUserByUid(smileUserCheckVo.getUid(), smileUserCheckVo.getOrgId(), smileUserCheckVo.getType());
+        }
+        return AjaxResult.success();
     }
 
 

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

@@ -70,12 +70,7 @@ public class SmileOrganization implements Serializable {
     /**
      * 总代理
      */
-    private Long agentId;
-
-    /**
-     * 总代理名称
-     */
-    private String agentName;
+    private String agentId;
 
     /**
      * 0：未删除，1：已删除

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.smile.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.liquidnet.service.smile.entity.SmileUserCheck;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -14,4 +15,5 @@ import com.liquidnet.service.smile.entity.SmileUserCheck;
  */
 public interface SmileUserCheckMapper extends BaseMapper<SmileUserCheck> {
 
+    void updateCheck(@Param("id")Long id);
 }

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

@@ -29,5 +29,8 @@ public interface SmileUserMapper extends BaseMapper<SmileUser> {
     List<SmileUser> selectUserList(Map<String, Object> map);
 
     List<SmileUserCheckDao> selectUserCheck(Map<String, Object> map);
+
     List<Map> getUserOrder(String userId);
+
+    void updateUserByUid(@Param("uid") String uid,@Param("orgId") Long orgId,@Param("type")Integer tag);
 }

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

@@ -2,4 +2,7 @@
 <!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">
 
+    <update id="updateCheck">
+        update smile_user_check set state = 2,updated_date =  now() where id = #{id}
+    </update>
 </mapper>

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

@@ -20,15 +20,21 @@
     </resultMap>
 
     <select id="strip" resultType="Integer">
-        select count(*) from smile_user where org_id = #{orgId};
+        select count(*)
+        from smile_user
+        where org_id = #{orgId};
     </select>
 
     <select id="selectUserNameById" resultType="String">
-        select name from  smile_user where id = #{id};
+        select name
+        from smile_user
+        where id = #{id};
     </select>
 
     <update id="updateUserSchoolBySchoolId">
-        update smile_user set school_name = #{schoolName}  where school_id = #{schoolId};
+        update smile_user
+        set school_name = #{schoolName}
+        where school_id = #{schoolId};
     </update>
 
     <select id="selectUserList" parameterType="java.util.Map" resultType="com.liquidnet.service.smile.entity.SmileUser">
@@ -42,26 +48,26 @@
 
     <select id="selectUserCheck" parameterType="java.util.Map" resultMap="smileUserCheckDao">
         SELECT
-            suc.id,
-            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`
+        suc.id,
+        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
+        smile_user su,
+        smile_user_check suc
         <where>
             su.uid = suc.uid
             <if test="phone!=''">
@@ -70,9 +76,24 @@
         </where>
         Order by id desc
     </select>
+
+
     <select id="getUserOrder" parameterType="String" resultType="java.util.Map">
-        select performance_id as 'yanchuId'  from (select * from kylin_order_tickets where created_at>DATE_SUB(CURDATE(), INTERVAL 6 MONTH)) as o
-        , kylin_order_ticket_status as s,kylin_order_ticket_relations as r where o.order_tickets_id=s.order_id
-        and o.order_tickets_id=r.order_id and r.agent_id=#{userId} and s.pay_status='1' GROUP BY r.performance_id
+        select performance_id as 'yanchuId'
+        from (select * from kylin_order_tickets where created_at > DATE_SUB(CURDATE(), INTERVAL 6 MONTH)) as o
+           , kylin_order_ticket_status as s
+           , kylin_order_ticket_relations as r
+        where o.order_tickets_id = s.order_id
+          and o.order_tickets_id = r.order_id
+          and r.agent_id = #{userId}
+          and s.pay_status = '1'
+        GROUP BY r.performance_id
     </select>
+
+    <update id="updateUserByUid">
+        update smile_user
+        set org_id = #{orgId},
+            type   = #{type}
+        where uid = #{uid}
+    </update>
 </mapper>