From 3179fbb9c77eeb5260593e9df20046285dc56fe6 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 03 七月 2026 11:00:08 +0800
Subject: [PATCH] 1.销售模块修改 2.CRM模块修改
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java | 44 +++++++++++++++++++++++++++++++-------------
1 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
index b0ec991..f0211bd 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
@@ -8,15 +8,15 @@
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
+import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
import cn.iocoder.yudao.module.erp.controller.admin.product.vo.product.ErpProductRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderSaveReqVO;
-import cn.iocoder.yudao.module.erp.dal.dataobject.sale.ErpCustomerDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.sale.ErpSaleOrderDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.sale.ErpSaleOrderItemDO;
import cn.iocoder.yudao.module.erp.service.product.ErpProductService;
-import cn.iocoder.yudao.module.erp.service.sale.ErpCustomerService;
import cn.iocoder.yudao.module.erp.service.sale.ErpSaleOrderService;
import cn.iocoder.yudao.module.erp.service.stock.ErpStockService;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
@@ -54,21 +54,21 @@
@Resource
private ErpProductService productService;
@Resource
- private ErpCustomerService customerService;
+ private CrmCustomerApi customerApi;
@Resource
private AdminUserApi adminUserApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓閿�鍞鍗�")
- @PreAuthorize("@ss.hasPermission('erp:sale-out:create')")
+ @PreAuthorize("@ss.hasPermission('erp:sale-order:create')")
public CommonResult<Long> createSaleOrder(@Valid @RequestBody ErpSaleOrderSaveReqVO createReqVO) {
return success(saleOrderService.createSaleOrder(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "鏇存柊閿�鍞鍗�")
- @PreAuthorize("@ss.hasPermission('erp:sale-out:update')")
+ @PreAuthorize("@ss.hasPermission('erp:sale-order:update')")
public CommonResult<Boolean> updateSaleOrder(@Valid @RequestBody ErpSaleOrderSaveReqVO updateReqVO) {
saleOrderService.updateSaleOrder(updateReqVO);
return success(true);
@@ -76,17 +76,35 @@
@PutMapping("/update-status")
@Operation(summary = "鏇存柊閿�鍞鍗曠殑鐘舵��")
- @PreAuthorize("@ss.hasPermission('erp:sale-out:update-status')")
+ @PreAuthorize("@ss.hasPermission('erp:sale-order:update-status')")
public CommonResult<Boolean> updateSaleOrderStatus(@RequestParam("id") Long id,
@RequestParam("status") Integer status) {
saleOrderService.updateSaleOrderStatus(id, status);
return success(true);
}
+ @PutMapping("/cancel")
+ @Operation(summary = "浣滃簾閿�鍞鍗�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('erp:sale-order:cancel')")
+ public CommonResult<Boolean> cancelSaleOrder(@RequestParam("id") Long id) {
+ saleOrderService.cancelSaleOrder(id);
+ return success(true);
+ }
+
+ @PutMapping("/enable")
+ @Operation(summary = "閲嶆柊鍚敤閿�鍞鍗�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('erp:sale-order:enable')")
+ public CommonResult<Boolean> enableSaleOrder(@RequestParam("id") Long id) {
+ saleOrderService.enableSaleOrder(id);
+ return success(true);
+ }
+
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎閿�鍞鍗�")
@Parameter(name = "ids", description = "缂栧彿鏁扮粍", required = true)
- @PreAuthorize("@ss.hasPermission('erp:sale-out:delete')")
+ @PreAuthorize("@ss.hasPermission('erp:sale-order:delete')")
public CommonResult<Boolean> deleteSaleOrder(@RequestParam("ids") List<Long> ids) {
saleOrderService.deleteSaleOrder(ids);
return success(true);
@@ -95,7 +113,7 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱閿�鍞鍗�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('erp:sale-out:query')")
+ @PreAuthorize("@ss.hasPermission('erp:sale-order:query')")
public CommonResult<ErpSaleOrderRespVO> getSaleOrder(@RequestParam("id") Long id) {
ErpSaleOrderDO saleOrder = saleOrderService.getSaleOrder(id);
if (saleOrder == null) {
@@ -115,7 +133,7 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱閿�鍞鍗曞垎椤�")
- @PreAuthorize("@ss.hasPermission('erp:sale-out:query')")
+ @PreAuthorize("@ss.hasPermission('erp:sale-order:query')")
public CommonResult<PageResult<ErpSaleOrderRespVO>> getSaleOrderPage(@Valid ErpSaleOrderPageReqVO pageReqVO) {
PageResult<ErpSaleOrderDO> pageResult = saleOrderService.getSaleOrderPage(pageReqVO);
return success(buildSaleOrderVOPageResult(pageResult));
@@ -123,7 +141,7 @@
@GetMapping("/export-excel")
@Operation(summary = "瀵煎嚭閿�鍞鍗� Excel")
- @PreAuthorize("@ss.hasPermission('erp:sale-out:export')")
+ @PreAuthorize("@ss.hasPermission('erp:sale-order:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportSaleOrderExcel(@Valid ErpSaleOrderPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
@@ -144,8 +162,8 @@
// 1.2 浜у搧淇℃伅
Map<Long, ErpProductRespVO> productMap = productService.getProductVOMap(
convertSet(saleOrderItemList, ErpSaleOrderItemDO::getProductId));
- // 1.3 瀹㈡埛淇℃伅
- Map<Long, ErpCustomerDO> customerMap = customerService.getCustomerMap(
+ // 1.3 瀹㈡埛淇℃伅锛堜娇鐢� CRM 瀹㈡埛 API锛�
+ Map<Long, CrmCustomerRespDTO> customerMap = customerApi.getCustomerMap(
convertSet(pageResult.getList(), ErpSaleOrderDO::getCustomerId));
// 1.4 绠＄悊鍛樹俊鎭�
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
@@ -161,4 +179,4 @@
});
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3