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

Browse Source
This commit is contained in:
Tankaikai
2024-10-10 09:36:38 +08:00
parent bd94b97017 59c7fc4c9d
commit f1bb7d39b4
3 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/chaozhanggui/system/cashierservice/bean/OrderPlatformTypeEnum.java Normal file
View File

@@ -0,0 +1,15 @@
package com.chaozhanggui.system.cashierservice.bean;
import lombok.Getter;
@Getter
public enum OrderPlatformTypeEnum {
PC("pc"),
CASH("cash"),
MINI_APP("miniapp");
private final String value;
OrderPlatformTypeEnum(String value) {
this.value = value;
}
}

1
src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java
View File

@@ -60,6 +60,7 @@ public class TbCashierCart implements Serializable {
private String tableId;
private String useType;
private Integer placeNum;
private String platformType;
@TableField(exist = false)
private TbProductSpec tbProductSpec;

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

@@ -350,6 +350,7 @@ public class OrderService {
cashierCart.setUuid(uuid);
cashierCart.setCategoryId(product.getCategoryId());
cashierCart.setTableId(tableId);
cashierCart.setPlatformType(OrderPlatformTypeEnum.CASH.getValue());
list.add(cashierCart);
mpCashierCartMapper.insert(cashierCart);
} else {
@@ -712,27 +713,18 @@ public class OrderService {
LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
.eq(TbCashierCart::getShopId, orderVo.getShopId())
.eq(TbCashierCart::getUseType, eatTypeInfoDTO.getUseType())
.gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
.and(q -> q.eq(TbCashierCart::getMasterId, orderVo.getMasterId()).or().isNull(TbCashierCart::getMasterId))
.eq(TbCashierCart::getStatus, "create");
// 外带模式
if (eatTypeInfoDTO.isTakeout()) {
queryWrapper.eq(TbCashierCart::getMasterId, orderVo.getMasterId())
.eq(TbCashierCart::getTradeDay, day)
.eq(TbCashierCart::getUseType, OrderUseTypeEnum.TAKEOUT.getValue())
.and(query -> query.isNull(TbCashierCart::getTableId)
.or()
.eq(TbCashierCart::getTableId, ""));
queryWrapper.and(q -> q.isNull(TbCashierCart::getTableId).or().eq(TbCashierCart::getTableId, ""))
.in(TbCashierCart::getPlatformType, OrderPlatformTypeEnum.PC.getValue(), OrderPlatformTypeEnum.CASH.getValue());
// 台桌点单
} else if (StrUtil.isNotBlank(orderVo.getTableId())) {
queryWrapper.eq(TbCashierCart::getTableId, orderVo.getTableId())
.eq(TbCashierCart::getUseType, eatTypeInfoDTO.getUseType())
.and(query2 -> query2.or(query3 -> query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay())
.eq(TbCashierCart::getMasterId, orderVo.getMasterId()))
.or((query4 -> query4.isNull(TbCashierCart::getTradeDay)
.or()
.eq(TbCashierCart::getMasterId, "")
.or()
.isNull(TbCashierCart::getMasterId))));
queryWrapper.eq(TbCashierCart::getTableId, orderVo.getTableId());
shopTable = mpShopTableMapper.selectOne(new LambdaUpdateWrapper<TbShopTable>()
.eq(TbShopTable::getQrcode, orderVo.getTableId()));
@@ -1773,6 +1765,7 @@ public class OrderService {
tbCashierCart.setPackFee(BigDecimal.ZERO);
tbCashierCart.setNumber(choseCountDTO.getNum());
tbCashierCart.setTotalNumber(choseCountDTO.getNum());
tbCashierCart.setPlatformType(OrderPlatformTypeEnum.CASH.getValue());
tbCashierCartMapper.insert(tbCashierCart);
} else {
tbCashierCart.setTotalAmount(new BigDecimal(choseCountDTO.getNum()).multiply(shopInfo.getTableFee()));