diff --git a/src/main/java/com/example/demo/Export/ExportService.java b/src/main/java/com/example/demo/Export/ExportService.java index f0b2475..f190b38 100644 --- a/src/main/java/com/example/demo/Export/ExportService.java +++ b/src/main/java/com/example/demo/Export/ExportService.java @@ -28,4 +28,8 @@ public interface ExportService { Result addExportBean(BeanRechargeDTO dto); Result addExportOnline(OnlineDTO dto); + //现金负责人退款导出 + Result addExportFinance(FinanceDTO dto); + + Result addExportCash(CashDTO dto); } diff --git a/src/main/java/com/example/demo/Export/ExportServiceImpl.java b/src/main/java/com/example/demo/Export/ExportServiceImpl.java index d4eb27c..e86d041 100644 --- a/src/main/java/com/example/demo/Export/ExportServiceImpl.java +++ b/src/main/java/com/example/demo/Export/ExportServiceImpl.java @@ -124,6 +124,16 @@ public class ExportServiceImpl implements ExportService { articleDTO.setUrl(""); articleDTO.setFileName(generateFileName("文章明细", adminName)); articleDTO.setDataNum(0); + } else if(dto instanceof FinanceDTO financeDTO){ + financeDTO.setAccount(Integer.valueOf(account)); + financeDTO.setUrl(""); + financeDTO.setFileName(generateFileName("现金退款明细", adminName)); + financeDTO.setDataNum(0); + } else if(dto instanceof CashDTO cashDTO){ + cashDTO.setAccount(Integer.valueOf(account)); + cashDTO.setUrl(""); + cashDTO.setFileName(generateFileName("现金收款明细", adminName)); + cashDTO.setDataNum(0); } } @@ -211,6 +221,26 @@ public class ExportServiceImpl implements ExportService { onlineDTO.getFileName(), onlineDTO.getDataNum() ); + }else if (dto instanceof FinanceDTO financeDTO){ + goldDetailMapper.insertExportRecord( + idHolder, + account, + financeDTO.getType(), + financeDTO.getState(), + financeDTO.getUrl(), + financeDTO.getFileName(), + financeDTO.getDataNum() + ); + }else if (dto instanceof CashDTO cashDTO){ + goldDetailMapper.insertExportRecord( + idHolder, + account, + cashDTO.getType(), + cashDTO.getState(), + cashDTO.getUrl(), + cashDTO.getFileName(), + cashDTO.getDataNum() + ); } } @@ -239,6 +269,10 @@ public class ExportServiceImpl implements ExportService { requestData.put(requestDataKey, beanRechargeDTO.getBeanSystemRechargeInfo()); } else if (dto instanceof OnlineDTO onlineDTO){ requestData.put(requestDataKey, onlineDTO.getBeanOnlineRechargeInfo()); + }else if(dto instanceof FinanceDTO financeDTO){ + requestData.put(requestDataKey, financeDTO.getCashRecordDTO()); + }else if (dto instanceof CashDTO cashDTO){ + requestData.put(requestDataKey, cashDTO.getCashCollection()); } exportData.put("requestData", requestData); @@ -294,4 +328,14 @@ public class ExportServiceImpl implements ExportService { public Result addExportOnline(OnlineDTO dto) { return addExport(dto, "在线明细", "online:queue:export_queue", "beanOnlineRechargeInfo"); } + + @Override + public Result addExportFinance(FinanceDTO dto) { + return addExport(dto, "现金退款明细", "finance:queue:export_queue", "cashRecordDTO"); + } + + @Override + public Result addExportCash(CashDTO dto) { + return addExport(dto, "现金收款明细", "cash:queue:export_queue", "cashCollection"); + } } \ No newline at end of file diff --git a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java index bef5b69..d9f7aa1 100644 --- a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java +++ b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java @@ -26,6 +26,7 @@ import java.time.LocalDateTime; import java.time.Month; import java.time.format.DateTimeFormatter; import java.util.*; +import java.util.Date; @Service @@ -64,7 +65,7 @@ public class MysqlServiceImpl implements MysqlService { @Override - @Transactional(transactionManager = "mysqlTransactionManager") // 👈 保证插入和用户更新在一个事务 + @Transactional(transactionManager = "mysqlTransactionManager",rollbackFor = Exception.class) // 👈 保证插入和用户更新在一个事务 public void getSqlserverData() throws Exception { logger.info("开始从 SQL Server 同步数据到 MySQL"); @@ -357,7 +358,7 @@ public class MysqlServiceImpl implements MysqlService { if (validZeroTypes.contains(data.gtype)) { stmt.setInt(13, 0); - stmt.setNull(20, 0); + stmt.setInt(20, 0); stmt.setString(1, "ERPCZ_" + data.orderNumber); } else if (validOneTypes.contains(data.gtype)) { stmt.setInt(13, 1); @@ -415,8 +416,8 @@ public class MysqlServiceImpl implements MysqlService { } else { stmt.setInt(17, 1); } - - stmt.setTimestamp(18, data.cz_time); + Timestamp now = new Timestamp(System.currentTimeMillis()); + stmt.setTimestamp(18, now); stmt.setTimestamp(19, data.cz_time); stmt.setString(21, data.uid); } diff --git a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java index 4cbc124..8850388 100644 --- a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java +++ b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java @@ -68,7 +68,7 @@ public class CashCollectionController { } //撤回未审核的收款订单 @PostMapping("/cancel") - public Result cancel(@RequestBody CashRecord cashRecord) { + public Result cancel(@RequestBody CashCollection cashRecord) { try { return Result.success( cashCollectionService.cancel(cashRecord.getOrderCode())); @@ -78,7 +78,7 @@ public class CashCollectionController { } //重新提交审核的收款订单 @PostMapping("/reSubmit") - public Result reSubmit(@RequestBody CashRecord cashRecord) { + public Result reSubmit(@RequestBody CashCollection cashRecord) { try { return Result.success(cashCollectionService.reSubmit(cashRecord)); }catch (Exception e){ @@ -111,9 +111,24 @@ public class CashCollectionController { return Result.error(e.getMessage()); }} + @PostMapping("/export") + public Result export(@RequestBody Page page) throws Exception { + try { + if (ObjectUtils.isEmpty(page.getPageNum())) { + return Result.error("页码数为空！"); + } + if (ObjectUtils.isEmpty(page.getPageSize())) { + return Result.error("页大小为空！"); + } + return Result.success(cashCollectionService.selectCollection(page.getPageNum(), page.getPageSize(),page.getCashCollection())); + } catch (Exception e) { + return Result.error(e.getMessage()); + } + } + //补全手续费等 @PostMapping("/complete") - public Result complete(@RequestBody CashRecord cashRecord) { + public Result complete(@RequestBody CashCollection cashRecord) { try { return Result.success(cashCollectionService.complete(cashRecord)); }catch (Exception e){ diff --git a/src/main/java/com/example/demo/controller/cash/CashRefundController.java b/src/main/java/com/example/demo/controller/cash/CashRefundController.java index 9614661..bced193 100644 --- a/src/main/java/com/example/demo/controller/cash/CashRefundController.java +++ b/src/main/java/com/example/demo/controller/cash/CashRefundController.java @@ -3,6 +3,7 @@ package com.example.demo.controller.cash; import com.example.demo.Util.JWTUtil; import com.example.demo.domain.entity.Admin; +import com.example.demo.domain.vo.cash.CashRecordDTO; import com.example.demo.domain.vo.cash.CashRecordDone; import com.example.demo.domain.vo.cash.CashRecordRefund; import com.example.demo.domain.vo.coin.Page; @@ -44,6 +45,8 @@ public class CashRefundController { private RefundService refundService; @Autowired MarketService marketService; + + /** * 当地财务负责人退款记录 */ @@ -67,20 +70,20 @@ public class CashRefundController { } // 获取传入的市场列表 - List requestedMarkets = page.getCashRecordDone() != null ? page.getCashRecordDone().getMarkets() : null; + List requestedMarkets = page.getCashRecordDTO() != null ? page.getCashRecordDTO().getMarkets() : null; // 权限校验逻辑 if (markets.contains("9") || markets.contains("9999")) { // 特权市场：9 或 9999，跳过权限校验，直接放行传入的 markets // 如果业务需要，也可以在这里做空值处理 - if (page.getCashRecordDone() != null) { + if (page.getCashRecordDTO() != null) { // 保持 requestedMarkets 不变，原样接受 // 可选：如果 requestedMarkets 为 null，可设为默认值或保持 null } } else { // 普通用户：必须校验权限 if (requestedMarkets == null || requestedMarkets.isEmpty()) { - page.getCashRecordDone().setMarkets(markets); + page.getCashRecordDTO().setMarkets(markets); } if (!markets.containsAll(requestedMarkets)) { return Result.error("无权限！请求的市场不在授权范围内。"); @@ -102,6 +105,50 @@ public class CashRefundController { } } /** + * 执行人查看退款现金记录 + */ + @PostMapping("/exSelect") + public Result executor(@RequestBody Page page) throws Exception { + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String token = request.getHeader("token"); + +// 解析 token 获取用户信息 + Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class); + List userMarkets = Arrays.asList(StringUtils.split(admin.getMarkets(), ",")); + List markets = marketService.getMarketIds(userMarkets); + +// 校验分页参数 + if (ObjectUtils.isEmpty(page.getPageNum())) { + return Result.error("页码数为空！"); + } + if (ObjectUtils.isEmpty(page.getPageSize())) { + return Result.error("页大小为空！"); + } + +// 获取传入的市场列表 + List requestedMarkets = page.getCashRecordDTO() != null ? page.getCashRecordDTO().getMarkets() : null; + +// 权限校验逻辑 + if (markets.contains("9") || markets.contains("9999")) { + // 特权市场：9 或 9999，跳过权限校验，直接放行传入的 markets + // 如果业务需要，也可以在这里做空值处理 + if (page.getCashRecordDTO() != null) { + // 保持 requestedMarkets 不变，原样接受 + // 可选：如果 requestedMarkets 为 null，可设为默认值或保持 null + } + } else { + // 普通用户：必须校验权限 + if (requestedMarkets == null || requestedMarkets.isEmpty()) { + page.getCashRecordDTO().setMarkets(markets); + } + if (!markets.containsAll(requestedMarkets)) { + return Result.error("无权限！请求的市场不在授权范围内。"); + } + // 校验通过，保持 requestedMarkets 不变 + } + return Result.success(refundService.exSelect(page.getPageNum(), page.getPageSize(), page.getCashRecordDTO())); + } + /** * 查询客服提交现金记录 */ @PostMapping("/selecta") @@ -161,4 +208,33 @@ public class CashRefundController { } } + /** + * 新增线上退款订单 + */ + @PostMapping("/addOnline") + public Result addOnline(@RequestBody CashRecordRefund cashRecordRefund){ + try { + return Result.success(refundService.add(cashRecordRefund)); + } catch (Exception e) { + return Result.error(e.getMessage()); + } + } + + @PostMapping("/export") + public Result export(@RequestBody Page page) throws Exception { + +// 校验分页参数 + if (ObjectUtils.isEmpty(page.getPageNum())) { + return Result.error("页码数为空！"); + } + if (ObjectUtils.isEmpty(page.getPageSize())) { + return Result.error("页大小为空！"); + } + + return Result.success(refundService.financeSelect(page.getPageNum(), page.getPageSize(), page.getCashRecordDTO())); + } + @PostMapping("/ceshi") + public Result ceshi() { + return Result.success("测试消息"); + } } diff --git a/src/main/java/com/example/demo/controller/coin/ExportController.java b/src/main/java/com/example/demo/controller/coin/ExportController.java index d6e120f..07b9eca 100644 --- a/src/main/java/com/example/demo/controller/coin/ExportController.java +++ b/src/main/java/com/example/demo/controller/coin/ExportController.java @@ -6,6 +6,7 @@ import com.example.demo.Util.RedisLockUtil; import com.example.demo.domain.DTO.*; import com.example.demo.domain.entity.Admin; import com.example.demo.domain.entity.Export; +import com.example.demo.domain.DTO.CashDTO; import com.example.demo.domain.vo.coin.Result; import com.example.demo.service.coin.ExportExcelService; import com.example.demo.service.coin.GoldDetailService; @@ -195,4 +196,41 @@ public class ExportController { redisLockUtil.unlock(lockKey, requestId); } } + /** + * 负责人退款导出 + */ + @PostMapping("/exportFinance") + public Result exportFinance(@Valid @RequestBody FinanceDTO dto) { + String lockKey = "export:lock:" + dto.getToken(); + String requestId = UUID.randomUUID().toString(); + long expireTime = 5000; + try { + // 尝试获取锁 + if (!redisLockUtil.tryLock(lockKey, requestId, expireTime)) { + throw new BusinessException("操作太频繁，请稍后重试"); + } + // 执行业务逻辑 + return exportService.addExportFinance(dto); + } finally { + // 释放锁 + redisLockUtil.unlock(lockKey, requestId); + } + } + @PostMapping("/exportCash") + public Result exportCash(@Valid @RequestBody CashDTO dto) { + String lockKey = "export:lock:" + dto.getToken(); + String requestId = UUID.randomUUID().toString(); + long expireTime = 5000; + try { + // 尝试获取锁 + if (!redisLockUtil.tryLock(lockKey, requestId, expireTime)) { + throw new BusinessException("操作太频繁，请稍后重试"); + } + // 执行业务逻辑 + return exportService.addExportCash(dto); + }finally { + // 释放锁 + redisLockUtil.unlock(lockKey, requestId); + } + } } \ No newline at end of file diff --git a/src/main/java/com/example/demo/controller/coin/RoleController.java b/src/main/java/com/example/demo/controller/coin/RoleController.java index 36e3786..89f220e 100644 --- a/src/main/java/com/example/demo/controller/coin/RoleController.java +++ b/src/main/java/com/example/demo/controller/coin/RoleController.java @@ -115,4 +115,21 @@ public class RoleController { } } + + //查询所有直播渠道 + @PostMapping("/getChannel") + public Result getChannel(){ + return Result.success(roleService.getChannel()); + } + + + @Log("获取频道列表") + @PostMapping("/selectChannel") + public Result selectChannel(@RequestBody RoleVo roleVo) { + Integer id = roleVo.getId(); + List list=roleService.selectSubRole(id); + return Result.success(list); + } + + } diff --git a/src/main/java/com/example/demo/domain/DTO/CashDTO.java b/src/main/java/com/example/demo/domain/DTO/CashDTO.java new file mode 100644 index 0000000..09aeea1 --- /dev/null +++ b/src/main/java/com/example/demo/domain/DTO/CashDTO.java @@ -0,0 +1,39 @@ +package com.example.demo.domain.DTO; + +import com.example.demo.domain.vo.bean.BeanOnlineRechargeInfo; +import com.example.demo.domain.vo.cash.CashCollection; +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @program: GOLD + * @ClassName CashDTO + * @description: + * @author: huangqizhen + * @create: 2025−11-09 09:26 + * @Version 1.0 + **/ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class CashDTO { + private String token; + private String url = ""; + private String fileName = ""; + private Integer sort = 0; + private String field = ""; + private Integer account; + private Integer type = 13; //类型 + private Integer state = 0; //状态 + private String text = ""; //关键词搜索 + private Integer dataNum = 0; + private String deptid = ""; + + @NotNull(message = "page不能为空") + private Integer page = 1; + @NotNull(message = "pageSize不能为空") + private Integer pageSize = 20; + private CashCollection cashCollection; +} diff --git a/src/main/java/com/example/demo/domain/DTO/FinanceDTO.java b/src/main/java/com/example/demo/domain/DTO/FinanceDTO.java new file mode 100644 index 0000000..d98283a --- /dev/null +++ b/src/main/java/com/example/demo/domain/DTO/FinanceDTO.java @@ -0,0 +1,36 @@ +package com.example.demo.domain.DTO; + +import com.example.demo.domain.vo.cash.CashRecordDTO; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @program: GOLD + * @ClassName FinanceDTO + * @description: + * @author: huangqizhen + * @create: 2025−11-06 21:22 + * @Version 1.0 + **/ +@Data +@NoArgsConstructor +public class FinanceDTO { + private String token; + private String url = ""; + private String fileName = ""; + private Integer sort = 0; + private String field = ""; + private Integer account; + private Integer type = 12; //类型 + private Integer state = 0; //状态 + private String text = ""; //关键词搜索 + private Integer dataNum = 0; + private String deptid = ""; + private CashRecordDTO cashRecordDTO; + + @NotNull(message = "page不能为空") + private Integer page = 1; + @NotNull(message = "pageSize不能为空") + private Integer pageSize = 5000; +} diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java index b25d472..38cfc61 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java +++ b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java @@ -61,7 +61,7 @@ public class CashCollection implements Serializable { private String remark; // 备注 private String receivedRemark; //到账备注 private String rejectReason; // 驳回理由 - private String auditId; //审核人id + private Integer auditId; //审核人id private String auditName; //审核人id private Integer cashRoleId; //角色id(0客服，1地区财务/负责人，2总部) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java index c7c2f63..6f46211 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java +++ b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java @@ -1,9 +1,14 @@ package com.example.demo.domain.vo.cash; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.Date; import java.util.List; /** @@ -16,24 +21,228 @@ import java.util.List; **/ @Data @AllArgsConstructor -public class CashRecordDTO extends CashRecordRefund{ - private Integer activity; - private String goodsName; - private Integer goodsNum; - private String numUnit; - private BigDecimal gold; - private BigDecimal free; - private String paymentCurrency; - private BigDecimal paymentAmount; - private String receiveCurrency; - private BigDecimal receiveAmount; - private BigDecimal handlingCharges; - private String payType; - private String receivedMarket; - private String payVoucher; - private String payRemark; - private List goodsNames; - private List markets; +@NoArgsConstructor +public class CashRecordDTO{ + private String activity;// 活动 + private String goodsName;// 商品名称 + private Integer goodsNum;// 商品数量 + private String numUnit;// 商品单位 + private BigDecimal gold;//永久金币 + private BigDecimal free;//免费金币 + private String paymentCurrency;// 支付币种 + private BigDecimal paymentAmount;// 支付金额 + private String receivedCurrency;// 收款币种 + private BigDecimal receivedAmount;// 收款金额 + private BigDecimal handlingCharge;// 手续费 + private String payBankCode;// 付款银行 + private String payType;// 支付方式 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private LocalDateTime payTime;// 付款时间 + private String receivedMarket;// 收款地区 + private String payVoucher;// 支付凭证 + private String payRemark;// 支付备注 + //提交人 + private String paySubmitter; + //提交人 + private String Submitter; + //审核人 + private String audit; + //到账日期 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private LocalDateTime receivedTime; + @ExcelIgnore + private List goodsNames;// 商品名称 + @ExcelIgnore + private List markets;// 地区 + /** + * 序号 + */ + private Integer id; + + /** + * 精网号 + */ + private Integer jwcode; + + /** + * 姓名 + */ + private String userName; + private String name; + + /** + * 所属地区 + */ + private Integer market; + + /** + * 金币订单号 + */ + private String orderCode; + + /** + * 银行流水订单号 + */ + private String bankCode; + + /** + * 永久金币 + */ + private BigDecimal permanentGold; + + /** + * 免费金币 + */ + private BigDecimal freeGold; + + /** + * 审核人id + */ + @ExcelIgnore + private Integer auditId; + + /** + * 订单状态（1位代表收款，2位代表退款） + 0：线下财务待审核；1：线下财务审核通过待填手续费；2线下财务审核驳回；5：手动撤回待编辑提交 + 3：link线上财务复核待填手续费 + 4：收款流程全部结束 + 6：退款 + --------------------------------------------- + 10：地区财务待审核;11:地区财务手动撤回待编辑提交12：地区财务驳回； + 20：地区负责人待审核；22：地区负责人驳回； + 30：总部财务待审核；32：总部财务驳回； + 40：执行人待处理；41：执行人已处理，退款结束 + */ + private Integer status; + + /** + * 提交人id + */ + @ExcelIgnore + private Integer submitterId; + + /** + * 提交人地区 + */ + private String submitterMarket; + + /** + * 转账凭证 + */ + private String voucher; + + /** + * 备注 + */ + private String remark; + + /** + * 驳回理由 + */ + private String rejectReason; + + /** + * 退款备注（理由）,客服填写 + */ + private String refundReason; + + /** + * 退款方式（0全额/1部分） + */ + private Integer refundModel; + + /** + * 退款执行人OA号 + */ + private Integer executor; + + /** + * 退款途径 + */ + private String refundChannels; + + /** + * 退款日期（到天） + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date refundTime; + + /** + * 退款备注（执行人填写） + */ + private String refundRemark; + + /** + * 退款截图 + */ + private String refundVoucher; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date createTime; + + /** + * 更新时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date updateTime; + + /** + * 审核时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date auditTime; + + /** + * 退款币种 + */ + private String refundCurrency; + + /** + * 退款金额 + */ + private String refundAmount; + + /** + * 关联收款id + */ + @ExcelIgnore + private Integer relatedId; + @ExcelIgnore + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date startTime; // 开始时间 + @ExcelIgnore + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date endTime; // 结束时间 + private String submitterName; + private String auditName; + private String executorName; + private String marketName; + @ExcelIgnore + private List statuses; + @ExcelIgnore + private String processInstanceId; // 流程实例ID + @ExcelIgnore + private String currentTaskId; // 当前任务ID + + private String areaServise; + private String areaFinance; + private String areaCharge; + private String headFinance; + @ExcelIgnore + private String sortField; + @ExcelIgnore + private String sortOrder; + + @ExcelIgnore + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date sTime; // 开始时间 + @ExcelIgnore + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date eTime; // 结束时间 + } diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashRecordRefund.java b/src/main/java/com/example/demo/domain/vo/cash/CashRecordRefund.java index 5be39cf..7e4f6bf 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/CashRecordRefund.java +++ b/src/main/java/com/example/demo/domain/vo/cash/CashRecordRefund.java @@ -17,7 +17,6 @@ import lombok.NoArgsConstructor; */ @Data @NoArgsConstructor -@AllArgsConstructor public class CashRecordRefund { /** * 序号 @@ -32,6 +31,7 @@ public class CashRecordRefund { /** * 姓名 */ + private String userName; private String name; /** @@ -126,6 +126,7 @@ public class CashRecordRefund { /** * 退款日期（到天） */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date refundTime; /** @@ -141,16 +142,19 @@ public class CashRecordRefund { /** * 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date createTime; /** * 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date updateTime; /** * 审核时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date auditTime; /** @@ -188,10 +192,12 @@ public class CashRecordRefund { private String headFinance; private String sortField; private String sortOrder; - + @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date sTime; // 开始时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date eTime; // 结束时间 + private Integer partRefundGold; + private Integer partRefundFree; } \ No newline at end of file diff --git a/src/main/java/com/example/demo/domain/vo/cash/LhlAudit.java b/src/main/java/com/example/demo/domain/vo/cash/LhlAudit.java new file mode 100644 index 0000000..d2a66e5 --- /dev/null +++ b/src/main/java/com/example/demo/domain/vo/cash/LhlAudit.java @@ -0,0 +1,24 @@ +package com.example.demo.domain.vo.cash; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @program: GOLD + * @ClassName LhlAudit + * @description: + * @author: huangqizhen + * @create: 2025−11-05 16:45 + * @Version 1.0 + **/ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class LhlAudit { + private Integer id; + private String areaServise;// + private String areaFinance; + private String areaCharge; + private String headFinace; +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/domain/vo/coin/IdName.java b/src/main/java/com/example/demo/domain/vo/coin/IdName.java new file mode 100644 index 0000000..fa550d3 --- /dev/null +++ b/src/main/java/com/example/demo/domain/vo/coin/IdName.java @@ -0,0 +1,13 @@ +package com.example.demo.domain.vo.coin; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class IdName { + private Integer id; + private String name; +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/domain/vo/coin/RoleVo.java b/src/main/java/com/example/demo/domain/vo/coin/RoleVo.java index d0f29c7..984c8e2 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/RoleVo.java +++ b/src/main/java/com/example/demo/domain/vo/coin/RoleVo.java @@ -34,6 +34,7 @@ public class RoleVo implements Serializable { private String fatherMarket;//父级角色市场 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date createTime; // 创建时间 + private String channel;//所属渠道 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date updateTime; // 更新时间 diff --git a/src/main/java/com/example/demo/mapper/cash/CashAuditMapper.java b/src/main/java/com/example/demo/mapper/cash/CashAuditMapper.java index e243824..f92f221 100644 --- a/src/main/java/com/example/demo/mapper/cash/CashAuditMapper.java +++ b/src/main/java/com/example/demo/mapper/cash/CashAuditMapper.java @@ -1,6 +1,7 @@ package com.example.demo.mapper.cash; import com.example.demo.domain.entity.CashRecord; +import com.example.demo.domain.vo.cash.CashCollection; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -15,7 +16,7 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface CashAuditMapper { //审核收款订单 - void updateOrder (CashRecord updateOrder); + void updateOrder (CashCollection updateOrder); //根据id获取审核人姓名 String getAuditName(Integer auditId); } diff --git a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java index 94e23d5..f55f4f1 100644 --- a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java +++ b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java @@ -1,5 +1,6 @@ package com.example.demo.mapper.cash; +import cn.hutool.core.lang.Opt; import com.example.demo.domain.entity.CashRecord; import com.example.demo.domain.entity.GOrder; import com.example.demo.domain.entity.RechargeActivity; @@ -9,6 +10,7 @@ import org.apache.ibatis.annotations.Param; import java.time.LocalDateTime; import java.util.List; +import java.util.Set; /** * @program: gold-java @@ -32,7 +34,7 @@ public interface CashCollectionMapper { @Param("status") Integer status); //编辑订单 // 编辑订单（状态=5）后重新提交 - int updateByOrderCode(@Param("cashRecord") CashRecord cashRecord); + int updateByOrderCode(@Param("cashRecordCollection") CashCollection cashRecord); //多条件查询收款订单列表 List selectCollection1(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize, @@ -41,7 +43,7 @@ public interface CashCollectionMapper { //根据订单号查询待审核的现金收款订单 CashRecord selectAuditByOrderCode(@Param("orderCode") String orderCode); //补全手续费等信息 - int complete(@Param("cashRecord") CashRecord cashRecord); + int complete(@Param("cashRecordCollection") CashCollection cashRecord); //根据精网号获取姓名 String getNameByJwcode(@Param("jwcode") Integer jwcode); //根据精网号获取市场名 @@ -54,4 +56,6 @@ public interface CashCollectionMapper { int markSynced(@Param("orderId") Integer orderId); //根据id查询收款订单 CashCollection selectById(Integer id); + + List selectBatchIds(Set relatedIds); } diff --git a/src/main/java/com/example/demo/mapper/cash/CashRefundMapper.java b/src/main/java/com/example/demo/mapper/cash/CashRefundMapper.java index 4c1039a..ee5fa3a 100644 --- a/src/main/java/com/example/demo/mapper/cash/CashRefundMapper.java +++ b/src/main/java/com/example/demo/mapper/cash/CashRefundMapper.java @@ -1,13 +1,12 @@ package com.example.demo.mapper.cash; -import com.example.demo.domain.vo.cash.CashCollection; -import com.example.demo.domain.vo.cash.CashRecordDTO; -import com.example.demo.domain.vo.cash.CashRecordDone; -import com.example.demo.domain.vo.cash.CashRecordRefund; +import cn.hutool.core.lang.Opt; +import com.example.demo.domain.vo.cash.*; import com.example.demo.domain.vo.coin.RefundUser; import org.apache.ibatis.annotations.Mapper; import java.util.List; +import java.util.Set; /** * @program: GOLD @@ -32,4 +31,9 @@ public interface CashRefundMapper { void addAudit(CashRecordDone cashRecordDone); void updateAudit(CashRecordDone cashRecordDone); List financeSelect(CashRecordDTO cashRecordDTO); -} + //获取各阶段审核人 + LhlAudit getAudit(Integer id); + List exSelect(CashRecordDTO cashRecordDTO); + + List getAuditBatch(Set auditIds); +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/mapper/coin/AuditMapper.java b/src/main/java/com/example/demo/mapper/coin/AuditMapper.java index e5f9409..ec9280b 100644 --- a/src/main/java/com/example/demo/mapper/coin/AuditMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/AuditMapper.java @@ -1,5 +1,7 @@ package com.example.demo.mapper.coin; +import cn.hutool.core.lang.Opt; +import com.example.demo.domain.entity.Admin; import com.example.demo.domain.entity.User; import com.example.demo.domain.entity.UserGoldRecord; import com.example.demo.domain.vo.coin.RechargeAudit; @@ -9,6 +11,7 @@ import org.apache.ibatis.annotations.Param; import java.util.Date; import java.util.List; +import java.util.Set; /** * @program: gold-java @@ -46,4 +49,6 @@ public interface AuditMapper { String getName(Integer auditId); //更新首充日期 void updateFirstRecharge(Integer jwcode); + + List getNamesByIds(Set submitterIds); } diff --git a/src/main/java/com/example/demo/mapper/coin/MarketMapper.java b/src/main/java/com/example/demo/mapper/coin/MarketMapper.java index 9102db8..99adcd3 100644 --- a/src/main/java/com/example/demo/mapper/coin/MarketMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/MarketMapper.java @@ -1,8 +1,11 @@ package com.example.demo.mapper.coin; +import cn.hutool.core.lang.Opt; import com.example.demo.domain.entity.Market; +import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Set; public interface MarketMapper { List getMarket(); @@ -14,4 +17,6 @@ public interface MarketMapper { Market getMarketIdDao(String country); Market getMarketIdBytype(String market); + String getMarketById(String market); + List getMarketByIds(@Param("marketIds") Set marketIds); } \ No newline at end of file diff --git a/src/main/java/com/example/demo/mapper/live/LiveMapper.java b/src/main/java/com/example/demo/mapper/live/LiveMapper.java index 223b64e..5715096 100644 --- a/src/main/java/com/example/demo/mapper/live/LiveMapper.java +++ b/src/main/java/com/example/demo/mapper/live/LiveMapper.java @@ -21,6 +21,8 @@ public interface LiveMapper { List selectLiveBy(@Param("beanConsumeLive") BeanConsumeLive beanConsumeLive); //获取直播礼物列表 List getLiveGift(); + //获取频道列表 + List getChannel(); //获取直播频道列表 List getLiveChannel(); //计算直播消费金豆合计数 diff --git a/src/main/java/com/example/demo/security/SecurityConfig.java b/src/main/java/com/example/demo/security/SecurityConfig.java index 440eb38..3e6d045 100644 --- a/src/main/java/com/example/demo/security/SecurityConfig.java +++ b/src/main/java/com/example/demo/security/SecurityConfig.java @@ -60,7 +60,7 @@ public class SecurityConfig { request .requestMatchers( HttpMethod.POST, // 用户不登录就可以访问的路径 - "/admin/login","/upload/**","/detailY/ERP","/home/java/haiwaiyanfa/gold1/**","/home/java/haiwaiyanfa/**","/statistics/**","/Mysql").permitAll() + "/admin/login","/upload/**","/detailY/ERP","/home/java/haiwaiyanfa/gold1/**","/home/java/haiwaiyanfa/**","/statistics/**","/Mysql/**").permitAll() .requestMatchers( "/error","alipay/**","/upload/**","/home/java/haiwaiyanfa/gold1/**","/home/java/haiwaiyanfa/**" ).permitAll() diff --git a/src/main/java/com/example/demo/service/cash/CashCollectionService.java b/src/main/java/com/example/demo/service/cash/CashCollectionService.java index 81a1226..45a7628 100644 --- a/src/main/java/com/example/demo/service/cash/CashCollectionService.java +++ b/src/main/java/com/example/demo/service/cash/CashCollectionService.java @@ -24,11 +24,11 @@ public interface CashCollectionService { //撤回未审核的收款订单 String cancel(String orderCode); //编辑并重新提交收款订单 - String reSubmit(CashRecord cashRecord); + String reSubmit(CashCollection cashRecord); //多条件查询收款订单列表 PageInfo selectCollection(Integer pageNum, Integer pageSize, CashCollection cashCollection); //补全手续费等 - String complete(CashRecord cashRecord); + String complete(CashCollection cashRecord); //根据精网号获取姓名和地区 User getNameAndMarket(Integer jwcode); //获取活动列表 diff --git a/src/main/java/com/example/demo/service/cash/RefundService.java b/src/main/java/com/example/demo/service/cash/RefundService.java index 57f1035..389b237 100644 --- a/src/main/java/com/example/demo/service/cash/RefundService.java +++ b/src/main/java/com/example/demo/service/cash/RefundService.java @@ -32,4 +32,8 @@ public interface RefundService { int finalreview(CashRecordDone cashRecordDone); PageInfo financeSelect(Integer pageNum, Integer pageSize, CashRecordDTO cashRecordDTO); + + PageInfo exSelect(Integer pageNum, Integer pageSize, CashRecordDTO cashRecordDTO); + //新增线上退款记录 + void addOnline(CashRecordRefund cashRecordRefund); } diff --git a/src/main/java/com/example/demo/service/coin/ExportExcelService.java b/src/main/java/com/example/demo/service/coin/ExportExcelService.java index c0d316b..c65b87e 100644 --- a/src/main/java/com/example/demo/service/coin/ExportExcelService.java +++ b/src/main/java/com/example/demo/service/coin/ExportExcelService.java @@ -34,4 +34,8 @@ public interface ExportExcelService { Exception OnlineExcel(String message) throws Exception; + //负责人退款导出 + Exception FinanceExcel(String message) throws Exception; + + Exception CashExcel(String message) throws Exception; } \ No newline at end of file diff --git a/src/main/java/com/example/demo/service/coin/RoleService.java b/src/main/java/com/example/demo/service/coin/RoleService.java index c47e595..268cdef 100644 --- a/src/main/java/com/example/demo/service/coin/RoleService.java +++ b/src/main/java/com/example/demo/service/coin/RoleService.java @@ -19,6 +19,8 @@ import java.util.List; public interface RoleService { + //查询频道 + List getChannel(); //新增角色 Result addRole(RoleVo roleVo); //新增角色二期替补 diff --git a/src/main/java/com/example/demo/service/listen/CashListener.java b/src/main/java/com/example/demo/service/listen/CashListener.java new file mode 100644 index 0000000..16cdfbc --- /dev/null +++ b/src/main/java/com/example/demo/service/listen/CashListener.java @@ -0,0 +1,36 @@ +package com.example.demo.service.listen; + +import com.example.demo.Util.RedisUtil; +import com.example.demo.service.coin.ExportExcelService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * @program: GOLD + * @ClassName CashListener + * @description: + * @author: huangqizhen + * @create: 2025−11-09 09:42 + * @Version 1.0 + **/ +@Component +public class CashListener extends BaseMessageListener { + @Autowired + private ExportExcelService exportExcelService; + + protected CashListener(RedisUtil redisQueueUtil) { + super(redisQueueUtil, "cash:queue:export_queue"); + } + + @Override + protected void handleMessage(String message) { + validateMessage( message); + try { + Thread.sleep(5000); + exportExcelService.CashExcel(message); + } catch (Exception e) { + handleException(e, message); + + } + } +} diff --git a/src/main/java/com/example/demo/service/listen/FinanceListener.java b/src/main/java/com/example/demo/service/listen/FinanceListener.java new file mode 100644 index 0000000..b72b110 --- /dev/null +++ b/src/main/java/com/example/demo/service/listen/FinanceListener.java @@ -0,0 +1,36 @@ +package com.example.demo.service.listen; + +import com.example.demo.Util.RedisUtil; +import com.example.demo.service.coin.ExportExcelService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * @program: GOLD + * @ClassName FinanceListener + * @description: + * @author: huangqizhen + * @create: 2025−11-06 21:35 + * @Version 1.0 + **/ +@Component +public class FinanceListener extends BaseMessageListener{ + @Autowired + private ExportExcelService exportExcelService; + + @Autowired + public FinanceListener(RedisUtil redisQueueUtil) { + super(redisQueueUtil, "finance:queue:export_queue"); + } + + @Override + protected void handleMessage(String message) { + validateMessage( message); + try { + Thread.sleep(5000); + exportExcelService.FinanceExcel(message); + } catch (Exception e) { + handleException(e, message); + } + } +} diff --git a/src/main/java/com/example/demo/serviceImpl/coin/AdminServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/AdminServiceImpl.java index 1014c4e..b28b1a4 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/AdminServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/AdminServiceImpl.java @@ -94,7 +94,6 @@ public class AdminServiceImpl implements AdminService { //更新密码 @Override public Result updatePassword(Password password) { - String oldPassword = password.getOldPassword(); String newPassword = password.getNewPassword(); String againPassword = password.getAgainPassword(); @@ -129,15 +128,15 @@ public class AdminServiceImpl implements AdminService { BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); // 使用Spring管理的密码编码器（不要手动new） + + String encodedPassword = passwordEncoder.encode(newPassword); // 更新数据库中的密码 admin.setPassword(encodedPassword); admin.setUpdateTime(new Date()); // 更新修改时间 adminMapper.updatePassword(admin); - return Result.success("密码修改成功"); - } catch (BadCredentialsException e) { // 旧密码验证失败 return Result.error("原密码错误，请重新输入"); @@ -182,6 +181,7 @@ public class AdminServiceImpl implements AdminService { } + //获取当前登录的管理员账号 public String getCurrentAdminAccount() { // 1. 从 Security 上下文获取认证信息 Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); diff --git a/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java index 862ec37..085b42a 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java @@ -8,6 +8,8 @@ import com.example.demo.Util.ExcelUploadUtil; import com.example.demo.Util.JWTUtil; import com.example.demo.controller.bean.BeanConsumeController; import com.example.demo.controller.bean.BeanRechargeController; +import com.example.demo.controller.cash.CashCollectionController; +import com.example.demo.controller.cash.CashRefundController; import com.example.demo.controller.coin.ConsumeController; import com.example.demo.controller.coin.GoldDetailController; import com.example.demo.controller.coin.RechargeController; @@ -18,10 +20,15 @@ import com.example.demo.domain.entity.User; import com.example.demo.domain.export.Goldmingxi; import com.example.demo.domain.vo.bean.*; +import com.example.demo.domain.vo.cash.CashCollection; +import com.example.demo.domain.vo.cash.CashRecordDTO; import com.example.demo.domain.vo.coin.*; +import com.example.demo.mapper.cash.CashRefundMapper; import com.example.demo.mapper.coin.ExportMapper; +import com.example.demo.service.cash.RefundService; import com.example.demo.service.coin.ExportExcelService; +import com.example.demo.serviceImpl.cash.CashRefundServiceImpl; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -32,6 +39,7 @@ import com.example.demo.service.coin.AiEmotionService; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.formula.functions.Finance; import org.apache.xmlbeans.impl.xb.xsdschema.Attribute; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -76,6 +84,10 @@ public class ExportExcelServiceImpl implements ExportExcelService { private BeanRechargeController beanRechargeController; @Autowired private AuthenticationManager authenticationManager; + @Autowired + private CashRefundController cashRefundController; + @Autowired + private CashCollectionController cashCollectionController; // 每页查询的数据量 private static final int PAGE_SIZE = 5000; @Autowired @@ -261,6 +273,38 @@ public class ExportExcelServiceImpl implements ExportExcelService { } @Override + public Exception FinanceExcel(String message) throws Exception { + return exportExcelGeneric(message, "financeUser", page -> { + try { + JsonNode rootNode = objectMapper.readTree(message); + JsonNode requestDataNode = rootNode.path("requestData"); + JsonNode beanRechargeNode = requestDataNode.path("cashRecordDTO"); + CashRecordDTO cashRecordDTO = objectMapper.treeToValue(beanRechargeNode, CashRecordDTO.class); + page.setCashRecordDTO(cashRecordDTO); + return cashRefundController.export(page); + } catch (Exception e) { + throw new RuntimeException(e); + } + }); + } + + @Override + public Exception CashExcel(String message) throws Exception { + return exportExcelGeneric(message, "cashUser", page -> { + try { + JsonNode rootNode = objectMapper.readTree(message); + JsonNode requestDataNode = rootNode.path("requestData"); + JsonNode beanRechargeNode = requestDataNode.path("cashCollection"); + CashCollection cashCollection = objectMapper.treeToValue(beanRechargeNode, CashCollection.class); + page.setCashCollection(cashCollection); + return cashCollectionController.export(page); + } catch (Exception e) { + throw new RuntimeException(e); + } + }); + } + + @Override public List getExcel(Export export) { List list = exportMapper.getExportRecord(export.getAccount(),export.getType()); System.out.println(list+"-------------------------------"); @@ -497,6 +541,10 @@ public class ExportExcelServiceImpl implements ExportExcelService { return BeanSystemRechargeInfo.class; case "onlineUser": return BeanOnlineRechargeInfo.class; + case "financeUser": + return CashRecordDTO.class; + case "cashUser": + return CashCollection.class; default: throw new IllegalArgumentException("不支持的导出类型: " + exportType); } diff --git a/src/main/java/com/example/demo/serviceImpl/coin/RoleServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/RoleServiceImpl.java index 79495e4..d2ca389 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/RoleServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/RoleServiceImpl.java @@ -9,6 +9,7 @@ import com.example.demo.domain.vo.coin.Result; import com.example.demo.domain.vo.coin.RoleVo; import com.example.demo.mapper.coin.MenuMapper; import com.example.demo.mapper.coin.RoleMapper; +import com.example.demo.mapper.live.LiveMapper; import com.example.demo.service.coin.MenuService; import com.example.demo.service.coin.RoleService; import com.github.pagehelper.PageHelper; @@ -40,6 +41,16 @@ public class RoleServiceImpl implements RoleService { private MenuService menuService; @Autowired private MenuMapper menuMapper; + @Autowired + private LiveMapper liveMapper; + + + + //查询直播礼物 + @Override + public List getChannel() { + return liveMapper.getChannel(); + } //新增角色 @Override @@ -62,9 +73,8 @@ public class RoleServiceImpl implements RoleService { if (roleVo.getMenuIds() == null || roleVo.getMenuIds().isEmpty()) { return Result.error("权限为空"); } - if (roleVo.getMarket() == null || roleVo.getMarket().isEmpty()) { - return Result.error("所属市场为空"); - } + + if (roleVo.getFatherId() == null || roleVo.getFatherId() != 2) { for (Integer menuId : roleVo.getMenuIds()) { diff --git a/src/main/resources/cashMapper/CashAuditMapper.xml b/src/main/resources/cashMapper/CashAuditMapper.xml index 28e36a4..cba43c8 100644 --- a/src/main/resources/cashMapper/CashAuditMapper.xml +++ b/src/main/resources/cashMapper/CashAuditMapper.xml @@ -4,7 +4,7 @@ - update cash_record + update cash_record_collection set status=#{status}, reject_reason=#{rejectReason}, audit_id=#{auditId}, @@ -13,7 +13,7 @@ \ No newline at end of file diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index f9c02c0..0297002 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -6,13 +6,13 @@ insert into - cash_record(order_type,jwcode,name,market,activity, + cash_record_collection(order_type,jwcode,name,market,activity, order_code,goods_name,good_num,num_unit,permanent_gold,free_gold, payment_currency,payment_amount,received_market, pay_type,pay_time,status,submitter_id,submitter_market, voucher,remark) values(#{orderType},#{jwcode},#{name},#{market},#{activity}, - #{orderCode},#{goodsName},#{goodNum},#{NumUnit},#{permanentGold},#{freeGold},#{paymentCurrency}, + #{orderCode},#{goodsName},#{goodNum},#{numUnit},#{permanentGold},#{freeGold},#{paymentCurrency}, #{paymentAmount},#{receivedMarket},#{payType},#{payTime}, #{status},#{submitterId},#{submitterMarket},#{voucher},#{remark}) @@ -29,57 +29,57 @@ - update cash_record + update cash_record_collection set status=#{status} where order_code=#{orderCode} - UPDATE cash_record + UPDATE cash_record_collection - jwcode = #{cashRecord.jwcode}, - name = #{cashRecord.name}, - market = #{cashRecord.market}, - activity = #{cashRecord.activity}, - goods_name = #{cashRecord.goodsName}, - good_num = #{cashRecord.goodNum}, - permanent_gold = #{cashRecord.permanentGold}, - free_gold = #{cashRecord.freeGold}, - Num_unit = #{cashRecord.NumUnit}, - payment_currency = #{cashRecord.paymentCurrency}, - payment_amount = #{cashRecord.paymentAmount}, - received_market = #{cashRecord.receivedMarket}, - pay_type = #{cashRecord.payType}, - pay_time = #{cashRecord.payTime}, - voucher = #{cashRecord.voucher}, - remark = #{cashRecord.remark}, + jwcode = #{cashRecordCollection.jwcode}, + name = #{cashRecordCollection.name}, + market = #{cashRecordCollection.market}, + activity = #{cashRecordCollection.activity}, + goods_name = #{cashRecordCollection.goodsName}, + good_num = #{cashRecordCollection.goodNum}, + num_unit = #{cashRecordCollection.numUnit}, + permanent_gold = #{cashRecordCollection.permanentGold}, + free_gold = #{cashRecordCollection.freeGold}, + payment_currency = #{cashRecordCollection.paymentCurrency}, + payment_amount = #{cashRecordCollection.paymentAmount}, + received_market = #{cashRecordCollection.receivedMarket}, + pay_type = #{cashRecordCollection.payType}, + pay_time = #{cashRecordCollection.payTime}, + voucher = #{cashRecordCollection.voucher}, + remark = #{cashRecordCollection.remark}, status = 0, - WHERE order_code = #{cashRecord.orderCode} + WHERE order_code = #{cashRecordCollection.orderCode} AND status = 5 - UPDATE cash_record + UPDATE cash_record_collection - - handling_charge = #{cashRecord.handlingCharge}, + + handling_charge = #{cashRecordCollection.handlingCharge}, - - received_currency = #{cashRecord.receivedCurrency}, + + received_currency = #{cashRecordCollection.receivedCurrency}, - - received_amount = #{cashRecord.receivedAmount}, + + received_amount = #{cashRecordCollection.receivedAmount}, - - received_time = #{cashRecord.receivedTime}, + + received_time = #{cashRecordCollection.receivedTime}, - - payment_currency = #{cashRecord.paymentCurrency}, + + payment_currency = #{cashRecordCollection.paymentCurrency}, - - payment_amount = #{cashRecord.paymentAmount}, + + payment_amount = #{cashRecordCollection.paymentAmount}, status = CASE @@ -94,7 +94,7 @@ ELSE status END - WHERE order_code = #{cashRecord.orderCode} + WHERE order_code = #{cashRecordCollection.orderCode} AND status IN (1, 3) @@ -110,7 +110,7 @@ @@ -119,6 +119,7 @@ m1.name as marketName, ra.activity_name as activity,cr.order_code,cr.bank_code, cr.goods_name,cr.good_num, + cr.num_unit, cr.permanent_gold/100 as permanentGold,cr.free_gold/100 as freeGold,cr.payment_amount/100 as paymentAmount, r1.rate_name as paymentCurrency, r2.rate_name as receivedCurrency, @@ -129,7 +130,7 @@ cr.audit_id,cr.create_time,cr.update_time,cr.audit_time, a1.admin_name as submitterName, a2.admin_name as auditName - from cash_record cr + from cash_record_collection cr left join admin a1 on cr.submitter_id = a1.id left join admin a2 on cr.audit_id = a2.id left join market m1 on m1.id = cr.market @@ -211,12 +212,12 @@ @@ -241,12 +242,36 @@ limit #{size} + \ No newline at end of file diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml index df73ebe..8ae112d 100644 --- a/src/main/resources/cashMapper/CashRefundMapper.xml +++ b/src/main/resources/cashMapper/CashRefundMapper.xml @@ -6,7 +6,6 @@ jwcode, name, market, - activity, order_code, bank_code, permanent_gold, @@ -27,16 +26,15 @@ refund_amount, related_id, audit_id, - status, + status ) VALUES ( #{jwcode}, #{name}, #{market}, - #{activity}, #{orderCode}, #{bankCode}, - #{permanentGold}, - #{freeGold}, + #{partRefundGold}, + #{partRefundFree}, #{submitterId}, #{submitterMarket}, #{voucher}, @@ -53,7 +51,7 @@ #{refundAmount}, #{id}, #{auditId}, - #{status}, + #{status} ); @@ -75,7 +73,7 @@ - update cash_record + update cash_record_refund set status = 10, refund_model = #{refundModel}, @@ -83,15 +81,15 @@ where id = #{id} - update cash_record set status = 11 - where order_type =2 and id = #{id} + update cash_record_refund set status = 11 + where id = #{id} - update cash_record set status = #{status},executor = #{executor},reject_reason = #{rejectReason} - where order_type =2 and id = #{id} + update cash_record_refund set status = #{status},executor = #{executor},reject_reason = #{rejectReason} + where id = #{id} - update cash_record set refund_currency = #{refundCurrency}, + update cash_record_refund set refund_currency = #{refundCurrency}, refund_amount = #{refundAmount}, refund_channels = #{refundChannels}, refund_time = #{refundTime}, @@ -99,10 +97,10 @@ refund_voucher = #{refundVoucher}, status = #{status}, executor = #{executor} - where order_type =2 and id = #{id} + where id = #{id} - update cash_record + update cash_record_collection set status = #{status} @@ -158,14 +156,15 @@ la.head_finance, crc.activity, crc.goods_name, - crc.goods_num, + crc.good_num as goodsNum, crc.num_unit, crc.pay_type, crc.pay_time, crc.voucher, crc.remark, crc.payment_currency, - crc.payment_amount, + crc.payment_amount + from cash_record_refund crr left join lhl_audit la on la.id = crr.audit_id left join cash_record_collection crc on crc.id = crr.related_id @@ -215,7 +214,7 @@ ORDER BY ${sortField} ${sortOrder} - ORDER BY create_time DESC + ORDER BY crr.create_time DESC @@ -225,7 +224,7 @@ crr.name, crr.market, crc.goods_name, - crc.goods_num, + crc.good_num as goodsNum, crc.num_unit, crr.refund_model, crr.submitter_id, @@ -235,9 +234,14 @@ crr.permanent_gold, crr.free_gold, crr.audit_id, - crr.related_id + crr.related_id, + la.area_servise, + la.area_finance, + la.area_charge, + la.head_finance from cash_record_refund crr left join cash_record_collection crc on crc.id = crr.related_id + left join lhl_audit la on la.id = crr.audit_id and crr.status = #{status} @@ -285,8 +289,105 @@ ORDER BY ${sortField} ${sortOrder} - ORDER BY create_time DESC + ORDER BY crr.create_time DESC + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/liveMapper/LiveMapper.xml b/src/main/resources/liveMapper/LiveMapper.xml index 602ecb5..69589b0 100644 --- a/src/main/resources/liveMapper/LiveMapper.xml +++ b/src/main/resources/liveMapper/LiveMapper.xml @@ -63,6 +63,13 @@ + - select * from user_gold_record - where order_code = #{orderCode} and audit_status = 0 - and flag=1 - ORDER BY create_time DESC - limit 1 - - - - - - - + + + + + update user set first_recharge = now() where jwcode = #{jwcode} and first_recharge is null + + \ No newline at end of file diff --git a/src/main/resources/mapper/MarketMapper.xml b/src/main/resources/mapper/MarketMapper.xml index 734f78a..36f8994 100644 --- a/src/main/resources/mapper/MarketMapper.xml +++ b/src/main/resources/mapper/MarketMapper.xml @@ -35,4 +35,18 @@ + + \ No newline at end of file diff --git a/src/main/resources/mapper/RoleMapper.xml b/src/main/resources/mapper/RoleMapper.xml index ec1ddda..019044e 100644 --- a/src/main/resources/mapper/RoleMapper.xml +++ b/src/main/resources/mapper/RoleMapper.xml @@ -7,7 +7,12 @@ role_name = #{roleName}, - + + market = #{market}, + + + channel = #{channel}, + father_id = #{fatherId}, @@ -32,7 +37,7 @@