From 2e6fca8ed1b3d78a4a5c5692a617cfcd6a37a748 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 21 Mar 2023 17:33:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=98=E6=94=BE=E5=9C=B0=E5=92=8C=E6=8F=90?= =?UTF-8?q?=E8=B4=A7=E7=82=B9=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oms/controller/OmsOrderController.java | 42 +++++++++++++++++++ .../oms/service/IOmsOrderService.java | 5 +++ .../oms/service/impl/OmsOrderServiceImpl.java | 11 +++++ .../mallplus/oms/entity/OmsOrderLocation.java | 14 +++++++ .../mallplus/oms/mapper/OmsOrderMapper.java | 4 ++ .../oms/query/OmsOrderLocationQuery.java | 20 +++++++++ .../main/resources/mapper/oms/OmsOrderDao.xml | 7 ++++ 7 files changed, 103 insertions(+) create mode 100644 mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsOrderLocation.java create mode 100644 mallplus-mbg/src/main/java/com/zscat/mallplus/oms/query/OmsOrderLocationQuery.java diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java index 187b129..19945eb 100644 --- a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java +++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java @@ -8,8 +8,10 @@ import com.zscat.mallplus.enums.AllEnum; import com.zscat.mallplus.enums.ConstansValue; import com.zscat.mallplus.oms.entity.OmsOrder; import com.zscat.mallplus.oms.entity.OmsOrderItem; +import com.zscat.mallplus.oms.entity.OmsOrderLocation; import com.zscat.mallplus.oms.entity.OmsOrderOperateHistory; import com.zscat.mallplus.oms.mapper.OmsOrderOperateHistoryMapper; +import com.zscat.mallplus.oms.query.OmsOrderLocationQuery; import com.zscat.mallplus.oms.query.OmsOrderQuery; import com.zscat.mallplus.oms.service.IOmsOrderItemService; import com.zscat.mallplus.oms.service.IOmsOrderService; @@ -253,5 +255,45 @@ public class OmsOrderController { return new CommonResult().success(IOmsOrderService.chartCount()); } + @GetMapping(value = "/getLocation") + public Object getLocation() { + return new CommonResult().success(IOmsOrderService.getLocation()); + } + + @GetMapping(value = "/getPickupPoint") + public Object getPickupPoint(@RequestParam("id") String id) { + return new CommonResult().success(IOmsOrderService.getPickupPoint(id)); + } + + @SysLog(MODULE = "oms", REMARK = "根据条件查询所有订单表列表") + @ApiOperation("根据条件查询所有订单表列表") + @GetMapping(value = "/getOmsOrderLocationByPage") + @PreAuthorize("hasAuthority('oms:OmsOrder:read')") + public Object getOmsOrderLocationByPage(OmsOrderLocationQuery omsOrderLocationQuery, + @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, + @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize + ) { + try { + QueryWrapper qw = new QueryWrapper<>(); + if(StringUtils.isNotBlank(omsOrderLocationQuery.getValueqhd())){ + qw.eq("receiver_detail_address",omsOrderLocationQuery.getValueqhd()); + } + if(StringUtils.isNotBlank(omsOrderLocationQuery.getValueszd())){ + qw.eq("receiver_region",omsOrderLocationQuery.getValueszd()); + } + if(StringUtils.isNotBlank(omsOrderLocationQuery.getReceiverPhone())){ + qw.like("receiver_phone",omsOrderLocationQuery.getReceiverPhone()); + } + if(StringUtils.isNotBlank(omsOrderLocationQuery.getStatus())){ + qw.eq("status",omsOrderLocationQuery.getStatus()); + + } + IPage page = IOmsOrderService.page(new Page(pageNum, pageSize), qw.orderByDesc("create_time").select(ConstansValue.sampleOrderList)); + return new CommonResult().success(page); + } catch (Exception e) { + log.error("根据条件查询所有订单表列表：%s", e.getMessage(), e); + } + return new CommonResult().failed(); + } } diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/IOmsOrderService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/IOmsOrderService.java index a88a5eb..6e996a5 100644 --- a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/IOmsOrderService.java +++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/IOmsOrderService.java @@ -2,6 +2,7 @@ package com.zscat.mallplus.oms.service; import com.baomidou.mybatisplus.extension.service.IService; import com.zscat.mallplus.oms.entity.OmsOrder; +import com.zscat.mallplus.oms.entity.OmsOrderLocation; import com.zscat.mallplus.oms.vo.*; import org.springframework.transaction.annotation.Transactional; @@ -75,4 +76,8 @@ public interface IOmsOrderService extends IService { List listOrderGroupByStatus(Integer status); Map orderMonthStatic(String date, Integer status); + + List getLocation(); + + List getPickupPoint(String id); } diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java index 2234ffa..010d61a 100644 --- a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java +++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zscat.mallplus.enums.OrderStatus; import com.zscat.mallplus.enums.StatusEnum; import com.zscat.mallplus.oms.entity.OmsOrder; +import com.zscat.mallplus.oms.entity.OmsOrderLocation; import com.zscat.mallplus.oms.entity.OmsOrderOperateHistory; import com.zscat.mallplus.oms.mapper.OmsOrderMapper; import com.zscat.mallplus.oms.mapper.OmsOrderOperateHistoryMapper; @@ -295,4 +296,14 @@ public class OmsOrderServiceImpl extends ServiceImpl i public Map orderMonthStatic(String date, Integer status) { return orderMapper.orderMonthStatic(date, status); } + + @Override + public List getLocation() { + return orderMapper.getLocation(); + } + + @Override + public List getPickupPoint(String id) { + return orderMapper.getPickupPoint(id); + } } diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsOrderLocation.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsOrderLocation.java new file mode 100644 index 0000000..95abe76 --- /dev/null +++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsOrderLocation.java @@ -0,0 +1,14 @@ +package com.zscat.mallplus.oms.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +public class OmsOrderLocation { + + @TableField("id") + private String id; + @TableField("name") + private String name; +} diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/mapper/OmsOrderMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/mapper/OmsOrderMapper.java index 00cd689..8d87d1a 100644 --- a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/mapper/OmsOrderMapper.java +++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/mapper/OmsOrderMapper.java @@ -3,6 +3,7 @@ package com.zscat.mallplus.oms.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zscat.mallplus.oms.entity.OmsOrder; import com.zscat.mallplus.oms.entity.OmsOrderItem; +import com.zscat.mallplus.oms.entity.OmsOrderLocation; import com.zscat.mallplus.oms.vo.OmsOrderDeliveryParam; import com.zscat.mallplus.oms.vo.OmsOrderDetail; import com.zscat.mallplus.oms.vo.OrderStstic; @@ -75,4 +76,7 @@ public interface OmsOrderMapper extends BaseMapper { List listOrderGroupByStatus(Integer status); + List getLocation(); + + List getPickupPoint(String id); } diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/query/OmsOrderLocationQuery.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/query/OmsOrderLocationQuery.java new file mode 100644 index 0000000..a9c1c2b --- /dev/null +++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/query/OmsOrderLocationQuery.java @@ -0,0 +1,20 @@ +package com.zscat.mallplus.oms.query; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2023/3/14 16:49 + * @Description + */ +@Data +public class OmsOrderLocationQuery { + @ApiModelProperty(value = "所在地id",required = false) + private String valueszd; + @ApiModelProperty(value = "取货点id",required = false) + private String valueqhd; + @ApiModelProperty(value = "收货人电话",required = false) + private String receiverPhone; + private String status; +} diff --git a/mallplus-mbg/src/main/resources/mapper/oms/OmsOrderDao.xml b/mallplus-mbg/src/main/resources/mapper/oms/OmsOrderDao.xml index d7337e1..ad86b73 100644 --- a/mallplus-mbg/src/main/resources/mapper/oms/OmsOrderDao.xml +++ b/mallplus-mbg/src/main/resources/mapper/oms/OmsOrderDao.xml @@ -230,4 +230,11 @@ + + +