diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java index b444caee8..e2e41be9f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java @@ -11,6 +11,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.MallUserInfoVo; +import com.iformall.enums.EnumMallUserStatus; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; import com.iformall.service.MallRoleService; @@ -178,7 +179,7 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { mallUserInfo.setPassword(wxProjectConfig.getPassword()); new PasswordHelper().encryptPassword(mallUserInfo); mallUserInfo.setCreateTime(new Date()); - mallUserInfo.setStatus(1); + mallUserInfo.setStatus(EnumMallUserStatus.VALID.getCode()); mallUserInfo.setIsAdmin(1); mallUserInfo.setPhone(wxProjectConfig.getPhone()); mallUserInfoMapper.insert(mallUserInfo); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index be10c789d..133b7f0c0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -261,7 +261,8 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { } int currentCreditAmount = 0; //获取当前用户总积分规则: - if (wxCUserBasicInfo != null && wxCUserBasicInfo.getCredit() != null && wxCUserBasicInfo.getCredit() > 0) { +// if (wxCUserBasicInfo != null && wxCUserBasicInfo.getCredit() != null && wxCUserBasicInfo.getCredit() > 0) { + if (wxCUserBasicInfo != null && wxCUserBasicInfo.getCredit() != null) { currentCreditAmount = wxCUserBasicInfo.getCredit(); } record.setCreditAmount(currentCreditAmount); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java index 815453df1..8a75a051a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java @@ -8,6 +8,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumInvestUserType; +import com.iformall.enums.EnumMallUserStatus; import com.iformall.enums.EnumUserAdmin; import com.iformall.mapper.WxMallBuildingMapper; import com.iformall.mapper.WxMallFloorMapper; @@ -306,7 +307,7 @@ public class WxMallServiceImpl implements WxMallService { userInfo.setUsername(wxMall.getAdminUsername()); userInfo.setPhone(wxMall.getAdminPhone()); userInfo.setPassword(wxMall.getAdminPassword()); - userInfo.setStatus(wxMall.getAdminStatus()); + if(userInfo.getId() == null){ if(userInfoService.cntByUserName(userInfo.getUsername()) > 0){ return new ResultData(ErrorCode.USER_NAME_IS_FOUND.getCode(),"用户名已存在"); @@ -322,6 +323,7 @@ public class WxMallServiceImpl implements WxMallService { passwordHelper.encryptPassword(userInfo); userInfo.setIsAdmin(EnumUserAdmin.ADMIN.getCode()); userInfo.setInvestRule(EnumInvestUserType.ALL.getCode()); + userInfo.setStatus(EnumMallUserStatus.VALID.getCode()); }else{ MallUserInfo oldUser = userInfoService.getById(userInfo.getId()); if(oldUser == null){ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index d4bb2a109..494c228d2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -785,7 +785,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public boolean hasMerchant(WxMerchant wxMerchant) { - wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); +// wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); return wxMerchantMapper.hasMerchant(wxMerchant) > 0 ? true : false; } @@ -1066,7 +1066,10 @@ public class WxMerchantServiceImpl implements WxMerchantService { if(wxMerchant.getId() == null){ final IdWorker idWorker = IdWorker.get(); wxMerchant.setId(idWorker.nextId()); - wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); + if(wxMerchant.getStatus() == null){ + wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); + } +// wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); if(wxMerchant.getIsAdmin() == null) { wxMerchant.setIsAdmin(EnumYesOrNo.NO.getCode()); } diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java index d5e63302b..4cd9584e0 100644 --- a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java +++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java @@ -60,7 +60,11 @@ public class WxMallController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode()); } TenantEntity tenantEntity = ifParentTenantInfoAlone(); + WxMall parentTenantId = wxMallService.getByTenantId(tenantEntity.getTenantId()); + wxMall.setParentTenantId(tenantEntity.getTenantId()); + wxMall.setImgUrlH(parentTenantId.getImgUrlH()); + if(StringUtils.isBlank(wxMall.getName())){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"名称不能为空"); }