From 1d1939f75858cbe87b859e9f26787166fe04416f Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 27 Mar 2023 15:26:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oms/controller/OmsOrderController.java | 8 ++++---- .../OmsOrderReturnApplyController.java | 9 +++++++++ .../oms/service/impl/OmsOrderServiceImpl.java | 18 +++++++++--------- 3 files changed, 22 insertions(+), 13 deletions(-) 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 16eb93a..ea8f847 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 @@ -90,9 +90,9 @@ public class OmsOrderController { return new CommonResult().failed(); } - @GetMapping("/exportExcel") + @PostMapping("/exportExcel") @ApiOperation(value = "订单列表导出") - public void exportExcel(OmsOrderQuery omsOrderQuery) { + public void exportExcel(@RequestBody OmsOrderQuery omsOrderQuery) { //得到所有要导出的数据 List excelVos = IOmsOrderService.listExcel(omsOrderQuery); //定义导出的excel名字 @@ -330,9 +330,9 @@ public class OmsOrderController { return new CommonResult().failed(); } - @GetMapping("/exportExcel2") + @PostMapping("/exportExcel2") @ApiOperation(value = "订单归集列表导出") - public void exportExcel2(OmsOrderLocationQuery omsOrderLocationQuery) { + public void exportExcel2(@RequestBody OmsOrderLocationQuery omsOrderLocationQuery) { //得到所有要导出的数据 List excelVos = IOmsOrderService.listExcel2(omsOrderLocationQuery); //定义导出的excel名字 diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderReturnApplyController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderReturnApplyController.java index 7dd12de..e42fefb 100644 --- a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderReturnApplyController.java +++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderReturnApplyController.java @@ -268,4 +268,13 @@ public class OmsOrderReturnApplyController { return null; } + + + public void main(String[] args) { + String out_trade_no = ""; + String trade_no =""; + String refund_amount =""; + String returnRe = alipayRefund(out_trade_no,trade_no,refund_amount); + + } } 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 950a3d1..6696981 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 @@ -358,20 +358,20 @@ public class OmsOrderServiceImpl extends ServiceImpl i public List listExcel(OmsOrderQuery omsOrderQuery) { QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(omsOrderQuery.getOrderSn())) { - qw.like("order_sn", omsOrderQuery.getOrderSn()); + qw.like("omo.order_sn", omsOrderQuery.getOrderSn()); } if (StringUtils.isNotBlank(omsOrderQuery.getReceiverPhone())) { - qw.like("receiver_phone", omsOrderQuery.getReceiverPhone()); + qw.like("omo.receiver_phone", omsOrderQuery.getReceiverPhone()); } - qw.apply(StringUtils.isNotBlank(omsOrderQuery.getCreateTimeStart()), "date_format (create_time,'%Y-%m-%d') >= date_format('" + omsOrderQuery.getCreateTimeStart() + "','%Y-%m-%d')"). - apply(StringUtils.isNotBlank(omsOrderQuery.getCreateTimeEnd()), "date_format (create_time,'%Y-%m-%d') <= date_format('" + omsOrderQuery.getCreateTimeEnd() + "','%Y-%m-%d')" + qw.apply(StringUtils.isNotBlank(omsOrderQuery.getCreateTimeStart()), "date_format (omo.create_time,'%Y-%m-%d') >= date_format('" + omsOrderQuery.getCreateTimeStart() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(omsOrderQuery.getCreateTimeEnd()), "date_format (omo.create_time,'%Y-%m-%d') <= date_format('" + omsOrderQuery.getCreateTimeEnd() + "','%Y-%m-%d')" ); List orders = new ArrayList<>(); if (StringUtils.isBlank(omsOrderQuery.getStatus())) { //查询全部订单 orders = orderMapper.listExcel(qw); } else { - orders = orderMapper.listExcel(qw.eq("status", omsOrderQuery.getStatus())); + orders = orderMapper.listExcel(qw.eq("omo.status", omsOrderQuery.getStatus())); } return orders; } @@ -380,20 +380,20 @@ public class OmsOrderServiceImpl extends ServiceImpl i public List listExcel2(OmsOrderLocationQuery omsOrderLocationQuery) { QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(omsOrderLocationQuery.getValueqhd())) { - qw.eq("receiver_detail_address", omsOrderLocationQuery.getValueqhd()); + qw.eq("omo.receiver_detail_address", omsOrderLocationQuery.getValueqhd()); } if (StringUtils.isNotBlank(omsOrderLocationQuery.getValueszd())) { - qw.eq("receiver_region", omsOrderLocationQuery.getValueszd()); + qw.eq("omo.receiver_region", omsOrderLocationQuery.getValueszd()); } if (StringUtils.isNotBlank(omsOrderLocationQuery.getReceiverPhone())) { - qw.like("receiver_phone", omsOrderLocationQuery.getReceiverPhone()); + qw.like("omo.receiver_phone", omsOrderLocationQuery.getReceiverPhone()); } List orders = new ArrayList<>(); if (StringUtils.isBlank(omsOrderLocationQuery.getStatus())) { //查询全部订单 orders = orderMapper.listExcel(qw); } else { - orders = orderMapper.listExcel(qw.eq("status", omsOrderLocationQuery.getStatus())); + orders = orderMapper.listExcel(qw.eq("omo.status", omsOrderLocationQuery.getStatus())); } return orders; }