|
|
|
@@ -5,6 +5,7 @@ import com.iformall.common.ResultData; |
|
|
|
import com.iformall.domain.po.*; |
|
|
|
import com.iformall.domain.vo.WxCUserVo; |
|
|
|
import com.iformall.domain.vo.WxLevelMerchantCVo; |
|
|
|
import com.iformall.enums.EnumCreditLockedStatus; |
|
|
|
import com.iformall.enums.EnumLevelConfigDiscountStatus; |
|
|
|
import com.iformall.service.WxCUserBasicInfoService; |
|
|
|
import com.iformall.service.WxCUserService; |
|
|
|
@@ -75,12 +76,15 @@ public class WxMemController extends BaseController { |
|
|
|
org.springframework.beans.BeanUtils.copyProperties(cUser, userVo); |
|
|
|
|
|
|
|
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(cUser.getId()); |
|
|
|
if (wxCUserBasicInfo != null) { |
|
|
|
userVo.setName(wxCUserBasicInfo.getName()); |
|
|
|
userVo.setBirthdate(wxCUserBasicInfo.getBirthdate()); |
|
|
|
userVo.setSex(wxCUserBasicInfo.getSex()); |
|
|
|
userVo.setAddress(wxCUserBasicInfo.getAddress()); |
|
|
|
if (null != wxCUserBasicInfo && EnumCreditLockedStatus.CLOSE.getCode().equals(wxCUserBasicInfo.getStatus())) { |
|
|
|
return new ResultData(ErrorCode.MEMBER_IS_LOCKED); |
|
|
|
} |
|
|
|
|
|
|
|
userVo.setName(wxCUserBasicInfo.getName()); |
|
|
|
userVo.setBirthdate(wxCUserBasicInfo.getBirthdate()); |
|
|
|
userVo.setSex(wxCUserBasicInfo.getSex()); |
|
|
|
userVo.setAddress(wxCUserBasicInfo.getAddress()); |
|
|
|
|
|
|
|
userVo.setLevelName(WxLevelConfigService.DEFAULT_LEVEL); |
|
|
|
userVo.setDiscountRate(WxLevelConfigService.DEFAULT_MERCHANT_DISCOUNT); |
|
|
|
|
|
|
|
|