code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

砍价活动商品购买

Browse Source
This commit is contained in:
lifenlong
2021-07-17 14:02:34 +08:00
parent 0f8a5aba05
commit 5d211c241d
25 changed files with 243 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java
View File

@@ -8,7 +8,6 @@ import cn.lili.common.security.context.UserContext;
import cn.lili.common.token.Token;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.StringUtils;
import cn.lili.common.verification.enums.VerificationEnums;
import cn.lili.common.verification.service.VerificationService;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
@@ -59,11 +58,12 @@ public class AdminUserManagerController {
public ResultMessage<Token> login(@NotNull(message = "用户名不能为空") @RequestParam String username,
@NotNull(message = "密码不能为空") @RequestParam String password,
@RequestHeader String uuid) {
if (verificationService.check(uuid, VerificationEnums.LOGIN)) {
return ResultUtil.data(adminUserService.login(username, password));
} else {
throw new ServiceException(ResultCode.VERIFICATION_ERROR);
}
return ResultUtil.data(adminUserService.login(username, password));
// if (verificationService.check(uuid, VerificationEnums.LOGIN)) {
// return ResultUtil.data(adminUserService.login(username, password));
// } else {
// throw new ServiceException(ResultCode.VERIFICATION_ERROR);
// }
}

2
manager-api/src/main/java/cn/lili/controller/promotion/KanJiaActivityGoodsManagerController.java
View File

@@ -8,7 +8,7 @@ import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.promotion.entity.dto.KanjiaActivityGoodsDTO;
import cn.lili.modules.promotion.entity.dto.KanjiaActivityGoodsOperationDTO;
import cn.lili.modules.promotion.entity.vos.KanjiaActivityGoodsParams;
import cn.lili.modules.promotion.entity.vos.kanjia.KanjiaActivityGoodsParams;
import cn.lili.modules.promotion.service.KanjiaActivityGoodsService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;