From 14cb1d8eae9a3bed83957b04d8862ec8dde5b0ba Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Tue, 06 Sep 2022 16:21:17 +0800 Subject: [PATCH] 20220902 --- src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 59 +---------------------------------------------------------- 1 files changed, 1 insertions(+), 58 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java index 09e56e6..a3c3e5f 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java @@ -755,65 +755,8 @@ apiLeaderRefundOrderDto.setItemId(mallOrderItem.getId()); apiLeaderRefundOrderDto.setAgreeState(1); iApiMallTeamLeaderService.leaderRefundOrder(apiLeaderRefundOrderDto); - -// //退款订单编号 -// String orderNo = mallOrderInfo.getOrderNo(); -// //退款退款编号 -// String refundNo = mallRefundEntity.getRefundNo(); -// //退款订单金额 -// BigDecimal orderAmount = mallOrderInfo.getAmount(); -// BigDecimal aa = new BigDecimal(100); -// int orderMoney = orderAmount.multiply(aa).intValue(); -// -// //退款退款金额 -// BigDecimal refundAmount = mallRefundEntity.getAmount(); -// BigDecimal bb = new BigDecimal(100); -// int refundMoney = refundAmount.multiply(bb).intValue(); -// -// Long refundId = mallRefundEntity.getId(); -// MallRefundEntity mallRefundOld = mallRefundMapper.selectById(refundId); -// MallOrderInfo mallOrderInfoOld = this.baseMapper.selectByOrderNo(orderNo); -// //余额支付退款 -// if(OrderPayMethodEnum.BALANCE.getName().equals(mallOrderInfo.getPayMethod())){ -// mallRefundOld.setState(1); -// mallRefundMapper.updateById(mallRefundOld); -// mallOrderInfoOld.setStatus(OrderStatusEnum.REFUNDED.getValue()); -// this.baseMapper.updateById(mallOrderInfoOld); -// mallMoneyFlowService.addMoneyFlow(mallOrderInfoOld.getMemberId(), mallOrderInfoOld.getAmount(), MoneyFlowTypeEnum.REFUND.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue()); -// memberWalletService.add(refundAmount, member.getId(), "balance"); -// mallOrderItemMapper.updateStateByOrderId(3,mallOrderInfoOld.getId()); -// return new FebsResponse().success().message("退款成功"); -// } -// -// Boolean flag = false; -// Boolean debug = xcxProperties.getDebug(); -// if (debug) { -// boolean b = weixinServiceUtil.comRefund(orderNo, refundNo, 1, 1, null); -// flag = b; -// } else { -// log.info("开始调用退款接口。。。退款编号为{}", refundNo); -// boolean b = weixinServiceUtil.comRefund(orderNo, refundNo, orderMoney, refundMoney, null); -// flag = b; -// } -// -// /** -// * 更新退款表 -// * 更新订单表 -// */ -// if(flag){ -// mallRefundOld.setState(1); -// mallRefundMapper.updateById(mallRefundOld); -// mallOrderInfoOld.setStatus(OrderStatusEnum.REFUNDED.getValue()); -// this.baseMapper.updateById(mallOrderInfoOld); -// mallOrderItemMapper.updateStateByOrderId(3,mallOrderInfoOld.getId()); -// mallMoneyFlowService.addMoneyFlow(mallOrderInfoOld.getMemberId(), mallOrderInfoOld.getAmount(), MoneyFlowTypeEnum.REFUND.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue()); -// }else{ -// mallRefundOld.setState(2); -// mallRefundMapper.updateById(mallRefundOld); -// return new FebsResponse().fail().message("退款失败,请联系客服人员"); -// } } - return new FebsResponse().success().message("退款成功"); + return new FebsResponse().success(); } @Override -- Gitblit v1.9.1