BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

调整

pull/1121/head
梁宇奇 2025-08-05 20:11:57 +08:00
parent a18e944fbe
commit 70c9bae5ae
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-framework/src/main/java/com/ruoyi/framework/notice/fs/FsNotice.java
View File

@ -33,7 +33,7 @@ public class FsNotice extends AbstractNotice {
private String defaultAppId; private String defaultAppId;
@Value("${fs.robot.appSecret:AZTpyNiW4hpLRXcDhrdjJcr8Z404gVqf}") @Value("${fs.robot.appSecret:AZTpyNiW4hpLRXcDhrdjJcr8Z404gVqf}")
private String defaultAppSecret; private String defaultAppSecret;
@Value("${fs.robot.defaultChatId:oc_4f66ce3cf471f50aac6c3fdae7f0aad9}") @Value("${fs.robot.defaultChatId:oc_34e207df88addd15d83ec274fda95ef6}")
private String defaultChatId; private String defaultChatId;
@Value("${fs.robot.monitorSwitch:true}") @Value("${fs.robot.monitorSwitch:true}")
private Boolean monitorSwitch; private Boolean monitorSwitch;

4
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java
View File

@ -975,7 +975,7 @@ public class XktTask {
//支付状态->已支付，收款单到账 //支付状态->已支付，收款单到账
storeOrderService.refundSuccess(storeOrderRefund.getRefundOrder().getId(), storeOrderService.refundSuccess(storeOrderRefund.getRefundOrder().getId(),
storeOrderRefund.getRefundOrderDetails().stream().map(SimpleEntity::getId).collect(Collectors.toList()), storeOrderRefund.getRefundOrderDetails().stream().map(SimpleEntity::getId).collect(Collectors.toList()),
SecurityUtils.getUserId()); null);
} else { } else {
//可能是退款失败，也可能是退款处理中，重复调用支付宝接口时只要参数正确也不会重复退款 //可能是退款失败，也可能是退款处理中，重复调用支付宝接口时只要参数正确也不会重复退款
boolean success = paymentManager.refundStoreOrder(storeOrderRefund); boolean success = paymentManager.refundStoreOrder(storeOrderRefund);
@ -985,7 +985,7 @@ public class XktTask {
//支付状态->已支付，收款单到账 //支付状态->已支付，收款单到账
storeOrderService.refundSuccess(storeOrderRefund.getRefundOrder().getId(), storeOrderService.refundSuccess(storeOrderRefund.getRefundOrder().getId(),
storeOrderRefund.getRefundOrderDetails().stream().map(SimpleEntity::getId).collect(Collectors.toList()), storeOrderRefund.getRefundOrderDetails().stream().map(SimpleEntity::getId).collect(Collectors.toList()),
SecurityUtils.getUserId()); null);
} else { } else {
fsNotice.sendMsg2DefaultChat("退款失败", "参数: " + JSON.toJSONString(storeOrderRefund)); fsNotice.sendMsg2DefaultChat("退款失败", "参数: " + JSON.toJSONString(storeOrderRefund));
} }

2
xkt/src/main/java/com/ruoyi/xkt/manager/impl/AliPaymentMangerImpl.java
View File

@ -222,8 +222,8 @@ public class AliPaymentMangerImpl implements PaymentManager, InitializingBean {
model.setRefundReason("正常退款"); model.setRefundReason("正常退款");
// 设置退款请求号 // 设置退款请求号
model.setOutRequestNo(orderRefund.getRefundOrder().getOrderNo()); model.setOutRequestNo(orderRefund.getRefundOrder().getOrderNo());
request.setBizModel(model);
try { try {
//TODO 沙箱环境接口无法完全退款？
AlipayTradeRefundResponse response = alipayClient.certificateExecute(request); AlipayTradeRefundResponse response = alipayClient.certificateExecute(request);
log.info("支付宝退款：{}", response.getBody()); log.info("支付宝退款：{}", response.getBody());
String fundChange = JSON.parseObject(response.getBody()) String fundChange = JSON.parseObject(response.getBody())