From f941841a99f21646e61c64b2979f59664e35ee59 Mon Sep 17 00:00:00 2001
From: lifenlong <pikachu1995@126.com>
Date: Thu, 20 May 2021 16:34:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=E5=95=86=E5=93=81=E7=BB=91?=
 =?UTF-8?q?=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<Object> 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<Boolean> cash(@NotNull @ApiIgnore Double price) {
-        Boolean result = distributionCashService.cash(price);
-        return ResultUtil.data(result);
+    public ResultMessage<Object> 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<IPage<DistributionGoodsVO>> distributionCheckGoods(
+    public ResultMessage<Object> 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);
     }
 }