|
|
|
@ -1,6 +1,5 @@ |
|
|
|
package com.bnyer.pay.service.impl; |
|
|
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
import com.bnyer.common.core.domain.PayInfo; |
|
|
|
import com.bnyer.common.core.domain.R; |
|
|
|
@ -13,8 +12,8 @@ import com.bnyer.common.core.utils.ip.IpUtils; |
|
|
|
import com.bnyer.common.core.vo.UserInfoVo; |
|
|
|
import com.bnyer.common.security.utils.SecurityUtils; |
|
|
|
import com.bnyer.order.api.bean.query.VipOrderExtQuery; |
|
|
|
import com.bnyer.order.api.remote.RemoteVipOrderService; |
|
|
|
import com.bnyer.order.api.bean.vo.VipOrderVo; |
|
|
|
import com.bnyer.order.api.remote.RemoteVipOrderService; |
|
|
|
import com.bnyer.pay.bean.bo.QueryOrderBo; |
|
|
|
import com.bnyer.pay.bean.bo.UnifiedOrderBo; |
|
|
|
import com.bnyer.pay.bean.dto.AddPayInfoDto; |
|
|
|
@ -34,8 +33,6 @@ import com.bnyer.pay.service.UnifiedPayService; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
import org.springframework.util.ObjectUtils; |
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
import java.math.BigDecimal; |
|
|
|
@ -200,7 +197,7 @@ public class UnifiedPayServiceImpl implements UnifiedPayService { |
|
|
|
//先查询系统支付单是否已经完成支付,如果因为延迟导致没有及时同步,在调用第三方接口查询支付状态返回
|
|
|
|
PayInfoDetailsVo payInfoDetailsVo = payInfoService.queryPayInfoDetails(dto.getPayId()); |
|
|
|
if (Objects.isNull(payInfoDetailsVo)){ |
|
|
|
throw new ServiceException(ResponseEnum.NOT_EXIST); |
|
|
|
throw new ServiceException(ResponseEnum.NOT_EXIST,"支付订单"); |
|
|
|
} |
|
|
|
Integer payStatus = payInfoDetailsVo.getPayStatus(); |
|
|
|
EnumPayStatus enumPayStatus = EnumPayStatus.getEnumPayStatusByStatus(payStatus); |
|
|
|
|