xhxu 5 лет назад
Родитель
Сommit
952281fee0
6 измененных файлов: 6 добавлений и 6 удалений
  1. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java
  2. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java
  3. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  4. +1
    -1
      mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java
  5. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/base/BaseCUserEntity.java
  6. +1
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/miniApp/maPay/WxMiniMaPayAdapterService.java

+ 1
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java Просмотреть файл

@@ -75,7 +75,7 @@ public class WxMsgValidationcodeController extends BaseController {
if (rd.code == Result.SUCCESS) { if (rd.code == Result.SUCCESS) {
// 更新到basicinfo // 更新到basicinfo
Long userId = user.getId(); Long userId = user.getId();
if (user.isBasicInfo()) {
if (user.basicInfoIs()) {
userId = user.getUserId(); userId = user.getUserId();
} }
Long basicUserId = saveToBasicInfoByCUser(phone, user.getNickName(), user.getAvatarUrl(), user.getGender(), userId); Long basicUserId = saveToBasicInfoByCUser(phone, user.getNickName(), user.getAvatarUrl(), user.getGender(), userId);


+ 1
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java Просмотреть файл

@@ -89,7 +89,7 @@ public class WxPayOrderController extends BaseController {
} }


WxCUser user = getWxCUser(); WxCUser user = getWxCUser();
if (!user.isBasicInfo()) {
if (!user.basicInfoIs()) {
logger.error("暂未成为会员,请授权手机号"); logger.error("暂未成为会员,请授权手机号");
return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号");
} }


+ 1
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java Просмотреть файл

@@ -767,7 +767,7 @@ public class WxUserGrantController extends BaseController {
org.springframework.beans.BeanUtils.copyProperties(user, userVo); org.springframework.beans.BeanUtils.copyProperties(user, userVo);
userVo.setScore(0); userVo.setScore(0);
userVo.setCredit(0); userVo.setCredit(0);
if(user.isBasicInfo()){
if(user.basicInfoIs()){
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(user.getUserId()); WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(user.getUserId());
if (wxCUserBasicInfo != null) { if (wxCUserBasicInfo != null) {
userVo.setScore(wxCUserBasicInfo.getPoins()); userVo.setScore(wxCUserBasicInfo.getPoins());


+ 1
- 1
mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java Просмотреть файл

@@ -70,7 +70,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
if (StringUtils.isNotBlank(cUser.getParentTenantId())) { if (StringUtils.isNotBlank(cUser.getParentTenantId())) {
request.setAttribute(Constant.PARENT_TENANT_ID, cUser.getParentTenantId()); request.setAttribute(Constant.PARENT_TENANT_ID, cUser.getParentTenantId());
} }
if(cUser.isBasicInfo()){
if(cUser.basicInfoIs()){
request.setAttribute(Constant.LOGIN_MEMBER_KEY, cUser.getUserId()); request.setAttribute(Constant.LOGIN_MEMBER_KEY, cUser.getUserId());
} }


+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/base/BaseCUserEntity.java Просмотреть файл

@@ -32,7 +32,7 @@ public class BaseCUserEntity extends TenantEntity {
* 是否是会员 * 是否是会员
* @return * @return
*/ */
public boolean isBasicInfo() {
public boolean basicInfoIs() {
return UserUtil.CuserIsBasicInfo(this.getUserId()); return UserUtil.CuserIsBasicInfo(this.getUserId());
} }
} }

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/miniApp/maPay/WxMiniMaPayAdapterService.java Просмотреть файл

@@ -233,7 +233,7 @@ public class WxMiniMaPayAdapterService extends BaseWxPayAdapterService implement
throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(), "微信扫码支付添加微信C端用户失败"); throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(), "微信扫码支付添加微信C端用户失败");
} }
}else { }else {
if (user1.isBasicInfo()) {
if (user1.basicInfoIs()) {
userId = user1.getUserId(); userId = user1.getUserId();
} }
} }


Загрузка…
Отмена
Сохранить