Selaa lähdekoodia

bugfix:创建订单修改

lyx 1 kuukausi sitten
vanhempi
commit
31c630f7a4

+ 2 - 2
alien-store/src/main/java/shop/alien/store/controller/LifeUserOrderController.java

@@ -29,9 +29,9 @@ public class LifeUserOrderController {
     @ApiOperation("创建订单")
     @ApiOperationSupport(order = 2)
     @PostMapping("/createUserOrder")
-    public R<Map<String, Object>> createUserOrder(@RequestBody LifeUserOrderDto LifeUserOrderDto) {
+    public R createUserOrder(@RequestBody LifeUserOrderDto LifeUserOrderDto) {
         log.info("userOrder.createUserOrder:{}", LifeUserOrderDto);
-        return R.data(lifeUserOrderService.createUserOrder(LifeUserOrderDto));
+        return lifeUserOrderService.createUserOrder(LifeUserOrderDto);
     }
 
     @ApiOperation("更新订单")

+ 3 - 3
alien-store/src/main/java/shop/alien/store/service/LifeUserOrderService.java

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