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

创建订单保存sendType

Browse Source
This commit is contained in:
SongZhang
2024-09-27 10:37:57 +08:00
parent 501970a89b
commit 19eacd1550
6 changed files with 54 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -156,7 +156,7 @@ public class OrderService {
boolean isDineInBefore = isMunchies && !isTakeout;
return new ShopEatTypeInfoDTO(isTakeout, isMunchies, isDineInAfter, isDineInBefore, shopInfo, isTakeout ? OrderUseTypeEnum.TAKEOUT.getValue() :
isMunchies ? OrderUseTypeEnum.DINE_IN_BEFORE.getValue() : OrderUseTypeEnum.DINE_IN_AFTER.getValue());
isMunchies ? OrderUseTypeEnum.DINE_IN_BEFORE.getValue() : OrderUseTypeEnum.DINE_IN_AFTER.getValue(), isTakeout ? OrderSendTypeEnums.TAKE_SELF.getValue() : OrderSendTypeEnums.TABLE.getValue());
}
@@ -703,7 +703,7 @@ public class OrderService {
.eq(TbCashierCart::getStatus, "create");
// 外带模式
if (StrUtil.isBlank(orderVo.getTableId())) {
if (eatTypeInfoDTO.isTakeout()) {
queryWrapper.eq(TbCashierCart::getMasterId, orderVo.getMasterId())
.eq(TbCashierCart::getTradeDay, day)
.eq(TbCashierCart::getUseType, OrderUseTypeEnum.TAKEOUT.getValue())
@@ -767,8 +767,9 @@ public class OrderService {
}
// 查询历史orderDetail
Integer finalOrderId = orderId;
List<TbOrderDetail> oldOrderDetailList = mPOrderDetailMapper.selectList(new LambdaQueryWrapper<TbOrderDetail>()
.in(TbOrderDetail::getCartId, cashierIds)
.and(q -> q.in(TbOrderDetail::getCartId, cashierIds).or().eq(TbOrderDetail::getOrderId, finalOrderId))
.eq(TbOrderDetail::getShopId, orderVo.getShopId()));
HashMap<String, TbOrderDetail> oldOrderDetailMap = new HashMap<>();
oldOrderDetailList.forEach(item -> {
@@ -863,7 +864,7 @@ public class OrderService {
orderInfo.setUserId(orderVo.getUserId());
orderInfo.setUseType(eatTypeInfoDTO.getUseType());
orderInfo.setPackFee(packAMount);
orderInfo.setSendType(eatTypeInfoDTO.getSendType());
// 堂食自取增加下单次数
if (eatTypeInfoDTO.isDineInAfter()) {
orderInfo.setPlaceNum(currentPlaceNum);
@@ -891,6 +892,7 @@ public class OrderService {
if (Objects.nonNull(tbToken)) {
orderInfo.setTokenId(tbToken.getId());
}
orderInfo.setSendType(eatTypeInfoDTO.getSendType());
orderInfo.setOutNumber(masterId);
mPOrderInfoMapper.insert(orderInfo);
orderId = orderInfo.getId();

8
src/main/java/com/chaozhanggui/system/cashierservice/service/ShopInfoService.java
View File

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.chaozhanggui.system.cashierservice.bean.TableStateEnum;
import com.chaozhanggui.system.cashierservice.dao.*;
import com.chaozhanggui.system.cashierservice.entity.*;
import com.chaozhanggui.system.cashierservice.entity.dto.ClearTableDTO;
import com.chaozhanggui.system.cashierservice.entity.vo.TbShopTableVO;
import com.chaozhanggui.system.cashierservice.mybatis.MpShopTableMapper;
import com.chaozhanggui.system.cashierservice.sign.CodeEnum;
@@ -141,4 +142,11 @@ public class ShopInfoService {
data.put("isReturn", tbShopInfo.getIsReturn());
return Result.success(CodeEnum.SUCCESS,data);
}
public int cleatTable(ClearTableDTO clearTableDTO) {
return mpShopTableMapper.update(null, new LambdaUpdateWrapper<TbShopTable>()
.eq(TbShopTable::getQrcode, clearTableDTO.getTableId())
.eq(TbShopTable::getShopId, clearTableDTO.getShopId())
.set(TbShopTable::getStatus, TableStateEnum.IDLE.getState()));
}
}