From 6c823dd44dbde79f008001a2a11e7bf9bc6bf8cc Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 04 十二月 2024 18:15:44 +0800
Subject: [PATCH] fix:合伙人列表操作日志
---
src/main/java/com/mzl/flower/web/payment/SalesController.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/payment/SalesController.java b/src/main/java/com/mzl/flower/web/payment/SalesController.java
index ad5bf04..aef4468 100644
--- a/src/main/java/com/mzl/flower/web/payment/SalesController.java
+++ b/src/main/java/com/mzl/flower/web/payment/SalesController.java
@@ -4,11 +4,15 @@
import com.mzl.flower.base.BaseController;
import com.mzl.flower.base.R;
import com.mzl.flower.base.ReturnDataDTO;
+import com.mzl.flower.base.annotation.OperationLog;
import com.mzl.flower.config.security.SecurityUtils;
import com.mzl.flower.constant.Constants;
-import com.mzl.flower.dto.request.payment.*;
+import com.mzl.flower.dto.request.payment.OrderItemSalesAuditDTO;
+import com.mzl.flower.dto.request.payment.OrderItemSalesQueryDTO;
import com.mzl.flower.dto.response.payment.OrderItemSalesNewDTO;
-import com.mzl.flower.dto.response.payment.OrderSalesListDTO;
+import com.mzl.flower.dto.response.payment.OrderItemSalesNewListDTO;
+import com.mzl.flower.dto.response.payment.OrderStatusCountDTO;
+import com.mzl.flower.entity.log.OperationRecord;
import com.mzl.flower.entity.payment.OrderItem;
import com.mzl.flower.service.payment.OrderItemSalesService;
import com.mzl.flower.service.payment.OrderItemSettlementService;
@@ -21,6 +25,9 @@
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
@RestController
@RequestMapping("/api/sales")
@@ -35,11 +42,23 @@
@Autowired
private OrderItemSettlementService orderItemSettlementService;
+ @GetMapping("/status/count")
+ @ApiOperation(value = "获取状态数量")
+ public ResponseEntity<ReturnDataDTO<List<OrderStatusCountDTO>>> getSalesStatusCount(OrderItemSalesQueryDTO dto){
+ return returnData(R.SUCCESS.getCode(), salesService.getSalesStatusCount(dto));
+ }
+
@GetMapping("/list")
@ApiOperation(value = "查询售后列表")
- public ResponseEntity<ReturnDataDTO<Page<OrderSalesListDTO>>> selectSalesList(Page page
+ public ResponseEntity<ReturnDataDTO<Page<OrderItemSalesNewListDTO>>> selectSalesList(Page page
, OrderItemSalesQueryDTO dto){
return returnData(R.SUCCESS.getCode(), salesService.selectSalesList(page, dto));
+ }
+
+ @GetMapping({"/list/export"})
+ @ApiOperation(value = "售后列表导出")
+ public void exportSales(HttpServletResponse response, OrderItemSalesQueryDTO dto){
+ salesService.exportSalesList(response, dto);
}
@GetMapping("/list/view")
@@ -52,17 +71,27 @@
}
@PostMapping("/audit/agree")
+ @OperationLog(value = "审核售后单-通过", type = "sales_fee")
@ApiOperation(value = "审核售后单-通过")
- public ResponseEntity<ReturnDataDTO> agree(@RequestBody OrderItemSalesAuditDTO dto) {
+ public ResponseEntity<ReturnDataDTO> agree(@RequestBody OrderItemSalesAuditDTO dto) throws Exception {
OrderItem oi = salesService.doAudit(dto, Constants.ORDER_SALES_STATUS.AGREED.name());
orderItemSettlementService.saveItemSettlementInfo(oi, SecurityUtils.getUserId(), Constants.S_TYPE.SALES);
- return returnData(R.SUCCESS.getCode(), null);
+// OrderItemSettlement orderItemSettlement = orderItemSettlementService.selectOrderItemSettlementById(dto.getId());
+ String content = "审核售后单-通过id：【" + dto.getId() + "】，供应商(元)：【" + dto.getFeeSupplier() + "】，平台(元)：【" + dto.getFeePlatform() + "】" + "，合伙人(元)：【" + dto.getFeePartner() + "】" +
+ "，打包(元)：【" + dto.getFeePlatformPack() + "】，质检(元)：【" + dto.getFeePlatformCheck() + "】，物流(元)：【" + dto.getFeePlatformTransport() + "】" + "" +
+ "，打包运费(元)(散户)：【" + dto.getFeePackingTransport() + "】，平台回复：【" + dto.getRemarks() + "】";
+ OperationRecord operationRecord = getOperationRecord(content);
+ return returnData(R.SUCCESS.getCode(), null, operationRecord);
}
@PostMapping("/audit/reject")
+ @OperationLog(value = "审核售后单-拒绝", type = "sales_fee")
@ApiOperation(value = "审核售后单-拒绝")
- public ResponseEntity<ReturnDataDTO> reject(@RequestBody OrderItemSalesAuditDTO dto) {
+ public ResponseEntity<ReturnDataDTO> reject(@RequestBody OrderItemSalesAuditDTO dto) throws Exception {
+// OrderItemSettlement orderItemSettlement = orderItemSettlementService.selectOrderItemSettlementById(dto.getId());
salesService.doAudit(dto, Constants.ORDER_SALES_STATUS.REJECTED.name());
- return returnData(R.SUCCESS.getCode(), null);
+ String content = "审核售后单-拒绝id：【" + dto.getId() + "】，平台回复：【" + dto.getRemarks() + "】";
+ OperationRecord operationRecord = getOperationRecord(content);
+ return returnData(R.SUCCESS.getCode(), null, operationRecord);
}
}
--
Gitblit v1.9.3