czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

退款接口返回是否清空购物车

Browse Source
This commit is contained in:
张松
2024-12-20 11:38:16 +08:00
parent a1a067e14d
commit 095c40f743
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
View File

@@ -117,8 +117,7 @@ public class TbPlaceController {
@PutMapping("/returnCart") @PutMapping("/returnCart")
@ApiOperation("代客下单 清空购物车 /shop/table") @ApiOperation("代客下单 清空购物车 /shop/table")
public ResponseEntity<Object> returnOrder(@Validated @RequestBody ReturnCartDTO ReturnCartDTO) { public ResponseEntity<Object> returnOrder(@Validated @RequestBody ReturnCartDTO ReturnCartDTO) {
tbShopTableService.returnCart(ReturnCartDTO); return ResponseEntity.ok(tbShopTableService.returnCart(ReturnCartDTO));
return new ResponseEntity<>(HttpStatus.OK);
} }
@DeleteMapping("/clearCart") @DeleteMapping("/clearCart")

10
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
View File

@@ -831,7 +831,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
} }
@Override @Override
public void returnCart(ReturnCartDTO removeCartDTO) { public boolean returnCart(ReturnCartDTO removeCartDTO) {
boolean isSeatCart = TableConstant.CashierCart.ID.equals(removeCartDTO.getCartId().toString()); boolean isSeatCart = TableConstant.CashierCart.ID.equals(removeCartDTO.getCartId().toString());
// 会员点单 // 会员点单
TbCashierCart cashierCart = cashierCartMapper.selectOne(new LambdaQueryWrapper<TbCashierCart>() TbCashierCart cashierCart = cashierCartMapper.selectOne(new LambdaQueryWrapper<TbCashierCart>()
@@ -927,16 +927,16 @@ public class TbShopTableServiceImpl implements TbShopTableService {
} }
ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(cashierCart.getShopId(), cashierCart.getTableId()); ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(cashierCart.getShopId(), cashierCart.getTableId());
checkTakeOutEmptyAndClear(cashierCart, shopEatTypeInfoDTO); return checkTakeOutEmptyAndClear(cashierCart, shopEatTypeInfoDTO);
} }
/** /**
* 检查订单购物车是否为空并删除订单 * 检查订单购物车是否为空并删除订单
*/ */
private void checkTakeOutEmptyAndClear(TbCashierCart cashierCart, ShopEatTypeInfoDTO shopEatTypeInfoDTO) { private boolean checkTakeOutEmptyAndClear(TbCashierCart cashierCart, ShopEatTypeInfoDTO shopEatTypeInfoDTO) {
if (TableConstant.OrderInfo.UseType.TAKEOUT.equalsVals(cashierCart.getUseType())) { if (TableConstant.OrderInfo.UseType.TAKEOUT.equalsVals(cashierCart.getUseType())) {
return; return false;
} }
List<TbCashierCart> cashierCarts = mpCashierCartService.selectByShopEatTypeAndOrderId(shopEatTypeInfoDTO, cashierCart.getMasterId(), cashierCart.getOrderId() == null ? null : cashierCart.getOrderId(), false); List<TbCashierCart> cashierCarts = mpCashierCartService.selectByShopEatTypeAndOrderId(shopEatTypeInfoDTO, cashierCart.getMasterId(), cashierCart.getOrderId() == null ? null : cashierCart.getOrderId(), false);
int activateCount = 0; int activateCount = 0;
@@ -951,7 +951,9 @@ public class TbShopTableServiceImpl implements TbShopTableService {
.eq(TbOrderDetail::getOrderId, cashierCart.getOrderId())); .eq(TbOrderDetail::getOrderId, cashierCart.getOrderId()));
mpOrderInfoService.removeById(cashierCart.getOrderId()); mpOrderInfoService.removeById(cashierCart.getOrderId());
mpCashierCartService.removeByIds(cashierCarts); mpCashierCartService.removeByIds(cashierCarts);
return true;
} }
return false;
} }
@Override @Override

2
eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java
View File

@@ -107,7 +107,7 @@ public interface TbShopTableService {
void removeCart(RemoveCartDTO removeCartDTO); void removeCart(RemoveCartDTO removeCartDTO);
void returnCart(ReturnCartDTO returnCartDTO); boolean returnCart(ReturnCartDTO returnCartDTO);
void clearCart(ClearCartDTO clearCartDTO); void clearCart(ClearCartDTO clearCartDTO);