From a067fdbf6b1374a1402096c722257575916eab99 Mon Sep 17 00:00:00 2001
From: wjli <591616088@qq.com>
Date: 星期四, 11 五月 2023 16:21:14 +0800
Subject: [PATCH] 1.首页分段显示 2.配送订单页可根据分段显示 3.后端配送率统计
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerController.java | 52 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 43 insertions(+), 9 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 6291084..998f23d 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
@@ -43,6 +43,11 @@
wrapper.eq("customer_id",id);
wrapper.eq("status",1);
List<CustomerReceive> list = iCustomerReceiveService.list(wrapper);
+ for (CustomerReceive customerReceive : list) {
+ if(StrUtil.isBlank(customerReceive.getPhone())){
+ customerReceive.setPhone(" ");
+ }
+ }
customer.setReceives(list);
return new ResultUtil<Customer>().setData(customer);
}
@@ -56,14 +61,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);
}
@@ -73,6 +77,22 @@
public Result<Customer> saveOrUpdate(Customer customer) {
if (iCustomerService.saveOrUpdate(customer)) {
+
+ if(StrUtil.isNotEmpty(customer.getLinker())){
+ QueryWrapper<CustomerReceive> wrapper = new QueryWrapper<>();
+ wrapper.eq("customer_id",customer.getId());
+ wrapper.eq("name",customer.getLinker());
+ CustomerReceive one = iCustomerReceiveService.getOne(wrapper);
+ if(one==null){
+ one = new CustomerReceive();
+ one.setCustomerId(customer.getId());
+ one.setFstatus(0);
+ one.setStatus(1);
+ one.setName(customer.getLinker());
+ one.setPhone(customer.getPhone());
+ iCustomerReceiveService.saveOrUpdate(one);
+ }
+ }
return new ResultUtil<Customer>().setData(customer);
}
return new ResultUtil<Customer>().setErrorMsg("鎿嶄綔澶辫触");
@@ -85,22 +105,36 @@
if(StrUtil.isNotEmpty(lng)){
customer.setLng(lng);
}else{
- return ResultUtil.error("璇峰皢淇℃伅濉啓瀹屾暣");
+ return ResultUtil.error("璇峰皢瀹氫綅淇℃伅濉啓瀹屾暣");
}
if(StrUtil.isNotEmpty(lat)){
customer.setLat(lat);
}else{
- return ResultUtil.error("璇峰皢淇℃伅濉啓瀹屾暣");
+ return ResultUtil.error("璇峰皢瀹氫綅淇℃伅濉啓瀹屾暣");
}
+
+ QueryWrapper<Customer> wrapper = new QueryWrapper<>();
+ wrapper.eq("lng",lng);
+ wrapper.eq("lat",lat);
+ List<Customer> list = iCustomerService.list(wrapper);
+ if(list.size()>0){
+ for(Customer c:list){
+ c.setLikeCusotmerId(customerId);
+ iCustomerService.saveOrUpdate(c);
+ }
+ //customer.setLikeCusotmerId(list.get(0).getId());
+ }
+
+
if(StrUtil.isNotEmpty(address)){
customer.setRegisteredAddress(address);
}else{
- return ResultUtil.error("璇峰皢淇℃伅濉啓瀹屾暣");
+ return ResultUtil.error("璇峰皢浣嶇疆淇℃伅濉啓瀹屾暣");
}
if(StrUtil.isNotEmpty(headImg)){
customer.setHeadImg(headImg);
}else{
- return ResultUtil.error("璇峰皢淇℃伅濉啓瀹屾暣");
+ return ResultUtil.error("璇峰皢闂ㄥご鐓т俊鎭～鍐欏畬鏁�");
}
customer.setKstatus(2);
if (iCustomerService.saveOrUpdate(customer)) {
--
Gitblit v1.9.1