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

Merge branch 'test' into prod

Browse Source 
# Conflicts:
#	cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java
#	cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShareBaseServiceImpl.java
This commit is contained in:
wangw
2026-01-31 16:22:16 +08:00
parent a74e099346 c9a432b786
commit ec1bc6a156
37 changed files with 550 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,10 +8,11 @@ import com.czg.account.vo.HandoverProductListVo;
import com.czg.account.vo.HandoverTotalVo;
import com.czg.annotation.SaAdminCheckPermission;
import com.czg.constants.SystemConstants;
import com.czg.excel.ExcelExportUtil;
import com.czg.log.annotation.OperationLog;
import com.czg.resp.CzgResult;
import com.mybatisflex.core.paginate.Page;
import com.pig4cloud.plugin.excel.annotation.ResponseExcel;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -62,12 +63,12 @@ public class HandoverRecordController {
*
* @param id 交班记录ID
*/
@ResponseExcel(name = "交班售出商品明细")
@GetMapping("/export/{id}")
@OperationLog("交班记录-导出")
@SaAdminCheckPermission(parentName = "交班记录", value = "handoverRecord:export", name = "交班记录-导出")
public List<HandoverProductListVo> export(@PathVariable Long id) {
return handoverRecordService.getHandoverProductListById(id);
public void export(@PathVariable Long id, HttpServletResponse response) {
List<HandoverProductListVo> list = handoverRecordService.getHandoverProductListById(id);
ExcelExportUtil.exportToResponse(list, HandoverProductListVo.class, "交班售出商品明细", response);
}
/**

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

@@ -1,5 +1,6 @@
package com.czg.controller.admin;
import com.czg.excel.ExcelExportUtil;
import com.czg.log.annotation.OperationLog;
import com.czg.order.entity.ShopProdStatistic;
import com.czg.order.param.SaleSummaryCountParam;
@@ -7,8 +8,8 @@ import com.czg.order.service.ShopProdStatisticService;
import com.czg.order.vo.SaleSummaryCountVo;
import com.czg.resp.CzgResult;
import com.czg.sa.StpKit;
import com.pig4cloud.plugin.excel.annotation.ResponseExcel;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
@@ -59,13 +60,12 @@ public class SaleSummaryController {
return CzgResult.success(list);
}
@ResponseExcel(name = "销售统计明细")
@GetMapping("/export")
public List<ShopProdStatistic> summaryExport(SaleSummaryCountParam param) {
public void summaryExport(SaleSummaryCountParam param, HttpServletResponse response) {
if (param.getShopId() == null) {
param.setShopId(StpKit.USER.getShopId());
}
return prodStatisticService.getArchiveTradeData(param);
ExcelExportUtil.exportToResponse(prodStatisticService.getArchiveTradeData(param), ShopProdStatistic.class, "销售统计明细", response);
}
}

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

@@ -1,7 +1,6 @@
package com.czg.controller.admin;
import com.czg.handel.ExcelMergeHandler;
import com.czg.handel.TableRefundCellHandel;
import com.czg.excel.ExcelExportUtil;
import com.czg.log.annotation.OperationLog;
import com.czg.order.entity.ShopTableOrderStatistic;
import com.czg.order.param.DataSummaryTradeParam;
@@ -11,8 +10,8 @@ import com.czg.order.service.TableSummaryService;
import com.czg.order.vo.TableSummaryExportVo;
import com.czg.resp.CzgResult;
import com.czg.sa.StpKit;
import com.pig4cloud.plugin.excel.annotation.ResponseExcel;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -54,15 +53,14 @@ public class TableSummaryController {
/**
* 导出
*/
@ResponseExcel(name = "台桌统计", writeHandler = {ExcelMergeHandler.class, TableRefundCellHandel.class})
@GetMapping("export")
@OperationLog("导出")
//@SaAdminCheckPermission("tableSummary:export")
public List<TableSummaryExportVo> summaryExport(TableSummaryParam param) {
public void summaryExport(TableSummaryParam param, HttpServletResponse response) {
if (param.getShopId() == null) {
param.setShopId(StpKit.USER.getShopId());
}
return tableSummaryService.summaryExportList(param);
tableSummaryService.summaryExportList(param, response);
}
}

151
cash-api/order-server/src/main/java/com/czg/handel/ExcelMergeHandler.java
View File

@@ -1,151 +0,0 @@
package com.czg.handel;
import cn.idev.excel.metadata.Head;
import cn.idev.excel.metadata.data.WriteCellData;
import cn.idev.excel.write.handler.CellWriteHandler;
import cn.idev.excel.write.metadata.holder.WriteSheetHolder;
import cn.idev.excel.write.metadata.holder.WriteTableHolder;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.util.CellRangeAddress;
import java.util.List;
/**
* @author tankaikai
* @since 2025-04-01 18:41
*/
public class ExcelMergeHandler implements CellWriteHandler {
// 要合并的列索引数组
private int[] mergeColumnIndex = {0, 1, 2, 3, 8, 9};
// 合并开始的行索引
private int mergeRowIndex = 1;
public ExcelMergeHandler() {
}
/**
* 构造函数
*
* @param mergeRowIndex 合并开始的行索引
* @param mergeColumnIndex 要合并的列索引数组
*/
public ExcelMergeHandler(int mergeRowIndex, int[] mergeColumnIndex) {
this.mergeRowIndex = mergeRowIndex;
this.mergeColumnIndex = mergeColumnIndex;
}
@Override
public void afterCellDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, List<WriteCellData<?>> cellDataList, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) {
// 当前行索引
int curRowIndex = cell.getRowIndex();
// 当前列索引
int curColIndex = cell.getColumnIndex();
// 如果当前行大于合并开始行且当前列在需要合并的列中
if (curRowIndex > mergeRowIndex && isMergeColumn(curColIndex)) {
// 进行合并操作
mergeWithPrevRow(writeSheetHolder, cell, curRowIndex, curColIndex);
}
}
/**
* 检查当前列是否在需要合并的列中
*
* @param curColIndex 当前列索引
* @return 如果是需要合并的列返回true，否则返回false
*/
private boolean isMergeColumn(int curColIndex) {
for (int columnIndex : mergeColumnIndex) {
if (curColIndex == columnIndex) {
return true;
}
}
return false;
}
/**
* 当前单元格向上合并
*
* @param writeSheetHolder 当前工作表持有者
* @param cell 当前单元格
* @param curRowIndex 当前行索引
* @param curColIndex 当前列索引
*/
private void mergeWithPrevRow(WriteSheetHolder writeSheetHolder, Cell cell, int curRowIndex, int curColIndex) {
// 获取当前单元格的数据
Object curData = getCellData(cell);
// 获取前一个单元格的数据
Cell preCell = cell.getSheet().getRow(curRowIndex - 1).getCell(curColIndex);
Object preData = getCellData(preCell);
// 判断当前单元格和前一个单元格的数据以及主键是否相同
if (curData.equals(preData) && isSamePrimaryKey(cell, curRowIndex)) {
// 获取工作表
Sheet sheet = writeSheetHolder.getSheet();
// 合并单元格
mergeCells(sheet, curRowIndex, curColIndex);
CellStyle style = preCell.getCellStyle();
// 设置水平居中
style.setAlignment(HorizontalAlignment.CENTER);
// 设置垂直居中
style.setVerticalAlignment(VerticalAlignment.CENTER);
preCell.setCellStyle(style);
}
}
/**
* 获取单元格的数据
*
* @param cell 单元格
* @return 单元格数据
*/
private Object getCellData(Cell cell) {
return cell.getCellType() == CellType.STRING ? cell.getStringCellValue() : cell.getNumericCellValue();
}
/**
* 判断当前单元格和前一个单元格的主键是否相同
*
* @param cell 当前单元格
* @param curRowIndex 当前行索引
* @return 如果主键相同返回true，否则返回false
*/
private boolean isSamePrimaryKey(Cell cell, int curRowIndex) {
String currentPrimaryKey = cell.getRow().getCell(0).getStringCellValue();
String previousPrimaryKey = cell.getSheet().getRow(curRowIndex - 1).getCell(0).getStringCellValue();
return currentPrimaryKey.equals(previousPrimaryKey);
}
/**
* 合并单元格
*
* @param sheet 工作表
* @param curRowIndex 当前行索引
* @param curColIndex 当前列索引
*/
private void mergeCells(Sheet sheet, int curRowIndex, int curColIndex) {
// 获取已合并的区域
List<CellRangeAddress> mergeRegions = sheet.getMergedRegions();
boolean isMerged = false;
// 检查前一个单元格是否已经被合并
for (int i = 0; i < mergeRegions.size() && !isMerged; i++) {
CellRangeAddress cellRangeAddr = mergeRegions.get(i);
if (cellRangeAddr.isInRange(curRowIndex - 1, curColIndex)) {
sheet.removeMergedRegion(i);
cellRangeAddr.setLastRow(curRowIndex);
sheet.addMergedRegion(cellRangeAddr);
isMerged = true;
}
}
// 如果前一个单元格未被合并，则新增合并区域
if (!isMerged) {
CellRangeAddress cellRangeAddress = new CellRangeAddress(curRowIndex - 1, curRowIndex, curColIndex, curColIndex);
sheet.addMergedRegion(cellRangeAddress);
}
}
}

55
cash-api/order-server/src/main/java/com/czg/handel/TableRefundCellHandel.java
View File

@@ -1,55 +0,0 @@
package com.czg.handel;
import cn.hutool.core.util.ArrayUtil;
import cn.idev.excel.metadata.Head;
import cn.idev.excel.metadata.data.WriteCellData;
import cn.idev.excel.write.handler.CellWriteHandler;
import cn.idev.excel.write.metadata.holder.WriteSheetHolder;
import cn.idev.excel.write.metadata.holder.WriteTableHolder;
import org.apache.poi.ss.usermodel.*;
import java.util.List;
/**
* 台桌统计退单单元格处理器
*
* @author tankaikai
* @since 2025-04-02 09:50
*/
public class TableRefundCellHandel implements CellWriteHandler {
// 要处理的列索引数组
private int[] yellowColumnIndex = {10, 11};
public TableRefundCellHandel() {
}
@Override
public void afterCellDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, List<WriteCellData<?>> cellDataList, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) {
// 当前行索引
int curRowIndex = cell.getRowIndex();
// 当前列索引
int curColIndex = cell.getColumnIndex();
if (curRowIndex == 0) {
return;
}
// 如果是指定要处理的列，则要进行加黄操作
if (ArrayUtil.contains(yellowColumnIndex, curColIndex)) {
Cell preCell = cell.getSheet().getRow(curRowIndex - 1).getCell(curColIndex);
if (preCell.getCellType() == CellType.NUMERIC) {
if (preCell.getNumericCellValue() < 0) {
//System.out.println("设置黄色背景：" + curRowIndex + "行，" + curColIndex + "列" + preCell.getNumericCellValue());
CellStyle style = preCell.getSheet().getWorkbook().createCellStyle();
style.cloneStyleFrom(preCell.getCellStyle());
style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
style.setFillForegroundColor(IndexedColors.YELLOW.getIndex());
// 设置水平居中
style.setAlignment(HorizontalAlignment.CENTER);
// 设置垂直居中
style.setVerticalAlignment(VerticalAlignment.CENTER);
preCell.setCellStyle(style);
}
}
}
}
}

13
cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java
View File

@@ -14,7 +14,6 @@ import com.czg.service.order.service.ShopDirectMerchantService;
import com.mybatisflex.core.query.QueryWrapper;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.util.List;
@@ -32,13 +31,15 @@ public class EntryManagerTask {
@Resource
private ShopMerchantService shopMerchantService;
// TODO 暂时不用原生进件，使用第三方进件
//每10分钟查一次
@Scheduled(cron = "0 0/10 * * * ? ")
// @Scheduled(cron = "0 0/10 * * * ? ")
public void run() {
log.info("进件查询，定时任务执行");
long start = System.currentTimeMillis();
entryManager(null);
log.info("进件查询，定时任务执行完毕，耗时:{}ms", System.currentTimeMillis() - start);
// log.info("进件查询，定时任务执行");
// long start = System.currentTimeMillis();
// entryManager(null);
// log.info("进件查询，定时任务执行完毕，耗时:{}ms", System.currentTimeMillis() - start);
}
/**

4
cash-api/pom.xml
View File

@@ -52,10 +52,6 @@
<artifactId>cash-common-service</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.pig4cloud.excel</groupId>
<artifactId>excel-spring-boot-starter</artifactId>
</dependency>
</dependencies>
<build>

35
cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdCategoryController.java
View File

@@ -13,6 +13,7 @@ import com.czg.validator.group.InsertGroup;
import com.czg.validator.group.UpdateGroup;
import com.mybatisflex.core.paginate.Page;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -36,14 +37,19 @@ public class ShopProdCategoryController {
@Resource
private ShopSyncService shopSyncService;
/**
* 分页
*/
@GetMapping("page")
@OperationLog("商品分类-分页")
//@SaAdminCheckPermission("shopProdCategory:page")
public CzgResult<Page<ShopProdCategoryDTO>> getShopProdCategoryPage(ShopProdCategoryDTO param) {
Page<ShopProdCategoryDTO> data = shopProdCategoryService.getShopProdCategoryPage(param);
return CzgResult.success(data);
}
/**
* 列表
*/
@GetMapping("list")
@OperationLog("商品分类-列表")
//@SaAdminCheckPermission("shopProdCategory:list")
@@ -52,6 +58,18 @@ public class ShopProdCategoryController {
return CzgResult.success(data);
}
/**
* 导出
*/
@GetMapping("/export")
@OperationLog("商品分类-导出")
public void exportShopProdCategory(ShopProdCategoryDTO param, HttpServletResponse response) {
shopProdCategoryService.exportShopProdCategory(param, response);
}
/**
* 详情
*/
@GetMapping("{id}")
@OperationLog("商品分类-详情")
//@SaAdminCheckPermission("shopProdCategory:info")
@@ -61,6 +79,9 @@ public class ShopProdCategoryController {
return CzgResult.success(data);
}
/**
* 新增
*/
@PostMapping
@OperationLog("商品分类-新增")
//@SaAdminCheckPermission("shopProdCategory:add")
@@ -70,6 +91,9 @@ public class ShopProdCategoryController {
return CzgResult.success();
}
/**
* 修改
*/
@PutMapping
@OperationLog("商品分类-修改")
//@SaAdminCheckPermission("shopProdCategory:update")
@@ -79,6 +103,9 @@ public class ShopProdCategoryController {
return CzgResult.success();
}
/**
* 删除
*/
@DeleteMapping("{id}")
@OperationLog("商品分类-删除")
//@SaAdminCheckPermission("shopProdCategory:delete")
@@ -89,6 +116,9 @@ public class ShopProdCategoryController {
return CzgResult.success();
}
/**
* 禁用
*/
@PostMapping("disable/{id}")
@OperationLog("商品分类-禁用")
//@SaAdminCheckPermission("shopProdCategory:able")
@@ -100,6 +130,9 @@ public class ShopProdCategoryController {
return CzgResult.success();
}
/**
* 启用
*/
@PostMapping("enable/{id}")
@OperationLog("商品分类-启用")
//@SaAdminCheckPermission("shopProdCategory:able")

37
cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdUnitController.java
View File

@@ -13,6 +13,7 @@ import com.czg.validator.group.InsertGroup;
import com.czg.validator.group.UpdateGroup;
import com.mybatisflex.core.paginate.Page;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -21,7 +22,7 @@ import java.util.List;
/**
* 商品单位
* 管理端/商品单位
*
* @author Tankaikai tankaikai@aliyun.com
* @since 1.0 2025-02-10
@@ -36,7 +37,9 @@ public class ShopProdUnitController {
@Resource
private ShopSyncService shopSyncService;
/**
* 分页
*/
@GetMapping("page")
@OperationLog("商品单位-分页")
//@SaAdminCheckPermission("shopProdUnit:page")
@@ -45,6 +48,9 @@ public class ShopProdUnitController {
return CzgResult.success(data);
}
/**
* 列表
*/
@GetMapping("list")
@OperationLog("商品单位-列表")
//@SaAdminCheckPermission("shopProdUnit:list")
@@ -53,6 +59,18 @@ public class ShopProdUnitController {
return CzgResult.success(data);
}
/**
* 导出
*/
@GetMapping("/export")
@OperationLog("商品单位-导出")
public void exportProduct(ShopProdUnitDTO param, HttpServletResponse response) {
shopProdUnitService.exportShopProdUnit(param, response);
}
/**
* 详情
*/
@GetMapping("{id}")
@OperationLog("商品单位-详情")
//@SaAdminCheckPermission("shopProdUnit:info")
@@ -62,6 +80,9 @@ public class ShopProdUnitController {
return CzgResult.success(data);
}
/**
* 新增
*/
@PostMapping
@OperationLog("商品单位-新增")
//@SaAdminCheckPermission("shopProdUnit:add")
@@ -71,6 +92,9 @@ public class ShopProdUnitController {
return CzgResult.success();
}
/**
* 修改
*/
@PutMapping
@OperationLog("商品单位-修改")
//@SaAdminCheckPermission("shopProdUnit:update")
@@ -80,6 +104,9 @@ public class ShopProdUnitController {
return CzgResult.success();
}
/**
* 删除
*/
@DeleteMapping("{id}")
@OperationLog("商品单位-删除")
//@SaAdminCheckPermission("shopProdUnit:delete")
@@ -90,6 +117,9 @@ public class ShopProdUnitController {
return CzgResult.success();
}
/**
* 禁用
*/
@PostMapping("disable/{id}")
@OperationLog("商品单位-禁用")
//@SaAdminCheckPermission("shopProdUnit:able")
@@ -101,6 +131,9 @@ public class ShopProdUnitController {
return CzgResult.success();
}
/**
* 启用
*/
@PostMapping("enable/{id}")
@OperationLog("商品单位-启用")
//@SaAdminCheckPermission("shopProdUnit:able")

5
cash-common/cash-common-service/pom.xml
View File

@@ -30,10 +30,7 @@
<groupId>com.mybatis-flex</groupId>
<artifactId>mybatis-flex-processor</artifactId>
</dependency>
<dependency>
<groupId>com.pig4cloud.excel</groupId>
<artifactId>excel-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>

2
cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoEditDTO.java
View File

@@ -11,7 +11,7 @@ import java.math.BigDecimal;
@Data
public class ShopInfoEditDTO {
@NotNull(message = "id不为空")
private Integer id;
private Long id;
private String code;

19
cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java
View File

@@ -1,6 +1,5 @@
package com.czg.account.entity;
import com.alibaba.fastjson2.annotation.JSONField;
import com.czg.utils.CzgRandomUtils;
import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id;
@@ -152,22 +151,6 @@ public class ShopUser implements Serializable {
private LocalDateTime nextDeliverTime;
// 是否分销员
private String distributionShops;
/**
* 上级分销员id
*/
private Long parentUserId;
/**
* 上上级分销员id
*/
private Long gradeUserId;
/**
* 一级分销收入
*/
private BigDecimal oneIncome;
/**
* 二级分销收入
*/
private BigDecimal twoIncome;
private String memberCircleName;
private Integer memberCircleReward;
@@ -179,8 +162,6 @@ public class ShopUser implements Serializable {
private Integer discount;
@Column(ignore = true)
private Integer isMemberPrice;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime inviteTime;
/**
* 添加或更新分销店铺：若shopId已存在（无论后缀），则替换为新的id_后缀；否则插入

8
cash-common/cash-common-service/src/main/java/com/czg/account/vo/HandoverProductListVo.java
View File

@@ -1,10 +1,9 @@
package com.czg.account.vo;
import cn.idev.excel.annotation.ExcelIgnore;
import cn.idev.excel.annotation.ExcelProperty;
import cn.idev.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.fastjson2.annotation.JSONField;
import com.pig4cloud.plugin.excel.annotation.ExcelLine;
import lombok.Data;
import java.io.Serial;
@@ -26,7 +25,6 @@ public class HandoverProductListVo implements Serializable {
/**
* 导入时候回显行号
*/
@ExcelLine
@ExcelIgnore
@JSONField(serialize = false)
private Long lineNum;

75
cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionInvite.java Normal file
View File

@@ -0,0 +1,75 @@
package com.czg.market.entity;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.KeyType;
import com.mybatisflex.annotation.Table;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.io.Serial;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 全民股东邀请关系 实体类。
*
* @author ww
* @since 2026-01-31
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table("mk_distribution_invite")
public class MkDistributionInvite implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@Id(keyType = KeyType.Auto)
private Long id;
/**
* 店铺Id
*/
private Long shopId;
/**
* 用户Id
*/
private Long userId;
/**
* 用户Id
*/
private Long shopUserId;
/**
* 邀请人ID mk_distribution_user.id
*/
private Long parentUserId;
/**
* 邀请人上级ID mk_distribution_user.id
*/
private Long gradeUserId;
/**
* 一级分润
*/
private BigDecimal oneIncome;
/**
* 二级分润
*/
private BigDecimal twoIncome;
/**
* 邀请时间
*/
private LocalDateTime inviteTime;
}

15
cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionInviteService.java Normal file
View File

@@ -0,0 +1,15 @@
package com.czg.market.service;
import com.mybatisflex.core.service.IService;
import com.czg.market.entity.MkDistributionInvite;
/**
* 全民股东邀请关系 服务层。
*
* @author ww
* @since 2026-01-31
*/
public interface MkDistributionInviteService extends IService<MkDistributionInvite> {
MkDistributionInvite getByShopIdAndShopUserId(Long shopId, Long shopUserId);
}

18
cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopProdStatistic.java
View File

@@ -1,8 +1,8 @@
package com.czg.order.entity;
import cn.idev.excel.annotation.ExcelIgnore;
import cn.idev.excel.annotation.ExcelProperty;
import cn.idev.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.KeyType;
@@ -59,42 +59,42 @@ public class ShopProdStatistic implements Serializable {
* 销售数量
*/
@ExcelProperty("销量")
@ColumnWidth(5)
@ColumnWidth(15)
private BigDecimal saleCount;
/**
* 销售金额
*/
@ExcelProperty("销售金额")
@ColumnWidth(7)
@ColumnWidth(15)
private BigDecimal saleAmount;
/**
* 退单量
*/
@ExcelProperty("退单量")
@ColumnWidth(5)
@ColumnWidth(15)
private BigDecimal refundCount;
/**
* 退单金额
*/
@ExcelProperty("退款金额")
@ColumnWidth(7)
@ColumnWidth(15)
private BigDecimal refundAmount;
/**
* 实际销售数量（过滤掉退单后的数量）
*/
@ExcelProperty("实际销量")
@ColumnWidth(5)
@ColumnWidth(15)
private BigDecimal validSaleCount;
/**
* 实际销售金额（过滤掉退单后的金额）
*/
@ExcelProperty("实际销售额")
@ColumnWidth(7)
@ColumnWidth(15)
private BigDecimal validSaleAmount;
/**

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

@@ -2,6 +2,7 @@ package com.czg.order.service;
import com.czg.order.param.TableSummaryParam;
import com.czg.order.vo.TableSummaryExportVo;
import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
@@ -14,7 +15,7 @@ import java.util.List;
public interface TableSummaryService {
List<TableSummaryExportVo> summaryExportList(TableSummaryParam param);
void summaryExportList(TableSummaryParam param, HttpServletResponse response);
}

24
cash-common/cash-common-service/src/main/java/com/czg/order/vo/TableSummaryExportVo.java
View File

@@ -1,10 +1,9 @@
package com.czg.order.vo;
import cn.idev.excel.annotation.ExcelIgnore;
import cn.idev.excel.annotation.ExcelProperty;
import cn.idev.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.fastjson2.annotation.JSONField;
import com.pig4cloud.plugin.excel.annotation.ExcelLine;
import lombok.Data;
import java.io.Serial;
@@ -25,7 +24,6 @@ public class TableSummaryExportVo implements Serializable {
/**
* 导入时候回显行号
*/
@ExcelLine
@ExcelIgnore
@JSONField(serialize = false)
private Long lineNum;
@@ -36,18 +34,20 @@ public class TableSummaryExportVo implements Serializable {
private String tableConcatDate;
@ExcelIgnore
private String tableCode;
/**
* 台桌
*/
@ExcelProperty("台桌")
@ColumnWidth(10)
private String tableName;
/**
* 日期
*/
@ExcelProperty("日期")
@ColumnWidth(10)
@ColumnWidth(15)
private String createDate;
/**
* 台桌
*/
@ExcelProperty("台桌")
@ColumnWidth(13)
private String tableName;
/**
* 商品分类
*/

20
cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProductCategoryExportDTO.java Normal file
View File

@@ -0,0 +1,20 @@
package com.czg.product.dto;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
/**
* @author yjjie
* @date 2026/1/30 18:15
*/
@Data
public class ProductCategoryExportDTO {
@ExcelProperty("分类名称")
private String name;
@ExcelProperty("简称")
private String shortName;
}

40
cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProductUnitExportDTO.java Normal file
View File

@@ -0,0 +1,40 @@
package com.czg.product.dto;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
/**
* 商品单位导出
* @author yjjie
* @date 2026/1/30 17:51
*/
@Data
public class ProductUnitExportDTO {
@ExcelProperty("单位名称")
private String name;
/**
* 单位类型 number-计数 weight-记重
*/
@ExcelIgnore
private String unitType;
@ExcelProperty("单位类型")
private String unitTypeRemark;
/**
* 单位来源 1-系统预设 0-商家创建
*/
@ExcelIgnore
private Integer isSystem;
@ExcelProperty("单位来源")
private String isSystemRemark;
public String getUnitTypeRemark() {
return "number".equals(unitType) ? "计数" : "记重";
}
public String getIsSystemRemark() {
return isSystem == 1 ? "系统预设" : "商家创建";
}
}

3
cash-common/cash-common-service/src/main/java/com/czg/product/service/ShopProdCategoryService.java
View File

@@ -4,6 +4,7 @@ import com.czg.product.dto.ShopProdCategoryDTO;
import com.czg.product.entity.ShopProdCategory;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.service.IService;
import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
@@ -30,6 +31,8 @@ public interface ShopProdCategoryService extends IService<ShopProdCategory> {
*/
List<ShopProdCategoryDTO> getShopProdCategoryList(ShopProdCategoryDTO param);
void exportShopProdCategory(ShopProdCategoryDTO param, HttpServletResponse response);
/**
* 获取店铺商品分类详情
* @param id id

3
cash-common/cash-common-service/src/main/java/com/czg/product/service/ShopProdUnitService.java
View File

@@ -4,6 +4,7 @@ import com.czg.product.dto.ShopProdUnitDTO;
import com.czg.product.entity.ShopProdUnit;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.service.IService;
import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
@@ -31,6 +32,8 @@ public interface ShopProdUnitService extends IService<ShopProdUnit> {
*/
List<ShopProdUnitDTO> getShopProdUnitList(ShopProdUnitDTO param);
void exportShopProdUnit(ShopProdUnitDTO param, HttpServletResponse response);
/**
* 获取商品单位详情
*

60
cash-common/cash-common-tools/src/main/java/com/czg/excel/ExcelExportUtil.java
View File

@@ -8,6 +8,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.write.builder.ExcelWriterBuilder;
import com.alibaba.excel.write.builder.ExcelWriterSheetBuilder;
import com.alibaba.excel.write.handler.SheetWriteHandler;
import com.alibaba.excel.write.merge.OnceAbsoluteMergeStrategy;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.metadata.style.WriteCellStyle;
import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
@@ -26,6 +27,7 @@ import java.util.List;
/**
* EasyExcel导出工具类
*
* @author yjjie
* @date 2026/1/28 10:48
*/
@@ -34,14 +36,18 @@ public class ExcelExportUtil {
private static final ExcelExportConfig DEFAULT_CONFIG = new ExcelExportConfig();
public static OnceAbsoluteMergeStrategy createMergeStrategy(int firstRow, int lastRow, int firstCol, int lastCol) {
return new OnceAbsoluteMergeStrategy(firstRow, lastRow, firstCol, lastCol);
}
/**
* 导出Excel到HttpServletResponse
*
* @param data 数据列表
* @param clazz 数据类型
* @param data 数据列表
* @param clazz 数据类型
* @param fileName 文件名（不含扩展名）
* @param response HttpServletResponse
* @param <T> 数据类型
* @param <T> 数据类型
*/
public static <T> void exportToResponse(List<T> data, Class<T> clazz,
String fileName, HttpServletResponse response) {
@@ -51,12 +57,12 @@ public class ExcelExportUtil {
/**
* 导出Excel到HttpServletResponse（自定义配置）
*
* @param data 数据列表
* @param clazz 数据类型
* @param data 数据列表
* @param clazz 数据类型
* @param fileName 文件名（不含扩展名）
* @param config 配置信息
* @param config 配置信息
* @param response HttpServletResponse
* @param <T> 数据类型
* @param <T> 数据类型
*/
public static <T> void exportToResponse(List<T> data, Class<T> clazz,
String fileName, ExcelExportConfig config,
@@ -86,10 +92,10 @@ public class ExcelExportUtil {
/**
* 导出Excel到文件
*
* @param data 数据列表
* @param clazz 数据类型
* @param data 数据列表
* @param clazz 数据类型
* @param filePath 文件路径
* @param <T> 数据类型
* @param <T> 数据类型
*/
public static <T> void exportToFile(List<T> data, Class<T> clazz, String filePath) {
exportToFile(data, clazz, filePath, DEFAULT_CONFIG);
@@ -98,11 +104,11 @@ public class ExcelExportUtil {
/**
* 导出Excel到文件（自定义配置）
*
* @param data 数据列表
* @param clazz 数据类型
* @param data 数据列表
* @param clazz 数据类型
* @param filePath 文件路径
* @param config 配置信息
* @param <T> 数据类型
* @param config 配置信息
* @param <T> 数据类型
*/
public static <T> void exportToFile(List<T> data, Class<T> clazz,
String filePath, ExcelExportConfig config) {
@@ -124,11 +130,11 @@ public class ExcelExportUtil {
/**
* 带样式的Excel导出到Response
*
* @param data 数据列表
* @param clazz 数据类型
* @param data 数据列表
* @param clazz 数据类型
* @param fileName 文件名
* @param response HttpServletResponse
* @param <T> 数据类型
* @param <T> 数据类型
*/
public static <T> void exportWithStyleToResponse(List<T> data, Class<T> clazz,
String fileName, HttpServletResponse response) {
@@ -162,11 +168,11 @@ public class ExcelExportUtil {
* 大数据量分批导出（避免内存溢出）
*
* @param dataSupplier 数据提供者（分页获取数据）
* @param clazz 数据类型
* @param fileName 文件名
* @param response HttpServletResponse
* @param batchSize 每批大小
* @param <T> 数据类型
* @param clazz 数据类型
* @param fileName 文件名
* @param response HttpServletResponse
* @param batchSize 每批大小
* @param <T> 数据类型
*/
public static <T> void exportBigDataToResponse(DataSupplier<T> dataSupplier,
Class<T> clazz, String fileName,
@@ -254,13 +260,13 @@ public class ExcelExportUtil {
* 带合并单元格的导出到Response
* 多sheet导出到response
*
* @param sheetDataList 数据列表
* @param fileName 文件名
* @param response HttpServletResponse
* @param sheetDataList 数据列表
* @param fileName 文件名
* @param response HttpServletResponse
*/
public static void exportMultipleSheetsToResponse(List<SheetData> sheetDataList,
String fileName,
HttpServletResponse response) {
String fileName,
HttpServletResponse response) {
if (CollectionUtil.isEmpty(sheetDataList)) {
throw new CzgException("数据列表不能为空");
}

7
cash-dependencies/pom.xml
View File

@@ -250,13 +250,6 @@
<artifactId>spring-data-redis</artifactId>
<version>${spring-data-redis.version}</version>
</dependency>
<!-- excel 导入导出工具类：https://github.com/pig-mesh/excel-spring-boot-starter -->
<!-- 参考文档：https://www.yuque.com/pig4cloud/excel -->
<dependency>
<groupId>com.pig4cloud.excel</groupId>
<artifactId>excel-spring-boot-starter</artifactId>
<version>3.4.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/io.netty/netty-all -->
<dependency>

4
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/GeoServiceImpl.java
View File

@@ -1,11 +1,11 @@
package com.czg.service.account.service.impl;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson2.JSONObject;
import com.czg.account.service.GeoService;
import com.czg.exception.CzgException;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestClient;
@@ -49,7 +49,7 @@ public class GeoServiceImpl implements GeoService {
param.put("key", "7a7f2e4790ea222660a027352ee3af39");
param.put("keywords", keywords);
param.put("subdistrict", "1");
if (StringUtils.isNotBlank(subdistrict)) {
if (StrUtil.isNotBlank(subdistrict)) {
param.put("subdistrict", "2");
}
param.put("extensions", "base");

2
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java
View File

@@ -459,7 +459,7 @@ public class ShopInfoServiceImpl extends ServiceImpl<ShopInfoMapper, ShopInfo> i
@Override
public BigDecimal updateAmount(Long id, BigDecimal amount) {
ShopInfo shopInfo = getShopInfo(id);
if (shopInfo.getAmount() == null || shopInfo.getAmount().compareTo(BigDecimal.ZERO) <= 0) {
if (shopInfo.getAmount().add(amount).compareTo(BigDecimal.ZERO) < 0) {
throw new CzgException("更新失败");
}
boolean flag = mapper.updateAmount(id, amount);

16
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopSongServiceImpl.java
View File

@@ -7,13 +7,13 @@ import com.czg.config.RedisCst;
import com.czg.exception.CzgException;
import com.czg.sa.StpKit;
import com.czg.service.RedisService;
import com.czg.utils.CzgRandomUtils;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.czg.account.entity.ShopSong;
import com.czg.account.service.ShopSongService;
import com.czg.service.account.mapper.ShopSongMapper;
import jakarta.annotation.Resource;
import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.stereotype.Service;
/**
@@ -23,7 +23,7 @@ import org.springframework.stereotype.Service;
* @since 2025-03-01
*/
@Service
public class ShopSongServiceImpl extends ServiceImpl<ShopSongMapper, ShopSong> implements ShopSongService{
public class ShopSongServiceImpl extends ServiceImpl<ShopSongMapper, ShopSong> implements ShopSongService {
@Resource
private RedisService redisService;
@@ -49,18 +49,12 @@ public class ShopSongServiceImpl extends ServiceImpl<ShopSongMapper, ShopSong> i
public String getSongUrl(Long shopId) {
String code;
String key = RedisCst.getSongUrlKey(shopId);
if(redisService.hasKey(key)){
if (redisService.hasKey(key)) {
code = (String) redisService.get(key);
}else {
code = RandomStringUtils.randomAlphanumeric(12);
} else {
code = CzgRandomUtils.randomString(12);
redisService.set(key, code);
}
return code;
}
public static void main(String[] args) {
String string = RandomStringUtils.randomAlphanumeric(12);
System.out.println(string);
}
}

22
cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml
View File

@@ -18,7 +18,7 @@
and amount - #{money} >= 0
</update>
<update id="updateOneOrTwoAmount">
update tb_shop_user
update mk_distribution_invite
<set>
<if test="isOne != null and isOne == 1">
one_income = one_income + #{amount}
@@ -27,7 +27,7 @@
two_income = two_income + #{amount}
</if>
</set>
where id = #{shopUserId}
where shop_user_id = #{shopUserId} and shop_id = #{shopId}
</update>
@@ -256,10 +256,10 @@
</select>
<select id="getInviteUser" resultType="com.czg.market.vo.InviteUserVO">
SELECT
invite.id AS shopUserId,
invite.head_img AS headImg,
invite.nick_name AS shopUserName,
invite.phone AS shopUserPhone,
u.id AS shopUserId,
u.head_img AS headImg,
u.nick_name AS shopUserName,
u.phone AS shopUserPhone,
invite.one_income AS oneIncome,
invite.invite_time AS inviteTime,
dist.total_income AS totalIncome,
@@ -269,12 +269,14 @@
dist.status AS status,
dist.distribution_level_id AS levelId,
dist.distribution_level_name AS levelName,
invite.distribution_shops AS distributionShops
FROM tb_shop_user invite
left join mk_distribution_user dist on invite.id = dist.id and dist.shop_id = #{shopId}
WHERE invite.`parent_user_id` = #{distributionUserId}
u.distribution_shops AS distributionShops
FROM mk_distribution_invite invite
left join tb_shop_user u on invite.shop_user_id = u.id
left join mk_distribution_user dist on invite.shop_user_id = dist.id
WHERE invite.`parent_user_id` = #{distributionUserId} and invite.shop_id = #{shopId}
<if test="distributionLevelId != null">and dist.distribution_level_id = #{distributionLevelId}</if>
<if test="shopUserId != null">and invite.id = #{shopUserId}</if>
GROUP BY invite.id
ORDER BY invite.`invite_time` DESC
</select>
</mapper>

14
cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkDistributionInviteMapper.java Normal file
View File

@@ -0,0 +1,14 @@
package com.czg.service.market.mapper;
import com.mybatisflex.core.BaseMapper;
import com.czg.market.entity.MkDistributionInvite;
/**
* 全民股东邀请关系 映射层。
*
* @author ww
* @since 2026-01-31
*/
public interface MkDistributionInviteMapper extends BaseMapper<MkDistributionInvite> {
}

22
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionInviteServiceImpl.java Normal file
View File

@@ -0,0 +1,22 @@
package com.czg.service.market.service.impl;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.czg.market.entity.MkDistributionInvite;
import com.czg.market.service.MkDistributionInviteService;
import com.czg.service.market.mapper.MkDistributionInviteMapper;
import org.springframework.stereotype.Service;
/**
* 全民股东邀请关系 服务层实现。
*
* @author ww
* @since 2026-01-31
*/
@Service
public class MkDistributionInviteServiceImpl extends ServiceImpl<MkDistributionInviteMapper, MkDistributionInvite> implements MkDistributionInviteService{
@Override
public MkDistributionInvite getByShopIdAndShopUserId(Long shopId, Long shopUserId) {
return getOne(query().eq(MkDistributionInvite::getShopId, shopId).eq(MkDistributionInvite::getShopUserId, shopUserId));
}
}

109
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java
View File

@@ -76,6 +76,8 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
@Resource
private MkDistributionDeliverService distributionDeliverService;
@Resource
private MkDistributionInviteService distributionInviteService;
@Resource
private AppWxServiceImpl appWxService;
@DubboReference
private ShopUserService shopUserService;
@@ -148,9 +150,9 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
AssertUtil.isNull(shopUser, "店铺用户不存在");
UserInfo userInfo = userInfoService.getById(shopUser.getUserId());
result.put("cashOutAmount", userInfo.getDistributionAmount() == null ? 0.0 : userInfo.getDistributionAmount());
if (shopUser.getParentUserId() != null) {
MkDistributionUser mkDistributionUser = getMkDistributionUserByIdAndShopId(shopUser.getParentUserId(), shopId);
MkDistributionInvite invite = distributionInviteService.getByShopIdAndShopUserId(shopId, shopUser.getId());
if (invite != null && invite.getParentUserId() != null) {
MkDistributionUser mkDistributionUser = getMkDistributionUserByIdAndShopId(invite.getParentUserId(), shopId);
AssertUtil.isNull(mkDistributionUser, "上级分销员不存在");
ShopUser shopUserParent = shopUserService.getById(mkDistributionUser.getId());
result.put("parentName", shopUserParent.getNickName());
@@ -234,8 +236,9 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
public void bindInviteUser(MkDistributionUserDTO param) throws CzgException, ValidateException {
ShopUser shopUser = shopUserService.getById(param.getId());
AssertUtil.isNull(shopUser, "店铺用户不存在");
if (shopUser.getParentUserId() != null) {
throw new CzgException("店铺用户已绑定分销员");
MkDistributionInvite shopUserInvite = distributionInviteService.getByShopIdAndShopUserId(param.getShopId(), shopUser.getId());
if (shopUserInvite != null && shopUserInvite.getParentUserId() != null) {
throw new CzgException("店铺用户已存在上级");
}
MkDistributionUser parent = getOne(QueryWrapper.create().eq(MkDistributionUser::getInviteCode, param.getInviteCode()));
AssertUtil.isNull(parent, "邀请人不存在");
@@ -250,28 +253,28 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
}
ShopUser parentShopUser = shopUserService.getById(parent.getId());
AssertUtil.isNull(parentShopUser, "邀请人不存在");
MkDistributionInvite parentShopUserInvite = distributionInviteService.getByShopIdAndShopUserId(param.getShopId(), parentShopUser.getId());
if (parentShopUserInvite != null && parentShopUserInvite.getParentUserId() != null && parentShopUserInvite.getParentUserId().equals(shopUser.getId())) {
throw new CzgException("存在绑定关系，不可绑定");
}
if (parentShopUserInvite != null && parentShopUserInvite.getGradeUserId() != null && parentShopUserInvite.getGradeUserId().equals(shopUser.getId())) {
throw new CzgException("存在绑定关系，不可绑定");
}
if (parentShopUser.getParentUserId() != null && parentShopUser.getParentUserId().equals(shopUser.getId())) {
throw new CzgException("存在绑定关系，不可绑定");
}
if (parentShopUser.getGradeUserId() != null && parentShopUser.getGradeUserId().equals(shopUser.getId())) {
throw new CzgException("存在绑定关系，不可绑定");
}
//更新自己的上级
shopUser.setParentUserId(parentShopUser.getId());
shopUser.setGradeUserId(parentShopUser.getParentUserId());
ShopUser upShopUser1 = new ShopUser();
upShopUser1.setParentUserId(parentShopUser.getId());
upShopUser1.setGradeUserId(parentShopUser.getParentUserId());
upShopUser1.setInviteTime(LocalDateTime.now());
shopUserService.update(upShopUser1, QueryWrapper.create().eq(ShopUser::getId, shopUser.getId()));
if (shopUser.getParentUserId() != null) {
MkDistributionInvite newShopUserInvite = new MkDistributionInvite();
newShopUserInvite.setShopId(param.getShopId());
newShopUserInvite.setUserId(shopUser.getUserId());
newShopUserInvite.setShopUserId(shopUser.getId());
newShopUserInvite.setParentUserId(parentShopUser.getId());
newShopUserInvite.setGradeUserId(parentShopUserInvite == null ? null : parentShopUserInvite.getParentUserId());
newShopUserInvite.setInviteTime(LocalDateTime.now());
distributionInviteService.save(newShopUserInvite);
if (parentShopUserInvite != null && parentShopUserInvite.getParentUserId() != null) {
//更新自己的下级 的上级的上级 为自己的上级
ShopUser upShopUser = new ShopUser();
upShopUser.setGradeUserId(shopUser.getParentUserId());
shopUserService.update(upShopUser, QueryWrapper.create().eq(ShopUser::getParentUserId, shopUser.getId()));
MkDistributionInvite childShopUserInvite = new MkDistributionInvite();
childShopUserInvite.setGradeUserId(parentShopUser.getId());
distributionInviteService.update(childShopUserInvite, QueryWrapper.create().eq(MkDistributionInvite::getParentUserId, shopUser.getId()));
}
MkDistributionUser newDistributionUser = new MkDistributionUser();
@@ -320,14 +323,12 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
public void bindInviteUser(Long fromUserId, Long toUserId, Long shopId) throws CzgException, ValidateException {
ShopUser shopUser = shopUserService.getById(toUserId);
AssertUtil.isNull(shopUser, "店铺用户不存在");
if (shopUser.getParentUserId() != null) {
throw new CzgException("店铺用户已绑定上级");
MkDistributionInvite shopUserInvite = distributionInviteService.getByShopIdAndShopUserId(shopId, shopUser.getId());
if (shopUserInvite != null && shopUserInvite.getParentUserId() != null) {
throw new CzgException("店铺用户已存在上级");
}
MkDistributionUser parent = getOne(QueryWrapper.create().eq(MkDistributionUser::getId, fromUserId));
MkDistributionUser parent = getOne(QueryWrapper.create().eq(MkDistributionUser::getId, fromUserId).eq(MkDistributionUser::getShopId, shopId));
AssertUtil.isNull(parent, "邀请人不存在");
if (!parent.getShopId().equals(shopId)) {
throw new CzgException("邀请人不是本店铺的分销员");
}
if (parent.getId().equals(shopUser.getId())) {
throw new CzgException("不能绑定自己为上级");
}
@@ -337,28 +338,28 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
ShopUser parentShopUser = shopUserService.getById(parent.getId());
AssertUtil.isNull(parentShopUser, "邀请人不存在");
if (parentShopUser.getParentUserId() != null && parentShopUser.getParentUserId().equals(shopUser.getId())) {
MkDistributionInvite parentShopUserInvite = distributionInviteService.getByShopIdAndShopUserId(shopId, parentShopUser.getId());
if (parentShopUserInvite != null && parentShopUserInvite.getParentUserId() != null && parentShopUserInvite.getParentUserId().equals(shopUser.getId())) {
throw new CzgException("存在绑定关系，不可绑定");
}
if (parentShopUser.getGradeUserId() != null && parentShopUser.getGradeUserId().equals(shopUser.getId())) {
if (parentShopUserInvite != null && parentShopUserInvite.getGradeUserId() != null && parentShopUserInvite.getGradeUserId().equals(shopUser.getId())) {
throw new CzgException("存在绑定关系，不可绑定");
}
//更新自己的上级
shopUser.setParentUserId(parentShopUser.getId());
shopUser.setGradeUserId(parentShopUser.getParentUserId());
//更新自己的下级 的上级的上级 为自己的上级
ShopUser upShopUser1 = new ShopUser();
upShopUser1.setParentUserId(parentShopUser.getId());
upShopUser1.setGradeUserId(parentShopUser.getParentUserId());
upShopUser1.setInviteTime(LocalDateTime.now());
shopUserService.update(upShopUser1, QueryWrapper.create().eq(ShopUser::getId, shopUser.getId()));
if (shopUser.getParentUserId() != null) {
MkDistributionInvite newShopUserInvite = new MkDistributionInvite();
newShopUserInvite.setShopId(shopId);
newShopUserInvite.setUserId(shopUser.getUserId());
newShopUserInvite.setShopUserId(shopUser.getId());
newShopUserInvite.setParentUserId(parentShopUser.getId());
newShopUserInvite.setGradeUserId(parentShopUserInvite == null ? null : parentShopUserInvite.getParentUserId());
newShopUserInvite.setInviteTime(LocalDateTime.now());
distributionInviteService.save(newShopUserInvite);
if (parentShopUserInvite != null && parentShopUserInvite.getParentUserId() != null) {
//更新自己的下级 的上级的上级 为自己的上级
ShopUser upShopUser = new ShopUser();
upShopUser.setGradeUserId(shopUser.getParentUserId());
shopUserService.update(upShopUser, QueryWrapper.create().eq(ShopUser::getParentUserId, shopUser.getId()));
MkDistributionInvite childShopUserInvite = new MkDistributionInvite();
childShopUserInvite.setGradeUserId(parentShopUser.getId());
distributionInviteService.update(childShopUserInvite, QueryWrapper.create().eq(MkDistributionInvite::getParentUserId, shopUser.getId()));
}
MkDistributionUser newDistributionUser = new MkDistributionUser();
@@ -406,8 +407,9 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
public void costUpgradeLevelBefore(Long userId, Long shopId) {
ShopUser shopUser = shopUserService.getShopUserInfo(shopId, userId);
costUpgradeLevel(shopUser.getId(), shopId);
if (shopUser.getParentUserId() != null) {
costUpgradeLevel(shopUser.getParentUserId(), shopId);
MkDistributionInvite shopUserInvite = distributionInviteService.getByShopIdAndShopUserId(shopId, shopUser.getId());
if (shopUserInvite != null && shopUserInvite.getParentUserId() != null) {
costUpgradeLevel(shopUserInvite.getParentUserId(), shopId);
}
}
@@ -774,18 +776,19 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
AssertUtil.isTrue(config.getIsEnable() != 1, "分销未开启");
// 产生消费的用户
ShopUser curUser = shopUserService.getShopUserInfo(shopId, sourceUserId);
if (curUser == null || curUser.getParentUserId() == null) {
MkDistributionInvite sourceInviteUser = distributionInviteService.getByShopIdAndShopUserId(shopId, curUser.getId());
if (sourceInviteUser.getParentUserId() == null) {
return;
}
log.info("开始分销, 当前来源用户: {}, shopId: {}, 邀请人id: {}", sourceUserId, shopId, curUser.getParentUserId());
log.info("开始分销, 当前来源用户: {}, shopId: {}, 邀请人id: {}", sourceUserId, shopId, sourceInviteUser.getParentUserId());
MkDistributionUser distributionUser = getMkDistributionUserByIdAndShopId(curUser.getParentUserId(), shopId);
MkDistributionUser distributionUser = getMkDistributionUserByIdAndShopId(sourceInviteUser.getParentUserId(), shopId);
MkDistributionLevelConfig level = levelConfigService.getById(distributionUser.getDistributionLevelId());
deepReward(curUser, level.getCommission(), config, distributionUser,
amount, sourceId, type, orderNo, 1);
if (curUser.getGradeUserId() != null) {
MkDistributionUser parentDis = getMkDistributionUserByIdAndShopId(curUser.getGradeUserId(), shopId);
if (sourceInviteUser.getGradeUserId() != null) {
MkDistributionUser parentDis = getMkDistributionUserByIdAndShopId(sourceInviteUser.getGradeUserId(), shopId);
MkDistributionLevelConfig parentDisLevel = levelConfigService.getById(parentDis.getDistributionLevelId());
deepReward(curUser, parentDisLevel.getCommission().subtract(level.getCommission()), config, parentDis,
amount, sourceId, type, orderNo, 2);

7
cash-service/market-service/src/main/resources/mapper/MkDistributionInviteMapper.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.czg.service.market.mapper.MkDistributionInviteMapper">
</mapper>

6
cash-service/market-service/src/main/resources/mapper/MkDistributionUserMapper.xml
View File

@@ -65,8 +65,10 @@
<select id="getOrderConsumeAmountByList" resultType="java.math.BigDecimal">
SELECT IFNULL(SUM(ord.pay_amount), 0) AS totalAmount
FROM tb_shop_user invite
INNER JOIN tb_order_info ord ON invite.user_id = ord.user_id
FROM mk_distribution_invite invite
INNER JOIN tb_shop_user su on invite.shop_user_id = su.id
INNER JOIN tb_order_info ord ON su.user_id = ord.user_id
and invite.shop_id = #{shopId}
AND ord.shop_id = #{shopId}
AND ord.STATUS = 'done'
AND ord.pay_type NOT IN ('vip_pay', 'credit_pay')

138
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/TableSummaryServiceImpl.java
View File

@@ -1,18 +1,21 @@
package com.czg.service.order.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.excel.write.handler.SheetWriteHandler;
import com.czg.excel.ExcelExportUtil;
import com.czg.excel.SheetData;
import com.czg.order.param.TableSummaryParam;
import com.czg.order.service.TableSummaryService;
import com.czg.order.vo.TableSummaryExportVo;
import com.czg.service.order.mapper.ShopTableOrderStatisticMapper;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -27,9 +30,8 @@ public class TableSummaryServiceImpl implements TableSummaryService {
@Resource
private ShopTableOrderStatisticMapper shopTableOrderStatisticMapper;
@Override
public List<TableSummaryExportVo> summaryExportList(TableSummaryParam param) {
public void summaryExportList(TableSummaryParam param, HttpServletResponse response) {
if (param.getBeginDate() == null && param.getEndDate() == null) {
// 获取当前日期
LocalDate currentDate = LocalDate.now();
@@ -46,49 +48,103 @@ public class TableSummaryServiceImpl implements TableSummaryService {
param.setBeginDate(formattedStartDate + " 00:00:00");
param.setEndDate(formattedEndDate + " 23:59:59");
}
List<TableSummaryExportVo> list = shopTableOrderStatisticMapper.findSummaryExportList(param);
if (CollUtil.isEmpty(list)) {
return List.of();
ExcelExportUtil.exportToResponse(new ArrayList<>(), TableSummaryExportVo.class, "台桌统计", response);
return;
}
record TableSummary(String tableKey, BigDecimal totalSales, Map<Long, BigDecimal> productSales) {}
Map<String, TableSummary> summaryMap = list.stream()
// === Step 1: 按日期计算 当日总销售额 ===
Map<String, BigDecimal> dailyTotalMap = list.stream()
.collect(Collectors.groupingBy(
vo -> vo.getTableCode() + "_" + vo.getCreateDate(),
Collectors.collectingAndThen(
Collectors.toList(),
vos -> {
String tableKey = vos.getFirst().getTableCode() + "_" + vos.getFirst().getCreateDate();
BigDecimal totalSales = vos.stream()
.map(TableSummaryExportVo::getAmount)
.reduce(BigDecimal.ZERO, BigDecimal::add);
Map<Long, BigDecimal> productSales = vos.stream()
.collect(Collectors.groupingBy(
TableSummaryExportVo::getProductId,
Collectors.reducing(
BigDecimal.ZERO,
TableSummaryExportVo::getAmount,
BigDecimal::add
)
));
return new TableSummary(tableKey, totalSales, productSales);
}
)
TableSummaryExportVo::getCreateDate,
Collectors.reducing(BigDecimal.ZERO, TableSummaryExportVo::getAmount, BigDecimal::add)
));
list.forEach(vo -> {
TableSummary summary = summaryMap.get(vo.getTableConcatDate());
if (summary != null) {
vo.setTotalSalesAmount(summary.totalSales());
vo.setSalesAmount(summary.productSales().getOrDefault(vo.getProductId(), BigDecimal.ZERO));
}
});
// 追加个空行用于处理表格样式
TableSummaryExportVo nullVo = new TableSummaryExportVo();
list.add(nullVo);
return list;
// === Step 2: 按 台桌+日期 计算 每台桌当日销售额 ===
Map<String, BigDecimal> tableDailyTotalMap = list.stream()
.collect(Collectors.groupingBy(
vo -> vo.getTableCode() + "_" + vo.getCreateDate(),
Collectors.reducing(BigDecimal.ZERO, TableSummaryExportVo::getAmount, BigDecimal::add)
));
// === Step 3: 回填字段 ===
for (TableSummaryExportVo vo : list) {
String dateKey = vo.getCreateDate();
String tableDateKey = vo.getTableCode() + "_" + dateKey;
// 设置“总销售额” = 该台桌当天总销售额
vo.setSalesAmount(tableDailyTotalMap.getOrDefault(tableDateKey, BigDecimal.ZERO));
// 设置“当日总销售额” = 当天所有台桌总和
vo.setTotalSalesAmount(dailyTotalMap.getOrDefault(dateKey, BigDecimal.ZERO));
}
// === Step 4: 导出 ===
List<SheetWriteHandler> strategies = calculateMergeCells(list);
ExcelExportUtil.exportMultipleSheetsToResponse(
List.of(new SheetData()
.setData(list)
.setSheetName("台桌统计")
.setHandlers(strategies)
.setClazz(TableSummaryExportVo.class)),
"台桌统计",
response);
}
}
/**
* 计算需要合并的单元格信息
*/
private List<SheetWriteHandler> calculateMergeCells(List<TableSummaryExportVo> list) {
List<SheetWriteHandler> mergeInfos = new ArrayList<>();
if (CollUtil.isEmpty(list)) {
return mergeInfos;
}
// 按日期分组（用于合并“日期”和“当日总销售额”列）
Map<String, List<TableSummaryExportVo>> byDate = list.stream()
.collect(Collectors.groupingBy(TableSummaryExportVo::getCreateDate));
int currentRow = 1; // Excel 数据从第1行开始（第0行为标题）
// 按日期排序
List<String> sortedDates = byDate.keySet().stream().sorted().toList();
for (String date : sortedDates) {
List<TableSummaryExportVo> dateGroup = byDate.get(date);
int dateSize = dateGroup.size();
// 合并“日期”列（第0列）和“当日总销售额”列（第9列）
if (dateSize > 1) {
mergeInfos.add(ExcelExportUtil.createMergeStrategy(currentRow, currentRow + dateSize - 1, 0, 0));
mergeInfos.add(ExcelExportUtil.createMergeStrategy(currentRow, currentRow + dateSize - 1, 9, 9));
}
// 在日期组内，按台桌分组（用于合并“台桌”和“总销售额”列）
Map<String, List<TableSummaryExportVo>> byTable = dateGroup.stream()
.collect(Collectors.groupingBy(TableSummaryExportVo::getTableName));
int tableStartRow = currentRow;
List<String> sortedTables = byTable.keySet().stream().sorted().toList();
for (String table : sortedTables) {
List<TableSummaryExportVo> tableGroup = byTable.get(table);
int tableSize = tableGroup.size();
// 合并“台桌”列（第1列）和“总销售额”列（第8列）
if (tableSize > 1) {
mergeInfos.add(ExcelExportUtil.createMergeStrategy(tableStartRow, tableStartRow + tableSize - 1, 1, 1));
mergeInfos.add(ExcelExportUtil.createMergeStrategy(tableStartRow, tableStartRow + tableSize - 1, 8, 8));
}
tableStartRow += tableSize;
}
currentRow += dateSize;
}
return mergeInfos;
}
}

5
cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java
View File

@@ -277,7 +277,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
.setIsSale(getMainSkuIsSale(exportDTO))
.setGroupTitleName(proGroupDTO.getTitle())
.setGroupProductNumber(Optional.ofNullable(proGroupDTO.getNumber()).map(String::valueOf).orElse(""))
.setGroupProductName(good.getProName() + " " + good.getSkuName());
.setGroupProductName(good.getProName() + "-" + good.getSkuName());
dataList.add(pkgDto);
}
@@ -327,8 +327,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
}
private void addMergeHandler(List<SheetWriteHandler> handlers, int firstRow, int lastRow, int firstCol, int lastCol) {
OnceAbsoluteMergeStrategy strategy = new OnceAbsoluteMergeStrategy(firstRow, lastRow, firstCol, lastCol);
handlers.add(strategy);
handlers.add(ExcelExportUtil.createMergeStrategy(firstRow, lastRow, firstCol, lastCol));
}
@Override

11
cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdCategoryServiceImpl.java
View File

@@ -3,7 +3,9 @@ package com.czg.service.product.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.czg.constants.SystemConstants;
import com.czg.excel.ExcelExportUtil;
import com.czg.exception.CzgException;
import com.czg.product.dto.ProductCategoryExportDTO;
import com.czg.product.dto.ShopProdCategoryDTO;
import com.czg.product.entity.ShopProdCategory;
import com.czg.product.service.ProductService;
@@ -16,6 +18,7 @@ import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.core.update.UpdateChain;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -62,6 +65,14 @@ public class ShopProdCategoryServiceImpl extends ServiceImpl<ShopProdCategoryMap
return super.listAs(queryWrapper, ShopProdCategoryDTO.class);
}
@Override
public void exportShopProdCategory(ShopProdCategoryDTO param, HttpServletResponse response) {
QueryWrapper queryWrapper = buildQueryWrapper(param);
queryWrapper.eq(ShopProdCategory::getStatus, SystemConstants.OneZero.ONE);
List<ProductCategoryExportDTO> exportList = listAs(queryWrapper, ProductCategoryExportDTO.class);
ExcelExportUtil.exportToResponse(exportList, ProductCategoryExportDTO.class, "商品分类列表", response);
}
@Override
public ShopProdCategoryDTO getShopProdCategoryById(Long id) {
Long shopId = StpKit.USER.getShopId(0L);

11
cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdUnitServiceImpl.java
View File

@@ -3,7 +3,9 @@ package com.czg.service.product.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.czg.constants.SystemConstants;
import com.czg.excel.ExcelExportUtil;
import com.czg.exception.CzgException;
import com.czg.product.dto.ProductUnitExportDTO;
import com.czg.product.dto.ShopProdUnitDTO;
import com.czg.product.entity.ShopProdUnit;
import com.czg.product.enums.UnitTypeEnum;
@@ -15,6 +17,7 @@ import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.core.update.UpdateChain;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -59,6 +62,14 @@ public class ShopProdUnitServiceImpl extends ServiceImpl<ShopProdUnitMapper, Sho
return super.listAs(queryWrapper, ShopProdUnitDTO.class);
}
@Override
public void exportShopProdUnit(ShopProdUnitDTO param, HttpServletResponse response) {
QueryWrapper queryWrapper = buildQueryWrapper(param);
queryWrapper.eq(ShopProdUnit::getStatus,SystemConstants.OneZero.ONE);
List<ProductUnitExportDTO> unitExportDTOList = listAs(queryWrapper, ProductUnitExportDTO.class);
ExcelExportUtil.exportToResponse(unitExportDTOList, ProductUnitExportDTO.class, "单位列表", response);
}
@Override
public ShopProdUnitDTO getShopProdUnitById(Long id) {
Long shopId = StpKit.USER.getShopId(0L);