Merge remote-tracking branch 'origin/dev-3.0.0' into dev

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;
-        ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(Integer.valueOf(shopId), tableId);
+        if (StrUtil.isBlank(tableId)) {
+            shopEatTypeInfoDTO = getEatModelUnCheck(Integer.valueOf(shopId), tableId);
+        }else {
+            shopEatTypeInfoDTO = checkEatModel(Integer.valueOf(shopId), tableId);
+        }
         String day = DateUtils.getDay();
 
         String finalMasterId1 = masterId;

src/main/resources/mapper/TbProductMapper.xml

@@ -486,6 +486,7 @@
     <if test="commdityName != null and commdityName!='' ">
       and a.name like CONCAT('%',#{commdityName},'%')
     </if>
+    and type != 'coupon'
     and b.is_grounding=1 GROUP BY a.id ORDER BY a.`sort`
 
 
@@ -512,6 +513,8 @@
     <if test="commdityName != null and commdityName!='' ">
       and a.name like CONCAT('%',#{commdityName},'%')
     </if>
+    and type != 'coupon'
+
     and b.is_grounding=1 GROUP BY a.id ORDER BY a.`sort`
 
   </select>
@@ -524,6 +527,8 @@
     <if test="commdityName != null and commdityName!='' ">
       and a.name like CONCAT('%',#{commdityName},'%')
     </if>
+    and type != 'coupon'
+
     and b.is_grounding=0 GROUP BY a.id ORDER BY a.`sort`
 
   </select>