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 f0c48a87..ee0424e5 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 @@ -119,6 +119,19 @@ public class OrderDetailController extends BaseController { List workList = workerService.getWorkList(param); List ids = workList.stream().map(Worker::getWorkerId).collect(Collectors.toList()); orderDetail.setWorkerIds(ids); + if(CollectionUtils.isEmpty(ids)){ + return getDataTable(new ArrayList<>()); + } + } + if(orderDetail.getSysPayStatus() != null){ + FinancialMaster param = new FinancialMaster(); + param.setPayStatus(orderDetail.getSysPayStatus()); + List financialMasters = financialMasterService.selectFinancialMasterList(param); + List masterIds = financialMasters.stream().map(FinancialMaster::getOrderMasterId).collect(Collectors.toList()); + orderDetail.setMasterIds(masterIds); + if(CollectionUtils.isEmpty(masterIds)){ + return getDataTable(new ArrayList<>()); + } } startPage(); if (this.getSysUser().getDept().getParentId() != 101) { @@ -135,16 +148,9 @@ public class OrderDetailController extends BaseController { Map orderMasterMap = orderMasters.stream().collect(Collectors.toMap(OrderMaster::getId, x -> x, (x, y) -> y)); List financialMasters = financialMasterService.selectByOrderMasterIds(orderMasterIds); - Map financialMasterMap = new HashMap<>(); - if(orderDetail.getSysPayStatus() != null && 0 == orderDetail.getSysPayStatus()){ - financialMasterMap = financialMasters - .stream().filter(financialMaster->0 == financialMaster.getPayStatus()).collect(Collectors.toMap(FinancialMaster::getOrderMasterId, x -> x, (x, y) -> y)); - }else { - financialMasterMap = financialMasters - .stream().collect(Collectors.toMap(FinancialMaster::getOrderMasterId, x -> x, (x, y) -> y)); - } - - + Map financialMasterMap = financialMasters + .stream().collect(Collectors.toMap(FinancialMaster::getOrderMasterId, x -> x, (x, y) -> y)); + Set orderDetailIds = orderDetails.stream().map(OrderDetail::getId).collect(Collectors.toSet()); Map financialDetailMap = financialDetailService.selectByOrderDetailIds(orderDetailIds) .stream().collect(Collectors.toMap(FinancialDetail::getOrderDetailId, x -> x, (x, y) -> y)); @@ -665,6 +671,14 @@ public class OrderDetailController extends BaseController { return "/order/pay-qrcode"; } + @GetMapping("/orderWorker/{orderId}") + public String orderWorker(@PathVariable("orderId") Long orderId, ModelMap mmap) { + List workList = workerService.getWorkList(new Worker()); + mmap.put("orderId", orderId); + mmap.put("workers", workList); + return "/order/orderWorker"; + } + /** * 修改保存详细订单 */ diff --git a/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html b/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html index c862e36f..68c25df6 100644 --- a/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html +++ b/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html @@ -3,6 +3,7 @@ + + + + + + + + + +
+
+
+
+
+ +
+ +
×
+
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java index 14517cab..379fc92e 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java @@ -177,4 +177,6 @@ public class OrderDetail extends BaseEntity { private List workerIds; + private List masterIds; + } diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml index beb7957a..431b9a1a 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml @@ -135,6 +135,12 @@ #{workerId} + + AND od.order_master_id in + + #{masterId} + + AND g.dept_goods_category_id = #{goodsCategoryId}