Merge remote-tracking branch 'origin/test' into test

cash-api/account-server/src/main/java/com/czg/controller/TestController.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author GYJoker
  */
 @RestController
-@RequestMapping("/test")
+@RequestMapping("/notify/test")
 public class TestController {
     @Resource
     private ShopUserFlowService shopUserFlowService;

cash-common/cash-common-tools/src/main/java/com/czg/utils/PageUtil.java

@@ -62,6 +62,15 @@ public class PageUtil {
         return new Page<>(pageNum, pageSize);
     }
 
+    /**
+     * 获取空Page对象
+     */
+    public <T> Page<T> emptyPage() {
+        return Page.of(1,10,0) ;
+    }
+
+
+
     /**
      * 构造排序QueryWrapper
      * 从param体获取

cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CallTableServiceImpl.java

@@ -473,7 +473,7 @@ public class CallTableServiceImpl extends ServiceImpl<CallTableMapper, CallTable
         } else {
             List<CallTable> list = queryChain().eq(CallTable::getShopId, shopId).eq(CallTable::getState, 1).list();
             if (list.isEmpty()) {
-                return new Page<>();
+                return PageUtil.emptyPage();
             }
             tableIds = list.stream()
                     .map(CallTable::getId)

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/GbWareServiceImpl.java

@@ -11,6 +11,7 @@ import com.czg.market.service.GbWareService;
 import com.czg.sa.StpKit;
 import com.czg.service.market.mapper.GbWareMapper;
 import com.czg.utils.AssertUtil;
+import com.czg.utils.PageUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
@@ -32,7 +33,7 @@ public class GbWareServiceImpl extends ServiceImpl<GbWareMapper, GbWare> impleme
     @Override
     public Page<GbWare> getGbWarePage(GbWareQueryParamDTO param, Long shopId, boolean isAdmin) {
         if (!isAdmin && !shopInfoService.checkSwitch(shopId, ShopSwitchTypeEnum.GROUP_BUY)) {
-            return new Page<>();
+            return PageUtil.emptyPage();
         }
         Long mainShopId = shopInfoService.getMainIdByShopId(shopId);
         QueryWrapper queryWrapper = new QueryWrapper();
@@ -54,9 +55,7 @@ public class GbWareServiceImpl extends ServiceImpl<GbWareMapper, GbWare> impleme
         });
         Page<GbWare> page = page(Page.of(param.getPage(), param.getSize()), queryWrapper);
         if (!isAdmin) {
-            page.getRecords().forEach(item -> {
+            page.getRecords().forEach(item -> item.setShopId(shopId));
-                item.setShopId(shopId);
-            });
         }
         return page;
     }

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java

@@ -19,7 +19,6 @@ import com.mybatisflex.spring.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -43,7 +42,7 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl<MkPointsGoodsMapper, M
     public Page<MkPointsGoods> getPointsGoodsPage(BaseQueryParam param, Long shopId) {
         boolean exists = mkPointsConfigService.exists(query().eq(MkPointsConfig::getShopId, shopId).eq(MkPointsConfig::getEnablePointsMall, 1));
         if (!exists) {
-            return new Page<>();
+            return PageUtil.emptyPage();
         }
         Page<MkPointsGoods> page = page(Page.of(param.getPage(), param.getSize()),
                 query()

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsUserRecordServiceImpl.java

@@ -31,11 +31,11 @@ public class MkPointsUserRecordServiceImpl extends ServiceImpl<MkPointsUserRecor
     @Override
     public Page<MkPointsUserRecord> pageByPointsUserId(Integer page, Integer size, Long mkPointsUserId) {
         if (mkPointsUserId == null) {
-            return new Page<>();
+            return PageUtil.emptyPage();
         }
         ShopInfo shopInfo = shopInfoService.getById(StpKit.USER.getShopId());
         if (shopInfo == null) {
-            return new Page<>();
+            return PageUtil.emptyPage();
         }
         Page<MkPointsUserRecord> pages = page(Page.of(page, size),
                 query().eq(MkPointsUserRecord::getMkPointsUserId, mkPointsUserId).orderBy(MkPointsUserRecord::getCreateTime, false));
@@ -46,7 +46,7 @@ public class MkPointsUserRecordServiceImpl extends ServiceImpl<MkPointsUserRecor
     @Override
     public Page<MkPointsUserRecord> getPointsUserRecord(Integer page, Integer size, Long mkPointsUserId) {
         if (mkPointsUserId == null) {
-            return new Page<>();
+            return PageUtil.emptyPage();
         }
         PageHelper.startPage(page, size);
         List<MkPointsUserRecord> record = mapper.getPointsUserRecord(mkPointsUserId);

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsUserServiceImpl.java

@@ -17,6 +17,7 @@ import com.czg.market.service.MkPointsUserRecordService;
 import com.czg.market.service.MkPointsUserService;
 import com.czg.sa.StpKit;
 import com.czg.service.market.mapper.MkPointsUserMapper;
+import com.czg.utils.PageUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
@@ -50,7 +51,7 @@ public class MkPointsUserServiceImpl extends ServiceImpl<MkPointsUserMapper, MkP
         if (StrUtil.isNotBlank(phone)) {
             ShopUser one = shopUserService.getOne(query().eq(ShopUser::getPhone, phone).eq(ShopUser::getMainShopId, mainIdByShopId));
             if (one == null) {
-                return new Page<>();
+                return PageUtil.emptyPage();
             }
             shopUserId = one.getId();
         }

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageServiceImpl.java

@@ -20,6 +20,7 @@ import com.czg.sa.StpKit;
 import com.czg.service.market.mapper.PpPackageMapper;
 import com.czg.service.market.mapper.PpPackageOrderMapper;
 import com.czg.utils.AssertUtil;
+import com.czg.utils.PageUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.core.update.UpdateChain;
@@ -168,7 +169,7 @@ public class PpPackageServiceImpl extends ServiceImpl<PpPackageMapper, PpPackage
         Integer promotionSwitch = getPackagePromotionSwitch(shopId);
         if (!isAdmin && SystemConstants.OneZero.ZERO == promotionSwitch) {
             log.info("没有开启套餐推广");
-            return new Page<>();
+            return PageUtil.emptyPage();
         }
 
         Long mainShopId = shopInfoService.getMainIdByShopId(shopId);

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java

@@ -310,7 +310,7 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
             }
             return PageUtil.convert(new PageInfo<>(coupons));
         }
-        return new Page<>();
+        return PageUtil.emptyPage();
     }
 
     @Override

cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java

@@ -162,7 +162,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
                     .like(OrderDetail::getProductName, productName);
             like = orderDetailService.listAs(queryWrapper, Long.class);
             if (CollUtil.isEmpty(like)) {
-                return new Page<>();
+                return PageUtil.emptyPage();
             }
         }
         QueryWrapper queryWrapper = PageUtil.buildSortQueryWrapper();