商家结算卡信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shop/business/BusinessDayBillController.java

@@ -244,7 +244,7 @@ public class BusinessDayBillController extends BaseController {
         map.put("todayOnlineOrderNum", today.getOnlineOrderNum());
         map.put("todayOnlineOrderAmount", today.getOnlineOrderAmount());
 
-        if (yesterday.getOnlineOrderNum() > 0) {
+        if (ObjectUtil.isNotNull(yesterday) && yesterday.getOnlineOrderNum() > 0) {
             double v = (today.getOnlineOrderNum() - yesterday.getOnlineOrderNum()) / (double) yesterday.getOnlineOrderNum();
             map.put("onlineOrderOnDay", MathUtils.setScale(v * 100D, 1));
         } else {
@@ -253,7 +253,7 @@ public class BusinessDayBillController extends BaseController {
 
         map.put("todayShopOrderNum", today.getShopOrderNum());
         map.put("todayShopOrderAmount", today.getShopOrderAmount());
-        if (yesterday.getOnlineOrderNum() > 0) {
+        if (ObjectUtil.isNotNull(yesterday) && yesterday.getShopOrderNum() > 0) {
             double v = (today.getShopOrderNum() - yesterday.getShopOrderNum()) / (double) yesterday.getShopOrderNum();
             map.put("shopOrderOnDay", MathUtils.setScale(v * 100D, 1));
         } else {

ruoyi-line/src/main/java/com/ruoyi/subsidy/service/impl/SubsidyModeAutoServiceImpl.java

@@ -118,7 +118,7 @@ public class SubsidyModeAutoServiceImpl implements ISubsidyModeAutoService {
     @Override
     public SubsidyModeAutoVo loadVoByBusinessId(Long businessId) {
         SubsidyModeAutoVo subsidyModeAutoVo = baseMapper.selectVoOne(new LambdaQueryWrapper<SubsidyModeAuto>().eq(SubsidyModeAuto::getBusinessId, businessId).last("limit 1"));
-        if (ObjectUtil.isNotNull(subsidyModeAutoVo.getTargetModeId())) {
+        if (ObjectUtil.isNotNull(subsidyModeAutoVo) && ObjectUtil.isNotNull(subsidyModeAutoVo.getTargetModeId())) {
             SubsidyMode targetMode = this.subsidyModeService.loadById(subsidyModeAutoVo.getTargetModeId(), false);
             if(ObjectUtil.isNotNull(targetMode)) {
                 subsidyModeAutoVo.setTargetModeName(targetMode.getName());

ruoyi-shop/src/main/java/com/ruoyi/shop/order/domain/vo/ShopOrderVo.java

@@ -613,7 +613,7 @@ public class ShopOrderVo extends BaseVo {
 
     public String loadCustomerServicePhone() {
         if (customerServicePhone == null) {
-            IBusinessService businessService = SpringUtil.getBean("businessService", IBusinessService.class);
+            IBusinessService businessService = SpringUtil.getBean("businessServiceImpl", IBusinessService.class);
             customerServicePhone = businessService.loadCustomerServicePhone(this.getBusinessId());
         }
         return customerServicePhone;