优化店铺结算单、店铺流水生成规则。

优化分销申请逻辑，分销佣金不转入预存款

manager-api/src/main/java/cn/lili/controller/distribution/DistributionCashManagerController.java

@@ -1,11 +1,13 @@
 package cn.lili.controller.distribution;
 
 import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
+import cn.lili.common.context.ThreadContextHolder;
 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;
 import cn.lili.modules.distribution.service.DistributionCashService;
+import cn.lili.modules.order.order.entity.dto.OrderSearchParams;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -14,6 +16,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -54,5 +57,13 @@ public class DistributionCashManagerController {
     public ResultMessage<DistributionCash> audit(@PathVariable String id, @NotNull String result) {
         return ResultUtil.data(distributorCashService.audit(id, result));
     }
+
+
+    @ApiOperation(value = "查询分销提现导出列表")
+    @GetMapping("/queryExport")
+    public void queryExport(DistributionCashSearchParams distributionCashSearchParams) {
+        HttpServletResponse response = ThreadContextHolder.getHttpResponse();
+        distributorCashService.queryExport(response,distributionCashSearchParams);
+    }
 }
 

manager-api/src/main/java/cn/lili/controller/distribution/DistributionManagerController.java

@@ -9,6 +9,7 @@ import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.distribution.entity.dos.Distribution;
 import cn.lili.modules.distribution.entity.dto.DistributionSearchParams;
 import cn.lili.modules.distribution.service.DistributionService;
+import cn.lili.modules.goods.entity.vos.BrandVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -17,6 +18,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -83,6 +85,17 @@ public class DistributionManagerController {
         } else {
             throw new ServiceException(ResultCode.DISTRIBUTION_AUDIT_ERROR);
         }
+    }
 
+
+    @ApiOperation(value = "更新数据")
+    @ApiImplicitParam(name = "id", value = "品牌ID", required = true, dataType = "String", paramType = "path")
+    @PutMapping("/{id}")
+    public ResultMessage<Distribution> update(@PathVariable String id, @Valid Distribution distribution) {
+        distribution.setId(id);
+        if (distributionService.updateById(distribution)) {
+            return ResultUtil.data(distribution);
+        }
+        throw new ServiceException(ResultCode.DISTRIBUTION_EDIT_ERROR);
     }
 }

manager-api/src/main/java/cn/lili/controller/member/MemberGradeManagerController.java

@@ -2,7 +2,6 @@ package cn.lili.controller.member;
 
 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.member.entity.dos.MemberGrade;
@@ -51,11 +50,11 @@ public class MemberGradeManagerController {
             @ApiImplicitParam(name = "id", value = "会员等级ID", required = true, paramType = "path")
     })
     @PostMapping(value = "/add")
-    public ResultMessage<Object> daa(@Validated  MemberGrade memberGrade) {
+    public ResultMessage<Object> daa(@Validated MemberGrade memberGrade) {
         if (memberGradeService.save(memberGrade)) {
             return ResultUtil.success(ResultCode.SUCCESS);
         }
-        throw new ServiceException(ResultCode.ERROR);
+        return ResultUtil.error(ResultCode.ERROR);
     }
 
     @ApiOperation(value = "修改会员等级")
@@ -63,24 +62,21 @@ public class MemberGradeManagerController {
             @ApiImplicitParam(name = "id", value = "会员等级ID", required = true, paramType = "path")
     })
     @PutMapping(value = "/update/{id}")
-    public ResultMessage<Object> update(@PathVariable String id,MemberGrade memberGrade) {
+    public ResultMessage<Object> update(@PathVariable String id, MemberGrade memberGrade) {
         if (memberGradeService.updateById(memberGrade)) {
             return ResultUtil.success(ResultCode.SUCCESS);
         }
-        throw new ServiceException(ResultCode.ERROR);
+        return ResultUtil.error(ResultCode.ERROR);
     }
 
 
-
     @ApiOperation(value = "删除会员等级")
     @ApiImplicitParam(name = "id", value = "会员等级ID", required = true, dataType = "String", paramType = "path")
     @DeleteMapping(value = "/delete/{id}")
     public ResultMessage<IPage<Object>> delete(@PathVariable String id) {
-        if(memberGradeService.getById(id).getIsDefault()){
-            throw new ServiceException(ResultCode.USER_GRADE_IS_DEFAULT);
-        }else if(memberGradeService.removeById(id)){
+        if (memberGradeService.removeById(id)) {
             return ResultUtil.success(ResultCode.SUCCESS);
         }
-        throw new ServiceException(ResultCode.ERROR);
+        return ResultUtil.error(ResultCode.ERROR);
     }
 }