diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
index ba2b8ae..b012363 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -643,8 +643,12 @@ public class OrderService {
if (StringUtils.isEmpty(shopId)) {
return Result.fail(CodeEnum.SHOPINFONOEXIST);
}
-
- ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(Integer.valueOf(shopId), tableId);
+ ShopEatTypeInfoDTO shopEatTypeInfoDTO;
+ if (StrUtil.isBlank(tableId)) {
+ shopEatTypeInfoDTO = getEatModelUnCheck(Integer.valueOf(shopId), tableId);
+ }else {
+ shopEatTypeInfoDTO = checkEatModel(Integer.valueOf(shopId), tableId);
+ }
String day = DateUtils.getDay();
String finalMasterId1 = masterId;
diff --git a/src/main/resources/mapper/TbProductMapper.xml b/src/main/resources/mapper/TbProductMapper.xml
index 6e95051..bf0d4c5 100644
--- a/src/main/resources/mapper/TbProductMapper.xml
+++ b/src/main/resources/mapper/TbProductMapper.xml
@@ -486,6 +486,7 @@
and a.name like CONCAT('%',#{commdityName},'%')
+ and type != 'coupon'
and b.is_grounding=1 GROUP BY a.id ORDER BY a.`sort`
@@ -512,6 +513,8 @@
and a.name like CONCAT('%',#{commdityName},'%')
+ and type != 'coupon'
+
and b.is_grounding=1 GROUP BY a.id ORDER BY a.`sort`
@@ -524,6 +527,8 @@
and a.name like CONCAT('%',#{commdityName},'%')
+ and type != 'coupon'
+
and b.is_grounding=0 GROUP BY a.id ORDER BY a.`sort`