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:
张松 2025-03-10 10:56:34 +08:00
parent 406bad4f2e 9a0d1602df
commit 68b7adb552
9 changed files with 28 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/admin/data/summary")
public class DataSummaryController {
private final DataSummaryService dataSummaryService;
/**
@ -47,7 +48,7 @@ public class DataSummaryController {
@GetMapping("productSaleDate")
@OperationLog("商品销售-右下")
//@SaAdminCheckPermission("dataSummary:productSaleData")
private CzgResult<DataSummaryProductSaleVo> getProductSaleData(DataSummaryProductSaleParam param) {
public CzgResult<DataSummaryProductSaleVo> getProductSaleData(DataSummaryProductSaleParam param) {
Long shopId = StpKit.USER.getShopId(0L);
param.setShopId(shopId);
DataSummaryProductSaleVo data = dataSummaryService.getProductSaleData(param);
@ -62,7 +63,7 @@ public class DataSummaryController {
@GetMapping("dateAmount")
@OperationLog("销售趋势柱状图 左下")
//@SaAdminCheckPermission("dataSummary:dateAmount")
private CzgResult<DataSummaryDateAmountVo> getDateAmount(@RequestParam Integer day) {
public CzgResult<DataSummaryDateAmountVo> getDateAmount(@RequestParam Integer day) {
Long shopId = StpKit.USER.getShopId(0L);
DataSummaryDateAmountVo data = dataSummaryService.getSummaryAmountData(shopId, day);
return CzgResult.success(data);
@ -75,7 +76,7 @@ public class DataSummaryController {
*/
@GetMapping("datePayType")
//@SaAdminCheckPermission("dataSummary:datePayType")
private Object shopSummaryPayType(@RequestParam Integer day) {
public CzgResult<DataSummaryPayTypeVo> shopSummaryPayType(@RequestParam Integer day) {
Long shopId = StpKit.USER.getShopId(0L);
DataSummaryPayTypeVo data = dataSummaryService.getSummaryPayTypeData(shopId, day);
return CzgResult.success(data);

3
cash-common/cash-common-service/src/main/java/com/czg/order/vo/DataSummaryDateAmountVo.java
View File

@ -5,6 +5,7 @@ import lombok.NoArgsConstructor;
import java.io.Serial;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/**
@ -22,7 +23,7 @@ public class DataSummaryDateAmountVo implements Serializable {
/**
* total
*/
private List<TotalVo> total;
private List<TotalVo> total = new ArrayList<>();
/**
* TotalVo

3
cash-common/cash-common-service/src/main/java/com/czg/order/vo/DataSummaryPayTypeVo.java
View File

@ -5,6 +5,7 @@ import lombok.NoArgsConstructor;
import java.io.Serial;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/**
@ -23,7 +24,7 @@ public class DataSummaryPayTypeVo implements Serializable {
/**
* countPayType
*/
private List<CountPayTypeVo> countPayType;
private List<CountPayTypeVo> countPayType = new ArrayList<>();
/**
* CountPayTypeVo

22
cash-common/cash-common-service/src/main/java/com/czg/order/vo/DataSummaryProductSaleVo.java
View File

@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
/**
@ -25,19 +26,19 @@ public class DataSummaryProductSaleVo implements Serializable {
/**
* productSum
*/
private ProductSumVo productSum;
private ProductSumVo productSum = new ProductSumVo();
/**
* countList
*/
private List<CountListVo> countList;
private List<CountListVo> countList = new ArrayList<>();
/**
* productCount
*/
private ProductCountVo productCount;
private ProductCountVo productCount = new ProductCountVo();
/**
* productList
*/
private Page<ContentVo> productList;
private Page<ContentVo> productList = new Page<ContentVo>(new ArrayList<ContentVo>(), 1, 10, 0);
/**
* ProductSumVo
@ -64,7 +65,7 @@ public class DataSummaryProductSaleVo implements Serializable {
/**
* saveAmount
*/
private Object saveAmount;
private BigDecimal saveAmount;
}
/**
@ -92,7 +93,7 @@ public class DataSummaryProductSaleVo implements Serializable {
/**
* saveAmount
*/
private Object saveAmount;
private BigDecimal saveAmount;
}
/**
* ContentVo
@ -123,11 +124,11 @@ public class DataSummaryProductSaleVo implements Serializable {
/**
* productSkuId
*/
private Object productSkuId;
private Long productSkuId;
/**
* productSkuName
*/
private Object productSkuName;
private String productSkuName;
/**
* refAmount
*/
@ -140,11 +141,6 @@ public class DataSummaryProductSaleVo implements Serializable {
* salesAmount
*/
private BigDecimal salesAmount;
/**
* 销售数量
*/

11
cash-common/cash-common-service/src/main/java/com/czg/order/vo/DataSummaryTradeVo.java
View File

@ -6,6 +6,7 @@ import lombok.NoArgsConstructor;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
/**
@ -23,15 +24,15 @@ public class DataSummaryTradeVo implements Serializable {
/**
* sale
*/
private SaleVo sale;
private SaleVo sale = new SaleVo();
/**
* count
*/
private CountVo count;
private CountVo count = new CountVo();
/**
* vip
*/
private VipVo vip;
private VipVo vip = new VipVo();
/**
* SaleVo
@ -66,7 +67,7 @@ public class DataSummaryTradeVo implements Serializable {
/**
* payCount
*/
private List<PayCountVo> payCount;
private List<PayCountVo> payCount = new ArrayList<>();
/**
* 销售退款金额
*/
@ -97,7 +98,7 @@ public class DataSummaryTradeVo implements Serializable {
/**
* saveAmount
*/
private Object saveAmount;
private BigDecimal saveAmount;
}
}

3
cash-common/cash-common-service/src/main/java/com/czg/order/vo/SaleSummaryCountVo.java
View File

@ -5,6 +5,7 @@ import lombok.NoArgsConstructor;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 销量统计汇总
@ -37,5 +38,5 @@ public class SaleSummaryCountVo implements Serializable {
/**
* saveAmount
*/
private Object saveAmount;
private BigDecimal saveAmount;
}

49
cash-common/cash-common-service/src/main/java/com/czg/order/vo/SaleSummaryInfoVo.java
View File

@ -5,7 +5,6 @@ import lombok.NoArgsConstructor;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
/**
* 销量统计明细
@ -48,56 +47,8 @@ public class SaleSummaryInfoVo implements Serializable {
* salesNum
*/
private Integer salesNum;
/**
* skus
*/
private List<SkusVo> skus;
/**
* typeEnum
*/
private String typeEnum;
/**
* SkusVo
*/
@NoArgsConstructor
@Data
public static class SkusVo {
/**
* cateName
*/
private String cateName;
/**
* name
*/
private String name;
/**
* productId
*/
private Integer productId;
/**
* refAmount
*/
private Integer refAmount;
/**
* refNum
*/
private Integer refNum;
/**
* salesAmount
*/
private Integer salesAmount;
/**
* salesNum
*/
private Integer salesNum;
/**
* skus
*/
private List<?> skus;
/**
* typeEnum
*/
private String typeEnum;
}
}

3
cash-common/cash-common-service/src/main/java/com/czg/order/vo/TableSummaryInfoVo.java
View File

@ -19,9 +19,6 @@ public class TableSummaryInfoVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
// 台桌 日期 商品分类 商品名称 单位 商品规格 销量 单价 金额 销售额 总销售额 退单量 退单额
/**
* 台桌
*/

4
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DataSummaryServiceImpl.java
View File

@ -23,7 +23,9 @@ public class DataSummaryServiceImpl implements DataSummaryService {
@Override
public DataSummaryProductSaleVo getProductSaleData(DataSummaryProductSaleParam param) {
return new DataSummaryProductSaleVo();
DataSummaryProductSaleVo data = new DataSummaryProductSaleVo();
System.out.println(1);
return data;
}
@Override