czg_team
/
cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Tankaikai 2025-03-07 14:22:16 +08:00
parent 16b7f78d55 d9b8aa3846
commit f163dbaa2b
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cash-api/account-server/src/main/java/com/czg/controller/admin/PrintMachineController.java
View File

@ -36,7 +36,7 @@ public class PrintMachineController {
*/
@SaAdminCheckPermission(value = "printer:list", name = "打印机列表获取")
@GetMapping
public CzgResult<Page<PrintMachine>> list(String name, String connectionType) {
public CzgResult<Page<PrintMachine>> list(String name, String connectionType, String subType) {
QueryWrapper queryWrapper = new QueryWrapper().eq(PrintMachine::getShopId, StpKit.USER.getShopId());
if (StrUtil.isNotBlank(name)) {
queryWrapper.like(PrintMachine::getName, name);
@ -45,6 +45,10 @@ public class PrintMachineController {
if (StrUtil.isNotBlank(connectionType)) {
queryWrapper.eq(PrintMachine::getConnectionType, connectionType);
}
if (StrUtil.isNotBlank(subType)) {
queryWrapper.eq(PrintMachine::getSubType, subType);
}
queryWrapper.orderBy(PrintMachine::getSort, true).orderBy(PrintMachine::getId, false);
return CzgResult.success(printMachineService.page(PageUtil.buildPage(), queryWrapper));
}

11
cash-common/cash-common-service/src/main/java/com/czg/account/dto/print/PrinterAddDTO.java
View File

@ -28,6 +28,7 @@ public class PrinterAddDTO {
/**
* ip地址
*/
@NotBlank
private String address;
/**
@ -44,7 +45,7 @@ public class PrinterAddDTO {
/**
* 打印机品牌
*/
@NotBlank(message = "打印机品牌不为空")
// @NotBlank(message = "打印机品牌不为空")
private String contentType;
@ -71,25 +72,25 @@ public class PrinterAddDTO {
/**
* 分类打印 0-所有 1-部分分类 2-部分商品
*/
@NotBlank(message = "打印分类不为空")
// @NotBlank(message = "打印分类不为空")
private String classifyPrint;
/**
* 打印数量 c1m1^2=顾客+商家[2张] m1^1=商家[1张] c1^1顾客[1张] c2m1^3顾客2+商家1[3张]
*/
@NotBlank(message = "打印数量不为空")
// @NotBlank(message = "打印数量不为空")
private String printQty;
/**
* 打印方式 all-全部打印 normal-仅打印结账单「前台」one-仅打印制作单「厨房」
*/
@NotBlank(message = "打印方式不为空")
// @NotBlank(message = "打印方式不为空")
private String printMethod;
/**
* 打印类型，JSON数组 refund-确认退款单 handover-交班单 queue-排队取号
*/
@NotBlank(message = "打印类型不为空")
// @NotBlank(message = "打印类型不为空")
private String printType;
private Integer status;

3
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PlatformDictServiceImpl.java
View File

@ -4,6 +4,7 @@ import com.czg.service.account.mapper.PlatformDictMapper;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.czg.account.entity.PlatformDict;
import com.czg.account.service.PlatformDictService;
import org.apache.dubbo.config.annotation.DubboService;
import org.springframework.stereotype.Service;
/**
@ -12,7 +13,7 @@ import org.springframework.stereotype.Service;
* @author zs
* @since 2025-02-28
*/
@Service
@DubboService
public class PlatformDictServiceImpl extends ServiceImpl<PlatformDictMapper, PlatformDict> implements PlatformDictService{
}