diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java index d7c653d6..3a44386d 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java @@ -253,7 +253,11 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl> statisticCount(Date end, int days) { Integer store_id = Convert.toInt(getCurrentUser().getStore_id()); if (ObjectUtil.isNotNull(store_id)) { - return shopOrderReturnMapper.statisticCountSeller(end, days, store_id); + List> mapList= shopOrderReturnMapper.statisticCountSeller(end, days, store_id); + if(null==mapList){ + mapList=new ArrayList<>(); + } + return mapList; } return shopOrderReturnMapper.statisticCount(end, days); } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/page/controller/admin/ShopPageAppController.java b/mall-shop/src/main/java/com/suisung/mall/shop/page/controller/admin/ShopPageAppController.java index 88f0ae86..5a71c4e1 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/page/controller/admin/ShopPageAppController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/page/controller/admin/ShopPageAppController.java @@ -540,6 +540,7 @@ public class ShopPageAppController extends BaseControllerImpl { editShopPageApp.setApp_market_images(shopPageApp.getApp_market_images()); editShopPageApp.setTpl_image(shopPageApp.getTpl_image()); editShopPageApp.setApp_industry(shopPageApp.getApp_industry()); + editShopPageApp.setApp_is_use(0); shopPageAppService.edit(editShopPageApp); return CommonResult.success(); }