From 2987ec0f865eb816cdcb3fd10e2d556f9b7d95d4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 03 九月 2025 16:18:10 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TServiceController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TServiceController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TServiceController.java
index 395d58b..4e3886b 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TServiceController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TServiceController.java
@@ -75,6 +75,27 @@
private TServicePayService servicePayService;
@Resource
private SiteClient siteClient;
+ // 查询服务费缴纳情况
+ @GetMapping("/getServiceStatus/{userId}")
+ public R<String> getServiceStatus(@PathVariable("userId") Integer userId) {
+ ServicePay servicePayBefore = servicePayService.lambdaQuery()
+ .eq(ServicePay::getUserId, userId)
+ .eq(ServicePay::getPayStatus,2)
+ .eq(ServicePay::getDelFlag,0)
+ .orderByDesc(ServicePay::getCreateTime)
+ .last("limit 1")
+ .one();
+ if (servicePayBefore==null){
+ return R.ok("1");
+ }
+ else if (servicePayBefore.getEndTime().isBefore(LocalDateTime.now())) {
+ return R.ok("2");
+ }
+ else{
+ return R.ok("3");
+ }
+
+ }
@PostMapping("/servicePageList")
@ApiOperation(tags = {"2.0-服务费"},value = "服务费管理")
public R<ServiceVO> integralPageList(@RequestBody ServiceListQuery query) {
@@ -87,6 +108,7 @@
ServicePay servicePayBefore = servicePayService.lambdaQuery()
.eq(ServicePay::getUserId, userid)
.eq(ServicePay::getPayStatus,2)
+ .eq(ServicePay::getDelFlag,0)
.orderByDesc(ServicePay::getCreateTime)
.last("limit 1")
.one();
@@ -125,7 +147,7 @@
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
- Map<String,String> res = wechatPayService.unifiedOrder(code, site.getAnnualServiceFee()+"", "服务费缴纳", "/other/wx/serviceCallback");
+ Map<String,String> res = wechatPayService.unifiedOrder(code, site.getAnnualServiceFee()+"", site.getCode()+"服务费缴纳", "/other/wx/serviceCallback");
ServicePay servicePay = new ServicePay();
servicePay.setUserId(data.getUserId());
servicePay.setAmount(site.getAnnualServiceFee());
@@ -191,7 +213,7 @@
servicePayService.save(servicePay);
- return wechatPayService.unifiedOrderApplet(servicePay.getId()+"",code, site.getAnnualServiceFee()+"", "服务费缴纳",data.getOpenId(), "/other/wx/serviceCallback");
+ return wechatPayService.unifiedOrderApplet(servicePay.getId()+"",code, site.getAnnualServiceFee()+"", site.getCode()+"服务费缴纳",data.getOpenId(), "/other/wx/serviceCallback");
}
public static MultipartFile convert(BufferedImage bufferedImage, String fileName) throws IOException {
// 将 BufferedImage 转换为字节数组
--
Gitblit v1.7.1