diff --git a/framework/src/main/java/cn/lili/common/token/base/generate/StoreTokenGenerate.java b/framework/src/main/java/cn/lili/common/token/base/generate/StoreTokenGenerate.java index 963eeb49b..0496fcea3 100644 --- a/framework/src/main/java/cn/lili/common/token/base/generate/StoreTokenGenerate.java +++ b/framework/src/main/java/cn/lili/common/token/base/generate/StoreTokenGenerate.java @@ -6,13 +6,11 @@ import cn.lili.common.security.enums.UserEnums; import cn.lili.common.token.Token; import cn.lili.common.token.TokenUtil; import cn.lili.common.token.base.AbstractTokenGenerate; -import cn.lili.common.enums.SwitchEnum; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.service.MemberService; import cn.lili.modules.store.entity.dos.Store; import cn.lili.modules.store.service.StoreService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -37,10 +35,10 @@ public class StoreTokenGenerate extends AbstractTokenGenerate { public Token createToken(String username, Boolean longTerm) { // 生成token Member member = memberService.findByUsername(username); - if (member.getHaveStore().equals(SwitchEnum.CLOSE.name())) { + if (!member.getHaveStore()) { throw new ServiceException("该会员未开通店铺"); } - AuthUser user = new AuthUser(member.getUsername(), member.getId(),member.getNickName(), UserEnums.STORE); + AuthUser user = new AuthUser(member.getUsername(), member.getId(), member.getNickName(), UserEnums.STORE); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Store::getMemberId, member.getId()); Store store = storeService.getOne(queryWrapper); diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java index 16273681d..33616b57c 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java @@ -20,7 +20,7 @@ public class StoreEditDTO extends StoreDetail { private String storeDisable; @ApiModelProperty(value = "是否自营", required = true) - private Integer selfOperated; + private Boolean selfOperated; @ApiModelProperty(value = "经纬度") private String storeCenter; diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java index 3f5ba6b27..225453e9b 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java @@ -2,7 +2,6 @@ package cn.lili.modules.store.serviceimpl; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; -import cn.lili.common.enums.SwitchEnum; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.context.UserContext; @@ -35,7 +34,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -102,7 +100,7 @@ public class StoreServiceImpl extends ServiceImpl implements throw new ServiceException(ResultCode.USER_NOT_EXIST); } //判断是否拥有店铺 - if (SwitchEnum.OPEN.name().equals(member.getHaveStore())) { + if (member.getHaveStore()) { throw new ServiceException(ResultCode.STORE_APPLY_DOUBLE_ERROR); } @@ -118,7 +116,7 @@ public class StoreServiceImpl extends ServiceImpl implements //设置会员-店铺信息 memberService.update(new LambdaUpdateWrapper() .eq(Member::getId,member.getId()) - .set(Member::getHaveStore,SwitchEnum.OPEN.name()) + .set(Member::getHaveStore,true) .set(Member::getStoreId,store.getId())); return store; @@ -177,6 +175,11 @@ public class StoreServiceImpl extends ServiceImpl implements store.setStoreDisable(StoreStatusEnum.OPEN.value()); //添加店铺页面 pageDataService.addStorePageData(store.getId()); + //修改会员 表示已有店铺 + Member member = memberService.getById(store.getMemberId()); + member.setHaveStore(true); + memberService.updateById(member); + } else { store.setStoreDisable(StoreStatusEnum.REFUSED.value()); }