From 056126127b576106ebebf63d52c8e4a9d11e7276 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 24 Sep 2024 18:14:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=20?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E6=95=B0=E9=87=8F=20=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=20=E6=96=B0=E5=A2=9E=E5=BA=97=E9=93=BA=20?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=90=8D=E7=A7=B0=20=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java  | 2 +-
 .../cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
index 0d7c5596..b5536994 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
@@ -245,7 +245,7 @@ public class SummaryServiceImpl implements SummaryService {
         List<CountDateVO> numList = new ArrayList<>();
         for (Object[] o : objects) {
             CountDateVO countDateVO = new CountDateVO();
-            BigInteger integers = (BigInteger) o[1];
+            BigInteger integers = (BigInteger) o[0];
             countDateVO.setCount(new BigDecimal(integers.toString()));
             Date date = (Date) o[2];
             countDateVO.setTradeDay(date.toString());
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java
index a112ff6e..1fdaeaa5 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java
@@ -127,6 +127,10 @@ public class TbShopInfoServiceImpl implements TbShopInfoService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public TbShopInfoDto create(TbShopInfoDto resources) {
+        if(StringUtils.isBlank(resources.getShopName())){
+            throw new BadRequestException("店铺名称不可为空");
+        }
+        resources.setShopName(resources.getShopName().trim());
         if ("release".equals(resources.getProfiles())){
             if (resources.getRegisterCode() == null){
                 throw new BadRequestException("未绑定激活码");