diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/vo/LoginUserVo.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/vo/LoginUserVo.java index 669c31b..1c47f88 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/vo/LoginUserVo.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/vo/LoginUserVo.java @@ -46,7 +46,7 @@ public class LoginUserVo { * 省id */ @Excel(name = "省id") - private String provinceId; + private Long provinceId; /** * 省 @@ -58,7 +58,7 @@ public class LoginUserVo { * 市id */ @Excel(name = "市id") - private String cityId; + private Long cityId; /** * 市 @@ -70,7 +70,7 @@ public class LoginUserVo { * 区id */ @Excel(name = "区id") - private String areaId; + private Long areaId; /** * 区 @@ -91,7 +91,7 @@ public class LoginUserVo { public LoginUserVo() { } - public LoginUserVo(Long id, String nickname, String headimg, String username, Integer credit, String mobile, String provinceId, String province, String cityId, String city, String areaId, String area, Date birthday, String token) { + public LoginUserVo(Long id, String nickname, String headimg, String username, Integer credit, String mobile, Long provinceId, String province, Long cityId, String city, Long areaId, String area, Date birthday, String token) { this.id = id; this.nickname = nickname; this.headimg = headimg; @@ -156,11 +156,11 @@ public class LoginUserVo { this.mobile = mobile; } - public String getProvinceId() { + public Long getProvinceId() { return provinceId; } - public void setProvinceId(String provinceId) { + public void setProvinceId(Long provinceId) { this.provinceId = provinceId; } @@ -172,11 +172,11 @@ public class LoginUserVo { this.province = province; } - public String getCityId() { + public Long getCityId() { return cityId; } - public void setCityId(String cityId) { + public void setCityId(Long cityId) { this.cityId = cityId; } @@ -188,11 +188,11 @@ public class LoginUserVo { this.city = city; } - public String getAreaId() { + public Long getAreaId() { return areaId; } - public void setAreaId(String areaId) { + public void setAreaId(Long areaId) { this.areaId = areaId; } @@ -219,4 +219,6 @@ public class LoginUserVo { public void setToken(String token) { this.token = token; } + + } diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java index 491475e..0cf04e6 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java @@ -21,6 +21,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -122,9 +124,10 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { // TODO: 首次完善,增加加分 (未完成) } - BeanUtils.copyProperties(userMemberUpdateVo, wxUserMember); - wxUserMember.setUpdateTime(DateUtils.getNowDate()); - wxUserMemberMapper.updateWxUserMember(wxUserMember); + WxUserMember update = new WxUserMember(); + BeanUtils.copyProperties(userMemberUpdateVo, update); + update.setUpdateTime(DateUtils.getNowDate()); + wxUserMemberMapper.updateWxUserMember(update); // 刷新用户信息 return refreshWxUserInfo(); @@ -136,6 +139,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { * @return */ @Override + @Transactional(propagation = Propagation.SUPPORTS) public LoginUserVo refreshWxUserInfo() { // 1、获取用户最新信息 String openid = SecurityUtils.getLoginUser().getWxUserMember().getOpenid();