From 00b25fb509207f7daf83b7a1eb4ceecaaa1d5101 Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期四, 18 十一月 2021 08:39:51 +0800
Subject: [PATCH] 修改

---
 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerController.java |   32 +++++++++++++++++++++++++++++++-
 1 files changed, 31 insertions(+), 1 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..3d69f0b 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);
     }
 
@@ -70,6 +78,28 @@
         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);
+        }
+        if(StrUtil.isNotEmpty(lat)){
+            customer.setLat(lat);
+        }
+        if(StrUtil.isNotEmpty(address)){
+            customer.setRegisteredAddress(address);
+        }
+        if(StrUtil.isNotEmpty(headImg)){
+            customer.setHeadImg(headImg);
+        }
+        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