fixed 发现的bug修复

fuint-application/src/main/java/com/fuint/common/service/impl/GoodsServiceImpl.java

@@ -82,7 +82,6 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
      */
     @Override
     public PaginationResponse<GoodsDto> queryGoodsListByPagination(PaginationRequest paginationRequest) throws BusinessCheckException {
-        Page<MtGoods> pageHelper = PageHelper.startPage(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());
         LambdaQueryWrapper<MtGoods> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.ne(MtGoods::getStatus, StatusEnum.DISABLE.getKey());
 
@@ -149,8 +148,9 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
                 lambdaQueryWrapper.orderByAsc(MtGoods::getSort);
             }
         } else {
-            lambdaQueryWrapper.orderByAsc(MtGoods::getSort);
+            lambdaQueryWrapper.orderByAsc(MtGoods::getSort, MtGoods::getId);
         }
+        Page<MtGoods> pageHelper = PageHelper.startPage(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());
         List<MtGoods> goodsList = mtGoodsMapper.selectList(lambdaQueryWrapper);
         List<GoodsDto> dataList = new ArrayList<>();
         String basePath = settingService.getUploadBasePath();

fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java

@@ -299,7 +299,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
             lambdaQueryWrapper.eq(MtOrder::getType, OrderTypeEnum.GOODS.getKey());
         }
         lambdaQueryWrapper.orderByDesc(MtOrder::getId);
-        Page<MtOpenGift> pageHelper = PageHelper.startPage(pageNumber, pageSize);
+        Page<MtOrder> pageHelper = PageHelper.startPage(pageNumber, pageSize);
         List<MtOrder> orderList = mtOrderMapper.selectList(lambdaQueryWrapper);
 
         List<UserOrderDto> dataList = new ArrayList<>();

fuint-application/src/main/java/com/fuint/common/service/impl/SendSmsServiceImpl.java

@@ -277,6 +277,10 @@ public class SendSmsServiceImpl implements SendSmsService {
         if (StringUtils.isNotBlank(merchantId)) {
             lambdaQueryWrapper.eq(MtSmsSendedLog::getMerchantId, merchantId);
         }
+        String storeId = paginationRequest.getSearchParams().get("storeId") == null ? "" : paginationRequest.getSearchParams().get("storeId").toString();
+        if (StringUtils.isNotBlank(storeId)) {
+            lambdaQueryWrapper.eq(MtSmsSendedLog::getStoreId, storeId);
+        }
         String content = paginationRequest.getSearchParams().get("content") == null ? "" : paginationRequest.getSearchParams().get("content").toString();
         if (StringUtils.isNotBlank(content)) {
             lambdaQueryWrapper.like(MtSmsSendedLog::getContent, content);

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSmsController.java

@@ -81,9 +81,6 @@ public class BackendSmsController extends BaseController {
         if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
             searchParams.put("merchantId", accountInfo.getMerchantId());
         }
-        if (accountInfo.getStoreId() != null && accountInfo.getStoreId() > 0) {
-            searchParams.put("storeId", accountInfo.getStoreId());
-        }
 
         paginationRequest.setSearchParams(searchParams);
         PaginationResponse<MtSmsSendedLog> paginationResponse = sendSmsService.querySmsListByPagination(paginationRequest);