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:
SongZhang
2024-09-19 10:17:27 +08:00
parent 079bf18d4c
commit 2f6bbd4dec
2 changed files with 56 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbCashierCartMapper.java
View File

@@ -21,6 +21,17 @@ public interface TbCashierCartMapper extends BaseMapper<TbCashierCart> {
List<CarVO> selectCar(@Param("shopId") Integer shopId); List<CarVO> selectCar(@Param("shopId") Integer shopId);
@Select("<script> select\n" +
" a.id orderId,b.pending_at pendingAt, sum(b.total_amount) totalAmount,\n" +
" count(b.id) totalCount, sum(b.total_number) totalNumber, a.remark\n" +
" from tb_order_info a\n" +
" JOIN tb_cashier_cart b on a.id=b.order_id\n" +
" where a.shop_id=#{shopId} and a.`status`='pending'\n" +
" and a.trade_day=#{day} and a.use_type=#{useType}\n" +
" <if test=\"tableId != null and tableId != ''\">\n" +
" and a.table_id=#{tableId}\n" +
" </if>\n" +
" GROUP BY a.id ORDER BY a.id desc</script>")
List<PendingCountVO> countPending(@Param("shopId") Integer shopId, @Param("tableId") String tableId, @Param("day") String day, @Param("useType") String useType); List<PendingCountVO> countPending(@Param("shopId") Integer shopId, @Param("tableId") String tableId, @Param("day") String day, @Param("useType") String useType);
@Select("select a.*, b.spec_snap from tb_cashier_cart as a left join tb_product_sku as b on a.sku_id=b.id where a.shop_id=#{shopId} and a.status='refund';") @Select("select a.*, b.spec_snap from tb_cashier_cart as a left join tb_product_sku as b on a.sku_id=b.id where a.shop_id=#{shopId} and a.status='refund';")

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

@@ -368,16 +368,10 @@ public class TbShopTableServiceImpl implements TbShopTableService {
.isNull(TbCashierCart::getPlaceNum) .isNull(TbCashierCart::getPlaceNum)
.eq(TbCashierCart::getUseType, addCartDTO.getUseType()) .eq(TbCashierCart::getUseType, addCartDTO.getUseType())
.in(TbCashierCart::getStatus, "create", "refund") .in(TbCashierCart::getStatus, "create", "refund")
.and(query2 -> { .and(query2 -> query2.and(query3 -> query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay())
query2.and(query3 -> { .eq(TbCashierCart::getMasterId, addCartDTO.getMasterId()))
query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay()) .or((query4 -> query4.isNull(TbCashierCart::getTradeDay)
.eq(TbCashierCart::getMasterId, addCartDTO.getMasterId()); .eq(TbCashierCart::getMasterId, ""))));
})
.or((query4 -> {
query4.isNull(TbCashierCart::getTradeDay)
.eq(TbCashierCart::getMasterId, "");
}));
});
if (addCartDTO.getCartId() != null) { if (addCartDTO.getCartId() != null) {
query.eq(TbCashierCart::getId, addCartDTO.getCartId()); query.eq(TbCashierCart::getId, addCartDTO.getCartId());
@@ -582,18 +576,14 @@ public class TbShopTableServiceImpl implements TbShopTableService {
.eq(TbCashierCart::getShopId, clearCartDTO.getShopId()) .eq(TbCashierCart::getShopId, clearCartDTO.getShopId())
.isNull(TbCashierCart::getPlaceNum) .isNull(TbCashierCart::getPlaceNum)
.eq(TbCashierCart::getUseType, clearCartDTO.getUseType()) .eq(TbCashierCart::getUseType, clearCartDTO.getUseType())
.and(q -> { .and(q -> q.eq(TbCashierCart::getMasterId, clearCartDTO.getMasterId())
q.eq(TbCashierCart::getMasterId, clearCartDTO.getMasterId())
.or() .or()
.isNull(TbCashierCart::getMasterId) .isNull(TbCashierCart::getMasterId)
.or() .or()
.eq(TbCashierCart::getMasterId, ""); .eq(TbCashierCart::getMasterId, ""))
}) .and(q -> q.eq(TbCashierCart::getOrderId, orderId)
.and(q -> {
q.eq(TbCashierCart::getOrderId, orderId)
.or() .or()
.isNull(TbCashierCart::getOrderId); .isNull(TbCashierCart::getOrderId));
});
if (clearCartDTO.getTableId() != null) { if (clearCartDTO.getTableId() != null) {
query.eq(TbCashierCart::getTableId, clearCartDTO.getTableId()); query.eq(TbCashierCart::getTableId, clearCartDTO.getTableId());
@@ -618,16 +608,10 @@ public class TbShopTableServiceImpl implements TbShopTableService {
.in(TbCashierCart::getStatus, "create", "refund", "return") .in(TbCashierCart::getStatus, "create", "refund", "return")
.eq(TbCashierCart::getShopId, shopId) .eq(TbCashierCart::getShopId, shopId)
.eq(TbCashierCart::getUseType, useType) .eq(TbCashierCart::getUseType, useType)
.and(query2 -> { .and(query2 -> query2.or(query3 -> query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay())
query2.or(query3 -> { .eq(TbCashierCart::getMasterId, masterId))
query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay()) .or((query4 -> query4.isNull(TbCashierCart::getTradeDay)
.eq(TbCashierCart::getMasterId, masterId); .isNull(TbCashierCart::getMasterId))));
})
.or((query4 -> {
query4.isNull(TbCashierCart::getTradeDay)
.isNull(TbCashierCart::getMasterId);
}));
});
if (tableId != null) { if (tableId != null) {
queryWrapper.eq(TbCashierCart::getTableId, tableId); queryWrapper.eq(TbCashierCart::getTableId, tableId);
@@ -638,9 +622,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
List<TbCashierCart> records = cartPage.getRecords(); List<TbCashierCart> records = cartPage.getRecords();
ArrayList<Integer> skuIds = new ArrayList<>(); ArrayList<Integer> skuIds = new ArrayList<>();
records.forEach(item -> { records.forEach(item -> skuIds.add(Integer.valueOf(item.getSkuId())));
skuIds.add(Integer.valueOf(item.getSkuId()));
});
AtomicReference<TbCashierCart> mealCashierCart = new AtomicReference<>(); AtomicReference<TbCashierCart> mealCashierCart = new AtomicReference<>();
@@ -689,16 +671,10 @@ public class TbShopTableServiceImpl implements TbShopTableService {
LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>() LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
.eq(TbCashierCart::getShopId, packCartDTO.getShopId()) .eq(TbCashierCart::getShopId, packCartDTO.getShopId())
.in(TbCashierCart::getStatus, "create", "refund") .in(TbCashierCart::getStatus, "create", "refund")
.and(query2 -> { .and(query2 -> query2.or(query3 -> query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay())
query2.or(query3 -> { .eq(TbCashierCart::getMasterId, packCartDTO.getMasterId()))
query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay()) .or((query4 -> query4.isNull(TbCashierCart::getTradeDay)
.eq(TbCashierCart::getMasterId, packCartDTO.getMasterId()); .eq(TbCashierCart::getMasterId, ""))));
})
.or((query4 -> {
query4.isNull(TbCashierCart::getTradeDay)
.eq(TbCashierCart::getMasterId, "");
}));
});
if (StrUtil.isNotBlank(packCartDTO.getTableId())) { if (StrUtil.isNotBlank(packCartDTO.getTableId())) {
queryWrapper.eq(TbCashierCart::getTableId, packCartDTO.getTableId()); queryWrapper.eq(TbCashierCart::getTableId, packCartDTO.getTableId());
@@ -1003,16 +979,10 @@ public class TbShopTableServiceImpl implements TbShopTableService {
.eq(TbCashierCart::getShopId, createOrderDTO.getShopId()) .eq(TbCashierCart::getShopId, createOrderDTO.getShopId())
.in(TbCashierCart::getStatus, "create") .in(TbCashierCart::getStatus, "create")
.eq(TbCashierCart::getUseType, createOrderDTO.getUseType()) .eq(TbCashierCart::getUseType, createOrderDTO.getUseType())
.and(query2 -> { .and(query2 -> query2.or(query3 -> query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay())
query2.or(query3 -> { .eq(TbCashierCart::getMasterId, createOrderDTO.getMasterId()))
query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay()) .or((query4 -> query4.isNull(TbCashierCart::getTradeDay)
.eq(TbCashierCart::getMasterId, createOrderDTO.getMasterId()); .isNull(TbCashierCart::getMasterId))));
})
.or((query4 -> {
query4.isNull(TbCashierCart::getTradeDay)
.isNull(TbCashierCart::getMasterId);
}));
});
if (StrUtil.isNotBlank(createOrderDTO.getTableId())) { if (StrUtil.isNotBlank(createOrderDTO.getTableId())) {
queryWrapper.eq(TbCashierCart::getTableId, createOrderDTO.getTableId()); queryWrapper.eq(TbCashierCart::getTableId, createOrderDTO.getTableId());
@@ -1252,16 +1222,10 @@ public class TbShopTableServiceImpl implements TbShopTableService {
} else { } else {
queryWrapper queryWrapper
.eq(TbCashierCart::getStatus, "create") .eq(TbCashierCart::getStatus, "create")
.and(query2 -> { .and(query2 -> query2.or(query3 -> query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay())
query2.or(query3 -> { .eq(TbCashierCart::getMasterId, pendingDTO.getMasterId()))
query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay()) .or((query4 -> query4.isNull(TbCashierCart::getTradeDay)
.eq(TbCashierCart::getMasterId, pendingDTO.getMasterId()); .eq(TbCashierCart::getMasterId, ""))));
})
.or((query4 -> {
query4.isNull(TbCashierCart::getTradeDay)
.eq(TbCashierCart::getMasterId, "");
}));
});
if (StrUtil.isNotBlank(pendingDTO.getTableId())) { if (StrUtil.isNotBlank(pendingDTO.getTableId())) {
queryWrapper.eq(TbCashierCart::getTableId, pendingDTO.getTableId()); queryWrapper.eq(TbCashierCart::getTableId, pendingDTO.getTableId());
@@ -1347,9 +1311,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
List<TbProductSku> skuList = productSkuRepository.findAllById(skuIds); List<TbProductSku> skuList = productSkuRepository.findAllById(skuIds);
LinkedHashMap<String, TbProductSku> skuMap = new LinkedHashMap<>(); LinkedHashMap<String, TbProductSku> skuMap = new LinkedHashMap<>();
skuList.forEach(item -> { skuList.forEach(item -> skuMap.put(item.getId().toString(), item));
skuMap.put(item.getId().toString(), item);
});
cashierCartMapper.selectPending(shopId); cashierCartMapper.selectPending(shopId);
@@ -1564,21 +1526,13 @@ public class TbShopTableServiceImpl implements TbShopTableService {
.eq(TbCashierCart::getTableId, choseTableDTO.getOldTableId()) .eq(TbCashierCart::getTableId, choseTableDTO.getOldTableId())
.in(TbCashierCart::getStatus, "create", "return") .in(TbCashierCart::getStatus, "create", "return")
.eq(TbCashierCart::getShopId, choseTableDTO.getShopId()) .eq(TbCashierCart::getShopId, choseTableDTO.getShopId())
.and(q -> { .and(q -> q.isNull(TbCashierCart::getOrderId)
q.isNull(TbCashierCart::getOrderId)
.or() .or()
.eq(TbCashierCart::getOrderId, currentOrderId); .eq(TbCashierCart::getOrderId, currentOrderId))
}) .and(query2 -> query2.or(query3 -> query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay())
.and(query2 -> { .isNotNull(TbCashierCart::getMasterId))
query2.or(query3 -> { .or((query4 -> query4.isNull(TbCashierCart::getTradeDay)
query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay()) .isNull(TbCashierCart::getMasterId))))
.isNotNull(TbCashierCart::getMasterId);
})
.or((query4 -> {
query4.isNull(TbCashierCart::getTradeDay)
.isNull(TbCashierCart::getMasterId);
}));
})
.set(TbCashierCart::getMasterId, masterId) .set(TbCashierCart::getMasterId, masterId)
.set(TbCashierCart::getTableId, choseTableDTO.getNewTableId())); .set(TbCashierCart::getTableId, choseTableDTO.getNewTableId()));
@@ -1685,9 +1639,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
.select(TbShopTable::getName)); .select(TbShopTable::getName));
HashMap<String, Object> tableMap = new HashMap<>(); HashMap<String, Object> tableMap = new HashMap<>();
tbShopTables.forEach(item -> { tbShopTables.forEach(item -> tableMap.put(item.getName(), item));
tableMap.put(item.getName(), item);
});
StringBuilder msg = new StringBuilder(); StringBuilder msg = new StringBuilder();
ArrayList<TbShopTable> tableArrayList = new ArrayList<>(); ArrayList<TbShopTable> tableArrayList = new ArrayList<>();