'新增unionid'

twzd-common/src/main/java/com/miaxis/common/core/domain/entity/UserInfo.java

@@ -61,13 +61,6 @@ public class UserInfo extends BaseBusinessEntity{
     @ApiModelProperty(value = "微信openid")
     private String openid;
 
-    /** 微信openid */
-    @Excel(name = "联合id")
-    @TableField("unionid")
-    @ApiModelProperty(value = "unionid")
-    private String unionid;
-
-
 
 
     /** 0 启用 1禁用 */
@@ -84,10 +77,10 @@ public class UserInfo extends BaseBusinessEntity{
 
 
     /** 驾校班型Id */
-//    @Excel(name = "联合id")
-//    @TableField("union_id")
-//    @ApiModelProperty(value = "联合id")
-//    private String unionId;
+    @Excel(name = "联合id")
+    @TableField("union_id")
+    @ApiModelProperty(value = "联合id")
+    private String unionId;
 
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" )

twzd-framework/src/main/java/com/miaxis/framework/web/service/UserDetailsServiceImpl.java

@@ -9,7 +9,6 @@ import com.miaxis.common.exception.BaseException;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.ServletUtils;
 import com.miaxis.common.utils.StringUtils;
-import com.miaxis.system.service.ISysConfigService;
 import com.miaxis.system.service.ISysUserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -37,8 +36,7 @@ public class UserDetailsServiceImpl implements UserDetailsService
     @Autowired
     private SysPermissionService permissionService;
 
-    @Autowired
-    private ISysConfigService configService;
+
 
     @Override
     @Transactional
@@ -70,14 +68,14 @@ public class UserDetailsServiceImpl implements UserDetailsService
                     userInfo = new UserInfo();
                     userInfo.setHeadImage((String) ServletUtils.getRequest().getAttribute("headImage"));
                     userInfo.setNickName((String) ServletUtils.getRequest().getAttribute("nickName"));
-                    userInfo.setUnionid((String) ServletUtils.getRequest().getAttribute("unionid"));
+                    userInfo.setUnionId((String) ServletUtils.getRequest().getAttribute("unionid"));
                     userInfo.setOpenid(identification);
                     userService.saveUserInfo(userInfo);
                     userInfo = userService.getStudentByOpenId(identification);
                 }else {
                     userInfo.setHeadImage((String) ServletUtils.getRequest().getAttribute("headImage"));
                     userInfo.setNickName((String) ServletUtils.getRequest().getAttribute("nickName"));
-                    userInfo.setUnionid((String) ServletUtils.getRequest().getAttribute("unionid"));
+                    userInfo.setUnionId((String) ServletUtils.getRequest().getAttribute("unionid"));
                     userService.updateStudent(userInfo);
                 }
                 return createLoginUser(userInfo);

twzd-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -102,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		insert into user_info (head_image,nick_name,openid) values (#{headImage},#{nickName},#{openid})
 	</insert>
 	<insert id="updateStudent" parameterType="com.miaxis.common.core.domain.entity.UserInfo" >
-		update user_info set head_image = #{headImage},nick_name = #{nickName} where openid = #{openid}
+		update user_info set head_image = #{headImage},nick_name = #{nickName},union_id = #{unionId} where openid = #{openid}
 	</insert>