autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 11:05:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

订单退款时校验已经退款金额

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-02-22 10:21:35 +08:00
parent 8ff5e15a5d
commit 5c75b981a4
5 changed files with 75 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -477,27 +477,7 @@ public class OrderService {
* @return
*/
private List<OrderDetailInfoVO.OrderRefundInfo> getOrderRefundInfoList(OrderBasicInfo orderBasicInfo) {
List<OrderDetailInfoVO.OrderRefundInfo> orderRefundInfoList = Lists.newArrayList();
OrderDetailInfoVO.OrderRefundInfo refundInfo;
if (OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) {
// 查新member_wallet_log订单 进账记录
List<MemberWalletLog> walletLogs = memberWalletLogService.getOrderRecord(orderBasicInfo.getOrderCode(), MemberWalletEnum.TYPE_IN.getValue());
if (CollectionUtils.isNotEmpty(walletLogs)) {
for (MemberWalletLog memberWalletLog : walletLogs) {
refundInfo = new OrderDetailInfoVO.OrderRefundInfo();
refundInfo.setReverseAmt(memberWalletLog.getAmount().abs().toString());
refundInfo.setSucceedTime(DateUtils.formatDateTime(memberWalletLog.getCreateTime()));
refundInfo.setCreatedTime(DateUtils.formatDateTime(memberWalletLog.getCreateTime()));
orderRefundInfoList.add(refundInfo);
}
}
} else if (OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue().equals(orderBasicInfo.getPayMode())) {
// 新逻辑
String mode = pileMerchantInfoService.getDelayModeByMerchantId(orderBasicInfo.getMerchantId());
AbstractProgramLogic orderLogic = ProgramLogicFactory.getProgramLogic(mode);
orderRefundInfoList = orderLogic.getOrderRefundInfoList(orderBasicInfo);
}
return orderRefundInfoList;
return orderBasicInfoService.getOrderRefundInfoList(orderBasicInfo);
}
/**