From c83b580b0f51a2cdf16f2b1537aa3cb113ef112f Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 20 十二月 2024 17:56:10 +0800
Subject: [PATCH] add: 花材销售统计商品分类

---
 src/main/java/com/mzl/flower/web/v2/wallet/WalletBillRecordController.java |   73 ++++++++++++++++--------------------
 1 files changed, 32 insertions(+), 41 deletions(-)

diff --git a/src/main/java/com/mzl/flower/web/v2/wallet/WalletBillRecordController.java b/src/main/java/com/mzl/flower/web/v2/wallet/WalletBillRecordController.java
index 8cf66b4..fe25c3f 100644
--- a/src/main/java/com/mzl/flower/web/v2/wallet/WalletBillRecordController.java
+++ b/src/main/java/com/mzl/flower/web/v2/wallet/WalletBillRecordController.java
@@ -5,25 +5,20 @@
 import com.mzl.flower.base.BaseController;
 import com.mzl.flower.base.R;
 import com.mzl.flower.base.ReturnDataDTO;
-
-import com.mzl.flower.config.exception.ValidationException;
-import com.mzl.flower.dto.request.wallet.CreateWalletBillRecordDTO;
-import com.mzl.flower.entity.supplier.Supplier;
-import com.mzl.flower.entity.wallet.WalletDO;
-import com.mzl.flower.mapper.supplier.SupplierMapper;
+import com.mzl.flower.dto.request.wallet.QueryWalletBillDTO;
+import com.mzl.flower.dto.request.wallet.QueryWalletBillRecordDTO;
+import com.mzl.flower.dto.response.wallet.WalletBillRecordVO;
 import com.mzl.flower.service.supplier.SupplierService;
 import com.mzl.flower.service.wallet.WalletBillRecordService;
-import com.mzl.flower.service.wallet.WalletService;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import com.mzl.flower.entity.wallet.WalletBillRecordDO;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Positive;
+import javax.servlet.http.HttpServletResponse;
 
 /**
 * @author @TaoJie
@@ -35,40 +30,36 @@
 
     @Autowired
     private WalletBillRecordService walletBillRecordService;
+    @Autowired
+    private SupplierService supplierService;
 
-
-    @PostMapping("")
-    public ResponseEntity<ReturnDataDTO> create(@Validated @RequestBody CreateWalletBillRecordDTO dto) {
-
-
-        return returnData(R.SUCCESS.getCode(), null);
-    }
-
-    @PutMapping("/{id}")
-    public ResponseEntity<ReturnDataDTO>  update(@PathVariable @Positive(message = "{id.positive}") Integer id) {
-        return returnData(R.SUCCESS.getCode(), null);
-    }
-
-    @DeleteMapping("/{id}")
-    public ResponseEntity<ReturnDataDTO>  delete(@PathVariable @Positive(message = "{id.positive}") Integer id) {
-        return returnData(R.SUCCESS.getCode(), null);
-    }
-
-    @GetMapping("/{id}")
-    public WalletBillRecordDO get(@PathVariable(value = "id") @Positive(message = "{id.positive}") Integer id) {
-        return null;
+    @GetMapping("/list")
+    @ApiOperation(value = "供应商财务-分页", httpMethod = "GET")
+    public ResponseEntity<ReturnDataDTO<Page<WalletBillRecordVO>>> getMemberList(Page page, QueryWalletBillRecordDTO dto) {
+        return returnData(R.SUCCESS.getCode(), walletBillRecordService.queryPage(dto, page));
     }
 
     @GetMapping("/page")
-    public ResponseEntity<ReturnDataDTO<Page<WalletBillRecordDO>>> page(
-            @RequestParam(name = "page", required = false, defaultValue = "0")
-            @Min(value = 0, message = "{page.number.min}") Integer page,
-            @RequestParam(name = "count", required = false, defaultValue = "10")
-            @Min(value = 1, message = "{page.count.min}")
-            @Max(value = 30, message = "{page.count.max}") Integer count
+    public ResponseEntity<ReturnDataDTO<Page<WalletBillRecordVO>>> page(Page page, QueryWalletBillDTO dto
     ) {
-        return returnData(R.SUCCESS.getCode(), null);
+        // 根据当前用户获取供应商
+        dto.setSupplierId(supplierService.getCurrentSupplier().getId());
+        return returnData(R.SUCCESS.getCode(), walletBillRecordService.getPage(page, dto));
 
     }
 
+    @GetMapping("/pageByDesc")
+    public ResponseEntity<ReturnDataDTO<Page<WalletBillRecordVO>>> pageByDesc(Page page, QueryWalletBillDTO dto
+    ) {
+        // 根据当前用户获取供应商
+        dto.setSupplierId(supplierService.getCurrentSupplier().getId());
+        return returnData(R.SUCCESS.getCode(), walletBillRecordService.getPageByDesc(page, dto));
+
+    }
+    @GetMapping({"/export"})
+    @ApiOperation(value = "供应商财务导出")
+    public void partnerExportSales(HttpServletResponse response, @Validated QueryWalletBillRecordDTO dto) {
+        walletBillRecordService.exportSupplierFinanceList(response, dto);
+    }
 }
+

--
Gitblit v1.9.3