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

重置统计数据

Browse Source
This commit is contained in:
wangw
2026-04-27 16:55:23 +08:00
parent 880d19b0fa
commit 604a42fa4d
3 changed files with 34 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cash-api/order-server/src/main/java/com/czg/controller/StatisticTaskController.java
View File

@@ -1,6 +1,7 @@
package com.czg.controller;
import com.czg.task.StatisticTask;
import com.czg.utils.FunUtils;
import jakarta.annotation.Resource;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -33,8 +34,10 @@ public class StatisticTaskController {
statisticTask.statisticAndInsertProd(shopId, date);
} else if ("table".equals(type)) {
statisticTask.statisticAndInsertTable(shopId, date);
} else {
return "未知错误";
} else if ("all".equals(type)) {
FunUtils.safeRunVoid(() -> statisticTask.statisticAndInsertOrder(shopId, date));
FunUtils.safeRunVoid(() -> statisticTask.statisticAndInsertProd(shopId, date));
FunUtils.safeRunVoid(() -> statisticTask.statisticAndInsertTable(shopId, date));
}
return "success";
}

29
cash-api/order-server/src/main/java/com/czg/controller/admin/FinanceStsController.java
View File

@@ -6,13 +6,18 @@ import com.czg.order.param.SaleSummaryCountParam;
import com.czg.order.service.FinanceStsService;
import com.czg.resp.CzgResult;
import com.czg.sa.StpKit;
import com.czg.task.StatisticTask;
import com.czg.utils.FunUtils;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.time.LocalDate;
/**
* 管理端/财务报表
* @author yjjie
@@ -25,6 +30,30 @@ public class FinanceStsController {
@Resource
private FinanceStsService financeStsService;
@Resource
private StatisticTask statisticTask;
/**
* 基础统计 预留重置统计
*
* @param date 日期yyyy-MM-dd
*/
@GetMapping("/base")
public String baseStatistic(@RequestParam LocalDate date, @RequestParam Long shopId, @RequestParam String type) {
if ("order".equals(type)) {
statisticTask.statisticAndInsertOrder(shopId, date);
} else if ("prod".equals(type)) {
statisticTask.statisticAndInsertProd(shopId, date);
} else if ("table".equals(type)) {
statisticTask.statisticAndInsertTable(shopId, date);
} else if ("all".equals(type)) {
FunUtils.safeRunVoid(() -> statisticTask.statisticAndInsertOrder(shopId, date));
FunUtils.safeRunVoid(() -> statisticTask.statisticAndInsertProd(shopId, date));
FunUtils.safeRunVoid(() -> statisticTask.statisticAndInsertTable(shopId, date));
}
return "success";
}
/**
* 查询财务报表
*/

153
cash-common/cash-common-service/src/main/java/com/czg/order/dto/PrintMachineLogDTO.java
View File

@@ -1,153 +0,0 @@
package com.czg.order.dto;
import java.io.Serializable;
import java.time.LocalDateTime;
import com.alibaba.fastjson2.annotation.JSONField;
import java.io.Serial;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 店铺小票打印记录 实体类。
*
* @author zs
* @since 2025-03-11
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
public class PrintMachineLogDTO implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* id
*/
private Long id;
/**
* 打印机类型 本地打印机-local USB打印机-USB 云打印机-network
*/
private String connectionType;
/**
* 打印机品牌 云想印 = yxyPrinter飞鹅 = fePrinter 本地 = local USB = printer
*/
private String contentType;
/**
* 打印小票 标签-label 出品-kitchen 小票-cash
*/
private String subType;
/**
* 打印机名称
*/
private String name;
/**
* IP地址/打印机编号
*/
private String address;
/**
* 端口/打印机秘钥
*/
private String port;
/**
* 小票尺寸 58mm 80mm
*/
private String receiptSize;
/**
* 分类打印 0-所以 1-部分分类 2-部分商品
*/
private String classifyPrint;
/**
* 桌台打印 0-所有 1-部分
*/
private String tablePrint;
/**
* 打印数量 c1m1^2=顾客+商家[2张] m1^1=商家[1张] c1^1顾客[1张] c2m1^3=顾客2+商家1[3张]
*/
private String printQty;
/**
* 打印方式 normal-普通出单 one-一菜一品 callTicket-排队取号
*/
private String printMethod;
/**
* 打印类型 JSON数组字符串数据 1-确认退款单 2-交班单 3-排队取号，如：[1,2,3]
*/
private String printType;
/**
* 打印票据 0-全部打印 1-仅厨房 2-仅前台
*/
private String printReceipt;
/**
* 打印内容
*/
private String printContent;
/**
* 店铺id
*/
private String shopId;
/**
* 业务类型
*/
private String bizType;
/**
* 打印人id
*/
private Long createUserId;
/**
* 打印人名称
*/
private String createUserName;
/**
* 打印任务创建时间
*/
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
/**
* 打印任务id，用于复查打印状态，云想印=orderId
*/
private String taskId;
/**
* 实际打印时间
*/
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime printTime;
/**
* 失败标识 1-是 0-否
*/
private Integer failFlag;
/**
* 响应代码
*/
private String respCode;
/**
* 响应消息
*/
private String respMsg;
}