|
@@ -730,7 +730,7 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
|
|
|
* @param lifeUserOrderDto 构造数据用
|
|
* @param lifeUserOrderDto 构造数据用
|
|
|
*/
|
|
*/
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public Map<String, Object> createUserOrder(LifeUserOrderDto lifeUserOrderDto) {
|
|
|
|
|
|
|
+ public R createUserOrder(LifeUserOrderDto lifeUserOrderDto) {
|
|
|
Date date = new Date();
|
|
Date date = new Date();
|
|
|
//1.创建订单
|
|
//1.创建订单
|
|
|
LifeUserOrder lifeUserOrder = new LifeUserOrder();
|
|
LifeUserOrder lifeUserOrder = new LifeUserOrder();
|
|
@@ -821,12 +821,12 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
|
|
|
if (updateRows == 0) {
|
|
if (updateRows == 0) {
|
|
|
log.error("couponid:" + lifeUserOrderDto.getCouponId() + " 库存不足,当前购买数量:" + buyCount);
|
|
log.error("couponid:" + lifeUserOrderDto.getCouponId() + " 库存不足,当前购买数量:" + buyCount);
|
|
|
// 手动抛出异常,触发事务回滚(回滚之前创建的订单和优惠券状态变更)
|
|
// 手动抛出异常,触发事务回滚(回滚之前创建的订单和优惠券状态变更)
|
|
|
- throw new RuntimeException("库存不足,下单失败");
|
|
|
|
|
|
|
+ return R.fail("库存不足,下单失败");
|
|
|
}
|
|
}
|
|
|
returnMap.put("success", "下单成功");
|
|
returnMap.put("success", "下单成功");
|
|
|
returnMap.put("orderNo", lifeUserOrderDto.getOrderNo());
|
|
returnMap.put("orderNo", lifeUserOrderDto.getOrderNo());
|
|
|
returnMap.put("lifeUserOrder", lifeUserOrder);
|
|
returnMap.put("lifeUserOrder", lifeUserOrder);
|
|
|
- return returnMap;
|
|
|
|
|
|
|
+ return R.data(returnMap);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|