root/alikeSCRM
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '后端：业绩订单审核通过自动加入应收计划' (#17) from lin into main

Browse Source 
Reviewed-on: http://120.46.37.243:3000/scrm/alikeSCRM/pulls/17
This commit is contained in:
root 2024-03-15 09:18:29 +00:00
commit 42078da627
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-crm/src/main/java/com/ruoyi/crm/controller/CrmOrderController.java
View File

@ -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));
}

34
ruoyi-crm/src/main/java/com/ruoyi/crm/service/impl/CrmOrderServiceImpl.java
View File

@ -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");