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

Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
牛叉闪闪 2024-08-29 16:13:02 +08:00
parent 36c3c2e04b 8b56b21021
commit 860211489e
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
View File

@ -150,9 +150,9 @@ public class OrderService {
} }
TbCashierCart cart = cashierCartMapper.selectByPrimaryKey(cartId); TbCashierCart cart = cashierCartMapper.selectByPrimaryKey(cartId);
if (cart != null && cart.getNumber() > number && StrUtil.isNotBlank(cart.getOrderId()) && StrUtil.isNotBlank(cart.getTableId())) { // if (cart != null && cart.getNumber() > number && StrUtil.isNotBlank(cart.getOrderId()) && StrUtil.isNotBlank(cart.getTableId())) {
return Result.fail("此商品已经出餐不支持减少操作"); // return Result.fail("此商品已经出餐不支持减少操作");
} // }
// List<TbProskuCon> proskuConList= tbProskuConMapper.selectByShopIdAndSkuIdAndProductId(skuId,shopInfo.getId(),product.getId()); // List<TbProskuCon> proskuConList= tbProskuConMapper.selectByShopIdAndSkuIdAndProductId(skuId,shopInfo.getId(),product.getId());
// if(Objects.nonNull(proskuConList)&&proskuConList.size()>0){ // if(Objects.nonNull(proskuConList)&&proskuConList.size()>0){
@ -465,9 +465,9 @@ public class OrderService {
return Result.fail(CodeEnum.CARTEXIST); return Result.fail(CodeEnum.CARTEXIST);
} }
if (cashierCart.getOrderId() != null) { // if (cashierCart.getOrderId() != null) {
return Result.success(CodeEnum.SUCCESS, "已打票商品不支持删除", null); // return Result.success(CodeEnum.SUCCESS, "已打票商品不支持删除", null);
} // }
TbProductWithBLOBs product= tbProductMapper.selectByPrimaryKey(Integer.valueOf(cashierCart.getProductId())); TbProductWithBLOBs product= tbProductMapper.selectByPrimaryKey(Integer.valueOf(cashierCart.getProductId()));
if(ObjectUtil.isEmpty(product)){ if(ObjectUtil.isEmpty(product)){
@ -1084,11 +1084,11 @@ public class OrderService {
ArrayList<Integer> ids = new ArrayList<>(); ArrayList<Integer> ids = new ArrayList<>();
StringBuilder proName = new StringBuilder(); StringBuilder proName = new StringBuilder();
for (TbCashierCart cashierCart : list) { for (TbCashierCart cashierCart : list) {
if (StrUtil.isNotBlank(cashierCart.getOrderId()) && StrUtil.isNotBlank(cashierCart.getTableId())) { // if (StrUtil.isNotBlank(cashierCart.getOrderId()) && StrUtil.isNotBlank(cashierCart.getTableId())) {
orderId = Integer.parseInt(cashierCart.getOrderId()); // orderId = Integer.parseInt(cashierCart.getOrderId());
proName.append(cashierCart.getName()).append(","); // proName.append(cashierCart.getName()).append(",");
continue; // continue;
} // }
ids.add(cashierCart.getId()); ids.add(cashierCart.getId());
// 数量减少, 返还库存 // 数量减少, 返还库存
@ -1114,11 +1114,7 @@ public class OrderService {
if (orderId > 0) { if (orderId > 0) {
TbOrderInfo orderInfo = tbOrderInfoMapper.selectByPrimaryKey(orderId); TbOrderInfo orderInfo = tbOrderInfoMapper.selectByPrimaryKey(orderId);
if (ids.isEmpty() && "postPay".equals(orderInfo.getUseType())) { if (ids.isEmpty() && "postPay".equals(orderInfo.getUseType())) {
if (StrUtil.isBlank(proName.toString())) { return Result.success(CodeEnum.SUCCESS);
return Result.success(CodeEnum.SUCCESS);
}else {
return Result.fail(proName + "已出餐，无法删除");
}
} }
// 返还耗材 // 返还耗材
@ -1155,11 +1151,7 @@ public class OrderService {
.eq(TbShopTable::getQrcode, cartVo.getTableId()) .eq(TbShopTable::getQrcode, cartVo.getTableId())
.set(TbShopTable::getStatus, TableStateEnum.IDLE.getState())); .set(TbShopTable::getStatus, TableStateEnum.IDLE.getState()));
if (StrUtil.isBlank(proName.toString())) { return Result.success(CodeEnum.SUCCESS);
return Result.success(CodeEnum.SUCCESS);
}else {
return Result.fail(proName + "已出餐，无法删除");
}
} }