From 46541296bfbe555e752b71a7c2eee2485fdf6b7c Mon Sep 17 00:00:00 2001 From: donqi Date: Sun, 10 Jul 2022 20:00:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D,orderdetai?= =?UTF-8?q?l=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/order/OrderDetailController.java | 12 ++++++++++-- .../web/controller/order/OrderMasterController.java | 2 +- .../resources/mapper/order/OrderDetailMapper.xml | 6 ++++++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index 5aa7d141..eada63d7 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -25,6 +25,8 @@ import com.ghy.order.service.OrderMasterService; import com.ghy.payment.domain.FinancialDetail; import com.ghy.payment.domain.FinancialMaster; import com.ghy.payment.service.FinancialDetailService; +import com.ghy.system.domain.SysArea; +import com.ghy.system.service.ISysAreaService; import com.ghy.web.pojo.vo.OrderListResponse; import com.ghy.web.pojo.vo.OrderStandard; import com.ghy.worker.domain.Worker; @@ -64,6 +66,8 @@ public class OrderDetailController extends BaseController { @Autowired private CustomerAddressService addressService; @Autowired + private ISysAreaService sysAreaService; + @Autowired private GoodsService goodsService; @Autowired private GoodsStandardService goodsStandardService; @@ -116,6 +120,8 @@ public class OrderDetailController extends BaseController { // 地址信息 CustomerAddress customerAddress = addressService.selectByCustomerAddressId(orderMaster.getAddressId()); + SysArea sysArea = sysAreaService.selectById(customerAddress.getCountryId()); + String completeAddress = sysArea.getMergerName().replaceAll(",", "") + customerAddress.getAddress(); for(OrderGoods orderGoods : orderStandardList){ OrderStandard orderStandard = new OrderStandard(); @@ -144,7 +150,7 @@ public class OrderDetailController extends BaseController { orderListResponse.setPayStatus(orderMaster.getPayStatus()); orderListResponse.setPayType(orderMaster.getPayType()); orderListResponse.setStandardList(standardList); - orderListResponse.setAddress(customerAddress.getAddress()); + orderListResponse.setAddress(completeAddress); orderListResponse.setServerTime(detail.getRevTime()); orderListResponse.setExpectTimeStart(detail.getExpectTimeStart()); orderListResponse.setExpectTimeEnd(detail.getExpectTimeEnd()); @@ -196,6 +202,8 @@ public class OrderDetailController extends BaseController { // 地址信息 CustomerAddress customerAddress = addressService.selectByCustomerAddressId(orderMaster.getAddressId()); + SysArea sysArea = sysAreaService.selectById(customerAddress.getCountryId()); + String completeAddress = sysArea.getMergerName().replaceAll(",", "") + customerAddress.getAddress(); for(OrderGoods orderGoods : orderStandardList){ OrderStandard orderStandard = new OrderStandard(); @@ -225,7 +233,7 @@ public class OrderDetailController extends BaseController { orderListResponse.setPayStatus(orderMaster.getPayStatus()); orderListResponse.setPayType(orderMaster.getPayType()); orderListResponse.setStandardList(standardList); - orderListResponse.setAddress(customerAddress.getAddress()); + orderListResponse.setAddress(completeAddress); orderListResponse.setServerTime(detail.getRevTime()); orderListResponse.setExpectTimeStart(detail.getExpectTimeStart()); orderListResponse.setExpectTimeEnd(detail.getExpectTimeEnd()); diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index b7da2133..95b90a8b 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -163,7 +163,7 @@ public class OrderMasterController extends BaseController { rspData.setTotal(orderListResponses.size()); return rspData; } - Integer pageSize = pageDomain.getPageNum() * 10; + Integer pageSize = pageDomain.getPageNum(); if (pageSize > orderListResponses.size()) { pageSize = orderListResponses.size(); diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml index bbf63d5f..0f60e694 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml @@ -98,6 +98,12 @@ AND ca.country_id = #{countryId} + + AND od.expect_time_start >= #{expectTimeStart} + + + AND od.expect_time_end <= #{expectTimeEnd} + order by od.create_time