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

fix: 取消会员修改

Browse Source
This commit is contained in:
张松
2024-11-06 16:40:46 +08:00
parent 12602192de
commit 66331f57dc
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,7 +147,7 @@ public class TbPlaceController {
@PostMapping("/order") @PostMapping("/order")
@ApiOperation("代客下单 查询购物车 /shop/table") @ApiOperation("代客下单 查询购物车 /shop/table")
public ResponseEntity<Object> createOrder(@RequestBody CreateOrderDTO createOrderDTO) { public ResponseEntity<Object> createOrder(@RequestBody CreateOrderDTO createOrderDTO) {
return ResponseEntity.ok(tbShopTableService.createOrder(createOrderDTO, !createOrderDTO.isPostPay(), true)); return ResponseEntity.ok(tbShopTableService.createOrder(createOrderDTO, false));
} }
@PostMapping("/pending") @PostMapping("/pending")

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

@@ -1115,7 +1115,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
@Override @Override
@Transactional @Transactional
public TbOrderInfo createOrder(CreateOrderDTO createOrderDTO, boolean addMaterId, boolean isPrint) { public TbOrderInfo createOrder(CreateOrderDTO createOrderDTO, boolean byOrderId) {
createOrderDTO.setTableId(OrderUseTypeEnum.TAKEOUT.getValue().equals(createOrderDTO.getUseType()) ? null : createOrderDTO.getTableId()); createOrderDTO.setTableId(OrderUseTypeEnum.TAKEOUT.getValue().equals(createOrderDTO.getUseType()) ? null : createOrderDTO.getTableId());
return Utils.runFunAndCheckKey(() -> { return Utils.runFunAndCheckKey(() -> {
TbShopInfo shopInfo = shopInfoRepository.findById(createOrderDTO.getShopId()).orElse(null); TbShopInfo shopInfo = shopInfoRepository.findById(createOrderDTO.getShopId()).orElse(null);
@@ -1130,7 +1130,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
// 就餐模式信息 // 就餐模式信息
ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(createOrderDTO.getShopId(), createOrderDTO.getTableId(), createOrderDTO.getUseType()); ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(createOrderDTO.getShopId(), createOrderDTO.getTableId(), createOrderDTO.getUseType());
OrderCartInfoDTO cartInfoDTO = getCartForCreateOrder(shopEatTypeInfoDTO, createOrderDTO.getMasterId(), shopUser); OrderCartInfoDTO cartInfoDTO = getCartForCreateOrder(shopEatTypeInfoDTO, createOrderDTO.getMasterId(), shopUser, byOrderId ? createOrderDTO.getOrderId() : null);
if (cartInfoDTO.getOrderId() == null) { if (cartInfoDTO.getOrderId() == null) {
createOrderDTO.setOrderId(shopEatTypeInfoDTO.isDineInAfter() ? createOrderDTO.setOrderId(shopEatTypeInfoDTO.isDineInAfter() ?
getCurrentOrderId(shopEatTypeInfoDTO) : null); getCurrentOrderId(shopEatTypeInfoDTO) : null);
@@ -1309,10 +1309,14 @@ public class TbShopTableServiceImpl implements TbShopTableService {
return infoDTO; return infoDTO;
} }
private OrderCartInfoDTO getCartForCreateOrder(ShopEatTypeInfoDTO shopEatTypeInfoDTO, String masterId, TbShopUser shopUser) { private OrderCartInfoDTO getCartForCreateOrder(ShopEatTypeInfoDTO shopEatTypeInfoDTO, String masterId, TbShopUser shopUser, Integer orderId) {
OrderCartInfoDTO cartInfoDTO = new OrderCartInfoDTO(); OrderCartInfoDTO cartInfoDTO = new OrderCartInfoDTO();
List<TbCashierCart> allCashierCarts;
List<TbCashierCart> allCashierCarts = mpCashierCartService.selectByShopEatType(shopEatTypeInfoDTO, masterId); if (orderId != null) {
allCashierCarts = mpCashierCartService.selectByOrderIdAndState(orderId, null);
}else {
allCashierCarts = mpCashierCartService.selectByShopEatType(shopEatTypeInfoDTO, masterId);
}
TbCashierCart seatCart = null; TbCashierCart seatCart = null;
for (TbCashierCart cashierCart : allCashierCarts) { for (TbCashierCart cashierCart : allCashierCarts) {
if (TableConstant.CART_SEAT_ID.equals(cashierCart.getProductId())) { if (TableConstant.CART_SEAT_ID.equals(cashierCart.getProductId())) {
@@ -1751,7 +1755,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
createOrderDTO.setMasterId(pendingDTO.getMasterId()); createOrderDTO.setMasterId(pendingDTO.getMasterId());
createOrderDTO.setNote(pendingDTO.getNote()); createOrderDTO.setNote(pendingDTO.getNote());
createOrderDTO.setUseType(pendingDTO.getUseType()); createOrderDTO.setUseType(pendingDTO.getUseType());
orderId = createOrder(createOrderDTO, true, false).getId(); orderId = createOrder(createOrderDTO, false).getId();
} }
@@ -2195,8 +2199,6 @@ public class TbShopTableServiceImpl implements TbShopTableService {
dto.setUseType(orderInfo.getUseType()); dto.setUseType(orderInfo.getUseType());
if (updateVipDTO.getType() == 0) { if (updateVipDTO.getType() == 0) {
TbShopUser shopUser = tbShopUserMapper.selectById(updateVipDTO.getVipUserId()); TbShopUser shopUser = tbShopUserMapper.selectById(updateVipDTO.getVipUserId());
if (shopUser == null) { if (shopUser == null) {
throw new BadRequestException("用户信息不存在"); throw new BadRequestException("用户信息不存在");
@@ -2215,7 +2217,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
.set(TbOrderInfo::getMemberId, null)); .set(TbOrderInfo::getMemberId, null));
} }
return createOrder(dto, true, true); return createOrder(dto, true);
} }

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

@@ -110,7 +110,7 @@ public interface TbShopTableService {
void pack(PackCartDTO packCartDTO); void pack(PackCartDTO packCartDTO);
Object createOrder(CreateOrderDTO createOrderDTO, boolean addMasterId, boolean isPrint); Object createOrder(CreateOrderDTO createOrderDTO, boolean addMasterId);
JSONObject getMasterId(Integer shopId, String tableId, String useType, Integer orderId); JSONObject getMasterId(Integer shopId, String tableId, String useType, Integer orderId);