--no commit message

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/client/ScoreClient.java

+package com.zrqx.bg.member.client;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import com.zrqx.core.constant.member.MemberRequestPath;
+import com.zrqx.core.util.response.CallBack;
+
+import io.swagger.annotations.ApiOperation;
+
+@FeignClient(value="fg-member",fallback = ScoreHystric.class)
+public interface ScoreClient {
+
+	@ApiOperation(value = "我的积分（根据当前登录用户）")
+	@GetMapping(MemberRequestPath.FG + MemberRequestPath.MEMBER_SCORE + MemberRequestPath.MEMBER_SCORE_VALUE)
+	CallBack<Integer> getValue();
+
+}

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/client/ScoreHystric.java

+package com.zrqx.bg.member.client;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.zrqx.core.util.response.CallBack;
+
+public class ScoreHystric implements ScoreClient{
+	Logger logger = LoggerFactory.getLogger(ScoreHystric.class);
+	@Override
+	public CallBack<Integer> getValue() {
+		logger.error("远程调用Score获取用户积分失败");
+		return null;
+	}
+
+	
+
+}

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/mapper/member/MemberMapper.java

@@ -26,7 +26,7 @@ public interface MemberMapper extends BaseMapper<Member>{
 	 * @date: 2019年4月3日 下午8:11:37
 	 */
 	@Select(" <script> "
-			+ " select m.id, m.name, m.phone, m.password, m.email, m.num,m.sex,m.status,m.relationId,m.departmentId,"
+			+ " select DISTINCT m.id, m.name, m.phone, m.password, m.email, m.num,m.sex,m.status,m.relationId,m.departmentId,"
 			+ " m.img,m.isAdmin,m.type,m.integral,m.loginTime from me_member m"
 			+ " left join me_role_member_relation rr on m.id = rr.memberId "
 			+ " WHERE  1=1 "

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/service/member/MemberServiceImpl.java

@@ -7,7 +7,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import com.zrqx.bg.member.client.ScoreClient;
 import com.zrqx.bg.member.mapper.department.DepartmentMapper;
+import com.zrqx.bg.member.mapper.member.MemberLoginLogMapper;
 import com.zrqx.bg.member.mapper.member.MemberMapper;
 import com.zrqx.bg.member.mapper.press.PressMapper;
 import com.zrqx.bg.member.mapper.role.RoleMapper;
@@ -16,12 +19,14 @@ import com.zrqx.bg.member.mapper.samplebookapply.SampleBookApplyMapper;
 import com.zrqx.bg.member.mapper.samplebookvoucher.SampleBookVoucherMapper;
 import com.zrqx.bg.member.mapper.school.SchoolMapper;
 import com.zrqx.core.enums.MemberTypeEnum;
+import com.zrqx.core.exception.BusinessValidateException;
 import com.zrqx.core.form.member.bg.member.member.MemberForm;
 import com.zrqx.core.form.member.bg.member.member.QueryMemberForm;
 import com.zrqx.core.form.member.bg.member.member.QueryMemberListForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.member.departmentmember.DepartmentMember;
 import com.zrqx.core.model.member.member.Member;
+import com.zrqx.core.model.member.member.MemberLoginLog;
 import com.zrqx.core.model.member.press.Press;
 import com.zrqx.core.model.member.rolemember.RoleMember;
 import com.zrqx.core.model.member.rolemember.RoleMemberRelation;
@@ -34,8 +39,12 @@ import com.zrqx.core.util.datatype.ArrayUtils;
 import com.zrqx.core.util.encry.MD5Util;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
+import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.member.member.MemberInfoVo;
 import com.zrqx.core.vo.member.member.MemberVo;
+import com.zrqx.core.vo.sysuser.fg.collections.CollectionsVo;
+
+import tk.mybatis.mapper.entity.Example;
 @Service
 public class MemberServiceImpl extends BaseModelServiceImpl<Member,Integer> implements MemberService{
 
@@ -57,7 +66,10 @@ public class MemberServiceImpl extends BaseModelServiceImpl<Member,Integer> impl
 	private SampleBookVoucherMapper sampleBookVoucherMapper;
 	@Autowired
 	private SampleBookApplyMapper sampleBookApplyMapper;
-	
+	@Autowired
+	private MemberLoginLogMapper memberLoginLogMapper;
+	/*@Autowired
+	private ScoreClient scoreClient;*/
 	@Override
 	public BaseMapper<Member> getMapper() {
 		return this.memberMapper;
@@ -92,15 +104,37 @@ public class MemberServiceImpl extends BaseModelServiceImpl<Member,Integer> impl
 		}
 		startPage(pageParam);
 		List<MemberVo> voList = memberMapper.list(form);
+		
+		voList.stream().forEach(vo->{
+			System.out.println("------------------------" + vo.getId());
+		});
+		
 		String relationName = this.getRelationName(form.getRelationId(), form.getType());
 		for(MemberVo v : voList) {
 			v.setRelationName(relationName);
 			if(StringUtils.isNotBlank(v.getDepartmentId())){
-				DepartmentMember dept = departmentMapper.selectByPrimaryKey(Integer.parseInt(v.getDepartmentId()));
+				DepartmentMember dept = departmentMapper.selectByPrimaryKey(Integer.parseInt(v.getDepartmentId().trim()));
 				if (dept != null) {
 					v.setDepartmentName(dept.getName());
 				}
 			}
+			//最后登录时间
+			Example example = new Example(MemberLoginLog.class);
+			if(StringUtils.isNotBlank(v.getPhone())){
+				example.createCriteria().andEqualTo("account", v.getPhone());
+				try {
+					MemberLoginLog log = memberLoginLogMapper.selectOneByExample(example);
+					if(log != null){
+						v.setLoginTime(log.getCreateTime());
+					}
+				} catch (Exception e) {
+					throw new BusinessValidateException("");
+				}
+				
+			}
+			//用户积分
+			/*CallBack<Integer> call = scoreClient.getValue();
+			v.setIntegral(call.getData());*/
 			List<String> roles = roleMapper.listByMemberId(v.getId());
 			v.setRoleIdList(roles);
 		}

com.zrqx.core/.classpath

@@ -28,6 +28,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_151"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

com.zrqx.core/src/main/java/com/zrqx/core/model/member/member/MemberSigned.java

@@ -23,9 +23,9 @@ public class MemberSigned {
 	@ApiModelProperty("签到信息")
 	private String mark;
 	@ApiModelProperty("总签到数")
-	private int count;
+	private Integer count;
 	@ApiModelProperty("连续签到天数")
-	private int continueSign;
+	private Integer continueSign;
 	@ApiModelProperty("奖励积分")
 	private Integer score;
 	@ApiModelProperty("签到ip")

com.zrqx.fg.member/.classpath

@@ -26,6 +26,9 @@
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
+		<accessrules>
+			<accessrule kind="accessible" pattern="**"/>
+		</accessrules>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>

com.zrqx.fg.member/src/main/java/com/zrqx/fg/member/controller/scorerecord/FgScoreController.java

 package com.zrqx.fg.member.controller.scorerecord;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.zrqx.core.commons.redis.Redis;
 import com.zrqx.core.constant.member.MemberRequestPath;
+import com.zrqx.core.model.member.member.Member;
+import com.zrqx.core.model.member.scorerecord.Score;
+import com.zrqx.core.util.response.CallBack;
 import com.zrqx.fg.member.service.scorerecord.FgScoreService;
 
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import tk.mybatis.mapper.entity.Example;
 
 @RestController
 @RequestMapping(MemberRequestPath.FG + MemberRequestPath.MEMBER_SCORE)
@@ -16,5 +23,18 @@ public class FgScoreController {
 
 	@Autowired
 	private FgScoreService fgScoreService;
+	@Autowired
+	private Redis redis;
+	
+	@ApiOperation(value = "用户积分",notes = "用户积分")
+	@GetMapping(MemberRequestPath.MEMBER_SCORE_VALUE)
+	public CallBack<Integer> getSorceNum(){
+		Member member = redis.getMember();
+		Example example = new Example(Score.class);
+		example.createCriteria().andEqualTo("memberId",member.getId());
+		Score score = fgScoreService.selectOneByExample(example);
+		Integer value = score.getValue();
+		return CallBack.success(value);
+	}
 
 }

com.zrqx.fg.member/src/main/java/com/zrqx/fg/member/controller/scorerecord/FgScoreRecordController.java

@@ -38,16 +38,7 @@ public class FgScoreRecordController {
 		return CallBack.success(fgScoreRecordService.getScoreRecordList(pageParam));
 	}
 	
-	@ApiOperation(value = "用户积分",notes = "用户积分")
-	@GetMapping(MemberRequestPath.MEMBER_SCORE_VALUE)
-	public CallBack<Integer> getSorceNum(){
-		Member member = redis.getMember();
-		Example example = new Example(Score.class);
-		example.createCriteria().andEqualTo("memberId",member.getId());
-		Score score = fgScoreService.selectOneByExample(example);
-		Integer value = score.getValue();
-		return CallBack.success(value);
-	}
+	
 	
 	@ApiOperation(value = "积分充值",notes = "积分充值")
 	@PostMapping(MemberRequestPath.SCORE_RECHARGE)

com.zrqx.fg.member/src/main/java/com/zrqx/fg/member/service/member/FgMemberSignedServiceImpl.java

@@ -26,6 +26,8 @@ public class FgMemberSignedServiceImpl extends BaseServiceImpl<MemberSigned,Inte
 	public BaseMapper<MemberSigned> getMapper() {
 		return fgMemberSignedMapper;
 	}
+	
+	
 	@Override
 	public Boolean signed() {
 		Member member = redis.getMember();
@@ -37,6 +39,7 @@ public class FgMemberSignedServiceImpl extends BaseServiceImpl<MemberSigned,Inte
 			MemberSigned memberSigned = new MemberSigned();
 			memberSigned.setMemberId(member.getId().toString());
 			memberSigned.setCreateTime(new Date());
+			memberSigned.setUpdateTime(new Date());
 			memberSigned.setCount(1);
 			memberSigned.setContinueSign(1);
 			fgMemberSignedMapper.insert(memberSigned);
@@ -49,8 +52,8 @@ public class FgMemberSignedServiceImpl extends BaseServiceImpl<MemberSigned,Inte
 				//不连续
 				ms.setContinueSign(0);
 			}
-			
 			ms.setCount(ms.getCount()+1);
+			ms.setUpdateTime(new Date());
 			fgMemberSignedMapper.updateByExample(ms, example);
 		}