diff --git a/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java index 49541e7d..f655ce92 100644 --- a/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java @@ -1,6 +1,5 @@ package cn.lili.controller.goods; -import cn.hutool.core.text.CharSequenceUtil; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; @@ -75,21 +74,16 @@ public class GoodsBuyerController { @ApiOperation(value = "通过id获取商品信息") @ApiImplicitParams({ @ApiImplicitParam(name = "goodsId", value = "商品ID", required = true, paramType = "path"), - @ApiImplicitParam(name = "skuId", value = "skuId", required = true, paramType = "path"), - @ApiImplicitParam(name = "distributionId", value = "分销员ID", dataType = "String", paramType = "query") + @ApiImplicitParam(name = "skuId", value = "skuId", required = true, paramType = "path") }) @GetMapping(value = "/sku/{goodsId}/{skuId}") @PageViewPoint(type = PageViewEnum.SKU, id = "#id") public ResultMessage> getSku(@NotNull(message = "商品ID不能为空") @PathVariable("goodsId") String goodsId, - @NotNull(message = "SKU ID不能为空") @PathVariable("skuId") String skuId, - String distributionId) { + @NotNull(message = "SKU ID不能为空") @PathVariable("skuId") String skuId) { Map map = goodsSkuService.getGoodsSkuDetail(goodsId, skuId); - //判断如果传递分销员则进行记录 - if (CharSequenceUtil.isNotEmpty(distributionId)) { - distributionService.bindingDistribution(distributionId); - } + return ResultUtil.data(map); } diff --git a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionBuyerController.java index c0323a1f..6b7f7431 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionBuyerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.other.distribution; -import cn.lili.common.security.context.UserContext; import cn.lili.common.enums.ResultUtil; +import cn.lili.common.security.context.UserContext; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.distribution.entity.dos.Distribution; import cn.lili.modules.distribution.entity.dos.DistributionOrder; @@ -65,4 +65,12 @@ public class DistributionBuyerController { return ResultUtil.data(distributionService.getDistribution()); } + + //申请分销员 + @ApiOperation(value = "绑定分销员") + @ApiImplicitParam(name = "distributionId", value = "分销员ID", required = true, paramType = "path") + @GetMapping("/bindingDistribution/{distributionId}") + public void bindingDistribution(@PathVariable String distributionId){ + distributionService.bindingDistribution(distributionId); + } } diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java index 96cc6564..70d60870 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java @@ -146,6 +146,11 @@ public class DistributionServiceImpl extends ServiceImpl add(@Valid AppVersionDO appVersionDO) { - return ResultUtil.data(this.appVersionService.save(appVersionDO)); + public ResultMessage add(@Valid AppVersionDO appVersionDO) { + if(this.appVersionService.save(appVersionDO)){ + return ResultUtil.success(); + } + throw new ServiceException(ResultCode.ERROR); } @PutMapping(value = "/{id}") @@ -55,10 +60,10 @@ public class AppVersionManagerController { @ApiImplicitParam(name = "id", value = "主键", required = true, dataType = "String", paramType = "path") }) public ResultMessage edit(@Valid AppVersionDO appVersionDO, @PathVariable String id) { - if (appVersionService.getById(id) != null) { - return ResultUtil.data(this.appVersionService.updateById(appVersionDO)); + if(this.appVersionService.updateById(appVersionDO)){ + return ResultUtil.success(); } - return ResultUtil.data(false); + throw new ServiceException(ResultCode.ERROR); } @DeleteMapping(value = "/{id}") @@ -67,10 +72,10 @@ public class AppVersionManagerController { @ApiImplicitParam(name = "id", value = "要删除的app版本主键", required = true, dataType = "String", paramType = "path") }) public ResultMessage delete(@PathVariable String id) { - if (appVersionService.getById(id) != null) { - return ResultUtil.data(this.appVersionService.removeById(id)); + if(this.appVersionService.removeById(id)){ + return ResultUtil.success(); } - return ResultUtil.data(true); + throw new ServiceException(ResultCode.ERROR); } }