|
|
@@ -707,13 +707,16 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
//记录用户推广海报下单记录
|
|
|
recordPosterUserOrder(orderId, payRequest.getRid());
|
|
|
//记录用户镜像店铺订单
|
|
|
- recordUserMirrorShopOrderRelate(orderId, payRequest.getCmt(), payRequest.getCustomId());
|
|
|
+ recordUserMirrorShopOrderRelate(orderId, payRequest.getUserId(), payRequest.getCmt(), payRequest.getCustomId());
|
|
|
}
|
|
|
|
|
|
- private void recordUserMirrorShopOrderRelate(Long orderId, Integer cmt, String customId) {
|
|
|
+ private void recordUserMirrorShopOrderRelate(Long orderId, Long userId, Integer cmt, String customId) {
|
|
|
if (cmt == 2 && StrUtil.isNotBlank(customId)) {
|
|
|
UserMirrorShop userMirrorShop = userMirrorShopMapper.selectOne(Wrappers.lambdaQuery(UserMirrorShop.class)
|
|
|
.eq(UserMirrorShop::getCustomId, customId).last("limit 1"));
|
|
|
+ if (userMirrorShop.getUserId().equals(userId)) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
if (userMirrorShop == null || !userMirrorShop.getStatus()) {
|
|
|
return;
|
|
|
}
|
|
|
@@ -1173,6 +1176,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
//独立规格续费订单记录
|
|
|
recordIndependentRenewOrderDon(orderDon, renewUpgradeIndependentPackage, groupsTrips);
|
|
|
}
|
|
|
+ //统一处理订单记录操作
|
|
|
+ unifiedHandlerOrderRecordFunc(orderDon.getId(), payRequest);
|
|
|
//订单金额为0 且订单为已完成 更新虚物车票
|
|
|
if (orderDon.getMoney().compareTo(BigDecimal.ZERO) == 0) {
|
|
|
OrderDon updateOrder = orderDonMapper.selectById(orderDon.getId());
|
|
|
@@ -1197,8 +1202,6 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
}
|
|
|
return updateOrder;
|
|
|
}
|
|
|
- //统一处理订单记录操作
|
|
|
- unifiedHandlerOrderRecordFunc(orderDon.getId(), payRequest);
|
|
|
return orderDon;
|
|
|
}
|
|
|
|
|
|
@@ -4027,6 +4030,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
jobManager.addJob(EXPIRY_TIME, () -> {
|
|
|
closeOrder(orderDon.getId(), null);
|
|
|
});
|
|
|
+ //记录用户镜像店铺订单
|
|
|
+ recordUserMirrorShopOrderRelate(orderDon.getId(), payRequest.getUserId(), payRequest.getCmt(), payRequest.getCustomId());
|
|
|
return orderDon;
|
|
|
}
|
|
|
|