From 25a25f620b016505a629b9c7565ea1c01864adab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 04 九月 2025 18:35:15 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/parkBike into 2.0.1
---
server/platform/src/main/java/com/doumee/api/business/WxBillController.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/WxBillController.java b/server/platform/src/main/java/com/doumee/api/business/WxBillController.java
index b2cd2f2..071bd15 100644
--- a/server/platform/src/main/java/com/doumee/api/business/WxBillController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/WxBillController.java
@@ -3,6 +3,8 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
@@ -18,6 +20,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -45,8 +48,14 @@
@PostMapping("/syncWxBill")
@RequiresPermissions("business:wxbill:create")
public ApiResponse syncWxBill(@RequestBody WxBill wxBill) {
- wxBillService.getWxBill(wxBill.getCreateDate());
- return ApiResponse.success(wxBillService.create(wxBill));
+ if( wxBill.getCreateDate() == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime( wxBill.getCreateDate());
+ calendar.set(Calendar.HOUR_OF_DAY,9);
+ wxBillService.getWxBill(calendar.getTime());
+ return ApiResponse.success(null);
}
@ApiOperation("鏍规嵁ID鍒犻櫎")
@@ -78,9 +87,9 @@
return ApiResponse.success(null);
}
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @ApiOperation("寰俊瀵硅处姹囨�籣鍒嗛〉鏌ヨ")
@PostMapping("/page")
-// @RequiresPermissions("business:wxbill:query")
+ @RequiresPermissions("business:wxbill:query")
public ApiResponse<PageData<WxBill>> findPage (@RequestBody PageWrap<WxBill> pageWrap) {
return ApiResponse.success(wxBillService.findPage(pageWrap));
}
@@ -92,9 +101,9 @@
ExcelExporter.build(WxBill.class).export(wxBillService.findPage(pageWrap).getRecords(), "WxBillController", response);
}
- @ApiOperation("寰俊瀵硅处鏄庣粏缁熻鏌ヨ")
- @PostMapping("/getTotalBill")
-// @RequiresPermissions("business:wxbilldetail:query")
+ @ApiOperation("寰俊瀵硅处鏄庣粏_鏌ヨ")
+ @PostMapping("/getTotalBillDetail")
+ @RequiresPermissions("business:wxbilldetail:query")
public ApiResponse<List<WxBill>> getTotalBill (@RequestBody WxBill param) {
return ApiResponse.success(wxBillService.getTotalBill(param));
}
--
Gitblit v1.9.3