添加日志

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpBizWalletController.java

@@ -1,9 +1,9 @@
 package com.sckw.payment.controller;
 
 
-import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.core.web.response.BaseResult;
 import com.sckw.core.web.response.result.PageDataResult;
+import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.payment.repose.KwpBizWalletPageResponse;
 import com.sckw.payment.repose.KwpBizWalletPrepayPageResponse;
 import com.sckw.payment.repose.vo.KwpBizWalletPrepayExcelVO;
@@ -94,12 +94,12 @@ public class KwpBizWalletController {
     }
 
     /**
-     * 钱包冻账明细
+     * 分页查询钱包冻账明细
      *
      * @param request 查询参数
      * @return 冻结明细分页列表
      */
-    @Operation(summary = "查询钱包冻结明细", description = "根据条件分页查询钱包冻结明细信息")
+    @Operation(summary = "分页查询钱包冻账明细", description = "根据条件分页查询钱包冻结明细信息")
     @PostMapping("/walletPrepayDetail")
     public BaseResult<PageDataResult<KwpBizWalletPrepayPageResponse>> walletPrepayDetail(@RequestBody @Validated KwpBizWalletPrepayQueryRequest request) {
         PageDataResult<KwpBizWalletPrepayPageResponse> walletPrepayPageDataResult = kwpBizWalletService.walletPrepayDetail(request);
@@ -115,7 +115,7 @@ public class KwpBizWalletController {
      */
     @Operation(summary = "导出钱包冻结明细", description = "导出钱包冻结明细为Excel文件")
     @PostMapping("/exportWalletPrepay")
-    public BaseResult exportWalletPrepay(@RequestBody @Validated HttpServletResponse response, KwpBizWalletPrepayQueryRequest request) {
+    public BaseResult exportWalletPrepay(@RequestBody @Validated KwpBizWalletPrepayQueryRequest request, HttpServletResponse response) {
         //查询导出数据
         List<KwpBizWalletPrepayExcelVO> excelVOList = kwpBizWalletService.queryExportWalletPrepay(request);
         //导出

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/repose/KwpBizWalletPageResponse.java

@@ -17,7 +17,7 @@ import java.util.List;
  */
 
 @Data
-public class KwpBizWalletPageResponse extends PageResult {
+public class KwpBizWalletPageResponse {
 
     /**
      * 企业id

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/repose/KwpBizWalletPrepayPageResponse.java

@@ -4,7 +4,6 @@ package com.sckw.payment.repose;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.sckw.core.model.page.PageResult;
 import com.sckw.payment.model.KwpBizWalletPrepay;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -20,7 +19,7 @@ import java.util.Date;
  */
 
 @Data
-public class KwpBizWalletPrepayPageResponse extends PageResult {
+public class KwpBizWalletPrepayPageResponse {
 
     /**
      * 主键
@@ -71,9 +70,9 @@ public class KwpBizWalletPrepayPageResponse extends PageResult {
     private BigDecimal prepayAmount;
 
     /**
-     * 动帐类型  0-冻结、1-预付、2-解冻、3-消费
+     * 动帐类型  0-预付、1-扣款、2-冻结、3-解冻、4-消费
      */
-    @Schema(description = "动帐类型  0-冻结、1-预付、2-解冻、3-消费")
+    @Schema(description = "动帐类型  0-预付、1-扣款、2-冻结、3-解冻、4-消费")
     private Integer type;
 
     /**

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/repose/vo/KwpBizWalletPrepayExcelVO.java

@@ -3,7 +3,7 @@ package com.sckw.payment.repose.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.sckw.core.model.page.PageResult;
+import com.sckw.excel.annotation.ExcelContext;
 import com.sckw.payment.repose.KwpBizWalletPrepayPageResponse;
 import lombok.Data;
 
@@ -18,7 +18,8 @@ import java.util.Date;
  */
 
 @Data
-public class KwpBizWalletPrepayExcelVO extends PageResult {
+@ExcelContext(fileName = "冻账明细表", sheetName = "冻账明细信息")
+public class KwpBizWalletPrepayExcelVO {
 
     /**
      * 钱包名称
@@ -34,7 +35,7 @@ public class KwpBizWalletPrepayExcelVO extends PageResult {
 
 
     /**
-     * 动帐类型  0-冻结、1-预付、2-解冻、3-消费',
+     * 动帐类型  0-预付、1-扣款、2-冻结、3-解冻、4-消费',
      */
     @ExcelProperty(value = "动帐类型")
     private String type;
@@ -43,19 +44,19 @@ public class KwpBizWalletPrepayExcelVO extends PageResult {
     /**
      * 变动金额（单位：元，保留2位小数）
      */
-    @ExcelProperty(value = "变动金额")
+    @ExcelProperty(value = "变动金额（元）")
     private BigDecimal changeAmount;
 
     /**
      * 可用金额
      */
-    @ExcelProperty(value = "可用金额")
+    @ExcelProperty(value = "可用金额（元）")
     private BigDecimal amount;
 
     /**
      * 冻结金额
      */
-    @ExcelProperty(value = "冻结金额")
+    @ExcelProperty(value = "冻结金额（元）")
     private BigDecimal prepayAmount;
 
     /**
@@ -67,7 +68,7 @@ public class KwpBizWalletPrepayExcelVO extends PageResult {
     /**
      * 创建时间
      */
-    @ExcelProperty(value = "钱包ID")
+    @ExcelProperty(value = "创建时间")
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
@@ -81,6 +82,8 @@ public class KwpBizWalletPrepayExcelVO extends PageResult {
             return new KwpBizWalletPrepayExcelVO();
         }
         KwpBizWalletPrepayExcelVO excelVO = KwpBizWalletPrepayExcelVO.getInstance();
+        excelVO.setAmount(response.getAmount());
+        excelVO.setPrepayAmount(response.getPrepayAmount());
         excelVO.setWalletName(response.getWalletName());
         excelVO.setSupEntName(response.getSupEntName());
         excelVO.setChangeAmount(response.getAmount());

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/request/KwpBizWalletPrepayQueryRequest.java

@@ -39,9 +39,9 @@ public class KwpBizWalletPrepayQueryRequest extends PageRequest {
     private BigDecimal maxAmount;
 
     /**
-     * 动帐类型  0-冻结、1-预付、2-解冻、3-消费
+     * 动帐类型  0-预付、1-扣款、2-冻结、3-解冻、4-消费
      */
-    @Schema(description = "动帐类型  0-冻结、1-预付、2-解冻、3-消费")
+    @Schema(description = "动帐类型  0-预付、1-扣款、2-冻结、3-解冻、4-消费")
     private Integer type;
 
     /**

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/request/KwpBizWalletPrepayRequest.java

@@ -3,9 +3,7 @@ package com.sckw.payment.request;
 
 import com.sckw.core.model.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.*;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -38,7 +36,8 @@ public class KwpBizWalletPrepayRequest extends PageRequest {
      */
     @NotNull(message = "资金方向不能为空！")
     @Schema(description = "动帐类型  0-预付、1-扣款、2-冻结、3-解冻、4-消费")
-    @Pattern(regexp = "^[0-4]$", message = "动帐类型无效，必须是0-4之间的有效值")
+    @Min(value = 0, message = "动帐类型不能小于0")
+    @Max(value = 4, message = "动帐类型不能大于4")
     private Integer type;
 
     /**

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/wallet/KwpBizWalletService.java

@@ -1,6 +1,7 @@
 package com.sckw.payment.service.wallet;
 
 
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -66,10 +67,12 @@ public class KwpBizWalletService {
      * 分页查询钱包明细
      */
     public PageDataResult<KwpBizWalletPageResponse> pageBizWalletList(KwpBizWalletQueryRequest request) {
+        log.info("分页查询钱包明细，入参：{}", JSONObject.toJSONString(request));
         int systemType = LoginUserHolder.getSystemType();
 
         //非管理端,返回空分页结果
         if (systemType != SystemTypeEnum.COMPANY.getCode()) {
+            log.info("当前登录企业非管理端：{}", SystemTypeEnum.COMPANY.getCode());
             return PageDataResult.empty(request.getPage(), request.getPageSize());
         }
 
@@ -96,7 +99,9 @@ public class KwpBizWalletService {
         List<KwpBizWalletPageResponse> walletPageList = pageList.size() >= request.getPage() ?
                 pageList.get(request.getPage() - 1) : Collections.emptyList();
 
-        return PageDataResult.success(request.getPage(), request.getPageSize(), (long) walletPageList.size(), walletPageList);
+        PageDataResult<KwpBizWalletPageResponse> walletPageResponse = PageDataResult.success(request.getPage(), request.getPageSize(), (long) walletPageList.size(), walletPageList);
+        log.info("分页查询钱包明细成功，结果：{}", JSONObject.toJSONString(walletPageResponse));
+        return walletPageResponse;
     }
 
 
@@ -120,10 +125,13 @@ public class KwpBizWalletService {
 
         List<KwpBizWallet> bizWalletList = kwpBizWalletRepository.list(queryWrapper);
         if (bizWalletList == null || CollectionUtils.isEmpty(bizWalletList)) {
+            log.info("当前供应企业无子级企业，entId：{}", entTypeResDto.getEntId());
             return new ArrayList<>();
         }
 
-        return getAndConvertWallet(entIds, bizWalletList);
+        List<KwpBizWalletPageResponse> supWalletList = getAndConvertWallet(entIds, bizWalletList);
+        log.info("供应企业钱包信息结果：{}", JSONObject.toJSONString(supWalletList));
+        return supWalletList;
     }
 
     /**
@@ -138,13 +146,16 @@ public class KwpBizWalletService {
                 .in(KwpBizWallet::getProEntId, entId);
         List<KwpBizWallet> bizWalletList = kwpBizWalletRepository.list(queryWrapper);
         if (bizWalletList == null || bizWalletList.isEmpty()) {
+            log.info("当前采购企业无钱包数据，entId：{}", entId);
             return new ArrayList<>();
         }
 
         //查询钱包所关联的供应商企业id
         List<Long> entIds = bizWalletList.stream().map(KwpBizWallet::getSupEntId).collect(Collectors.toList());
 
-        return getAndConvertWallet(entIds, bizWalletList);
+        List<KwpBizWalletPageResponse> proWallet = getAndConvertWallet(entIds, bizWalletList);
+        log.info("采购企业钱包信息结果：{}", JSONObject.toJSONString(proWallet));
+        return proWallet;
     }
 
 
@@ -265,6 +276,7 @@ public class KwpBizWalletService {
      * 新增钱包
      */
     public void addWallet(KwpBizWalletSaveRequest request) {
+        log.info("新增钱包，入参：{}", JSONObject.toJSONString(request));
         //校验
         checkAddWallet(request);
 
@@ -277,6 +289,7 @@ public class KwpBizWalletService {
         String entName = queryEntById(request.getProEntId());
         kwpBizWallet.setName(entName + StringConstant.HYPHEN + OFFLINE_WALLET);
         kwpBizWalletRepository.save(kwpBizWallet);
+        log.info("新增钱包成功！");
     }
 
     /**
@@ -318,6 +331,7 @@ public class KwpBizWalletService {
      * 钱包状态更新
      */
     public void updateWallet(Long id) {
+        log.info("更新钱包状态，入参：{}", id);
         if (id == null) {
             throw new RuntimeException("钱包id不能为空！");
         }
@@ -331,6 +345,7 @@ public class KwpBizWalletService {
             wallet.setState(0);
         }
         kwpBizWalletRepository.updateById(wallet);
+        log.info("更新钱包成功!");
     }
 
     /**
@@ -338,6 +353,7 @@ public class KwpBizWalletService {
      */
     @Transactional(rollbackFor = Exception.class)
     public void updateWalletAmount(KwpBizWalletPrepayRequest request) {
+        log.info("人工录入明细，入参：{}", JSONObject.toJSONString(request));
         KwpBizWallet wallet = kwpBizWalletRepository.getById(request.getWalletId());
         if (wallet == null) {
             throw new RuntimeException("钱包id:" + request.getWalletId() + ", 钱包信息不存在！");
@@ -363,13 +379,15 @@ public class KwpBizWalletService {
         walletOperation.setVoucherUrl(request.getVoucherUrl());
         walletOperation.setRemark(request.getRemark());
         kwpBizWalletPrepayRepository.save(walletOperation);
+        log.info("人工录入明细成功！");
     }
 
 
     /**
-     * 钱包冻账明细
+     * 分页查询钱包冻账明细
      */
     public PageDataResult<KwpBizWalletPrepayPageResponse> walletPrepayDetail(KwpBizWalletPrepayQueryRequest request) {
+        log.info("分页查询钱包冻账明细，入参：{}", JSONObject.toJSONString(request));
         Page<KwpBizWalletPrepay> page = new Page<>(request.getPage(), request.getPageSize());
         LambdaQueryWrapper<KwpBizWalletPrepay> queryWrapper = Wrappers.<KwpBizWalletPrepay>lambdaQuery()
                 .eq(request.getType() != null, KwpBizWalletPrepay::getType, request.getType())
@@ -381,6 +399,7 @@ public class KwpBizWalletService {
         Page<KwpBizWalletPrepay> walletPrepayPage = kwpBizWalletPrepayRepository.page(page, queryWrapper);
         //若为null,返回空分页结果
         if (walletPrepayPage == null || CollectionUtils.isEmpty(walletPrepayPage.getRecords())) {
+            log.info("分页查询钱包冻账明细无数据");
             return PageDataResult.empty(request.getPage(), request.getPageSize());
         }
 
@@ -403,16 +422,21 @@ public class KwpBizWalletService {
                 }).collect(Collectors.toList());
 
         walletPrepayPageList.sort(Comparator.comparing(KwpBizWalletPrepayPageResponse::getCreateTime));
-        return PageDataResult.success(request.getPage(), request.getPageSize(), (long) walletPrepayPageList.size(), walletPrepayPageList);
+        PageDataResult<KwpBizWalletPrepayPageResponse> walletPrepayPageResponse = PageDataResult
+                .success(request.getPage(), request.getPageSize(), (long) walletPrepayPageList.size(), walletPrepayPageList);
+        log.info("分页查询钱包冻账明细成功，结果：{}", JSONObject.toJSONString(walletPrepayPageResponse));
+        return walletPrepayPageResponse;
+
     }
 
     /**
      * 钱包冻账明细导出
      */
     public List<KwpBizWalletPrepayExcelVO> queryExportWalletPrepay(KwpBizWalletPrepayQueryRequest request) {
+        log.info("钱包冻账明细导出，入参：{}", JSONObject.toJSONString(request));
         //查询导出数据
         PageDataResult<KwpBizWalletPrepayPageResponse> walletPrepayPageResult = walletPrepayDetail(request);
-        return walletPrepayPageResult.getList().stream().map(vo -> {
+        List<KwpBizWalletPrepayExcelVO> walletPrepayExcelVO = walletPrepayPageResult.getList().stream().map(vo -> {
             KwpBizWalletPrepayExcelVO excelVO = KwpBizWalletPrepayExcelVO.toPageResp(vo);
             //变动类型
             String descByCode = PrepayTypEnum.getDescByCode(vo.getType());
@@ -420,7 +444,8 @@ public class KwpBizWalletService {
 
             return excelVO;
         }).collect(Collectors.toList());
-
+        log.info("钱包冻账明细导出成功，结果：{}", JSONObject.toJSONString(walletPrepayPageResult));
+        return walletPrepayExcelVO;
     }
 
 

sql/2025/mvp2/2025_11_03_donglang.sql

@@ -39,7 +39,7 @@ CREATE TABLE `kwp_biz_wallet_prepay`
     wallet_id               bigint                                                          NOT NULL COMMENT '钱包id',
     order_id                bigint                                                          NOT NULL COMMENT '订单id',
     amount                  decimal(10,2)                                                   NOT NULL DEFAULT '0.00' COMMENT '金额（单位：元，保留2位小数）',
-    type                    int                                                             NOT NULL DEFAULT '0' COMMENT '动帐类型  0-冻结、1-预付、2-解冻、3-消费',
+    type                    int                                                             NOT NULL DEFAULT '0' COMMENT '动帐类型  0-预付、1-扣款、2-冻结、3-解冻、4-消费',
     remark                  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci   DEFAULT NULL COMMENT '备注',
     voucher_url             varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci   DEFAULT NULL COMMENT '凭证URL地址',
     create_time             datetime                                                        not null default CURRENT_TIMESTAMP comment '创建时间',