czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ww' into test

This commit is contained in:
wangw 2024-09-24 18:14:23 +08:00
parent 5042ebe490 056126127b
commit 0d77408fa5
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
View File

@ -241,7 +241,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());

4
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java
View File

@ -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("未绑定激活码");