|
|
@@ -1083,7 +1083,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
String payTimeStr = params.get("gmt_payment");
|
|
|
//买家支付宝账号
|
|
|
String buyerId = params.get("buyer_id");
|
|
|
- log.info("支付宝回调信息:{}", Jsons.toJson(params));
|
|
|
+ String buyerOpenId = params.get("buyer_open_id");
|
|
|
if (!orderDon.getStatus().equals(OrderDon.Status.noPayment) && !orderDon.getStatus().equals(OrderDon.Status.close)) {
|
|
|
log.info("支付宝已回调，重复修改状态 id:{}", orderDon.getId());
|
|
|
return;
|
|
|
@@ -1107,7 +1107,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
orderDon.setShopId(appId);
|
|
|
orderDon.setType(OrderDon.Type.ALI_PAY);
|
|
|
|
|
|
- orderDon.setBuyerId(buyerId);
|
|
|
+ orderDon.setBuyerId(Optional.ofNullable(buyerId).orElse(buyerOpenId));
|
|
|
//该支付账号id 是否被后台拉黑
|
|
|
Integer count1 = userPayOrderBlockMapper.selectCount(Wrappers.lambdaQuery(UserPayOrderBlock.class)
|
|
|
.eq(UserPayOrderBlock::getBuyerId, buyerId));
|
zoujiajian