diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index 015c8395..eb6ed987 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -777,6 +777,7 @@ public class OrderController extends BaseController { Assert.notNull(deptId, "deptId is null!"); // 生成主单 + orderMaster.setIsDeliveryToStore(appOrderRequest.getIsDeliveryToStore()); orderMaster.setOrderImages(appOrderRequest.getOrderImages()); orderMaster.setServiceShopId(appOrderRequest.getServiceShopId()); orderMaster.setDeptId(deptId); @@ -1449,6 +1450,19 @@ public class OrderController extends BaseController { } logger.info("处理已完成及已取消的订单: {}", orderListResponses); } + + if(CollectionUtils.isNotEmpty(orderListResponses)){ + // 如果传入的参数是商品订单且timeout为1，则排除orderStatus为3、5、6的订单 + if (orderListRequest.getOrderType() != null && orderListRequest.getOrderType() == 1 + && orderListRequest.getTimeout() != null && orderListRequest.getTimeout() == 1) { + orderListResponses = orderListResponses.stream() + .filter(order -> order.getOrderStatus() != 3 + && order.getOrderStatus() != 5 + && order.getOrderStatus() != 6) + .collect(Collectors.toList()); + } + } + // 查询新订单列表根据创建时间倒叙排列，查询其他根据更新时间倒序排列 Collections.sort(orderListResponses, new Comparator() { @Override @@ -1697,7 +1711,7 @@ public class OrderController extends BaseController { if (!mewAfterServiceRecords.isEmpty()) { // 检查售后记录状态，如果存在afterServiceStatus不为1的记录，则显示售后记录按钮 for (AfterServiceRecord record : mewAfterServiceRecords) { - if (record.getAfterServiceStatus() != 1) { + if (record.getAfterServiceStatus() == null ||(record.getAfterServiceStatus() != 1 && record.getAfterServiceStatus() != 2)) { hasMatchingAfterService = true; break; } @@ -1904,7 +1918,8 @@ public class OrderController extends BaseController { if (currentDetailRecords != null && !currentDetailRecords.isEmpty()) { // 遍历售后记录，如果存在afterServiceStatus不为1的记录，则显示售后记录按钮 for (AfterServiceRecord record : currentDetailRecords) { - if (record.getAfterServiceStatus() != 1) { + if (record.getAfterServiceStatus() == null || + (record.getAfterServiceStatus() != 1 && record.getAfterServiceStatus() != 2)) { showAfterServiceRecord = 1; break; } @@ -2004,7 +2019,7 @@ public class OrderController extends BaseController { Integer afterTimeout = null; if (currentDetailRecords != null && !currentDetailRecords.isEmpty()) { for (AfterServiceRecord record : currentDetailRecords) { - if (record.getAfterServiceStatus() != 1) { + if (record.getAfterServiceStatus() == null ||(record.getAfterServiceStatus() != 1 && record.getAfterServiceStatus() != 2)) { showAfterServiceRecord = 1; } @@ -2162,6 +2177,9 @@ public class OrderController extends BaseController { || master.getOrderStatus() == 4)) && master.getWorkerId() != null; + orderListResponse.setIsDeliveryToStore(1); + orderListResponse.setServiceShop(shopService.getShop(master.getServiceShopId())); + // 编辑返回属性 @@ -2417,16 +2435,21 @@ public class OrderController extends BaseController { int showAfterServiceRecord = 0; if (afterServiceRecordList != null && !afterServiceRecordList.isEmpty()) { - // 遍历售后记录，如果存在afterServiceStatus不为1的记录，则显示售后记录按钮 + // 遍历售后记录，如果存在afterServiceStatus不为1且不为2的记录，则显示售后记录按钮 for (AfterServiceRecord record : afterServiceRecordList) { - if (record.getAfterServiceStatus() != 1) { + if (record.getAfterServiceStatus() == null || + (record.getAfterServiceStatus() != 1 && record.getAfterServiceStatus() != 2)) { showAfterServiceRecord = 1; break; } } } orderListResponse.setShowAfterServiceRecord(showAfterServiceRecord); - + if(orderMaster.getIsDeliveryToStore()!=null&&orderMaster.getIsDeliveryToStore()==1){ + orderListResponse.setIsDeliveryToStore(1); + orderListResponse.setServiceShopId(orderMaster.getServiceShopId()); + orderListResponse.setServiceShop(shopService.getShop(orderMaster.getServiceShopId())); + } // 编辑返回属性 orderListResponse.setRefundPayStatus(orderMaster.getRefundPayStatus()); 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 2f3fee6f..b78cd763 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 @@ -878,7 +878,10 @@ public class OrderDetailController extends BaseController { orderListResponse.setServiceShop(serviceShop); orderListResponse.setShop(shop); orderListResponse.setServiceShopId(serviceShop != null ? serviceShop.getShopId() : null); - + if(orderMaster.getIsDeliveryToStore()!=null&&orderMaster.getIsDeliveryToStore()==1){ + orderListResponse.setIsDeliveryToStore(1); + + } // 编辑返回属性 orderListResponse.setRefundPayStatus(orderMaster.getRefundPayStatus()); orderListResponse.setAfterPlatformServiceStatus(detail.getAfterServiceStatus()); @@ -1234,7 +1237,7 @@ public class OrderDetailController extends BaseController { e.printStackTrace(); } } - orderDetail=orderDetailService.selectById(orderDetail.getId()); + // orderDetail=orderDetailService.selectById(orderDetail.getId()); if (orderDetail.getIsQuicklyDelivery()!=null&&orderDetail.getIsQuicklyDelivery()==1) { // 立即发货时更新订单商品的已发货数量 logger.info("立即发货订单[{}]开始更新商品已发货数量", orderDetail.getId()); @@ -1243,7 +1246,8 @@ public class OrderDetailController extends BaseController { // 获取子订单商品列表 List detailGoodsList = orderGoodsService.selectByOrderDetailId(orderDetail.getId()); // 获取主订单商品列表 - List masterGoodsList = orderGoodsService.selectByOrderMasterId(orderDetail.getOrderMasterId()); + OrderDetail orderDetail1 = orderDetailService.selectById(orderDetail.getId()); + List masterGoodsList = orderGoodsService.selectByOrderMasterId(orderDetail1.getOrderMasterId()); logger.info("立即发货订单[{}]子订单商品数量：{}，主订单商品数量：{}", orderDetail.getId(), detailGoodsList.size(), masterGoodsList.size()); 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 f407d456..6f8ece83 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 @@ -1301,6 +1301,7 @@ public class OrderMasterController extends BaseController { orderListResponse.setServiceShopId(master.getServiceShopId()); orderListResponse.setGoods(goods); // 编辑返回属性 + orderListResponse.setIsDeliveryToStore(master.getIsDeliveryToStore()); orderListResponse.setGoodsOrderMasterId(master.getGoodsOrderMasterId()); orderListResponse.setWorkerRemark(master.getWorkerRemark()); orderListResponse.setIsNeedBill(master.getIsNeedBill()); @@ -2101,6 +2102,7 @@ public class OrderMasterController extends BaseController { shop = calculateShopDistance(orderMaster, shop); serviceShop = calculateShopDistance(orderMaster, serviceShop); // 编辑返回属性 + orderListResponse.setIsDeliveryToStore(orderMaster.getIsDeliveryToStore()); orderListResponse.setDeliveryType(orderMaster.getDeliveryType()); orderListResponse.setDeliveryRemark(orderMaster.getDeliveryRemark()); orderListResponse.setDeliveryImages(orderMaster.getDeliveryImages()); diff --git a/ghy-order/src/main/java/com/ghy/order/request/AppOrderRequest.java b/ghy-order/src/main/java/com/ghy/order/request/AppOrderRequest.java index 5ec658b8..8a7f1dc4 100644 --- a/ghy-order/src/main/java/com/ghy/order/request/AppOrderRequest.java +++ b/ghy-order/src/main/java/com/ghy/order/request/AppOrderRequest.java @@ -49,4 +49,10 @@ public class AppOrderRequest { private Long serviceShopId; private String orderImages; + + /** + * 是否发货到服务店：0=否，1=是 + */ + + private Integer isDeliveryToStore; }