Explorar el Código

tt

release_toaliyun_real
xhxu hace 5 años
padre
commit
e992f35d2d
Se han modificado 5 ficheros con 16 adiciones y 5 borrados
  1. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java
  2. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java
  3. +3
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java
  4. +5
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  5. +4
    -0
      mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java

+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java Ver fichero

@@ -11,6 +11,7 @@ import com.iformall.common.ResultData;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.MallUserInfoVo; import com.iformall.domain.vo.MallUserInfoVo;
import com.iformall.enums.EnumMallUserStatus;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
import com.iformall.mapper.*; import com.iformall.mapper.*;
import com.iformall.service.MallRoleService; import com.iformall.service.MallRoleService;
@@ -178,7 +179,7 @@ public class MallUserInfoServiceImpl implements MallUserInfoService {
mallUserInfo.setPassword(wxProjectConfig.getPassword()); mallUserInfo.setPassword(wxProjectConfig.getPassword());
new PasswordHelper().encryptPassword(mallUserInfo); new PasswordHelper().encryptPassword(mallUserInfo);
mallUserInfo.setCreateTime(new Date()); mallUserInfo.setCreateTime(new Date());
mallUserInfo.setStatus(1);
mallUserInfo.setStatus(EnumMallUserStatus.VALID.getCode());
mallUserInfo.setIsAdmin(1); mallUserInfo.setIsAdmin(1);
mallUserInfo.setPhone(wxProjectConfig.getPhone()); mallUserInfo.setPhone(wxProjectConfig.getPhone());
mallUserInfoMapper.insert(mallUserInfo); mallUserInfoMapper.insert(mallUserInfo);


+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java Ver fichero

@@ -261,7 +261,8 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
} }
int currentCreditAmount = 0; 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(); currentCreditAmount = wxCUserBasicInfo.getCredit();
} }
record.setCreditAmount(currentCreditAmount); record.setCreditAmount(currentCreditAmount);


+ 3
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java Ver fichero

@@ -8,6 +8,7 @@ import com.iformall.common.ResultData;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.EnumInvestUserType; import com.iformall.enums.EnumInvestUserType;
import com.iformall.enums.EnumMallUserStatus;
import com.iformall.enums.EnumUserAdmin; import com.iformall.enums.EnumUserAdmin;
import com.iformall.mapper.WxMallBuildingMapper; import com.iformall.mapper.WxMallBuildingMapper;
import com.iformall.mapper.WxMallFloorMapper; import com.iformall.mapper.WxMallFloorMapper;
@@ -306,7 +307,7 @@ public class WxMallServiceImpl implements WxMallService {
userInfo.setUsername(wxMall.getAdminUsername()); userInfo.setUsername(wxMall.getAdminUsername());
userInfo.setPhone(wxMall.getAdminPhone()); userInfo.setPhone(wxMall.getAdminPhone());
userInfo.setPassword(wxMall.getAdminPassword()); userInfo.setPassword(wxMall.getAdminPassword());
userInfo.setStatus(wxMall.getAdminStatus());
if(userInfo.getId() == null){ if(userInfo.getId() == null){
if(userInfoService.cntByUserName(userInfo.getUsername()) > 0){ if(userInfoService.cntByUserName(userInfo.getUsername()) > 0){
return new ResultData(ErrorCode.USER_NAME_IS_FOUND.getCode(),"用户名已存在"); return new ResultData(ErrorCode.USER_NAME_IS_FOUND.getCode(),"用户名已存在");
@@ -322,6 +323,7 @@ public class WxMallServiceImpl implements WxMallService {
passwordHelper.encryptPassword(userInfo); passwordHelper.encryptPassword(userInfo);
userInfo.setIsAdmin(EnumUserAdmin.ADMIN.getCode()); userInfo.setIsAdmin(EnumUserAdmin.ADMIN.getCode());
userInfo.setInvestRule(EnumInvestUserType.ALL.getCode()); userInfo.setInvestRule(EnumInvestUserType.ALL.getCode());
userInfo.setStatus(EnumMallUserStatus.VALID.getCode());
}else{ }else{
MallUserInfo oldUser = userInfoService.getById(userInfo.getId()); MallUserInfo oldUser = userInfoService.getById(userInfo.getId());
if(oldUser == null){ if(oldUser == null){


+ 5
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Ver fichero

@@ -785,7 +785,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {


@Override @Override
public boolean hasMerchant(WxMerchant wxMerchant) { public boolean hasMerchant(WxMerchant wxMerchant) {
wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode());
// wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode());
return wxMerchantMapper.hasMerchant(wxMerchant) > 0 ? true : false; return wxMerchantMapper.hasMerchant(wxMerchant) > 0 ? true : false;
} }


@@ -1066,7 +1066,10 @@ public class WxMerchantServiceImpl implements WxMerchantService {
if(wxMerchant.getId() == null){ if(wxMerchant.getId() == null){
final IdWorker idWorker = IdWorker.get(); final IdWorker idWorker = IdWorker.get();
wxMerchant.setId(idWorker.nextId()); 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) { if(wxMerchant.getIsAdmin() == null) {
wxMerchant.setIsAdmin(EnumYesOrNo.NO.getCode()); wxMerchant.setIsAdmin(EnumYesOrNo.NO.getCode());
} }


+ 4
- 0
mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java Ver fichero

@@ -60,7 +60,11 @@ public class WxMallController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode()); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode());
} }
TenantEntity tenantEntity = ifParentTenantInfoAlone(); TenantEntity tenantEntity = ifParentTenantInfoAlone();
WxMall parentTenantId = wxMallService.getByTenantId(tenantEntity.getTenantId());

wxMall.setParentTenantId(tenantEntity.getTenantId()); wxMall.setParentTenantId(tenantEntity.getTenantId());
wxMall.setImgUrlH(parentTenantId.getImgUrlH());

if(StringUtils.isBlank(wxMall.getName())){ if(StringUtils.isBlank(wxMall.getName())){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"名称不能为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"名称不能为空");
} }


Cargando…
Cancelar
Guardar