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

日志增加shopId，改动打印机，增加注册时默认四种支付方式

Browse Source
This commit is contained in:
liuyingfang
2024-03-13 10:57:00 +08:00
parent 2c5c32883d
commit 6568318806
11 changed files with 173 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,10 +26,8 @@ import cn.ysk.cashier.pojo.shop.TbMerchantAccount;
import cn.ysk.cashier.pojo.shop.TbMerchantRegister;
import cn.ysk.cashier.pojo.shop.TbPlussShopStaff;
import cn.ysk.cashier.pojo.shop.TbShopInfo;
import cn.ysk.cashier.repository.shop.TbMerchantAccountRepository;
import cn.ysk.cashier.repository.shop.TbMerchantRegisterRepository;
import cn.ysk.cashier.repository.shop.TbPlussShopStaffRepository;
import cn.ysk.cashier.repository.shop.TbShopInfoRepository;
import cn.ysk.cashier.repository.TbShopPayTypeRepository;
import cn.ysk.cashier.repository.shop.*;
import cn.ysk.cashier.service.shop.TbShopInfoService;
import cn.ysk.cashier.system.domain.Dept;
import cn.ysk.cashier.system.domain.Job;
@@ -85,6 +83,8 @@ public class TbShopInfoServiceImpl implements TbShopInfoService {
private final RedisUtils redisUtils;
private final TbShopPayTypeRepository tbShopPayTypeRepository;
@Override
public Map<String,Object> queryAll(TbShopInfoQueryCriteria criteria){
Sort sort = Sort.by(Sort.Direction.DESC, "id");
@@ -215,8 +215,11 @@ public class TbShopInfoServiceImpl implements TbShopInfoService {
tbPlussShopStaff.setUpdatedAt(Instant.now().toEpochMilli());
tbPlussShopStaff.setCode(save.getPhone());
shopStaffRepository.save(tbPlussShopStaff);
//增加默认支付方式
Integer integer = tbShopPayTypeRepository.creatPayType(save.getId().toString());
if (integer<4){
throw new BadRequestException("请重试");
}
return tbShopInfoMapper.toDto(new TbShopInfo());
}