From 9c1840e4302d8c4f7af549e5de412488073490bf Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期二, 11 一月 2022 11:23:05 +0800
Subject: [PATCH] bug
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerController.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerController.java
index 57b0c96..445dcd3 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerController.java
@@ -41,7 +41,7 @@
Customer customer = iCustomerService.getById(id);
QueryWrapper<CustomerReceive> wrapper = new QueryWrapper<>();
wrapper.eq("customer_id",id);
- wrapper.eq("customer_id",id);
+ wrapper.eq("status",1);
List<CustomerReceive> list = iCustomerReceiveService.list(wrapper);
customer.setReceives(list);
return new ResultUtil<Customer>().setData(customer);
@@ -56,14 +56,13 @@
}
@RequestMapping(value = "/getByPage", method = RequestMethod.GET)
- @ApiOperation(value = "" +
- "")
- public Result<IPage<Customer>> getByPage(String areaSectionId,String name,PageVo page) {
+ @ApiOperation(value = "")
+ public Result<IPage<Customer>> getByPage(String areaSectionId,String customerName,PageVo page) {
QueryWrapper<Customer> wrapper = new QueryWrapper<>();
if (!StrUtil.isEmpty(areaSectionId))
wrapper.eq("area_section_id",areaSectionId);
- if (!StrUtil.isEmpty(name))
- wrapper.like("name","%"+name+"%");
+ if (!StrUtil.isEmpty(customerName))
+ wrapper.like("name", "%" + customerName + "%");
IPage<Customer> data = iCustomerService.page(PageUtil.initMpPage(page),wrapper);
return new ResultUtil<IPage<Customer>>().setData(data);
}
@@ -84,16 +83,25 @@
Customer customer = iCustomerService.getById(customerId);
if(StrUtil.isNotEmpty(lng)){
customer.setLng(lng);
+ }else{
+ return ResultUtil.error("璇峰皢淇℃伅濉啓瀹屾暣");
}
if(StrUtil.isNotEmpty(lat)){
customer.setLat(lat);
+ }else{
+ return ResultUtil.error("璇峰皢淇℃伅濉啓瀹屾暣");
}
if(StrUtil.isNotEmpty(address)){
customer.setRegisteredAddress(address);
+ }else{
+ return ResultUtil.error("璇峰皢淇℃伅濉啓瀹屾暣");
}
if(StrUtil.isNotEmpty(headImg)){
customer.setHeadImg(headImg);
+ }else{
+ return ResultUtil.error("璇峰皢淇℃伅濉啓瀹屾暣");
}
+ customer.setKstatus(2);
if (iCustomerService.saveOrUpdate(customer)) {
return new ResultUtil<Customer>().setData(customer);
}
--
Gitblit v1.9.1