From e6bd4af95cc42adf2a57b88d1cc3329cfa95303c Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 21 Nov 2024 15:31:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E9=97=A8=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/shopimpl/TbShopInfoServiceImpl.java     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java
index bd1925fa..d7ba32a5 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java
@@ -102,17 +102,14 @@ public class TbShopInfoServiceImpl implements TbShopInfoService {
             Predicate query1 = criteriaBuilder.equal(root.get("id"), criteria.getId());
             Predicate query2 = criteriaBuilder.and(
                     criteriaBuilder.equal(root.get("mainId"), criteria.getId()),
-                    criteriaBuilder.notEqual(root.get("type"), "only"),
-                    criteriaBuilder.equal(root.get("tubeType"), 1)
+                    criteriaBuilder.notEqual(root.get("type"), "only")
             );
 
-
-            // 再将两个子条件进行或运算组合成最终条件
             Predicate predicate = criteriaBuilder.or(
                     query1,
                     query2
             );
-
+            criteriaBuilder.desc(root.get("tubeType"));
             return predicate;
         });
         return list;
@@ -189,6 +186,7 @@ public class TbShopInfoServiceImpl implements TbShopInfoService {
             }
         }else {
             tbShopInfo.setMainId(null);
+            tbShopInfo.setTubeType(1);
         }
 
         //增加商户详情
@@ -285,6 +283,7 @@ public class TbShopInfoServiceImpl implements TbShopInfoService {
             }
         }else {
             tbShopInfo.setMainId(null);
+            tbShopInfo.setTubeType(1);
         }
         if (StringUtils.isNotBlank(resources.getShopName()) && !resources.getShopName().equals(tbShopInfo.getShopName())) {
             shopStaffRepository.updateNameById(resources.getShopName(),resources.getId().toString());