|
|
@@ -1119,27 +1119,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
recordOrderDonLocationRelate(orderDon.getId(), payRequest.getIp());
|
|
|
//订单金额为0 且订单为已完成 更新虚物车票
|
|
|
if (orderDon.getMoney().compareTo(BigDecimal.ZERO) == 0) {
|
|
|
- OrderDon updateOrder = orderDonMapper.selectById(orderDon.getId());
|
|
|
- //mj镜像续费订单
|
|
|
- if(orderDon.getOrderType() == 2 && orderDon.getGoodsId() == 26){
|
|
|
- GroupsRelation groupsRelation = groupsRelationMapper.selectById(orderDon.getRelationId());
|
|
|
- if(groupsRelation != null){
|
|
|
- Date expiryTime = groupsRelation.getExpiryTime();
|
|
|
-
|
|
|
- //mj续费订单当天过期直接加次数
|
|
|
- if (expiryTime != null && DateUtil.isSameDay(new Date(), expiryTime)) {
|
|
|
- mjRenewOrder(orderDon);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- updateOrder.setStatus(goodsDon.getType() == 1 && goodsDon.getSecondType() == 2 ? OrderDon.Status.complete : OrderDon.Status.hasPayment);
|
|
|
- updateGroupsTicket(updateOrder, goodsDon, sku);
|
|
|
- orderDonMapper.updateById(updateOrder);
|
|
|
- //余额使用记录
|
|
|
- if (orderDon.getBalance().compareTo(BigDecimal.ZERO) > 0) {
|
|
|
- userBenefitsService.recordBalanceBySource(orderDon.getUserId(), orderDon.getBalance().negate(), UserBalanceSourceRecord.Source.payment, orderDon.getId(), goodsDon.getTitle() + UserBalanceSourceRecord.Source.payment.getDesc());
|
|
|
- }
|
|
|
- return updateOrder;
|
|
|
+ unifiedHandlerOrderNotify(orderDon, goodsDon, sku);
|
|
|
}
|
|
|
return orderDon;
|
|
|
}
|