|
@@ -141,12 +141,18 @@ public class PayOrderServiceImpl implements PayOrderService {
|
|
|
|
|
|
@Override // 注意,这里不能添加事务注解,避免调用支付渠道失败时,将 PayOrderExtensionDO 回滚了
|
|
|
public PayOrderSubmitRespVO submitOrder(PayOrderSubmitReqVO reqVO, String userIp) {
|
|
|
+
|
|
|
+ log.error("[submitOrder--------->unifiedOrderResp][订单id({})000000支付开始]", reqVO.getId());
|
|
|
+
|
|
|
+
|
|
|
// 1.1 获得 PayOrderDO ,并校验其是否存在
|
|
|
PayOrderDO order = validateOrderCanSubmit(reqVO.getId());
|
|
|
// 1.32 校验支付渠道是否有效
|
|
|
PayChannelDO channel = validateChannelCanSubmit(order.getAppId(), reqVO.getChannelCode());
|
|
|
PayClient client = channelService.getPayClient(channel.getId());
|
|
|
|
|
|
+ log.error("[submitOrder--------->unifiedOrderResp][订单id({})1111111支付渠道校验通过]", order.getId());
|
|
|
+
|
|
|
// 2. 插入 PayOrderExtensionDO
|
|
|
String no = noRedisDAO.generate(payProperties.getOrderNoPrefix());
|
|
|
PayOrderExtensionDO orderExtension = PayOrderConvert.INSTANCE.convert(reqVO, userIp)
|
|
@@ -155,6 +161,8 @@ public class PayOrderServiceImpl implements PayOrderService {
|
|
|
.setStatus(PayOrderStatusEnum.WAITING.getStatus());
|
|
|
orderExtensionMapper.insert(orderExtension);
|
|
|
|
|
|
+ log.error("[submitOrder--------->unifiedOrderResp][订单id({})2222222支付渠道校验通过]", order.getId());
|
|
|
+
|
|
|
// 3. 调用三方接口
|
|
|
PayOrderUnifiedReqDTO unifiedOrderReqDTO = PayOrderConvert.INSTANCE.convert2(reqVO, userIp)
|
|
|
// 商户相关的字段
|
|
@@ -166,6 +174,8 @@ public class PayOrderServiceImpl implements PayOrderService {
|
|
|
.setPrice(order.getPrice()).setExpireTime(order.getExpireTime());
|
|
|
PayOrderRespDTO unifiedOrderResp = client.unifiedOrder(unifiedOrderReqDTO);
|
|
|
|
|
|
+ log.error("[submitOrder--------->unifiedOrderResp][订单id({})333333支付完成,支付状态({})]", order.getId(),unifiedOrderResp.getStatus());
|
|
|
+
|
|
|
// 4. 如果调用直接支付成功,则直接更新支付单状态为成功。例如说:付款码支付,免密支付时,就直接验证支付成功
|
|
|
if (unifiedOrderResp != null) {
|
|
|
getSelf().notifyOrder(channel, unifiedOrderResp);
|