From 54f2491c90c170b58ebbca1a100f3f4a10b7ab65 Mon Sep 17 00:00:00 2001 From: houjianhui Date: Fri, 15 Sep 2017 18:11:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=84=E4=BB=B6=E5=AE=A1=E6=A0=B8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/service/OrderAuditService.java | 8 +++++++ .../service/OrderAuditServiceImpl.java | 21 +++++++++++++++++++ .../backend/service/OrderServiceImpl.java | 3 +++ 3 files changed, 32 insertions(+) diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditService.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditService.java index efd4fa0..fcc0052 100644 --- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditService.java +++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditService.java @@ -33,4 +33,12 @@ public interface OrderAuditService { * @throws Exception */ Integer updateAuditStatus(String ids) throws Exception; + + /** + * 更新销售订单审核状态 + * + * @param saleOrderId 销售订单ID + * @param auditStatus 审核状态 + */ + void updateAuditStatusByOrderId(Integer saleOrderId, Integer auditStatus); } diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java index 36298da..2af3094 100644 --- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java +++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java @@ -134,6 +134,27 @@ public class OrderAuditServiceImpl implements OrderAuditService { return null; } + @Override + public void updateAuditStatusByOrderId(Integer saleOrderId, Integer auditStatus) { + if (Objects.equals(saleOrderId, null) || Objects.equals(saleOrderId, "") || Objects.equals(saleOrderId, 0)) { + LOGGER.info("OrderAuditServiceImpl.updateAuditStatusByOrderId param saleOrderId must not be null"); + throw new IllegalArgumentException("销售订单ID不能为空"); + } else if (Objects.equals(auditStatus, null) || Objects.equals(auditStatus, "") || Objects.equals(auditStatus, 0)) { + LOGGER.info("OrderAuditServiceImpl.updateAuditStatusByOrderId param auditStatus must not be null"); + throw new IllegalArgumentException("销售订单审核状态不能为空"); + } + SaleOrderAuditExample example = new SaleOrderAuditExample(); + example.createCriteria().andSaleOrderIdEqualTo(saleOrderId); + List audits = orderAuditMapper.selectByExample(example); + if (CollectionUtils.isNotEmpty(audits)) { + audits.stream().forEach(item -> { + item.setAuditStatus(auditStatus); + orderAuditMapper.updateByPrimaryKeySelective(item); + }); + } + + } + /** * 构建推送销售订单对象 * diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java index 0189c5f..406bd8d 100644 --- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java +++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java @@ -10,6 +10,7 @@ import com.google.common.collect.Lists; import com.unlcn.ils.sales.backend.bo.*; import com.unlcn.ils.sales.backend.constant.AutoConfConstant; import com.unlcn.ils.sales.backend.enums.AttachAuditStatusEnum; +import com.unlcn.ils.sales.backend.enums.OrderAuditStatusEnum; import com.unlcn.ils.sales.backend.enums.OrderPayStatusEnum; import com.unlcn.ils.sales.backend.enums.OrderStatusEnum; import com.unlcn.ils.sales.backend.util.UniquenessUtil; @@ -282,6 +283,8 @@ public class OrderServiceImpl implements OrderService { item.setAttachAuditStatus(AttachAuditStatusEnum.getByValue(attachAuditStatus).getValue()); item.setPayStatus(OrderPayStatusEnum.ORDER_TOUCH.getValue()); orderMapper.updateByPrimaryKeySelective(item); + // 更新审核表中状态 + orderAuditService.updateAuditStatusByOrderId(item.getId(), OrderAuditStatusEnum.ORDER_AWAIT.getValue()); }); } return 0; -- Gitee