|
@@ -2,9 +2,10 @@ package org.springblade.modules.finance.service.impl;
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
+import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.springblade.common.base.BaseEntity;
|
|
|
import org.springblade.common.cache.ParamCache;
|
|
|
import org.springblade.common.constant.CacheBizConstant;
|
|
|
import org.springblade.common.constant.CommonConstant;
|
|
@@ -21,16 +22,14 @@ import org.springblade.modules.api.vo.LogisticVO;
|
|
|
import org.springblade.modules.distribution.service.ICommissionService;
|
|
|
import org.springblade.modules.distribution.service.IDistributionConfigService;
|
|
|
import org.springblade.modules.finance.entity.*;
|
|
|
+import org.springblade.modules.finance.mapper.OrderMapper;
|
|
|
import org.springblade.modules.finance.service.*;
|
|
|
import org.springblade.modules.finance.vo.OrderVO;
|
|
|
-import org.springblade.modules.finance.mapper.OrderMapper;
|
|
|
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import org.springblade.modules.mall.service.IStoreService;
|
|
|
import org.springblade.modules.platform.service.IMessageService;
|
|
|
import org.springframework.context.annotation.Lazy;
|
|
|
import org.springframework.scheduling.annotation.Async;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
-import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.util.Assert;
|
|
|
|
|
@@ -337,13 +336,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public void commonRefund(String orderNo, Long orderId, BigDecimal refundAmount, BigDecimal totalAmount, Long afterSalesId) {
|
|
|
+ public void commonRefund(String orderNo, Long orderId, BigDecimal refundAmount, BigDecimal paymentAmount, Long afterSalesId) {
|
|
|
OrderRefund orderRefund = orderRefundService.lambdaQuery().eq(OrderRefund::getAfterSalesId, afterSalesId)
|
|
|
.eq(OrderRefund::getRefundState, RefundStateEnum.ONLY_REFUND.getValue()).one();
|
|
|
if (orderRefund != null) {
|
|
|
throw new ServiceException("申请中,请勿重复操作");
|
|
|
}
|
|
|
- wxPayService.orderRefund(orderNo, orderId, refundAmount, totalAmount, afterSalesId);
|
|
|
+ wxPayService.orderRefund(orderNo, orderId, refundAmount, paymentAmount, afterSalesId);
|
|
|
}
|
|
|
|
|
|
/**
|