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-04 21:27:30 +08:00
parent c31baa48d3
commit e57f2ea64a
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,7 +215,6 @@ public class AliPaymentMangerImpl implements PaymentManager, InitializingBean {
// 设置退款金额 // 设置退款金额
BigDecimal amount = BigDecimal.ZERO; BigDecimal amount = BigDecimal.ZERO;
for (StoreOrderDetail orderDetail : orderRefund.getRefundOrderDetails()) { for (StoreOrderDetail orderDetail : orderRefund.getRefundOrderDetails()) {
//TODO 暂时商品金额+快递费一起退，需调整为实际退款金额
amount = NumberUtil.add(amount, orderDetail.getTotalAmount()); amount = NumberUtil.add(amount, orderDetail.getTotalAmount());
} }
model.setRefundAmount(amount.toPlainString()); model.setRefundAmount(amount.toPlainString());
@ -359,7 +358,6 @@ public class AliPaymentMangerImpl implements PaymentManager, InitializingBean {
model.setBusinessParams("{\"payer_show_name_use_alias\":\"true\"}"); model.setBusinessParams("{\"payer_show_name_use_alias\":\"true\"}");
request.setBizModel(model); request.setBizModel(model);
try { try {
//TODO 测试
AlipayFundTransUniTransferResponse response = alipayClient.certificateExecute(request); AlipayFundTransUniTransferResponse response = alipayClient.certificateExecute(request);
log.info("支付宝转账: {}", response.getBody()); log.info("支付宝转账: {}", response.getBody());
if (response.isSuccess()) { if (response.isSuccess()) {

6
xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java
View File

@ -653,7 +653,8 @@ public class StoreOrderServiceImpl implements IStoreOrderService {
log.error("订单状态异常，更新支付结果失败: id = {}", storeOrderId); log.error("订单状态异常，更新支付结果失败: id = {}", storeOrderId);
throw new ServiceException("订单状态异常"); throw new ServiceException("订单状态异常");
} }
if (!NumberUtil.equals(order.getTotalAmount(), totalAmount)) { if (!NumberUtil.equals(order.getTotalAmount(), totalAmount)
|| !NumberUtil.equals(order.getTotalAmount(), realTotalAmount)) {
log.error("订单支付金额异常，更新支付结果失败: id = {} totalAmount = {} realTotalAmount = {}", log.error("订单支付金额异常，更新支付结果失败: id = {} totalAmount = {} realTotalAmount = {}",
storeOrderId, totalAmount, realTotalAmount); storeOrderId, totalAmount, realTotalAmount);
throw new ServiceException("订单支付金额异常"); throw new ServiceException("订单支付金额异常");
@ -661,8 +662,7 @@ public class StoreOrderServiceImpl implements IStoreOrderService {
order.setOrderStatus(EOrderStatus.PENDING_SHIPMENT.getValue()); order.setOrderStatus(EOrderStatus.PENDING_SHIPMENT.getValue());
order.setPayStatus(EPayStatus.PAID.getValue()); order.setPayStatus(EPayStatus.PAID.getValue());
order.setPayTradeNo(payTradeNo); order.setPayTradeNo(payTradeNo);
//TODO 暂时使用总金额 order.setRealTotalAmount(realTotalAmount);
order.setRealTotalAmount(order.getTotalAmount());
int orderSuccess = storeOrderMapper.updateById(prepareUpdate(order)); int orderSuccess = storeOrderMapper.updateById(prepareUpdate(order));
if (orderSuccess == 0) { if (orderSuccess == 0) {
throw new ServiceException(Constants.VERSION_LOCK_ERROR_COMMON_MSG); throw new ServiceException(Constants.VERSION_LOCK_ERROR_COMMON_MSG);

2
xkt/src/main/resources/mapper/InternalAccountMapper.xml
View File

@ -59,7 +59,7 @@
IF(fb.src_type = 2, fb.trans_amount, 0) input_amount IF(fb.src_type = 2, fb.trans_amount, 0) input_amount
FROM FROM
finance_bill fb finance_bill fb
LEFT JOIN store_order so ON fb.src_id = so.id AND fb.src_type IN (1, 4) LEFT JOIN store_order so ON fb.rel_id = so.id AND fb.src_type IN (1, 4)
WHERE WHERE
so.order_user_id = #{userId} so.order_user_id = #{userId}
AND fb.bill_status = 3 AND fb.bill_status = 3