czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Tankaikai
2025-04-07 10:13:57 +08:00
parent a77ecb4170 772c947808
commit 75df0b07c3
16 changed files with 449 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cash-api/product-server/src/main/java/com/czg/controller/admin/ShopVendorController.java
View File

@@ -110,7 +110,7 @@ public class ShopVendorController {
* @return 统计信息
*/
@GetMapping("summary")
@OperationLog("供应商账单-统计")
// @OperationLog("供应商账单-统计")
public CzgResult<ShopVendorSummaryVO> summary() {
return CzgResult.success(shopVendorService.summary(StpKit.USER.getShopId()));
}
@@ -120,9 +120,9 @@ public class ShopVendorController {
* @return 账单列表
*/
@GetMapping("/bill")
@OperationLog("供应商账单-列表")
public CzgResult<Page<ShopVendorBillVO>> bill() {
return CzgResult.success(shopVendorService.billList(StpKit.USER.getShopId()));
// @OperationLog("供应商账单-列表")
public CzgResult<Page<ShopVendorBillVO>> bill(@RequestParam(required = false) String key) {
return CzgResult.success(shopVendorService.billList(StpKit.USER.getShopId(), key));
}
/**
@@ -130,9 +130,9 @@ public class ShopVendorController {
* @return 记录list
*/
@GetMapping("/bill/record")
@OperationLog("供应商账单-列表")
public CzgResult<Page<ShopVendorBillRecordVO>> bill(@RequestParam Integer vendorId) {
return CzgResult.success(shopVendorService.billRecord(StpKit.USER.getShopId(), vendorId));
// @OperationLog("供应商账单-列表")
public CzgResult<Page<ShopVendorBillRecordVO>> bill(@RequestParam Integer vendorId, @RequestParam(required = false) String key) {
return CzgResult.success(shopVendorService.billRecord(StpKit.USER.getShopId(), vendorId, key));
}
@@ -141,7 +141,7 @@ public class ShopVendorController {
* @return 记录list
*/
@PostMapping("/bill/pay")
@OperationLog("供应商账单-付款")
// @OperationLog("供应商账单-付款")
public CzgResult<Boolean> pay(@RequestBody @Validated ShopVendorBillPayDTO payDTO) {
return CzgResult.success(shopVendorService.pay(StpKit.USER.getShopId(), payDTO));
}
@@ -152,7 +152,7 @@ public class ShopVendorController {
* @return 记录list
*/
@GetMapping("/bill/pay/record")
@OperationLog("供应商账单-付款记录")
// @OperationLog("供应商账单-付款记录")
public CzgResult<Page<ShopVendorBillPayRecordVO>> payRecord(@RequestParam Long flowId) {
return CzgResult.success(shopVendorService.payRecord(StpKit.USER.getShopId(), flowId));
}