From d50388001fd48795eb053fb2f14a7613eac17522 Mon Sep 17 00:00:00 2001 From: lifenlong Date: Thu, 20 May 2021 11:35:54 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E5=95=86=E5=93=81=E6=95=B0=E9=87=8F=E5=8E=BB=E9=99=A4=E5=B7=B2?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goods/serviceimpl/GoodsServiceImpl.java | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java index 0b45e62a..6b7aea66 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java @@ -55,9 +55,6 @@ import java.util.List; @Transactional public class GoodsServiceImpl extends ServiceImpl implements GoodsService { - //商品 - @Autowired - private GoodsMapper goodsMapper; //商品属性 @Autowired private GoodsParamsService goodsParamsService; @@ -85,7 +82,7 @@ public class GoodsServiceImpl extends ServiceImpl implements @Override public void underStoreGoods(String storeId) { - this.goodsMapper.underStoreGoods(storeId); + this.baseMapper.underStoreGoods(storeId); } @Override @@ -237,15 +234,10 @@ public class GoodsServiceImpl extends ServiceImpl implements public Integer goodsNum(GoodsStatusEnum goodsStatusEnum, GoodsAuthEnum goodsAuthEnum) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); - queryWrapper.eq(Goods::getDeleteFlag,false); - - if (goodsStatusEnum != null) { - queryWrapper.eq(Goods::getMarketEnable, goodsStatusEnum.name()); - } - if (goodsAuthEnum != null) { - queryWrapper.eq(Goods::getIsAuth, goodsAuthEnum.name()); - } - queryWrapper.eq(StringUtils.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name()), + queryWrapper.eq(Goods::getDeleteFlag,false) + .eq(goodsStatusEnum != null,Goods::getMarketEnable, goodsStatusEnum.name()) + .eq(goodsAuthEnum != null,Goods::getIsAuth, goodsAuthEnum.name()) + .eq(StringUtils.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name()), Goods::getStoreId, UserContext.getCurrentUser().getStoreId()); return this.count(queryWrapper); From b427daab029041088aa746ac68dbb6c8d0aa0b7a Mon Sep 17 00:00:00 2001 From: lifenlong Date: Thu, 20 May 2021 15:38:22 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=94=AE=E5=90=8E=E5=8D=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goods/serviceimpl/GoodsServiceImpl.java | 13 +++++++++---- .../cn/lili/modules/page/entity/dos/Article.java | 8 ++------ .../lili/modules/page/entity/vos/ArticleVO.java | 2 +- .../page/serviceimpl/ArticleServiceImpl.java | 3 +-- .../trade/AfterSaleManagerController.java | 16 ++++++++++++++++ 5 files changed, 29 insertions(+), 13 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java index 6b7aea66..4d25c382 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java @@ -234,10 +234,15 @@ public class GoodsServiceImpl extends ServiceImpl implements public Integer goodsNum(GoodsStatusEnum goodsStatusEnum, GoodsAuthEnum goodsAuthEnum) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); - queryWrapper.eq(Goods::getDeleteFlag,false) - .eq(goodsStatusEnum != null,Goods::getMarketEnable, goodsStatusEnum.name()) - .eq(goodsAuthEnum != null,Goods::getIsAuth, goodsAuthEnum.name()) - .eq(StringUtils.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name()), + queryWrapper.eq(Goods::getDeleteFlag,false); + + if (goodsStatusEnum != null) { + queryWrapper.eq(Goods::getMarketEnable, goodsStatusEnum.name()); + } + if (goodsAuthEnum != null) { + queryWrapper.eq(Goods::getIsAuth, goodsAuthEnum.name()); + } + queryWrapper.eq(StringUtils.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name()), Goods::getStoreId, UserContext.getCurrentUser().getStoreId()); return this.count(queryWrapper); diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dos/Article.java b/framework/src/main/java/cn/lili/modules/page/entity/dos/Article.java index 95bd10f0..6a3d756c 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/dos/Article.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/dos/Article.java @@ -1,7 +1,6 @@ package cn.lili.modules.page.entity.dos; import cn.lili.base.BaseEntity; -import cn.lili.common.enums.SwitchEnum; import cn.lili.modules.page.entity.enums.ArticleEnum; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -45,11 +44,8 @@ public class Article extends BaseEntity { @NotEmpty(message = "文章内容不能为空") private String content; - /** - * @see SwitchEnum - */ - @ApiModelProperty(value = "状态", allowableValues = "OPEN,CLOSE") - private String openStatus; + @ApiModelProperty(value = "状态") + private Boolean openStatus; /** * @see ArticleEnum */ diff --git a/framework/src/main/java/cn/lili/modules/page/entity/vos/ArticleVO.java b/framework/src/main/java/cn/lili/modules/page/entity/vos/ArticleVO.java index 74ff538f..98891628 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/vos/ArticleVO.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/vos/ArticleVO.java @@ -25,5 +25,5 @@ public class ArticleVO { private Integer sort; @ApiModelProperty(value = "状态, allowableValues = OPEN,CLOSE") - private String openStatus; + private Boolean openStatus; } diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java index 421f8cef..7cb1d058 100644 --- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java @@ -3,7 +3,6 @@ package cn.lili.modules.page.serviceimpl; import cn.hutool.core.util.StrUtil; 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.PageUtil; @@ -83,7 +82,7 @@ public class ArticleServiceImpl extends ServiceImpl impl @Override public Boolean updateArticleStatus(String id, boolean status) { Article article=this.getById(id); - article.setOpenStatus(status? SwitchEnum.OPEN.name():SwitchEnum.CLOSE.name()); + article.setOpenStatus(status); return this.updateById(article); } } \ No newline at end of file diff --git a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java index dfc83989..daf715af 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java @@ -66,4 +66,20 @@ public class AfterSaleManagerController { return ResultUtil.data(afterSaleService.refund(afterSaleSn, remark)); } + @ApiOperation(value = "审核售后申请") + @ApiImplicitParams({ + @ApiImplicitParam(name = "afterSaleSn", value = "售后sn", required = true, paramType = "path"), + @ApiImplicitParam(name = "serviceStatus", value = "PASS：审核通过，REFUSE：审核未通过", required = true, paramType = "query"), + @ApiImplicitParam(name = "remark", value = "备注", paramType = "query"), + @ApiImplicitParam(name = "actualRefundPrice", value = "实际退款金额", paramType = "query") + }) + @PutMapping(value = "/review/{afterSaleSn}") + public ResultMessage review(@NotNull(message = "请选择售后单") @PathVariable String afterSaleSn, + @NotNull(message = "请审核") String serviceStatus, + String remark, + Double actualRefundPrice) { + + return ResultUtil.data(afterSaleService.review(afterSaleSn, serviceStatus, remark,actualRefundPrice)); + } + } From 0f0f480b24bfd9a846cd42509f8c0a9ef6bf8f12 Mon Sep 17 00:00:00 2001 From: Chopper Date: Thu, 20 May 2021 15:55:12 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=95=86=E5=93=81=E6=95=B0=E9=87=8F=E7=B4=AF=E5=8A=A0=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86=E3=80=82=20=E5=BB=B6=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=A5=E5=BF=97=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../delayqueue/AbstractDelayQueueMachineFactory.java | 8 +++++--- .../java/cn/lili/common/trigger/RocketmqTimerTrigger.java | 6 ++++-- .../java/cn/lili/modules/order/cart/entity/vo/CartVO.java | 2 +- .../modules/order/cart/render/impl/CartPriceRender.java | 3 +-- .../serviceimpl/IndexStatisticsServiceImpl.java | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/framework/src/main/java/cn/lili/common/delayqueue/AbstractDelayQueueMachineFactory.java b/framework/src/main/java/cn/lili/common/delayqueue/AbstractDelayQueueMachineFactory.java index 5189cff0..c74aadbd 100644 --- a/framework/src/main/java/cn/lili/common/delayqueue/AbstractDelayQueueMachineFactory.java +++ b/framework/src/main/java/cn/lili/common/delayqueue/AbstractDelayQueueMachineFactory.java @@ -10,7 +10,6 @@ import org.springframework.util.CollectionUtils; import javax.annotation.PostConstruct; import java.util.Calendar; import java.util.Set; -import java.util.TimeZone; import java.util.concurrent.TimeUnit; /** @@ -40,6 +39,9 @@ public abstract class AbstractDelayQueueMachineFactory { } + /** + * 延时队列机器开始运作 + */ private void startDelayQueueMachine() { log.info(String.format("延时队列机器{%s}开始运作", setDelayQueueName())); @@ -64,11 +66,11 @@ public abstract class AbstractDelayQueueMachineFactory { } } catch (Exception e) { -// log.warn(String.format("处理延时任务发生异常,异常原因为{%s}", e.getMessage()), e); + log.error(String.format("处理延时任务发生异常,异常原因为{%s}", e.getMessage()), e); } finally { // 间隔一秒钟搞一次 try { - TimeUnit.SECONDS.sleep(1L); + TimeUnit.SECONDS.sleep(5L); } catch (InterruptedException e) { e.printStackTrace(); } diff --git a/framework/src/main/java/cn/lili/common/trigger/RocketmqTimerTrigger.java b/framework/src/main/java/cn/lili/common/trigger/RocketmqTimerTrigger.java index 5a78666e..54262022 100644 --- a/framework/src/main/java/cn/lili/common/trigger/RocketmqTimerTrigger.java +++ b/framework/src/main/java/cn/lili/common/trigger/RocketmqTimerTrigger.java @@ -52,13 +52,15 @@ public class RocketmqTimerTrigger implements TimeTrigger { if (StringUtils.isEmpty(uniqueKey)) { uniqueKey = StringUtils.getRandStr(10); } + //执行任务key String generateKey = TimeTriggerUtil.generateKey(timeTriggerMsg.getTriggerExecutor(), timeTriggerMsg.getTriggerTime(), uniqueKey); this.cache.put(generateKey, 1); + //设置延时任务 if (Boolean.TRUE.equals(promotionDelayQueue.addJobId(JSONUtil.toJsonStr(timeTriggerMsg), delayTime))) { - log.info("add Redis key {} --------------------------", generateKey); + log.info("add Redis key {}", generateKey); log.info("定时执行在【" + DateUtil.toString(timeTriggerMsg.getTriggerTime(), "yyyy-MM-dd HH:mm:ss") + "】，消费【" + timeTriggerMsg.getParam().toString() + "】"); } else { - log.info("延时任务添加失败！"); + log.error("延时任务添加失败:{}", timeTriggerMsg); } } diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartVO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartVO.java index f93fd268..20713c8e 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartVO.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartVO.java @@ -89,7 +89,7 @@ public class CartVO extends CartBase implements Serializable { this.remark = ""; } - public void add(Integer goodsNum) { + public void addGoodsNum(Integer goodsNum) { if (this.goodsNum == null) { this.goodsNum = goodsNum; } else { diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CartPriceRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CartPriceRender.java index 4a15ec65..d4573dc0 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CartPriceRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CartPriceRender.java @@ -8,7 +8,6 @@ import cn.lili.modules.order.cart.entity.vo.CartSkuVO; import cn.lili.modules.order.cart.entity.vo.CartVO; import cn.lili.modules.order.cart.render.CartRenderStep; import cn.lili.modules.order.order.entity.dto.PriceDetailDTO; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Service; @@ -53,7 +52,7 @@ public class CartPriceRender implements CartRenderStep { if (Boolean.FALSE.equals(sku.getChecked())) { continue; } - cart.setGoodsNum(sku.getNum()); + cart.addGoodsNum(sku.getNum()); if (cart.getStoreId().equals(sku.getStoreId()) && !cart.getSkuList().contains(sku)) { cart.getSkuList().add(sku); } diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java index 3710e27d..8a8ab473 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java @@ -139,7 +139,7 @@ public class IndexStatisticsServiceImpl implements IndexStatisticsService { //获取总会员数量 indexStatisticsVO.setMemberNum(memberStatisticsDataService.getMemberCount()); //获取总上架商品数量 - indexStatisticsVO.setGoodsNum(goodsService.goodsNum(GoodsStatusEnum.UPPER, null)); + indexStatisticsVO.setGoodsNum(goodsService.goodsNum(GoodsStatusEnum.UPPER, GoodsAuthEnum.PASS)); //获取总店铺数量 indexStatisticsVO.setStoreNum(storeService.storeNum()); From e73d189022ebe3de2fc66f4320d9b387cd5daffe Mon Sep 17 00:00:00 2001 From: lifenlong Date: Thu, 20 May 2021 16:20:18 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=88=86=E9=94=80?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goods/GoodsBuyerController.java | 12 +++-------- .../DistributionBuyerController.java | 10 ++++++++- .../serviceimpl/DistributionServiceImpl.java | 5 +++++ .../system/entity/dos/AppVersionDO.java | 1 - .../setting/AppVersionManagerController.java | 21 ++++++++++++------- 5 files changed, 30 insertions(+), 19 deletions(-) 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); } } From f941841a99f21646e61c64b2979f59664e35ee59 Mon Sep 17 00:00:00 2001 From: lifenlong Date: Thu, 20 May 2021 16:34:48 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=88=86=E9=94=80=E5=95=86=E5=93=81?= =?UTF-8?q?=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/DistributionBuyerController.java | 3 ++- .../distribution/DistributionCashBuyerController.java | 10 +++++++--- .../distribution/DistributionGoodsBuyerController.java | 10 +++++++--- 3 files changed, 16 insertions(+), 7 deletions(-) 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 6b7f7431..410601c2 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 @@ -70,7 +70,8 @@ public class DistributionBuyerController { @ApiOperation(value = "绑定分销员") @ApiImplicitParam(name = "distributionId", value = "分销员ID", required = true, paramType = "path") @GetMapping("/bindingDistribution/{distributionId}") - public void bindingDistribution(@PathVariable String distributionId){ + public ResultMessage bindingDistribution(@PathVariable String distributionId){ distributionService.bindingDistribution(distributionId); + return ResultUtil.success(); } } diff --git a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashBuyerController.java index 69b9cd2a..d79adfe9 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashBuyerController.java @@ -1,6 +1,8 @@ package cn.lili.controller.other.distribution; +import cn.lili.common.enums.ResultCode; import cn.lili.common.enums.ResultUtil; +import cn.lili.common.exception.ServiceException; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.distribution.entity.dos.DistributionCash; @@ -48,9 +50,11 @@ public class DistributionCashBuyerController { @ApiImplicitParam(name = "price", value = "申请金额", required = true, paramType = "query", dataType = "double") }) @PostMapping - public ResultMessage cash(@NotNull @ApiIgnore Double price) { - Boolean result = distributionCashService.cash(price); - return ResultUtil.data(result); + public ResultMessage cash(@NotNull @ApiIgnore Double price) { + if(distributionCashService.cash(price)){ + return ResultUtil.success(); + } + throw new ServiceException(ResultCode.ERROR); } @ApiOperation(value = "分销员提现历史") diff --git a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsBuyerController.java index a90ba973..088e5143 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsBuyerController.java @@ -1,6 +1,8 @@ package cn.lili.controller.other.distribution; +import cn.lili.common.enums.ResultCode; import cn.lili.common.enums.ResultUtil; +import cn.lili.common.exception.ServiceException; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.distribution.entity.dto.DistributionGoodsSearchParams; import cn.lili.modules.distribution.entity.vos.DistributionGoodsVO; @@ -50,9 +52,11 @@ public class DistributionGoodsBuyerController { @ApiOperation(value = "选择分销商品") @ApiImplicitParam(name = "distributionGoodsId", value = "分销ID", required = true, dataType = "String", paramType = "path") @GetMapping(value = "/checked/{distributionGoodsId}") - public ResultMessage> distributionCheckGoods( + public ResultMessage distributionCheckGoods( @NotNull(message = "分销商品不能为空") @PathVariable("distributionGoodsId") String distributionGoodsId) { - distributionSelectedGoodsService.add(distributionGoodsId); - return ResultUtil.success(); + if(distributionSelectedGoodsService.add(distributionGoodsId)){ + return ResultUtil.success(); + } + throw new ServiceException(ResultCode.ERROR); } }