From f8b88dddf16b29629d78b2b25c8fa93887c34c3b Mon Sep 17 00:00:00 2001 From: HH Date: Thu, 16 Feb 2023 23:01:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/OrderMasterController.java | 114 +++++++++--------- .../mapper/CustomerAddressMapper.java | 5 +- .../mapper/customer/CustomerAddressMapper.xml | 6 +- 3 files changed, 59 insertions(+), 66 deletions(-) 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 aa1f9c05..d1873a27 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 @@ -14,7 +14,6 @@ import com.ghy.common.utils.StringUtils; import com.ghy.common.utils.poi.ExcelUtil; import com.ghy.customer.domain.CustomerAddress; import com.ghy.customer.service.CustomerAddressService; -import com.ghy.customer.service.CustomerService; import com.ghy.goods.domain.Goods; import com.ghy.goods.domain.GoodsImgs; import com.ghy.goods.domain.GoodsStandard; @@ -48,15 +47,14 @@ import com.ghy.worker.domain.WorkerCertification; import com.ghy.worker.service.IWorkerCertificationService; import com.ghy.worker.service.WorkerService; import com.huifu.adapay.core.exception.BaseAdaPayException; -import org.apache.commons.collections.CollectionUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; @@ -74,37 +72,35 @@ public class OrderMasterController extends BaseController { private final String prefix = "order/master"; - @Autowired + @Resource private OrderMasterService orderMasterService; - @Autowired - private CustomerService customerService; - @Autowired + @Resource private WorkerService workerService; - @Autowired + @Resource private IWorkerCertificationService workerCertificationService; - @Autowired + @Resource private OrderDetailService orderDetailService; - @Autowired + @Resource private OrderGoodsService orderGoodsService; - @Autowired + @Resource private CustomerAddressService addressService; - @Autowired + @Resource private GoodsService goodsService; - @Autowired + @Resource private GoodsImgsService goodsImgsService; - @Autowired + @Resource private FinancialMasterService financialMasterService; - @Autowired + @Resource private FinancialDetailService financialDetailService; - @Autowired + @Resource private GoodsStandardService goodsStandardService; - @Autowired + @Resource private OrderFineRecordService orderFineRecordService; - @Autowired + @Resource private ISysAreaService sysAreaService; - @Autowired + @Resource private IAfterServiceRecordService afterServiceRecordService; - @Autowired + @Resource private FinancialChangeRecordService financialChangeRecordService; @RequiresPermissions("order:master:view") @@ -146,7 +142,7 @@ public class OrderMasterController extends BaseController { FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(master.getId()); BigDecimal totalPayMoney = financialMaster.getPayMoney(); BigDecimal totalChangeMoney = new BigDecimal(0); - for (OrderDetail detail: detailList) { + for (OrderDetail detail : detailList) { // 查询子单加价记录 FinancialChangeRecord record = financialChangeRecordService.selectNotPayRecordByDetailId(detail.getId()); if (record != null) { @@ -164,7 +160,7 @@ public class OrderMasterController extends BaseController { // 查询售后记录 List afterServiceRecords = new ArrayList<>(); List detailOrderList = orderDetailService.selectByOrderMasterId(master.getId()); - detailOrderList.stream().forEach(detail -> { + detailOrderList.forEach(detail -> { OrderTimeoutRecord timeoutRecord = orderFineRecordService.selectByDetailIdAndStatus(detail.getId(), detail.getOrderStatus()); if (timeoutRecord != null) { timeoutRecords.add(timeoutRecord); @@ -172,7 +168,7 @@ public class OrderMasterController extends BaseController { AfterServiceRecord afterServiceRecordQry = new AfterServiceRecord(); afterServiceRecordQry.setOrderDetailId(detail.getId()); - List records = afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecordQry); + List records = afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecordQry); afterServiceRecords.addAll(records); }); @@ -244,31 +240,31 @@ public class OrderMasterController extends BaseController { afterServiceRecord.setExcludeAfterServiceFinished(Boolean.TRUE); List afterServiceRecordList = afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord); // 踢重后的子单ids - List detailIds = afterServiceRecordList.stream().map(AfterServiceRecord::getOrderDetailId).distinct().collect(Collectors.toList()); + List detailIds = afterServiceRecordList.stream().map(AfterServiceRecord::getOrderDetailId).distinct().collect(Collectors.toList()); StringBuilder orderDetailIds = new StringBuilder(); OrderDetail orderDetail = new OrderDetail(); orderDetail.setCustomerId(orderMaster.getCustomerId()); orderDetail.setDeptId(orderMaster.getDeptId()); - detailIds.forEach(id->{ + detailIds.forEach(id -> { orderDetailIds.append(id).append(","); }); String ids = orderDetailIds.toString(); - if(StringUtils.isNotEmpty(ids)){ - orderDetail.setOrderDetailIds(ids.substring(0, ids.length()-1)); - }else { + if (StringUtils.isNotEmpty(ids)) { + orderDetail.setOrderDetailIds(ids.substring(0, ids.length() - 1)); + } else { orderDetail.setOrderDetailIds("0"); } // 所有售后的子单 List orderDetailList = orderDetailService.selectOrderDetailList(orderDetail); StringBuilder orderMasterIds = new StringBuilder(); orderDetailList.stream().map(OrderDetail::getOrderMasterId).distinct() - .collect(Collectors.toList()).forEach(id->{ - orderMasterIds.append(id).append(","); - }); + .collect(Collectors.toList()).forEach(id -> { + orderMasterIds.append(id).append(","); + }); String orderIds = orderMasterIds.toString(); - if(StringUtils.isNotEmpty(orderIds)){ - orderMaster.setOrderMasterIds(orderIds.substring(0, orderIds.length()-1)); - }else { + if (StringUtils.isNotEmpty(orderIds)) { + orderMaster.setOrderMasterIds(orderIds.substring(0, orderIds.length() - 1)); + } else { orderMaster.setOrderMasterIds("0"); } @@ -277,7 +273,7 @@ public class OrderMasterController extends BaseController { List list = orderMasterService.selectOrderMasterList(orderMaster); list.forEach(master -> { //子单 - List detailList = orderDetailService.selectByOrderMasterId(master.getId()); +// List detailList = orderDetailService.selectByOrderMasterId(master.getId()); // 初始化属性 OrderListResponse orderListResponse = new OrderListResponse(); @@ -320,7 +316,7 @@ public class OrderMasterController extends BaseController { // 查询是否超时 List timeoutRecords = new ArrayList<>(); List detailOrderList = orderDetailService.selectByOrderMasterId(master.getId()); - detailOrderList.stream().forEach(detail -> { + detailOrderList.forEach(detail -> { OrderTimeoutRecord timeoutRecord = orderFineRecordService.selectByDetailIdAndStatus(detail.getId(), detail.getOrderStatus()); if (timeoutRecord != null) { timeoutRecords.add(timeoutRecord); @@ -387,31 +383,31 @@ public class OrderMasterController extends BaseController { afterServiceRecord.setExcludeAfterServiceFinished(Boolean.TRUE); List afterServiceRecordList = afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord); // 踢重后的子单ids - List detailIds = afterServiceRecordList.stream().map(AfterServiceRecord::getOrderDetailId).distinct().collect(Collectors.toList()); + List detailIds = afterServiceRecordList.stream().map(AfterServiceRecord::getOrderDetailId).distinct().collect(Collectors.toList()); StringBuilder orderDetailIds = new StringBuilder(); OrderDetail orderDetail = new OrderDetail(); orderDetail.setCustomerId(orderMaster.getCustomerId()); orderDetail.setDeptId(orderMaster.getDeptId()); - detailIds.forEach(id->{ + detailIds.forEach(id -> { orderDetailIds.append(id).append(","); }); String ids = orderDetailIds.toString(); - if(StringUtils.isNotEmpty(ids)){ - orderDetail.setOrderDetailIds(ids.substring(0, ids.length()-1)); - }else { + if (StringUtils.isNotEmpty(ids)) { + orderDetail.setOrderDetailIds(ids.substring(0, ids.length() - 1)); + } else { orderDetail.setOrderDetailIds("0"); } // 所有售后的子单 List orderDetailList = orderDetailService.selectOrderDetailList(orderDetail); StringBuilder orderMasterIds = new StringBuilder(); orderDetailList.stream().map(OrderDetail::getOrderMasterId).distinct() - .collect(Collectors.toList()).forEach(id->{ - orderMasterIds.append(id).append(","); - }); + .collect(Collectors.toList()).forEach(id -> { + orderMasterIds.append(id).append(","); + }); String orderIds = orderMasterIds.toString(); - if(StringUtils.isNotEmpty(orderIds)){ - orderMaster.setOrderMasterIds(orderIds.substring(0, orderIds.length()-1)); - }else { + if (StringUtils.isNotEmpty(orderIds)) { + orderMaster.setOrderMasterIds(orderIds.substring(0, orderIds.length() - 1)); + } else { orderMaster.setOrderMasterIds("0"); } @@ -433,7 +429,7 @@ public class OrderMasterController extends BaseController { // 计算总额 BigDecimal totalPayMoney = financialMaster.getPayMoney(); - for (OrderDetail orderDetail: orderDetailList) { + for (OrderDetail orderDetail : orderDetailList) { List standardList = new ArrayList<>(); // 子单施工师傅信息 Worker detailWorker = workerService.selectById(orderDetail.getWorkerId()); @@ -500,7 +496,7 @@ public class OrderMasterController extends BaseController { orderStandardDetail.setServerMoney(financialMaster.getServerMoney()); AfterServiceRecord afterServiceRecord = new AfterServiceRecord(); afterServiceRecord.setOrderDetailId(orderDetail.getId()); - List records =afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord); + List records = afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord); orderStandardDetail.setAfterServiceRecordList(records); orderStandardDetail.setIsOnlyServ(this.checkIsOnlyServer(orderMaster.getId(), orderDetail.getWorkerId()) ? Boolean.TRUE : Boolean.FALSE); @@ -564,7 +560,7 @@ public class OrderMasterController extends BaseController { fdQry.setFinancialMasterId(financialMaster.getId()); List financialDetailList = financialDetailService.selectFinancialDetailList(fdQry); BigDecimal finalRecvMoney = BigDecimal.ZERO; - for (FinancialDetail financialDetail: financialDetailList) { + for (FinancialDetail financialDetail : financialDetailList) { finalRecvMoney = finalRecvMoney.add(financialDetail.getPayMoney()); } @@ -623,7 +619,7 @@ public class OrderMasterController extends BaseController { orderMasterResponseVo.setWorkerName(worker.getName()); } // 消费者信息 - CustomerAddress customerAddress = addressService.selectByCustomerAddressId(orderMaster.getAddressId()); + CustomerAddress customerAddress = addressService.selectByCustomerAddressId(master.getAddressId()); orderMasterResponseVo.setCustomerName(customerAddress.getName()); orderMasterResponseVos.add(orderMasterResponseVo); @@ -757,7 +753,7 @@ public class OrderMasterController extends BaseController { // 查询主单金额 FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(orderMasterId); BigDecimal totalMoney = financialMaster.getPayMoney(); - for (OrderDetail detail: detailList) { + for (OrderDetail detail : detailList) { // 师傅信息 Worker worker = workerService.selectById(detail.getWorkerId()); @@ -785,7 +781,7 @@ public class OrderMasterController extends BaseController { orderStandardDetails.add(detailRes); } - for (OrderStandardDetail orderStandardDetail: orderStandardDetails) { + for (OrderStandardDetail orderStandardDetail : orderStandardDetails) { orderStandardDetail.setPayMoney(totalMoney); } @@ -796,22 +792,22 @@ public class OrderMasterController extends BaseController { } } - private boolean checkIsOnlyServer(Long orderMasterId, Long workId){ + private boolean checkIsOnlyServer(Long orderMasterId, Long workId) { // 找出原单的数量 - List orderGoodsList = orderGoodsService.selectByOrderMasterId(orderMasterId); + List orderGoodsList = orderGoodsService.selectByOrderMasterId(orderMasterId); // 找出原单关联的细单的商品数量 List orderDetailList = orderDetailService.selectByOrderMasterId(orderMasterId); - for (OrderDetail detail : orderDetailList){ + for (OrderDetail detail : orderDetailList) { // 非一个师傅接单 - if(!workId.equals(detail.getWorkerId())){ + if (!workId.equals(detail.getWorkerId())) { return false; } // 子单数量 List orderDetailGoodsList = orderGoodsService.selectByOrderDetailId(detail.getId()); // 计算剩余未分配的商品数量 for (OrderGoods detailGoods : orderDetailGoodsList) { - for(OrderGoods masterGoods : orderGoodsList){ - if(Objects.equals(masterGoods.getGoodsStandardId(), detailGoods.getGoodsStandardId())){ + for (OrderGoods masterGoods : orderGoodsList) { + if (Objects.equals(masterGoods.getGoodsStandardId(), detailGoods.getGoodsStandardId())) { masterGoods.setGoodsNum(masterGoods.getGoodsNum() - detailGoods.getGoodsNum()); } } diff --git a/ghy-custom/src/main/java/com/ghy/customer/mapper/CustomerAddressMapper.java b/ghy-custom/src/main/java/com/ghy/customer/mapper/CustomerAddressMapper.java index a4516d29..b895e1b2 100644 --- a/ghy-custom/src/main/java/com/ghy/customer/mapper/CustomerAddressMapper.java +++ b/ghy-custom/src/main/java/com/ghy/customer/mapper/CustomerAddressMapper.java @@ -3,6 +3,7 @@ package com.ghy.customer.mapper; import com.ghy.customer.domain.CustomerAddress; import org.apache.ibatis.annotations.Param; +import javax.validation.constraints.NotNull; import java.util.List; public interface CustomerAddressMapper { @@ -17,7 +18,7 @@ public interface CustomerAddressMapper { * @param ids 地址id * @return 删除成功条数 */ - int deleteByIds(String [] ids); + int deleteByIds(String[] ids); /** * @param customerAddressId 地址id @@ -35,7 +36,7 @@ public interface CustomerAddressMapper { * @param customerAddressId 地址id * @return 地址 */ - CustomerAddress selectByCustomerAddressId(@Param("customerAddressId") Long customerAddressId); + CustomerAddress selectByCustomerAddressId(@NotNull @Param("customerAddressId") Long customerAddressId); /** * @param customerAddress 地址信息 diff --git a/ghy-custom/src/main/resources/mapper/customer/CustomerAddressMapper.xml b/ghy-custom/src/main/resources/mapper/customer/CustomerAddressMapper.xml index 26e9404b..c893bd39 100644 --- a/ghy-custom/src/main/resources/mapper/customer/CustomerAddressMapper.xml +++ b/ghy-custom/src/main/resources/mapper/customer/CustomerAddressMapper.xml @@ -59,11 +59,7 @@