|
@@ -25,6 +25,7 @@ import cn.newfeifan.mall.module.pay.dal.dataobject.order.PayOrderExtensionDO;
|
|
|
import cn.newfeifan.mall.module.pay.dal.mysql.order.PayOrderExtensionMapper;
|
|
|
import cn.newfeifan.mall.module.pay.dal.mysql.order.PayOrderMapper;
|
|
|
import cn.newfeifan.mall.module.pay.dal.redis.no.PayNoRedisDAO;
|
|
|
+import cn.newfeifan.mall.module.pay.enums.fuyouorder.FuYouPayOrderTypeEnum;
|
|
|
import cn.newfeifan.mall.module.pay.enums.notify.PayNotifyTypeEnum;
|
|
|
import cn.newfeifan.mall.module.pay.enums.order.PayOrderStatusEnum;
|
|
|
import cn.newfeifan.mall.module.pay.framework.pay.config.PayProperties;
|
|
@@ -261,6 +262,12 @@ public class PayOrderServiceImpl implements PayOrderService {
|
|
|
id, orderExtension.getId());
|
|
|
throw exception(PAY_ORDER_EXTENSION_IS_PAID);
|
|
|
}
|
|
|
+
|
|
|
+ // 如果支付渠道是从富友对接的那就不用往下继续了
|
|
|
+ if(FuYouPayOrderTypeEnum.getCode(orderExtension.getChannelCode()) != null){
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
// 情况二:调用三方接口,查询支付单状态,是不是已支付
|
|
|
PayClient payClient = channelService.getPayClient(orderExtension.getChannelId());
|
|
|
if (payClient == null) {
|