From 77946261ec663aa1fe7f6f97e550532ed879f982 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 13:47:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractBillCloudController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractBillCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractBillCloudController.java
index ca58ec1..4916c65 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractBillCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractBillCloudController.java
@@ -9,9 +9,13 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.dto.YwSmsEmailBillCallDTO;
import com.doumee.dao.business.model.YwContractBill;
+import com.doumee.dao.business.vo.YwContractBillCallDataVO;
import com.doumee.dao.business.vo.YwContractBillDataVO;
import com.doumee.service.business.YwContractBillService;
+import com.doumee.service.business.YwContractService;
+import com.doumee.service.business.impl.SmsEmailServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +36,12 @@
@Autowired
private YwContractBillService ywContractBillService;
+
+ @Autowired
+ private SmsEmailServiceImpl smsEmailService;
+
+ @Autowired
+ private YwContractService ywContractService;
@PreventRepeat
@ApiOperation("鏂板缓")
@@ -80,6 +90,16 @@
return ApiResponse.success(ywContractBillService.findPage(pageWrap));
}
+
+ @ApiOperation("閫炬湡璐﹀崟")
+ @PostMapping("/findPageForOverdue")
+ @CloudRequiredPermission("business:ywcontractbill:query")
+ public ApiResponse<PageData<YwContractBill>> findPageForOverdue (@RequestBody PageWrap<YwContractBill> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
+ return ApiResponse.success(ywContractBillService.findPageForOverdue(pageWrap));
+ }
+
+
@ApiOperation("鍙��娆捐处鍗�")
@PostMapping("/getCanBackBill")
@CloudRequiredPermission("business:ywcontractbill:query")
@@ -113,6 +133,15 @@
return ApiResponse.success("鐢熸垚鎴愬姛");
}
+ @LoginNoRequired
+ @ApiOperation("鏇存柊鎴挎簮绉熻祦鐘舵��")
+ @GetMapping("/dealRoomStatus")
+ public ApiResponse dealRoomStatus() {
+ ywContractService.updRentContractStatus();
+ ywContractService.updRoomLeaseNowStatus();
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
@ApiOperation("鑾峰彇寰呭鐞嗚处鍗�")
@GetMapping("/getWaitDealList")
@CloudRequiredPermission("business:ywcontractbill:query")
@@ -120,4 +149,31 @@
return ApiResponse.success(ywContractBillService.getWaitDealList(contractId));
}
+
+ @ApiOperation("鑾峰彇鎵归噺鍌即鏁版嵁")
+ @PostMapping("/getNoticeCustomerData")
+ @CloudRequiredPermission("business:ywcontractbill:query")
+ public ApiResponse<List<YwContractBillCallDataVO>> getNoticeCustomerData(@RequestBody List<Integer> billIds,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ return ApiResponse.success(ywContractBillService.getNoticeCustomerData(billIds));
+ }
+
+
+ @ApiOperation("涓嬭浇鍌垂鏂囦欢")
+ @PostMapping("/downloadCallFeeDoc")
+ @CloudRequiredPermission("business:ywcontractbill:query")
+ public void downloadCallFeeDoc(@RequestBody List<Integer> billIds,@RequestHeader(Constants.HEADER_USER_TOKEN) String token,HttpServletResponse response) {
+ ywContractBillService.downloadCallFeeDoc(billIds,getLoginUser(token),response);
+ }
+
+ @ApiOperation("鍙戦�佺煭淇′笌閭欢")
+ @PostMapping("/sendSmsEmail")
+ @CloudRequiredPermission("business:ywcontractbill:query")
+ public ApiResponse sendSmsEmail(@RequestBody List<YwSmsEmailBillCallDTO> ywSmsEmailBillCallDTOList, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ ywContractBillService.sendSmsEmail(ywSmsEmailBillCallDTOList,smsEmailService,getLoginUser(token));
+ return ApiResponse.success(null);
+ }
+
+
+
+
}
--
Gitblit v1.9.3