chuangte/share-space-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

111

Browse Source
This commit is contained in:
邱贞招 2025-02-20 17:36:54 +08:00
parent b80b64f9c7
commit f2c2c4a296
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
share-space-system/src/main/java/com/ruoyi/ss/callback/service/impl/CallbackServiceImpl.java
View File

@ -408,7 +408,6 @@ public class CallbackServiceImpl implements ICallbackService {
* 微信退款回调 * 微信退款回调
*/ */
@Override @Override
@Transactional
public void weChatRefund(HttpServletRequest request) { public void weChatRefund(HttpServletRequest request) {
String body = HttpUtils.getBody(request); String body = HttpUtils.getBody(request);
CallbackLog etCallbackLog = new CallbackLog(); CallbackLog etCallbackLog = new CallbackLog();
@ -457,7 +456,7 @@ public class CallbackServiceImpl implements ICallbackService {
Order order = new Order(); Order order = new Order();
order.setOrderNo(payBillVO.getOrderNo()); order.setOrderNo(payBillVO.getOrderNo());
order.setStatus(ServiceConstants.ORDER_STATUS_REFUNDED); order.setStatus(ServiceConstants.ORDER_STATUS_REFUNDED);
int updateOrder = orderService.updateRlOrder(order); int updateOrder = orderService.updateRlOrderByOrderNo(order);
ServiceUtil.assertion(updateOrder == 0, "更新订单状态失败"); ServiceUtil.assertion(updateOrder == 0, "更新订单状态失败");
// 3.更新支付单中的退款金额为已退款 // 3.更新支付单中的退款金额为已退款
@ -466,7 +465,7 @@ public class CallbackServiceImpl implements ICallbackService {
PayBillQuery updateQuery = new PayBillQuery(); PayBillQuery updateQuery = new PayBillQuery();
updateQuery.setStatusList(PayBillStatus.payedList()); updateQuery.setStatusList(PayBillStatus.payedList());
updateQuery.setPayId(refund.getPayId()); updateQuery.setPayId(refund.getPayId());
int update = paymentService.updatePayBill(closeData); int update = paymentService.updateByQuery(closeData,updateQuery);
ServiceUtil.assertion(update != 1, "修改订单状态失败"); ServiceUtil.assertion(update != 1, "修改订单状态失败");
// 3.1记录（转移）已退款金额 // 3.1记录（转移）已退款金额
@ -520,10 +519,12 @@ public class CallbackServiceImpl implements ICallbackService {
.setScale(2, RoundingMode.HALF_UP); .setScale(2, RoundingMode.HALF_UP);
totalRefundCalculated = totalRefundCalculated.add(refundForDetail); totalRefundCalculated = totalRefundCalculated.add(refundForDetail);
detail.setRefundAmount(refundForDetail); detail.setRefundAmount(refundForDetail);
int i = dividendDetailService.updateRefundAmount(detail.getId(), refundForDetail);
ServiceUtil.assertion(i == 0, "更新分成表退款金额失败");
} }
// 检查总分红比例是否为100% // 检查总分红比例是否为100%
ServiceUtil.assertion(!totalDividendProportion.equals(new BigDecimal("100")), "总分红比例必须为100%"); ServiceUtil.assertion(!(totalDividendProportion.compareTo(new BigDecimal("100")) == 0), "总分红比例必须为100%");
// 如果总退款金额有误差，由商户承担差额 // 如果总退款金额有误差，由商户承担差额
BigDecimal difference = totalRefundCalculated.subtract(refundAmount).abs(); BigDecimal difference = totalRefundCalculated.subtract(refundAmount).abs();
@ -559,11 +560,11 @@ public class CallbackServiceImpl implements ICallbackService {
// 余额退款 // 余额退款
for (DividendDetailVO dividendDetail : refundList) { for (DividendDetailVO dividendDetail : refundList) {
UserVO userVO = userService.selectUserById(dividendDetail.getPartnerId()); UserVO userVO = userService.selectUserById(dividendDetail.getPartnerId());
ServiceUtil.assertion(userVO.getBalance().compareTo(dividendDetail.getBeRefundedAmount()) < 0, "可退款金额不足"); ServiceUtil.assertion(userVO.getBalance().compareTo(dividendDetail.getRefundAmount()) < 0, "可退款金额不足");
/* 记录账变 */ /* 记录账变 */
int i = changeBalanceService.generateChangeBalance(dividendDetail.getOrderNo(), null, ServiceConstants.FLOW_TYPE_DISBURSE, int i = changeBalanceService.generateChangeBalance(dividendDetail.getOrderNo(), null, ServiceConstants.FLOW_TYPE_DISBURSE,
ServiceConstants.REFUND, dividendDetail.getBeRefundedAmount(), dividendDetail.getPartnerId(), dividendDetail.getPartnerName(), dividendDetail.getPartnerPhone(),dividendDetail.getPartnerType()); ServiceConstants.REFUND, dividendDetail.getRefundAmount(), dividendDetail.getPartnerId(), dividendDetail.getPartnerName(), dividendDetail.getPartnerPhone(),dividendDetail.getPartnerType());
ServiceUtil.assertion(i == 0, "更新记录账变失败"); ServiceUtil.assertion(i == 0, "更新记录账变失败");
update++; update++;
} }

6
share-space-system/src/main/java/com/ruoyi/ss/changeBalance/service/impl/ChangeBalanceServiceImpl.java
View File

@ -184,11 +184,11 @@ public class ChangeBalanceServiceImpl implements IChangeBalanceService
reason = businessType.getDescription() + orderNo; reason = businessType.getDescription() + orderNo;
if (businessType == BusinessType.SYSTEM_MODIFY) { if (businessType == BusinessType.SYSTEM_MODIFY) {
rlChangeBalance.setCreateBy(getUsername()); rlChangeBalance.setCreateBy(getUsername());
if (type.equals(FLOW_TYPE_DISBURSE)) {
changeAmount = changeAmount.negate();
}
reason = changeType + payFee + "元"; reason = changeType + payFee + "元";
} }
if (type.equals(FLOW_TYPE_DISBURSE)) {
changeAmount = changeAmount.negate();
}
} }
rlChangeBalance.setReason(reason); rlChangeBalance.setReason(reason);
BigDecimal finalChangeAmount = changeAmount; BigDecimal finalChangeAmount = changeAmount;

2
share-space-system/src/main/java/com/ruoyi/ss/order/mapper/OrderMapper.xml
View File

@ -516,7 +516,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="addRefundAmountByOrderNo"> <update id="addRefundAmountByOrderNo">
update ss_order update ss_order
set refund = refund + #{refundAmount} set refund = refund + #{refundAmount}
where order_no = #{orderNo} and refund <![CDATA[<]]> paid where order_no = #{orderNo} and refund <![CDATA[<]]> pay_fee
</update> </update>
<update id="updateRlOrder" parameterType="Order"> <update id="updateRlOrder" parameterType="Order">

2
share-space-system/src/main/java/com/ruoyi/ss/refund/service/impl/RefundValidatormpl.java
View File

@ -52,7 +52,7 @@ public class RefundValidatormpl implements IRefundValidator
ServiceUtil.assertion(ORDER_PAY_STATUS_NON_PAYMENT.equals(orderVO.getPaid()), "订单未支付，不能发起退款"); ServiceUtil.assertion(ORDER_PAY_STATUS_NON_PAYMENT.equals(orderVO.getPaid()), "订单未支付，不能发起退款");
ServiceUtil.assertion(dto.getAmount().compareTo(BigDecimal.ZERO) <= 0, "退款金额不能为0"); ServiceUtil.assertion(dto.getAmount().compareTo(BigDecimal.ZERO) <= 0, "退款金额不能为0");
ServiceUtil.assertion(dto.getAmount().compareTo(orderVO.getPayFee()) > 0, "退款金额不能超过订单金额"); ServiceUtil.assertion(dto.getAmount().compareTo(orderVO.getPayFee()) > 0, "退款金额不能超过订单金额");
ServiceUtil.assertion(!PayBillStatus.PAY_SUCCESS.getStatus().equals(payBillVO.getStatus()), "支付单状态非："+PayBillStatus.PAY_SUCCESS.getMsg()+",不允许退款"); ServiceUtil.assertion(!PayBillStatus.PAY_SUCCESS.getStatus().equals(payBillVO.getStatus()), "支付单状态非"+PayBillStatus.PAY_SUCCESS.getMsg()+",不允许退款");
RefundBO bo = new RefundBO(); RefundBO bo = new RefundBO();
bo.setOrder(orderVO); bo.setOrder(orderVO);