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

余额支付订单

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-11-28 14:46:48 +08:00
parent 3a18ffec35
commit 49ed50edf8
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -471,14 +471,16 @@ public class OrderService {
OrderDetailInfoVO.OrderRefundInfo refundInfo; OrderDetailInfoVO.OrderRefundInfo refundInfo;
if (OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) { if (OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) {
// 查新member_wallet_log订单 进账记录 // 查新member_wallet_log订单 进账记录
MemberWalletLog memberWalletLog = memberWalletLogService.getOrderRecord(orderBasicInfo.getOrderCode(), MemberWalletEnum.TYPE_IN.getValue()); List<MemberWalletLog> walletLogs = memberWalletLogService.getOrderRecord(orderBasicInfo.getOrderCode(), MemberWalletEnum.TYPE_IN.getValue());
if (memberWalletLog != null) { if (CollectionUtils.isNotEmpty(walletLogs)) {
for (MemberWalletLog memberWalletLog : walletLogs) {
refundInfo = new OrderDetailInfoVO.OrderRefundInfo(); refundInfo = new OrderDetailInfoVO.OrderRefundInfo();
refundInfo.setReverseAmt(memberWalletLog.getAmount().abs().toString()); refundInfo.setReverseAmt(memberWalletLog.getAmount().abs().toString());
refundInfo.setSucceedTime(DateUtils.formatDateTime(memberWalletLog.getCreateTime())); refundInfo.setSucceedTime(DateUtils.formatDateTime(memberWalletLog.getCreateTime()));
refundInfo.setCreatedTime(DateUtils.formatDateTime(memberWalletLog.getCreateTime())); refundInfo.setCreatedTime(DateUtils.formatDateTime(memberWalletLog.getCreateTime()));
orderRefundInfoList.add(refundInfo); orderRefundInfoList.add(refundInfo);
} }
}
} else if (OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue().equals(orderBasicInfo.getPayMode())) { } else if (OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue().equals(orderBasicInfo.getPayMode())) {
List<PaymentReverseResponse> paymentReverseResponses = orderBasicInfoService.queryOrderAdapayRefund(orderBasicInfo); List<PaymentReverseResponse> paymentReverseResponses = orderBasicInfoService.queryOrderAdapayRefund(orderBasicInfo);
if (CollectionUtils.isNotEmpty(paymentReverseResponses)) { if (CollectionUtils.isNotEmpty(paymentReverseResponses)) {

2
jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java
View File

@@ -91,5 +91,5 @@ public interface MemberWalletLogMapper {
*/ */
List<MemberBalanceVO> getMemberRefundAmount(List<String> memberIds); List<MemberBalanceVO> getMemberRefundAmount(List<String> memberIds);
MemberWalletLog getOrderRecord(@Param("orderCode") String orderCode, @Param("type") String type); List<MemberWalletLog> getOrderRecord(@Param("orderCode") String orderCode, @Param("type") String type);
} }

2
jsowell-pile/src/main/java/com/jsowell/pile/service/MemberWalletLogService.java
View File

@@ -29,6 +29,6 @@ public interface MemberWalletLogService {
int batchInsert(List<MemberWalletLog> list); int batchInsert(List<MemberWalletLog> list);
MemberWalletLog getOrderRecord(String orderCode, String type); List<MemberWalletLog> getOrderRecord(String orderCode, String type);
} }

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletLogServiceImpl.java
View File

@@ -45,7 +45,7 @@ public class MemberWalletLogServiceImpl implements MemberWalletLogService {
} }
@Override @Override
public MemberWalletLog getOrderRecord(String orderCode, String type) { public List<MemberWalletLog> getOrderRecord(String orderCode, String type) {
return memberWalletLogMapper.getOrderRecord(orderCode, type); return memberWalletLogMapper.getOrderRecord(orderCode, type);
} }