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 | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 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 1517eb8..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,10 +3,14 @@
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;
+import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.WxBill;
+import com.doumee.dao.business.model.WxBillDetail;
import com.doumee.service.business.WxBillService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -16,6 +20,8 @@
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
import java.util.List;
/**
@@ -36,6 +42,20 @@
@RequiresPermissions("business:wxbill:create")
public ApiResponse create(@RequestBody WxBill wxBill) {
return ApiResponse.success(wxBillService.create(wxBill));
+ }
+ @PreventRepeat
+ @ApiOperation("鎵嬪姩鍚屾寰俊鏌愬ぉ璐﹀崟淇℃伅")
+ @PostMapping("/syncWxBill")
+ @RequiresPermissions("business:wxbill:create")
+ public ApiResponse syncWxBill(@RequestBody WxBill 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鍒犻櫎")
@@ -67,7 +87,7 @@
return ApiResponse.success(null);
}
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @ApiOperation("寰俊瀵硅处姹囨�籣鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("business:wxbill:query")
public ApiResponse<PageData<WxBill>> findPage (@RequestBody PageWrap<WxBill> pageWrap) {
@@ -81,6 +101,14 @@
ExcelExporter.build(WxBill.class).export(wxBillService.findPage(pageWrap).getRecords(), "WxBillController", response);
}
+ @ApiOperation("寰俊瀵硅处鏄庣粏_鏌ヨ")
+ @PostMapping("/getTotalBillDetail")
+ @RequiresPermissions("business:wxbilldetail:query")
+ public ApiResponse<List<WxBill>> getTotalBill (@RequestBody WxBill param) {
+ return ApiResponse.success(wxBillService.getTotalBill(param));
+ }
+
+
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@RequiresPermissions("business:wxbill:query")
--
Gitblit v1.9.3