From cd0e6fea719b159b158a2c0880a6d5593ee488d2 Mon Sep 17 00:00:00 2001 From: linjiabin <1152935893@qq.com> Date: Fri, 15 Mar 2024 17:17:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=EF=BC=9A=E4=B8=9A=E7=BB=A9?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8A=A0=E5=85=A5=E5=BA=94=E6=94=B6=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crm/controller/CrmOrderController.java | 2 +- .../crm/service/impl/CrmOrderServiceImpl.java | 34 ++++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/ruoyi-crm/src/main/java/com/ruoyi/crm/controller/CrmOrderController.java b/ruoyi-crm/src/main/java/com/ruoyi/crm/controller/CrmOrderController.java index 142fe06..8553bec 100644 --- a/ruoyi-crm/src/main/java/com/ruoyi/crm/controller/CrmOrderController.java +++ b/ruoyi-crm/src/main/java/com/ruoyi/crm/controller/CrmOrderController.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.UUID; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.crm.domain.CrmReceive; import com.ruoyi.crm.domain.CustomerOder; import com.ruoyi.crm.domain.Product; import com.ruoyi.crm.service.ICustomerOderService; @@ -199,7 +200,6 @@ public class CrmOrderController extends BaseController @Log(title = "订单", businessType = BusinessType.UPDATE) @PutMapping("/approve/{id}") public AjaxResult approve(@PathVariable Long id){ - return toAjax(crmOrderService.approve(id)); } diff --git a/ruoyi-crm/src/main/java/com/ruoyi/crm/service/impl/CrmOrderServiceImpl.java b/ruoyi-crm/src/main/java/com/ruoyi/crm/service/impl/CrmOrderServiceImpl.java index 8c5d367..4c0a22a 100644 --- a/ruoyi-crm/src/main/java/com/ruoyi/crm/service/impl/CrmOrderServiceImpl.java +++ b/ruoyi-crm/src/main/java/com/ruoyi/crm/service/impl/CrmOrderServiceImpl.java @@ -1,17 +1,24 @@ package com.ruoyi.crm.service.impl; import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.Date; import java.util.List; +import java.util.UUID; + import com.ruoyi.common.utils.DateUtils; import com.ruoyi.crm.domain.CrmCustomer; +import com.ruoyi.crm.domain.CrmReceive; import com.ruoyi.crm.domain.enums.CustomerFolder; import com.ruoyi.crm.service.ICrmCustomerService; +import com.ruoyi.crm.service.ICrmReceiveService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.crm.mapper.CrmOrderMapper; import com.ruoyi.crm.domain.CrmOrder; import com.ruoyi.crm.service.ICrmOrderService; import org.springframework.transaction.annotation.Transactional; +import sun.util.resources.LocaleData; /** * 订单Service业务层处理 @@ -28,6 +35,10 @@ public class CrmOrderServiceImpl implements ICrmOrderService @Autowired private ICrmCustomerService customerService; + @Autowired + private ICrmReceiveService crmReceiveService; + + /** * 查询订单 * @@ -107,8 +118,29 @@ public class CrmOrderServiceImpl implements ICrmOrderService @Override public int approve(Long id) { CrmOrder crmOrder = crmOrderMapper.selectCrmOrderById(id); - crmOrder.setStatus("1"); + //业绩订单审核通过自动加入应收计划 + CrmReceive crmReceive = new CrmReceive(); + crmReceive.setReceiveTitle(LocalDateTime.now().toString()+"-应收计划"); + crmReceive.setCustomerName(crmOrder.getCustomerName()); + CrmCustomer crmCustomer1 = customerService.selectCrmCustomerById(crmOrder.getCustomerId()); + crmReceive.setCustomerCode(crmCustomer1.getCode()); + crmReceive.setOrderCode(crmOrder.getOrderNo()); + crmReceive.setOwner(crmOrder.getOwner()); + crmReceive.setReceiveAmount(crmOrder.getAmount()); +// crmReceive.setReceiveDate(); +// crmReceive.setReceiveType(); + String ReceiveCode = UUID.randomUUID().toString(); + crmReceive.setReceiveCode(ReceiveCode); + crmReceive.setStatus("1"); + crmReceive.setSubmitPerson(crmOrder.getOwner()); + crmReceive.setNotes("暂无"); + crmReceive.setUpdateTime(new Date()); + crmReceive.setCreateTime(new Date()); + crmReceiveService.insertCrmReceive(crmReceive); + + //设置审核状态 + crmOrder.setStatus("1"); CrmCustomer crmCustomer = customerService.selectCrmCustomerById(crmOrder.getCustomerId()); crmCustomer.setStatus(CustomerFolder.CUSTOMER.getCode()); crmCustomer.setDealStatus("1");