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

Merge branch 'ww' into test

Browse Source 
# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java
#	src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
This commit is contained in:
wangw
2024-10-08 11:43:56 +08:00
parent fda4c29e85 d4cc9deed0
commit 88b189b1c4
5 changed files with 97 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java
View File

@@ -134,6 +134,8 @@ public class TbProduct implements Serializable {
private Integer stockNumber;
private Integer warnLine = 0;
@Transient
@TableField(exist = false)
private int orderCount;
@@ -150,5 +152,4 @@ public class TbProduct implements Serializable {
private static final long serialVersionUID = 1L;
}

2
src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProductSku.java
View File

@@ -35,8 +35,6 @@ public class TbProductSku implements Serializable {
private String coverImg;
private Integer warnLine;
private Double weight;
private Float volume;

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

@@ -391,39 +391,8 @@ public class OrderService {
return Result.success(CodeEnum.SUCCESS, masterId);
}
private TbCashierCart getCashierInfo(Object shopId, Object skuId, Object productId, String tableId, String MasterId, ShopEatTypeInfoDTO shopEatTypeInfoDTO) {
LambdaQueryWrapper<TbCashierCart> query = new LambdaQueryWrapper<TbCashierCart>()
.eq(TbCashierCart::getShopId, shopId)
.eq(TbCashierCart::getSkuId, skuId)
.eq(TbCashierCart::getProductId, productId)
.in(TbCashierCart::getStatus, "create")
.eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType());
if (shopEatTypeInfoDTO.isDineInAfter()) {
query.isNull(TbCashierCart::getPlaceNum);
}
if (shopEatTypeInfoDTO.isTakeout()) {
query.eq(TbCashierCart::getTradeDay, DateUtils.getDay())
.eq(TbCashierCart::getMasterId, MasterId);
}else {
query.eq(TbCashierCart::getTableId, tableId).and(query2 -> query2.and(query3 -> query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay())
.eq(TbCashierCart::getMasterId, MasterId))
.or(query4 -> query4.isNull(TbCashierCart::getTradeDay)
.and(q -> q.eq(TbCashierCart::getMasterId, "").or().isNull(TbCashierCart::getMasterId))
)
);
}
return mpCashierCartMapper.selectOne(query);
}
/**
* 设置小程序购物车缓存
*/
private void setRedisTableCartInfo(String tableId, Object shopId, List<TbCashierCart> tbCashierCartList, boolean isAdd) {
String tableCartKey = RedisCst.getTableCartKey(tableId, shopId.toString());
private void setRedisTableCartInfo(String tableId, String shopId, List<TbCashierCart> tbCashierCartList, boolean isAdd) {
String tableCartKey = RedisCst.getTableCartKey(tableId, shopId);
String tableCart = redisUtil.getMessage(tableCartKey);
List<TbCashierCart> cartArrayList = new ArrayList<>();
@@ -451,7 +420,7 @@ public class OrderService {
private void checkWarnLineAndSendMsg(TbProductSku productSku, TbProduct product, Integer shopId, Integer num) {
log.info("下单,开始校验库存预警,商品信息:{}, {}, {}", product, productSku, num);
if (productSku.getWarnLine() == null) {
if (product.getWarnLine() == null) {
return;
}
@@ -459,21 +428,15 @@ public class OrderService {
return;
}
if (productSku.getStockNumber() == null) {
productSku.setStockNumber((double) 0);
}
if (product.getStockNumber() == null) {
product.setStockNumber(0);
}
if (
(product.getIsDistribute() == 1 && product.getStockNumber() - num <= productSku.getWarnLine())
|| (product.getIsDistribute() != 1) && productSku.getStockNumber() - num <= productSku.getWarnLine()
) {
if (product.getStockNumber() - num <= product.getWarnLine()) {
List<TbShopOpenId> shopOpenIds = shopOpenIdMapper.selectStateByShopIdAndType(product.getShopId(), ShopWxMsgTypeEnum.STOCK_MSG.getType());
shopOpenIds.forEach(item -> {
wxAccountUtil.sendStockWarnMsg("商品库存不足", product.getName(),
product.getIsDistribute() == 1 ? product.getStockNumber() - num : (int) (productSku.getStockNumber() - num), item.getOpenId(), ShopWxMsgTypeEnum.STOCK_MSG, shopId);
product.getStockNumber() - num , item.getOpenId(), ShopWxMsgTypeEnum.STOCK_MSG, shopId);
});
}
}