remove

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

@@ -1,126 +0,0 @@
-package com.sckw.payment.controller;
-
-
-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;
-import com.sckw.payment.request.KwpBizWalletPrepayQueryRequest;
-import com.sckw.payment.request.KwpBizWalletPrepayRequest;
-import com.sckw.payment.request.KwpBizWalletQueryRequest;
-import com.sckw.payment.request.KwpBizWalletSaveRequest;
-import com.sckw.payment.service.wallet.KwpBizWalletService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.RequiredArgsConstructor;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * Author: donglang
- * Time: 2025-11-03
- * Des: 钱包管理Controller
- * Version: 1.0
- */
-@Tag(name = "线下钱包管理", description = "提供钱包相关操作接口")
-@RestController
-@RequestMapping("/biz/wallet")
-@RequiredArgsConstructor
-public class KwpBizWalletController {
-
-    private final KwpBizWalletService kwpBizWalletService;
-
-
-    /**
-     * 分页查询钱包明细
-     *
-     * @param request 查询参数
-     * @return 钱包分页列表
-     */
-    @Operation(summary = "分页查询钱包明细", description = "根据条件分页查询钱包明细信息")
-    @PostMapping("/pageBizWalletList")
-    public BaseResult<PageDataResult<KwpBizWalletPageResponse>> pageBizWalletList(@RequestBody KwpBizWalletQueryRequest request) {
-        PageDataResult<KwpBizWalletPageResponse> WalletPageList = kwpBizWalletService.pageBizWalletList(request);
-        return BaseResult.success(WalletPageList);
-    }
-
-    /**
-     * 新增钱包
-     *
-     * @param request 钱包信息
-     * @return 操作结果
-     */
-    @Operation(summary = "新增钱包", description = "新增一个钱包账户")
-    @PostMapping("/addWallet")
-    public BaseResult addWallet(@RequestBody @Validated KwpBizWalletSaveRequest request) {
-        kwpBizWalletService.addWallet(request);
-        return BaseResult.success();
-    }
-
-    /**
-     * 钱包状态更新
-     *
-     * @param id 钱包ID
-     * @return 操作结果
-     */
-    @Operation(summary = "更新钱包状态", description = "根据ID更新钱包状态")
-    @Parameter(name = "id", description = "钱包ID", required = true)
-    @PostMapping("/updateWallet")
-    public BaseResult updateWallet(Long id) {
-        kwpBizWalletService.updateWallet(id);
-        return BaseResult.success();
-    }
-
-    /**
-     * 钱包金额更新
-     *
-     * @param request 钱包金额更新信息
-     * @return 操作结果
-     */
-    @Operation(summary = "更新钱包金额", description = "更新钱包金额信息")
-    @PostMapping("/updateWalletAmount")
-    public BaseResult updateWalletAmount(@RequestBody @Validated KwpBizWalletPrepayRequest request) {
-        kwpBizWalletService.updateWalletAmount(request);
-        return BaseResult.success();
-    }
-
-    /**
-     * 分页查询钱包冻账明细
-     *
-     * @param request 查询参数
-     * @return 冻结明细分页列表
-     */
-    @Operation(summary = "分页查询钱包冻账明细", description = "根据条件分页查询钱包冻结明细信息")
-    @PostMapping("/walletPrepayDetail")
-    public BaseResult<PageDataResult<KwpBizWalletPrepayPageResponse>> walletPrepayDetail(@RequestBody @Validated KwpBizWalletPrepayQueryRequest request) {
-        PageDataResult<KwpBizWalletPrepayPageResponse> walletPrepayPageDataResult = kwpBizWalletService.walletPrepayDetail(request);
-        return BaseResult.success(walletPrepayPageDataResult);
-    }
-
-    /**
-     * 钱包冻账明细导出
-     *
-     * @param response HTTP响应
-     * @param request  查询参数
-     * @return 操作结果
-     */
-    @Operation(summary = "导出钱包冻结明细", description = "导出钱包冻结明细为Excel文件")
-    @PostMapping("/exportWalletPrepay")
-    public void exportWalletPrepay(@RequestBody @Validated KwpBizWalletPrepayQueryRequest request, HttpServletResponse response) {
-        //查询导出数据
-        List<KwpBizWalletPrepayExcelVO> excelVOList = kwpBizWalletService.queryExportWalletPrepay(request);
-        //导出
-        ExcelUtil.downData(response, KwpBizWalletPrepayExcelVO.class, excelVOList);
-    }
-
-
-}

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

@@ -1,318 +0,0 @@
-package com.sckw.payment.controller;
-
-import com.sckw.core.annotation.RepeatSubmit;
-import com.sckw.core.model.vo.TableTop;
-import com.sckw.core.web.response.HttpResult;
-import com.sckw.excel.utils.ExcelUtil;
-import com.sckw.payment.model.constant.LedgerEnum;
-import com.sckw.payment.model.constant.LogisticsUnitType;
-import com.sckw.payment.model.dto.LedgerLogisticsDto;
-import com.sckw.payment.model.vo.req.*;
-import com.sckw.payment.model.vo.res.LedgerLogisticsVo;
-import com.sckw.payment.service.KwpLedgerLogisticsService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
-import org.springframework.beans.BeanUtils;
-import org.springframework.util.CollectionUtils;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 对账-物流订单
- *
- * @author xucaiqin
- */
-@Tag(name = "物流对账管理", description = "提供物流对账相关操作接口")
-@Validated
-@RestController
-@RequestMapping("/kwpLedgerLogistics")
-public class KwpLedgerLogisticsController {
-    @Resource
-    private KwpLedgerLogisticsService kwpLedgerLogisticsService;
-
-    /**
-     * 物流对账单-发起对账(保存草稿)（承运方）
-     *
-     * @param logisticsReq 保存物流对账单参数
-     * @return 操作结果
-     */
-    @Operation(summary = "发起对账(保存草稿)", description = "物流对账单-发起对账(保存草稿)（承运方）")
-    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
-    @PostMapping("sendDraft")
-    public HttpResult sendDraft(@RequestBody @Valid LogisticsSendReq logisticsReq) {
-        return HttpResult.ok(kwpLedgerLogisticsService.sendLedgerDraft(logisticsReq));
-    }
-
-    /**
-     * 物流对账单-发起对账（承运方）
-     *
-     * @param logisticsReq 保存物流对账单参数
-     * @return 操作结果
-     */
-    @Operation(summary = "发起对账", description = "物流对账单-发起对账（承运方）")
-    @PostMapping("send")
-    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
-    public HttpResult send(@RequestBody @Valid LogisticsSendReq logisticsReq) {
-        return HttpResult.ok(kwpLedgerLogisticsService.sendLedger(logisticsReq));
-    }
-
-    /**
-     * 托运方物流对账单列表查询
-     *
-     * @param logisticsReq 物流订单查询参数
-     * @return 对账单列表
-     */
-    @Operation(summary = "托运方物流对账单列表查询", description = "托运方物流对账单列表查询")
-    @PostMapping("shipperList")
-    public HttpResult shipperList(@RequestBody LogisticsReq logisticsReq) {
-        return HttpResult.ok(kwpLedgerLogisticsService.shipperList(logisticsReq));
-    }
-
-    /**
-     * 托运方对账单关联订单
-     *
-     * @param ledgerListReq 对账单id
-     * @return 关联订单列表
-     */
-    @Operation(summary = "托运方对账单关联订单", description = "托运方对账单关联订单")
-    @GetMapping("shipperOrderList")
-    public HttpResult shipperOrderList(@Valid LedgerListReq ledgerListReq) {
-        return HttpResult.ok(kwpLedgerLogisticsService.orderList(ledgerListReq));
-    }
-
-    /**
-     * 承运方物流对账单列表查询（物流公司、收钱方）
-     *
-     * @param logisticsReq 物流订单查询参数
-     * @return 对账单列表
-     */
-    @Operation(summary = "承运方物流对账单列表查询", description = "承运方物流对账单列表查询（物流公司、收钱方）")
-    @PostMapping("carrierList")
-    public HttpResult carrierList(@RequestBody LogisticsReq logisticsReq) {
-        return HttpResult.ok(kwpLedgerLogisticsService.carrierList(logisticsReq));
-    }
-
-    /**
-     * 承运方对账单关联订单
-     *
-     * @param ledgerListReq 对账单id
-     * @return 关联订单列表
-     */
-    @Operation(summary = "承运方对账单关联订单", description = "承运方对账单关联订单")
-    @GetMapping("carrierOrderList")
-    public HttpResult carrierOrderList(@Valid LedgerListReq ledgerListReq) {
-        return HttpResult.ok(kwpLedgerLogisticsService.orderList(ledgerListReq));
-    }
-
-    /**
-     * 承运方-查询物流对账单详情
-     *
-     * @param id 物流对账单id
-     * @return 物流对账单详情
-     */
-    @Operation(summary = "承运方-查询物流对账单详情", description = "承运方-查询物流对账单详情")
-    @Parameter(name = "id", description = "物流对账单id", required = true)
-    @GetMapping("queryCarrierDetail")
-    public HttpResult queryCarrierDetail(@RequestParam("id") @NotBlank(message = "物流对账单id不能为空") String id) {
-        return HttpResult.ok(kwpLedgerLogisticsService.queryDetail(Long.valueOf(id), LogisticsUnitType.SHIPPER));
-    }
-
-    /**
-     * 托运方-查询物流对账单详情
-     *
-     * @param id 物流对账单id
-     * @return 物流对账单详情
-     */
-    @Operation(summary = "托运方-查询物流对账单详情", description = "托运方-查询物流对账单详情")
-    @Parameter(name = "id", description = "物流对账单id", required = true)
-    @GetMapping("queryShipperDetail")
-    public HttpResult queryDetail(@RequestParam("id") @NotBlank(message = "物流对账单id不能为空") String id) {
-        return HttpResult.ok(kwpLedgerLogisticsService.queryDetail(Long.valueOf(id), LogisticsUnitType.CARRIER));
-    }
-
-    /**
-     * 修改物流对账单详情（修改物流对账单接口使用） 仅发起对账方支持修改
-     *
-     * @param id 物流对账单id
-     * @return 物流对账单详情
-     */
-    @Operation(summary = "修改物流对账单详情", description = "修改物流对账单详情（修改物流对账单接口使用） 仅发起对账方支持修改")
-    @Parameter(name = "id", description = "物流对账单id", required = true)
-    @GetMapping("queryUpdate")
-    public HttpResult queryUpdate(@RequestParam("id") @NotBlank(message = "物流对账单id不能为空") String id) {
-        return HttpResult.ok(kwpLedgerLogisticsService.queryUpdate(Long.valueOf(id)));
-    }
-
-    /**
-     * 托运方对账单统计
-     *
-     * @param logisticsReq 物流订单查询参数
-     * @return 物流对账单统计数据
-     */
-    @Operation(summary = "托运方对账单统计", description = "托运方对账单统计")
-    @PostMapping("shipperCount")
-    public HttpResult shipperCount(@RequestBody LogisticsReq logisticsReq) {
-        logisticsReq.setUnitType(LogisticsUnitType.CARRIER);
-        logisticsReq.setUnitTypeTwo(LogisticsUnitType.SHIPPER);
-        List<TableTop> tableTops = kwpLedgerLogisticsService.orderCount(logisticsReq);
-        List<Integer> re = new ArrayList<>() {{
-            add(LedgerEnum.SAVE.getStatus());
-            add(LedgerEnum.REVOCATION.getStatus());
-        }};
-        return HttpResult.ok(tableTops.stream().filter(a -> !re.contains(a.getValue())).collect(Collectors.toList()));
-    }
-
-    /**
-     * 承运方对账单统计
-     *
-     * @param logisticsReq 物流订单查询参数
-     * @return 物流对账单统计数据
-     */
-    @Operation(summary = "承运方对账单统计", description = "承运方对账单统计")
-    @PostMapping("carrierCount")
-    public HttpResult carrierCount(@RequestBody LogisticsReq logisticsReq) {
-        logisticsReq.setUnitType(LogisticsUnitType.SHIPPER);
-        logisticsReq.setUnitTypeTwo(LogisticsUnitType.CARRIER);
-        return HttpResult.ok(kwpLedgerLogisticsService.orderCount(logisticsReq));
-    }
-
-    /**
-     * 删除对账单
-     * 释放关联的订单（只有删除操作才释放订单）
-     *
-     * @param id 物流对账单id
-     * @return 操作结果
-     */
-    @Operation(summary = "删除对账单", description = "删除对账单，释放关联的订单（只有删除操作才释放订单）")
-    @Parameter(name = "id", description = "物流对账单id", required = true)
-    @DeleteMapping("delete")
-    public HttpResult delete(@RequestParam("id") @NotBlank(message = "物流对账单id不能为空") String id) {
-        return HttpResult.ok(kwpLedgerLogisticsService.remove(Long.valueOf(id)));
-    }
-
-    /**
-     * 物流对账单-撤回对账
-     *
-     * @param id 物流对账单id
-     * @return 操作结果
-     */
-    @Operation(summary = "撤回对账", description = "物流对账单-撤回对账")
-    @Parameter(name = "id", description = "物流对账单id", required = true)
-    @PostMapping("back")
-    public HttpResult back(@RequestParam("id") @NotBlank(message = "物流对账单id不能为空") String id) {
-        return HttpResult.ok(kwpLedgerLogisticsService.backOrder(Long.valueOf(id)));
-    }
-
-    /**
-     * 物流对账单-对账确认
-     *
-     * @param confirmReq 确认参数
-     * @return 操作结果
-     */
-    @Operation(summary = "对账确认", description = "物流对账单-对账确认")
-    @PostMapping("confirm")
-    public HttpResult confirm(@RequestBody @Valid LedgerConfirmReq confirmReq) {
-        return HttpResult.ok(kwpLedgerLogisticsService.confirmOrder(confirmReq));
-    }
-
-    /**
-     * 物流对账单-驳回查询
-     *
-     * @param id 物流对账单id
-     * @return 驳回信息
-     */
-    @Operation(summary = "驳回查询", description = "物流对账单-驳回查询")
-    @Parameter(name = "id", description = "物流对账单id", required = true)
-    @GetMapping("queryBack")
-    public HttpResult queryBack(@RequestParam("id") @NotBlank(message = "物流对账单id不能为空") String id) {
-        return HttpResult.ok(kwpLedgerLogisticsService.queryBack(Long.valueOf(id)));
-    }
-
-    /**
-     * 物流对账单-驳回
-     *
-     * @param ledgerReq 驳回参数
-     * @return 操作结果
-     */
-    @Operation(summary = "驳回对账单", description = "物流对账单-驳回")
-    @PostMapping("doBack")
-    public HttpResult doBack(@RequestBody @Valid LedgerReq ledgerReq) {
-        return HttpResult.ok(kwpLedgerLogisticsService.doBack(ledgerReq));
-    }
-
-    /**
-     * 物流对账单-对账完成
-     * <p>
-     * 生成结算单
-     * </p>
-     *
-     * @param ledgerReq 对账完成参数
-     * @return 操作结果
-     */
-    @Operation(summary = "对账完成", description = "物流对账单-对账完成，生成结算单")
-    @PostMapping("success")
-    public HttpResult orderSuccess(@RequestBody @Valid LedgerSuccessReq ledgerReq) {
-        return HttpResult.ok(kwpLedgerLogisticsService.orderSuccess(ledgerReq));
-    }
-
-    /**
-     * 托运方-导出对账单
-     *
-     * @param response HTTP响应
-     * @param logisticsReq 查询参数
-     * @return 操作结果
-     */
-    @Operation(summary = "托运方-导出对账单", description = "托运方-导出")
-    @PostMapping("exportShipper")
-    public HttpResult exportShipper(HttpServletResponse response, @RequestBody LogisticsReq logisticsReq) {
-        logisticsReq.setUnitType(LogisticsUnitType.CARRIER);
-        logisticsReq.setUnitTypeTwo(LogisticsUnitType.SHIPPER);
-        List<LedgerLogisticsDto> list = kwpLedgerLogisticsService.exportList(logisticsReq, logisticsReq.getIdList());
-        if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("暂无数据，请确认");
-        }
-        List<LedgerLogisticsVo> collect = list.stream().map(a -> {
-            LedgerLogisticsVo ledgerLogisticsVo = new LedgerLogisticsVo();
-            BeanUtils.copyProperties(a, ledgerLogisticsVo);
-            return ledgerLogisticsVo;
-        }).collect(Collectors.toList());
-
-        ExcelUtil.downData(response, LedgerLogisticsVo.class, collect);
-        return null;
-    }
-
-    /**
-     * 承运方-导出对账单
-     *
-     * @param response HTTP响应
-     * @param logisticsReq 查询参数
-     * @return 操作结果
-     */
-    @Operation(summary = "承运方-导出对账单", description = "承运方-导出对账单")
-    @PostMapping("exportCarrier")
-    public HttpResult exportCarrier(HttpServletResponse response, @RequestBody LogisticsReq logisticsReq) {
-        logisticsReq.setUnitType(LogisticsUnitType.SHIPPER);
-        logisticsReq.setUnitTypeTwo(LogisticsUnitType.CARRIER);
-        List<LedgerLogisticsDto> list = kwpLedgerLogisticsService.exportList(logisticsReq, logisticsReq.getIdList());
-        if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("暂无数据，请确认");
-        }
-        List<LedgerLogisticsVo> collect = list.stream().map(a -> {
-            LedgerLogisticsVo ledgerLogisticsVo = new LedgerLogisticsVo();
-            BeanUtils.copyProperties(a, ledgerLogisticsVo);
-            return ledgerLogisticsVo;
-        }).collect(Collectors.toList());
-
-        ExcelUtil.downData(response, LedgerLogisticsVo.class, collect);
-        return null;
-    }
-}

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

@@ -1,316 +0,0 @@
-package com.sckw.payment.controller;
-
-import com.sckw.core.annotation.RepeatSubmit;
-import com.sckw.core.model.vo.TableTop;
-import com.sckw.core.web.response.HttpResult;
-import com.sckw.excel.utils.ExcelUtil;
-import com.sckw.payment.model.constant.LedgerEnum;
-import com.sckw.payment.model.constant.TradeUnitType;
-import com.sckw.payment.model.dto.LedgerTradeDto;
-import com.sckw.payment.model.vo.req.*;
-import com.sckw.payment.model.vo.res.LedgerTradeVo;
-import com.sckw.payment.service.KwpLedgerTradeService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
-import org.springframework.beans.BeanUtils;
-import org.springframework.util.CollectionUtils;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 对账-交易订单
- *
- * @author xucaiqin
- */
-@Tag(name = "交易对账管理", description = "提供交易对账相关操作接口")
-@RestController
-@RequestMapping("/kwpLedgerTrade")
-@Validated
-public class KwpLedgerTradeController {
-    @Resource
-    private KwpLedgerTradeService kwpLedgerTradeService;
-
-
-    /**
-     * 贸易对账单-发起对账(保存草稿)
-     *
-     * @param tradeSendReq 对账单参数
-     * @return 操作结果
-     */
-    @Operation(summary = "发起对账(保存草稿)", description = "贸易对账单-发起对账(保存草稿)")
-    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
-    @PostMapping("sendDraft")
-    public HttpResult sendDraft(@RequestBody @Valid TradeSendReq tradeSendReq) {
-        return HttpResult.ok(kwpLedgerTradeService.sendLedgerDraft(tradeSendReq));
-    }
-
-    /**
-     * 贸易对账单-发起对账
-     *
-     * @param tradeSendReq 对账单参数
-     * @return 操作结果
-     */
-    @Operation(summary = "发起对账", description = "贸易对账单-发起对账")
-    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
-    @PostMapping("send")
-    public HttpResult send(@RequestBody @Valid TradeSendReq tradeSendReq) {
-        return HttpResult.ok(kwpLedgerTradeService.sendLedger(tradeSendReq));
-    }
-
-    /**
-     * 贸易对账单列表查询 销售方
-     *
-     * @param tradeReq 查询参数
-     * @return 对账单列表
-     */
-    @Operation(summary = "销售方贸易对账单列表", description = "贸易对账单列表查询 销售方")
-    @PostMapping("sellList")
-    public HttpResult sellList(@RequestBody TradeReq tradeReq) {
-        return HttpResult.ok(kwpLedgerTradeService.sellList(tradeReq));
-    }
-
-    /**
-     * 销售方对账单关联订单
-     *
-     * @param ledgerListReq 对账单id
-     * @return 关联订单列表
-     */
-    @Operation(summary = "销售方对账单关联订单", description = "销售方对账单关联订单")
-    @GetMapping("sellOrderList")
-    public HttpResult sellOrderList(@Valid LedgerListReq ledgerListReq) {
-        return HttpResult.ok(kwpLedgerTradeService.orderList(ledgerListReq));
-    }
-
-    /**
-     * 贸易对账单列表查询 采购方
-     *
-     * @param tradeReq 查询参数
-     * @return 对账单列表
-     */
-    @Operation(summary = "采购方贸易对账单列表", description = "贸易对账单列表查询 采购方")
-    @PostMapping("purchaseList")
-    public HttpResult purchaseList(@RequestBody TradeReq tradeReq) {
-        return HttpResult.ok(kwpLedgerTradeService.purchaseList(tradeReq));
-    }
-
-    /**
-     * 对账单关联订单
-     *
-     * @param ledgerListReq 对账单id
-     * @return 关联订单列表
-     */
-    @Operation(summary = "采购方对账单关联订单", description = "采购方对账单关联订单")
-    @GetMapping("purchaseOrderList")
-    public HttpResult purchaseOrderList(@Valid LedgerListReq ledgerListReq) {
-        return HttpResult.ok(kwpLedgerTradeService.orderList(ledgerListReq));
-    }
-
-    /**
-     * 销售-查询贸易对账单详情
-     *
-     * @param id 对账单id
-     * @return 对账单详情
-     */
-    @Operation(summary = "销售方贸易对账单详情", description = "销售-查询贸易对账单详情")
-    @Parameter(name = "id", description = "对账单ID", required = true)
-    @GetMapping("querySellDetail")
-    public HttpResult querySellDetail(@RequestParam("id") String id) {
-        return HttpResult.ok(kwpLedgerTradeService.queryDetail(Long.valueOf(id), TradeUnitType.PURCHASE));
-    }
-
-    /**
-     * 采购-查询贸易对账单详情
-     *
-     * @param id 对账单id
-     * @return 对账单详情
-     */
-    @Operation(summary = "采购方贸易对账单详情", description = "采购-查询贸易对账单详情")
-    @Parameter(name = "id", description = "对账单ID", required = true)
-    @GetMapping("queryPurchaseDetail")
-    public HttpResult queryPurchaseDetail(@RequestParam("id") String id) {
-        return HttpResult.ok(kwpLedgerTradeService.queryDetail(Long.valueOf(id), TradeUnitType.SELL));
-    }
-
-    /**
-     * 修改贸易对账单详情（修改物流对账单接口使用）
-     *
-     * @param id 对账单id
-     * @return 对账单详情
-     */
-    @Operation(summary = "修改贸易对账单详情", description = "修改贸易对账单详情（修改物流对账单接口使用）")
-    @Parameter(name = "id", description = "对账单ID", required = true)
-    @GetMapping("queryUpdate")
-    public HttpResult queryUpdate(@RequestParam("id") String id) {
-        return HttpResult.ok(kwpLedgerTradeService.queryUpdate(Long.valueOf(id)));
-    }
-
-    /**
-     * 贸易订单数分类统计(销售方)
-     *
-     * @param tradeReq 查询参数
-     * @return 统计结果
-     */
-    @Operation(summary = "销售方贸易订单分类统计", description = "贸易订单数分类统计(销售方)")
-    @PostMapping("sellCount")
-    public HttpResult sellCount(@RequestBody TradeReq tradeReq) {
-        tradeReq.setUnitType(TradeUnitType.PURCHASE);
-        tradeReq.setUnitTypeTwo(TradeUnitType.SELL);
-        return HttpResult.ok(kwpLedgerTradeService.orderCount(tradeReq));
-    }
-
-    /**
-     * 贸易订单数分类统计(采购方)
-     *
-     * @param tradeReq 查询参数
-     * @return 统计结果
-     */
-    @Operation(summary = "采购方贸易订单分类统计", description = "贸易订单数分类统计(采购方)")
-    @PostMapping("purchaseCount")
-    public HttpResult purchaseCount(@RequestBody TradeReq tradeReq) {
-        tradeReq.setUnitType(TradeUnitType.SELL);
-        tradeReq.setUnitTypeTwo(TradeUnitType.PURCHASE);
-        List<TableTop> tableTops = kwpLedgerTradeService.orderCount(tradeReq);
-        List<Integer> re = new ArrayList<>() {{
-            add(LedgerEnum.SAVE.getStatus());
-            add(LedgerEnum.REVOCATION.getStatus());
-        }};
-        return HttpResult.ok(tableTops.stream().filter(a -> !re.contains(a.getValue())).collect(Collectors.toList()));
-    }
-
-    /**
-     * 删除对账单
-     *
-     * @param id 对账单ID
-     * @return 操作结果
-     */
-    @Operation(summary = "删除对账单", description = "删除对账单")
-    @Parameter(name = "id", description = "对账单ID", required = true)
-    @DeleteMapping("delete")
-    public HttpResult delete(@NotBlank(message = "id不能为空") String id) {
-        return HttpResult.ok(kwpLedgerTradeService.remove(Long.valueOf(id)));
-    }
-
-    /**
-     * 贸易对账单-撤回对账
-     *
-     * @param id 对账单ID
-     * @return 操作结果
-     */
-    @Operation(summary = "撤回对账", description = "贸易对账单-撤回对账")
-    @Parameter(name = "id", description = "对账单ID", required = true)
-    @PostMapping("back")
-    public HttpResult back(@NotBlank(message = "id不能为空") @RequestParam("id") String id) {
-        return HttpResult.ok(kwpLedgerTradeService.backOrder(Long.valueOf(id)));
-    }
-
-    /**
-     * 贸易对账单-对账确认
-     *
-     * @param confirmReq 确认参数
-     * @return 操作结果
-     */
-    @Operation(summary = "对账确认", description = "贸易对账单-对账确认")
-    @PostMapping("confirm")
-    public HttpResult confirm(@RequestBody @Valid LedgerConfirmReq confirmReq) {
-        return HttpResult.ok(kwpLedgerTradeService.confirmOrder(confirmReq));
-    }
-
-    /**
-     * 贸易对账单-驳回查询
-     *
-     * @param id 对账单ID
-     * @return 驳回信息
-     */
-    @Operation(summary = "驳回查询", description = "贸易对账单-驳回查询")
-    @Parameter(name = "id", description = "对账单ID", required = true)
-    @GetMapping("queryBack")
-    public HttpResult queryBack(@NotBlank(message = "id不能为空") @RequestParam("id") String id) {
-        return HttpResult.ok(kwpLedgerTradeService.queryBack(Long.valueOf(id)));
-    }
-
-    /**
-     * 贸易对账单-驳回对账
-     *
-     * @param ledgerReq 驳回参数
-     * @return 操作结果
-     */
-    @Operation(summary = "驳回对账", description = "贸易对账单-驳回对账")
-    @PostMapping("doBack")
-    public HttpResult doBack(@RequestBody @Valid LedgerReq ledgerReq) {
-        return HttpResult.ok(kwpLedgerTradeService.doBack(ledgerReq));
-    }
-
-    /**
-     * 贸易对账单-对账完成
-     * <p>
-     * 生成结算单
-     * </p>
-     *
-     * @param ledgerReq 完成参数
-     * @return 操作结果
-     */
-    @Operation(summary = "对账完成", description = "贸易对账单-对账完成，生成结算单")
-    @PostMapping("success")
-    public HttpResult orderSuccess(@RequestBody @Valid LedgerSuccessReq ledgerReq) {
-        return HttpResult.ok(kwpLedgerTradeService.orderSuccess(ledgerReq));
-    }
-
-    /**
-     * 导出销售方对账单
-     *
-     * @param response HTTP响应
-     * @param tradeReq 查询参数
-     * @return 操作结果
-     */
-    @Operation(summary = "导出销售方对账单", description = "导出销售方对账单")
-    @PostMapping("sellExport")
-    public HttpResult sellExport(HttpServletResponse response, @RequestBody TradeReq tradeReq) {
-        tradeReq.setUnitType(TradeUnitType.PURCHASE);
-        tradeReq.setUnitTypeTwo(TradeUnitType.SELL);
-        List<LedgerTradeDto> list = kwpLedgerTradeService.exportList(tradeReq, tradeReq.getIdList());
-        if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("暂无数据，请确认");
-        }
-        List<LedgerTradeVo> collect = list.stream().map(a -> {
-            LedgerTradeVo ledgerTradeVo = new LedgerTradeVo();
-            BeanUtils.copyProperties(a, ledgerTradeVo);
-            return ledgerTradeVo;
-        }).collect(Collectors.toList());
-        ExcelUtil.downData(response, LedgerTradeVo.class, collect);
-        return null;
-    }
-
-    /**
-     * 导出采购方对账单
-     *
-     * @param response HTTP响应
-     * @param tradeReq 查询参数
-     * @return 操作结果
-     */
-    @Operation(summary = "导出采购方对账单", description = "导出采购方对账单")
-    @PostMapping("purchaseExport")
-    public HttpResult purchaseExport(HttpServletResponse response, @RequestBody TradeReq tradeReq) {
-        tradeReq.setUnitType(TradeUnitType.SELL);
-        tradeReq.setUnitTypeTwo(TradeUnitType.PURCHASE);
-        List<LedgerTradeDto> list = kwpLedgerTradeService.exportList(tradeReq, tradeReq.getIdList());
-        if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("暂无数据，请确认");
-        }
-        List<LedgerTradeVo> collect = list.stream().map(a -> {
-            LedgerTradeVo ledgerTradeVo = new LedgerTradeVo();
-            BeanUtils.copyProperties(a, ledgerTradeVo);
-            return ledgerTradeVo;
-        }).collect(Collectors.toList());
-        ExcelUtil.downData(response, LedgerTradeVo.class, collect);
-        return null;
-    }
-}

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

@@ -1,134 +0,0 @@
-package com.sckw.payment.controller;
-
-import com.sckw.core.web.response.HttpResult;
-import com.sckw.excel.utils.ExcelUtil;
-import com.sckw.payment.model.constant.LogisticsUnitType;
-import com.sckw.payment.model.dto.SettlementLogisticsDto;
-import com.sckw.payment.model.vo.req.SettlementReq;
-import com.sckw.payment.model.vo.res.SettlementLogisticsVo;
-import com.sckw.payment.service.KwpSettlementLogisticsService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.Valid;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 结算-物流订单
- *
- * @author Aick Spt
- * @date 2023-07-18 16:34
- */
-@Tag(name = "物流结算管理", description = "提供物流订单结算相关操作接口")
-@RestController
-@Slf4j
-@RequestMapping(path = "/kwpSettlementLogistics")
-public class KwpSettlementLogisticsController {
-
-    @Resource
-    private KwpSettlementLogisticsService kwpSettlementLogisticsService;
-
-    //   ========= 运费收款 承运方 =========
-    @Operation(summary = "运费收款-物流订单列表", description = "查询运费收款的物流订单列表（承运方）")
-    @PostMapping(path = "pageListCollection")
-    public HttpResult pageSelectCollection(@RequestBody @Valid SettlementReq settlementReq) {
-        return HttpResult.ok(kwpSettlementLogisticsService.pageSelectCollection(settlementReq));
-    }
-
-    @Operation(summary = "运费收款-物流订单各状态列表总数", description = "统计运费收款的物流订单各状态列表总数（承运方）")
-    @PostMapping(path = "getCountListCollection")
-    public HttpResult getCountListCollection(@RequestBody @Valid SettlementReq settlementReq) {
-        return HttpResult.ok(kwpSettlementLogisticsService.getCountListCollection(settlementReq));
-    }
-
-    /**
-     * 承运方导出
-     *
-     * @param response      HTTP响应
-     * @param settlementReq 查询参数
-     * @return 操作结果
-     */
-    @Operation(summary = "运费收款-导出物流订单表数据", description = "根据条件导出运费收款的物流订单表数据（承运方）")
-    @PostMapping(path = "exportCollection")
-    public HttpResult exportCollection(HttpServletResponse response, @RequestBody @Valid SettlementReq settlementReq) {
-        settlementReq.setUnitType(LogisticsUnitType.SHIPPER);
-        settlementReq.setUnitTypeTwo(LogisticsUnitType.CARRIER);
-        List<SettlementLogisticsDto> list;
-        list = kwpSettlementLogisticsService.selectList(settlementReq);
-        return this.export(response, list);
-    }
-
-    @Operation(summary = "运费收款-物流订单详情", description = "查询运费收款的物流订单详情（承运方）")
-    @Parameter(name = "id", description = "订单ID", required = true)
-    @GetMapping(path = "detailCollection")
-    public HttpResult detailCollection(@RequestParam("id") Long id) {
-        return HttpResult.ok(kwpSettlementLogisticsService.detailCollection(id));
-    }
-
-
-    //   ========= 运费付款 托运方 =========
-    @Operation(summary = "运费付款-物流订单列表", description = "查询运费付款的物流订单列表（托运方）")
-    @PostMapping(path = "pageListPayment")
-    public HttpResult pageSelectPayment(@RequestBody @Valid SettlementReq settlementReq) {
-        return HttpResult.ok(kwpSettlementLogisticsService.pageSelectPayment(settlementReq));
-    }
-
-    @Operation(summary = "运费付款-物流订单各状态列表总数", description = "统计运费付款的物流订单各状态列表总数（托运方）")
-    @PostMapping(path = "getCountListPayment")
-    public HttpResult getCountListPayment(@RequestBody @Valid SettlementReq settlementReq) {
-        return HttpResult.ok(kwpSettlementLogisticsService.getCountListPayment(settlementReq));
-    }
-
-    /**
-     * 托运方导出
-     *
-     * @param response      HTTP响应
-     * @param settlementReq 查询参数
-     * @return 操作结果
-     */
-    @Operation(summary = "运费付款-导出物流订单表数据", description = "根据条件导出运费付款的物流订单表数据（托运方）")
-    @PostMapping(path = "exportPayment")
-    public HttpResult exportPayment(HttpServletResponse response, @RequestBody @Valid SettlementReq settlementReq) {
-        settlementReq.setUnitType(LogisticsUnitType.CARRIER);
-        settlementReq.setUnitTypeTwo(LogisticsUnitType.SHIPPER);
-        List<SettlementLogisticsDto> list;
-        list = kwpSettlementLogisticsService.selectList(settlementReq);
-        return this.export(response, list);
-    }
-
-    @Operation(summary = "物流订单详情", description = "查询物流订单详情（托运方）")
-    @Parameter(name = "id", description = "订单ID", required = true)
-    @GetMapping(path = "detailPayment")
-    public HttpResult detailPayment(@RequestParam("id") Long id) {
-        return HttpResult.ok(kwpSettlementLogisticsService.detailPayment(id));
-    }
-
-    /**
-     * 导出
-     *
-     * @author Aick Spt
-     * @date 2023-07-24 15:49
-     */
-    private HttpResult export(HttpServletResponse response, List<SettlementLogisticsDto> list) {
-        if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("暂无数据，请确认");
-        }
-        List<SettlementLogisticsVo> collect = list.stream().map(a -> {
-            SettlementLogisticsVo settlementLogisticsVo = new SettlementLogisticsVo();
-            BeanUtils.copyProperties(a, settlementLogisticsVo);
-            return settlementLogisticsVo;
-        }).collect(Collectors.toList());
-        ExcelUtil.downData(response, SettlementLogisticsVo.class, collect);
-        return null;
-    }
-
-
-}

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

@@ -1,83 +0,0 @@
-package com.sckw.payment.controller;
-
-import com.sckw.core.web.response.HttpResult;
-import com.sckw.payment.model.constant.SettlementOrderTypeEnum;
-import com.sckw.payment.model.constant.SettlementWalletPayTypeEnum;
-import com.sckw.payment.model.vo.req.OfflinePaymentReq;
-import com.sckw.payment.model.vo.req.SettlementOfflinePayReq;
-import com.sckw.payment.model.vo.req.SettlementOfflineReq;
-import com.sckw.payment.service.KwpSettlementOfflineService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 结算-线下记录（交易订单结算/物流订单结算）
- *
- * @author Aick Spt
- * @date 2023-07-20 11:42
- */
-@Tag(name = "线下结算管理", description = "提供线下结算记录相关操作接口")
-@RestController
-@RequestMapping(path = "/kwpSettlementOffline")
-public class KwpSettlementOfflineController {
-
-    @Resource
-    private KwpSettlementOfflineService kwpSettlementOfflineService;
-
-    //  =========  运费收款  =========
-
-    @Operation(summary = "物流-线下付款(运费收款)记录-列表", description = "查询物流订单线下付款(运费收款)记录列表")
-    @PostMapping(path = "pageListLogisticsCollection")
-    public HttpResult pageListLogisticsCollection(@RequestBody @Valid SettlementOfflineReq settlementOfflineReq) {
-        settlementOfflineReq.setOrderType(SettlementOrderTypeEnum.LOGISTICS.getStatus());
-        return HttpResult.ok(kwpSettlementOfflineService.pageListLogisticsCollection(settlementOfflineReq));
-    }
-
-    @Operation(summary = "物流-线下付款(运费收款)记录-详情", description = "查询物流订单线下付款(运费收款)记录详情")
-    @Parameter(name = "id", description = "记录ID", required = true)
-    @GetMapping(path = "detailLogisticsCollection")
-    public HttpResult detailLogisticsCollection(@RequestParam("id") Long id) {
-        return HttpResult.ok(kwpSettlementOfflineService.detailLogisticsCollection(id));
-    }
-
-    @Operation(summary = "物流-线下付款(运费收款)记录-新增", description = "新增物流订单线下付款(运费收款)记录")
-    @PostMapping(path = "confirmLogisticsCollection")
-    public HttpResult confirmLogisticsCollection(@RequestBody @Valid OfflinePaymentReq offlinePaymentReq) {
-        offlinePaymentReq.setOrderType(SettlementOrderTypeEnum.LOGISTICS.getStatus());
-        return HttpResult.ok(kwpSettlementOfflineService.confirmLogisticsCollection(offlinePaymentReq));
-    }
-
-
-    //  =========  销售收款  =========
-
-    /**
-     * 销售方-线下付款记录
-     *
-     * @param settlementOfflineReq 查询参数
-     * @return 付款记录列表
-     */
-    @Operation(summary = "交易-线下付款(销售收款)记录-列表", description = "查询交易订单线下付款(销售收款)记录列表")
-    @GetMapping(path = "pageListTrade")
-    public HttpResult pageListTradeCollection(@Valid SettlementOfflineReq settlementOfflineReq) {
-        settlementOfflineReq.setOrderType(SettlementOrderTypeEnum.TRADE.getStatus());
-        return HttpResult.ok(kwpSettlementOfflineService.pageListTradeCollection(settlementOfflineReq));
-    }
-
-    /**
-     * 销售收款-收款确认-线下付款
-     *
-     * @param payReq 付款参数
-     * @return 操作结果
-     */
-    @Operation(summary = "销售收款-收款确认-线下付款", description = "销售收款-收款确认-线下付款")
-    @PostMapping(path = "confirmTradeCollection")
-    public HttpResult confirmTradeCollection(@Valid @RequestBody SettlementOfflinePayReq payReq) {
-        payReq.setOrderType(SettlementOrderTypeEnum.TRADE.getStatus());
-        return HttpResult.ok(kwpSettlementOfflineService.confirmTradeCollection(payReq));
-    }
-
-}

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

@@ -1,186 +0,0 @@
-package com.sckw.payment.controller;
-
-import com.sckw.core.web.context.LoginUserHolder;
-import com.sckw.core.web.response.HttpResult;
-import com.sckw.excel.utils.ExcelUtil;
-import com.sckw.payment.model.constant.TradeUnitType;
-import com.sckw.payment.model.vo.req.SettlementTradeReq;
-import com.sckw.payment.model.vo.res.SettlementTradeVo;
-import com.sckw.payment.service.KwpSettlementTradeService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.Valid;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 结算-交易订单
- *
- * @author xucaiqin
- */
-@Tag(name = "交易结算管理", description = "提供交易订单结算相关操作接口")
-@RestController
-@RequestMapping(path = "/kwpSettlementTrade")
-public class KwpSettlementTradeController {
-
-    @Resource
-    private KwpSettlementTradeService kwpSettlementTradeService;
-
-    //   ========= 收款 销售 =========
-
-    /**
-     * 销售分页列表
-     *
-     * @param settlementReq 查询参数
-     * @return 结算单列表
-     */
-    @Operation(summary = "销售结算单列表", description = "查询销售结算单分页列表")
-    @PostMapping("pageSellList")
-    public HttpResult pageListCollection(@RequestBody @Valid SettlementTradeReq settlementReq) {
-        settlementReq.setUnitType(TradeUnitType.PURCHASE);
-        settlementReq.setUnitTypeTwo(TradeUnitType.SELL);
-        settlementReq.check();
-        return HttpResult.ok(kwpSettlementTradeService.pageListCollection(settlementReq));
-    }
-
-    /**
-     * 待结算、部分结算、全部结算
-     *
-     * @param settlementReq 查询参数
-     * @return 统计结果
-     */
-    @Operation(summary = "销售结算单统计", description = "统计销售结算单状态（待结算、部分结算、全部结算）")
-    @PostMapping("getSellCount")
-    public HttpResult getCount(@RequestBody @Valid SettlementTradeReq settlementReq) {
-        settlementReq.setUnitType(TradeUnitType.PURCHASE);
-        settlementReq.setUnitTypeTwo(TradeUnitType.SELL);
-        settlementReq.setEntId(LoginUserHolder.getEntId());
-        settlementReq.check();
-        return HttpResult.ok(kwpSettlementTradeService.getCount(settlementReq));
-    }
-
-    /**
-     * 表尾金额结算数据
-     *
-     * @param settlementReq 查询参数
-     * @return 金额统计
-     */
-    @Operation(summary = "销售结算金额统计", description = "统计销售结算单表尾金额结算数据")
-    @PostMapping("getSellSum")
-    public HttpResult getSellSum(@RequestBody @Valid SettlementTradeReq settlementReq) {
-        settlementReq.check();
-        settlementReq.setUnitType(TradeUnitType.PURCHASE);
-        settlementReq.setUnitTypeTwo(TradeUnitType.SELL);
-        settlementReq.setEntId(LoginUserHolder.getEntId());
-        return HttpResult.ok(kwpSettlementTradeService.getCountListCollection(settlementReq));
-    }
-
-    /**
-     * 导出销售结算单列表
-     *
-     * @param response      HTTP响应
-     * @param settlementReq 查询参数
-     * @return 操作结果
-     */
-    @Operation(summary = "导出销售结算单", description = "导出销售结算单列表")
-    @PostMapping("exportCollection")
-    public HttpResult exportCollection(HttpServletResponse response, @RequestBody @Valid SettlementTradeReq settlementReq) {
-        settlementReq.check();
-        settlementReq.setUnitType(TradeUnitType.PURCHASE);
-        settlementReq.setUnitTypeTwo(TradeUnitType.SELL);
-        settlementReq.setEntId(LoginUserHolder.getEntId());
-        List<SettlementTradeVo> list = kwpSettlementTradeService.exportList(settlementReq, settlementReq.getIdList());
-        return this.export(response, list);
-    }
-
-
-    //   ========= 付款 采购 =========
-
-    /**
-     * 采购分页列表
-     *
-     * @param settlementReq 查询参数
-     * @return 结算单列表
-     */
-    @Operation(summary = "采购结算单列表", description = "查询采购结算单分页列表")
-    @PostMapping("pagePurchaseList")
-    public HttpResult pageListPayment(@RequestBody @Valid SettlementTradeReq settlementReq) {
-        settlementReq.check();
-        settlementReq.setUnitType(TradeUnitType.SELL);
-        settlementReq.setUnitTypeTwo(TradeUnitType.PURCHASE);
-        return HttpResult.ok(kwpSettlementTradeService.pageListCollection(settlementReq));
-    }
-
-    /**
-     * 待结算、部分结算、全部结算
-     *
-     * @param settlementReq 查询参数
-     * @return 统计结果
-     */
-    @Operation(summary = "采购结算单统计", description = "统计采购结算单状态（待结算、部分结算、全部结算）")
-    @PostMapping("getPurchaseCount")
-    public HttpResult getPurchaseCount(@RequestBody @Valid SettlementTradeReq settlementReq) {
-        settlementReq.check();
-        settlementReq.setUnitType(TradeUnitType.SELL);
-        settlementReq.setUnitTypeTwo(TradeUnitType.PURCHASE);
-        settlementReq.setEntId(LoginUserHolder.getEntId());
-        return HttpResult.ok(kwpSettlementTradeService.getCount(settlementReq));
-    }
-
-    /**
-     * 表尾金额结算数据
-     *
-     * @param settlementReq 查询参数
-     * @return 金额统计
-     */
-    @Operation(summary = "采购结算金额统计", description = "统计采购结算单表尾金额结算数据")
-    @PostMapping("getPurchaseSum")
-    public HttpResult getCountListPayment(@RequestBody @Valid SettlementTradeReq settlementReq) {
-        settlementReq.check();
-        settlementReq.setUnitType(TradeUnitType.SELL);
-        settlementReq.setUnitTypeTwo(TradeUnitType.PURCHASE);
-        settlementReq.setEntId(LoginUserHolder.getEntId());
-        return HttpResult.ok(kwpSettlementTradeService.getCountListCollection(settlementReq));
-    }
-
-    /**
-     * 导出采购结算单列表
-     *
-     * @param response      HTTP响应
-     * @param settlementReq 查询参数
-     * @return 操作结果
-     */
-    @Operation(summary = "导出采购结算单", description = "导出采购结算单列表")
-    @PostMapping("exportPayment")
-    public HttpResult exportPayment(HttpServletResponse response, @RequestBody @Valid SettlementTradeReq settlementReq) {
-        settlementReq.check();
-        settlementReq.setUnitType(TradeUnitType.SELL);
-        settlementReq.setUnitTypeTwo(TradeUnitType.PURCHASE);
-        settlementReq.setEntId(LoginUserHolder.getEntId());
-        List<SettlementTradeVo> list = kwpSettlementTradeService.exportList(settlementReq, settlementReq.getIdList());
-        return this.export(response, list);
-    }
-
-    /**
-     * 导出
-     *
-     * @author Aick Spt
-     * @date 2023-07-24 15:49
-     */
-    private HttpResult export(HttpServletResponse response, List<SettlementTradeVo> list) {
-        if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("暂无数据，请确认");
-        }
-        ExcelUtil.downData(response, SettlementTradeVo.class, list);
-        return null;
-    }
-
-
-}

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

@@ -1,144 +0,0 @@
-package com.sckw.payment.controller;
-
-import com.sckw.core.web.response.HttpResult;
-import com.sckw.payment.model.constant.SettlementOrderTypeEnum;
-import com.sckw.payment.model.constant.SettlementWalletPayTypeEnum;
-import com.sckw.payment.model.vo.req.OfflinePaymentReq;
-import com.sckw.payment.model.vo.req.SettlementWalletReq;
-import com.sckw.payment.model.vo.req.WalletPayReq;
-import com.sckw.payment.service.KwpSettlementWalletService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 结算-电子钱包结算记录（交易订单结算/物流订单结算）
- *
- * @author Aick Spt
- * @date 2023-07-20 14:42
- */
-@Tag(name = "电子钱包结算管理", description = "提供电子钱包结算记录相关操作接口")
-@Validated
-@RestController
-@RequestMapping(path = "/kwpSettlementWallet")
-public class KwpSettlementWalletController {
-
-    //  =========  物流付款  =========
-
-    @Resource
-    private KwpSettlementWalletService kwpSettlementWalletService;
-
-    @Operation(summary = "物流-电子钱包付款（货到付款）结算记录-列表", description = "查询物流订单使用电子钱包付款（货到付款）的结算记录列表")
-    @PostMapping(path = "pageListLogisticsPayment")
-    public HttpResult pageListLogisticsPayment(@RequestBody @Valid SettlementWalletReq settlementWalletReq) {
-        settlementWalletReq.setPayType(SettlementWalletPayTypeEnum.CASH_ON_DELIVERY.getStatus());
-        settlementWalletReq.setOrderType(SettlementOrderTypeEnum.LOGISTICS.getStatus());
-        return HttpResult.ok(kwpSettlementWalletService.pageListLogisticsPayment(settlementWalletReq));
-    }
-
-//    @GetMapping(name = "物流-电子钱包付款（货到付款）结算记录-详情", path = "detailLogisticsPayment")
-//    public HttpResult detailLogisticsPayment(@RequestParam("id") Long id) {
-////        return HttpResult.ok(kwpSettlementWalletService.detailLogisticsPayment(id));
-//        return HttpResult.ok(null);
-//    }
-
-    /**
-     * @author Aick Spt
-     * @date 2023-07-25 09:55
-     */
-    @Operation(summary = "物流-电子钱包付款（货到付款）结算记录-新增", description = "新增物流订单使用电子钱包付款（货到付款）的结算记录")
-    @PostMapping(path = "confirmLogisticsPayment")
-    public HttpResult confirmLogisticsPayment(@RequestBody @Valid OfflinePaymentReq offlinePaymentReq) {
-        return HttpResult.ok(kwpSettlementWalletService.confirmLogisticsPayment(offlinePaymentReq));
-    }
-
-
-    /**
-     * 运费-货到付款-查询钱包余额
-     *
-     * @param id 结算单id
-     * @author Aick Spt
-     * @date 2023-08-16 11:15
-     */
-    @Operation(summary = "运费-货到付款-查询钱包余额", description = "运费-货到付款-查询钱包余额")
-    @Parameter(name = "id", description = "结算单ID", required = true)
-    @GetMapping(path = "getConfirmLogisticsPay")
-    public HttpResult getConfirmLogisticsPay(@RequestParam("id") @NotBlank(message = "id不能为空") String id) {
-        return HttpResult.ok(kwpSettlementWalletService.getConfirmLogisticsPayment(Long.parseLong(id)));
-    }
-
-
-    //  =========  销售收付款  =========
-
-    /**
-     * 采购付款记录-货到付款查询列表
-     *
-     * @param settlementWalletReq 查询参数
-     * @return 付款记录列表
-     */
-    @Operation(summary = "销售-付款记录列表（采购电子钱包结算记录）", description = "查询销售订单的付款记录列表（采购电子钱包结算记录）")
-    @GetMapping(path = "pageListTradePayment")
-    public HttpResult pageListTradePayment(@Valid SettlementWalletReq settlementWalletReq) {
-        settlementWalletReq.setPayType(SettlementWalletPayTypeEnum.CASH_ON_DELIVERY.getStatus());
-        settlementWalletReq.setOrderType(SettlementOrderTypeEnum.TRADE.getStatus());
-        return HttpResult.ok(kwpSettlementWalletService.pageList(settlementWalletReq));
-    }
-
-    /**
-     * 采购-货到付款-查询钱包余额
-     *
-     * @param id 结算单id
-     * @author Aick Spt
-     * @date 2023-07-25 09:55
-     */
-    @Operation(summary = "采购-货到付款-查询钱包余额", description = "采购订单货到付款时查询钱包余额")
-    @Parameter(name = "id", description = "结算单ID", required = true)
-    @GetMapping(path = "getConfirmPay")
-    public HttpResult getConfirmPay(@RequestParam("id") @NotBlank(message = "id不能为空") String id) {
-        return HttpResult.ok(kwpSettlementWalletService.getConfirmTradePayment(Long.parseLong(id)));
-    }
-
-    /**
-     * 采购-货到付款
-     */
-    @Operation(summary = "采购-付款确认-(新增电子钱包记录-采购货到付款)", description = "采购订单货到付款确认，新增电子钱包记录")
-    @PostMapping(path = "confirmReceive")
-    public HttpResult confirmTradePayment(@RequestBody @Valid WalletPayReq payReq) {
-        return HttpResult.ok(kwpSettlementWalletService.confirmTradePayment(payReq));
-    }
-
-    /**
-     * 销售收款记录-预付款查询列表
-     *
-     * @param settlementWalletReq 查询参数
-     * @return 收款记录列表
-     */
-    @Operation(summary = "销售-收款记录列表-预付款(电子钱包)", description = "查询销售订单的收款记录列表（预付款电子钱包）")
-    @GetMapping(path = "pageListTradeCollection")
-    public HttpResult pageListTradeCollection(@Valid SettlementWalletReq settlementWalletReq) {
-        settlementWalletReq.setPayType(SettlementWalletPayTypeEnum.ADVANCE_PAYMENT.getStatus());
-        settlementWalletReq.setOrderType(SettlementOrderTypeEnum.TRADE.getStatus());
-        return HttpResult.ok(kwpSettlementWalletService.pageList(settlementWalletReq));
-    }
-
-    /**
-     * 销售-预付款
-     *
-     * @param id 结算单id
-     * @author Aick Spt
-     * @date 2023-07-25 09:55
-     */
-    @Operation(summary = "销售-收款确认-预付款(电子钱包)", description = "销售订单收款确认，使用预付款(电子钱包)")
-    @Parameter(name = "id", description = "结算单ID", required = true)
-    @PostMapping(path = "confirmPrePay")
-    public HttpResult confirmTradeCollection(@RequestParam("id") @NotBlank(message = "id不能为空") String id) {
-        return HttpResult.ok(kwpSettlementWalletService.confirmTradeCollection(Long.parseLong(id)));
-    }
-
-
-}

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

@@ -1,62 +0,0 @@
-package com.sckw.payment.controller;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.sckw.core.web.response.HttpResult;
-import com.sckw.payment.service.WalletService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 通知
- *
- * @author xucaiqin
- * @date 2023-08-28 15:36:48
- */
-@Tag(name = "通知", description = "通知")
-@Validated
-@RestController
-@RequestMapping("/notice")
-@Slf4j
-public class NoticeController {
-    @Resource
-    private WalletService walletService;
-
-    /**
-     * 【接口】用户开户回调
-     *
-     */
-    @Operation(summary = "用户开户回调", description = "用户开户回调")
-    @PostMapping("/user")
-    public HttpResult createUser(@RequestBody @Valid JSONObject jsonObject) {
-        return HttpResult.ok(walletService.userNotice(jsonObject));
-    }
-
-    /**
-     * 【接口】提现回调通知
-     *
-     */
-    @Operation(summary = "提现回调通知", description = "提现回调通知")
-    @PostMapping("/cash")
-    public Object cash(@RequestBody @Valid JSONObject jsonObject) {
-        return HttpResult.ok(walletService.cashNotice(jsonObject));
-    }
-
-    /**
-     * 【接口】清分回调通知
-     *
-     */
-    @Operation(summary = "清分回调通知", description = "清分回调通知")
-    @PostMapping("/split")
-    public Object split(@RequestBody @Valid JSONObject jsonObject) {
-        return HttpResult.ok(walletService.splitNotice(jsonObject));
-    }
-
-}

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

@@ -1,129 +0,0 @@
-package com.sckw.payment.controller;
-
-import com.sckw.core.model.page.PageRes;
-import com.sckw.core.web.response.HttpResult;
-import com.sckw.payment.api.model.dto.common.R;
-import com.sckw.payment.model.vo.req.CashVo;
-import com.sckw.payment.model.vo.req.CashWalletReq;
-import com.sckw.payment.model.vo.req.CreateUserReq;
-import com.sckw.payment.model.vo.req.page.CashPage;
-import com.sckw.payment.model.vo.req.page.ListPage;
-import com.sckw.payment.model.vo.req.page.PayPage;
-import com.sckw.payment.model.vo.req.page.PrePayPage;
-import com.sckw.payment.model.vo.res.PrepayVo;
-import com.sckw.payment.service.WalletService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 钱包
- *
- * @author xucaiqin
- * @date 2023-08-28 15:36:48
- */
-@Tag(name = "钱包管理", description = "提供钱包相关操作接口")
-@Validated
-@RestController
-@RequestMapping("/wallet")
-@Slf4j
-public class WalletController {
-    @Resource
-    private WalletService walletService;
-
-    /**
-     * 【接口】开户
-     *
-     * @param createUserReq 开户请求参数
-     */
-    @Operation(summary = "开户", description = "为用户开通钱包账户")
-    @PostMapping("createUser")
-    public HttpResult createUser(@RequestBody @Valid CreateUserReq createUserReq) {
-        return HttpResult.ok(walletService.createUser(createUserReq));
-    }
-
-    /**
-     * 【接口】钱包信息
-     */
-    @Operation(summary = "查询用户钱包信息", description = "查询用户钱包信息")
-    @Parameter(name = "entId", description = "企业id", required = true)
-    @GetMapping("/info")
-    public R<Object> userInfo(@NotNull(message = "entId不能为空") @RequestParam("entId") Long entId) {
-        return walletService.userInfo(entId);
-    }
-
-    /**
-     * 【接口】可提现余额分页查询
-     */
-    @Operation(summary = "可提现余额分页查询", description = "可提现余额分页查询")
-    @Parameter(name = "entId", description = "企业id", required = true)
-    @PostMapping("/cashPage")
-    public R<PageRes<CashVo>> cashPage(@RequestBody @Valid CashPage cashPage) {
-        return R.ok(walletService.cashPage(cashPage));
-    }
-
-    /**
-     * 【接口】提现
-     *
-     * @param cashWalletReq 提现参数
-     * @return 操作结果
-     */
-    @Operation(summary = "提现", description = "发起提现操作")
-    @PostMapping("cashOUt")
-    public R<Object> cashOUt(@RequestBody @Valid CashWalletReq cashWalletReq) {
-        return R.ok(walletService.cashOUt(cashWalletReq));
-    }
-
-    /*预付*/
-
-    /**
-     * 【接口】预付（待履约）清单分页查询
-     *
-     * @param listPage
-     */
-    @Operation(summary = "预付（待履约）清单分页查询", description = "预付（待履约）清单分页查询")
-    @PostMapping("/prepayList")
-    public R<Object> prepayList(@RequestBody @Valid ListPage listPage) {
-        return R.ok(walletService.prepayList(listPage));
-    }
-
-    /**
-     * 【接口】支付记录/预付记录
-     */
-    @Operation(summary = "支付记录/预付记录", description = "支付记录/预付记录")
-    @PostMapping("/payList")
-    public R<Object> prepayRecord(@RequestBody @Valid PayPage payPage) {
-        return R.ok(walletService.prepayRecord(payPage));
-    }
-
-    /**
-     * 【接口】预付（待履约）明细分页查询
-     *
-     * @param prePayPage 预付
-     */
-    @Operation(summary = "预付（待履约）明细分页查询", description = "预付（待履约）明细分页查询")
-    @PostMapping("/prepayPage")
-    public R<PageRes<PrepayVo>> prepayPage(@RequestBody @Valid PrePayPage prePayPage) {
-        return R.ok(walletService.prepayPage(prePayPage));
-    }
-
-
-    /**
-     * 【接口】预付（待收）运费清单分页查询
-     *
-     * @param listPage
-     */
-    @Operation(summary = "预付（待收）运费清单分页查询", description = "预付（待收）运费清单分页查询")
-    @PostMapping("/duePay")
-    public R<Object> duePay(@RequestBody @Valid ListPage listPage) {
-        return R.ok(walletService.duePayList(listPage));
-    }
-
-
-}

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

@@ -1,41 +0,0 @@
-package com.sckw.payment.controller;
-
-import com.sckw.core.web.response.HttpResult;
-import com.sckw.payment.model.vo.req.FinanceCount;
-import com.sckw.payment.service.WorkbenchService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 工作台
- *
- * @author xucaiqin
- * @date 2023-08-28 15:36:48
- */
-@Tag(name = "工作台", description = "提供工作台相关数据接口")
-@Validated
-@RestController
-@RequestMapping("/workbench")
-@Slf4j
-public class WorkbenchController {
-    @Resource
-    private WorkbenchService workbenchService;
-
-    /**
-     * 财务数据统计
-     *
-     * @param financeCount 财务统计参数
-     * @return 财务统计数据
-     */
-    @Operation(summary = "财务数据统计", description = "根据条件统计财务数据")
-    @PostMapping("finance")
-    public HttpResult finance(@Valid @RequestBody FinanceCount financeCount) {
-        return HttpResult.ok(workbenchService.financeCount(financeCount));
-    }
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/app/AppKwpLedgerLogisticsController.java

@@ -1,282 +0,0 @@
-package com.sckw.payment.controller.app;
-
-import com.sckw.core.model.vo.TableTop;
-import com.sckw.core.web.response.HttpResult;
-import com.sckw.payment.model.constant.LedgerEnum;
-import com.sckw.payment.model.constant.LogisticsUnitType;
-import com.sckw.payment.model.dto.Id;
-import com.sckw.payment.model.vo.req.*;
-import com.sckw.payment.service.KwpLedgerLogisticsService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 对账-物流订单
- *
- * @author xucaiqin
- */
-@Tag(name = "App物流对账管理", description = "提供App端物流对账相关操作接口")
-@Validated
-@RestController
-@RequestMapping("/appKwpLedgerLogistics")
-public class AppKwpLedgerLogisticsController {
-    @Resource
-    private KwpLedgerLogisticsService kwpLedgerLogisticsService;
-
-    /**
-     * 物流对账单-发起对账(保存草稿)（承运方）
-     *
-     * @param logisticsReq 保存物流对账单参数
-     * @return 操作结果
-     */
-    @Operation(summary = "发起对账(保存草稿)", description = "物流对账单-发起对账(保存草稿)（承运方）")
-    @PostMapping("sendDraft")
-    public HttpResult sendDraft(@RequestBody @Valid LogisticsSendReq logisticsReq) {
-        return HttpResult.ok(kwpLedgerLogisticsService.sendLedgerDraft(logisticsReq));
-    }
-
-    /**
-     * 物流对账单-发起对账（承运方）
-     *
-     * @param logisticsReq 保存物流对账单参数
-     * @return 操作结果
-     */
-    @Operation(summary = "发起对账", description = "物流对账单-发起对账（承运方）")
-    @PostMapping("send")
-    public HttpResult send(@RequestBody @Valid LogisticsSendReq logisticsReq) {
-        return HttpResult.ok(kwpLedgerLogisticsService.sendLedger(logisticsReq));
-    }
-
-    /**
-     * 托运方物流对账单列表查询
-     *
-     * @param logisticsReq 物流订单查询参数
-     * @return 对账单列表
-     */
-    @Operation(summary = "托运方物流对账单列表", description = "托运方物流对账单列表查询")
-    @PostMapping("shipperList")
-    public HttpResult shipperList(@RequestBody @Valid LogisticsReq logisticsReq) {
-        return HttpResult.ok(kwpLedgerLogisticsService.shipperList(logisticsReq));
-    }
-
-    /**
-     * 托运方物流对账单统计
-     *
-     * @param logisticsReq 物流订单查询参数
-     * @return 对账单梳理、对账单金额
-     */
-    @Operation(summary = "托运方物流对账单统计", description = "托运方物流对账单统计")
-    @PostMapping("shipperSum")
-    public HttpResult shipperSum(@RequestBody @Valid LogisticsReq logisticsReq) {
-        return HttpResult.ok(kwpLedgerLogisticsService.shipperSum(logisticsReq));
-    }
-
-    /**
-     * 托运方对账单关联订单
-     *
-     * @param ledgerListReq 对账单id
-     * @return 关联订单列表
-     */
-    @Operation(summary = "托运方对账单关联订单", description = "托运方对账单关联订单")
-    @GetMapping("shipperOrderList")
-    public HttpResult shipperOrderList(@Valid LedgerListReq ledgerListReq) {
-        return HttpResult.ok(kwpLedgerLogisticsService.queryOrderList(ledgerListReq));
-    }
-
-    /**
-     * 承运方物流对账单列表查询（物流公司、收钱方）
-     *
-     * @param logisticsReq 物流订单查询参数
-     * @return 对账单列表
-     */
-    @Operation(summary = "承运方物流对账单列表", description = "承运方物流对账单列表查询（物流公司、收钱方）")
-    @PostMapping("carrierList")
-    public HttpResult carrierList(@RequestBody @Valid LogisticsReq logisticsReq) {
-        return HttpResult.ok(kwpLedgerLogisticsService.carrierList(logisticsReq));
-    }
-
-
-    /**
-     * 承运方物流对账单统计
-     *
-     * @param logisticsReq 查询参数
-     * @return 对账应收金额、对账单数量
-     */
-    @Operation(summary = "承运方物流对账单统计", description = "承运方物流对账单统计")
-    @PostMapping("carrierSum")
-    public HttpResult carrierSum(@RequestBody @Valid LogisticsReq logisticsReq) {
-        return HttpResult.ok(kwpLedgerLogisticsService.carrierSumCount(logisticsReq));
-    }
-
-    /**
-     * 承运方对账单关联订单
-     *
-     * @param ledgerListReq 对账单id
-     * @return 关联订单列表
-     */
-    @Operation(summary = "承运方对账单关联订单", description = "承运方对账单关联订单")
-    @GetMapping("carrierOrderList")
-    public HttpResult carrierOrderList(@Valid LedgerListReq ledgerListReq) {
-        return HttpResult.ok(kwpLedgerLogisticsService.queryOrderList(ledgerListReq));
-    }
-
-    /**
-     * 承运方-查询物流对账单详情
-     *
-     * @param id 物流对账单id
-     * @return 物流对账单详情
-     */
-    @Operation(summary = "承运方-查询物流对账单详情", description = "承运方-查询物流对账单详情")
-    @Parameter(name = "id", description = "物流对账单id", required = true)
-    @GetMapping("queryCarrierDetail")
-    public HttpResult queryCarrierDetail(@RequestParam("id") @NotBlank(message = "物流对账单id不能为空") String id) {
-        return HttpResult.ok(kwpLedgerLogisticsService.queryDetail(Long.valueOf(id), LogisticsUnitType.SHIPPER));
-    }
-
-    /**
-     * 托运方-查询物流对账单详情
-     *
-     * @param id 物流对账单id
-     * @return 物流对账单详情
-     */
-    @Operation(summary = "托运方-查询物流对账单详情", description = "托运方-查询物流对账单详情")
-    @Parameter(name = "id", description = "物流对账单id", required = true)
-    @GetMapping("queryShipperDetail")
-    public HttpResult queryDetail(@RequestParam("id") @NotBlank(message = "物流对账单id不能为空") String id) {
-        return HttpResult.ok(kwpLedgerLogisticsService.queryDetail(Long.valueOf(id), LogisticsUnitType.CARRIER));
-    }
-
-    /**
-     * 修改物流对账单详情（修改物流对账单接口使用） 仅发起对账方支持修改
-     *
-     * @param id 物流对账单id
-     * @return 物流对账单详情
-     */
-    @Operation(summary = "修改物流对账单详情", description = "修改物流对账单详情（修改物流对账单接口使用） 仅发起对账方支持修改")
-    @Parameter(name = "id", description = "物流对账单id", required = true)
-    @GetMapping("queryUpdate")
-    public HttpResult queryUpdate(@RequestParam("id") @NotBlank(message = "物流对账单id不能为空") String id) {
-        return HttpResult.ok(kwpLedgerLogisticsService.queryUpdate(Long.valueOf(id)));
-    }
-
-    /**
-     * 托运方对账单统计
-     *
-     * @param logisticsReq 物流订单查询参数
-     * @return 物流对账单统计数据
-     */
-    @Operation(summary = "托运方对账单统计", description = "托运方物流对账单统计数据")
-    @PostMapping("shipperCount")
-    public HttpResult shipperCount(@RequestBody @Valid LogisticsReq logisticsReq) {
-        logisticsReq.setUnitType(LogisticsUnitType.CARRIER);
-        logisticsReq.setUnitTypeTwo(LogisticsUnitType.SHIPPER);
-        List<TableTop> tableTops = kwpLedgerLogisticsService.orderCount(logisticsReq);
-        List<Integer> re = new ArrayList<>() {{
-            add(LedgerEnum.SAVE.getStatus());
-            add(LedgerEnum.REVOCATION.getStatus());
-        }};
-        return HttpResult.ok(tableTops.stream().filter(a -> !re.contains(a.getValue())).collect(Collectors.toList()));
-    }
-
-    /**
-     * 承运方对账单统计
-     *
-     * @param logisticsReq 物流订单查询参数
-     * @return 物流对账单统计数据
-     */
-    @Operation(summary = "承运方对账单统计", description = "承运方物流对账单统计数据")
-    @PostMapping("carrierCount")
-    public HttpResult carrierCount(@RequestBody @Valid LogisticsReq logisticsReq) {
-        logisticsReq.setUnitType(LogisticsUnitType.SHIPPER);
-        logisticsReq.setUnitTypeTwo(LogisticsUnitType.CARRIER);
-        return HttpResult.ok(kwpLedgerLogisticsService.orderCount(logisticsReq));
-    }
-
-    /**
-     * 删除对账单
-     * 释放关联的订单（只有删除操作才释放订单）
-     *
-     * @param id 物流对账单id
-     * @return 操作结果
-     */
-    @Operation(summary = "删除对账单", description = "删除对账单，释放关联的订单（只有删除操作才释放订单）")
-    @DeleteMapping("delete")
-    public HttpResult delete(@RequestBody @Valid Id id) {
-        return HttpResult.ok(kwpLedgerLogisticsService.remove(id.getIdLong()));
-    }
-
-    /**
-     * 物流对账单-撤回对账
-     *
-     * @param id 物流对账单id
-     * @return 操作结果
-     */
-    @Operation(summary = "撤回对账", description = "物流对账单-撤回对账")
-    @Parameter(name = "id", description = "物流对账单id", required = true)
-    @PostMapping("back")
-    public HttpResult back(@RequestParam("id") @NotBlank(message = "物流对账单id不能为空") String id) {
-        return HttpResult.ok(kwpLedgerLogisticsService.backOrder(Long.valueOf(id)));
-    }
-
-    /**
-     * 物流对账单-对账确认
-     *
-     * @param confirmReq 确认参数
-     * @return 操作结果
-     */
-    @Operation(summary = "对账确认", description = "物流对账单-对账确认")
-    @PostMapping("confirm")
-    public HttpResult confirm(@RequestBody @Valid LedgerConfirmReq confirmReq) {
-        return HttpResult.ok(kwpLedgerLogisticsService.confirmOrder(confirmReq));
-    }
-
-    /**
-     * 物流对账单-驳回查询
-     *
-     * @param id 物流对账单id
-     * @return 驳回信息
-     */
-    @Operation(summary = "驳回查询", description = "物流对账单-驳回查询")
-    @Parameter(name = "id", description = "物流对账单id", required = true)
-    @GetMapping("queryBack")
-    public HttpResult queryBack(@RequestParam("id") @NotBlank(message = "物流对账单id不能为空") String id) {
-        return HttpResult.ok(kwpLedgerLogisticsService.queryBack(Long.valueOf(id)));
-    }
-
-    /**
-     * 物流对账单-驳回
-     *
-     * @param ledgerReq 驳回参数
-     * @return 操作结果
-     */
-    @Operation(summary = "驳回对账单", description = "物流对账单-驳回")
-    @PostMapping("doBack")
-    public HttpResult doBack(@RequestBody @Valid LedgerReq ledgerReq) {
-        return HttpResult.ok(kwpLedgerLogisticsService.doBack(ledgerReq));
-    }
-
-    /**
-     * 物流对账单-对账完成
-     * <p>
-     * 生成结算单
-     * </p>
-     *
-     * @param ledgerReq 对账完成参数
-     * @return 操作结果
-     */
-    @Operation(summary = "对账完成", description = "物流对账单-对账完成，生成结算单")
-    @PostMapping("success")
-    public HttpResult orderSuccess(@RequestBody @Valid LedgerSuccessReq ledgerReq) {
-        return HttpResult.ok(kwpLedgerLogisticsService.orderSuccess(ledgerReq));
-    }
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/app/AppKwpLedgerTradeController.java

@@ -1,245 +0,0 @@
-package com.sckw.payment.controller.app;
-
-import com.sckw.core.web.response.HttpResult;
-import com.sckw.payment.model.constant.TradeUnitType;
-import com.sckw.payment.model.dto.Id;
-import com.sckw.payment.model.vo.req.*;
-import com.sckw.payment.service.KwpLedgerTradeService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * app端接口
- * 对账-交易订单
- *
- * @author xucaiqin
- */
-@Tag(name = "App交易对账管理", description = "提供App端交易对账相关操作接口")
-@RestController
-@RequestMapping("/appKwpLedgerTrade")
-@Validated
-public class AppKwpLedgerTradeController {
-    @Resource
-    private KwpLedgerTradeService kwpLedgerTradeService;
-
-
-    /**
-     * 贸易对账单-发起对账(保存草稿)
-     *
-     * @param tradeSendReq 对账单参数
-     * @return 操作结果
-     */
-    @Operation(summary = "发起对账(保存草稿)", description = "贸易对账单-发起对账(保存草稿)")
-    @PostMapping("sendDraft")
-    public HttpResult sendDraft(@RequestBody @Valid TradeSendReq tradeSendReq) {
-        return HttpResult.ok(kwpLedgerTradeService.sendLedgerDraft(tradeSendReq));
-    }
-
-    /**
-     * 贸易对账单-发起对账
-     *
-     * @param tradeSendReq 对账单参数
-     * @return 操作结果
-     */
-    @Operation(summary = "发起对账", description = "贸易对账单-发起对账")
-    @PostMapping("send")
-    public HttpResult send(@RequestBody @Valid TradeSendReq tradeSendReq) {
-        return HttpResult.ok(kwpLedgerTradeService.sendLedger(tradeSendReq));
-    }
-
-    /**
-     * 贸易对账单列表查询 销售方
-     *
-     * @param tradeReq 查询参数
-     * @return 对账单列表
-     */
-    @Operation(summary = "销售方贸易对账单列表", description = "贸易对账单列表查询 销售方")
-    @PostMapping("sellList")
-    public HttpResult sellList(@RequestBody @Valid TradeReq tradeReq) {
-        return HttpResult.ok(kwpLedgerTradeService.sellList(tradeReq));
-    }
-
-    /**
-     * 贸易对账单统计数据 销售方
-     *
-     * @param tradeReq 查询参数
-     * @return 统计数据
-     */
-    @Operation(summary = "销售方贸易对账单统计", description = "贸易对账单统计数据 销售方")
-    @PostMapping("sellSum")
-    public HttpResult sellSum(@RequestBody @Valid TradeReq tradeReq) {
-        return HttpResult.ok(kwpLedgerTradeService.sellSum(tradeReq));
-    }
-
-    /**
-     * 销售方对账单关联订单
-     *
-     * @param ledgerListReq 对账单id
-     * @return 关联订单列表
-     */
-    @Operation(summary = "销售方对账单关联订单", description = "销售方对账单关联订单")
-    @GetMapping("sellOrderList")
-    public HttpResult sellOrderList(@Valid LedgerListReq ledgerListReq) {
-        return HttpResult.ok(kwpLedgerTradeService.queryOrderList(ledgerListReq));
-    }
-
-    /**
-     * 贸易对账单列表查询 采购方
-     *
-     * @param tradeReq 查询参数
-     * @return 对账单列表
-     */
-    @Operation(summary = "采购方贸易对账单列表", description = "贸易对账单列表查询 采购方")
-    @PostMapping("purchaseList")
-    public HttpResult purchaseList(@RequestBody @Valid TradeReq tradeReq) {
-        return HttpResult.ok(kwpLedgerTradeService.purchaseList(tradeReq));
-    }
-
-    /**
-     * 贸易对账单统计 采购方
-     *
-     * @param tradeReq 查询参数
-     * @return 统计数据
-     */
-    @Operation(summary = "采购方贸易对账单统计", description = "贸易对账单统计 采购方")
-    @PostMapping("purchaseSum")
-    public HttpResult purchaseSum(@RequestBody @Valid TradeReq tradeReq) {
-        return HttpResult.ok(kwpLedgerTradeService.purchaseSum(tradeReq));
-    }
-
-    /**
-     * 对账单关联订单
-     *
-     * @param ledgerListReq 对账单id
-     * @return 关联订单列表
-     */
-    @Operation(summary = "采购方对账单关联订单", description = "采购方对账单关联订单")
-    @GetMapping("purchaseOrderList")
-    public HttpResult purchaseOrderList(@Valid LedgerListReq ledgerListReq) {
-        return HttpResult.ok(kwpLedgerTradeService.queryOrderList(ledgerListReq));
-    }
-
-    /**
-     * 销售-查询贸易对账单详情
-     *
-     * @param id 对账单id
-     * @return 对账单详情
-     */
-    @Operation(summary = "销售方贸易对账单详情", description = "销售-查询贸易对账单详情")
-    @Parameter(name = "id", description = "对账单ID", required = true)
-    @GetMapping("querySellDetail")
-    public HttpResult querySellDetail(@NotBlank(message = "id不能为空") @RequestParam("id") String id) {
-        return HttpResult.ok(kwpLedgerTradeService.queryDetail(Long.valueOf(id), TradeUnitType.PURCHASE));
-    }
-
-    /**
-     * 采购-查询贸易对账单详情
-     *
-     * @param id 对账单id
-     * @return 对账单详情
-     */
-    @Operation(summary = "采购方贸易对账单详情", description = "采购-查询贸易对账单详情")
-    @Parameter(name = "id", description = "对账单ID", required = true)
-    @GetMapping("queryPurchaseDetail")
-    public HttpResult queryPurchaseDetail(@NotBlank(message = "id不能为空") @RequestParam("id") String id) {
-        return HttpResult.ok(kwpLedgerTradeService.queryDetail(Long.valueOf(id), TradeUnitType.SELL));
-    }
-
-    /**
-     * 修改贸易对账单详情（修改物流对账单接口使用）
-     *
-     * @param id 对账单id
-     * @return 对账单详情
-     */
-    @Operation(summary = "修改贸易对账单详情", description = "修改贸易对账单详情（修改物流对账单接口使用）")
-    @Parameter(name = "id", description = "对账单ID", required = true)
-    @GetMapping("queryUpdate")
-    public HttpResult queryUpdate(@NotBlank(message = "id不能为空") @RequestParam("id") String id) {
-        return HttpResult.ok(kwpLedgerTradeService.queryUpdate(Long.valueOf(id)));
-    }
-
-
-    /**
-     * 删除对账单
-     *
-     * @param id 对账单ID
-     * @return 操作结果
-     */
-    @Operation(summary = "删除对账单", description = "删除对账单")
-    @DeleteMapping("delete")
-    public HttpResult delete(@RequestBody @Valid Id id) {
-        return HttpResult.ok(kwpLedgerTradeService.remove(id.getIdLong()));
-    }
-
-    /**
-     * 贸易对账单-撤回对账
-     *
-     * @param id 对账单ID
-     * @return 操作结果
-     */
-    @Operation(summary = "撤回对账", description = "贸易对账单-撤回对账")
-    @Parameter(name = "id", description = "对账单ID", required = true)
-    @PostMapping("back")
-    public HttpResult back(@NotBlank(message = "id不能为空") @RequestParam("id") String id) {
-        return HttpResult.ok(kwpLedgerTradeService.backOrder(Long.valueOf(id)));
-    }
-
-    /**
-     * 贸易对账单-对账确认
-     *
-     * @param confirmReq 确认参数
-     * @return 操作结果
-     */
-    @Operation(summary = "对账确认", description = "贸易对账单-对账确认")
-    @PostMapping("confirm")
-    public HttpResult confirm(@RequestBody @Valid LedgerConfirmReq confirmReq) {
-        return HttpResult.ok(kwpLedgerTradeService.confirmOrder(confirmReq));
-    }
-
-    /**
-     * 贸易对账单-驳回查询
-     *
-     * @param id 对账单ID
-     * @return 驳回信息
-     */
-    @Operation(summary = "驳回查询", description = "贸易对账单-驳回查询")
-    @Parameter(name = "id", description = "对账单ID", required = true)
-    @GetMapping("queryBack")
-    public HttpResult queryBack(@NotBlank(message = "id不能为空") @RequestParam("id") String id) {
-        return HttpResult.ok(kwpLedgerTradeService.queryBack(Long.valueOf(id)));
-    }
-
-    /**
-     * 贸易对账单-驳回对账
-     *
-     * @param ledgerReq 驳回参数
-     * @return 操作结果
-     */
-    @Operation(summary = "驳回对账", description = "贸易对账单-驳回对账")
-    @PostMapping("doBack")
-    public HttpResult doBack(@RequestBody @Valid LedgerReq ledgerReq) {
-        return HttpResult.ok(kwpLedgerTradeService.doBack(ledgerReq));
-    }
-
-    /**
-     * 贸易对账单-对账完成
-     * <p>
-     * 生成结算单
-     * </p>
-     *
-     * @param ledgerReq 完成参数
-     * @return 操作结果
-     */
-    @Operation(summary = "对账完成", description = "贸易对账单-对账完成，生成结算单")
-    @PostMapping("success")
-    public HttpResult orderSuccess(@RequestBody @Valid LedgerSuccessReq ledgerReq) {
-        return HttpResult.ok(kwpLedgerTradeService.orderSuccess(ledgerReq));
-    }
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/app/AppKwpSettlementLogisticsController.java

@@ -1,94 +0,0 @@
-package com.sckw.payment.controller.app;
-
-import com.sckw.core.web.response.HttpResult;
-import com.sckw.payment.model.constant.LogisticsUnitType;
-import com.sckw.payment.model.vo.req.SettlementReq;
-import com.sckw.payment.service.KwpSettlementLogisticsService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 结算-物流订单
- *
- * @author Aick Spt
- * @date 2023-07-18 16:34
- */
-@Tag(name = "App物流结算管理", description = "提供App端物流订单结算相关操作接口")
-@RestController
-@RequestMapping("/appKwpSettlementLogistics")
-public class AppKwpSettlementLogisticsController {
-
-    @Resource
-    private KwpSettlementLogisticsService kwpSettlementLogisticsService;
-
-    //   ========= 运费收款 承运方 =========
-    @Operation(summary = "运费收款-物流订单列表", description = "运费收款-物流订单列表（承运方）")
-    @PostMapping(path = "pageListCollection")
-    public HttpResult pageSelectCollection(@RequestBody @Valid SettlementReq settlementReq) {
-        return HttpResult.ok(kwpSettlementLogisticsService.pageSelectCollection(settlementReq));
-    }
-
-    @Operation(summary = "运费收款-物流订单各状态列表总数", description = "运费收款-物流订单各状态列表总数（承运方）")
-    @PostMapping(path = "getCountListCollection")
-    public HttpResult getCountListCollection(@RequestBody @Valid SettlementReq settlementReq) {
-        return HttpResult.ok(kwpSettlementLogisticsService.getCountListCollection(settlementReq));
-    }
-
-    @Operation(summary = "运费收款-物流订单详情", description = "运费收款-物流订单详情（承运方）")
-    @Parameter(name = "id", description = "订单ID", required = true)
-    @GetMapping(path = "detailCollection")
-    public HttpResult detailCollection(@RequestParam("id") Long id) {
-        return HttpResult.ok(kwpSettlementLogisticsService.detailCollection(id));
-    }
-
-    /**
-     * 承运方 app端
-     *
-     * @param id 订单ID
-     * @return 订单详情
-     */
-    @Operation(summary = "承运方订单详情", description = "承运方 app端订单详情")
-    @Parameter(name = "id", description = "订单ID", required = true)
-    @GetMapping("carrierDetail")
-    public HttpResult carrierDetail(@RequestParam("id") String id) {
-        return HttpResult.ok(kwpSettlementLogisticsService.queryDetail(Long.parseLong(id), LogisticsUnitType.SHIPPER));
-    }
-
-
-    //   ========= 运费付款 托运方 =========
-    @Operation(summary = "运费付款-物流订单列表", description = "运费付款-物流订单列表（托运方）")
-    @PostMapping(path = "pageListPayment")
-    public HttpResult pageSelectPayment(@RequestBody @Valid SettlementReq settlementReq) {
-        return HttpResult.ok(kwpSettlementLogisticsService.pageSelectPayment(settlementReq));
-    }
-
-    @Operation(summary = "运费付款-物流订单各状态列表总数", description = "运费付款-物流订单各状态列表总数（托运方）")
-    @PostMapping(path = "getCountListPayment")
-    public HttpResult getCountListPayment(@RequestBody @Valid SettlementReq settlementReq) {
-        return HttpResult.ok(kwpSettlementLogisticsService.getCountListPayment(settlementReq));
-    }
-
-    @Operation(summary = "物流订单详情", description = "物流订单详情（托运方）")
-    @Parameter(name = "id", description = "订单ID", required = true)
-    @GetMapping(path = "detailPayment")
-    public HttpResult detailPayment(@RequestParam("id") Long id) {
-        return HttpResult.ok(kwpSettlementLogisticsService.detailPayment(id));
-    }
-
-    /**
-     * app端详情
-     *
-     * @param id 订单ID
-     * @return 订单详情
-     */
-    @Operation(summary = "托运方订单详情", description = "托运方 app端订单详情")
-    @Parameter(name = "id", description = "订单ID", required = true)
-    @GetMapping("shipperDetail")
-    public HttpResult shipperDetail(@RequestParam("id") String id) {
-        return HttpResult.ok(kwpSettlementLogisticsService.queryDetail(Long.parseLong(id), LogisticsUnitType.CARRIER));
-    }
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/app/AppKwpSettlementTradeController.java

@@ -1,121 +0,0 @@
-package com.sckw.payment.controller.app;
-
-import com.sckw.core.web.context.LoginUserHolder;
-import com.sckw.core.web.response.HttpResult;
-import com.sckw.payment.model.constant.TradeUnitType;
-import com.sckw.payment.model.vo.req.SettlementTradeReq;
-import com.sckw.payment.service.KwpSettlementTradeService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 结算-交易订单
- *
- * @author xucaiqin
- */
-@Tag(name = "App交易结算管理", description = "提供App端交易订单结算相关操作接口")
-@Validated
-@RestController
-@RequestMapping("/appKwpSettlementTrade")
-public class AppKwpSettlementTradeController {
-
-    @Resource
-    private KwpSettlementTradeService kwpSettlementTradeService;
-
-    //   ========= 收款 销售 =========
-
-    /**
-     * 销售分页列表
-     *
-     * @param settlementReq 查询参数
-     * @return 结算单列表
-     */
-    @Operation(summary = "收款-销售结算单列表", description = "收款-销售结算单列表")
-    @PostMapping(path = "pageSellList")
-    public HttpResult pageListCollection(@RequestBody @Valid SettlementTradeReq settlementReq) {
-        settlementReq.setUnitType(TradeUnitType.PURCHASE);
-        settlementReq.setUnitTypeTwo(TradeUnitType.SELL);
-        settlementReq.check();
-        return HttpResult.ok(kwpSettlementTradeService.pageListCollection(settlementReq));
-    }
-
-    /**
-     * 待结算、部分结算、全部结算
-     *
-     * @param settlementReq 查询参数
-     * @return 统计结果
-     */
-    @Operation(summary = "收款-表头统计数量", description = "待结算、部分结算、全部结算统计")
-    @PostMapping(path = "getSellCount")
-    public HttpResult getCount(@RequestBody @Valid SettlementTradeReq settlementReq) {
-        settlementReq.setUnitType(TradeUnitType.PURCHASE);
-        settlementReq.setUnitTypeTwo(TradeUnitType.SELL);
-        settlementReq.setEntId(LoginUserHolder.getEntId());
-        settlementReq.check();
-        return HttpResult.ok(kwpSettlementTradeService.getCount(settlementReq));
-    }
-
-    /**
-     * 销售方查询结算单详情
-     * @param id 结算单ID
-     * @return 结算单详情
-     */
-    @Operation(summary = "销售方结算单详情", description = "销售方查询结算单详情")
-    @Parameter(name = "id", description = "结算单ID", required = true)
-    @GetMapping("sellDetail")
-    public HttpResult sellDetail(@NotBlank(message = "结算单id不能为空") @RequestParam("id") String id) {
-        return HttpResult.ok(kwpSettlementTradeService.queryDetail(Long.parseLong(id), TradeUnitType.PURCHASE));
-    }
-    
-    //   ========= 付款 采购 =========
-
-    /**
-     * 采购分页列表
-     *
-     * @param settlementReq 查询参数
-     * @return 结算单列表
-     */
-    @Operation(summary = "付款-采购结算单列表", description = "付款-采购结算单列表")
-    @PostMapping(path = "pagePurchaseList")
-    public HttpResult pageListPayment(@RequestBody @Valid SettlementTradeReq settlementReq) {
-        settlementReq.check();
-        settlementReq.setUnitType(TradeUnitType.SELL);
-        settlementReq.setUnitTypeTwo(TradeUnitType.PURCHASE);
-        return HttpResult.ok(kwpSettlementTradeService.pageListCollection(settlementReq));
-    }
-
-    /**
-     * 待结算、部分结算、全部结算
-     *
-     * @param settlementReq 查询参数
-     * @return 统计结果
-     */
-    @Operation(summary = "付款-表头统计数量", description = "待结算、部分结算、全部结算统计")
-    @PostMapping(path = "getPurchaseCount")
-    public HttpResult getPurchaseCount(@RequestBody @Valid SettlementTradeReq settlementReq) {
-        settlementReq.check();
-        settlementReq.setUnitType(TradeUnitType.SELL);
-        settlementReq.setUnitTypeTwo(TradeUnitType.PURCHASE);
-        settlementReq.setEntId(LoginUserHolder.getEntId());
-        return HttpResult.ok(kwpSettlementTradeService.getCount(settlementReq));
-    }
-    
-    /**
-     * 采购方查询结算单详情
-     * @param id 结算单id
-     * @return 结算单详情
-     */
-    @Operation(summary = "采购方结算单详情", description = "采购方查询结算单详情")
-    @Parameter(name = "id", description = "结算单ID", required = true)
-    @GetMapping("purchaseDetail")
-    public HttpResult purchaseDetail(@NotBlank(message = "结算单id不能为空") @RequestParam("id") String id) {
-        return HttpResult.ok(kwpSettlementTradeService.queryDetail(Long.parseLong(id), TradeUnitType.SELL));
-    }
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operate/LedgerLogisticsController.java

@@ -1,120 +0,0 @@
-package com.sckw.payment.controller.operate;
-
-import com.sckw.core.model.page.PageRes;
-import com.sckw.core.web.response.HttpResult;
-import com.sckw.excel.utils.ExcelUtil;
-import com.sckw.payment.model.vo.LedgerLogistics;
-import com.sckw.payment.model.vo.excel.LedgerLogisticsExport;
-import com.sckw.payment.model.vo.req.LedgerListReq;
-import com.sckw.payment.model.vo.req.LogisticsReq;
-import com.sckw.payment.service.operateService.LedgerLogisticsService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
-import org.springframework.beans.BeanUtils;
-import org.springframework.util.CollectionUtils;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 对账-物流订单
- *
- * @author xucaiqin
- */
-@Tag(name = "运营物流对账管理", description = "提供运营端物流对账相关操作接口")
-@Validated
-@RestController
-@RequestMapping("/ledgerLogistics")
-public class LedgerLogisticsController {
-    @Resource
-    private LedgerLogisticsService ledgerLogisticsService;
-
-
-    /**
-     * 查询物流对账单列表
-     *
-     * @param logisticsReq 物流订单查询参数
-     * @return 对账单列表
-     */
-    @Operation(summary = "物流对账单列表", description = "查询物流对账单列表")
-    @PostMapping("list")
-    public HttpResult list(@RequestBody LogisticsReq logisticsReq) {
-        return HttpResult.ok(ledgerLogisticsService.list(logisticsReq, false));
-    }
-
-    /**
-     * 对账单关联订单
-     *
-     * @param ledgerListReq 对账单id
-     * @return 关联订单列表
-     */
-    @Operation(summary = "对账单关联订单", description = "查询对账单关联的订单列表")
-    @GetMapping("orderList")
-    public HttpResult orderList(@Valid LedgerListReq ledgerListReq) {
-        return HttpResult.ok(ledgerLogisticsService.orderList(ledgerListReq));
-    }
-
-
-    /**
-     * 查询物流对账单详情
-     *
-     * @param id 物流对账单id
-     * @return 物流对账单详情
-     */
-    @Operation(summary = "物流对账单详情", description = "根据ID查询物流对账单详情")
-    @Parameter(name = "id", description = "物流对账单ID", required = true)
-    @GetMapping("queryDetail")
-    public HttpResult queryDetail(@RequestParam("id") @NotBlank(message = "物流对账单id不能为空") String id) {
-        return HttpResult.ok(ledgerLogisticsService.queryDetail(Long.valueOf(id)));
-    }
-
-    /**
-     * 统计物流对账单
-     *
-     * @param logisticsReq 物流订单查询参数
-     * @return 物流对账单统计数据
-     */
-    @Operation(summary = "物流对账单统计", description = "统计物流对账单数据")
-    @PostMapping("count")
-    public HttpResult count(@RequestBody LogisticsReq logisticsReq) {
-        return HttpResult.ok(ledgerLogisticsService.orderCount(logisticsReq));
-    }
-
-
-    /**
-     * 导出物流对账单
-     *
-     * @param response     HTTP响应
-     * @param logisticsReq 查询参数
-     * @return 操作结果
-     */
-    @Operation(summary = "导出物流对账单", description = "导出物流对账单数据")
-    @PostMapping("export")
-    public HttpResult export(HttpServletResponse response, @RequestBody LogisticsReq logisticsReq) {
-        List<LedgerLogistics> list;
-        if (CollectionUtils.isEmpty(logisticsReq.getIdList())) {
-            PageRes<LedgerLogistics> pageResult = ledgerLogisticsService.list(logisticsReq, true);
-            list = pageResult.getList();
-        } else {
-            list = ledgerLogisticsService.selectList(logisticsReq.getIdList());
-        }
-        if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("暂无数据，请确认");
-        }
-        List<LedgerLogisticsExport> collect = list.stream().map(a -> {
-            LedgerLogisticsExport ledgerLogisticsVo = new LedgerLogisticsExport();
-            BeanUtils.copyProperties(a, ledgerLogisticsVo);
-            return ledgerLogisticsVo;
-        }).collect(Collectors.toList());
-
-        ExcelUtil.downData(response, LedgerLogisticsExport.class, collect);
-        return null;
-    }
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operate/LedgerTradeController.java

@@ -1,124 +0,0 @@
-package com.sckw.payment.controller.operate;
-
-import com.sckw.core.model.page.PageRes;
-import com.sckw.core.web.response.HttpResult;
-import com.sckw.excel.utils.ExcelUtil;
-import com.sckw.payment.model.vo.LedgerSell;
-import com.sckw.payment.model.vo.excel.LedgerTradeExport;
-import com.sckw.payment.model.vo.req.LedgerListReq;
-import com.sckw.payment.model.vo.req.TradeReq;
-import com.sckw.payment.service.operateService.LedgerTradeService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.Valid;
-import org.springframework.beans.BeanUtils;
-import org.springframework.util.CollectionUtils;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 对账-交易订单
- *
- * @author xucaiqin
- */
-@Tag(name = "运营交易对账管理", description = "提供运营端交易对账相关操作接口")
-@RestController
-@RequestMapping("/ledgerTrade")
-@Validated
-public class LedgerTradeController {
-    @Resource
-    private LedgerTradeService ledgerTradeService;
-
-
-    /**
-     * 查询交易对账单列表
-     *
-     * @param tradeReq 查询参数
-     * @return 对账单列表
-     */
-    @Operation(summary = "交易对账单列表", description = "查询交易对账单列表")
-    @PostMapping("list")
-    public HttpResult list(@RequestBody TradeReq tradeReq) {
-        return HttpResult.ok(ledgerTradeService.list(tradeReq));
-    }
-
-    /**
-     * 对账单关联订单
-     *
-     * @param ledgerListReq 对账单id
-     * @return 关联订单列表
-     */
-    @Operation(summary = "对账单关联订单", description = "查询对账单关联的订单列表")
-    @GetMapping("orderList")
-    public HttpResult orderList(@Valid LedgerListReq ledgerListReq) {
-        return HttpResult.ok(ledgerTradeService.orderList(ledgerListReq));
-    }
-
-
-    /**
-     * 查询交易对账单详情
-     *
-     * @param id 对账单id
-     * @return 对账单详情
-     */
-    @Operation(summary = "交易对账单详情", description = "根据ID查询交易对账单详情")
-    @Parameter(name = "id", description = "交易对账单ID", required = true)
-    @GetMapping("queryDetail")
-    public HttpResult queryDetail(@RequestParam("id") String id) {
-        return HttpResult.ok(ledgerTradeService.queryDetail(Long.valueOf(id)));
-    }
-
-    /**
-     * 贸易订单数分类统计
-     *
-     * @param tradeReq 查询参数
-     * @return 统计数据
-     */
-    @Operation(summary = "交易对账单统计", description = "贸易订单数分类统计")
-    @PostMapping("count")
-    public HttpResult count(@RequestBody TradeReq tradeReq) {
-        return HttpResult.ok(ledgerTradeService.orderCount(tradeReq));
-    }
-
-
-    /**
-     * 导出交易对账单
-     *
-     * @param response HTTP响应
-     * @param tradeReq 查询参数
-     * @return 操作结果
-     */
-    @Operation(summary = "导出交易对账单", description = "导出交易对账单数据")
-    @PostMapping("export")
-    public HttpResult export(HttpServletResponse response, @RequestBody TradeReq tradeReq) {
-        List<LedgerSell> list;
-
-        if (CollectionUtils.isEmpty(tradeReq.getIdList())) {
-            tradeReq.setPage(0);
-            tradeReq.setPageSize(0);
-            PageRes<LedgerSell> pageResult = ledgerTradeService.list(tradeReq);
-            list = pageResult.getList();
-        } else {
-            list = ledgerTradeService.queryIds(tradeReq.getIdList());
-        }
-
-        if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("暂无数据，请确认");
-        }
-        List<LedgerTradeExport> collect = list.stream().map(a -> {
-            LedgerTradeExport ledgerTradeVo = new LedgerTradeExport();
-            BeanUtils.copyProperties(a, ledgerTradeVo);
-            return ledgerTradeVo;
-        }).collect(Collectors.toList());
-        ExcelUtil.downData(response, LedgerTradeExport.class, collect);
-        return null;
-    }
-
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operate/OperateWalletController.java

@@ -1,28 +0,0 @@
-package com.sckw.payment.controller.operate;
-
-import com.sckw.payment.service.WalletService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 钱包
- *
- * @author xucaiqin
- * @date 2023-08-28 15:36:48
- */
-@Tag(name = "运营钱包管理", description = "提供运营端钱包相关操作接口")
-@Validated
-@RestController
-@RequestMapping("/operateWallet")
-@Slf4j
-public class OperateWalletController {
-    @Resource
-    private WalletService walletService;
-
-
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operate/SettlementLogisticsController.java

@@ -1,89 +0,0 @@
-package com.sckw.payment.controller.operate;
-
-import com.sckw.core.web.response.HttpResult;
-import com.sckw.excel.utils.ExcelUtil;
-import com.sckw.payment.model.constant.LogisticsUnitType;
-import com.sckw.payment.model.vo.SettlementLogistics;
-import com.sckw.payment.model.vo.excel.SettlementLogisticsExportVo;
-import com.sckw.payment.model.vo.req.SettlementReq;
-import com.sckw.payment.service.operateService.SettlementLogisticsService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.Valid;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 结算-物流订单
- *
- * @author Aick Spt
- * @date 2023-07-18 16:34
- */
-@Tag(name = "运营物流结算管理", description = "提供运营端物流订单结算相关操作接口")
-@RestController
-@Slf4j
-@RequestMapping("/settlementLogistics")
-public class SettlementLogisticsController {
-    @Resource
-    private SettlementLogisticsService settlementLogisticsService;
-
-    /**
-     * 结算列表
-     *
-     * @param settlementReq 查询参数
-     * @return 结算列表
-     */
-    @Operation(summary = "物流结算列表", description = "查询物流订单结算列表")
-    @PostMapping("list")
-    public HttpResult list(@RequestBody @Valid SettlementReq settlementReq) {
-        return HttpResult.ok(settlementLogisticsService.list(settlementReq));
-    }
-
-    /**
-     * 结算统计
-     *
-     * @param settlementReq 查询参数
-     * @return 统计结果
-     */
-    @Operation(summary = "物流结算统计", description = "统计物流订单结算数据")
-    @PostMapping("count")
-    public HttpResult count(@RequestBody @Valid SettlementReq settlementReq) {
-        return HttpResult.ok(settlementLogisticsService.count(settlementReq));
-    }
-
-    /**
-     * 导出结算列表
-     *
-     * @param response      HTTP响应
-     * @param settlementReq 查询参数
-     * @return 操作结果
-     */
-    @Operation(summary = "导出物流结算列表", description = "导出物流订单结算列表数据")
-    @PostMapping("export")
-    public HttpResult export(HttpServletResponse response, @RequestBody @Valid SettlementReq settlementReq) {
-        settlementReq.setUnitType(LogisticsUnitType.SHIPPER);
-        settlementReq.setUnitTypeTwo(LogisticsUnitType.CARRIER);
-        List<SettlementLogistics> list = settlementLogisticsService.exportList(settlementReq);
-        if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("暂无数据，请确认");
-        }
-        List<SettlementLogisticsExportVo> collect = list.stream().map(a -> {
-            SettlementLogisticsExportVo settlementLogisticsVo = new SettlementLogisticsExportVo();
-            BeanUtils.copyProperties(a, settlementLogisticsVo);
-            return settlementLogisticsVo;
-        }).collect(Collectors.toList());
-        ExcelUtil.downData(response, SettlementLogisticsExportVo.class, collect);
-        return null;
-    }
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operate/SettlementOfflineController.java

@@ -1,55 +0,0 @@
-package com.sckw.payment.controller.operate;
-
-import com.sckw.core.web.response.HttpResult;
-import com.sckw.payment.model.constant.SettlementOrderTypeEnum;
-import com.sckw.payment.model.vo.req.SettlementOfflineReq;
-import com.sckw.payment.service.operateService.SettlementOfflineService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 结算-线下记录（交易订单结算/物流订单结算）
- *
- * @author xucaiqin
- * @date 2023-07-20 11:42
- */
-@Tag(name = "运营线下结算管理", description = "提供运营端线下结算记录相关操作接口")
-@RestController
-@RequestMapping("/settlementOffline")
-public class SettlementOfflineController {
-
-    @Resource
-    private SettlementOfflineService settlementOfflineService;
-
-    /**
-     * 贸易-线下付款记录
-     *
-     * @param settlementOfflineReq 查询参数
-     * @return 付款记录列表
-     */
-    @Operation(summary = "贸易线下付款记录", description = "查询贸易订单线下付款记录")
-    @GetMapping("tradeList")
-    public HttpResult list(@Valid SettlementOfflineReq settlementOfflineReq) {
-        settlementOfflineReq.setOrderType(SettlementOrderTypeEnum.TRADE.getStatus());
-        return HttpResult.ok(settlementOfflineService.list(settlementOfflineReq));
-    }
-
-    /**
-     * 物流线下结算记录
-     *
-     * @param settlementOfflineReq 查询参数
-     * @return 结算记录列表
-     */
-    @Operation(summary = "物流线下结算记录", description = "查询物流订单线下结算记录")
-    @GetMapping("logisticsList")
-    public HttpResult logisticsList(@Valid SettlementOfflineReq settlementOfflineReq) {
-        settlementOfflineReq.setOrderType(SettlementOrderTypeEnum.LOGISTICS.getStatus());
-        return HttpResult.ok(settlementOfflineService.list(settlementOfflineReq));
-    }
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operate/SettlementTradeController.java

@@ -1,95 +0,0 @@
-package com.sckw.payment.controller.operate;
-
-import com.sckw.core.web.response.HttpResult;
-import com.sckw.excel.utils.ExcelUtil;
-import com.sckw.payment.model.constant.TradeUnitType;
-import com.sckw.payment.model.vo.SettlementTrade;
-import com.sckw.payment.model.vo.excel.SettlementTradeExportVo;
-import com.sckw.payment.model.vo.req.SettlementTradeReq;
-import com.sckw.payment.service.operateService.SettlementTradeService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.Valid;
-import org.springframework.beans.BeanUtils;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 结算-交易订单
- *
- * @author xucaiqin
- */
-@Tag(name = "运营交易结算管理", description = "提供运营端交易订单结算相关操作接口")
-@RestController
-@RequestMapping("/settlementTrade")
-public class SettlementTradeController {
-
-    @Resource
-    private SettlementTradeService settlementTradeService;
-
-    /**
-     * 销售分页列表
-     *
-     * @param settlementReq 查询参数
-     * @return 结算列表
-     */
-    @Operation(summary = "销售结算列表", description = "查询销售订单结算列表")
-    @PostMapping("list")
-    public HttpResult list(@RequestBody @Valid SettlementTradeReq settlementReq) {
-        settlementReq.check();
-        return HttpResult.ok(settlementTradeService.list(settlementReq));
-    }
-
-    /**
-     * 待结算、部分结算、全部结算
-     *
-     * @param settlementReq 查询参数
-     * @return 统计结果
-     */
-    @Operation(summary = "结算状态统计", description = "按待结算、部分结算、全部结算状态进行统计")
-    @PostMapping("count")
-    public HttpResult getCount(@RequestBody @Valid SettlementTradeReq settlementReq) {
-        settlementReq.check();
-        return HttpResult.ok(settlementTradeService.getCount(settlementReq));
-    }
-
-    /**
-     * 表尾金额结算数据
-     *
-     * @param settlementReq 查询参数
-     * @return 金额统计
-     */
-    @Operation(summary = "结算金额统计", description = "统计表尾金额结算数据")
-    @PostMapping("sum")
-    public HttpResult sum(@RequestBody @Valid SettlementTradeReq settlementReq) {
-        settlementReq.check();
-        return HttpResult.ok(settlementTradeService.sumMoney(settlementReq));
-    }
-
-    @Operation(summary = "导出结算列表", description = "导出交易结算列表数据")
-    @PostMapping("export")
-    public HttpResult exportCollection(HttpServletResponse response, @RequestBody @Valid SettlementTradeReq settlementReq) {
-        settlementReq.check();
-        settlementReq.setUnitType(TradeUnitType.SELL);
-        settlementReq.setUnitTypeTwo(TradeUnitType.PURCHASE);
-        List<SettlementTrade> list = settlementTradeService.exportList(settlementReq, settlementReq.getIdList());
-        if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("暂无数据，请确认");
-        }
-        List<SettlementTradeExportVo> collect = list.stream().map(a -> {
-            SettlementTradeExportVo settlementTradeExportVo = new SettlementTradeExportVo();
-            BeanUtils.copyProperties(a, settlementTradeExportVo);
-            return settlementTradeExportVo;
-        }).collect(Collectors.toList());
-        ExcelUtil.downData(response, SettlementTradeExportVo.class, collect);
-        return null;
-    }
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operate/SettlementWalletController.java

@@ -1,72 +0,0 @@
-package com.sckw.payment.controller.operate;
-
-import com.sckw.core.web.response.HttpResult;
-import com.sckw.payment.model.constant.SettlementOrderTypeEnum;
-import com.sckw.payment.model.constant.SettlementWalletPayTypeEnum;
-import com.sckw.payment.model.vo.req.SettlementWalletReq;
-import com.sckw.payment.service.operateService.SettlementWalletService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 结算-电子钱包结算记录（交易订单结算/物流订单结算）
- *
- * @author xucaiqin
- * @date 2023-07-20 14:42
- */
-@Tag(name = "运营电子钱包结算管理", description = "提供运营端电子钱包结算记录相关操作接口")
-@Validated
-@RestController
-@RequestMapping("/settlementWallet")
-public class SettlementWalletController {
-    @Resource
-    private SettlementWalletService settlementWalletService;
-
-    /**
-     * 货到付款-物流
-     *
-     * @param settlementWalletReq 查询参数
-     * @return 结算记录列表
-     */
-    @Operation(summary = "货到付款-物流结算记录", description = "查询货到付款类型的物流订单电子钱包结算记录")
-    @GetMapping("logisticsList")
-    public HttpResult logisticsList(@Valid SettlementWalletReq settlementWalletReq) {
-        settlementWalletReq.setPayType(SettlementWalletPayTypeEnum.CASH_ON_DELIVERY.getStatus());
-        settlementWalletReq.setOrderType(SettlementOrderTypeEnum.LOGISTICS.getStatus());
-        return HttpResult.ok(settlementWalletService.pageList(settlementWalletReq));
-    }
-
-    /**
-     * 货到付款-贸易
-     *
-     * @param settlementWalletReq 查询参数
-     * @return 结算记录列表
-     */
-    @Operation(summary = "货到付款-贸易结算记录", description = "查询货到付款类型的贸易订单电子钱包结算记录")
-    @GetMapping("tradeList")
-    public HttpResult tradeList(@Valid SettlementWalletReq settlementWalletReq) {
-        settlementWalletReq.setPayType(SettlementWalletPayTypeEnum.CASH_ON_DELIVERY.getStatus());
-        settlementWalletReq.setOrderType(SettlementOrderTypeEnum.TRADE.getStatus());
-        return HttpResult.ok(settlementWalletService.pageList(settlementWalletReq));
-    }
-
-    /**
-     * 预付款-贸易
-     * 没有预付款-物流这种情况
-     *
-     * @param settlementWalletReq 查询参数
-     * @return 结算记录列表
-     */
-    @Operation(summary = "预付款-贸易结算记录", description = "查询预付款类型的贸易订单电子钱包结算记录")
-    @GetMapping("tradePreList")
-    public HttpResult tradePreList(@Valid SettlementWalletReq settlementWalletReq) {
-        settlementWalletReq.setPayType(SettlementWalletPayTypeEnum.ADVANCE_PAYMENT.getStatus());
-        settlementWalletReq.setOrderType(SettlementOrderTypeEnum.TRADE.getStatus());
-        return HttpResult.ok(settlementWalletService.pageList(settlementWalletReq));
-    }
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpBizWalletMapper.java

@@ -1,19 +0,0 @@
-package com.sckw.payment.dao;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpBizWallet;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * Author: donglang
- * Time: 2025-11-03
- * Des: 钱包管理
- * Version: 1.0
- */
-@Mapper
-public interface KwpBizWalletMapper extends BaseMapper<KwpBizWallet> {
-
-
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpBizWalletPrepayMapper.java

@@ -1,19 +0,0 @@
-package com.sckw.payment.dao;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpBizWalletPrepay;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * Author: donglang
- * Time: 2025-11-03
- * Des: 钱包管理
- * Version: 1.0
- */
-@Mapper
-public interface KwpBizWalletPrepayMapper extends BaseMapper<KwpBizWalletPrepay> {
-
-
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpLedgerLogisticsMapper.java

@@ -1,145 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpLedgerLogistics;
-import com.sckw.payment.model.dto.LedgerCarrierDto;
-import com.sckw.payment.model.dto.LedgerLogisticsDto;
-import com.sckw.payment.model.dto.LedgerShipperDto;
-import com.sckw.payment.model.dto.LedgerSize;
-import com.sckw.payment.model.vo.LedgerLogistics;
-import com.sckw.payment.model.vo.req.LogisticsReq;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author xucaiqin
- * @date 2023-07-17 15:34:39
- */
-
-@Mapper
-public interface KwpLedgerLogisticsMapper extends BaseMapper<KwpLedgerLogistics> {
-
-    /**
-     * 托运方
-     * 2023.8.22 需要过滤已保存、以撤回两个状态
-     *
-     * @param logisticsReq
-     * @return
-     */
-    List<LedgerShipperDto> shipperSelect(@Param("logisticsReq") LogisticsReq logisticsReq, @Param("authList") List<Long> authList);
-
-    /**
-     * 运营端
-     *
-     * @param logisticsReq
-     * @return
-     */
-    List<LedgerLogistics> list(@Param("logisticsReq") LogisticsReq logisticsReq, @Param("authEntIdList") List<Long> authEntIdList);
-
-    /**
-     * 承运方 对账发起方，客户公司是托运方
-     *
-     * @param logisticsReq
-     * @return
-     */
-    List<LedgerCarrierDto> carrierSelect(@Param("logisticsReq") LogisticsReq logisticsReq, @Param("authList") List<Long> authList);
-
-    /**
-     * 统计订单数量
-     *
-     * @param logisticsReq
-     * @return
-     */
-    Map<String, Long> countOrder(@Param("logisticsReq") LogisticsReq logisticsReq);
-
-    /**
-     * 承运方统计订单数量
-     *
-     * @param logisticsReq
-     * @return
-     */
-    Map<String, Long> countSendOrder(@Param("logisticsReq") LogisticsReq logisticsReq, @Param("authList") List<Long> authList);
-
-    /**
-     * 托运方统计订单数量
-     *
-     * @param logisticsReq
-     * @param authList
-     * @return
-     */
-    Map<String, Long> countAuditOrder(@Param("logisticsReq") LogisticsReq logisticsReq, @Param("authList") List<Long> authList);
-
-    /**
-     * 运营端统计
-     *
-     * @param logisticsReq
-     * @return
-     */
-    Map<String, Long> countOrder2(@Param("logisticsReq") LogisticsReq logisticsReq, @Param("authEntIdList") List<Long> authEntIdList);
-
-    LedgerLogisticsDto selectId(@Param("id") Long id, @Param("unitType") Integer unitType);
-
-
-    List<LedgerShipperDto> selectShipperIds(@Param("ids") List<Long> ids);
-
-    /**
-     * 运营端通过ids查询，导出数据
-     *
-     * @param ids
-     * @return
-     */
-    List<LedgerLogistics> selectIds(@Param("ids") List<Long> ids);
-
-    /**
-     * 承运方
-     * 1托运方、2承运方
-     *
-     * @param ids
-     * @return
-     */
-    List<LedgerCarrierDto> selectCarrierIds(@Param("ids") List<Long> ids);
-
-    /**
-     * app统计对账单数量
-     *
-     * @param logisticsReq
-     * @return
-     */
-    Long countSum(@Param("logisticsReq") LogisticsReq logisticsReq, @Param("status") List<Integer> status);
-
-    /**
-     * app统计对账金额
-     *
-     * @param logisticsReq
-     * @return
-     */
-    BigDecimal countSumMoney(@Param("logisticsReq") LogisticsReq logisticsReq, @Param("status") List<Integer> status);
-
-    /**
-     * @param entId     托运方企业
-     * @param entTarget 承运方企业
-     * @return
-     */
-    List<String> selectJoin(@Param("entId") Long entId, @Param("entTarget") Long entTarget);
-
-    /**
-     * 根据顶级企业id统计对账单数量，仅不包含已保存
-     *
-     * @param entId 顶级企业id
-     * @return
-     */
-    LedgerSize countSize(@Param("entId") Long entId, @Param("enterpriseIds") List<Long> enterpriseIds);
-
-    /**
-     * 列表导出
-     *
-     * @param logisticsReq
-     * @param idList
-     * @return
-     */
-    List<LedgerLogisticsDto> exportList(@Param("logisticsReq") LogisticsReq logisticsReq, @Param("idList") List<Long> idList, @Param("authList") List<Long> authList);
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpLedgerLogisticsOrderMapper.java

@@ -1,14 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpLedgerLogisticsOrder;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author xucaiqin
- * @date 2023-07-10 16:42:19
- */
-
-@Mapper
-public interface KwpLedgerLogisticsOrderMapper extends BaseMapper<KwpLedgerLogisticsOrder> {
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpLedgerLogisticsTrackMapper.java

@@ -1,13 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpLedgerLogisticsTrack;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author xucaiqin
- * @date 2023-07-10 16:42:19
- */
-@Mapper
-public interface KwpLedgerLogisticsTrackMapper extends BaseMapper<KwpLedgerLogisticsTrack> {
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpLedgerLogisticsUnitMapper.java

@@ -1,14 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpLedgerLogisticsUnit;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author xucaiqin
- * @date 2023-07-13 17:32:34
- */
-
-@Mapper
-public interface KwpLedgerLogisticsUnitMapper extends BaseMapper<KwpLedgerLogisticsUnit> {
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpLedgerTradeMapper.java

@@ -1,109 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpLedgerTrade;
-import com.sckw.payment.model.dto.LedgerPurchaseDto;
-import com.sckw.payment.model.dto.LedgerSellDto;
-import com.sckw.payment.model.dto.LedgerSize;
-import com.sckw.payment.model.dto.LedgerTradeDto;
-import com.sckw.payment.model.vo.LedgerSell;
-import com.sckw.payment.model.vo.req.TradeReq;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author xucaiqin
- * @date 2023-07-17 15:34:43
- */
-
-@Mapper
-public interface KwpLedgerTradeMapper extends BaseMapper<KwpLedgerTrade> {
-
-    List<LedgerSellDto> sellList(@Param("tradeReq") TradeReq tradeReq, @Param("authList") List<Long> authList);
-
-    /**
-     * 运营端 对账列表数据
-     *
-     * @param tradeReq
-     * @return
-     */
-    List<LedgerSell> list(@Param("tradeReq") TradeReq tradeReq, @Param("authEntIdList") List<Long> authEntIdList);
-
-    /**
-     * 采购方数据需要过滤已保存、已撤回状态的数据
-     *
-     * @param tradeReq
-     * @return
-     */
-
-    List<LedgerPurchaseDto> purchaseList(@Param("tradeReq") TradeReq tradeReq, @Param("authList") List<Long> authList);
-
-    /**
-     * 统计对账单数量
-     *
-     * @param tradeReq
-     * @return
-     */
-    Map<String, Long> countOrder(@Param("tradeReq") TradeReq tradeReq);
-
-    Map<String, Long> countSellOrder(@Param("tradeReq") TradeReq tradeReq, @Param("authList") List<Long> authList);
-
-    Map<String, Long> countPurchaseOrder(@Param("tradeReq") TradeReq tradeReq, @Param("authList") List<Long> authList);
-
-    /**
-     * 运营端统计对账单数量
-     *
-     * @param tradeReq
-     * @return
-     */
-    Map<String, Long> countOrder2(@Param("tradeReq") TradeReq tradeReq, @Param("authEntIdList") List<Long> authEntIdList);
-
-    LedgerTradeDto selectId(@Param("id") Long id, @Param("unitType") Integer unitType);
-
-    List<LedgerSellDto> selectSellIds(@Param("ids") List<Long> ids);
-
-    List<LedgerPurchaseDto> selectPurchaseIds(@Param("ids") List<Long> ids);
-
-    /**
-     * app端对账统计
-     *
-     * @param tradeReq
-     * @param status
-     * @return
-     */
-    Long countSum(@Param("tradeReq") TradeReq tradeReq, @Param("status") List<Integer> status);
-
-    /**
-     * app端对账统计
-     *
-     * @param tradeReq
-     * @param status
-     * @return
-     */
-    BigDecimal countSumMoney(@Param("tradeReq") TradeReq tradeReq, @Param("status") List<Integer> status);
-
-    void updatePrice(@Param("id") Long id, @Param("totalPrice") BigDecimal totalPrice);
-
-    /**
-     * @param entId     采购单位
-     * @param entTarget 销售单位
-     * @return
-     */
-    List<String> selectJoin(@Param("entId") Long entId, @Param("entTarget") Long entTarget);
-
-    LedgerSize countSize(@Param("entId") Long entId, @Param("enterpriseIds") List<Long> enterpriseIds);
-
-    /**
-     * 运营端通过ids查询，导出数据
-     *
-     * @param ids
-     * @return
-     */
-    List<LedgerSell> selectIds(@Param("ids") List<Long> ids);
-
-    List<LedgerTradeDto> exportList(@Param("tradeReq") TradeReq tradeReq, @Param("idList") List<Long> idList, @Param("authList") List<Long> authList);
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpLedgerTradeOrderMapper.java

@@ -1,14 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpLedgerTradeOrder;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author xucaiqin
- * @date 2023-07-10 16:42:19
- */
-
-@Mapper
-public interface KwpLedgerTradeOrderMapper extends BaseMapper<KwpLedgerTradeOrder> {
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpLedgerTradeTrackMapper.java

@@ -1,14 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpLedgerTradeTrack;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author xucaiqin
- * @date 2023-07-10 16:42:19
- */
-
-@Mapper
-public interface KwpLedgerTradeTrackMapper extends BaseMapper<KwpLedgerTradeTrack> {
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpLedgerTradeUnitMapper.java

@@ -1,14 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpLedgerTradeUnit;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author xucaiqin
- * @date 2023-07-14 09:23:57
- */
-
-@Mapper
-public interface KwpLedgerTradeUnitMapper extends BaseMapper<KwpLedgerTradeUnit> {
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpSettlementLogisticsMapper.java

@@ -1,130 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpSettlementLogistics;
-import com.sckw.payment.model.KwpSettlementRecord;
-import com.sckw.payment.model.dto.LedgerUnitDto;
-import com.sckw.payment.model.dto.MoneyType;
-import com.sckw.payment.model.dto.SettlementLogisticsDto;
-import com.sckw.payment.model.vo.SettlementLogistics;
-import com.sckw.payment.model.vo.req.SettlementReq;
-import com.sckw.payment.model.vo.res.SettlementLogisticsSumVo;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Aick Spt
- * @date 2023-07-24 14:55
- */
-@Mapper
-public interface KwpSettlementLogisticsMapper extends BaseMapper<KwpSettlementLogistics> {
-
-    /**
-     * 运费付款-物流订单列表
-     *
-     * @author Aick Spt
-     * @date 2023-07-24 16:23
-     */
-    List<SettlementLogisticsDto> pageSelect(@Param("settlementReq") SettlementReq settlementReq);
-
-    /**
-     * 运营端查询物流结算列表
-     *
-     * @param settlementReq
-     * @return
-     */
-    List<SettlementLogistics> list(@Param("settlementReq") SettlementReq settlementReq, @Param("authEntIdList") List<Long> authEntIdList);
-
-    /**
-     * 运费-物流订单各状态列表总数
-     *
-     * @author Aick Spt
-     * @date 2023-07-24 16:23
-     */
-    Long getCountList(@Param("settlementReq") SettlementReq settlementReq);
-
-    Map<String, Long> count(@Param("settlementReq") SettlementReq settlementReq, @Param("authEntIdList") List<Long> authEntIdList);
-
-    /**
-     * 运费-物流订单列表查询合计
-     *
-     * @author Aick Spt
-     * @date 2023-07-28 09:49
-     */
-    SettlementLogisticsSumVo selectSum(@Param("settlementReq") SettlementReq settlementReq);
-
-    /**
-     * 运营端接口
-     *
-     * @param settlementReq
-     * @return
-     */
-    SettlementLogisticsSumVo sum(@Param("settlementReq") SettlementReq settlementReq, @Param("authEntIdList") List<Long> authEntIdList);
-
-    /**
-     * 运费-物流订单详情
-     *
-     * @author Aick Spt
-     * @date 2023-07-24 16:24
-     */
-    SettlementLogisticsDto detail(@Param("id") Long id, @Param("unitType") Integer unitType, @Param("unitTypeTwo") Integer unitTypeTwo);
-
-    /**
-     * 根据条件查物流结算订单-导出
-     *
-     * @author Aick Spt
-     * @date 2023-07-24 16:24
-     */
-    List<SettlementLogisticsDto> selectLogisticsList(@Param("settlementReq") SettlementReq settlementReq, @Param("ids") List<Long> ids);
-
-    /**
-     * 运营端根据条件导出数据
-     *
-     * @param settlementReq
-     * @param ids
-     * @return
-     */
-    List<SettlementLogistics> exportList(@Param("settlementReq") SettlementReq settlementReq,
-                                         @Param("ids") List<Long> ids,
-                                         @Param("authEntIdList") List<Long> authEntIdList
-    );
-
-    List<LedgerUnitDto> getListById(@Param("id") Long id);
-
-    /**
-     * 根据双方企业查询
-     *
-     * @param entId     托运方
-     * @param entTarget 承运方
-     * @return
-     */
-    List<String> selectJoin(@Param("entId") Long entId, @Param("entTarget") Long entTarget);
-
-    /**
-     * @param entId    顶级企业id
-     * @param cur      当月/周
-     * @param pre      上月/周
-     * @param unitType 企业类型
-     */
-    List<MoneyType> sumMoneyType(@Param("entId") Long entId, @Param("cur") List<LocalDateTime> cur, @Param("pre") List<LocalDateTime> pre, @Param("unitType") Integer unitType);
-
-    /**
-     * 物流结算定时任务归档数据查询
-     *
-     * @return
-     */
-    List<KwpSettlementRecord> queryRecord();
-
-    /**
-     * app端详情
-     *
-     * @param id
-     * @param unitType
-     * @return
-     */
-    SettlementLogisticsDto selectDetail(@Param("id") Long id, @Param("unitType") Integer unitType);
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpSettlementLogisticsTrackMapper.java

@@ -1,14 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpSettlementLogisticsTrack;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author xucaiqin
- * @date 2023-07-10 16:42:20
- */
-
-@Mapper
-public interface KwpSettlementLogisticsTrackMapper extends BaseMapper<KwpSettlementLogisticsTrack> {
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpSettlementOfflineMapper.java

@@ -1,41 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpSettlementOffline;
-import com.sckw.payment.model.dto.SettlementOfflineDto;
-import com.sckw.payment.model.vo.SettlementVo;
-import com.sckw.payment.model.vo.req.SettlementOfflineReq;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * @author Aick Spt
- * @date 2023-07-25 10:44
- */
-@Mapper
-public interface KwpSettlementOfflineMapper extends BaseMapper<KwpSettlementOffline> {
-    List<SettlementOfflineDto> pageListLogisticsCollection(@Param("offlineReq") SettlementOfflineReq settlementOfflineReq);
-
-    SettlementOfflineDto detailLogisticsCollection(@Param("id") Long id);
-
-
-    List<SettlementOfflineDto> pageList(@Param("offlineReq") SettlementOfflineReq settlementOfflineReq);
-
-    /**
-     * app端查询列表
-     *
-     * @param settlementOfflineReq
-     * @return
-     */
-    List<SettlementVo> appList(@Param("offlineReq") SettlementOfflineReq settlementOfflineReq);
-
-    /**
-     * 运营端查询
-     *
-     * @param settlementOfflineReq
-     * @return
-     */
-    List<SettlementOfflineDto> list(@Param("offlineReq") SettlementOfflineReq settlementOfflineReq);
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpSettlementRecordMapper.java

@@ -1,22 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpSettlementRecord;
-import com.sckw.payment.model.vo.SettlementRecord;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * @author xucaiqin
- * @date 2023-09-13 18:48:30
- */
-@Mapper
-public interface KwpSettlementRecordMapper extends BaseMapper<KwpSettlementRecord> {
-    void insertBatch(@Param("list") List<KwpSettlementRecord> list);
-
-    List<SettlementRecord> countByDay(@Param("timeAll") List<String> timeAll, @Param("time") List<String> time, @Param("entId") Long entId);
-
-    List<SettlementRecord> countMonth(@Param("timeAll") List<String> timeAll, @Param("time") List<String> time, @Param("entId") Long entId);
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpSettlementTradeMapper.java

@@ -1,102 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpSettlementRecord;
-import com.sckw.payment.model.KwpSettlementTrade;
-import com.sckw.payment.model.dto.LedgerUnitDto;
-import com.sckw.payment.model.dto.MoneyType;
-import com.sckw.payment.model.dto.SettlementTradeDto;
-import com.sckw.payment.model.vo.SettlementTrade;
-import com.sckw.payment.model.vo.req.SettlementTradeReq;
-import com.sckw.payment.model.vo.res.SettlementSumVo;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author xucaiqin
- * @date 2023-07-10 16:42:19
- */
-
-@Mapper
-public interface KwpSettlementTradeMapper extends BaseMapper<KwpSettlementTrade> {
-    List<SettlementTradeDto> pageSelect(@Param("settlementReq") SettlementTradeReq settlementReq);
-
-    /**
-     * 运营端列表查询
-     *
-     * @param settlementReq
-     * @return
-     */
-    List<SettlementTrade> list(@Param("settlementReq") SettlementTradeReq settlementReq, @Param("authEntIdList") List<Long> authEntIdList);
-
-    SettlementSumVo sumMoney(@Param("settlementReq") SettlementTradeReq settlementReq);
-
-    /**
-     * 运营端统计
-     *
-     * @param settlementReq
-     * @return
-     */
-    SettlementSumVo sumMoney2(@Param("settlementReq") SettlementTradeReq settlementReq);
-
-    Map<String, Long> countOrder(@Param("settlementReq") SettlementTradeReq settlementReq);
-
-    /**
-     * 运营端统计结算单数量
-     *
-     * @param settlementReq
-     * @return
-     */
-    Map<String, Long> count(@Param("settlementReq") SettlementTradeReq settlementReq, @Param("authEntIdList") List<Long> authEntIdList);
-
-    List<SettlementTradeDto> selectByIds(@Param("ids") List<Long> ids, @Param("unitType") Integer unitType);
-
-    SettlementTradeDto getById(@Param("id") Long id, @Param("unitType") Integer unitType);
-
-    List<LedgerUnitDto> getListById(@Param("id") Long id);
-
-    SettlementTradeDto selectDetail(@Param("id") Long id, @Param("unitType") Integer unitType);
-
-    /**
-     * 根据双方企业查询
-     *
-     * @param entId     采购方
-     * @param entTarget 销售方
-     * @return
-     */
-    List<String> selectJoin(@Param("entId") Long entId, @Param("entTarget") Long entTarget);
-
-    /**
-     * @param entId    顶级企业id
-     * @param cur      当月/周
-     * @param pre      上月/周
-     * @param unitType 企业类型
-     */
-    List<MoneyType> sumMoneyType(@Param("entId") Long entId, @Param("cur") List<LocalDateTime> cur, @Param("pre") List<LocalDateTime> pre, @Param("unitType") Integer unitType);
-
-    List<KwpSettlementRecord> queryRecord();
-
-    /**
-     * 导出数据查询
-     *
-     * @param settlementReq
-     * @param idList
-     * @return
-     */
-    List<SettlementTradeDto> exportList(@Param("settlementReq") SettlementTradeReq settlementReq, @Param("idList") List<Long> idList);
-
-    /**
-     * 运营端导出数据
-     *
-     * @param settlementReq
-     * @param idList
-     * @return
-     */
-    List<SettlementTrade> operateExportList(@Param("settlementReq") SettlementTradeReq settlementReq,
-                                            @Param("idList") List<Long> idList,
-                                            @Param("authEntIdList") List<Long> authEntIdList);
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpSettlementTradeTrackMapper.java

@@ -1,14 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpSettlementTradeTrack;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author xucaiqin
- * @date 2023-07-10 16:42:19
- */
-
-@Mapper
-public interface KwpSettlementTradeTrackMapper extends BaseMapper<KwpSettlementTradeTrack> {
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpSettlementWalletMapper.java

@@ -1,50 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpSettlementWallet;
-import com.sckw.payment.model.dto.SettlementWalletDto;
-import com.sckw.payment.model.vo.SettlementVo;
-import com.sckw.payment.model.vo.req.SettlementWalletReq;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * @author Aick Spt
- * @date 2023-07-25 11:01
- */
-
-@Mapper
-public interface KwpSettlementWalletMapper extends BaseMapper<KwpSettlementWallet> {
-
-    /**
-     * 运费付款-物流订单列表
-     *
-     * @author Aick Spt
-     * @date 2023-07-24 16:23
-     */
-    List<SettlementWalletDto> pageListLogisticsPayment(@Param("settlementWalletReq") SettlementWalletReq settlementWalletReq);
-
-    SettlementWalletDto detailLogisticsPayment(@Param("id") Long id);
-
-    Integer confirmLogisticsPayment(@Param("id") Long id, @Param("price") Float price);
-
-    List<SettlementWalletDto> pageList(@Param("walletReq") SettlementWalletReq walletReq);
-
-    /**
-     * app端结算列表
-     *
-     * @param walletReq
-     * @return
-     */
-    List<SettlementVo> appList(@Param("walletReq") SettlementWalletReq walletReq);
-
-    /**
-     * 运营端查询钱包结算记录
-     *
-     * @param walletReq
-     * @return
-     */
-    List<SettlementWalletDto> list(@Param("walletReq") SettlementWalletReq walletReq);
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpTradeFreezeMapper.java

@@ -1,13 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpTradeFreeze;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
-* @date 2023-09-20 17:32:24
-* @author xucaiqin
-*/
-@Mapper
-public interface KwpTradeFreezeMapper extends BaseMapper<KwpTradeFreeze> {
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpWalletCashMapper.java

@@ -1,13 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpWalletCash;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author xucaiqin
- * @date 2026-03-26 14:32:05
- */
-@Mapper
-public interface KwpWalletCashMapper extends BaseMapper<KwpWalletCash> {
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpWalletFreightMapper.java

@@ -1,13 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpWalletFreight;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author xucaiqin
- * @date 2026-03-26 14:32:05
- */
-@Mapper
-public interface KwpWalletFreightMapper extends BaseMapper<KwpWalletFreight> {
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpWalletMapper.java

@@ -1,13 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpWallet;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author xucaiqin
- * @date 2026-03-26 14:33:23
- */
-@Mapper
-public interface KwpWalletMapper extends BaseMapper<KwpWallet> {
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpWalletPayMapper.java

@@ -1,13 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpWalletPay;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
-* @date 2026-03-26 14:32:05
-* @author xucaiqin
-*/
-@Mapper
-public interface KwpWalletPayMapper extends BaseMapper<KwpWalletPay> {
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpWalletPrepayMapper.java

@@ -1,13 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpWalletPrepay;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author xucaiqin
- * @date 2026-03-26 14:45:11
- */
-@Mapper
-public interface KwpWalletPrepayMapper extends BaseMapper<KwpWalletPrepay> {
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpWalletReceiveMapper.java

@@ -1,18 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpWalletReceive;
-import com.sckw.payment.model.vo.req.page.MoneyPage;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
-* @date 2023-10-18 12:57:05
-* @author xucaiqin
-*/
-@Mapper
-public interface KwpWalletReceiveMapper extends BaseMapper<KwpWalletReceive> {
-    List<KwpWalletReceive> pageList(@Param("moneyPage") MoneyPage moneyPage);
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpWalletRefundMapper.java

@@ -1,24 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpWalletRefund;
-import com.sckw.payment.model.vo.req.page.RefundPage;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * @author xucaiqin
- * @date 2023-09-05 17:53:14
- */
-@Mapper
-public interface KwpWalletRefundMapper extends BaseMapper<KwpWalletRefund> {
-    /**
-     * 查询退款中的 退款单列表
-     *
-     * @param refundPage
-     * @return
-     */
-    List<KwpWalletRefund> pageList(@Param("refundPage") RefundPage refundPage);
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpWalletRefundSubMapper.java

@@ -1,13 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpWalletRefundSub;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
-* @date 2023-09-19 10:26:44
-* @author xucaiqin
-*/
-@Mapper
-public interface KwpWalletRefundSubMapper extends BaseMapper<KwpWalletRefundSub> {
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpWalletRelationMapper.java

@@ -1,13 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpWalletRelation;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
-* @date 2023-07-24 10:47:47
-* @author xucaiqin
-*/
-@Mapper
-public interface KwpWalletRelationMapper extends BaseMapper<KwpWalletRelation> {
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpWalletSubMapper.java

@@ -1,13 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpWalletSub;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
-* @date 2026-03-26 14:32:05
-* @author xucaiqin
-*/
-@Mapper
-public interface KwpWalletSubMapper extends BaseMapper<KwpWalletSub> {
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpWalletTransferMapper.java

@@ -1,34 +0,0 @@
-package com.sckw.payment.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.payment.model.KwpWalletTransfer;
-import com.sckw.payment.model.vo.req.page.MoneyPage;
-import com.sckw.payment.model.vo.res.FundVo;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * @author xucaiqin
- * @date 2023-09-06 16:42:08
- */
-@Mapper
-public interface KwpWalletTransferMapper extends BaseMapper<KwpWalletTransfer> {
-    /**
-     * 转账记录
-     *
-     * @param moneyPage
-     * @return
-     */
-    List<KwpWalletTransfer> pageList(@Param("moneyPage") MoneyPage moneyPage);
-
-    /**
-     * 统计转账中金额
-     *
-     * @param fundVo
-     * @return
-     */
-    BigDecimal sumMoney(@Param("fundVo") FundVo fundVo);
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dubbo/PayCenterServiceImpl.java

@@ -1,65 +0,0 @@
-package com.sckw.payment.dubbo;
-
-import com.sckw.core.exception.BusinessException;
-import com.sckw.payment.api.dubbo.PayCenterDubboService;
-import com.sckw.payment.api.model.constant.ChannelEnum;
-import com.sckw.payment.api.model.dto.MemberDetail;
-import com.sckw.payment.api.model.dto.common.R;
-import com.sckw.payment.api.model.dto.WalletDto;
-import com.sckw.payment.service.KwpWalletRelationService;
-import com.sckw.payment.service.PayCenterService;
-import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.dubbo.config.annotation.DubboService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-@DubboService(group = "design", version = "1.0.0")
-@Slf4j
-public class PayCenterServiceImpl implements PayCenterDubboService {
-    @Resource
-    private PayCenterService payCenterService;
-    @Resource
-    private KwpWalletRelationService kwpWalletRelationService;
-
-    @Override
-    public R<MemberDetail> memberDetail(Long entId, ChannelEnum channel) {
-//        String uid = kwpWalletRelationService.getRelation(entId);
-//        if (StringUtils.isBlank(uid)) {
-//            throw new BusinessException("企业未开通电子钱包");
-//        }
-//        payCenterService.withdrawDetail("kll_0001", "", "1");
-//        payCenterService.withdrawIndex("kll_0001", ChannelEnum.HF, 1, 5);
-//        payCenterService.walletUnFreeze("kll_0001");
-//        payCenterService.withdrawStatus("");
-//        payCenterService.withdrawCancel("kll_0001", "123");
-//        payCenterService.withdrawTake("kll_0001", ChannelEnum.HF, 123L, "1");
-//        payCenterService.totalInfo("kll_0001", ChannelEnum.HF, "kll_0002");
-//        payCenterService.operateDownload("kll_0001", ChannelEnum.HF, "kll_0002");
-//        payCenterService.operateCategory();
-//        payCenterService.operateIndex("kll_0001", ChannelEnum.HF, 1, 5, new String[]{"2023-07-20", "2023-07-21"}, null);
-        payCenterService.logCategory();
-        payCenterService.record("kll_0001", "kll_0002", 1, 5);
-
-//        payCenterService.payAgentPay("kll_0001");
-        return R.ok();
-    }
-
-    @Override
-    public R<List<WalletDto>> wallet(Long payEntId, ChannelEnum channel, Long receiveEntId) {
-        String uid = kwpWalletRelationService.getRelation(payEntId);
-        if (StringUtils.isBlank(uid)) {
-            throw new BusinessException("付款方企业未开通电子钱包");
-        }
-        String filter = kwpWalletRelationService.getRelation(receiveEntId);
-        if (StringUtils.isBlank(filter)) {
-            throw new BusinessException("收款方企业未开通电子钱包");
-        }
-        return payCenterService.wallet(uid, channel, filter);
-    }
-
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dubbo/PaymentDubboServiceImpl.java

@@ -1,389 +0,0 @@
-package com.sckw.payment.dubbo;
-
-import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson2.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.sckw.core.exception.BusinessException;
-import com.sckw.core.utils.DateTimeUtil;
-import com.sckw.core.utils.OrderUtils;
-import com.sckw.core.web.constant.HttpStatus;
-import com.sckw.core.web.context.LoginUserHolder;
-import com.sckw.core.web.response.BaseResult;
-import com.sckw.core.web.response.HttpResult;
-import com.sckw.payment.api.dubbo.PaymentDubboService;
-import com.sckw.payment.api.model.WalletFreeze;
-import com.sckw.payment.api.model.constant.ChannelEnum;
-import com.sckw.payment.api.model.constant.OrderEnum;
-import com.sckw.payment.api.model.dto.LedgerCount;
-import com.sckw.payment.api.model.dto.SettlementMoney;
-import com.sckw.payment.dao.KwpBizWalletMapper;
-import com.sckw.payment.dao.KwpBizWalletPrepayMapper;
-import com.sckw.payment.model.KwpBizWallet;
-import com.sckw.payment.model.KwpBizWalletPrepay;
-import com.sckw.payment.model.constant.LogisticsUnitType;
-import com.sckw.payment.model.constant.TradeUnitType;
-import com.sckw.payment.model.dto.LedgerSize;
-import com.sckw.payment.model.dto.MoneyType;
-import com.sckw.payment.service.*;
-import com.sckw.payment.utils.DecimalUtils;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.config.annotation.DubboService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.math.BigDecimal;
-import java.text.DecimalFormat;
-import java.time.LocalDateTime;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * @author xucaiqin
- * @date 2023-08-18 17:26:05
- */
-@Service
-@DubboService(group = "design", version = "1.0.0")
-@RequiredArgsConstructor
-@Slf4j
-public class PaymentDubboServiceImpl implements PaymentDubboService {
-    private final KwpLedgerLogisticsService ledgerLogisticsService;
-    private final KwpLedgerTradeService kwpLedgerTradeService;
-    private final KwpSettlementLogisticsService kwpSettlementLogisticsService;
-    private final KwpSettlementTradeService kwpSettlementTradeService;
-    private final WalletService walletService;
-    private final KwpTradeFreezeService kwpTradeFreezeService;
-    private final KwpBizWalletPrepayMapper kwpBizWalletPrepayMapper;
-    private final KwpBizWalletMapper kwpBizWalletMapper;
-
-
-    private SettlementMoney change(List<MoneyType> moneyType) {
-        DecimalFormat df = new DecimalFormat("0.00");
-        BigDecimal curMoney = new BigDecimal("0.0"), preMoney = new BigDecimal("0.0");
-        for (MoneyType type : moneyType) {
-            if (type.type() == 1) {
-                curMoney = type.money();
-            } else {
-                preMoney = type.money();
-            }
-        }
-        int flag = curMoney.compareTo(preMoney) > 0 ? 1 : 2;
-
-        String percent = DecimalUtils.percent(curMoney.subtract(preMoney), preMoney);
-        return new SettlementMoney(df.format(curMoney), df.format(preMoney), percent, flag);
-    }
-
-    @Override
-    public HttpResult freezeMoney(Long payEntId, ChannelEnum channel, Long receiveEntId, BigDecimal money, Long tOrderId) {
-        log.info("贸易下单冻结订单，payEntId：{} channel：{} receiveEntId：{} money：{} tOrderId：{}", payEntId, channel, receiveEntId, money, tOrderId);
-        if (Objects.isNull(payEntId)) {
-            return HttpResult.error("支付企业不能为空");
-        }
-        if (Objects.isNull(channel)) {
-            return HttpResult.error("支付渠道不能为空");
-        }
-        if (Objects.isNull(receiveEntId)) {
-            return HttpResult.error("收款企业不能为空");
-        }
-        if (Objects.isNull(money)) {
-            return HttpResult.error("订单金额不能为空");
-        }
-        if (Objects.isNull(tOrderId)) {
-            return HttpResult.error("贸易订单id不能为空");
-        }
-        long m;
-        try {
-            m = money.multiply(new BigDecimal("100")).longValueExact();
-        } catch (Exception e) {
-            log.error("金额转换异常：{}", e.getMessage(), e);
-            return HttpResult.error("金额异常");
-        }
-        //settlementTradeFreeze冻结订单编号规则
-        String orderNo = OrderUtils.generateOrderNo("STF");
-        HttpResult httpResult = walletService.freezeMoney(payEntId, channel, receiveEntId, m, orderNo);
-        //记录订单流水号
-        if (httpResult.getCode() == HttpStatus.SUCCESS_CODE) {
-            kwpTradeFreezeService.save(tOrderId, orderNo);
-        }
-        log.info("贸易下单冻结订单:{}", JSONObject.toJSONString(httpResult));
-        return httpResult;
-    }
-
-    @Override
-    public Map<OrderEnum, List<String>> checkLedger(Long entId, Long entTarget) {
-        if (Objects.isNull(entId) || Objects.isNull(entTarget)) {
-            throw new BusinessException("企业id不能为空");
-        }
-        List<String> logistics = ledgerLogisticsService.checkOrder(entId, entTarget);
-        List<String> trade = kwpLedgerTradeService.checkOrder(entId, entTarget);
-        Map<OrderEnum, List<String>> res = new HashMap<>(2);
-        res.put(OrderEnum.LOGISTICS, logistics);
-        res.put(OrderEnum.TRADE, trade);
-        return res;
-    }
-
-    @Override
-    public Map<OrderEnum, List<String>> checkSettlement(Long entId, Long entTarget) {
-        if (Objects.isNull(entId) || Objects.isNull(entTarget)) {
-            throw new BusinessException("企业id不能为空");
-        }
-        List<String> logistics = kwpSettlementLogisticsService.checkOrder(entId, entTarget);
-        List<String> trade = kwpSettlementTradeService.checkOrder(entId, entTarget);
-        Map<OrderEnum, List<String>> res = new HashMap<>(2);
-        res.put(OrderEnum.LOGISTICS, logistics);
-        res.put(OrderEnum.TRADE, trade);
-        return res;
-    }
-
-    @Override
-    public LedgerCount countLedger(Long entId, List<Long> enterpriseIds) {
-        enterpriseIds = enterpriseIds.stream().distinct().collect(Collectors.toList());
-        LedgerSize count = ledgerLogisticsService.count(entId, enterpriseIds);
-        LedgerSize ledgerSize = kwpLedgerTradeService.count(entId, enterpriseIds);
-        return new LedgerCount(ledgerSize.send(), ledgerSize.receive(), count.send(), count.receive());
-    }
-
-
-    @Override
-    public SettlementMoney countSell(Long entId, Integer countType) {
-        log.info("销售统计：{} {}", entId, countType);
-        if (Objects.isNull(countType)) {
-            return new SettlementMoney("0.00", "0.00", "0.00%", 1);
-        }
-        List<LocalDateTime> cur = new ArrayList<>();
-        List<LocalDateTime> pre = new ArrayList<>();
-        //按周统计
-        if (countType == 2) {
-            cur.add(DateTimeUtil.getComputeDaysStart(-6));
-            cur.add(DateTimeUtil.getComputeDaysEnd(0));
-            pre.add(DateTimeUtil.getComputeDaysStart(-13));
-            pre.add(DateTimeUtil.getComputeDaysEnd(-7));
-        } else if (countType == 3) {
-            cur.add(DateTimeUtil.getComputeMonthStart(-1, 1));
-            cur.add(DateTimeUtil.getComputeMonthEnd(0, 0));
-            pre.add(DateTimeUtil.getComputeMonthStart(-2, 1));
-            pre.add(DateTimeUtil.getComputeMonthEnd(-1, 0));
-        }
-        List<MoneyType> moneyType = kwpSettlementTradeService.moneySum(entId, cur, pre, TradeUnitType.SELL);
-        return change(moneyType);
-    }
-
-    @Override
-    public SettlementMoney countPurchase(Long entId, Integer countType) {
-        log.info("采购统计：{} {}", entId, countType);
-        if (Objects.isNull(countType)) {
-            return new SettlementMoney("0.00", "0.00", "0.00%", 1);
-        }
-        List<LocalDateTime> cur = new ArrayList<>();
-        List<LocalDateTime> pre = new ArrayList<>();
-        //按周统计
-        if (countType == 2) {
-            cur.add(DateTimeUtil.getComputeDaysStart(-6));
-            cur.add(DateTimeUtil.getComputeDaysEnd(0));
-            pre.add(DateTimeUtil.getComputeDaysStart(-13));
-            pre.add(DateTimeUtil.getComputeDaysEnd(-7));
-        } else if (countType == 3) {
-            cur.add(DateTimeUtil.getComputeMonthStart(-1, 1));
-            cur.add(DateTimeUtil.getComputeMonthEnd(0, 0));
-            pre.add(DateTimeUtil.getComputeMonthStart(-2, 1));
-            pre.add(DateTimeUtil.getComputeMonthEnd(-1, 0));
-        }
-        List<MoneyType> moneyType = kwpSettlementTradeService.moneySum(entId, cur, pre, TradeUnitType.PURCHASE);
-        return change(moneyType);
-    }
-
-
-    @Override
-    public SettlementMoney countCarrier(Long entId, Integer countType) {
-        log.info("承运统计：{} {}", entId, countType);
-        if (Objects.isNull(countType)) {
-            return new SettlementMoney("0.00", "0.00", "0.00%", 1);
-        }
-        List<LocalDateTime> cur = new ArrayList<>();
-        List<LocalDateTime> pre = new ArrayList<>();
-        //按周统计
-        if (countType == 2) {
-            cur.add(DateTimeUtil.getComputeDaysStart(-6));
-            cur.add(DateTimeUtil.getComputeDaysEnd(0));
-            pre.add(DateTimeUtil.getComputeDaysStart(-13));
-            pre.add(DateTimeUtil.getComputeDaysEnd(-7));
-        } else if (countType == 3) {
-            cur.add(DateTimeUtil.getComputeMonthStart(-1, 1));
-            cur.add(DateTimeUtil.getComputeMonthEnd(0, 0));
-            pre.add(DateTimeUtil.getComputeMonthStart(-2, 1));
-            pre.add(DateTimeUtil.getComputeMonthEnd(-1, 0));
-        }
-        List<MoneyType> moneyType = kwpSettlementLogisticsService.moneySum(entId, cur, pre, LogisticsUnitType.CARRIER);
-        return change(moneyType);
-
-    }
-
-    @Override
-    public SettlementMoney countShipper(Long entId, Integer countType) {
-        log.info("托运统计：{} {}", entId, countType);
-        if (Objects.isNull(countType)) {
-            return new SettlementMoney("0.00", "0.00", "0.00%", 1);
-        }
-        List<LocalDateTime> cur = new ArrayList<>();
-        List<LocalDateTime> pre = new ArrayList<>();
-        //按周统计
-        if (countType == 2) {
-            cur.add(DateTimeUtil.getComputeDaysStart(-6));
-            cur.add(DateTimeUtil.getComputeDaysEnd(0));
-            pre.add(DateTimeUtil.getComputeDaysStart(-13));
-            pre.add(DateTimeUtil.getComputeDaysEnd(-7));
-        } else if (countType == 3) {
-            cur.add(DateTimeUtil.getComputeMonthStart(-1, 1));
-            cur.add(DateTimeUtil.getComputeMonthEnd(0, 0));
-            pre.add(DateTimeUtil.getComputeMonthStart(-2, 1));
-            pre.add(DateTimeUtil.getComputeMonthEnd(-1, 0));
-        }
-        List<MoneyType> moneyType = kwpSettlementLogisticsService.moneySum(entId, cur, pre, LogisticsUnitType.SHIPPER);
-        return change(moneyType);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public BaseResult<Boolean> freezeMoney(WalletFreeze walletFreeze) {
-        log.info("冻结钱包：{}", JSONObject.toJSONString(walletFreeze));
-        KwpBizWallet one = kwpBizWalletMapper.selectOne(new LambdaQueryWrapper<KwpBizWallet>()
-                .eq(KwpBizWallet::getSupEntId, walletFreeze.getSaleEntId())
-                .eq(KwpBizWallet::getProEntId, walletFreeze.getBuyEntId()).eq(KwpBizWallet::getState, 1)
-        );
-        if (Objects.isNull(one)) {
-            return BaseResult.failed("钱包不存在,请核实");
-        }
-        BigDecimal amount = one.getAmount();
-        if (NumberUtil.isLess(amount, walletFreeze.getMoney())) {
-            return BaseResult.failed("可用余额不足");
-        }
-        one.setAmount(NumberUtil.sub(amount, walletFreeze.getMoney()));
-        one.setPrepayAmount(NumberUtil.add(one.getPrepayAmount(), walletFreeze.getMoney()));
-        one.setUpdateUser(LoginUserHolder.getUserName());
-        kwpBizWalletMapper.updateById(one);
-        //新增订单
-        KwpBizWalletPrepay kwpBizWalletPrepay = new KwpBizWalletPrepay();
-        kwpBizWalletPrepay.setWalletId(one.getId());
-        kwpBizWalletPrepay.setOrderId(walletFreeze.getTTradeOrderId());
-        kwpBizWalletPrepay.setChangeAmount(walletFreeze.getMoney());
-        kwpBizWalletPrepay.setAmount(one.getAmount());
-        kwpBizWalletPrepay.setPrepayAmount(one.getPrepayAmount());
-        kwpBizWalletPrepay.setType(2);
-        kwpBizWalletPrepay.setRemark(StrUtil.format("[订单号：{}]冻结", walletFreeze.getOrderNo()));
-        kwpBizWalletPrepay.setVoucherUrl("");
-        kwpBizWalletPrepay.setCreateTime(new Date());
-        kwpBizWalletPrepay.setUpdateTime(new Date());
-        kwpBizWalletPrepay.setCreateUser(LoginUserHolder.getUserName());
-        kwpBizWalletPrepay.setUpdateUser(LoginUserHolder.getUserName());
-
-        kwpBizWalletPrepayMapper.insert(kwpBizWalletPrepay);
-        return BaseResult.success();
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public BaseResult<Boolean> dealMoney(WalletFreeze walletFreeze) {
-        log.info("钱包结算 {}", JSONObject.toJSONString(walletFreeze));
-        Long tTradeOrderId = walletFreeze.getTTradeOrderId();
-        KwpBizWalletPrepay one = kwpBizWalletPrepayMapper.selectOne(new LambdaQueryWrapper<KwpBizWalletPrepay>()
-                .eq(KwpBizWalletPrepay::getOrderId, tTradeOrderId)
-                .eq(KwpBizWalletPrepay::getType, 2)
-                .last("limit 1")
-        );
-        if (Objects.isNull(one)) {
-            return BaseResult.failed("冻结订单不存在");
-        }
-
-        KwpBizWallet wallet = kwpBizWalletMapper.selectById(one.getWalletId());
-        if (Objects.isNull(wallet) || Objects.equals(wallet.getState(), 0)) {
-            return BaseResult.failed("钱包不存在或状态异常");
-        }
-        BigDecimal changeAmount = one.getChangeAmount();//冻结金额
-        //钱包实际可用
-        BigDecimal amount = wallet.getAmount();
-        //新增解冻订单
-        amount = NumberUtil.add(amount, changeAmount);
-        KwpBizWalletPrepay kwpBizWalletPrepay = new KwpBizWalletPrepay();
-        kwpBizWalletPrepay.setWalletId(wallet.getId());
-        kwpBizWalletPrepay.setOrderId(walletFreeze.getTTradeOrderId());
-        kwpBizWalletPrepay.setChangeAmount(changeAmount);
-        kwpBizWalletPrepay.setAmount(amount);
-        kwpBizWalletPrepay.setPrepayAmount(NumberUtil.sub(wallet.getPrepayAmount(), changeAmount));
-        kwpBizWalletPrepay.setType(3);
-        kwpBizWalletPrepay.setRemark(StrUtil.format("[{}][结算]解冻订单总金额", walletFreeze.getOrderNo()));
-        kwpBizWalletPrepay.setVoucherUrl("");
-        kwpBizWalletPrepay.setCreateTime(new Date());
-        kwpBizWalletPrepay.setUpdateTime(new Date());
-        kwpBizWalletPrepay.setCreateUser(LoginUserHolder.getUserName());
-        kwpBizWalletPrepay.setUpdateUser(LoginUserHolder.getUserName());
-        kwpBizWalletPrepayMapper.insert(kwpBizWalletPrepay);
-
-        //新增消费订单
-        KwpBizWalletPrepay kwpBizWalletPrepay2 = new KwpBizWalletPrepay();
-        kwpBizWalletPrepay2.setWalletId(wallet.getId());
-        kwpBizWalletPrepay2.setOrderId(walletFreeze.getTTradeOrderId());
-        kwpBizWalletPrepay2.setChangeAmount(walletFreeze.getMoney());
-        kwpBizWalletPrepay2.setAmount(NumberUtil.sub(amount, walletFreeze.getMoney()));
-        kwpBizWalletPrepay2.setPrepayAmount(kwpBizWalletPrepay.getPrepayAmount());
-        kwpBizWalletPrepay2.setType(4);
-        kwpBizWalletPrepay2.setRemark(StrUtil.format("[{}][结算]扣除订单总金额", walletFreeze.getOrderNo()));
-        kwpBizWalletPrepay2.setVoucherUrl("");
-        kwpBizWalletPrepay2.setCreateTime(new Date());
-        kwpBizWalletPrepay2.setUpdateTime(new Date());
-        kwpBizWalletPrepay2.setCreateUser(LoginUserHolder.getUserName());
-        kwpBizWalletPrepay2.setUpdateUser(LoginUserHolder.getUserName());
-        kwpBizWalletPrepayMapper.insert(kwpBizWalletPrepay2);
-
-        wallet.setAmount(kwpBizWalletPrepay2.getAmount());
-        wallet.setPrepayAmount(kwpBizWalletPrepay2.getPrepayAmount());
-        kwpBizWalletMapper.updateById(wallet);
-        return BaseResult.success();
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public BaseResult<Boolean> unfreezeMoney(WalletFreeze walletFreeze) {
-        log.info("解冻钱包：{}", JSONObject.toJSONString(walletFreeze));
-        Long tTradeOrderId = walletFreeze.getTTradeOrderId();
-        KwpBizWalletPrepay one = kwpBizWalletPrepayMapper.selectOne(new LambdaQueryWrapper<KwpBizWalletPrepay>()
-                .eq(KwpBizWalletPrepay::getOrderId, tTradeOrderId)
-                .eq(KwpBizWalletPrepay::getType, 2)
-                .last("limit 1")
-        );
-        if (Objects.isNull(one)) {
-            return BaseResult.failed("冻结订单不存在");
-        }
-
-        KwpBizWallet wallet = kwpBizWalletMapper.selectById(one.getWalletId());
-        if (Objects.isNull(wallet) || Objects.equals(wallet.getState(), 0)) {
-            return BaseResult.failed("钱包不存在或状态异常");
-        }
-        BigDecimal changeAmount = one.getChangeAmount();//冻结金额
-        //钱包实际可用
-        BigDecimal amount = wallet.getAmount();
-        //新增解冻订单
-        amount = NumberUtil.add(amount, changeAmount);
-        KwpBizWalletPrepay kwpBizWalletPrepay = new KwpBizWalletPrepay();
-        kwpBizWalletPrepay.setWalletId(wallet.getId());
-        kwpBizWalletPrepay.setOrderId(walletFreeze.getTTradeOrderId());
-        kwpBizWalletPrepay.setChangeAmount(changeAmount);
-        kwpBizWalletPrepay.setAmount(amount);
-        kwpBizWalletPrepay.setPrepayAmount(NumberUtil.sub(wallet.getPrepayAmount(), changeAmount));
-        kwpBizWalletPrepay.setType(3);
-        kwpBizWalletPrepay.setRemark(StrUtil.format("[订单号：{}]解冻", walletFreeze.getOrderNo()));
-        kwpBizWalletPrepay.setVoucherUrl("");
-        kwpBizWalletPrepay.setCreateTime(new Date());
-        kwpBizWalletPrepay.setUpdateTime(new Date());
-        kwpBizWalletPrepay.setCreateUser(LoginUserHolder.getUserName());
-        kwpBizWalletPrepay.setUpdateUser(LoginUserHolder.getUserName());
-        kwpBizWalletPrepayMapper.insert(kwpBizWalletPrepay);
-
-
-        wallet.setAmount(amount);
-        wallet.setPrepayAmount(kwpBizWalletPrepay.getPrepayAmount());
-        kwpBizWalletMapper.updateById(wallet);
-        return BaseResult.success();
-    }
-}
-

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/enums/PrepayTypEnum.java

@@ -1,56 +0,0 @@
-package com.sckw.payment.enums;
-
-import lombok.Getter;
-
-@Getter
-public enum PrepayTypEnum {
-
-    PREPAY(0, "预付"),
-    DEDUCTION(1, "扣款"),
-    FREEZE(2, "冻结"),
-    UNFREEZE(3, "解冻"),
-    CONSUME(4, "消费");
-
-    /**
-     * 数据库存储的编码值
-     */
-    private final Integer code;
-
-    /**
-     * 类型描述（用于页面展示）
-     */
-    private final String desc;
-
-    PrepayTypEnum(Integer code, String desc) {
-        this.code = code;
-        this.desc = desc;
-    }
-
-    /**
-     * 根据编码值获取枚举
-     * @param code 数据库存储的编码
-     * @return 对应的枚举对象，无匹配时返回 null
-     */
-    public static PrepayTypEnum getByCode(Integer code) {
-        if (code == null) {
-            return null;
-        }
-        for (PrepayTypEnum type : values()) {
-            if (type.code.equals(code)) {
-                return type;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * 根据编码值获取描述
-     * @param code 数据库存储的编码
-     * @return 描述文本，无匹配时返回"未知类型"
-     */
-    public static String getDescByCode(Integer code) {
-        PrepayTypEnum type = getByCode(code);
-        return type != null ? type.desc : "未知类型";
-    }
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/JumpUrl.java

@@ -1,28 +0,0 @@
-package com.sckw.payment.model;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Getter;
-import lombok.Setter;
-
-
-/**
- * @author xucaiqin
- * @date 2023-09-06 18:58:51
- */
-@Schema(description = "跳转URL实体类")
-@Getter
-@Setter
-public class JumpUrl {
-    /**
-     * pc端跳转地址
-     */
-    @Schema(description = "PC端跳转地址")
-    private String pc;
-    /**
-     * app端跳转地址
-     */
-    @Schema(description = "APP端跳转地址")
-    private String app;
-
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/JumpUrlConfig.java

@@ -1,45 +0,0 @@
-package com.sckw.payment.model;
-
-import com.sckw.core.model.constant.Global;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-
-/**
- * @author xucaiqin
- * @date 2023-09-06 18:58:51
- */
-@Schema(description = "跳转URL配置类")
-@Getter
-@Setter
-@Component
-@ConfigurationProperties(prefix = "msg")
-@RefreshScope
-public class JumpUrlConfig {
-    /**
-     * 销售收款对账
-     */
-    @Schema(description = "URL映射配置")
-    private Map<String, JumpUrl> url = new HashMap<>();
-
-    public Map<String, String> getMapUrl(String key) {
-        JumpUrl jumpUrl = url.get(key);
-        if (Objects.nonNull(jumpUrl)) {
-            return new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
-                put("pc", jumpUrl.getPc());
-                put("app", jumpUrl.getApp());
-            }};
-        }
-        return new HashMap<>(Global.NUMERICAL_SIXTEEN);
-    }
-
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpBizWallet.java

@@ -1,94 +0,0 @@
-package com.sckw.payment.model;
-
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * Author: donglang
- * Time: 2025-11-03
- * Des: 钱包管理
- * Version: 1.0
- */
-
-@Data
-@TableName("kwp_biz_wallet")
-public class KwpBizWallet {
-
-    /**
-     * 主键
-     */
-    @TableId(type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 供应商企业id
-     */
-    @TableField("sup_ent_id")
-    private Long supEntId;
-
-    /**
-     * 采购商企业id
-     */
-    @TableField("pro_ent_id")
-    private Long proEntId;
-
-    /**
-     * 钱包名称
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 可用金额（单位：元，保留2位小数）
-     */
-    @TableField("amount")
-    private BigDecimal amount;
-
-    /**
-     * 冻结金额（单位：元，保留2位小数）
-     */
-    @TableField("prepay_amount")
-    private BigDecimal prepayAmount;
-
-    /**
-     * 类型 0-线下钱包
-     */
-    @TableField("type")
-    private Integer type;
-
-    /**
-     * 状态 1-开启，0-关闭
-     */
-    @TableField("state")
-    private Integer state;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time", fill = FieldFill.INSERT)
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_user")
-    private String createUser;
-
-    /**
-     * 更新人
-     */
-    @TableField(value = "update_user")
-    private String updateUser;
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpBizWalletPrepay.java

@@ -1,98 +0,0 @@
-package com.sckw.payment.model;
-
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * Author: donglang
- * Time: 2025-11-03
- * Des: 钱包管理
- * Version: 1.0
- */
-
-@Data
-@TableName("kwp_biz_wallet_prepay")
-public class KwpBizWalletPrepay {
-
-    /**
-     * 主键
-     */
-    @TableId(type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 钱包id（关联kwp_biz_wallet表的id）
-     */
-    private Long walletId;
-
-    /**
-     * 订单id（关联订单表的id）
-     */
-    private Long orderId;
-
-    /**
-     * 变动金额（单位：元，保留5位小数）
-     */
-    private BigDecimal changeAmount;
-
-    /**
-     * 可用金额（单位：元，保留5位小数）
-     */
-    private BigDecimal amount;
-
-    /**
-     * 冻结金额（单位：元，保留5位小数）
-     */
-    private BigDecimal prepayAmount;
-
-    /**
-     * 动帐类型  0-预付、1-扣款、2-冻结、3-解冻、4-消费
-     */
-    private Integer type;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 凭证URL地址
-     */
-    private String voucherUrl;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time", fill = FieldFill.INSERT)
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date updateTime;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_user")
-    private String createUser;
-
-    /**
-     * 更新人
-     */
-    @TableField(value = "update_user")
-    private String updateUser;
-
-
-
-
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpLedgerLogistics.java

@@ -1,194 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * 对账-物流订单
- *
- * @author xucaiqin
- * @date 2023-07-17 15:34:39
- */
-@Getter
-@Setter
-@ToString
-@TableName(value = "kwp_ledger_logistics")
-public class KwpLedgerLogistics {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.INPUT)
-    private Long id;
-
-    /**
-     * 企业id
-     */
-    @TableField(value = "ent_id")
-    private Long entId;
-
-    /**
-     * 物流对账单编号
-     */
-    @TableField(value = "l_ledger_no")
-    private String lLedgerNo;
-
-    /**
-     * 对账单名称
-     */
-    @TableField(value = "`name`")
-    private String name;
-
-    /**
-     * 开始日期
-     */
-    @TableField(value = "start_time")
-    private LocalDateTime startTime;
-
-    /**
-     * 结束日期
-     */
-    @TableField(value = "end_time")
-    private LocalDateTime endTime;
-
-    /**
-     * 发票税率（%）
-     */
-    @TableField(value = "tax_rate")
-    private Integer taxRate;
-
-    /**
-     * 交易方式(预付款、货到付款）
-     */
-    @TableField(value = "trading")
-    private String trading;
-
-    /**
-     * 总应收/元
-     */
-    @TableField(value = "total_price")
-    private BigDecimal totalPrice;
-
-    /**
-     * 不含税金额
-     */
-    @TableField(value = "ex_tax_price")
-    private BigDecimal exTaxPrice;
-
-    /**
-     * 实际结算金额
-     */
-    @TableField(value = "settle_price")
-    private BigDecimal settlePrice;
-
-    /**
-     * 已收款/元
-     */
-    @TableField(value = "actual_price")
-    private BigDecimal actualPrice;
-    /**
-     * 扣款金额
-     */
-    @TableField(value = "deduct_price")
-    private BigDecimal deductPrice;
-    /**
-     * 托运方财务联系人id
-     */
-    @TableField(value = "audit_user_id")
-    private Long auditUserId;
-
-    /**
-     * 审核人联系方式（托运方）
-     */
-    @TableField(value = "audit_user")
-    private String auditUser;
-
-    /**
-     * 审核人电话（托运方）
-     */
-    @TableField(value = "audit_phone")
-    private String auditPhone;
-    /**
-     * 承运方财务联系人id
-     */
-    @TableField(value = "success_user_id")
-    private Long successUserId;
-    /**
-     * 财务联系人(承运方)
-     */
-    @TableField(value = "success_user")
-    private String successUser;
-
-    /**
-     * 财务联系人电话(承运方)
-     */
-    @TableField(value = "success_phone")
-    private String successPhone;
-
-    /**
-     * 对账清单凭证
-     */
-    @TableField(value = "url")
-    private String url;
-
-    /**
-     * 生成时间
-     */
-    @TableField(value = "generate_time")
-    private LocalDateTime generateTime;
-
-    /**
-     * 预计收款日期
-     */
-    @TableField(value = "receipt_time")
-    private LocalDateTime receiptTime;
-
-    /**
-     * 订单数量
-     */
-    @TableField(value = "order_count")
-    private Integer orderCount;
-
-    /**
-     * 备注
-     */
-    @TableField(value = "remark")
-    private String remark;
-
-    /**
-     * 状态（1-已保存、2-待对账、3-已对账、4-已完成、5-已退回）
-     */
-    @TableField(value = "`status`")
-    private Integer status;
-
-    @TableField(value = "create_by")
-    private Long createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private LocalDateTime createTime;
-
-    @TableField(value = "update_by")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 是否删除（0未删除，1删除）
-     */
-    @TableField(value = "del_flag")
-    private Integer delFlag;
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpLedgerLogisticsOrder.java

@@ -1,75 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * 对账-物流订单-对账关联交易订单
- * @author xucaiqin
- * @date 2023-07-10 16:42:19
- */
-@Data
-@TableName(value = "kwp_ledger_logistics_order")
-public class KwpLedgerLogisticsOrder {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.INPUT)
-    private Long id;
-
-    /**
-     * 物流订单对账id(kwp_ledger_logistics)
-     */
-    @TableField(value = "l_ledger_id")
-    private Long lLedgerId;
-
-    /**
-     * 物流订单id（kwt_logistics_order）
-     */
-    @TableField(value = "l_order_id")
-    private Long lOrderId;
-
-    /**
-     * 物流订单编号（kwt_logistics_order）
-     */
-    @TableField(value = "l_order_no")
-    private String lOrderNo;
-
-    /**
-     * 备注
-     */
-    @TableField(value = "remark")
-    private String remark;
-
-    /**
-     * 用户状态（0正常、1已锁）
-     */
-    @TableField(value = "`status`")
-    private Integer status;
-
-    @TableField(value = "create_by")
-    private Long createBy;
-
-    @TableField(value = "create_time")
-    private LocalDateTime createTime;
-
-    @TableField(value = "update_by")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 是否删除（0未删除，1删除）
-     */
-    @TableField(value = "del_flag")
-    private Integer delFlag;
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpLedgerLogisticsTrack.java

@@ -1,67 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.time.LocalDateTime;
-
-/**
- * 对账-物流订单-状态信息
- * @author xucaiqin
- * @date 2023-07-10 16:42:19
- */
-@Getter
-@Setter
-@ToString
-@TableName(value = "kwp_ledger_logistics_track")
-public class KwpLedgerLogisticsTrack {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.INPUT)
-    private Long id;
-
-    /**
-     * 物流订单对账id（kwp_ledger_logistics）
-     */
-    @TableField(value = "l_ledger_id")
-    private Long lLedgerId;
-
-    /**
-     * 备注
-     */
-    @TableField(value = "remark")
-    private String remark;
-
-    /**
-     * 用户状态（0正常、1已锁）
-     */
-    @TableField(value = "`status`")
-    private Integer status;
-
-    @TableField(value = "create_by")
-    private Long createBy;
-
-    @TableField(value = "create_time")
-    private LocalDateTime createTime;
-
-    @TableField(value = "update_by")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 是否删除（0未删除，1删除）
-     */
-    @TableField(value = "del_flag")
-    private Integer delFlag;
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpLedgerLogisticsUnit.java

@@ -1,114 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.time.LocalDateTime;
-
-/**
- * 物流对账单托运方或承运方企业信息
- * @author xucaiqin
- * @date 2023-07-13 17:32:34
- */
-@Getter
-@Setter
-@ToString
-@TableName(value = "kwp_ledger_logistics_unit")
-public class KwpLedgerLogisticsUnit {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.INPUT)
-    private Long id;
-
-    /**
-     * 物流对账单id
-     */
-    @TableField(value = "l_ledger_id")
-    private Long lLedgerId;
-
-    /**
-     * 物流对账单编号
-     */
-    @TableField(value = "l_ledger_no")
-    private String lLedgerNo;
-
-    /**
-     * 单位类型（1托运方、2承运方）
-     */
-    @TableField(value = "unit_type")
-    private Integer unitType;
-
-    /**
-     * 企业id
-     */
-    @TableField(value = "ent_id")
-    private Long entId;
-
-    /**
-     * 顶级企业ID
-     */
-    @TableField(value = "top_ent_id")
-    private Long topEntId;
-
-    /**
-     * 企业名称
-     */
-    @TableField(value = "firm_name")
-    private String firmName;
-
-    /**
-     * 联系人姓名
-     */
-    @TableField(value = "contacts")
-    private String contacts;
-    /**
-     * 联系人ID
-     */
-    @TableField(value = "contacts_id")
-    private Long contactsId;
-
-    /**
-     * 联系电话
-     */
-    @TableField(value = "phone")
-    private String phone;
-
-    /**
-     * 备注
-     */
-    @TableField(value = "remark")
-    private String remark;
-
-    /**
-     * 用户状态（0正常、1已锁）
-     */
-    @TableField(value = "`status`")
-    private Integer status;
-
-    @TableField(value = "create_by")
-    private Long createBy;
-
-    @TableField(value = "create_time")
-    private LocalDateTime createTime;
-
-    @TableField(value = "update_by")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 是否删除（0未删除，1删除）
-     */
-    @TableField(value = "del_flag")
-    private Integer delFlag;
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpLedgerTrade.java

@@ -1,195 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * 对账-交易订单
- * @author xucaiqin
- * @date 2023-07-17 15:34:43
- */
-@Getter
-@Setter
-@ToString
-@TableName(value = "kwp_ledger_trade")
-public class KwpLedgerTrade {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.INPUT)
-    private Long id;
-
-    /**
-     * 企业id
-     */
-    @TableField(value = "ent_id")
-    private Long entId;
-
-    /**
-     * 交易对账单编号
-     */
-    @TableField(value = "t_ledger_no")
-    private String tLedgerNo;
-
-    /**
-     * 对账单名称
-     */
-    @TableField(value = "`name`")
-    private String name;
-
-    /**
-     * 开始日期
-     */
-    @TableField(value = "start_time")
-    private LocalDateTime startTime;
-
-    /**
-     * 结束日期
-     */
-    @TableField(value = "end_time")
-    private LocalDateTime endTime;
-
-    /**
-     * 发票税率（%）
-     */
-    @TableField(value = "tax_rate")
-    private Integer taxRate;
-
-    /**
-     * 交易方式(预付款、货到付款）
-     */
-    @TableField(value = "trading")
-    private String trading;
-
-    /**
-     * 总应收/元
-     */
-    @TableField(value = "total_price")
-    private BigDecimal totalPrice;
-
-    /**
-     * 不含税金额
-     */
-    @TableField(value = "ex_tax_price")
-    private BigDecimal exTaxPrice;
-
-    /**
-     * 实际计算金额
-     */
-    @TableField(value = "settle_price")
-    private BigDecimal settlePrice;
-
-    /**
-     * 已收款/元
-     */
-    @TableField(value = "actual_price")
-    private BigDecimal actualPrice;
-
-    /**
-     * 扣款金额
-     */
-    @TableField(value = "deduct_price")
-    private BigDecimal deductPrice;
-
-    /**
-     * 采购方财务联系人id
-     */
-    @TableField(value = "audit_user_id")
-    private Long auditUserId;
-
-    /**
-     * 审核人联系方式（采购方）
-     */
-    @TableField(value = "audit_user")
-    private String auditUser;
-
-    /**
-     * 审核人电话（采购方）
-     */
-    @TableField(value = "audit_phone")
-    private String auditPhone;
-    /**
-     * 销售方财务联系人id
-     */
-    @TableField(value = "success_user_id")
-    private Long successUserId;
-    /**
-     * 财务联系人(销售方)
-     */
-    @TableField(value = "success_user")
-    private String successUser;
-
-    /**
-     * 财务联系人电话(销售方)
-     */
-    @TableField(value = "success_phone")
-    private String successPhone;
-
-    /**
-     * 生成时间
-     */
-    @TableField(value = "generate_time")
-    private LocalDateTime generateTime;
-
-    /**
-     * 预计收款日期
-     */
-    @TableField(value = "receipt_time")
-    private LocalDateTime receiptTime;
-
-    /**
-     * 对账清单凭证
-     */
-    @TableField(value = "url")
-    private String url;
-
-    /**
-     * 订单数量
-     */
-    @TableField(value = "order_count")
-    private Integer orderCount;
-
-    /**
-     * 备注
-     */
-    @TableField(value = "remark")
-    private String remark;
-
-    /**
-     * 状态（1-已保存、2-待对账、3-已对账、4-已完成、5-已退回）
-     */
-    @TableField(value = "`status`")
-    private Integer status;
-
-    @TableField(value = "create_by")
-    private Long createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private LocalDateTime createTime;
-
-    @TableField(value = "update_by")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 是否删除（0未删除，1删除）
-     */
-    @TableField(value = "del_flag")
-    private Integer delFlag;
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpLedgerTradeOrder.java

@@ -1,81 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * 对账-交易订单-对账关联交易订单
- *
- * @author xucaiqin
- * @date 2023-07-27 12:45:43
- */
-@Data
-@TableName(value = "kwp_ledger_trade_order")
-public class KwpLedgerTradeOrder {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.INPUT)
-    private Long id;
-
-    /**
-     * 交易订单对账id(kwp_ledger_trade)
-     */
-    @TableField(value = "t_ledger_id")
-    private Long tLedgerId;
-    /**
-     * 中台订单号-冻结订单号
-     */
-    @TableField(value = "order_no")
-    private String orderNo;
-
-    /**
-     * 交易订单id（kwo_trade_order）
-     */
-    @TableField(value = "t_order_id")
-    private Long tOrderId;
-
-    /**
-     * 交易订单编号（kwo_trade_order）
-     */
-    @TableField(value = "t_order_no")
-    private String tOrderNo;
-
-    /**
-     * 备注
-     */
-    @TableField(value = "remark")
-    private String remark;
-
-    /**
-     * 用户状态（0正常、1已锁）
-     */
-    @TableField(value = "`status`")
-    private Integer status;
-
-    @TableField(value = "create_by")
-    private Long createBy;
-
-    @TableField(value = "create_time")
-    private LocalDateTime createTime;
-
-    @TableField(value = "update_by")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 是否删除（0未删除，1删除）
-     */
-    @TableField(value = "del_flag")
-    private Integer delFlag;
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpLedgerTradeTrack.java

@@ -1,69 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.time.LocalDateTime;
-
-/**
- * 对账-交易订单-状态信息
- *
- * @author xucaiqin
- * @date 2023-07-10 16:42:19
- */
-
-@Getter
-@Setter
-@ToString
-@TableName(value = "kwp_ledger_trade_track")
-public class KwpLedgerTradeTrack {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.INPUT)
-    private Long id;
-
-    /**
-     * 交易订单对账id(kwp_ledger_trade)
-     */
-    @TableField(value = "t_ledger_id")
-    private Long tLedgerId;
-
-    /**
-     * 备注
-     */
-    @TableField(value = "remark")
-    private String remark;
-
-    /**
-     * 用户状态（0正常、1已锁）
-     */
-    @TableField(value = "`status`")
-    private Integer status;
-
-    @TableField(value = "create_by")
-    private Long createBy;
-
-    @TableField(value = "create_time")
-    private LocalDateTime createTime;
-
-    @TableField(value = "update_by")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 是否删除（0未删除，1删除）
-     */
-    @TableField(value = "del_flag")
-    private Integer delFlag;
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpLedgerTradeUnit.java

@@ -1,114 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.time.LocalDateTime;
-
-/**
- * 销售方/采购方企业信息
- * @author xucaiqin
- * @date 2023-07-14 09:23:57
- */
-@Getter
-@Setter
-@ToString
-@TableName(value = "kwp_ledger_trade_unit")
-public class KwpLedgerTradeUnit {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.INPUT)
-    private Long id;
-
-    /**
-     * 贸易对账单id
-     */
-    @TableField(value = "t_ledger_id")
-    private Long tLedgerId;
-
-    /**
-     * 贸易对账单编号
-     */
-    @TableField(value = "t_ledger_no")
-    private String tLedgerNo;
-
-    /**
-     * 单位类型（1采购方、2销售方）
-     */
-    @TableField(value = "unit_type")
-    private Integer unitType;
-
-    /**
-     * 企业id
-     */
-    @TableField(value = "ent_id")
-    private Long entId;
-
-    /**
-     * 顶级企业ID
-     */
-    @TableField(value = "top_ent_id")
-    private Long topEntId;
-
-    /**
-     * 企业名称
-     */
-    @TableField(value = "firm_name")
-    private String firmName;
-
-    /**
-     * 联系人姓名
-     */
-    @TableField(value = "contacts")
-    private String contacts;
-    /**
-     * 联系人ID
-     */
-    @TableField(value = "contacts_id")
-    private Long contactsId;
-
-    /**
-     * 联系电话
-     */
-    @TableField(value = "phone")
-    private String phone;
-
-    /**
-     * 备注
-     */
-    @TableField(value = "remark")
-    private String remark;
-
-    /**
-     * 用户状态（0正常、1已锁）
-     */
-    @TableField(value = "`status`")
-    private Integer status;
-
-    @TableField(value = "create_by")
-    private Long createBy;
-
-    @TableField(value = "create_time")
-    private LocalDateTime createTime;
-
-    @TableField(value = "update_by")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 是否删除（0未删除，1删除）
-     */
-    @TableField(value = "del_flag")
-    private Integer delFlag;
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpSettlementLogistics.java

@@ -1,151 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * 结算-物流订单
- *
- * @author xucaiqin
- * @date 2023-07-10 16:42:20
- */
-@Getter
-@Setter
-@ToString
-@TableName(value = "kwp_settlement_logistics")
-public class KwpSettlementLogistics {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.INPUT)
-    private Long id;
-
-    /**
-     * 企业id
-     */
-    @TableField(value = "ent_id")
-    private Long entId;
-
-    /**
-     * 物流订单对账id
-     */
-    @TableField(value = "l_ledger_id")
-    private Long lLedgerId;
-
-    /**
-     * 结算单编号
-     */
-    @TableField(value = "sl_order_no")
-    private String slOrderNo;
-
-    /**
-     * 名称
-     */
-    @TableField(value = "`name`")
-    private String name;
-
-    /**
-     * 对账金额
-     */
-    @TableField(value = "total_price")
-    private BigDecimal totalPrice;
-
-    /**
-     * 已收账款
-     */
-    @TableField(value = "actual_price")
-    private BigDecimal actualPrice;
-
-    /**
-     * 预计收款日期
-     */
-    @TableField(value = "receipt_time")
-    private LocalDateTime receiptTime;
-
-    /**
-     * 备注
-     */
-    @TableField(value = "remark")
-    private String remark;
-    /**
-     * 冗余字段，写统计接口时增加
-     */
-    @TableField(value = "trading")
-    private String trading;
-    /**
-     * 对账托运方财务联系人
-     */
-    @TableField(value = "audit_user_id")
-    private Long auditUserId;
-    /**
-     * 对账托运方财务联系人
-     */
-    @TableField(value = "audit_user")
-    private String auditUser;
-
-    /**
-     * 对账托运方财务联系人电话
-     */
-    @TableField(value = "audit_phone")
-    private String auditPhone;
-    /**
-     * 对账承运方财务联系人
-     */
-    @TableField(value = "success_user_id")
-    private Long successUserId;
-    /**
-     * 对账承运方财务联系人
-     */
-    @TableField(value = "success_user")
-    private String successUser;
-
-    /**
-     * 对账承运方财务联系人电话
-     */
-    @TableField(value = "success_phone")
-    private String successPhone;
-
-    /**
-     * 状态（1待结算2部分结算3全部结算）
-     */
-    @TableField(value = "`status`")
-    private Integer status;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_by")
-    private Long createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新人
-     */
-    @TableField(value = "update_by")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 是否删除（0未删除，1删除）
-     */
-    @TableField(value = "del_flag")
-    private Integer delFlag;
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpSettlementLogisticsTrack.java

@@ -1,67 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.time.LocalDateTime;
-
-/**
- * @author xucaiqin
- * @date 2023-07-10 16:42:20
- * 结算-物流订单-状态信息
- */
-@Getter
-@Setter
-@ToString
-@TableName(value = "kwp_settlement_logistics_track")
-public class KwpSettlementLogisticsTrack {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.INPUT)
-    private Long id;
-
-    /**
-     * 物流订单结算id
-     */
-    @TableField(value = "l_settlement_id")
-    private Long lSettlementId;
-
-    /**
-     * 备注
-     */
-    @TableField(value = "remark")
-    private String remark;
-
-    /**
-     * 用户状态（1待结算，2部分结算，3全部结算）
-     */
-    @TableField(value = "`status`")
-    private Integer status;
-
-    @TableField(value = "create_by")
-    private Long createBy;
-
-    @TableField(value = "create_time")
-    private LocalDateTime createTime;
-
-    @TableField(value = "update_by")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 是否删除（0未删除，1删除）
-     */
-    @TableField(value = "del_flag")
-    private Integer delFlag;
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpSettlementOffline.java

@@ -1,117 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-/**
- * 线下结算记录（交易订单结算/物流订单结算）
- *
- * @author xucaiqin
- * @date 2023-07-10 16:42:19
- */
-@Getter
-@Setter
-@ToString
-@TableName(value = "kwp_settlement_offline")
-public class KwpSettlementOffline {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.INPUT)
-    private Long id;
-
-    /**
-     * 企业类型
-     */
-    @TableField(value = "ent_id")
-    private Long entId;
-
-    /**
-     * 结算id（交易订单结算/物流订单结算）
-     */
-    @TableField(value = "settlement_id")
-    private Long settlementId;
-
-    /**
-     * 结算单类型 1-物流 2-贸易
-     */
-    @TableField(value = "order_type")
-    private Integer orderType;
-
-    /**
-     * 付款日期
-     */
-    @TableField(value = "pay_time")
-    private LocalDateTime payTime;
-
-    /**
-     * 付款金额
-     */
-    @TableField(value = "pay_price")
-    private BigDecimal payPrice;
-
-    /**
-     * 待付金额
-     */
-    @TableField(value = "topay_price")
-    private BigDecimal topayPrice;
-
-    /**
-     * 付款附件
-     */
-    @TableField(value = "url")
-    private String url;
-
-    /**
-     * 备注
-     */
-    @TableField(value = "remark")
-    private String remark;
-
-    /**
-     * 状态（1正常 、2异常）
-     */
-    @TableField(value = "status")
-    private Integer status;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_by")
-    private Long createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新人
-     */
-    @TableField(value = "update_by")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 删除标识(0正常/1删除)
-     */
-    @TableField(value = "del_flag")
-    private Integer delFlag;
-
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpSettlementRecord.java

@@ -1,91 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDate;
-
-/**
- * 结算归档表
-* @date 2023-09-13 18:48:30
-* @author xucaiqin
-*/
-@Data
-@TableName(value = "kwp_settlement_record")
-public class KwpSettlementRecord {
-    /**
-     * id
-     */
-    @TableId(value = "id", type = IdType.INPUT)
-    private Long id;
-
-    /**
-     * 企业id
-     */
-    @TableField(value = "ent_id")
-    private Long entId;
-
-    /**
-     * 总应收金额
-     */
-    @TableField(value = "total_receive_money")
-    private BigDecimal totalReceiveMoney;
-
-    /**
-     * 待收金额
-     */
-    @TableField(value = "exact_money")
-    private BigDecimal exactMoney;
-
-    /**
-     * 已收金额（累加金额）
-     */
-    @TableField(value = "received_money")
-    private BigDecimal receivedMoney;
-
-    /**
-     * 逾期待收金额
-     */
-    @TableField(value = "overdue_exact_money")
-    private BigDecimal overdueExactMoney;
-
-    /**
-     * 总应付金额
-     */
-    @TableField(value = "total_pay_money")
-    private BigDecimal totalPayMoney;
-
-    /**
-     * 待付金额
-     */
-    @TableField(value = "unpaid_money")
-    private BigDecimal unpaidMoney;
-
-    /**
-     * 已付金额（累加金额）
-     */
-    @TableField(value = "paid_money")
-    private BigDecimal paidMoney;
-
-    /**
-     * 逾期待付金额
-     */
-    @TableField(value = "overdue_paid_money")
-    private BigDecimal overduePaidMoney;
-
-    /**
-     * 创建日期
-     */
-    @TableField(value = "create_time")
-    private LocalDate createTime;
-
-    /**
-     * 1-物流 2-贸易
-     */
-    @TableField(value = "order_type")
-    private Integer orderType;
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpSettlementTrade.java

@@ -1,142 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * 结算-交易订单
- * @author xucaiqin
- * @date 2023-07-18 14:51:38
- */
-@Getter
-@Setter
-@ToString
-@TableName(value = "kwp_settlement_trade")
-public class KwpSettlementTrade {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.INPUT)
-    private Long id;
-
-    /**
-     * 企业id
-     */
-    @TableField(value = "ent_id")
-    private Long entId;
-
-    /**
-     * 交易订单对账id
-     */
-    @TableField(value = "t_ledger_id")
-    private Long tLedgerId;
-
-    /**
-     * 结算单编号
-     */
-    @TableField(value = "st_order_no")
-    private String stOrderNo;
-
-    /**
-     * 结算单名称
-     */
-    @TableField(value = "`name`")
-    private String name;
-
-    /**
-     * 对账金额（对账单表的实际结算金额字段settle_price）
-     */
-    @TableField(value = "total_price")
-    private BigDecimal totalPrice;
-
-    /**
-     * 已收款/元
-     */
-    @TableField(value = "actual_price")
-    private BigDecimal actualPrice;
-
-    /**
-     * 预计收款日期
-     */
-    @TableField(value = "receipt_time")
-    private LocalDateTime receiptTime;
-    /**
-     * 对账采购财务联系人
-     */
-    @TableField(value = "audit_user_id")
-    private Long auditUserId;
-    /**
-     * 对账采购财务联系人名称
-     */
-    @TableField(value = "audit_user")
-    private String auditUser;
-
-    /**
-     * 对账采购财务联系人电话
-     */
-    @TableField(value = "audit_phone")
-    private String auditPhone;
-
-    /**
-     * 对账销售财务联系人
-     */
-    @TableField(value = "success_user_id")
-    private Long successUserId;
-
-    /**
-     * 对账销售财务联系人名称
-     */
-    @TableField(value = "success_user")
-    private String successUser;
-
-    /**
-     * 对账销售财务联系人电话
-     */
-    @TableField(value = "success_phone")
-    private String successPhone;
-    /**
-     * 冗余字段，写统计接口时增加
-     */
-    @TableField(value = "trading")
-    private String trading;
-    /**
-     * 备注
-     */
-    @TableField(value = "remark")
-    private String remark;
-
-    /**
-     * 状态（待回款、部分回款、全部回款、回退）
-     */
-    @TableField(value = "`status`")
-    private Integer status;
-
-    @TableField(value = "create_by")
-    private Long createBy;
-
-    @TableField(value = "create_time")
-    private LocalDateTime createTime;
-
-    @TableField(value = "update_by")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 是否删除（0未删除，1删除）
-     */
-    @TableField(value = "del_flag")
-    private Integer delFlag;
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpSettlementTradeTrack.java

@@ -1,83 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.sckw.core.utils.IdWorker;
-import com.sckw.core.web.context.LoginUserHolder;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.time.LocalDateTime;
-
-/**
- * 结算-交易订单-状态信息
- * @author xucaiqin
- * @date 2023-07-10 16:42:19
- */
-@Getter
-@Setter
-@ToString
-@TableName(value = "kwp_settlement_trade_track")
-public class KwpSettlementTradeTrack {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.INPUT)
-    private Long id;
-
-    /**
-     * 交易订单结算id
-     */
-    @TableField(value = "t_settlement_id")
-    private Long tSettlementId;
-
-    /**
-     * 备注
-     */
-    @TableField(value = "remark")
-    private String remark;
-
-    /**
-     * 用户状态（0正常、1已锁）
-     */
-    @TableField(value = "`status`")
-    private Integer status;
-
-    @TableField(value = "create_by")
-    private Long createBy;
-
-    @TableField(value = "create_time")
-    private LocalDateTime createTime;
-
-    @TableField(value = "update_by")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 是否删除（0未删除，1删除）
-     */
-    @TableField(value = "del_flag")
-    private Integer delFlag;
-
-    public static KwpSettlementTradeTrack build(Long tSettlementId, Integer status) {
-        KwpSettlementTradeTrack kwpSettlementTradeTrack = new KwpSettlementTradeTrack();
-        kwpSettlementTradeTrack.setId(new IdWorker(1).nextId());
-        kwpSettlementTradeTrack.setTSettlementId(tSettlementId);
-        kwpSettlementTradeTrack.setRemark("");
-        kwpSettlementTradeTrack.setStatus(status);
-        kwpSettlementTradeTrack.setCreateBy(LoginUserHolder.getUserId());
-        kwpSettlementTradeTrack.setCreateTime(LocalDateTime.now());
-        kwpSettlementTradeTrack.setUpdateBy(LoginUserHolder.getUserId());
-        kwpSettlementTradeTrack.setUpdateTime(LocalDateTime.now());
-        kwpSettlementTradeTrack.setDelFlag(0);
-        return kwpSettlementTradeTrack;
-    }
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpSettlementWallet.java

@@ -1,129 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * 电子钱包结算记录（交易订单结算/物流订单结算）
- *
- * @author xucaiqin
- * @date 2023-07-10 16:42:20
- */
-@Getter
-@Setter
-@Data
-@ToString
-@TableName(value = "kwp_settlement_wallet")
-public class KwpSettlementWallet {
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.INPUT)
-    private Long id;
-
-    /**
-     * 企业类型
-     */
-    @TableField(value = "ent_id")
-    private Long entId;
-    /**
-     * 中台流水号 清分单号
-     */
-    @TableField(value = "order_no")
-    private String orderNo;
-
-    /**
-     * 结算id（交易订单结算/物流订单结算）
-     */
-    @TableField(value = "settlement_id")
-    private Long settlementId;
-
-    /**
-     * 1-物流 2-交易
-     */
-    @TableField(value = "order_type")
-    private Integer orderType;
-
-    /**
-     * 线上渠道 1-huifu
-     */
-    @TableField(value = "channel")
-    private String channel;
-
-    /**
-     * 回款时间
-     */
-    @TableField(value = "pay_time")
-    private LocalDateTime payTime;
-
-    /**
-     * 金额
-     */
-    @TableField(value = "pay_price")
-    private BigDecimal payPrice;
-
-    /**
-     * 剩余待付金额
-     */
-    @TableField(value = "topay_price")
-    private BigDecimal topayPrice;
-
-    /**
-     * 类型（1预付款、2货到付款）
-     */
-    @TableField(value = "type")
-    private Integer type;
-
-    /**
-     * 备注
-     */
-    @TableField(value = "remark")
-    private String remark;
-
-    /**
-     * 状态（1正常 、2异常）
-     */
-    @TableField(value = "status")
-    private Integer status;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_by")
-    private Long createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新人
-     */
-    @TableField(value = "update_by")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 是否删除（0未删除，1删除）
-     */
-    @TableField(value = "del_flag")
-    private Integer delFlag;
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpTradeFreeze.java

@@ -1,69 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * 贸易订单冻结单表
-* @date 2023-09-20 17:32:24
-* @author xucaiqin
-*/
-@Data
-@TableName(value = "kwp_trade_freeze")
-public class KwpTradeFreeze {
-    /**
-     * id
-     */
-    @TableId(value = "id", type = IdType.INPUT)
-    private Long id;
-
-    /**
-     * 贸易订单id
-     */
-    @TableField(value = "t_order_id")
-    private Long tOrderId;
-
-    /**
-     * 中台冻结订单号
-     */
-    @TableField(value = "order_no")
-    private String orderNo;
-
-    @TableField(value = "`status`")
-    private Integer status;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_by")
-    private Long createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新人
-     */
-    @TableField(value = "update_by")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 0-正常 1-删除
-     */
-    @TableField(value = "del_flag")
-    private Integer delFlag;
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpWallet.java

@@ -1,147 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * 钱包表
- *
- * @author xucaiqin
- * @date 2026-03-26 14:33:23
- */
-@Schema(description = "钱包表")
-@Data
-@TableName(value = "kwp_wallet")
-public class KwpWallet {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    @Schema(description = "主键")
-    private Long id;
-
-    /**
-     * 企业id
-     */
-    @TableField(value = "ent_id")
-    @Schema(description = "企业id")
-    private Long entId;
-
-    /**
-     * uid
-     */
-    @TableField(value = "`uid`")
-    @Schema(description = "uid")
-    private String uid;
-
-    /**
-     * 企业类型
-     */
-    @TableField(value = "ent_type")
-    @Schema(description = "企业类型")
-    private Integer entType;
-
-    /**
-     * 提现金额
-     */
-    @TableField(value = "cash_amount")
-    @Schema(description = "提现金额")
-    private Long cashAmount;
-
-    /**
-     * 预付余额
-     */
-    @TableField(value = "prepay_amount")
-    @Schema(description = "预付余额")
-    private Long prepayAmount;
-
-    /**
-     * 交易中金额
-     */
-    @TableField(value = "dealing_amount")
-    @Schema(description = "交易中金额")
-    private Long dealingAmount;
-
-    /**
-     * 运费金额
-     */
-    @TableField(value = "freight_amount")
-    @Schema(description = "运费金额")
-    private Long freightAmount;
-
-    /**
-     * 进行中金额
-     */
-    @TableField(value = "processing_amount")
-    @Schema(description = "进行中金额")
-    private Long processingAmount;
-
-    /**
-     * 付款中金额
-     */
-    @TableField(value = "paying_amount")
-    @Schema(description = "付款中金额")
-    private Long payingAmount;
-
-    /**
-     * 渠道
-     */
-    @TableField(value = "channel")
-    @Schema(description = "渠道")
-    private String channel;
-
-    /**
-     * 状态 1-开户中 2-开户成功
-     */
-    @TableField(value = "`status`")
-    @Schema(description = "状态 1-开户中 2-开户成功")
-    private Integer status;
-
-    /**
-     * 备注
-     */
-    @TableField(value = "remark")
-    @Schema(description = "备注")
-    private String remark;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_by")
-    @Schema(description = "创建人")
-    private Long createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    @Schema(description = "创建时间")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新人
-     */
-    @TableField(value = "update_by")
-    @Schema(description = "更新人")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    @Schema(description = "更新时间")
-    private LocalDateTime updateTime;
-
-    /**
-     * 0-正常 1-删除
-     */
-    @TableField(value = "del_flag")
-    @Schema(description = "0-正常 1-删除")
-    private Integer delFlag;
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpWalletCash.java

@@ -1,126 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * 提现记录表
- *
- * @author xucaiqin
- * @date 2026-03-26 14:32:05
- */
-@Schema(description = "提现记录表")
-@Data
-@TableName(value = "kwp_wallet_cash")
-public class KwpWalletCash {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    @Schema(description = "主键")
-    private Long id;
-
-    /**
-     * 付款方
-     */
-    @TableField(value = "from_ent")
-    @Schema(description = "付款方")
-    private Long fromEnt;
-
-    /**
-     * 收款方
-     */
-    @TableField(value = "to_ent")
-    @Schema(description = "收款方")
-    private Long toEnt;
-
-    /**
-     * 订单号
-     */
-    @TableField(value = "order_no")
-    @Schema(description = "订单号")
-    private String orderNo;
-
-    /**
-     * 操作 1-提现 2-预付 3-支付 3-收益
-     */
-    @TableField(value = "`action`")
-    @Schema(description = "操作 1-提现 2-预付 3-支付 3-收益")
-    private Integer action;
-
-    /**
-     * 交易金额
-     */
-    @TableField(value = "amount")
-    @Schema(description = "交易金额")
-    private Long amount;
-
-    /**
-     * 可提现金额
-     */
-    @TableField(value = "cash_amount")
-    @Schema(description = "可提现金额")
-    private Long cashAmount;
-
-    /**
-     * 凭证
-     */
-    @TableField(value = "img")
-    @Schema(description = "凭证")
-    private String img;
-
-    /**
-     * 备注
-     */
-    @TableField(value = "remark")
-    @Schema(description = "备注")
-    private String remark;
-
-    /**
-     * 状态 1-成功 2-失败 3-提现中
-     */
-    @TableField(value = "`status`")
-    @Schema(description = "状态 1-成功 2-失败")
-    private Integer status;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_by")
-    @Schema(description = "创建人")
-    private Long createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    @Schema(description = "创建时间")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新人
-     */
-    @TableField(value = "update_by")
-    @Schema(description = "更新人")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    @Schema(description = "更新时间")
-    private LocalDateTime updateTime;
-
-    /**
-     * 0-正常 1-删除
-     */
-    @TableField(value = "del_flag")
-    @Schema(description = "0-正常 1-删除")
-    private Integer delFlag;
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpWalletFreight.java

@@ -1,133 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * 运费表
- *
- * @author xucaiqin
- * @date 2026-03-26 14:32:05
- */
-@Schema(description = "运费表")
-@Data
-@TableName(value = "kwp_wallet_freight")
-public class KwpWalletFreight {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    @Schema(description = "主键")
-    private Long id;
-
-    /**
-     * 付款方
-     */
-    @TableField(value = "from_ent")
-    @Schema(description = "付款方")
-    private Long fromEnt;
-
-    /**
-     * 收款方
-     */
-    @TableField(value = "to_ent")
-    @Schema(description = "收款方")
-    private Long toEnt;
-
-    /**
-     * 中台订单号
-     */
-    @TableField(value = "order_no")
-    @Schema(description = "中台订单号")
-    private String orderNo;
-
-    /**
-     * 操作 1-冻结 2-解冻
-     */
-    @TableField(value = "`action`")
-    @Schema(description = "操作 1-冻结 2-解冻")
-    private Boolean action;
-
-    /**
-     * 交易金额
-     */
-    @TableField(value = "money")
-    @Schema(description = "交易金额")
-    private Integer money;
-
-    /**
-     * 运费金额
-     */
-    @TableField(value = "freight_amount")
-    @Schema(description = "运费金额")
-    private Integer freightAmount;
-
-    /**
-     * 进行中金额
-     */
-    @TableField(value = "processing_amount")
-    @Schema(description = "进行中金额")
-    private Integer processingAmount;
-
-    /**
-     * 付款中金额
-     */
-    @TableField(value = "paying_amount")
-    @Schema(description = "付款中金额")
-    private Integer payingAmount;
-
-    /**
-     * 备注
-     */
-    @TableField(value = "remark")
-    @Schema(description = "备注")
-    private String remark;
-
-    /**
-     * 状态 1-已提交 2-预付成功 3-预付失败
-     */
-    @TableField(value = "`status`")
-    @Schema(description = "状态 1-已提交 2-预付成功 3-预付失败")
-    private Integer status;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_by")
-    @Schema(description = "创建人")
-    private Long createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    @Schema(description = "创建时间")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新人
-     */
-    @TableField(value = "update_by")
-    @Schema(description = "更新人")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    @Schema(description = "更新时间")
-    private LocalDateTime updateTime;
-
-    /**
-     * 0-正常 1-删除
-     */
-    @TableField(value = "del_flag")
-    @Schema(description = "0-正常 1-删除")
-    private Integer delFlag;
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpWalletPay.java

@@ -1,123 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * 支付记录表
- *
- * @author xucaiqin
- * @date 2026-03-26 14:32:05
- */
-@Schema(description = "支付记录表")
-@Data
-@TableName(value = "kwp_wallet_pay")
-public class KwpWalletPay {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    @Schema(description = "主键")
-    private Long id;
-
-    /**
-     * 付款方
-     */
-    @TableField(value = "from_ent")
-    @Schema(description = "付款方")
-    private Long fromEnt;
-
-    /**
-     * 收款方
-     */
-    @TableField(value = "to_ent")
-    @Schema(description = "收款方")
-    private Long toEnt;
-
-    /**
-     * 订单号
-     */
-    @TableField(value = "order_no")
-    @Schema(description = "订单号")
-    private String orderNo;
-
-    /**
-     * 操作 1-预付 2-支付
-     */
-    @TableField(value = "`action`")
-    @Schema(description = "操作 1-预付 2-支付")
-    private Integer action;
-
-    /**
-     * 申请金额
-     */
-    @TableField(value = "apply_amount")
-    @Schema(description = "申请金额")
-    private Long applyAmount;
-
-    /**
-     * 支付金额
-     */
-    @TableField(value = "pay_amount")
-    @Schema(description = "支付金额")
-    private Long payAmount;
-
-    @TableField(value = "img")
-    @Schema(description = "")
-    private String img;
-
-    /**
-     * 备注
-     */
-    @TableField(value = "remark")
-    @Schema(description = "备注")
-    private String remark;
-
-    /**
-     * 状态 1-成功 2-失败
-     */
-    @TableField(value = "`status`")
-    @Schema(description = "状态 1-成功 2-失败")
-    private Integer status;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_by")
-    @Schema(description = "创建人")
-    private Long createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    @Schema(description = "创建时间")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新人
-     */
-    @TableField(value = "update_by")
-    @Schema(description = "更新人")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    @Schema(description = "更新时间")
-    private LocalDateTime updateTime;
-
-    /**
-     * 0-正常 1-删除
-     */
-    @TableField(value = "del_flag")
-    @Schema(description = "0-正常 1-删除")
-    private Integer delFlag;
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpWalletPrepay.java

@@ -1,125 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * 预付表
- *
- * @author xucaiqin
- * @date 2026-03-26 14:45:11
- */
-@Schema(description = "预付表")
-@Data
-@TableName(value = "kwp_wallet_prepay")
-public class KwpWalletPrepay {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    @Schema(description = "主键")
-    private Long id;
-
-    /**
-     * 付款方 采购商
-     */
-    @TableField(value = "from_ent")
-    @Schema(description = "付款方")
-    private Long fromEnt;
-
-    /**
-     * 收款方 供应商
-     */
-    @TableField(value = "to_ent")
-    @Schema(description = "收款方")
-    private Long toEnt;
-
-    /**
-     * 订单号
-     */
-    @TableField(value = "order_no")
-    @Schema(description = "中台订单号")
-    private String orderNo;
-    /**
-     * 操作 1-提现 2-预付 3-支付 3-收益
-     */
-    @TableField(value = "`action`")
-    @Schema(description = "操作 1-提现 2-预付 3-支付 3-收益")
-    private Integer action;
-    private String actionLabel;
-    /**
-     * 交易金额
-     */
-    @TableField(value = "money")
-    @Schema(description = "交易金额")
-    private Integer money;
-
-    /**
-     * 预付金额
-     */
-    @TableField(value = "prepay_amount")
-    @Schema(description = "预付金额")
-    private Integer prepayAmount;
-
-    /**
-     * 交易中金额
-     */
-    @TableField(value = "deal_amount")
-    @Schema(description = "交易中金额")
-    private Integer dealAmount;
-
-    /**
-     * 备注
-     */
-    @TableField(value = "remark")
-    @Schema(description = "备注")
-    private String remark;
-
-    /**
-     * 状态 1-已提交 2-预付成功 3-预付失败
-     */
-    @TableField(value = "`status`")
-    @Schema(description = "状态 1-已提交 2-预付成功 3-预付失败")
-    private Integer status;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_by")
-    @Schema(description = "创建人")
-    private Long createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    @Schema(description = "创建时间")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新人
-     */
-    @TableField(value = "update_by")
-    @Schema(description = "更新人")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    @Schema(description = "更新时间")
-    private LocalDateTime updateTime;
-
-    /**
-     * 0-正常 1-删除
-     */
-    @TableField(value = "del_flag")
-    @Schema(description = "0-正常 1-删除")
-    private Integer delFlag;
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpWalletReceive.java

@@ -1,109 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * 货到付款记录表
-* @date 2023-10-18 12:57:05
-* @author xucaiqin
-*/
-@Data
-@TableName(value = "kwp_wallet_receive")
-public class KwpWalletReceive {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.INPUT)
-    private Long id;
-
-    /**
-     * 流水号
-     */
-    @TableField(value = "order_no")
-    private String orderNo;
-
-    /**
-     * uid
-     */
-    @TableField(value = "`uid`")
-    private String uid;
-
-    /**
-     * 企业id
-     */
-    @TableField(value = "from_ent")
-    private Long fromEnt;
-
-    /**
-     * filter
-     */
-    @TableField(value = "`filter`")
-    private String filter;
-
-    /**
-     * 企业id
-     */
-    @TableField(value = "to_ent")
-    private Long toEnt;
-
-    /**
-     * 电子钱包渠道
-     */
-    @TableField(value = "channel")
-    private String channel;
-
-    /**
-     * 转账金额
-     */
-    @TableField(value = "money")
-    private BigDecimal money;
-
-    /**
-     * 备注
-     */
-    @TableField(value = "remark")
-    private String remark;
-
-    /**
-     * 1-已提交 2-转帐中 3-转账失败 4-转账成功
-     */
-    @TableField(value = "`status`")
-    private Integer status;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_by")
-    private Long createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新人
-     */
-    @TableField(value = "update_by")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 0-正常 1-删除
-     */
-    @TableField(value = "del_flag")
-    private Integer delFlag;
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpWalletRefund.java

@@ -1,114 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * 退款记录表
- * @date 2023-09-05 17:53:14
- * @author xucaiqin
- */
-@Data
-@TableName(value = "kwp_wallet_refund")
-public class KwpWalletRefund {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.INPUT)
-    private Long id;
-
-    /**
-     * 流水号
-     */
-    @TableField(value = "order_no")
-    private String orderNo;
-
-    /**
-     * uid
-     */
-    @TableField(value = "`uid`")
-    private String uid;
-
-    /**
-     * 退款企业id
-     */
-    @TableField(value = "from_ent")
-    private Long fromEnt;
-
-    /**
-     * filter
-     */
-    @TableField(value = "`filter`")
-    private String filter;
-
-    /**
-     * 收款企业id
-     */
-    @TableField(value = "to_ent")
-    private Long toEnt;
-
-    /**
-     * 电子钱包渠道
-     */
-    @TableField(value = "channel")
-    private String channel;
-    /**
-     * 备注
-     */
-    @TableField(value = "remark")
-    private String remark;
-
-    /**
-     * 退款金额
-     */
-    @TableField(value = "money")
-    private BigDecimal money;
-
-    /**
-     * 实际退款金额
-     */
-    @TableField(value = "actual_money")
-    private BigDecimal actualMoney;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_by")
-    private Long createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新人
-     */
-    @TableField(value = "update_by")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 0-正常 1-删除
-     */
-    @TableField(value = "del_flag")
-    private Integer delFlag;
-
-    /**
-     * 1-申请退款 2-退款中 3-退款失败 4-退款驳回
-     */
-    @TableField(value = "`status`")
-    private Integer status;
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpWalletRefundSub.java

@@ -1,73 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * 退款操作记录表
-* @date 2023-09-19 10:26:44
-* @author xucaiqin
-*/
-
-@Data
-@TableName(value = "kwp_wallet_refund_sub")
-public class KwpWalletRefundSub {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.INPUT)
-    private Long id;
-
-    /**
-     * 退款单id
-     */
-    @TableField(value = "refund_id")
-    private Long refundId;
-
-    /**
-     * 备注
-     */
-    @TableField(value = "remark")
-    private String remark;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_by")
-    private Long createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新人
-     */
-    @TableField(value = "update_by")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 0-正常 1-删除
-     */
-    @TableField(value = "del_flag")
-    private Integer delFlag;
-
-    /**
-     * 1-申请退款 发起退款 退款驳回
-     */
-    @TableField(value = "`status`")
-    private Integer status;
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpWalletRelation.java

@@ -1,60 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 企业与中台用户关系表
-* @date 2023-07-24 10:47:47
-* @author xucaiqin
-*/
-@Data
-@TableName(value = "kwp_wallet_relation")
-public class KwpWalletRelation {
-    @TableId(value = "id", type = IdType.INPUT)
-    private Long id;
-
-    /**
-     * 企业id（顶级企业才有线上支付功能）
-     */
-    @TableField(value = "ent_id")
-    private Long entId;
-
-    /**
-     * 中台用户id
-     */
-    @TableField(value = "`uid`")
-    private String uid;
-
-    /**
-     * 用户状态（0正常、1已锁）
-     */
-    @TableField(value = "`status`")
-    private Integer status;
-
-    @TableField(value = "create_by")
-    private Long createBy;
-
-    @TableField(value = "create_time")
-    private Date createTime;
-
-    @TableField(value = "update_by")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private Date updateTime;
-
-    /**
-     * 是否删除（0未删除，1删除）
-     */
-    @TableField(value = "del_flag")
-    private Integer delFlag;
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpWalletSub.java

@@ -1,133 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * 钱包关系表
- *
- * @author xucaiqin
- * @date 2026-03-26 14:32:05
- */
-@Schema(description = "钱包关系表")
-@Data
-@TableName(value = "kwp_wallet_sub")
-public class KwpWalletSub {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    @Schema(description = "主键")
-    private Long id;
-
-    /**
-     * 付款方
-     */
-    @TableField(value = "from_ent")
-    @Schema(description = "企业")
-    private Long fromEnt;
-
-    /**
-     * 收款方
-     */
-    @TableField(value = "to_ent")
-    @Schema(description = "企业")
-    private Long toEnt;
-
-    /**
-     * 提现金额
-     */
-    @TableField(value = "cash_amount")
-    @Schema(description = "提现金额")
-    private Long cashAmount;
-
-    /**
-     * 预付余额
-     */
-    @TableField(value = "prepay_amount")
-    @Schema(description = "预付余额")
-    private Long prepayAmount;
-
-    /**
-     * 交易中金额
-     */
-    @TableField(value = "dealing_amount")
-    @Schema(description = "交易中金额")
-    private Long dealingAmount;
-
-    /**
-     * 运费金额
-     */
-    @TableField(value = "freight_amount")
-    @Schema(description = "运费金额")
-    private Long freightAmount;
-
-    /**
-     * 进行中金额
-     */
-    @TableField(value = "processing_amount")
-    @Schema(description = "进行中金额")
-    private Long processingAmount;
-
-    /**
-     * 付款中金额
-     */
-    @TableField(value = "paying_amount")
-    @Schema(description = "付款中金额")
-    private Long payingAmount;
-
-    /**
-     * 渠道
-     */
-    @TableField(value = "channel")
-    @Schema(description = "渠道")
-    private String channel;
-
-    /**
-     * 备注
-     */
-    @TableField(value = "remark")
-    @Schema(description = "备注")
-    private String remark;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_by")
-    @Schema(description = "创建人")
-    private Long createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    @Schema(description = "创建时间")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新人
-     */
-    @TableField(value = "update_by")
-    @Schema(description = "更新人")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    @Schema(description = "更新时间")
-    private LocalDateTime updateTime;
-
-    /**
-     * 0-正常 1-删除
-     */
-    @TableField(value = "del_flag")
-    @Schema(description = "0-正常 1-删除")
-    private Integer delFlag;
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpWalletTransfer.java

@@ -1,109 +0,0 @@
-package com.sckw.payment.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * 转账记录表
-* @date 2023-09-06 16:42:08
-* @author xucaiqin
-*/
-@Data
-@TableName(value = "kwp_wallet_transfer")
-public class KwpWalletTransfer {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.INPUT)
-    private Long id;
-
-    /**
-     * 流水号
-     */
-    @TableField(value = "order_no")
-    private String orderNo;
-
-    /**
-     * uid
-     */
-    @TableField(value = "`uid`")
-    private String uid;
-
-    /**
-     * 企业id
-     */
-    @TableField(value = "from_ent")
-    private Long fromEnt;
-
-    /**
-     * filter
-     */
-    @TableField(value = "`filter`")
-    private String filter;
-
-    /**
-     * 企业id
-     */
-    @TableField(value = "to_ent")
-    private Long toEnt;
-
-    /**
-     * 电子钱包渠道
-     */
-    @TableField(value = "channel")
-    private String channel;
-
-    /**
-     * 转账金额
-     */
-    @TableField(value = "money")
-    private BigDecimal money;
-
-    /**
-     * 备注
-     */
-    @TableField(value = "remark")
-    private String remark;
-
-    /**
-     * 1-已提交 2-转帐中 3-转账失败 4-转账成功
-     */
-    @TableField(value = "`status`")
-    private Integer status;
-
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_by")
-    private Long createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_time")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新人
-     */
-    @TableField(value = "update_by")
-    private Long updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(value = "update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 0-正常 1-删除
-     */
-    @TableField(value = "del_flag")
-    private Integer delFlag;
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/CashEnum.java

@@ -1,54 +0,0 @@
-package com.sckw.payment.model.constant;
-
-import java.util.Objects;
-
-/**
- * 物流、贸易
- * 对账单状态枚举
- *
- * @author xucaiqin
- * @date 2023-07-11 12:00:52
- */
-public enum CashEnum {
-    ALL(-1, "全部", "all"),
-    FAIL(0, "提现失败", "failed"),
-    SUCCESS(1, "提现成功", "success"),
-    LOAD(2, "提现中", "processing"),
-    WAIT(3, "等待提现", "3");
-
-    private final int status;
-    private final String desc;
-    private final String label;
-
-    CashEnum(int status, String desc, String label) {
-        this.status = status;
-        this.label = label;
-        this.desc = desc;
-    }
-
-    public static String getDesc(Integer status) {
-        if (Objects.isNull(status)) {
-            return "";
-        }
-        for (CashEnum value : values()) {
-            if (status == value.getStatus()) {
-                return value.getDesc();
-            }
-        }
-        return "";
-    }
-
-    public String getLabel() {
-        return label;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-
-    public String getDesc() {
-        return desc;
-    }
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/JumpEnum.java

@@ -1,78 +0,0 @@
-package com.sckw.payment.model.constant;
-
-import com.sckw.stream.enums.MessageEnum;
-import lombok.Getter;
-
-/**
- * 跳转地址
- *
- * @author xucaiqin
- * @date 2023-07-11 12:00:52
- */
-@Getter
-public enum JumpEnum {
-    LEDGER_SELL("ledgerSell", MessageEnum.LEDGER_SELL),
-    LEDGER_REVOCATION_SELL("ledgerSell", MessageEnum.LEDGER_REVOCATION_SELL),
-    LEDGER_CONFIRM_SELL("ledgerSell", MessageEnum.LEDGER_CONFIRM_SELL),
-    LEDGER_SUCCESS_SELL("ledgerSell", MessageEnum.LEDGER_SUCCESS_SELL),
-    LEDGER_BACK_SELL("ledgerSell", MessageEnum.LEDGER_BACK_SELL),
-    LEDGER_PURCHASE("ledgerPurchase", MessageEnum.LEDGER_PURCHASE),
-    LEDGER_REVOCATION_PURCHASE("ledgerPurchase", MessageEnum.LEDGER_REVOCATION_PURCHASE),
-    LEDGER_CONFIRM_PURCHASE("ledgerPurchase", MessageEnum.LEDGER_CONFIRM_PURCHASE),
-    LEDGER_SUCCESS_PURCHASE("ledgerPurchase", MessageEnum.LEDGER_SUCCESS_PURCHASE),
-    LEDGER_BACK_PURCHASE("ledgerPurchase", MessageEnum.LEDGER_BACK_PURCHASE),
-
-    LEDGER_CARRIER("ledgerCarrier", MessageEnum.LEDGER_CARRIER),
-    LEDGER_SHIPPER("ledgerShipper", MessageEnum.LEDGER_SHIPPER),
-    LEDGER_REVOCATION_CARRIER("ledgerCarrier", MessageEnum.LEDGER_REVOCATION_CARRIER),
-    LEDGER_REVOCATION_SHIPPER("ledgerShipper", MessageEnum.LEDGER_REVOCATION_SHIPPER),
-    LEDGER_CONFIRM_CARRIER("ledgerCarrier", MessageEnum.LEDGER_CONFIRM_CARRIER),
-    LEDGER_CONFIRM_SHIPPER("ledgerShipper", MessageEnum.LEDGER_CONFIRM_SHIPPER),
-    LEDGER_SUCCESS_CARRIER("ledgerCarrier", MessageEnum.LEDGER_SUCCESS_CARRIER),
-    LEDGER_SUCCESS_SHIPPER("ledgerShipper", MessageEnum.LEDGER_SUCCESS_SHIPPER),
-    LEDGER_BACK_CARRIER("ledgerCarrier", MessageEnum.LEDGER_BACK_CARRIER),
-    LEDGER_BACK_SHIPPER("ledgerShipper", MessageEnum.LEDGER_BACK_SHIPPER),
-
-    SETTLEMENT_SELL("settlementSell", MessageEnum.SETTLEMENT_SELL),
-    SETTLEMENT_PURCHASE("settlementPurchase", MessageEnum.SETTLEMENT_PURCHASE),
-    SETTLEMENT_CONFIRM_SELL("ledgerPurchase", MessageEnum.SETTLEMENT_CONFIRM_SELL),
-    SETTLEMENT_CONFIRM_PURCHASE("settlementPurchase", MessageEnum.SETTLEMENT_CONFIRM_PURCHASE),
-    SETTLEMENT_START_SELL("settlementSell", MessageEnum.SETTLEMENT_START_SELL),
-    SETTLEMENT_START_PURCHASE("settlementPurchase", MessageEnum.SETTLEMENT_START_PURCHASE),
-
-    SETTLEMENT_CARRIER("settlementCarrier", MessageEnum.SETTLEMENT_CARRIER),
-    SETTLEMENT_SHIPPER("settlementShipper", MessageEnum.SETTLEMENT_SHIPPER),
-    SETTLEMENT_CONFIRM_CARRIER("settlementCarrier", MessageEnum.SETTLEMENT_CONFIRM_CARRIER),
-    SETTLEMENT_CONFIRM_SHIPPER("settlementShipper", MessageEnum.SETTLEMENT_CONFIRM_SHIPPER),
-    SETTLEMENT_START_CARRIER("settlementCarrier", MessageEnum.SETTLEMENT_START_CARRIER),
-    SETTLEMENT_START_SHIPPER("settlementShipper", MessageEnum.SETTLEMENT_START_SHIPPER),
-    ;
-    /**
-     * nacos种配置的前端跳转url
-     */
-    private final String key;
-
-    private final MessageEnum messageEnum;
-
-
-    JumpEnum(String key, MessageEnum messageEnum) {
-        this.key = key;
-        this.messageEnum = messageEnum;
-    }
-
-    /**
-     * 通过消息枚举值，获取跳转地址key
-     *
-     * @param messageEnum
-     * @return
-     */
-    public static String getByEnum(MessageEnum messageEnum) {
-        for (JumpEnum value : JumpEnum.values()) {
-            if (value.getMessageEnum() == messageEnum) {
-                return value.getKey();
-            }
-        }
-        return "";
-    }
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/LedgerEnum.java

@@ -1,56 +0,0 @@
-package com.sckw.payment.model.constant;
-
-import java.util.Objects;
-
-/**
- * 物流、贸易
- * 对账单状态枚举
- *
- * @author xucaiqin
- * @date 2023-07-11 12:00:52
- */
-public enum LedgerEnum {
-    ALL(0, "全部", "0"),
-    SAVE(1, "已保存", "1"),
-    TO_LEDGER(2, "待对账", "2"),
-    LEDGERED(3, "已对账", "3"),
-    SUCCESS(4, "已完成", "4"),
-    BACK(5, "已退回", "5"),
-    REVOCATION(6, "已撤回", "6");
-
-    private final int status;
-    private final String desc;
-    private final String label;
-
-    LedgerEnum(int status, String desc, String label) {
-        this.status = status;
-        this.label = label;
-        this.desc = desc;
-    }
-
-    public static String getDesc(Integer status) {
-        if (Objects.isNull(status)) {
-            return "";
-        }
-        for (LedgerEnum value : values()) {
-            if (status == value.getStatus()) {
-                return value.getDesc();
-            }
-        }
-        return "";
-    }
-
-    public String getLabel() {
-        return label;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-
-    public String getDesc() {
-        return desc;
-    }
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/LedgerTrackEnum.java

@@ -1,41 +0,0 @@
-package com.sckw.payment.model.constant;
-
-/**
- * 物流对账、贸易对账
- * 对账记录track枚举
- *
- * @author xucaiqin
- * @date 2023-07-11 12:00:52
- */
-public enum LedgerTrackEnum {
-    SAVE(1, "保存对帐"),
-    TO_LEDGER(2, "发起对账"),
-    REVOKE(3, "撤回对账"),
-    DELETE(4, "删除对账"),
-    CONFIRM(5, "对账确认"),
-    REJECT(6, "对账驳回"),
-    SUCCESS(7, "对账完成");
-    private int status;
-    private String desc;
-
-    LedgerTrackEnum(int status, String desc) {
-        this.status = status;
-        this.desc = desc;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/LogisticsUnitType.java

@@ -1,16 +0,0 @@
-package com.sckw.payment.model.constant;
-
-/**
- * @author xucaiqin
- * @date 2023-07-14 09:26:16
- */
-public interface LogisticsUnitType {
-    /**
-     * 托运方 货物的委托人或发货人，即发送货物的一方
-     */
-    Integer SHIPPER = 1;
-    /**
-     * 承运方 发起对账的一方
-     */
-    Integer CARRIER = 2;
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/PayCenterEnum.java

@@ -1,60 +0,0 @@
-package com.sckw.payment.model.constant;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author xucaiqin
- * @date 2023-07-21 17:53:28
- */
-@Getter
-@AllArgsConstructor
-public enum PayCenterEnum {
-    MEMBER_DETAIL("/v1/member/detail", "会员详情"),
-    MEMBER_WALLET("/v1/member/wallet", "钱包清单"),
-    MEMBER_WALLET_V2("/v2/member/wallet", "钱包清单v2"),
-    MEMBER_GENERAL("/v2/wallet/general", "总览信息"),
-    USER("/v2/member/user", "会员注册信息"),
-    WITHDRAW_DETAIL("/v2/wallet/withdraw/detail", "提现详情"),
-    //    WITHDRAW_DETAIL("/v1/wallet/withdraw/detail", "提现详情"), 原接口
-    //    WITHDRAW_INDEX("/v1/wallet/withdraw/index", "提现清单"), 原接口
-    WITHDRAW_INDEX("/v2/wallet/withdraw/index", "提现清单"),
-    WITHDRAW_CATEGORY("/v2/wallet/withdraw/categories", "提现清单分类"),
-    WITHDRAW_STATUS("/v1/wallet/withdraw/status", "订单状态"),
-    WITHDRAW_CANCEL("/v1/wallet/withdraw/cancel", "取消提现"),
-    WITHDRAW_TAKE("/v1/wallet/withdraw/take", "申请提现"),
-    TOTAL_INFO("/v1/wallet/totalInfo", "统计信息"),
-    OPERATE_DOWNLOAD("/v1/wallet/operate/download", "操作记录-下载"),
-    OPERATE_CATEGORY("/v1/wallet/operate/category", "操作记录-分类"),
-    OPERATE_INDEX("/v1/wallet/operate/index", "操作记录"),
-    LOG_CATEGORY("/v1/wallet/log/category", "钱包日志类型"),
-    RECORD("/v1/wallet/record", "获取钱包使用明细"),
-    TRANSFER("/v1/wallet/transfer", "余额转出"),
-    ADVANCE_PAY_DETAIL("/v1/wallet/advancepay/detail", "预付订单详情"),
-    ADVANCE_PAY_APPLY("/v1/wallet/advancepay/apply", "发起预付"),
-    ADVANCE_PAY_INDEX("/v1/wallet/advancepay/index", "预付订单清单"),
-    ADVANCE_PAY_INDEX2("/v2/wallet/advancepay/index", "预付订单清单"),
-    ADVANCE_PAY_WALLETS("/v2/advancepay/wallets", "钱包预付列表"),
-    ADVANCE_PAY_PAY_CHANNELS("/v2/advancepay/pay/channels", "钱包预付通道统计"),
-    ADVANCE_PAY_RECEIVE("/v2/advancepay/receives", "钱包预收列表"),
-    ADVANCE_PAY_LOGS("/v2/advancepay/operate/logs", "预付支出记录"),
-    ADVANCE_PAY_RECEIVE_CHANNELS("/v2/advancepay/receive/channels", "钱包预收通道统计"),
-    ADVANCE_PAY_STATUS("/v1/wallet/advancepay/statusCategory", "预付订单状态"),
-    INDEX("/v1/index/index", "获取通道清单"),
-    MEMBER_PAY_INDEX("/v1/member/pay/index", "订单记录"),
-    MEMBER_INDEX("/v1/member/index", "创建/更新账户"),
-    PAY_INDEX("/v1/pay/index", "在线充值"),
-    RECHARGE_ORDER("/v2/wallet/recharge/orders", "充值记录清单"),
-    WALLET_FREEZE("/v1/wallet/freeze", "冻结资金"),
-    WALLET_UNFREEZE("/v1/wallet/unfreeze", "解冻金额"),
-    PAY_AGENT_PAY("/v1/pay/agent_pay", "清分"),
-    PAY_AGENT_PAY_V2("/v2/pay/agent_pay", "清分"),
-    AGENT_PAY_QUERY("/v2/pay/status/query", "清分结果查询"),
-    WITHDRAW_TRANSFER("/v2/wallet/withdraw/transfer", "转出加提现"),
-    WALLET_INDEX("/v1/wallet/index", "创建钱包"),
-    REFUND_APPLY("/v1/pay/refund_apply", "充值订单退款"),
-    ;
-    private final String addr;
-    private final String desc;
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/PayXwEnum.java

@@ -1,60 +0,0 @@
-package com.sckw.payment.model.constant;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author xucaiqin
- * @date 2023-07-21 17:53:28
- */
-@Getter
-@AllArgsConstructor
-public enum PayXwEnum {
-    BEFORE_CREATE("/user/beforeCreate", "获取开户地址"),
-    MEMBER_WALLET("/v1/member/wallet", "钱包清单"),
-    MEMBER_WALLET_V2("/v2/member/wallet", "钱包清单v2"),
-    MEMBER_GENERAL("/v2/wallet/general", "总览信息"),
-    USER("/v2/member/user", "会员注册信息"),
-    WITHDRAW_DETAIL("/v2/wallet/withdraw/detail", "提现详情"),
-    //    WITHDRAW_DETAIL("/v1/wallet/withdraw/detail", "提现详情"), 原接口
-    //    WITHDRAW_INDEX("/v1/wallet/withdraw/index", "提现清单"), 原接口
-    WITHDRAW_INDEX("/v2/wallet/withdraw/index", "提现清单"),
-    WITHDRAW_CATEGORY("/v2/wallet/withdraw/categories", "提现清单分类"),
-    WITHDRAW_STATUS("/v1/wallet/withdraw/status", "订单状态"),
-    WITHDRAW_CANCEL("/v1/wallet/withdraw/cancel", "取消提现"),
-    WITHDRAW_TAKE("/v1/wallet/withdraw/take", "申请提现"),
-    TOTAL_INFO("/v1/wallet/totalInfo", "统计信息"),
-    OPERATE_DOWNLOAD("/v1/wallet/operate/download", "操作记录-下载"),
-    OPERATE_CATEGORY("/v1/wallet/operate/category", "操作记录-分类"),
-    OPERATE_INDEX("/v1/wallet/operate/index", "操作记录"),
-    LOG_CATEGORY("/v1/wallet/log/category", "钱包日志类型"),
-    RECORD("/v1/wallet/record", "获取钱包使用明细"),
-    TRANSFER("/v1/wallet/transfer", "余额转出"),
-    ADVANCE_PAY_DETAIL("/v1/wallet/advancepay/detail", "预付订单详情"),
-    ADVANCE_PAY_APPLY("/v1/wallet/advancepay/apply", "发起预付"),
-    ADVANCE_PAY_INDEX("/v1/wallet/advancepay/index", "预付订单清单"),
-    ADVANCE_PAY_INDEX2("/v2/wallet/advancepay/index", "预付订单清单"),
-    ADVANCE_PAY_WALLETS("/v2/advancepay/wallets", "钱包预付列表"),
-    ADVANCE_PAY_PAY_CHANNELS("/v2/advancepay/pay/channels", "钱包预付通道统计"),
-    ADVANCE_PAY_RECEIVE("/v2/advancepay/receives", "钱包预收列表"),
-    ADVANCE_PAY_LOGS("/v2/advancepay/operate/logs", "预付支出记录"),
-    ADVANCE_PAY_RECEIVE_CHANNELS("/v2/advancepay/receive/channels", "钱包预收通道统计"),
-    ADVANCE_PAY_STATUS("/v1/wallet/advancepay/statusCategory", "预付订单状态"),
-    INDEX("/v1/index/index", "获取通道清单"),
-    MEMBER_PAY_INDEX("/v1/member/pay/index", "订单记录"),
-    MEMBER_INDEX("/v1/member/index", "创建/更新账户"),
-    PAY_INDEX("/v1/pay/index", "在线充值"),
-    RECHARGE_ORDER("/v2/wallet/recharge/orders", "充值记录清单"),
-    WALLET_FREEZE("/v1/wallet/freeze", "冻结资金"),
-    WALLET_UNFREEZE("/v1/wallet/unfreeze", "解冻金额"),
-    PAY_AGENT_PAY("/v1/pay/agent_pay", "清分"),
-    PAY_AGENT_PAY_V2("/v2/pay/agent_pay", "清分"),
-    AGENT_PAY_QUERY("/v2/pay/status/query", "清分结果查询"),
-    WITHDRAW_TRANSFER("/v2/wallet/withdraw/transfer", "转出加提现"),
-    WALLET_INDEX("/v1/wallet/index", "创建钱包"),
-    REFUND_APPLY("/v1/pay/refund_apply", "充值订单退款"),
-    ;
-    private final String addr;
-    private final String desc;
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/PrePayEnum.java

@@ -1,49 +0,0 @@
-package com.sckw.payment.model.constant;
-
-import java.util.Objects;
-
-/**
- * 预付操作枚举
- *
- * @author xucaiqin
- * @date 2023-07-11 12:00:52
- */
-public enum PrePayEnum {
-    ADD(1, "新增预付", "新增预付"),
-    APPEND(2, "预付追加", "预付追加");
-
-    private final int status;
-    private final String desc;
-    private final String label;
-
-    PrePayEnum(int status, String desc, String label) {
-        this.status = status;
-        this.label = label;
-        this.desc = desc;
-    }
-
-    public String getLabel() {
-        return label;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public static String getByStatus(Integer status) {
-        if (Objects.isNull(status)) {
-            return "";
-        }
-        for (PrePayEnum value : PrePayEnum.values()) {
-            if (value.getStatus() == status) {
-                return value.getDesc();
-            }
-        }
-        return "";
-    }
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/ReceiveEnum.java

@@ -1,52 +0,0 @@
-package com.sckw.payment.model.constant;
-
-import java.util.Objects;
-
-/**
- * 货到付款枚举
- *
- * @author xucaiqin
- * @date 2023-07-11 12:00:52
- */
-public enum ReceiveEnum {
-    APPLY(1, "已提交", "1"),
-    TRANSFERRING(2, "支付中", "2"),
-    FAILED(3, "支付失败", "3"),
-    SUCCESS(4, "支付成功", "4");
-
-    private final int status;
-    private final String desc;
-    private final String label;
-
-    ReceiveEnum(int status, String desc, String label) {
-        this.status = status;
-        this.label = label;
-        this.desc = desc;
-    }
-
-    public static String getDesc(Integer status) {
-        if (Objects.isNull(status)) {
-            return "";
-        }
-        for (ReceiveEnum value : values()) {
-            if (status == value.getStatus()) {
-                return value.getDesc();
-            }
-        }
-        return "";
-    }
-
-    public String getLabel() {
-        return label;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-
-    public String getDesc() {
-        return desc;
-    }
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/RefundEnum.java

@@ -1,53 +0,0 @@
-package com.sckw.payment.model.constant;
-
-import java.util.Objects;
-
-/**
- * 钱包退款枚举类
- * 1-申请退款 2-退款中 3-退款失败 4-退款驳回
- * @author xucaiqin
- * @date 2023-07-11 12:00:52
- */
-public enum RefundEnum {
-    APPLY(1, "申请退款", "1"),
-    REFUNDING(2, "退款中", "2"),
-    FAILED(3, "退款失败", "3"),
-    BACK(4, "退款驳回", "4"),
-    SUCCESS(5,"退款成功","5");
-
-    private final int status;
-    private final String desc;
-    private final String label;
-
-    RefundEnum(int status, String desc, String label) {
-        this.status = status;
-        this.label = label;
-        this.desc = desc;
-    }
-
-    public static String getDesc(Integer status) {
-        if (Objects.isNull(status)) {
-            return "";
-        }
-        for (RefundEnum value : values()) {
-            if (status == value.getStatus()) {
-                return value.getDesc();
-            }
-        }
-        return "";
-    }
-
-    public String getLabel() {
-        return label;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-
-    public String getDesc() {
-        return desc;
-    }
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/SettlementEnum.java

@@ -1,51 +0,0 @@
-package com.sckw.payment.model.constant;
-
-/**
- * 物流、贸易
- * 结算单状态枚举
- *
- * @author xucaiqin
- * @date 2023-07-11 12:00:52
- */
-public enum SettlementEnum {
-    ALL(0, "全部", "0"),
-    WAITING_PAYMENT(1, "待结算", "1"),
-    PARTIAL_PAYMENT(2, "部分结算", "2"),
-    ALL_PAYMENT(3, "全部结算", "3");
-
-    private final int status;
-    private final String desc;
-    private final String label;
-
-    SettlementEnum(int status, String desc, String label) {
-        this.status = status;
-        this.desc = desc;
-        this.label = label;
-    }
-
-    public String getLabel() {
-        return label;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-
-    public String getDesc() {
-        return desc;
-    }
-
-    // 添加静态方法，根据 status 获取对应的 desc
-    public static String getStatusDesc(int status) {
-        for (SettlementEnum settlementEnum : values()) {
-            if (settlementEnum.getStatus() == status) {
-                return settlementEnum.getDesc();
-            }
-        }
-        // 可根据实际需求返回默认值或其他处理
-        return null;
-    }
-
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/SettlementOrderTypeEnum.java

@@ -1,48 +0,0 @@
-package com.sckw.payment.model.constant;
-
-/**
- * @author Aick Spt
- * @date 2023-07-27 12:49
- */
-public enum SettlementOrderTypeEnum {
-        LOGISTICS(1, "物流"),
-        TRADE(2, "贸易");
-
-        private int status;
-        private String desc;
-
-    SettlementOrderTypeEnum(int status, String desc) {
-            this.status = status;
-            this.desc = desc;
-        }
-
-        public int getStatus() {
-            return status;
-        }
-
-        public void setStatus(int status) {
-            this.status = status;
-        }
-
-        public String getDesc() {
-            return desc;
-        }
-
-        public void setDesc(String desc) {
-            this.desc = desc;
-        }
-
-        // 添加静态方法，根据 status 获取对应的 desc
-        public static String getStatusDesc(int status) {
-            for (SettlementOrderTypeEnum settlementOrderTypeEnum : values()) {
-                if (settlementOrderTypeEnum.getStatus() == status) {
-                    return settlementOrderTypeEnum.getDesc();
-                }
-            }
-            // 可根据实际需求返回默认值或其他处理
-            return null;
-        }
-
-
-    }
-

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/SettlementPayTypeEnum.java

@@ -1,36 +0,0 @@
-package com.sckw.payment.model.constant;
-
-/**
- * Desc: 暂不明确是否使用
- * @author Aick Spt
- * @date 2023-07-20 08:35
- */
-public enum SettlementPayTypeEnum {
-    ADVANCE_PAYMENT(1, "预付款"),
-    CASH_ON_DELIVERY(2, "货到付款"),
-    OFFLINE_PAYMENT(3, "线下付款");
-
-    private int status;
-    private String desc;
-
-    SettlementPayTypeEnum(int status, String desc) {
-        this.status = status;
-        this.desc = desc;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/SettlementTrackEnum.java

@@ -1,38 +0,0 @@
-package com.sckw.payment.model.constant;
-
-/**
- * 结算track表状态枚举
- *
- * @author xucaiqin
- * @date 2023-07-13 16:12:41
- */
-public enum SettlementTrackEnum {
-
-    PRE_PAY(1, "收款确认-预付款"),
-    RECEIVE_PAY(2, "付款确认-货到付款"),
-    OFFLINE_PAY(3, "收款确认-线下付款");
-
-    private int status;
-    private String desc;
-
-    SettlementTrackEnum(int status, String desc) {
-        this.status = status;
-        this.desc = desc;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/SettlementWalletPayTypeEnum.java

@@ -1,35 +0,0 @@
-package com.sckw.payment.model.constant;
-
-/**
- * Desc: 暂不明确是否使用
- * @author Aick Spt
- * @date 2023-07-20 08:35
- */
-public enum SettlementWalletPayTypeEnum {
-    ADVANCE_PAYMENT(1, "预付款"),
-    CASH_ON_DELIVERY(2, "货到付款");
-
-    private int status;
-    private String desc;
-
-    SettlementWalletPayTypeEnum(int status, String desc) {
-        this.status = status;
-        this.desc = desc;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/TradeUnitType.java

@@ -1,16 +0,0 @@
-package com.sckw.payment.model.constant;
-
-/**
- * @author xucaiqin
- * @date 2023-07-14 09:26:16
- */
-public interface TradeUnitType {
-    /**
-     * 销售方
-     */
-    Integer SELL = 2;
-    /**
-     * 采购方
-     */
-    Integer PURCHASE = 1;
-}