Merge remote-tracking branch 'origin/master'

membercard-modules/member-module/src/main/java/com/cftech/member/dao/MemberMapper.java

 package com.cftech.member.dao;
 
 import com.cftech.core.generic.GenericDao;
+import com.cftech.core.sql.Conds;
 import com.cftech.member.model.Member;
 import com.cftech.member.model.MemberDto;
+import com.cftech.member.model.MemberVO;
 
 import java.util.List;
 import java.util.Map;
@@ -33,5 +35,12 @@ public interface MemberMapper extends GenericDao<Member> {
     List<MemberDto> selectmemberDto(Map<String,Object> params);
 
     int selectmemberDtoCount (Map<String,Object> params);
-
+    /**
+     *
+     * 个人信息回填
+     *
+     * @Param
+     * @return
+     **/
+    List<MemberVO> memberFormation(Long id);
 }
\ No newline at end of file

membercard-modules/member-module/src/main/java/com/cftech/member/dao/MemberMapper.xml

@@ -350,4 +350,8 @@
 	wx_mp_member m
         <include refid="sqlWhere"/>
     </select>
+    <select id="memberFormation" parameterType="java.lang.Long" resultType="com.cftech.member.model.MemberVO">
+       SELECT CONCAT(surname,`name`) AS memberName,sex,birthday,imageurl,other AS mailbox,phone
+       FROM  wx_mp_member WHERE id= #{id}
+    </select>
 </mapper>
\ No newline at end of file

membercard-modules/member-module/src/main/java/com/cftech/member/model/MemberVO.java

+package com.cftech.member.model;
+
+import java.util.Date;
+
+/**
+ * @author ：licc
+ * @date ：Created in 2020/10/19 14:30
+ * @description：
+ */
+public class MemberVO {
+    /*姓名*/
+    private  String memberName;
+    /*性别*/
+    private  Long Sex;
+    /*生日*/
+    private Date birthday;
+    /* 邮箱*/
+    private String mailbox;
+    /* 手机号码*/
+    private String phone;
+    /*用户头像*/
+    private String imageUrl;
+    /*openID*/
+    private String openid;
+    /*accountsID*/
+    private Long accountsID;
+}

membercard-modules/member-module/src/main/java/com/cftech/member/service/MemberService.java

 package com.cftech.member.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.cftech.core.feature.orm.mybatis.Page;
 import com.cftech.core.generic.GenericService;
 import com.cftech.core.sql.Conds;
 import com.cftech.core.sql.Sort;
 import com.cftech.member.model.Member;
 import com.cftech.member.model.MemberDto;
+import com.cftech.member.model.MemberVO;
 import com.cftech.workshop.meeting.model.Meeting;
 
 import java.util.List;
@@ -43,5 +45,13 @@ public interface MemberService extends GenericService<Member> {
     List<MemberDto> selectmemberDto(Conds conds, Sort sort, int page, int pageSize);
 
     int selectmemberDtoCount (Conds conds);
+    /**
+     *
+     * 个人信息回填
+     *
+     * @Param
+     * @return
+     **/
+    JSONObject memberFormation(Long id);
 
 }

membercard-modules/member-module/src/main/java/com/cftech/member/service/impl/MemberServiceImpl.java

 package com.cftech.member.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.cftech.core.generic.GenericDao;
 import com.cftech.core.generic.GenericServiceImpl;
 import com.cftech.core.scope.OrderType;
@@ -10,10 +11,13 @@ import com.cftech.core.util.StringUtils;
 import com.cftech.member.dao.MemberMapper;
 import com.cftech.member.model.Member;
 import com.cftech.member.model.MemberDto;
+import com.cftech.member.model.MemberVO;
 import com.cftech.member.service.MemberService;
 import com.cftech.workshop.meeting.model.Meeting;
 import com.cftech.workshop.workshop.model.Workshop;
 import com.cftech.workshop.workshop.service.WorkshopService;
+import com.esotericsoftware.minlog.Log;
+import com.mchange.v2.lang.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
@@ -75,7 +79,30 @@ public class MemberServiceImpl extends GenericServiceImpl<Member> implements Mem
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("conds", conds);
         return memberMapper.selectmemberDtoCount(params);
-    };
+    }
+
+    @Override
+    public JSONObject memberFormation(Long id) {
+        JSONObject rtnJson = new JSONObject();
+        try {
+            if (org.springframework.util.StringUtils.isEmpty(id)){
+                rtnJson.put("errorNo","1");
+                rtnJson.put("errorMsg","id不能为空");
+                return rtnJson;
+            }
+            List<MemberVO> memberVOS = memberMapper.memberFormation(id);
+            Log.info("参数值"+memberVOS);
+            rtnJson.put("errorNo","0");
+            rtnJson.put("data",memberVOS);
+            return rtnJson;
+        }catch (Exception e){
+            e.printStackTrace();
+            rtnJson.put("errorNo","1");
+        }
+        return rtnJson;
+    }
+
+
 
     @Override
     public void updateworkshop(Member member,String invitcode) {