From 27ce12d3ed00ed5d70ce785653a16db092c3ef88 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 28 八月 2025 21:33:27 +0800
Subject: [PATCH] bug修改
---
cloud-server-account/src/main/java/com/dsh/account/model/vo/VipPaymentListVO.java | 2 +-
cloud-server-management/src/main/webapp/WEB-INF/view/system/vipPayment/vip_payment.html | 2 +-
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/vo/VipPaymentListVO.java | 2 +-
cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java | 8 ++++++--
cloud-server-management/src/main/webapp/static/modular/system/vipPayment/vipPayment.js | 9 +++++----
cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java | 2 +-
6 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java
index 887ad12..0b173ea 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java
@@ -118,19 +118,23 @@
List<VipPaymentListVO> vipPaymentListVOS = new ArrayList<>();
List<Integer> payStatus = new ArrayList<>();
- payStatus.add(2);
LambdaQueryWrapper<VipPayment> vipPaymentLambdaQueryWrapper = new LambdaQueryWrapper<>();
vipPaymentLambdaQueryWrapper.in(vipPaymentDto.getUserIds()!=null&&!vipPaymentDto.getUserIds().isEmpty(),VipPayment::getAppUserId, vipPaymentDto.getUserIds());
vipPaymentLambdaQueryWrapper.in(vipPaymentDto.getVipIds()!=null&&!vipPaymentDto.getVipIds().isEmpty(),VipPayment::getVipId, vipPaymentDto.getVipIds());
- vipPaymentLambdaQueryWrapper.in(VipPayment::getPayStatus,payStatus);
vipPaymentLambdaQueryWrapper.ge(StringUtils.hasLength(vipPaymentDto.getStartTime()), VipPayment::getInsertTime, vipPaymentDto.getStartTime());
vipPaymentLambdaQueryWrapper.le(StringUtils.hasLength(vipPaymentDto.getEndTime()), VipPayment::getInsertTime, vipPaymentDto.getEndTime());
if (vipPaymentDto.getIsRefund()==null){
payStatus.add(3);
+ payStatus.add(2);
}
if (vipPaymentDto.getIsRefund()!=null&&vipPaymentDto.getIsRefund()==1){
payStatus.add(3);
}
+ if (vipPaymentDto.getIsRefund()!=null&&vipPaymentDto.getIsRefund()==2){
+ payStatus.add(2);
+ }
+ vipPaymentLambdaQueryWrapper.in(VipPayment::getPayStatus,payStatus);
+
vipPaymentLambdaQueryWrapper.orderByDesc(VipPayment::getInsertTime);
List<VipPayment> list = vipPaymentService.list(vipPaymentLambdaQueryWrapper);
// 使用 Stream + 手动拷贝提升性能和可读性（或使用 MapStruct）
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/VipPaymentListVO.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/VipPaymentListVO.java
index f7985ac..1845a2c 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/VipPaymentListVO.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/VipPaymentListVO.java
@@ -41,7 +41,7 @@
@ApiModelProperty(value = "是否退款 0否1时")
private Integer isRefund;
@ApiModelProperty(value = "备注")
- private Integer remark;
+ private String remark;
/**
* 支付方式（1=微信，2=支付宝）
diff --git a/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java b/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
index 5ac25f0..41e7bd3 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
@@ -95,7 +95,7 @@
private String key = "6f5e0c2dcabfa9c27b5da5836a362fef";//微信商户号
// private String callbackPath = "https://online.daowepark.com:443/account";//支付回调网关地址
- private String callbackPath = "https://y6cgd7wo3ooa.guyubao.com/account";//支付回调网关地址
+ private String callbackPath = "http://221.182.45.100:1234/account";//支付回调网关地址
private String app_cert_path = "C:/cert/alipay/user/app_cert_path.crt";//应用公钥证书路径
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/vo/VipPaymentListVO.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/vo/VipPaymentListVO.java
index 36f0d1f..b089a96 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/vo/VipPaymentListVO.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/vo/VipPaymentListVO.java
@@ -39,7 +39,7 @@
@ApiModelProperty(value = "是否退款 0否1时")
private Integer isRefund;
@ApiModelProperty(value = "备注")
- private Integer remark;
+ private String remark;
/**
* 支付方式（1=微信，2=支付宝）
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/vipPayment/vip_payment.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/vipPayment/vip_payment.html
index c341d3b..77db567 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/vipPayment/vip_payment.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/vipPayment/vip_payment.html
@@ -26,7 +26,7 @@
是否退费
</button>
</div>
- <select class="form-control" id="type" >
+ <select class="form-control" id="isRefund" >
<option value="">全部</option>
<option value="1">是</option>
<option value="2">否</option>
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/vipPayment/vipPayment.js b/cloud-server-management/src/main/webapp/static/modular/system/vipPayment/vipPayment.js
index 5481cab..d8cd0ee 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/vipPayment/vipPayment.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/vipPayment/vipPayment.js
@@ -77,7 +77,7 @@
var index = layer.load(1,{
type: 1
, title: '会员退费'
- , area: ['800px', '600px']
+ , area: ['600px', '550px']
, offset: 'auto' //具体配置参考：http://www.layui.com/doc/modules/layer.html#offset
, id: 'layerDemo' //防止重复弹出cge
, content: '<div class="form-horizontal" style="padding-top: 20px;">' +
@@ -88,14 +88,15 @@
'<div class="col-sm-9">'+
'<input style="width: 300px" class="form-control" id="vipEndTime" name="vipEndTime" type="date">'+
'</div>'+
+
+ ' </div>' +
+ ' </div>' +
' <div class="form-group refusal" >\n' +
' <label class="col-sm-3 control-label">备注：</label>\n' +
' <div class="col-sm-9">\n' +
- ' <textarea id="refusal" class="form-control" style="width: 100%;height: 200px"></textarea>'+
+ ' <textarea id="refusal" class="form-control" style="width: 100%;height: 120px"></textarea>'+
' </div>\n' +
' </div>\n' +
- ' </div>' +
- ' </div>' +
'</div>'
, btn: ['保存', '关闭']
, btnAlign: 'c' //按钮居中
--
Gitblit v1.7.1