|
@@ -4752,6 +4752,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
|
|
+ @Transactional(rollbackFor = Throwable.class)
|
|
|
public OrderDon ccDeductSubmitOrder(OrderPayRequest payRequest) {
|
|
public OrderDon ccDeductSubmitOrder(OrderPayRequest payRequest) {
|
|
|
Long relationId = payRequest.getRelationId();
|
|
Long relationId = payRequest.getRelationId();
|
|
|
Long userId = payRequest.getUserId();
|
|
Long userId = payRequest.getUserId();
|
|
@@ -4797,7 +4798,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
orderDon.setUserId(userId);
|
|
orderDon.setUserId(userId);
|
|
|
orderDon.setGoodsId(upgradeSku.getGoodsId());
|
|
orderDon.setGoodsId(upgradeSku.getGoodsId());
|
|
|
orderDon.setRelationId(relationId);
|
|
orderDon.setRelationId(relationId);
|
|
|
- orderDon.setSkuId(renewSkuId);
|
|
|
|
|
|
|
+ orderDon.setSkuId(upgradeSku.getId());
|
|
|
//续费订单
|
|
//续费订单
|
|
|
orderDon.setOrderType(2);
|
|
orderDon.setOrderType(2);
|
|
|
BigDecimal price = upgradeSku.getPrice();
|
|
BigDecimal price = upgradeSku.getPrice();
|