客户相关代码

Signed-off-by: fengb <fengbin1989@aliyun.com>

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/CustomerController.java

@@ -1,6 +1,7 @@
 package cc.hiver.mall.controller;
 
 import cc.hiver.core.common.utils.ResultUtil;
+import cc.hiver.core.common.utils.StringUtils;
 import cc.hiver.core.common.vo.Result;
 import cc.hiver.core.entity.User;
 import cc.hiver.core.service.UserService;
@@ -58,7 +59,9 @@ public class CustomerController {
     @RequestMapping(value = "/edit", method = RequestMethod.POST)
     @ApiOperation(value = "根据客户id修改客户")
     public Result edit(Customer customer) {
-
+        if(StringUtils.isEmpty(customer.getId())){
+            return ResultUtil.error("客户id不能为空");
+        }
         Customer originCustomer = customerService.getById(customer.getId());
         User user = userService.get(originCustomer.getUserId());
         user.setNickname(customer.getName());
@@ -78,6 +81,9 @@ public class CustomerController {
     @RequestMapping(value = "/delById", method = RequestMethod.POST)
     @ApiOperation(value = "根据id删除客户")
     public Result delete(Customer customer) {
+        if(StringUtils.isEmpty(customer.getId())){
+            return ResultUtil.error("客户id不能为空");
+        }
         boolean result = customerService.removeById(customer);
         if(result) {
             return ResultUtil.success("删除成功");

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnCommissionController.java

@@ -13,11 +13,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -68,9 +70,10 @@ public class ReturnCommissionController {
     }
 
     @RequestMapping(value = "/list", method = RequestMethod.GET)
-    @ApiOperation(value = "查询全部")
+    @ApiOperation(value = "查询商铺的返佣记录",httpMethod = "GET")
-    public Result list() {
+    public Result list(@ApiParam(value = "商铺id",required = true) @RequestParam(value = "shopId",required = true) String shopId) {
         QueryWrapper<ReturnCommission> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("shop_id",shopId);
         List<ReturnCommission> list = returnCommissionService.list(queryWrapper);
         return new ResultUtil<List<ReturnCommission>>().setData(list);
     }