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

merge master

Browse Source
This commit is contained in:
lifenlong
2021-05-19 19:29:51 +08:00
parent 48f24b675b 120189ef99
commit 250fffab77
205 changed files with 899 additions and 1251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manager-api/src/main/java/cn/lili/controller/file/FileManagerController.java
View File

@@ -1,7 +1,7 @@
package cn.lili.controller.file;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.common.vo.SearchVO;
@@ -54,7 +54,7 @@ public class FileManagerController {
@DeleteMapping(value = "/delete/{ids}")
public ResultMessage delete(@PathVariable List<String> ids) {
fileService.batchDelete(ids);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

4
manager-api/src/main/java/cn/lili/controller/goods/BrandManagerController.java
View File

@@ -3,7 +3,7 @@ package cn.lili.controller.goods;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.goods.entity.dos.Brand;
import cn.lili.modules.goods.entity.dto.BrandPageDTO;
@@ -88,7 +88,7 @@ public class BrandManagerController {
@PutMapping(value = "/disable/{brandId}")
public ResultMessage<Object> disable(@PathVariable String brandId, @RequestParam Boolean disable) {
if (brandService.brandDisable(brandId, disable)) {
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
throw new ServiceException(ResultCode.BRAND_DISABLE_ERROR);
}

5
manager-api/src/main/java/cn/lili/controller/goods/CategoryBrandManagerController.java
View File

@@ -1,7 +1,7 @@
package cn.lili.controller.goods;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.goods.entity.dos.CategoryBrand;
import cn.lili.modules.goods.entity.vos.CategoryBrandVO;
@@ -11,7 +11,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -55,7 +54,7 @@ public class CategoryBrandManagerController {
CategoryBrand categoryBrand = new CategoryBrand(categoryId, brandId);
categoryBrandService.save(categoryBrand);
}
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

6
manager-api/src/main/java/cn/lili/controller/goods/CategoryManagerController.java
View File

@@ -2,7 +2,7 @@ package cn.lili.controller.goods;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.goods.entity.dos.Category;
@@ -122,7 +122,7 @@ public class CategoryManagerController {
throw new ServiceException(ResultCode.CATEGORY_HAS_GOODS);
}
categoryService.delete(id);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@PutMapping(value = "/disable/{id}")
@@ -137,7 +137,7 @@ public class CategoryManagerController {
throw new ServiceException(ResultCode.CATEGORY_NOT_EXIST);
}
categoryService.updateCategoryStatus(id, enableOperations);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

4
manager-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupManagerController.java
View File

@@ -2,7 +2,7 @@ package cn.lili.controller.goods;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.goods.entity.dos.CategoryParameterGroup;
import cn.lili.modules.goods.entity.dos.Parameters;
@@ -76,7 +76,7 @@ public class CategoryParameterGroupManagerController {
parametersService.remove(new QueryWrapper<Parameters>().eq("group_id", id));
//删除参数组
categoryParameterGroupService.removeById(id);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

5
manager-api/src/main/java/cn/lili/controller/goods/CategorySpecificationManagerController.java
View File

@@ -1,7 +1,7 @@
package cn.lili.controller.goods;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.goods.entity.dos.CategorySpecification;
import cn.lili.modules.goods.entity.vos.CategorySpecificationVO;
@@ -13,7 +13,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -73,7 +72,7 @@ public class CategorySpecificationManagerController {
CategorySpecification categoryBrand = new CategorySpecification(categoryId, specId);
categorySpecificationService.save(categoryBrand);
}
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

8
manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java
View File

@@ -2,7 +2,7 @@ package cn.lili.controller.goods;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.goods.entity.dos.Goods;
import cn.lili.modules.goods.entity.dos.GoodsSku;
@@ -70,7 +70,7 @@ public class GoodsManagerController {
public ResultMessage<Object> underGoods(@PathVariable String goodsId, @NotEmpty(message = "下架原因不能为空") @RequestParam String reason) {
List<String> goodsIds = Arrays.asList(goodsId.split(","));
if (Boolean.TRUE.equals(goodsService.updateGoodsMarketAble(goodsIds, GoodsStatusEnum.DOWN, reason))) {
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
throw new ServiceException(ResultCode.GOODS_UNDER_ERROR);
}
@@ -84,7 +84,7 @@ public class GoodsManagerController {
public ResultMessage<Object> auth(@PathVariable List<String> goodsIds, @RequestParam String isAuth) {
//校验商品是否存在
if (goodsService.auditGoods(goodsIds, GoodsAuthEnum.valueOf(isAuth))) {
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
throw new ServiceException(ResultCode.GOODS_AUTH_ERROR);
}
@@ -97,7 +97,7 @@ public class GoodsManagerController {
})
public ResultMessage<Object> unpGoods(@PathVariable List<String> goodsId) {
if (goodsService.updateGoodsMarketAble(goodsId, GoodsStatusEnum.UPPER, "")) {
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
throw new ServiceException(ResultCode.GOODS_UPPER_ERROR);
}

3
manager-api/src/main/java/cn/lili/controller/goods/GoodsParameterManagerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.goods;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.goods.entity.vos.GoodsParamsGroupVO;
import cn.lili.modules.goods.service.GoodsParamsService;
@@ -8,7 +8,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;

6
manager-api/src/main/java/cn/lili/controller/goods/GoodsUnitManagerController.java
View File

@@ -1,10 +1,9 @@
package cn.lili.controller.goods;
import cn.lili.common.enums.MessageCode;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.goods.entity.dos.GoodsUnit;
@@ -13,7 +12,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -70,7 +68,7 @@ public class GoodsUnitManagerController {
@DeleteMapping("/delete/{ids}")
public ResultMessage<Object> delete(@NotNull @PathVariable List<String> ids) {
goodsUnitService.removeByIds(ids);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}

4
manager-api/src/main/java/cn/lili/controller/goods/ParameterManagerController.java
View File

@@ -2,7 +2,7 @@ package cn.lili.controller.goods;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.goods.entity.dos.Parameters;
import cn.lili.modules.goods.service.ParametersService;
@@ -54,7 +54,7 @@ public class ParameterManagerController {
@DeleteMapping(value = "/{id}")
public ResultMessage<Object> delById(@PathVariable String id) {
parametersService.removeById(id);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}

2
manager-api/src/main/java/cn/lili/controller/goods/SpecValuesManagerController.java
View File

@@ -1,7 +1,7 @@
package cn.lili.controller.goods;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.goods.entity.dos.SpecValues;
import cn.lili.modules.goods.service.SpecValuesService;

4
manager-api/src/main/java/cn/lili/controller/goods/SpecificationManagerController.java
View File

@@ -3,7 +3,7 @@ package cn.lili.controller.goods;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.goods.entity.dos.Specification;
@@ -88,6 +88,6 @@ public class SpecificationManagerController {
@ApiOperation(value = "批量删除")
public ResultMessage<Object> delAllByIds(@PathVariable List<String> ids) {
specificationService.deleteSpecification(ids);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

2
manager-api/src/main/java/cn/lili/controller/member/ConnectConfigManagerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.member;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.connect.entity.ConnectConfig;
import cn.lili.modules.connect.entity.vo.ConnectConfigForm;

2
manager-api/src/main/java/cn/lili/controller/member/IpInfoManagerController.java
View File

@@ -1,7 +1,7 @@
package cn.lili.controller.member;
import cn.lili.common.utils.IpHelper;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

10
manager-api/src/main/java/cn/lili/controller/member/MemberAddressManagerController.java
View File

@@ -1,8 +1,6 @@
package cn.lili.controller.member;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.entity.dos.MemberAddress;
@@ -39,10 +37,8 @@ public class MemberAddressManagerController {
@ApiImplicitParam(name = "id", value = "会员地址ID", dataType = "String", paramType = "path")
@DeleteMapping(value = "/delById/{id}")
public ResultMessage<Object> delShippingAddressById(@PathVariable String id) {
if (memberAddressService.removeMemberAddress(id)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
memberAddressService.removeMemberAddress(id);
return ResultUtil.success();
}
@ApiOperation(value = "修改会员收件地址")

16
manager-api/src/main/java/cn/lili/controller/member/MemberEvaluationManagerController.java
View File

@@ -1,8 +1,6 @@
package cn.lili.controller.member;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.entity.dto.EvaluationQueryParams;
@@ -54,20 +52,16 @@ public class MemberEvaluationManagerController {
})
@GetMapping(value = "/updateStatus/{id}")
public ResultMessage<Object> updateStatus(@PathVariable String id, @NotNull String status) {
if (memberEvaluationService.updateStatus(id, status)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
memberEvaluationService.updateStatus(id, status);
return ResultUtil.success();
}
@ApiOperation(value = "删除评论")
@ApiImplicitParam(name = "id", value = "评价ID", required = true, dataType = "String", paramType = "path")
@PutMapping(value = "/delete/{id}")
public ResultMessage<IPage<Object>> delete(@PathVariable String id) {
if (memberEvaluationService.delete(id)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
memberEvaluationService.delete(id);
return ResultUtil.success();
}
}

12
manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java
View File

@@ -1,8 +1,6 @@
package cn.lili.controller.member;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.entity.dos.Member;
@@ -65,14 +63,12 @@ public class MemberManagerController {
@ApiOperation(value = "修改会员状态,开启关闭会员")
@ApiImplicitParams({
@ApiImplicitParam(name = "memberIds", value = "会员ID", required = true, dataType = "String", allowMultiple = true, paramType = "query"),
@ApiImplicitParam(name = "disabled", required = true, dataType = "boolean", paramType = "query")
@ApiImplicitParam(name = "disabled", required = true, dataType = "boolean", paramType = "query")
})
@PutMapping("/updateMemberStatus")
public ResultMessage<Object> updateMemberStatus(@RequestParam List<String> memberIds, @RequestParam Boolean disabled) {
if (memberService.updateMemberStatus(memberIds, disabled)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
memberService.updateMemberStatus(memberIds, disabled);
return ResultUtil.success();
}

12
manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java
View File

@@ -1,9 +1,7 @@
package cn.lili.controller.member;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.entity.dos.MemberNoticeLog;
@@ -53,16 +51,14 @@ public class MemberNoticeLogManagerController {
@ApiOperation(value = "编辑或更新数据")
@PostMapping(value = "/insertOrUpdate")
public ResultMessage<MemberNoticeLog> saveOrUpdate(MemberNoticeLog memberNoticeLog) {
if (memberNoticeLogService.saveOrUpdate(memberNoticeLog)) {
return ResultUtil.data(memberNoticeLog);
}
throw new ServiceException(ResultCode.ERROR);
memberNoticeLogService.saveOrUpdate(memberNoticeLog);
return ResultUtil.data(memberNoticeLog);
}
@ApiOperation(value = "批量删除")
@DeleteMapping(value = "/delByIds/{ids}")
public ResultMessage<Object> delAllByIds(@PathVariable List ids) {
memberNoticeLogService.removeByIds(ids);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

12
manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java
View File

@@ -1,9 +1,7 @@
package cn.lili.controller.member;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.common.vo.SearchVO;
@@ -58,16 +56,14 @@ public class MemberNoticeSenterManagerController {
@PostMapping(value = "/insertOrUpdate")
public ResultMessage<MemberNoticeSenter> saveOrUpdate(MemberNoticeSenter memberNoticeSenter) {
if (memberNoticeSenterService.customSave(memberNoticeSenter)) {
return ResultUtil.data(memberNoticeSenter);
}
throw new ServiceException(ResultCode.ERROR);
memberNoticeSenterService.customSave(memberNoticeSenter);
return ResultUtil.data(memberNoticeSenter);
}
@ApiOperation(value = "批量删除")
@DeleteMapping(value = "/delByIds/{ids}")
public ResultMessage<Object> delAllByIds(@PathVariable List ids) {
memberNoticeSenterService.removeByIds(ids);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

4
manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.member;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.entity.dos.MemberPointsHistory;

2
manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.member;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.entity.vo.MemberWalletVO;
import cn.lili.modules.member.service.MemberWalletService;

2
manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java
View File

@@ -1,7 +1,7 @@
package cn.lili.controller.member;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.entity.dos.MemberWithdrawApply;

10
manager-api/src/main/java/cn/lili/controller/other/ArticleCategoryManagerController.java
View File

@@ -1,8 +1,6 @@
package cn.lili.controller.other;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.page.entity.dos.ArticleCategory;
import cn.lili.modules.page.entity.vos.ArticleCategoryVO;
@@ -73,9 +71,7 @@ public class ArticleCategoryManagerController {
@ApiImplicitParam(name = "id", value = "文章分类ID", required = true, dataType = "String", paramType = "path")
@DeleteMapping("/{id}")
public ResultMessage<ArticleCategory> deleteById(@PathVariable String id) {
if (articleCategoryService.deleteById(id)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
articleCategoryService.deleteById(id);
return ResultUtil.success();
}
}

14
manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java
View File

@@ -1,8 +1,6 @@
package cn.lili.controller.other;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.page.entity.dos.Article;
import cn.lili.modules.page.entity.dto.ArticleSearchParams;
@@ -76,11 +74,9 @@ public class ArticleManagerController {
@ApiImplicitParam(name = "status", value = "操作状态", required = true, paramType = "query")
})
@PutMapping("update/status/{id}")
public ResultMessage<Article> updateStatus(@PathVariable("id") String id,boolean status) {
if(articleService.updateArticleStatus(id,status)){
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
public ResultMessage<Article> updateStatus(@PathVariable("id") String id, boolean status) {
articleService.updateArticleStatus(id, status);
return ResultUtil.success();
}
@@ -89,7 +85,7 @@ public class ArticleManagerController {
@DeleteMapping(value = "/delByIds/{id}")
public ResultMessage<Object> delAllByIds(@PathVariable String id) {
articleService.customRemove(id);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}

22
manager-api/src/main/java/cn/lili/controller/other/CustomWordsManagerController.java
View File

@@ -1,8 +1,6 @@
package cn.lili.controller.other;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.search.entity.dos.CustomWords;
@@ -38,29 +36,23 @@ public class CustomWordsManagerController {
@ApiOperation(value = "添加自定义分词")
@PostMapping
public ResultMessage<CustomWordsVO> addCustomWords(@Valid CustomWordsVO customWords) {
if (customWordsService.addCustomWords(customWords)) {
return ResultUtil.data(customWords);
}
throw new ServiceException(ResultCode.ERROR);
customWordsService.addCustomWords(customWords);
return ResultUtil.data(customWords);
}
@ApiOperation(value = "修改自定义分词")
@PutMapping
public ResultMessage<CustomWordsVO> updateCustomWords(@Valid CustomWordsVO customWords) {
if (customWordsService.updateCustomWords(customWords)) {
return ResultUtil.data(customWords);
}
throw new ServiceException(ResultCode.ERROR);
customWordsService.updateCustomWords(customWords);
return ResultUtil.data(customWords);
}
@ApiOperation(value = "删除自定义分词")
@ApiImplicitParam(name = "id", value = "文章ID", required = true, dataType = "String", paramType = "path")
@DeleteMapping("/{id}")
public ResultMessage<String> deleteCustomWords(@NotNull @PathVariable String id) {
if (customWordsService.deleteCustomWords(id)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
customWordsService.deleteCustomWords(id);
return ResultUtil.success();
}
@ApiOperation(value = "分页获取自定义分词")

3
manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java
View File

@@ -1,7 +1,7 @@
package cn.lili.controller.other;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.page.entity.dos.Feedback;
@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;

3
manager-api/src/main/java/cn/lili/controller/other/MessageManagerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.other;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.message.entity.dos.Message;
@@ -11,7 +11,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

2
manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.other;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.page.entity.dos.PageData;

22
manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java
View File

@@ -1,9 +1,7 @@
package cn.lili.controller.other;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.system.entity.dos.SensitiveWords;
@@ -49,11 +47,9 @@ public class SensitiveWordsManagerController {
@ApiOperation(value = "添加敏感词")
@PostMapping
public ResultMessage<SensitiveWords> add(@Valid SensitiveWords sensitiveWords) {
if (sensitiveWordsService.save(sensitiveWords)) {
SensitiveWordsFilter.put(sensitiveWords.getSensitiveWord());
return ResultUtil.data(sensitiveWords);
}
throw new ServiceException(ResultCode.ERROR);
sensitiveWordsService.save(sensitiveWords);
SensitiveWordsFilter.put(sensitiveWords.getSensitiveWord());
return ResultUtil.data(sensitiveWords);
}
@ApiOperation(value = "修改敏感词")
@@ -61,11 +57,9 @@ public class SensitiveWordsManagerController {
@PutMapping("/{id}")
public ResultMessage<SensitiveWords> edit(@PathVariable String id, SensitiveWords sensitiveWords) {
sensitiveWords.setId(id);
if (sensitiveWordsService.updateById(sensitiveWords)) {
SensitiveWordsFilter.put(sensitiveWords.getSensitiveWord());
return ResultUtil.data(sensitiveWords);
}
throw new ServiceException(ResultCode.ERROR);
sensitiveWordsService.updateById(sensitiveWords);
SensitiveWordsFilter.put(sensitiveWords.getSensitiveWord());
return ResultUtil.data(sensitiveWords);
}
@ApiOperation(value = "批量删除")
@@ -77,7 +71,7 @@ public class SensitiveWordsManagerController {
SensitiveWordsFilter.remove(name);
sensitiveWordsService.removeById(id);
}
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

16
manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java
View File

@@ -1,9 +1,7 @@
package cn.lili.controller.other;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.page.entity.dos.Special;
@@ -43,20 +41,16 @@ public class SpecialManagerController {
@PutMapping("/updateSpecial")
public ResultMessage<Special> updateSpecial(@PathVariable String id, @Valid Special special) {
special.setId(id);
if (specialService.updateById(special)) {
return ResultUtil.data(special);
}
throw new ServiceException(ResultCode.ERROR);
specialService.updateById(special);
return ResultUtil.data(special);
}
@ApiOperation(value = "删除专题活动")
@ApiImplicitParam(name = "id", value = "专题ID", required = true, dataType = "String", paramType = "path")
@DeleteMapping("/{id}")
public ResultMessage<Object> deleteSpecial(@PathVariable String id) {
if(specialService.removeSpecial(id)){
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
specialService.removeSpecial(id);
return ResultUtil.success();
}
@ApiOperation(value = "分页获取专题活动")

22
manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java
View File

@@ -1,9 +1,7 @@
package cn.lili.controller.other;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.common.vo.SearchVO;
@@ -55,22 +53,18 @@ public class VerificationSourceController {
@ApiOperation(value = "新增验证码资源维护")
public ResultMessage<VerificationSource> save(VerificationSource verificationSource) {
if (verificationSourceService.save(verificationSource)) {
verificationSourceService.initCache();
return ResultUtil.data(verificationSource);
}
throw new ServiceException(ResultCode.ERROR);
verificationSourceService.save(verificationSource);
verificationSourceService.initCache();
return ResultUtil.data(verificationSource);
}
@PutMapping("/{id}")
@ApiOperation(value = "更新验证码资源维护")
public ResultMessage<VerificationSource> update(@PathVariable String id, VerificationSource verificationSource) {
verificationSource.setId(id);
if (verificationSourceService.updateById(verificationSource)) {
verificationSourceService.initCache();
return ResultUtil.data(verificationSource);
}
throw new ServiceException(ResultCode.ERROR);
verificationSourceService.updateById(verificationSource);
verificationSourceService.initCache();
return ResultUtil.data(verificationSource);
}
@DeleteMapping(value = "/{ids}")
@@ -79,6 +73,6 @@ public class VerificationSourceController {
verificationSourceService.removeByIds(ids);
verificationSourceService.initCache();
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

4
manager-api/src/main/java/cn/lili/controller/distribution/DistributionCashManagerController.java → manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashManagerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.distribution;
package cn.lili.controller.other.distribution;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.distribution.entity.dos.DistributionCash;
import cn.lili.modules.distribution.entity.vos.DistributionCashSearchParams;

7
manager-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsManagerController.java → manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsManagerController.java
View File

@@ -1,7 +1,7 @@
package cn.lili.controller.distribution;
package cn.lili.controller.other.distribution;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.distribution.entity.dto.DistributionGoodsSearchParams;
import cn.lili.modules.distribution.entity.vos.DistributionGoodsVO;
@@ -9,7 +9,6 @@ import cn.lili.modules.distribution.service.DistributionGoodsService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -41,6 +40,6 @@ public class DistributionGoodsManagerController {
public ResultMessage<Object> delAllByIds(@PathVariable List ids) {
distributionGoodsService.removeByIds(ids);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

10
manager-api/src/main/java/cn/lili/controller/distribution/DistributionManagerController.java → manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionManagerController.java
View File

@@ -1,8 +1,8 @@
package cn.lili.controller.distribution;
package cn.lili.controller.other.distribution;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.distribution.entity.dos.Distribution;
@@ -46,7 +46,7 @@ public class DistributionManagerController {
})
public ResultMessage<Object> retreat(@PathVariable String id) {
if (distributionService.retreat(id)) {
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
} else {
throw new ServiceException(ResultCode.DISTRIBUTION_RETREAT_ERROR);
}
@@ -60,7 +60,7 @@ public class DistributionManagerController {
})
public ResultMessage<Object> resume(@PathVariable String id) {
if (distributionService.resume(id)) {
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
} else {
throw new ServiceException(ResultCode.DISTRIBUTION_RETREAT_ERROR);
}
@@ -75,7 +75,7 @@ public class DistributionManagerController {
})
public ResultMessage<Object> audit(@NotNull @PathVariable String id, @NotNull String status) {
if (distributionService.audit(id, status)) {
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
} else {
throw new ServiceException(ResultCode.DISTRIBUTION_AUDIT_ERROR);
}

5
manager-api/src/main/java/cn/lili/controller/distribution/DistributionOrderManagerController.java → manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderManagerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.distribution;
package cn.lili.controller.other.distribution;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.distribution.entity.dos.DistributionOrder;
import cn.lili.modules.distribution.entity.vos.DistributionOrderSearchParams;
@@ -8,7 +8,6 @@ import cn.lili.modules.distribution.service.DistributionOrderService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;

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

@@ -6,7 +6,7 @@ import cn.lili.common.security.AuthUser;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.token.Token;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
@@ -150,7 +150,7 @@ public class AdminUserManagerController {
} catch (Exception e) {
e.printStackTrace();
}
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@PutMapping(value = "/enable/{userId}")
@@ -162,14 +162,14 @@ public class AdminUserManagerController {
}
user.setStatus(status);
adminUserService.updateById(user);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@DeleteMapping(value = "/{ids}")
@ApiOperation(value = "批量通过ids删除")
public ResultMessage<Object> delAllByIds(@PathVariable List<String> ids) {
adminUserService.deleteCompletely(ids);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

19
manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java
View File

@@ -1,9 +1,7 @@
package cn.lili.controller.permission;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.common.vo.SearchVO;
import cn.lili.modules.permission.entity.dos.Department;
@@ -48,25 +46,22 @@ public class DepartmentManagerController {
@PostMapping
@ApiOperation(value = "新增部门")
public ResultMessage<Department> save(Department department) {
if (departmentService.save(department)) {
return ResultUtil.data(department);
}
throw new ServiceException(ResultCode.ERROR);
departmentService.save(department);
return ResultUtil.data(department);
}
@PutMapping("/{id}")
@ApiOperation(value = "更新部门")
public ResultMessage<Department> update(@PathVariable String id, Department department) {
if (departmentService.updateById(department)) {
return ResultUtil.data(department);
}
throw new ServiceException(ResultCode.ERROR);
departmentService.updateById(department);
departmentService.updateById(department);
return ResultUtil.data(department);
}
@DeleteMapping(value = "/{ids}")
@ApiOperation(value = "删除部门")
public ResultMessage<Object> delAllByIds(@PathVariable List<String> ids) {
departmentService.deleteByIds(ids);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

14
manager-api/src/main/java/cn/lili/controller/permission/DepartmentRoleManagerController.java
View File

@@ -1,8 +1,6 @@
package cn.lili.controller.permission;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.permission.entity.dos.DepartmentRole;
import cn.lili.modules.permission.service.DepartmentRoleService;
@@ -36,13 +34,9 @@ public class DepartmentRoleManagerController {
@PutMapping("/{departmentId}")
@ApiOperation(value = "更新部门角色")
public ResultMessage<DepartmentRole> update(@PathVariable String departmentId, @RequestBody List<DepartmentRole> departmentRole) {
try {
departmentRoleService.updateByDepartmentId(departmentId, departmentRole);
} catch (Exception e) {
e.printStackTrace();
throw new ServiceException(ResultCode.ERROR);
}
return ResultUtil.success(ResultCode.SUCCESS);
departmentRoleService.updateByDepartmentId(departmentId, departmentRole);
return ResultUtil.success();
}
}

5
manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java
View File

@@ -1,7 +1,7 @@
package cn.lili.controller.permission;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.permission.entity.dos.Menu;
import cn.lili.modules.permission.entity.dto.MenuSearchParams;
@@ -10,7 +10,6 @@ import cn.lili.modules.permission.service.MenuService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -60,7 +59,7 @@ public class MenuManagerController {
@DeleteMapping(value = "/{ids}")
public ResultMessage<Menu> delByIds(@PathVariable List<String> ids) {
menuService.deleteIds(ids);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@ApiOperation(value = "获取所有菜单")

5
manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java
View File

@@ -2,7 +2,7 @@ package cn.lili.controller.permission;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.permission.entity.dos.Role;
@@ -10,7 +10,6 @@ import cn.lili.modules.permission.service.RoleService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -56,7 +55,7 @@ public class RoleManagerController {
@ApiOperation(value = "批量删除")
public ResultMessage<Role> delByIds(@PathVariable List<String> ids) {
roleService.deleteRoles(ids);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}

5
manager-api/src/main/java/cn/lili/controller/permission/RoleMenuManagerController.java
View File

@@ -1,13 +1,12 @@
package cn.lili.controller.permission;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.permission.entity.dos.RoleMenu;
import cn.lili.modules.permission.service.RoleMenuService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -37,7 +36,7 @@ public class RoleMenuManagerController {
@ApiOperation(value = "保存角色菜单")
public ResultMessage save(@PathVariable String roleId, @RequestBody List<RoleMenu> roleMenus) {
roleMenuService.updateRoleMenu(roleId, roleMenus);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

4
manager-api/src/main/java/cn/lili/controller/permission/UserRoleManagerController.java
View File

@@ -1,7 +1,7 @@
package cn.lili.controller.permission;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.permission.entity.dos.UserRole;
import cn.lili.modules.permission.service.UserRoleService;
@@ -37,7 +37,7 @@ public class UserRoleManagerController {
@ApiOperation(value = "更新角色菜单")
public ResultMessage<UserRole> update(@PathVariable String userId, List<UserRole> userRole) {
userRoleService.updateUserRole(userId, userRole);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

16
manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java
View File

@@ -5,7 +5,7 @@ import cn.lili.common.exception.ServiceException;
import cn.lili.common.security.AuthUser;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.promotion.entity.dos.Coupon;
@@ -60,10 +60,8 @@ public class CouponManagerController {
@PostMapping(consumes = "application/json", produces = "application/json")
public ResultMessage<CouponVO> addCoupon(@RequestBody CouponVO couponVO) {
this.setStoreInfo(couponVO);
if (couponService.add(couponVO) != null) {
return ResultUtil.data(couponVO);
}
throw new ServiceException(ResultCode.ERROR);
couponService.add(couponVO);
return ResultUtil.data(couponVO);
}
@ApiOperation(value = "修改优惠券")
@@ -71,10 +69,8 @@ public class CouponManagerController {
public ResultMessage<Coupon> updateCoupon(@RequestBody CouponVO couponVO) {
Coupon coupon = couponService.getById(couponVO.getId());
couponVO.setPromotionStatus(PromotionStatusEnum.NEW.name());
if (couponService.updateCoupon(couponVO) != null) {
return ResultUtil.data(coupon);
}
throw new ServiceException(ResultCode.ERROR);
couponService.updateCoupon(couponVO);
return ResultUtil.data(coupon);
}
@ApiOperation(value = "修改优惠券状态")
@@ -93,7 +89,7 @@ public class CouponManagerController {
for (String id : ids) {
couponService.deleteCoupon(id);
}
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@ApiOperation(value = "会员优惠券作废")

3
manager-api/src/main/java/cn/lili/controller/promotion/FullDiscountManagerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.promotion;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.promotion.entity.vos.FullDiscountSearchParams;
@@ -9,7 +9,6 @@ import cn.lili.modules.order.cart.entity.vo.FullDiscountVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;

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

@@ -2,7 +2,7 @@ package cn.lili.controller.promotion;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.promotion.entity.dos.Pintuan;

22
manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsCategoryManagerController.java
View File

@@ -1,8 +1,6 @@
package cn.lili.controller.promotion;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.promotion.entity.dos.PointsGoodsCategory;
@@ -30,28 +28,22 @@ public class PointsGoodsCategoryManagerController {
@PostMapping
@ApiOperation(value = "添加积分商品分类")
public ResultMessage<Object> add(PointsGoodsCategoryVO pointsGoodsCategory) {
if (pointsGoodsCategoryService.addCategory(pointsGoodsCategory)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
pointsGoodsCategoryService.addCategory(pointsGoodsCategory);
return ResultUtil.success();
}
@PutMapping
@ApiOperation(value = "修改积分商品分类")
public ResultMessage<Object> update(PointsGoodsCategoryVO pointsGoodsCategory) {
if (pointsGoodsCategoryService.updateCategory(pointsGoodsCategory)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
pointsGoodsCategoryService.updateCategory(pointsGoodsCategory);
return ResultUtil.success();
}
@DeleteMapping("/{id}")
@ApiOperation(value = "删除积分商品分类")
public ResultMessage<Object> delete(@PathVariable String id) {
if (pointsGoodsCategoryService.deleteCategory(id)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
pointsGoodsCategoryService.deleteCategory(id);
return ResultUtil.success();
}
@GetMapping

22
manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsManagerController.java
View File

@@ -4,7 +4,7 @@ import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.security.AuthUser;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.promotion.entity.vos.PointsGoodsSearchParams;
@@ -43,10 +43,8 @@ public class PointsGoodsManagerController {
i.setStoreId(currentUser.getId());
collect.add(i);
}
if (pointsGoodsService.addPointsGoods(collect)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
pointsGoodsService.addPointsGoods(collect);
return ResultUtil.success();
}
@PutMapping(consumes = "application/json", produces = "application/json")
@@ -55,28 +53,26 @@ public class PointsGoodsManagerController {
AuthUser currentUser = UserContext.getCurrentUser();
pointsGoods.setStoreId(currentUser.getId());
pointsGoods.setStoreName("platform");
if (pointsGoodsService.updatePointsGoods(pointsGoods)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
pointsGoodsService.updatePointsGoods(pointsGoods);
return ResultUtil.success();
}
@PutMapping("/{ids}")
@ApiOperation(value = "修改积分商品状态")
public ResultMessage<Object> updatePointsGoodsStatus(@PathVariable String ids, String promotionStatus) {
if (pointsGoodsService.updatePointsGoodsPromotionStatus(Arrays.asList(ids.split(",")), promotionStatus)) {
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
throw new ServiceException(ResultCode.ERROR);
throw new ServiceException(ResultCode.POINT_GOODS_ERROR);
}
@DeleteMapping("/{ids}")
@ApiOperation(value = "删除积分商品")
public ResultMessage<Object> delete(@PathVariable String ids) {
if (pointsGoodsService.deletePointsGoods(Arrays.asList(ids.split(",")))) {
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
throw new ServiceException(ResultCode.ERROR);
throw new ServiceException(ResultCode.POINT_GOODS_ERROR);
}
@GetMapping

3
manager-api/src/main/java/cn/lili/controller/promotion/PromotionManagerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.promotion;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.promotion.entity.dto.PromotionGoodsDTO;
@@ -9,7 +9,6 @@ import cn.lili.modules.promotion.service.PromotionGoodsService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;

24
manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java
View File

@@ -1,10 +1,8 @@
package cn.lili.controller.promotion;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.AuthUser;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.promotion.entity.dos.Seckill;
@@ -42,10 +40,8 @@ public class SeckillManagerController {
seckillVO.setStoreId(currentUser.getId());
seckillVO.setStoreName(currentUser.getUsername());
seckillVO.setSeckillApplyStatus(SeckillApplyStatusEnum.NOT_APPLY.name());
if (seckillService.saveSeckill(seckillVO)) {
return ResultUtil.data(seckillVO);
}
throw new ServiceException(ResultCode.ERROR);
seckillService.saveSeckill(seckillVO);
return ResultUtil.data(seckillVO);
}
@PutMapping
@@ -54,10 +50,8 @@ public class SeckillManagerController {
AuthUser currentUser = UserContext.getCurrentUser();
seckillVO.setStoreId(currentUser.getId());
seckillVO.setStoreName(currentUser.getUsername());
if (seckillService.modifySeckill(seckillVO)) {
return ResultUtil.data(seckillVO);
}
throw new ServiceException(ResultCode.ERROR);
seckillService.modifySeckill(seckillVO);
return ResultUtil.data(seckillVO);
}
@GetMapping(value = "/{id}")
@@ -79,21 +73,21 @@ public class SeckillManagerController {
@ApiOperation(value = "删除一个限时抢购")
public ResultMessage<Object> deleteSeckill(@PathVariable String id) {
seckillService.deleteSeckill(id);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@PutMapping("/close/{id}")
@ApiOperation(value = "关闭一个限时抢购")
public ResultMessage<Object> closeSeckill(@PathVariable String id) {
seckillService.closeSeckill(id);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@PutMapping("/open/{id}")
@ApiOperation(value = "一个限时抢购")
public ResultMessage<Object> openSeckill(@PathVariable String id) {
seckillService.openSeckill(id);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@GetMapping("/apply")
@@ -107,7 +101,7 @@ public class SeckillManagerController {
@ApiOperation(value = "审核多个限时抢购申请")
public ResultMessage<Object> auditSeckillApply(@PathVariable String[] ids, String seckillId, String applyStatus, String failReason) {
seckillApplyService.auditBatchApply(ids, seckillId, applyStatus, failReason);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

10
manager-api/src/main/java/cn/lili/controller/purchase/PurchaseManagerController.java
View File

@@ -1,8 +1,6 @@
package cn.lili.controller.purchase;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.purchase.entity.dos.PurchaseOrder;
import cn.lili.modules.purchase.entity.dos.PurchaseQuoted;
@@ -62,10 +60,8 @@ public class PurchaseManagerController {
@PutMapping("/{id}")
public ResultMessage<Object> close(@NotNull @PathVariable String id) {
if (purchaseOrderService.close(id)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
purchaseOrderService.close(id);
return ResultUtil.success();
}
@ApiOperation(value = "报价列表")

3
manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java
View File

@@ -1,7 +1,7 @@
package cn.lili.controller.setting;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
@@ -13,7 +13,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

5
manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java
View File

@@ -2,7 +2,7 @@ package cn.lili.controller.setting;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.system.entity.dos.InstantDelivery;
@@ -15,7 +15,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -72,7 +71,7 @@ public class InstantDeliveryManagerController {
@ApiImplicitParam(name = "bean", value = "bean", required = true, dataType = "String", paramType = "path")
public ResultMessage<String> open(@PathVariable String bean) {
this.instantDeliveryService.openInstantDelivery(bean);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}

7
manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java
View File

@@ -1,14 +1,13 @@
package cn.lili.controller.setting;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.common.vo.SearchVO;
import cn.lili.modules.permission.service.SystemLogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -52,13 +51,13 @@ public class LogManagerController {
@DeleteMapping(value = "/{ids}")
public ResultMessage<Object> delByIds(@PathVariable List<String> ids) {
systemLogService.deleteLog(ids);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@DeleteMapping
@ApiOperation(value = "全部删除")
public ResultMessage<Object> delAll() {
systemLogService.flushAll();
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

5
manager-api/src/main/java/cn/lili/controller/setting/LogisticsManagerController.java
View File

@@ -2,7 +2,7 @@ package cn.lili.controller.setting;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.system.entity.dos.Logistics;
@@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -64,6 +63,6 @@ public class LogisticsManagerController {
@DeleteMapping(value = "/delete/{id}")
public ResultMessage<Object> delAllByIds(@PathVariable String id) {
logisticsService.removeById(id);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

10
manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java
View File

@@ -3,7 +3,7 @@ package cn.lili.controller.setting;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.entity.dos.MemberNotice;
@@ -53,7 +53,7 @@ public class MemberNoticeManagerController {
updateWrapper.in("id", ids);
updateWrapper.set("is_read", true);
memberNoticeService.update(updateWrapper);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@ApiOperation(value = "阅读全部")
@@ -63,14 +63,14 @@ public class MemberNoticeManagerController {
updateWrapper.in("member_id", UserContext.getCurrentUser().getId());
updateWrapper.set("is_read", true);
memberNoticeService.update(updateWrapper);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@ApiOperation(value = "批量删除")
@DeleteMapping(value = "/{ids}")
public ResultMessage<Object> delAllByIds(@PathVariable List ids) {
memberNoticeService.removeByIds(ids);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@ApiOperation(value = "删除所有")
@@ -79,7 +79,7 @@ public class MemberNoticeManagerController {
QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("member_id", UserContext.getCurrentUser().getId());
memberNoticeService.remove(queryWrapper);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

17
manager-api/src/main/java/cn/lili/controller/setting/NoticeMessageManagerController.java
View File

@@ -4,7 +4,7 @@ import cn.lili.common.enums.ResultCode;
import cn.lili.common.enums.SwitchEnum;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.BeanUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.message.entity.dos.NoticeMessage;
@@ -95,11 +95,8 @@ public class NoticeMessageManagerController {
if (noticeMessage != null) {
noticeMessage.setNoticeContent(noticeContent);
noticeMessage.setNoticeTitle(noticeTitle);
boolean result = noticeMessageService.updateById(noticeMessage);
if (result) {
return ResultUtil.data(noticeMessage);
}
throw new ServiceException(ResultCode.ERROR);
noticeMessageService.updateById(noticeMessage);
ResultUtil.data(noticeMessage);
}
throw new ResourceNotFoundException(ResultCode.NOTICE_NOT_EXIST.message());
}
@@ -120,12 +117,10 @@ public class NoticeMessageManagerController {
if (b) {
//赋值执行修改操作
messageTemplate.setNoticeStatus(status);
boolean result = noticeMessageService.updateById(messageTemplate);
if (result) {
return ResultUtil.data(messageTemplate);
}
noticeMessageService.updateById(messageTemplate);
return ResultUtil.data(messageTemplate);
}
throw new ServiceException(ResultCode.ERROR);
throw new ServiceException(ResultCode.NOTICE_ERROR);
}
throw new ResourceNotFoundException(ResultCode.NOTICE_NOT_EXIST.message());
}

18
manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java
View File

@@ -1,8 +1,6 @@
package cn.lili.controller.setting;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.base.service.RegionService;
import cn.lili.modules.system.entity.dos.Region;
@@ -56,20 +54,16 @@ public class RegionManagerController {
@ApiOperation(value = "更新地区")
public ResultMessage<Region> update(@PathVariable String id, @Valid Region region) {
region.setId(id);
if (regionService.updateById(region)) {
return ResultUtil.data(region);
}
throw new ServiceException(ResultCode.ERROR);
regionService.updateById(region);
return ResultUtil.data(region);
}
@PostMapping
@ApiOperation(value = "增加地区")
public ResultMessage<Region> save(@Valid Region region) {
if (regionService.save(region)) {
return ResultUtil.data(region);
}
throw new ServiceException(ResultCode.ERROR);
regionService.save(region);
return ResultUtil.data(region);
}
@DeleteMapping(value = "{ids}")
@@ -77,6 +71,6 @@ public class RegionManagerController {
@ApiOperation(value = "批量通过id删除")
public ResultMessage<Object> delAllByIds(@PathVariable List<String> ids) {
regionService.removeByIds(ids);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

18
manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java
View File

@@ -1,9 +1,7 @@
package cn.lili.controller.setting;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.common.vo.SearchVO;
@@ -52,25 +50,21 @@ public class ServiceNoticeManagerController {
public ResultMessage<ServiceNotice> save(ServiceNotice serviceNotice) {
//标记平台消息
serviceNotice.setStoreId("-1");
if (serviceNoticeService.saveOrUpdate(serviceNotice)) {
return ResultUtil.data(serviceNotice);
}
throw new ServiceException(ResultCode.ERROR);
serviceNoticeService.saveOrUpdate(serviceNotice);
return ResultUtil.data(serviceNotice);
}
@ApiOperation(value = "更新服务订阅消息")
@PostMapping("/{id}")
public ResultMessage<ServiceNotice> update(@PathVariable String id, ServiceNotice serviceNotice) {
if (serviceNoticeService.saveOrUpdate(serviceNotice)) {
return ResultUtil.data(serviceNotice);
}
throw new ServiceException(ResultCode.ERROR);
serviceNoticeService.saveOrUpdate(serviceNotice);
return ResultUtil.data(serviceNotice);
}
@ApiOperation(value = "删除服务订阅消息")
@DeleteMapping(value = "/{ids}")
public ResultMessage<Object> delAllByIds(@PathVariable List ids) {
serviceNoticeService.removeByIds(ids);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

12
manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java
View File

@@ -3,7 +3,7 @@ package cn.lili.controller.setting;
import cn.hutool.json.JSONUtil;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.base.aspect.DemoSite;
import cn.lili.modules.system.entity.dos.Setting;
@@ -60,7 +60,7 @@ public class SettingManagerController {
setting.setSettingValue(configValue);
settingService.saveUpdate(setting);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
/**
@@ -95,12 +95,7 @@ public class SettingManagerController {
"PAYMENT_SUPPORT,ALIPAY_PAYMENT,WECHAT_PAYMENT"
)
public ResultMessage settingGet(@PathVariable String key) {
try {
return createSetting(key);
} catch (Exception e) {
e.printStackTrace();
throw new ServiceException(ResultCode.ERROR);
}
return createSetting(key);
}
/**
@@ -114,7 +109,6 @@ public class SettingManagerController {
*/
private ResultMessage createSetting(String key) {
SettingEnum settingEnum = SettingEnum.valueOf(key);
Setting setting = settingService.get(key);
switch (settingEnum) {
case BASE_SETTING:

2
manager-api/src/main/java/cn/lili/controller/setting/SettingXManagerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.setting;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.system.entity.dto.payment.dto.PaymentSupportForm;
import io.swagger.annotations.Api;

4
manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java
View File

@@ -2,7 +2,7 @@ package cn.lili.controller.setting;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.message.entity.dos.SmsReach;
@@ -33,7 +33,7 @@ public class SmsManagerController {
@PostMapping
public ResultMessage<Object> sendBatchSms(SmsReach smsReach, @RequestParam(value = "mobile") List<String> mobile) {
smsReachService.addSmsReach(smsReach,mobile);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@ApiOperation(value = "查询短信任务分页")

11
manager-api/src/main/java/cn/lili/controller/setting/SmsSignManagerController.java
View File

@@ -1,7 +1,7 @@
package cn.lili.controller.setting;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.message.entity.dos.SmsSign;
@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -34,7 +33,7 @@ public class SmsSignManagerController {
@PostMapping
public ResultMessage<SmsSign> save(@Valid SmsSign smsSign) {
smsSignService.addSmsSign(smsSign);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@ApiOperation(value = "删除短信签名")
@@ -42,7 +41,7 @@ public class SmsSignManagerController {
@ApiImplicitParam(name = "id", value = "短信签名id", required = true, dataType = "String", allowMultiple = true, paramType = "path")
public ResultMessage<SmsSign> delete(@PathVariable String id) {
smsSignService.deleteSmsSign(id);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@@ -57,14 +56,14 @@ public class SmsSignManagerController {
@PutMapping("/querySmsSign")
public ResultMessage<SmsSign> querySmsSign() {
smsSignService.querySmsSign();
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@ApiOperation(value = "修改短信签名")
@PutMapping("/modifySmsSign")
public ResultMessage<SmsSign> modifySmsSign(@Valid SmsSign smsSign) {
smsSignService.modifySmsSign(smsSign);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@ApiOperation(value = "查询短信签名分页")

10
manager-api/src/main/java/cn/lili/controller/setting/SmsTemplateManagerController.java
View File

@@ -1,7 +1,7 @@
package cn.lili.controller.setting;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.message.entity.dos.SmsTemplate;
@@ -32,7 +32,7 @@ public class SmsTemplateManagerController {
@PostMapping
public ResultMessage<SmsTemplate> save(@Valid SmsTemplate smsTemplate) {
smsTemplateService.addSmsTemplate(smsTemplate);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@ApiOperation(value = "删除短信模板")
@@ -40,21 +40,21 @@ public class SmsTemplateManagerController {
@DeleteMapping("/{id}")
public ResultMessage<SmsTemplate> delete(@PathVariable("id") String id) {
smsTemplateService.deleteSmsTemplate(id);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@ApiOperation(value = "查询短信模板状态")
@PutMapping("/querySmsSign")
public ResultMessage<SmsTemplate> querySmsSign() {
smsTemplateService.querySmsTemplate();
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@ApiOperation(value = "修改短信模板")
@PutMapping("/modifySmsTemplate")
public ResultMessage<SmsTemplate> modifySmsTemplate(@Valid SmsTemplate smsTemplate) {
smsTemplateService.modifySmsTemplate(smsTemplate);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@ApiOperation(value = "查询短信模板分页")

21
manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java
View File

@@ -1,9 +1,7 @@
package cn.lili.controller.setting;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.common.vo.SearchVO;
@@ -34,8 +32,9 @@ public class WechatMPMessageManagerController {
@ApiOperation(value = "初始化微信小程序消息订阅")
public ResultMessage init() {
wechatMPMessageService.init();
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@GetMapping(value = "/{id}")
@ApiOperation(value = "查看微信小程序消息订阅详情")
public ResultMessage<WechatMPMessage> get(@PathVariable String id) {
@@ -57,19 +56,15 @@ public class WechatMPMessageManagerController {
@ApiOperation(value = "新增微信小程序消息订阅")
public ResultMessage<WechatMPMessage> save(WechatMPMessage wechatMPMessage) {
if (wechatMPMessageService.save(wechatMPMessage)) {
return new ResultUtil<WechatMPMessage>().setData(wechatMPMessage);
}
throw new ServiceException(ResultCode.ERROR);
wechatMPMessageService.save(wechatMPMessage);
return new ResultUtil<WechatMPMessage>().setData(wechatMPMessage);
}
@PutMapping("/{id}")
@ApiOperation(value = "更新微信小程序消息订阅")
public ResultMessage<WechatMPMessage> update(@PathVariable String id, WechatMPMessage wechatMPMessage) {
if (wechatMPMessageService.updateById(wechatMPMessage)) {
return new ResultUtil<WechatMPMessage>().setData(wechatMPMessage);
}
throw new ServiceException(ResultCode.ERROR);
wechatMPMessageService.updateById(wechatMPMessage);
return new ResultUtil<WechatMPMessage>().setData(wechatMPMessage);
}
@DeleteMapping(value = "/{ids}")
@@ -77,6 +72,6 @@ public class WechatMPMessageManagerController {
public ResultMessage<Object> delAllByIds(@PathVariable List ids) {
wechatMPMessageService.removeByIds(ids);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

20
manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java
View File

@@ -1,9 +1,7 @@
package cn.lili.controller.setting;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.message.entity.dos.WechatMessage;
@@ -35,7 +33,7 @@ public class WechatMessageManageController {
@ApiOperation(value = "初始化微信消息")
public ResultMessage init() {
wechatMessageService.init();
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@GetMapping(value = "/{id}")
@@ -57,25 +55,21 @@ public class WechatMessageManageController {
@ApiOperation(value = "新增微信消息")
public ResultMessage<WechatMessage> save(WechatMessage wechatMessage) {
if (wechatMessageService.save(wechatMessage)) {
return ResultUtil.data(wechatMessage);
}
throw new ServiceException(ResultCode.ERROR);
wechatMessageService.save(wechatMessage);
return ResultUtil.data(wechatMessage);
}
@PutMapping("/{id}")
@ApiOperation(value = "更新微信消息")
public ResultMessage<WechatMessage> update(@PathVariable String id, WechatMessage wechatMessage) {
if (wechatMessageService.updateById(wechatMessage)) {
return ResultUtil.data(wechatMessage);
}
throw new ServiceException(ResultCode.ERROR);
wechatMessageService.updateById(wechatMessage);
return ResultUtil.data(wechatMessage);
}
@DeleteMapping(value = "/{ids}")
@ApiOperation(value = "删除微信消息")
public ResultMessage<Object> delAllByIds(@PathVariable List ids) {
wechatMessageService.removeByIds(ids);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

3
manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.statistics;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.statistics.model.dto.GoodsStatisticsQueryParam;
import cn.lili.modules.statistics.model.vo.CategoryStatisticsDataVO;
@@ -8,7 +8,6 @@ import cn.lili.modules.statistics.model.vo.GoodsStatisticsDataVO;
import cn.lili.modules.statistics.service.GoodsStatisticsDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;

3
manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.statistics;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.statistics.model.vo.GoodsStatisticsDataVO;
import cn.lili.modules.statistics.model.vo.IndexNoticeVO;
@@ -9,7 +9,6 @@ import cn.lili.modules.statistics.model.vo.StoreStatisticsDataVO;
import cn.lili.modules.statistics.service.IndexStatisticsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;

3
manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java
View File

@@ -1,13 +1,12 @@
package cn.lili.controller.statistics;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.statistics.model.dos.MemberStatisticsData;
import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.service.MemberStatisticsDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;

3
manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.statistics;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.order.order.entity.dos.AfterSale;
@@ -14,7 +14,6 @@ import cn.lili.modules.statistics.service.OrderStatisticsDataService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;

2
manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.statistics;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;

2
manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.statistics;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.entity.vo.MemberDistributionVO;
import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;

10
manager-api/src/main/java/cn/lili/controller/store/BillManagerController.java
View File

@@ -1,8 +1,6 @@
package cn.lili.controller.store;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.order.order.entity.dos.StoreFlow;
@@ -60,10 +58,8 @@ public class BillManagerController {
@ApiImplicitParam(name = "id", value = "结算单ID", required = true, paramType = "path")
@PutMapping(value = "/pay/{id}")
public ResultMessage<Object> pay(@PathVariable String id) {
if (billService.complete(id)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
billService.complete(id);
return ResultUtil.success();
}
}

18
manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java
View File

@@ -1,8 +1,6 @@
package cn.lili.controller.store;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.goods.entity.vos.CategoryVO;
@@ -89,27 +87,23 @@ public class StoreManagerController {
@PutMapping(value = "/audit/{id}/{passed}")
public ResultMessage<Object> audit(@PathVariable String id, @PathVariable Integer passed) {
storeService.audit(id, passed);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@ApiOperation(value = "关闭店铺")
@ApiImplicitParam(name = "id", value = "店铺id", required = true, dataType = "String", paramType = "path")
@PutMapping(value = "/disable/{id}")
public ResultMessage<Store> disable(@PathVariable String id) {
if (storeService.disable(id)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
storeService.disable(id);
return ResultUtil.success();
}
@ApiOperation(value = "开启店铺")
@ApiImplicitParam(name = "id", value = "店铺id", required = true, dataType = "String", paramType = "path")
@PutMapping(value = "/enable/{id}")
public ResultMessage<Store> enable(@PathVariable String id) {
if (storeService.enable(id)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
storeService.enable(id);
return ResultUtil.success();
}
@ApiOperation(value = "查询一级分类列表")

2
manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.store;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.message.entity.dos.StoreMessage;

3
manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.trade;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.order.order.entity.dos.AfterSale;
import cn.lili.modules.order.order.entity.vo.AfterSaleSearchParams;
@@ -12,7 +12,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

5
manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java
View File

@@ -2,7 +2,7 @@ package cn.lili.controller.trade;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.order.order.entity.dos.AfterSaleReason;
@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -70,6 +69,6 @@ public class AfterSaleReasonManagerController {
@DeleteMapping(value = "/delByIds/{id}")
public ResultMessage<Object> delAllByIds(@PathVariable String id) {
afterSaleReasonService.removeById(id);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

35
manager-api/src/main/java/cn/lili/controller/trade/OrderComplaintManagerController.java
View File

@@ -1,10 +1,8 @@
package cn.lili.controller.trade;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.AuthUser;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.order.order.entity.dos.OrderComplaint;
@@ -63,10 +61,9 @@ public class OrderComplaintManagerController {
@ApiOperation(value = "更新数据")
@PutMapping
public ResultMessage<OrderComplaintVO> update(OrderComplaintVO orderComplainVO) {
if (orderComplaintService.updateOrderComplain(orderComplainVO)) {
return ResultUtil.data(orderComplainVO);
}
throw new ServiceException(ResultCode.ERROR);
orderComplaintService.updateOrderComplain(orderComplainVO);
return ResultUtil.data(orderComplainVO);
}
@ApiOperation(value = "添加交易投诉对话")
@@ -75,22 +72,18 @@ public class OrderComplaintManagerController {
@ApiImplicitParam(name = "content", value = "内容", required = true, paramType = "query")
})
@PostMapping("/communication")
public ResultMessage<OrderComplaintCommunicationVO> addCommunication(@RequestParam String complainId,@RequestParam String content) {
public ResultMessage<OrderComplaintCommunicationVO> addCommunication(@RequestParam String complainId, @RequestParam String content) {
AuthUser currentUser = UserContext.getCurrentUser();
OrderComplaintCommunicationVO communicationVO = new OrderComplaintCommunicationVO(complainId, content, CommunicationOwnerEnum.PLATFORM.name(), currentUser.getId(), currentUser.getUsername());
if (orderComplaintCommunicationService.addCommunication(communicationVO)) {
return ResultUtil.data(communicationVO);
}
throw new ServiceException(ResultCode.ERROR);
orderComplaintCommunicationService.addCommunication(communicationVO);
return ResultUtil.data(communicationVO);
}
@ApiOperation(value = "修改状态")
@PutMapping(value = "/status")
public ResultMessage<Object> updateStatus(OrderComplaintOperationParams orderComplainVO) {
if (orderComplaintService.updateOrderComplainByStatus(orderComplainVO) != null) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
orderComplaintService.updateOrderComplainByStatus(orderComplainVO);
return ResultUtil.success();
}
@@ -100,17 +93,15 @@ public class OrderComplaintManagerController {
@ApiImplicitParam(name = "arbitrationResult", value = "仲裁结果", required = true, paramType = "query")
})
@PutMapping(value = "/complete/{id}")
public ResultMessage<Object> complete(@PathVariable String id,String arbitrationResult) {
public ResultMessage<Object> complete(@PathVariable String id, String arbitrationResult) {
//新建对象
OrderComplaintOperationParams orderComplaintOperationParams =new OrderComplaintOperationParams();
OrderComplaintOperationParams orderComplaintOperationParams = new OrderComplaintOperationParams();
orderComplaintOperationParams.setComplainId(id);
orderComplaintOperationParams.setArbitrationResult(arbitrationResult);
orderComplaintOperationParams.setComplainStatus(OrderComplaintStatusEnum.COMPLETE.name());
//修改状态
if (orderComplaintService.updateOrderComplainByStatus(orderComplaintOperationParams) != null) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
orderComplaintService.updateOrderComplainByStatus(orderComplaintOperationParams);
return ResultUtil.success();
}
}

3
manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java
View File

@@ -1,7 +1,7 @@
package cn.lili.controller.trade;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.common.vo.SearchVO;
@@ -10,7 +10,6 @@ import cn.lili.modules.order.trade.service.OrderLogService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;

5
manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java
View File

@@ -1,7 +1,7 @@
package cn.lili.controller.trade;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.entity.dto.MemberAddressDTO;
import cn.lili.modules.order.order.entity.dos.Order;
@@ -15,7 +15,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@@ -62,7 +61,7 @@ public class OrderManagerController {
@PostMapping(value = "/{orderSn}/pay")
public ResultMessage<Object> payOrder(@PathVariable String orderSn) {
orderPriceService.adminPayOrder(orderSn);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@ApiOperation(value = "修改收货人信息")

3
manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java
View File

@@ -1,7 +1,7 @@
package cn.lili.controller.trade;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.common.vo.SearchVO;
@@ -11,7 +11,6 @@ import cn.lili.modules.payment.service.PaymentService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;

2
manager-api/src/main/java/cn/lili/controller/trade/ReceiptManagerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.trade;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.order.order.entity.dto.OrderReceiptDTO;

3
manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.trade;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.order.trade.entity.dos.Recharge;
@@ -9,7 +9,6 @@ import cn.lili.modules.order.trade.service.RechargeService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

3
manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java
View File

@@ -1,7 +1,7 @@
package cn.lili.controller.trade;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.common.vo.SearchVO;
@@ -10,7 +10,6 @@ import cn.lili.modules.payment.service.RefundLogService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;

3
manager-api/src/main/java/cn/lili/controller/trade/WalletLogManagerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.trade;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.order.trade.entity.dos.WalletLog;
@@ -9,7 +9,6 @@ import cn.lili.modules.order.trade.service.WalletLogService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;