czg_team/cashier-admin-java
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:05:49 +08:00
parent cf9ff5c380
commit 19533f37b4
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ShopEatTypeInfoDTO.java
View File

@@ -15,4 +15,5 @@ public class ShopEatTypeInfoDTO {
private String useType; private String useType;
private Object shopId; private Object shopId;
private String tableId; private String tableId;
private String sendType;
} }

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

@@ -180,7 +180,8 @@ public class TbShopTableServiceImpl implements TbShopTableService {
boolean isDineInBefore = isMunchies && !isTakeout; boolean isDineInBefore = isMunchies && !isTakeout;
return new ShopEatTypeInfoDTO(isTakeout, isMunchies, isDineInAfter, isDineInBefore, shopInfo, isTakeout ? OrderUseTypeEnum.TAKEOUT.getValue() : return new ShopEatTypeInfoDTO(isTakeout, isMunchies, isDineInAfter, isDineInBefore, shopInfo, isTakeout ? OrderUseTypeEnum.TAKEOUT.getValue() :
isMunchies ? OrderUseTypeEnum.DINE_IN_BEFORE.getValue() : OrderUseTypeEnum.DINE_IN_AFTER.getValue(), shopId, tableId); isMunchies ? OrderUseTypeEnum.DINE_IN_BEFORE.getValue() : OrderUseTypeEnum.DINE_IN_AFTER.getValue(),
shopId, tableId, isTakeout ? OrderSendTypeEnums.TAKE_SELF.getValue() : OrderSendTypeEnums.TABLE.getValue());
} }
@@ -1198,6 +1199,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
orderInfo.setCreatedAt(DateUtil.current()); orderInfo.setCreatedAt(DateUtil.current());
orderInfo.setSeatAmount(mealAmount); orderInfo.setSeatAmount(mealAmount);
orderInfo.setSeatCount(mealNum); orderInfo.setSeatCount(mealNum);
orderInfo.setSendType(shopEatTypeInfoDTO.getSendType());
// 存在新添加的商品，增加下单次数 // 存在新添加的商品，增加下单次数
if (hasNewInfo) { if (hasNewInfo) {
orderInfo.setPlaceNum(placeNum); orderInfo.setPlaceNum(placeNum);
@@ -1232,6 +1234,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
orderInfo.setUseType(createOrderDTO.getUseType()); orderInfo.setUseType(createOrderDTO.getUseType());
orderInfo.setSeatAmount(mealAmount); orderInfo.setSeatAmount(mealAmount);
orderInfo.setSeatCount(mealNum); orderInfo.setSeatCount(mealNum);
orderInfo.setSendType(shopEatTypeInfoDTO.getSendType());
TbMerchantAccount merchantAccount = merchantAccountMapper.selectOne(new LambdaQueryWrapper<TbMerchantAccount>() TbMerchantAccount merchantAccount = merchantAccountMapper.selectOne(new LambdaQueryWrapper<TbMerchantAccount>()
.eq(TbMerchantAccount::getShopId, createOrderDTO.getShopId()) .eq(TbMerchantAccount::getShopId, createOrderDTO.getShopId())
.eq(TbMerchantAccount::getStatus, 1)); .eq(TbMerchantAccount::getStatus, 1));