backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Jack 2025-12-17 16:59:04 +08:00
commit 2d50db41d0
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java
View File

@ -253,7 +253,11 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
public List<Map<String, Object>> statisticCount(Date end, int days) { public List<Map<String, Object>> statisticCount(Date end, int days) {
Integer store_id = Convert.toInt(getCurrentUser().getStore_id()); Integer store_id = Convert.toInt(getCurrentUser().getStore_id());
if (ObjectUtil.isNotNull(store_id)) { if (ObjectUtil.isNotNull(store_id)) {
return shopOrderReturnMapper.statisticCountSeller(end, days, store_id); List<Map<String, Object>> mapList= shopOrderReturnMapper.statisticCountSeller(end, days, store_id);
if(null==mapList){
mapList=new ArrayList<>();
}
return mapList;
} }
return shopOrderReturnMapper.statisticCount(end, days); return shopOrderReturnMapper.statisticCount(end, days);
} }

1
mall-shop/src/main/java/com/suisung/mall/shop/page/controller/admin/ShopPageAppController.java
View File

@ -540,6 +540,7 @@ public class ShopPageAppController extends BaseControllerImpl {
editShopPageApp.setApp_market_images(shopPageApp.getApp_market_images()); editShopPageApp.setApp_market_images(shopPageApp.getApp_market_images());
editShopPageApp.setTpl_image(shopPageApp.getTpl_image()); editShopPageApp.setTpl_image(shopPageApp.getTpl_image());
editShopPageApp.setApp_industry(shopPageApp.getApp_industry()); editShopPageApp.setApp_industry(shopPageApp.getApp_industry());
editShopPageApp.setApp_is_use(0);
shopPageAppService.edit(editShopPageApp); shopPageAppService.edit(editShopPageApp);
return CommonResult.success(); return CommonResult.success();
} }