zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
wangjinlei
2024-05-30 13:51:20 +08:00
parent 6ab30dd9bd
commit f8d98dda1b
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/peanut/modules/common/controller/TaihuWelfareController.java
View File

@@ -9,8 +9,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
@Slf4j
@RestController("commonTaihuWelfare")
@RequestMapping("common/taihuWelfare")

4
src/main/java/com/peanut/modules/common/service/impl/TaihuWelfareServiceImpl.java
View File

@@ -35,7 +35,7 @@ public class TaihuWelfareServiceImpl extends ServiceImpl<TaihuWelfareDao, TaihuW
wrapper.leftJoin(ShopProduct.class,ShopProduct::getProductId,ShopStoreToProductEntity::getProductId);
wrapper.eq(ShopStoreToProductEntity::getStoreId,1);
wrapper.orderByAsc(ShopStoreToProductEntity::getSort);
Page<ShopStoreToProductEntity> shopStoreToProductEntityPage = shopStoreToProductDao.selectPage(new Page<>(param.getPage(), param.getLimit()), wrapper);
return R.ok().put("page",shopStoreToProductEntityPage);
Page<ShopProduct> shopProductPage = shopStoreToProductDao.selectJoinPage(new Page<>(param.getPage(), param.getLimit()), ShopProduct.class, wrapper);
return R.ok().put("page",shopProductPage);
}
}