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 | 50 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 44 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 bd68872..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
@@ -5,6 +5,8 @@
import cn.exrick.xboot.core.common.vo.PageVo;
import cn.exrick.xboot.core.common.vo.Result;
import cn.exrick.xboot.your.entity.Customer;
+import cn.exrick.xboot.your.entity.CustomerReceive;
+import cn.exrick.xboot.your.service.ICustomerReceiveService;
import cn.exrick.xboot.your.service.ICustomerService;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -30,12 +32,18 @@
@Autowired
private ICustomerService iCustomerService;
+ @Autowired
+ private ICustomerReceiveService iCustomerReceiveService;
@RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
@ApiOperation(value = "閫氳繃id鑾峰彇")
public Result<Customer> get(@PathVariable String id) {
-
Customer customer = iCustomerService.getById(id);
+ QueryWrapper<CustomerReceive> wrapper = new QueryWrapper<>();
+ wrapper.eq("customer_id",id);
+ wrapper.eq("status",1);
+ List<CustomerReceive> list = iCustomerReceiveService.list(wrapper);
+ customer.setReceives(list);
return new ResultUtil<Customer>().setData(customer);
}
@@ -48,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);
}
@@ -70,6 +77,37 @@
return new ResultUtil<Customer>().setErrorMsg("鎿嶄綔澶辫触");
}
+ @RequestMapping(value = "/update", method = RequestMethod.POST)
+ @ApiOperation(value = "鏇存柊鏁版嵁")
+ public Result<Customer> update(String customerId,String lng,String lat,String address,String headImg) {
+ 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);
+ }
+ return new ResultUtil<Customer>().setErrorMsg("鎿嶄綔澶辫触");
+ }
+
@RequestMapping(value = "/delByIds", method = RequestMethod.POST)
@ApiOperation(value = "鎵归噺閫氳繃id鍒犻櫎")
public Result<Object> delAllByIds(@RequestParam String[] ids) {
--
Gitblit v1.9.1