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

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
SongZhang
2024-10-12 10:46:33 +08:00
parent 90505fd354 d2ed566348
commit ece7e3eb0e
3 changed files with 49 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,33 +15,33 @@
*/
package cn.ysk.cashier.service.impl.shopimpl;
import cn.ysk.cashier.exception.BadRequestException;
import cn.ysk.cashier.pojo.shop.TbPrintMachine;
import cn.ysk.cashier.dto.shop.PrintMachineDto;
import cn.ysk.cashier.dto.shop.TbPrintMachineDto;
import cn.ysk.cashier.dto.shop.TbPrintMachineQueryCriteria;
import cn.ysk.cashier.exception.BadRequestException;
import cn.ysk.cashier.mapper.shop.TbPrintMachineMapper;
import cn.ysk.cashier.pojo.shop.TbPrintMachine;
import cn.ysk.cashier.repository.shop.TbPrintMachineRepository;
import cn.ysk.cashier.service.shop.TbPrintMachineService;
import cn.ysk.cashier.utils.FileUtil;
import cn.ysk.cashier.utils.ListUtil;
import cn.ysk.cashier.utils.QueryHelp;
import cn.ysk.cashier.utils.ValidationUtil;
import cn.ysk.cashier.vo.TbPrintMachineVO;
import lombok.RequiredArgsConstructor;
import cn.ysk.cashier.repository.shop.TbPrintMachineRepository;
import cn.ysk.cashier.service.shop.TbPrintMachineService;
import cn.ysk.cashier.dto.shop.TbPrintMachineDto;
import cn.ysk.cashier.dto.shop.TbPrintMachineQueryCriteria;
import cn.ysk.cashier.mapper.shop.TbPrintMachineMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.Instant;
import java.util.List;
import java.util.Map;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.time.Instant;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
/**
* @website https://eladmin.vip
@@ -152,6 +152,15 @@ public class TbPrintMachineServiceImpl implements TbPrintMachineService {
map.put("分类Id", tbPrintMachine.getCategoryIds());
map.put("现在打印机支持USB 和 网络两种", tbPrintMachine.getContentType());
map.put("主配置", tbPrintMachine.getConfig());
map.put("小票尺寸", tbPrintMachine.getReceiptSize());
map.put("分类打印", tbPrintMachine.getClassifyPrint());
map.put("桌台打印", tbPrintMachine.getTablePrint());
map.put("打印数量", tbPrintMachine.getPrintQty());
map.put("打印方式", tbPrintMachine.getPrintMethod());
map.put("打印类型", tbPrintMachine.getPrintType());
map.put("打印单据", tbPrintMachine.getPrintReceipt());
map.put(" createdAt", tbPrintMachine.getCreatedAt());
map.put(" updatedAt", tbPrintMachine.getUpdatedAt());
map.put("分类", tbPrintMachine.getCategoryList());