huwhois 5 年之前
父節點
當前提交
18809b6d72

+ 19 - 25
src/main/java/io/renren/modules/admin/controller/AttendersController.java

@ -34,6 +34,7 @@ import io.renren.common.utils.ExcelUtils;
34 34
import io.renren.common.utils.PageUtils;
35 35
import io.renren.common.utils.R;
36 36
import io.renren.modules.sys.controller.AbstractController;
37
import net.bytebuddy.asm.Advice.Exit;
37 38
import io.renren.modules.admin.service.PaymentService;
38 39

39 40
/**
@ -83,33 +84,26 @@ public class AttendersController extends AbstractController  {
83 84
    @RequestMapping("/save")
84 85
    @RequiresPermissions("admin:attenders:save")
85 86
    public R save(@RequestBody AttendersEntity attenders) {
87
        System.out.println(attenders);
86 88
        if (attenders.getMemberId() == null || attenders.getMemberId()==0) {
87
            MemberEntity member = memberService.getByUserName(attenders.getPhone());
88
            System.out.println(member);
89
            if (member == null || member.getId() == null || member.getId() == 0) {
90
                member = new MemberEntity();
91
                member.setUsername(attenders.getPhone());
92
                member.setPassword("123456");         // 默认密码
93
                member.setTruename(attenders.getName());
94
                member.setOrganization(attenders.getOrganization());
95
                member.setPosition(attenders.getPosition());
96
                member.setJobTitle(attenders.getJobTitle());
97
                member.setPhone(attenders.getPhone());
98
                member.setEmail(attenders.getEmail());
99
                member.setIsCheck(1);
100
                member.setCreateId(getUserId());
101
                memberService.saveMember(member);
102
                attenders.setMemberId(member.getId());
103
            } else {
104
                member.setUsername(attenders.getPhone());
105
                member.setTruename(attenders.getName());
106
                member.setOrganization(attenders.getOrganization());
107
                member.setPosition(attenders.getPosition());
108
                member.setJobTitle(attenders.getJobTitle());
109
                member.setPhone(attenders.getPhone());
110
                member.setEmail(attenders.getEmail());
111
                memberService.updateById(member);
89
            MemberEntity ismember = memberService.getByUserName(attenders.getPhone());
90
            System.out.println(ismember);
91
            if (ismember != null) {
92
                return R.error("手机号重复");
112 93
            }
94
            MemberEntity member = new MemberEntity();
95
            member.setUsername(attenders.getPhone());
96
            member.setPassword("123456");         // 默认密码
97
            member.setTruename(attenders.getName());
98
            member.setOrganization(attenders.getOrganization());
99
            member.setPosition(attenders.getPosition());
100
            member.setJobTitle(attenders.getJobTitle());
101
            member.setPhone(attenders.getPhone());
102
            member.setEmail(attenders.getEmail());
103
            member.setIsCheck(1);
104
            member.setCreateId(getUserId());
105
            memberService.saveMember(member);
106
            attenders.setMemberId(member.getId());
113 107
        } else {
114 108
            MemberEntity member = new MemberEntity();
115 109
            member.setId(attenders.getMemberId());

+ 2 - 4
src/main/java/io/renren/modules/admin/controller/MemberController.java

@ -123,13 +123,11 @@ public class MemberController extends AbstractController  {
123 123
    @PostMapping("/status")
124 124
    @RequiresPermissions("admin:member:status")
125 125
    @ApiOperation("改变审核状态")
126
    public R status(@RequestBody Map<String, Object> params){
127
    //    System.out.println(params);      
126
    public R status(@RequestBody Map<String, Object> params){   
128 127
        Long id = Long.valueOf(params.get("id").toString());
129 128
        Integer status = Integer.valueOf(params.get("status").toString());
130
        // System.out.println(id);
131
        // System.out.println(status);
132 129
        memberService.updateStatus(id, status);
130
        
133 131
        return R.ok();
134 132
    }
135 133

+ 7 - 0
src/main/java/io/renren/modules/admin/service/MemberService.java

@ -45,6 +45,13 @@ public interface MemberService extends IService<MemberEntity> {
45 45
	 */
46 46
	MemberEntity getByUserName(String username);
47 47
48
	/**
49
	 * 根据用户名或手机号判断member表里是否已存在此值
50
	 * @param username
51
	 * @return
52
	 */
53
	boolean isMember(String usernameorphone);
54
48 55
	List<Map<String, Object>> getListByName(String truename);
49 56
	
50 57
	List<Map<String, Object>> getList();

+ 10 - 0
src/main/java/io/renren/modules/admin/service/impl/MemberServiceImpl.java

@ -126,6 +126,16 @@ public class MemberServiceImpl extends ServiceImpl<MemberDao, MemberEntity> impl
126 126
        return this.getOne(new QueryWrapper<MemberEntity>().eq("username", username));
127 127
    }
128 128
129
    @Override
130
    public boolean isMember(String usernameorphone) {
131
        boolean res = false;
132
        MemberEntity member = this.getOne(new QueryWrapper<MemberEntity>().eq("username", usernameorphone).or().eq("phone", usernameorphone));
133
        if (member != null) {
134
            res = true;
135
        }
136
        return res;
137
    }
138
129 139
    @Override
130 140
    public List<Map<String, Object>> getListByName(String truename) {
131 141
        return baseMapper.selectListByName(truename);