Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

xiaoyong931011

2021-06-29 898213bf34f8535b703a90bef799a9bf0adba95c

 gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java

@@ -1,15 +1,24 @@
package com.xzx.gc.user.service;

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.convert.Convert;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.xzx.gc.common.exception.RestException;
import com.xzx.gc.entity.JhyInfo;
import com.xzx.gc.user.dto.ExamineJwyDto;
import com.xzx.gc.user.dto.JhyApplyDto;
import com.xzx.gc.user.dto.JhyInfoListDto;
import com.xzx.gc.user.mapper.JhyInfoMapper;
import com.xzx.gc.user.vo.JhyInfoListVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@Service
@Transactional
@@ -28,6 +37,8 @@
            throw new RestException(-3, "手机号/身份证号已注册集物员");
        }

        jhyInfoMapper.deleteByUserId(applyDto.getUserId());

        JhyInfo jhyInfo = new JhyInfo();
        BeanUtil.copyProperties(applyDto, jhyInfo);
        jhyInfo.setCreatedTime(new Date());
@@ -43,16 +54,47 @@
        return jhyInfo.getStatus();
    }

    public boolean isJhy(String userId) {
    public int isJhy(String userId) {
        JhyInfo jhyInfo = jhyInfoMapper.selectJhyInfoByUserId(userId);
        if (jhyInfo == null) {
            return false;
            return 0;
        }

        if (JhyInfo.CHECK_REFUSE.equals(jhyInfo.getStatus())) {
            return 0;
        }

        if (JhyInfo.CHECK_PASS.equals(jhyInfo.getStatus())) {
            return true;
            return 1;
        } else {
            return 2;
        }
    }

        return false;
    public Map<String, Object> queryList(JhyInfoListDto jhyInfoListDto) {
        PageHelper.startPage(jhyInfoListDto.getPage(), jhyInfoListDto.getLimit());
        List<JhyInfoListVo> jhyInfoListVos = jhyInfoMapper.selectJhyInfoList(jhyInfoListDto);
        PageInfo<JhyInfoListVo> pageInfo = new PageInfo<>(jhyInfoListVos);

        Map<String, Object> data = new HashMap<>();
        int count = Convert.toInt(pageInfo.getTotal());
        data.put("data", jhyInfoListVos);
        data.put("count", count);
        data.put("code", 0);
        return data;
    }

    public void examineJwy(ExamineJwyDto model) {
        long id = model.getId();
        JhyInfo jhyInfo = jhyInfoMapper.selectByPrimaryKey(id);
        Integer type = model.getType();
        if(1 == type){
            jhyInfo.setStatus(2);
            jhyInfo.setIsJhy(1+"");
        }else if(2 == type){
            jhyInfo.setStatus(3);
            jhyInfo.setIsJhy(2+"");
        }
        jhyInfoMapper.updateByPrimaryKey(jhyInfo);
    }
}